Skip to content

Commit

Permalink
feat(gql): custom scalar support for outputs (#1173)
Browse files Browse the repository at this point in the history
  • Loading branch information
jasonkuhrt authored Oct 9, 2024
1 parent 021d26e commit d3ffdc2
Show file tree
Hide file tree
Showing 97 changed files with 1,831 additions and 1,279 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ ContextualAggregateError: One or more errors in the execution result.
]
}
]
at <anonymous> (/some/path/to/graphqlHTTP.ts:XX:XX:47)
at <anonymous> (/some/path/to/http.ts:XX:XX:47)
at Array.map (<anonymous>)
at parseExecutionResult (/some/path/to/graphqlHTTP.ts:XX:XX:28)
at parseExecutionResult (/some/path/to/http.ts:XX:XX:28)
at Object.unpack (/some/path/to/core.ts:XX:XX:26)
at process.processTicksAndRejections (node:internal/process/task_queues:XX:XX)
at async runHook (/some/path/to/runHook.ts:XX:XX:16) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@

node:internal/modules/run_main:123
triggerUncaughtException(
^
Error [ERR_MODULE_NOT_FOUND]: Cannot find module '/some/path/to/gql_gql-document-node_gql-typed_gql-typed-graphql-document-node__gql-typed-graphql-document-node.ts:XX:XX' imported from /Users/jasonkuhrt/projects/jasonkuhrt/graffle/
at finalizeResolution (node:internal/modules/esm/resolve:XX:XX)
at moduleResolve (node:internal/modules/esm/resolve:XX:XX)
at defaultResolve (node:internal/modules/esm/resolve:XX:XX)
at nextResolve (node:internal/modules/esm/hooks:XX:XX)
at resolveBase (file:///Users/jasonkuhrt/projects/jasonkuhrt/graffle/node_modules/.pnpm/tsx@4.19.1/node_modules/tsx/dist/esm/index.mjs?1728404771051:XX:XX)
at resolveDirectory (file:///Users/jasonkuhrt/projects/jasonkuhrt/graffle/node_modules/.pnpm/tsx@4.19.1/node_modules/tsx/dist/esm/index.mjs?1728404771051:XX:XX)
at resolveTsPaths (file:///Users/jasonkuhrt/projects/jasonkuhrt/graffle/node_modules/.pnpm/tsx@4.19.1/node_modules/tsx/dist/esm/index.mjs?1728404771051:XX:XX)
at resolve (file:///Users/jasonkuhrt/projects/jasonkuhrt/graffle/node_modules/.pnpm/tsx@4.19.1/node_modules/tsx/dist/esm/index.mjs?1728404771051:XX:XX)
at nextResolve (node:internal/modules/esm/hooks:XX:XX)
at Hooks.resolve (node:internal/modules/esm/hooks:XX:XX) {
code: 'ERR_MODULE_NOT_FOUND',
url: 'file:/some/path/to/gql_gql-document-node_gql-typed_gql-typed-graphql-document-node__gql-typed-graphql-document-node.ts:XX:XX'
}

Node.js vXX.XX.XX
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@

node:internal/modules/run_main:123
triggerUncaughtException(
^
Error [ERR_MODULE_NOT_FOUND]: Cannot find module '/some/path/to/raw_rawDocumentNode__raw-document-node.ts:XX:XX' imported from /Users/jasonkuhrt/projects/jasonkuhrt/graffle/
at finalizeResolution (node:internal/modules/esm/resolve:XX:XX)
at moduleResolve (node:internal/modules/esm/resolve:XX:XX)
at defaultResolve (node:internal/modules/esm/resolve:XX:XX)
at nextResolve (node:internal/modules/esm/hooks:XX:XX)
at resolveBase (file:///Users/jasonkuhrt/projects/jasonkuhrt/graffle/node_modules/.pnpm/tsx@4.19.1/node_modules/tsx/dist/esm/index.mjs?1728316475175:XX:XX)
at resolveDirectory (file:///Users/jasonkuhrt/projects/jasonkuhrt/graffle/node_modules/.pnpm/tsx@4.19.1/node_modules/tsx/dist/esm/index.mjs?1728316475175:XX:XX)
at resolveTsPaths (file:///Users/jasonkuhrt/projects/jasonkuhrt/graffle/node_modules/.pnpm/tsx@4.19.1/node_modules/tsx/dist/esm/index.mjs?1728316475175:XX:XX)
at resolve (file:///Users/jasonkuhrt/projects/jasonkuhrt/graffle/node_modules/.pnpm/tsx@4.19.1/node_modules/tsx/dist/esm/index.mjs?1728316475175:XX:XX)
at nextResolve (node:internal/modules/esm/hooks:XX:XX)
at Hooks.resolve (node:internal/modules/esm/hooks:XX:XX) {
code: 'ERR_MODULE_NOT_FOUND',
url: 'file:/some/path/to/raw_rawDocumentNode__raw-document-node.ts:XX:XX'
}

Node.js vXX.XX.XX
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@

node:internal/modules/run_main:123
triggerUncaughtException(
^
Error [ERR_MODULE_NOT_FOUND]: Cannot find module '/some/path/to/raw_rawDocumentNode_rawTyped__raw-document-node-typed.ts:XX:XX' imported from /Users/jasonkuhrt/projects/jasonkuhrt/graffle/
at finalizeResolution (node:internal/modules/esm/resolve:XX:XX)
at moduleResolve (node:internal/modules/esm/resolve:XX:XX)
at defaultResolve (node:internal/modules/esm/resolve:XX:XX)
at nextResolve (node:internal/modules/esm/hooks:XX:XX)
at resolveBase (file:///Users/jasonkuhrt/projects/jasonkuhrt/graffle/node_modules/.pnpm/tsx@4.19.1/node_modules/tsx/dist/esm/index.mjs?1728316472737:XX:XX)
at resolveDirectory (file:///Users/jasonkuhrt/projects/jasonkuhrt/graffle/node_modules/.pnpm/tsx@4.19.1/node_modules/tsx/dist/esm/index.mjs?1728316472737:XX:XX)
at resolveTsPaths (file:///Users/jasonkuhrt/projects/jasonkuhrt/graffle/node_modules/.pnpm/tsx@4.19.1/node_modules/tsx/dist/esm/index.mjs?1728316472737:XX:XX)
at resolve (file:///Users/jasonkuhrt/projects/jasonkuhrt/graffle/node_modules/.pnpm/tsx@4.19.1/node_modules/tsx/dist/esm/index.mjs?1728316472737:XX:XX)
at nextResolve (node:internal/modules/esm/hooks:XX:XX)
at Hooks.resolve (node:internal/modules/esm/hooks:XX:XX) {
code: 'ERR_MODULE_NOT_FOUND',
url: 'file:/some/path/to/raw_rawDocumentNode_rawTyped__raw-document-node-typed.ts:XX:XX'
}

Node.js vXX.XX.XX
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@

node:internal/modules/run_main:123
triggerUncaughtException(
^
Error [ERR_MODULE_NOT_FOUND]: Cannot find module '/some/path/to/raw_rawString__rawString.ts:XX:XX' imported from /Users/jasonkuhrt/projects/jasonkuhrt/graffle/
at finalizeResolution (node:internal/modules/esm/resolve:XX:XX)
at moduleResolve (node:internal/modules/esm/resolve:XX:XX)
at defaultResolve (node:internal/modules/esm/resolve:XX:XX)
at nextResolve (node:internal/modules/esm/hooks:XX:XX)
at resolveBase (file:///Users/jasonkuhrt/projects/jasonkuhrt/graffle/node_modules/.pnpm/tsx@4.19.1/node_modules/tsx/dist/esm/index.mjs?1728316478033:XX:XX)
at resolveDirectory (file:///Users/jasonkuhrt/projects/jasonkuhrt/graffle/node_modules/.pnpm/tsx@4.19.1/node_modules/tsx/dist/esm/index.mjs?1728316478033:XX:XX)
at resolveTsPaths (file:///Users/jasonkuhrt/projects/jasonkuhrt/graffle/node_modules/.pnpm/tsx@4.19.1/node_modules/tsx/dist/esm/index.mjs?1728316478033:XX:XX)
at resolve (file:///Users/jasonkuhrt/projects/jasonkuhrt/graffle/node_modules/.pnpm/tsx@4.19.1/node_modules/tsx/dist/esm/index.mjs?1728316478033:XX:XX)
at nextResolve (node:internal/modules/esm/hooks:XX:XX)
at Hooks.resolve (node:internal/modules/esm/hooks:XX:XX) {
code: 'ERR_MODULE_NOT_FOUND',
url: 'file:/some/path/to/raw_rawString__rawString.ts:XX:XX'
}

Node.js vXX.XX.XX
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@

node:internal/modules/run_main:123
triggerUncaughtException(
^
Error [ERR_MODULE_NOT_FOUND]: Cannot find module '/some/path/to/raw_rawString_rawTyped__rawString-typed.ts:XX:XX' imported from /Users/jasonkuhrt/projects/jasonkuhrt/graffle/
at finalizeResolution (node:internal/modules/esm/resolve:XX:XX)
at moduleResolve (node:internal/modules/esm/resolve:XX:XX)
at defaultResolve (node:internal/modules/esm/resolve:XX:XX)
at nextResolve (node:internal/modules/esm/hooks:XX:XX)
at resolveBase (file:///Users/jasonkuhrt/projects/jasonkuhrt/graffle/node_modules/.pnpm/tsx@4.19.1/node_modules/tsx/dist/esm/index.mjs?1728316474983:XX:XX)
at resolveDirectory (file:///Users/jasonkuhrt/projects/jasonkuhrt/graffle/node_modules/.pnpm/tsx@4.19.1/node_modules/tsx/dist/esm/index.mjs?1728316474983:XX:XX)
at resolveTsPaths (file:///Users/jasonkuhrt/projects/jasonkuhrt/graffle/node_modules/.pnpm/tsx@4.19.1/node_modules/tsx/dist/esm/index.mjs?1728316474983:XX:XX)
at resolve (file:///Users/jasonkuhrt/projects/jasonkuhrt/graffle/node_modules/.pnpm/tsx@4.19.1/node_modules/tsx/dist/esm/index.mjs?1728316474983:XX:XX)
at nextResolve (node:internal/modules/esm/hooks:XX:XX)
at Hooks.resolve (node:internal/modules/esm/hooks:XX:XX) {
code: 'ERR_MODULE_NOT_FOUND',
url: 'file:/some/path/to/raw_rawString_rawTyped__rawString-typed.ts:XX:XX'
}

Node.js vXX.XX.XX
2 changes: 1 addition & 1 deletion src/entrypoints/main.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export { createExtension, type Extension } from '../layers/6_client/extension/extension.js'
export { type TypedDocument } from '../lib/typed-document/__.js'
export { type TypedDocument } from '../lib/grafaid/typed-document/__.js'
// todo figure this export out. Was just put there to resolve a type error about "...cannot be named..."
export { type Config as BuilderConfig } from '../layers/6_client/Settings/Config.js'
export * from '../layers/6_client/Settings/Input.js'
Expand Down
12 changes: 4 additions & 8 deletions src/layers/1_Schema/Output/types/Object.ts
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
import type {
RootTypeNameMutation,
RootTypeNameQuery,
RootTypeNameSubscription,
} from '../../../../lib/graphql-plus/graphql.js'
import type { Grafaid } from '../../../../lib/grafaid/__.js'
import { __typename } from './__typename.js'
import type { Field, SomeFields } from './Field.js'
import { field } from './Field.js'

export interface ObjectQuery<
$Fields extends SomeFields = SomeFields,
> extends Object$2<RootTypeNameQuery, $Fields> {}
> extends Object$2<Grafaid.Schema.RootTypeNameQuery, $Fields> {}

export interface ObjectMutation<
$Fields extends SomeFields = SomeFields,
> extends Object$2<RootTypeNameMutation, $Fields> {}
> extends Object$2<Grafaid.Schema.RootTypeNameMutation, $Fields> {}

export interface ObjectSubscription<
$Fields extends SomeFields = SomeFields,
> extends Object$2<RootTypeNameSubscription, $Fields> {}
> extends Object$2<Grafaid.Schema.RootTypeNameSubscription, $Fields> {}

export type RootType = ObjectQuery | ObjectMutation | ObjectSubscription

Expand Down
31 changes: 13 additions & 18 deletions src/layers/2_Select/document.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
import type { OperationTypeNode } from 'graphql'
import { RootTypeName, RootTypeNameToOperationName } from '../../lib/graphql-plus/graphql.js'
import {
type OperationType,
type RootTypeNameMutation,
type RootTypeNameQuery,
} from '../../lib/graphql-plus/graphql.js'
import { Grafaid } from '../../lib/grafaid/__.js'
import type { FirstNonUnknownNever, IsKeyInObjectOptional, Values } from '../../lib/prelude.js'
import type { Select } from './__.js'

Expand Down Expand Up @@ -39,8 +34,8 @@ export type GetOperationNames<$Document extends SomeDocument> = Values<

// dprint-ignore
export type GetRootTypeNameOfOperation<$Document extends SomeDocument, $Name extends OperationName> =
IsKeyInObjectOptional<$Document[OperationType.Mutation], $Name> extends true ? RootTypeNameMutation :
IsKeyInObjectOptional<$Document[OperationType.Query], $Name> extends true ? RootTypeNameQuery :
IsKeyInObjectOptional<$Document[OperationTypeNode.MUTATION], $Name> extends true ? Grafaid.Schema.RootTypeNameMutation :
IsKeyInObjectOptional<$Document[OperationTypeNode.QUERY], $Name> extends true ? Grafaid.Schema.RootTypeNameQuery :
never

// dprint-ignore
Expand All @@ -55,7 +50,7 @@ export type GetOperation<$Document extends SomeDocument, $Name extends string> =
export interface OperationNormalized {
name: string | null
type: OperationTypeNode
rootType: RootTypeName
rootType: Grafaid.Schema.RootTypeName
selectionSet: Select.SelectionSet.AnySelectionSet
}

Expand All @@ -74,24 +69,24 @@ export interface DocumentNormalized {
export const createDocumentNormalized = (document: DocumentNormalized) => document

export const createDocumentNormalizedFromRootTypeSelection = (
rootTypeName: RootTypeName,
rootTypeName: Grafaid.Schema.RootTypeName,
selectionSet: Select.SelectionSet.AnySelectionSet,
) =>
createDocumentNormalized({
operations: {
[defaultOperationName]: {
name: null,
type: RootTypeNameToOperationName[rootTypeName],
type: Grafaid.RootTypeNameToOperationName[rootTypeName],
rootType: rootTypeName,
selectionSet,
},
},
facts: {
hasMultipleOperations: false,
hasRootType: {
query: rootTypeName === RootTypeName.Query,
mutation: rootTypeName === RootTypeName.Mutation,
subscription: rootTypeName === RootTypeName.Subscription,
query: rootTypeName === Grafaid.Schema.RootTypeName.Query,
mutation: rootTypeName === Grafaid.Schema.RootTypeName.Mutation,
subscription: rootTypeName === Grafaid.Schema.RootTypeName.Subscription,
},
},
})
Expand All @@ -101,16 +96,16 @@ export const normalizeOrThrow = (document: DocumentObject): DocumentNormalized =
[name, selectionSet],
): [name: string, OperationNormalized] => [name, {
name,
type: RootTypeNameToOperationName[RootTypeName.Query],
rootType: RootTypeName.Query,
type: Grafaid.RootTypeNameToOperationName[Grafaid.Schema.RootTypeName.Query],
rootType: Grafaid.Schema.RootTypeName.Query,
selectionSet,
}])
const mutationOperations = Object.entries(document.mutation ?? {}).map((
[name, selectionSet],
): [name: string, OperationNormalized] => [name, {
name,
type: RootTypeNameToOperationName[RootTypeName.Mutation],
rootType: RootTypeName.Mutation,
type: Grafaid.RootTypeNameToOperationName[Grafaid.Schema.RootTypeName.Mutation],
rootType: Grafaid.Schema.RootTypeName.Mutation,
selectionSet,
}])
const operations = [
Expand Down
1 change: 0 additions & 1 deletion src/layers/3_Result/_.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
export { decode } from './decode.js'
export * from './infer/_.js'
20 changes: 0 additions & 20 deletions src/layers/3_Result/decode.test.ts

This file was deleted.

Loading

0 comments on commit d3ffdc2

Please sign in to comment.