graffle-js · jasonkuhrt · Sep 24, 2024 · Sep 24, 2024 · Sep 24, 2024
diff --git a/src/cli/generate.ts b/src/cli/generate.ts
@@ -3,7 +3,7 @@
 import { Command } from '@molt/command'
 import * as Path from 'node:path'
 import { z } from 'zod'
-import { generateFiles } from '../layers/2_generator/files.js'
+import { generateFiles } from '../layers/4_generator/files.js'
 import { urlParseSafe } from '../lib/prelude.js'
 
 const args = Command.create().description(`Generate a type safe GraphQL client.`)

diff --git a/src/entrypoints/generator.ts b/src/entrypoints/generator.ts
@@ -1 +1 @@
-export { generateFiles as generate } from '../layers/2_generator/files.js'
+export { generateFiles as generate } from '../layers/4_generator/files.js'
diff --git a/src/entrypoints/main.ts b/src/entrypoints/main.ts
@@ -1,7 +1,7 @@
 export { execute } from '../layers/0_functions/execute.js'
-export { gql } from '../layers/0_functions/gql.js'
 export { type TypedDocumentString } from '../layers/0_functions/types.js'
 export { createExtension, type Extension } from '../layers/6_client/extension.js'
+export { gql } from '../layers/6_helpers/gql.js'
 // todo figure this export out. Was just put there to resolve a type error about "...cannot be named..."
 export * from '../layers/6_client/Settings/Input.js'
 // todo figure this export out. Was just put there to resolve a type error about "...cannot be named..."

diff --git a/src/entrypoints/schema.ts b/src/entrypoints/schema.ts
@@ -1,3 +1,3 @@
 export * from '../layers/1_Schema/__.js'
-export { SelectionSet } from '../layers/3_SelectionSet/__.js'
-export { ResultSet } from '../layers/4_ResultSet/__.js'
+export { SelectionSet } from '../layers/2_SelectionSet/__.js'
+export { ResultSet } from '../layers/3_ResultSet/__.js'
diff --git a/src/entrypoints/utilities-for-generated.ts b/src/entrypoints/utilities-for-generated.ts
@@ -1,5 +1,5 @@
 export { type Simplify } from 'type-fest'
-export * from '../layers/3_SelectionSet/__.js'
+export * from '../layers/2_SelectionSet/__.js'
 export { type DocumentRunner } from '../layers/6_client/document.js'
 export type {
   ConfigGetOutputError,

diff --git a/src/layers/0_functions/types.ts b/src/layers/0_functions/types.ts
@@ -41,7 +41,7 @@ type GetVariablesInputFromDocumentNode<$Document extends TypedQueryDocumentNode>
       : { variables?: VariablesOf<$Document> }
     : {}
 
-export type HasVariables<$Document extends TypedQueryDocumentNode | TypedDocumentString> = Negate<
+type HasVariables<$Document extends TypedQueryDocumentNode | TypedDocumentString> = Negate<
   IsEmptyObject<VariablesOf<$Document>>
 >
 

diff --git a/src/layers/1_Schema/Hybrid/types/Scalar/Scalar.ts b/src/layers/1_Schema/Hybrid/types/Scalar/Scalar.ts
@@ -1,4 +1,4 @@
-import type { GlobalRegistry } from '../../../../2_generator/globalRegistry.js'
+import type { GlobalRegistry } from '../../../../4_generator/globalRegistry.js'
 import type { Codec } from './codec.js'
 import { JavaScriptScalarCodecs } from './nativeScalarCodecs.js'
 

diff --git a/src/layers/1_Schema/core/Index.ts b/src/layers/1_Schema/core/Index.ts
@@ -1,5 +1,5 @@
 import type { RootTypeName } from '../../../lib/graphql.js'
-import type { GlobalRegistry } from '../../2_generator/globalRegistry.js'
+import type { GlobalRegistry } from '../../4_generator/globalRegistry.js'
 import type { Hybrid } from '../Hybrid/__.js'
 import type { Output } from '../Output/__.js'
 

diff --git a/...layers/3_SelectionSet/Directive/$print.ts → ...layers/2_SelectionSet/Directive/$print.ts b/...layers/3_SelectionSet/Directive/$print.ts → ...layers/2_SelectionSet/Directive/$print.ts
diff --git a/...layers/3_SelectionSet/Directive/$types.ts → ...layers/2_SelectionSet/Directive/$types.ts b/...layers/3_SelectionSet/Directive/$types.ts → ...layers/2_SelectionSet/Directive/$types.ts
diff --git a/src/layers/3_SelectionSet/Directive/_.ts → src/layers/2_SelectionSet/Directive/_.ts b/src/layers/3_SelectionSet/Directive/_.ts → src/layers/2_SelectionSet/Directive/_.ts
diff --git a/src/layers/3_SelectionSet/Directive/__.ts → src/layers/2_SelectionSet/Directive/__.ts b/src/layers/3_SelectionSet/Directive/__.ts → src/layers/2_SelectionSet/Directive/__.ts
diff --git a/...layers/3_SelectionSet/Directive/_defer.ts → ...layers/2_SelectionSet/Directive/_defer.ts b/...layers/3_SelectionSet/Directive/_defer.ts → ...layers/2_SelectionSet/Directive/_defer.ts
diff --git a/...yers/3_SelectionSet/Directive/_include.ts → ...yers/2_SelectionSet/Directive/_include.ts b/...yers/3_SelectionSet/Directive/_include.ts → ...yers/2_SelectionSet/Directive/_include.ts
diff --git a/src/layers/3_SelectionSet/Directive/_skip.ts → src/layers/2_SelectionSet/Directive/_skip.ts b/src/layers/3_SelectionSet/Directive/_skip.ts → src/layers/2_SelectionSet/Directive/_skip.ts
diff --git a/...ayers/3_SelectionSet/Directive/_stream.ts → ...ayers/2_SelectionSet/Directive/_stream.ts b/...ayers/3_SelectionSet/Directive/_stream.ts → ...ayers/2_SelectionSet/Directive/_stream.ts
diff --git a/src/layers/3_SelectionSet/Directive/defer.ts → src/layers/2_SelectionSet/Directive/defer.ts b/src/layers/3_SelectionSet/Directive/defer.ts → src/layers/2_SelectionSet/Directive/defer.ts
diff --git a/...ayers/3_SelectionSet/Directive/include.ts → ...ayers/2_SelectionSet/Directive/include.ts b/...ayers/3_SelectionSet/Directive/include.ts → ...ayers/2_SelectionSet/Directive/include.ts
diff --git a/src/layers/3_SelectionSet/Directive/skip.ts → src/layers/2_SelectionSet/Directive/skip.ts b/src/layers/3_SelectionSet/Directive/skip.ts → src/layers/2_SelectionSet/Directive/skip.ts
diff --git a/...layers/3_SelectionSet/Directive/stream.ts → ...layers/2_SelectionSet/Directive/stream.ts b/...layers/3_SelectionSet/Directive/stream.ts → ...layers/2_SelectionSet/Directive/stream.ts
diff --git a/src/layers/3_SelectionSet/_.ts → src/layers/2_SelectionSet/_.ts b/src/layers/3_SelectionSet/_.ts → src/layers/2_SelectionSet/_.ts
diff --git a/src/layers/3_SelectionSet/__.ts → src/layers/2_SelectionSet/__.ts b/src/layers/3_SelectionSet/__.ts → src/layers/2_SelectionSet/__.ts
diff --git a/...ctionSet/__snapshots__/print.test.ts.snap → ...ctionSet/__snapshots__/print.test.ts.snap b/...ctionSet/__snapshots__/print.test.ts.snap → ...ctionSet/__snapshots__/print.test.ts.snap
diff --git a/src/layers/3_SelectionSet/_indicator.ts → src/layers/2_SelectionSet/_indicator.ts b/src/layers/3_SelectionSet/_indicator.ts → src/layers/2_SelectionSet/_indicator.ts
diff --git a/src/layers/3_SelectionSet/helpers.ts → src/layers/2_SelectionSet/helpers.ts b/src/layers/3_SelectionSet/helpers.ts → src/layers/2_SelectionSet/helpers.ts
diff --git a/src/layers/3_SelectionSet/indicator.ts → src/layers/2_SelectionSet/indicator.ts b/src/layers/3_SelectionSet/indicator.ts → src/layers/2_SelectionSet/indicator.ts
diff --git a/src/layers/3_SelectionSet/on.ts → src/layers/2_SelectionSet/on.ts b/src/layers/3_SelectionSet/on.ts → src/layers/2_SelectionSet/on.ts
diff --git a/src/layers/3_SelectionSet/print.test.ts → src/layers/2_SelectionSet/print.test.ts b/src/layers/3_SelectionSet/print.test.ts → src/layers/2_SelectionSet/print.test.ts
diff --git a/src/layers/3_SelectionSet/print.ts → src/layers/2_SelectionSet/print.ts b/src/layers/3_SelectionSet/print.ts → src/layers/2_SelectionSet/print.ts
diff --git a/...ayers/3_SelectionSet/runtime/FieldItem.ts → ...ayers/2_SelectionSet/runtime/FieldItem.ts b/...ayers/3_SelectionSet/runtime/FieldItem.ts → ...ayers/2_SelectionSet/runtime/FieldItem.ts
diff --git a/...ayers/3_SelectionSet/runtime/FieldName.ts → ...ayers/2_SelectionSet/runtime/FieldName.ts b/...ayers/3_SelectionSet/runtime/FieldName.ts → ...ayers/2_SelectionSet/runtime/FieldName.ts
diff --git a/src/layers/3_SelectionSet/types.test-d.ts → src/layers/2_SelectionSet/types.test-d.ts b/src/layers/3_SelectionSet/types.test-d.ts → src/layers/2_SelectionSet/types.test-d.ts
diff --git a/src/layers/3_SelectionSet/types.ts → src/layers/2_SelectionSet/types.ts b/src/layers/3_SelectionSet/types.ts → src/layers/2_SelectionSet/types.ts
diff --git a/src/layers/4_ResultSet/__.ts → src/layers/3_ResultSet/__.ts b/src/layers/4_ResultSet/__.ts → src/layers/3_ResultSet/__.ts
diff --git a/src/layers/4_ResultSet/customScalars.ts → src/layers/3_ResultSet/customScalars.ts b/src/layers/4_ResultSet/customScalars.ts → src/layers/3_ResultSet/customScalars.ts
@@ -4,8 +4,8 @@ import { assertArray, mapValues } from '../../lib/prelude.js'
 import type { Object$2, Schema } from '../1_Schema/__.js'
 import { Output } from '../1_Schema/__.js'
 import { readMaybeThunk } from '../1_Schema/core/helpers.js'
-import type { GraphQLObject } from '../4_ResultSet/runtime.js'
-import { assertGraphQLObject } from '../4_ResultSet/runtime.js'
+import type { GraphQLObject } from '../3_ResultSet/runtime.js'
+import { assertGraphQLObject } from '../3_ResultSet/runtime.js'
 
 export const decode = <$Data extends ExecutionResult['data']>(index: Schema.Object$2, data: $Data): $Data => {
   if (!data) return data

diff --git a/src/layers/4_ResultSet/runtime.ts → src/layers/3_ResultSet/runtime.ts b/src/layers/4_ResultSet/runtime.ts → src/layers/3_ResultSet/runtime.ts
diff --git a/src/layers/4_ResultSet/types.test-d.ts → src/layers/3_ResultSet/types.test-d.ts b/src/layers/4_ResultSet/types.test-d.ts → src/layers/3_ResultSet/types.test-d.ts
diff --git a/src/layers/4_ResultSet/types.ts → src/layers/3_ResultSet/types.ts b/src/layers/4_ResultSet/types.ts → src/layers/3_ResultSet/types.ts
@@ -3,8 +3,8 @@ import type { ExcludeNull, GetKeyOr, mergeObjectArray, ValuesOrEmptyObject } fro
 import type { TSError } from '../../lib/TSError.js'
 import type { Schema, SomeField } from '../1_Schema/__.js'
 import type { PickScalarFields } from '../1_Schema/Output/Output.js'
-import type { SelectionSet } from '../3_SelectionSet/__.js'
-import type { PickPositiveNonAliasIndicators } from '../3_SelectionSet/types.js'
+import type { SelectionSet } from '../2_SelectionSet/__.js'
+import type { PickPositiveNonAliasIndicators } from '../2_SelectionSet/types.js'
 
 export type RootViaObject<
   $SelectionSet,

diff --git a/...enerator/__snapshots__/files.test.ts.snap → ...enerator/__snapshots__/files.test.ts.snap b/...enerator/__snapshots__/files.test.ts.snap → ...enerator/__snapshots__/files.test.ts.snap
diff --git a/...ator/__snapshots__/generator.test.ts.snap → ...ator/__snapshots__/generator.test.ts.snap b/...ator/__snapshots__/generator.test.ts.snap → ...ator/__snapshots__/generator.test.ts.snap
diff --git a/src/layers/2_generator/code/Client.ts → src/layers/4_generator/code/Client.ts b/src/layers/2_generator/code/Client.ts → src/layers/4_generator/code/Client.ts
diff --git a/src/layers/2_generator/code/Data.ts → src/layers/4_generator/code/Data.ts b/src/layers/2_generator/code/Data.ts → src/layers/4_generator/code/Data.ts
diff --git a/src/layers/2_generator/code/Error.ts → src/layers/4_generator/code/Error.ts b/src/layers/2_generator/code/Error.ts → src/layers/4_generator/code/Error.ts
diff --git a/...ayers/2_generator/code/MethodsDocument.ts → ...ayers/4_generator/code/MethodsDocument.ts b/...ayers/2_generator/code/MethodsDocument.ts → ...ayers/4_generator/code/MethodsDocument.ts
diff --git a/src/layers/2_generator/code/MethodsRoot.ts → src/layers/4_generator/code/MethodsRoot.ts b/src/layers/2_generator/code/MethodsRoot.ts → src/layers/4_generator/code/MethodsRoot.ts
diff --git a/src/layers/2_generator/code/MethodsSelect.ts → src/layers/4_generator/code/MethodsSelect.ts b/src/layers/2_generator/code/MethodsSelect.ts → src/layers/4_generator/code/MethodsSelect.ts
diff --git a/src/layers/2_generator/code/Scalar.ts → src/layers/4_generator/code/Scalar.ts b/src/layers/2_generator/code/Scalar.ts → src/layers/4_generator/code/Scalar.ts
diff --git a/...ayers/2_generator/code/SchemaBuildtime.ts → ...ayers/4_generator/code/SchemaBuildtime.ts b/...ayers/2_generator/code/SchemaBuildtime.ts → ...ayers/4_generator/code/SchemaBuildtime.ts
diff --git a/src/layers/2_generator/code/SchemaIndex.ts → src/layers/4_generator/code/SchemaIndex.ts b/src/layers/2_generator/code/SchemaIndex.ts → src/layers/4_generator/code/SchemaIndex.ts
diff --git a/src/layers/2_generator/code/SchemaRuntime.ts → src/layers/4_generator/code/SchemaRuntime.ts b/src/layers/2_generator/code/SchemaRuntime.ts → src/layers/4_generator/code/SchemaRuntime.ts
diff --git a/src/layers/2_generator/code/Select.ts → src/layers/4_generator/code/Select.ts b/src/layers/2_generator/code/Select.ts → src/layers/4_generator/code/Select.ts
diff --git a/src/layers/2_generator/code/SelectionSets.ts → src/layers/4_generator/code/SelectionSets.ts b/src/layers/2_generator/code/SelectionSets.ts → src/layers/4_generator/code/SelectionSets.ts
@@ -30,7 +30,7 @@ import {
   StandardScalarTypeTypeScriptMapping,
 } from '../../../lib/graphql.js'
 import type { StandardScalarTypeNames } from '../../../lib/graphql.js'
-import { SelectionSet } from '../../3_SelectionSet/__.js'
+import { SelectionSet } from '../../2_SelectionSet/__.js'
 import { createCodeGenerator, createModuleGenerator } from '../createCodeGenerator.js'
 import {
   getDocumentation,

diff --git a/src/layers/2_generator/code/_.ts → src/layers/4_generator/code/_.ts b/src/layers/2_generator/code/_.ts → src/layers/4_generator/code/_.ts
diff --git a/src/layers/2_generator/code/__.ts → src/layers/4_generator/code/__.ts b/src/layers/2_generator/code/__.ts → src/layers/4_generator/code/__.ts
diff --git a/src/layers/2_generator/code/global.ts → src/layers/4_generator/code/global.ts b/src/layers/2_generator/code/global.ts → src/layers/4_generator/code/global.ts
diff --git a/...layers/2_generator/createCodeGenerator.ts → ...layers/4_generator/createCodeGenerator.ts b/...layers/2_generator/createCodeGenerator.ts → ...layers/4_generator/createCodeGenerator.ts
diff --git a/src/layers/2_generator/files.test.ts → src/layers/4_generator/files.test.ts b/src/layers/2_generator/files.test.ts → src/layers/4_generator/files.test.ts
diff --git a/src/layers/2_generator/files.ts → src/layers/4_generator/files.ts b/src/layers/2_generator/files.ts → src/layers/4_generator/files.ts
diff --git a/src/layers/2_generator/generateCode.ts → src/layers/4_generator/generateCode.ts b/src/layers/2_generator/generateCode.ts → src/layers/4_generator/generateCode.ts
diff --git a/src/layers/2_generator/globalRegistry.ts → src/layers/4_generator/globalRegistry.ts b/src/layers/2_generator/globalRegistry.ts → src/layers/4_generator/globalRegistry.ts
diff --git a/src/layers/2_generator/helpers.ts → src/layers/4_generator/helpers.ts b/src/layers/2_generator/helpers.ts → src/layers/4_generator/helpers.ts
diff --git a/src/layers/2_generator/prelude.ts → src/layers/4_generator/prelude.ts b/src/layers/2_generator/prelude.ts → src/layers/4_generator/prelude.ts
diff --git a/src/layers/5_core/core.ts b/src/layers/5_core/core.ts
@@ -19,9 +19,9 @@ import { mergeRequestInit, searchParamsAppendAll } from '../../lib/http.js'
 import { casesExhausted, throwNull } from '../../lib/prelude.js'
 import { execute } from '../0_functions/execute.js'
 import type { Schema } from '../1_Schema/__.js'
-import { SelectionSet } from '../3_SelectionSet/__.js'
-import type { GraphQLObjectSelection } from '../3_SelectionSet/print.js'
-import * as Result from '../4_ResultSet/customScalars.js'
+import { SelectionSet } from '../2_SelectionSet/__.js'
+import type { GraphQLObjectSelection } from '../2_SelectionSet/print.js'
+import * as Result from '../3_ResultSet/customScalars.js'
 import type { GraffleExecutionResultVar } from '../6_client/client.js'
 import type { Config } from '../6_client/Settings/Config.js'
 import {

diff --git a/src/layers/5_select/select.ts b/src/layers/5_select/select.ts
@@ -1,5 +1,5 @@
 import { identityProxy } from '../../lib/prelude.js'
-import type { GlobalRegistry } from '../2_generator/globalRegistry.js'
+import type { GlobalRegistry } from '../4_generator/globalRegistry.js'
 
 // dprint-ignore
 type Create = <$Name extends GlobalRegistry.SchemaNames>(name: $Name) =>

diff --git a/src/layers/6_client/Settings/Config.ts b/src/layers/6_client/Settings/Config.ts
@@ -1,7 +1,7 @@
 import type { RequireProperties, StringKeyof } from '../../../lib/prelude.js'
 import type { Schema } from '../../1_Schema/__.js'
-import type { GlobalRegistry } from '../../2_generator/globalRegistry.js'
-import type { AliasInput } from '../../3_SelectionSet/types.js'
+import type { AliasInput } from '../../2_SelectionSet/types.js'
+import type { GlobalRegistry } from '../../4_generator/globalRegistry.js'
 import type { Transport } from '../../5_core/types.js'
 import type { ConfigGetOutputError } from '../handleOutput.js'
 import type { TransportHttpInput } from '../transportHttp/request.js'

diff --git a/src/layers/6_client/Settings/Input.ts b/src/layers/6_client/Settings/Input.ts
@@ -1,6 +1,6 @@
 import type { GraphQLSchema } from 'graphql'
 import type { Schema } from '../../1_Schema/__.js'
-import type { GlobalRegistry } from '../../2_generator/globalRegistry.js'
+import type { GlobalRegistry } from '../../4_generator/globalRegistry.js'
 import type { WithInput } from './inputIncrementable/inputIncrementable.js'
 
 export type URLInput = URL | string

diff --git a/src/layers/6_client/Settings/InputToConfig.ts b/src/layers/6_client/Settings/InputToConfig.ts
@@ -1,6 +1,6 @@
 import type { IsUnknown } from 'type-fest'
 import type { ConfigManager } from '../../../lib/prelude.js'
-import type { GlobalRegistry } from '../../2_generator/globalRegistry.js'
+import type { GlobalRegistry } from '../../4_generator/globalRegistry.js'
 import { Transport, type TransportHttp, type TransportMemory } from '../../5_core/types.js'
 import { defaultMethodMode } from '../transportHttp/request.js'
 import { type Config, outputConfigDefault } from './Config.js'

diff --git a/src/layers/6_client/Settings/inputIncrementable/inputIncrementable.ts b/src/layers/6_client/Settings/inputIncrementable/inputIncrementable.ts
@@ -1,4 +1,4 @@
-import type { GlobalRegistry } from '../../../2_generator/globalRegistry.js'
+import type { GlobalRegistry } from '../../../4_generator/globalRegistry.js'
 import type { Transport, TransportMemory } from '../../../5_core/types.js'
 import type { TransportHttpInput } from '../../transportHttp/request.js'
 import type { Config } from '../Config.js'

diff --git a/src/layers/6_client/Settings/inputIncrementable/output.ts b/src/layers/6_client/Settings/inputIncrementable/output.ts
@@ -1,4 +1,4 @@
-import type { GlobalRegistry } from '../../../2_generator/globalRegistry.js'
+import type { GlobalRegistry } from '../../../4_generator/globalRegistry.js'
 import type { OutputChannel, OutputChannelConfig } from '../Config.js'
 import type { InputOutputEnvelopeLonghand } from '../Input.js'
 import type { IncrementableInputContext } from './inputIncrementable.js'

diff --git a/src/layers/6_client/client.raw.test-d.ts b/src/layers/6_client/client.raw.test-d.ts
@@ -3,7 +3,7 @@ import { describe, expectTypeOf } from 'vitest'
 import { test } from '../../../tests/_/helpers.js'
 import { Graffle } from '../../../tests/_/schema/generated/__.js'
 import { schema } from '../../../tests/_/schema/schema.js'
-import { gql } from '../0_functions/gql.js'
+import { gql } from '../6_helpers/gql.js'
 import type { RawResolveOutputReturnRootType } from './handleOutput.js'
 
 const g = Graffle.create({ schema })

diff --git a/src/layers/6_client/client.ts b/src/layers/6_client/client.ts
@@ -10,8 +10,8 @@ import { proxyGet, type SimplifyExceptError } from '../../lib/prelude.js'
 import type { BaseInput, BaseInput_, TypedDocumentString } from '../0_functions/types.js'
 import { Schema } from '../1_Schema/__.js'
 import { readMaybeThunk } from '../1_Schema/core/helpers.js'
-import type { GlobalRegistry } from '../2_generator/globalRegistry.js'
-import type { DocumentObject, GraphQLObjectSelection } from '../3_SelectionSet/print.js'
+import type { DocumentObject, GraphQLObjectSelection } from '../2_SelectionSet/print.js'
+import type { GlobalRegistry } from '../4_generator/globalRegistry.js'
 import { Core } from '../5_core/__.js'
 import { type HookDefEncode } from '../5_core/core.js'
 import { type InterfaceRaw, type TransportHttp } from '../5_core/types.js'

diff --git a/src/layers/6_client/document.ts b/src/layers/6_client/document.ts
@@ -8,9 +8,9 @@ import {
 } from '../../lib/graphql.js'
 import type { FirstNonUnknownNever, IsKeyInObjectOptional, IsTupleMultiple, Values } from '../../lib/prelude.js'
 import type { Schema } from '../1_Schema/__.js'
-import { SelectionSet } from '../3_SelectionSet/__.js'
-import type { Context, DocumentObject } from '../3_SelectionSet/print.js'
-import type { ResultSet } from '../4_ResultSet/__.js'
+import { SelectionSet } from '../2_SelectionSet/__.js'
+import type { Context, DocumentObject } from '../2_SelectionSet/print.js'
+import type { ResultSet } from '../3_ResultSet/__.js'
 import type { ResolveOutputReturnRootType } from './handleOutput.js'
 import type { AddTypenameToSelectedRootTypeResultFields, Config } from './Settings/Config.js'
 

diff --git a/src/layers/6_client/prefilled.ts b/src/layers/6_client/prefilled.ts
@@ -1,7 +1,7 @@
 import type { HasRequiredKeys } from 'type-fest'
 import type { Exact } from '../../lib/prelude.js'
 import type { Schema } from '../1_Schema/__.js'
-import type { GlobalRegistry } from '../2_generator/globalRegistry.js'
+import type { GlobalRegistry } from '../4_generator/globalRegistry.js'
 import { type Client, create } from './client.js'
 import type { InputBase } from './Settings/Input.js'
 import type { InputToConfig } from './Settings/InputToConfig.js'

diff --git a/src/layers/0_functions/gql.ts → src/layers/6_helpers/gql.ts b/src/layers/0_functions/gql.ts → src/layers/6_helpers/gql.ts
diff --git a/tests/_/schemaGenerate.ts b/tests/_/schemaGenerate.ts
@@ -2,8 +2,8 @@ import type { GraphQLSchema } from 'graphql'
 import { printSchema } from 'graphql'
 import fs from 'node:fs/promises'
 import { dirname, join } from 'node:path'
-import { generateFiles } from '../../src/layers/2_generator/files.js'
-import type { OptionsInput } from '../../src/layers/2_generator/generateCode.js'
+import { generateFiles } from '../../src/layers/4_generator/files.js'
+import type { OptionsInput } from '../../src/layers/4_generator/generateCode.js'
 import { schema as schema } from './schema/schema.js'
 import { schema as schemaMutationOnly } from './schemaMutationOnly/schema.js'
 import { schema as schemaQueryOnly } from './schemaQueryOnly/schema.js'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export { generateFiles as generate } from '../layers/2_generator/files.js'
		export { generateFiles as generate } from '../layers/4_generator/files.js'