refactor(generator): raise to external pos (#1205)

jasonkuhrt · web-flow · commit 78549439f316 · 2024-10-19T09:50:15.000-04:00
* refactor(generator): raise to external pos

* test

* fix bin path

* chmod path
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "packageManager": "pnpm@9.12.2",
   "type": "module",
   "bin": {
-    "graffle": "./build/cli/generate.js"
+    "graffle": "./build/generator/cli/generate.js"
   },
   "exports": {
     ".": {
@@ -84,7 +84,7 @@
     "check:publint": "publint run --strict",
     "prepublishOnly": "pnpm build",
     "build:docs": "doctoc README.md --notitle && dprint fmt README.md",
-    "build": "pnpm clean && pnpm tsc --project tsconfig.build.json && chmod +x ./build/cli/generate.js",
+    "build": "pnpm clean && pnpm tsc --project tsconfig.build.json && chmod +x ./build/generator/cli/generate.js",
     "clean": "tsc --build --clean && rm -rf build",
     "test:unit": "vitest --exclude tests/examples",
     "test:examples": "vitest --config vitest.examples.config.ts --dir tests/examples",
diff --git a/src/entrypoints/_Generator.ts b/src/entrypoints/_Generator.ts
@@ -1,2 +1,2 @@
-export { generate } from '../layers/4_generator/_.js'
-export { create } from '../layers/4_generator/configFile/builder.js'
+export { generate } from '../generator/_.js'
+export { create } from '../generator/configFile/builder.js'
diff --git a/src/entrypoints/extensionkit.ts b/src/entrypoints/extensionkit.ts
@@ -1,2 +1,2 @@
-export { createExtension as createGeneratorExtension } from '../layers/4_generator/extension/create.js'
+export { createExtension as createGeneratorExtension } from '../generator/extension/create.js'
 export { createExtension } from '../layers/6_client/extension/extension.js'
diff --git a/src/entrypoints/utilities-for-generated.ts b/src/entrypoints/utilities-for-generated.ts
@@ -1,14 +1,14 @@
 export { type Simplify } from 'type-fest'
 export { type SchemaDrivenDataMap } from '../extensions/CustomScalars/schemaDrivenDataMap/__.js'
+export { type Schema as SchemaIndexBase } from '../generator/generators/Schema.js'
 export * from '../layers/2_Select/__.js'
-export { type Schema as SchemaIndexBase } from '../layers/4_generator/generators/Schema.js'
-export { type GlobalRegistry } from '../layers/4_generator/GlobalRegistry.js'
 export type {
   ConfigGetOutputError,
   HandleOutput,
   HandleOutputGraffleRootField,
 } from '../layers/6_client/handleOutput.js'
 export { type DocumentRunner } from '../layers/6_client/requestMethods/document.js'
 export type { Config } from '../layers/6_client/Settings/Config.js'
+export { type GlobalRegistry } from '../layers/GlobalRegistry.js'
 export { type Exact, type ExactNonEmpty, type UnionExpanded } from '../lib/prelude.js'
 export { TypeFunction } from '../lib/type-function/__.js'
diff --git a/src/extensions/CustomScalars/schemaDrivenDataMap/generator.ts b/src/extensions/CustomScalars/schemaDrivenDataMap/generator.ts
@@ -1,8 +1,8 @@
-import type { Config } from '../../../layers/4_generator/config/config.js'
-import { ModuleGeneratorScalar } from '../../../layers/4_generator/generators/Scalar.js'
-import { createModuleGenerator } from '../../../layers/4_generator/helpers/moduleGenerator.js'
-import { createCodeGenerator } from '../../../layers/4_generator/helpers/moduleGeneratorRunner.js'
-import { title1 } from '../../../layers/4_generator/helpers/render.js'
+import type { Config } from '../../../generator/config/config.js'
+import { ModuleGeneratorScalar } from '../../../generator/generators/Scalar.js'
+import { createModuleGenerator } from '../../../generator/helpers/moduleGenerator.js'
+import { createCodeGenerator } from '../../../generator/helpers/moduleGeneratorRunner.js'
+import { title1 } from '../../../generator/helpers/render.js'
 import { Code } from '../../../lib/Code.js'
 import { Grafaid } from '../../../lib/grafaid/__.js'
 import { entries } from '../../../lib/prelude.js'
diff --git a/src/extensions/SchemaErrors/generator.ts b/src/extensions/SchemaErrors/generator.ts
@@ -1,5 +1,5 @@
 import { createGeneratorExtension } from '../../entrypoints/extensionkit.js'
-import type { Config as GeneratorConfig } from '../../layers/4_generator/config/config.js'
+import type { Config as GeneratorConfig } from '../../generator/config/config.js'
 import { Code } from '../../lib/Code.js'
 import { ConfigManager } from '../../lib/config-manager/__.js'
 import { Grafaid } from '../../lib/grafaid/__.js'
diff --git a/src/extensions/SchemaErrors/global.ts b/src/extensions/SchemaErrors/global.ts
@@ -1,4 +1,4 @@
-import type { GlobalRegistry } from '../../layers/4_generator/GlobalRegistry.js'
+import type { GlobalRegistry } from '../../layers/GlobalRegistry.js'
 
 declare global {
   namespace GraffleGlobal {
diff --git a/src/generator/_.ts b/src/generator/_.ts
diff --git a/src/generator/__.ts b/src/generator/__.ts
diff --git a/src/generator/cli/generate.ts b/src/generator/cli/generate.ts
@@ -3,9 +3,9 @@
 import { Command } from '@molt/command'
 import * as Path from 'node:path'
 import { z } from 'zod'
-import { Generator } from '../layers/4_generator/__.js'
-import { toAbsolutePath } from '../lib/fs.js'
-import { isError, urlParseSafe } from '../lib/prelude.js'
+import { toAbsolutePath } from '../../lib/fs.js'
+import { isError, urlParseSafe } from '../../lib/prelude.js'
+import { Generator } from '../__.js'
 
 const args = Command.create().description(`Generate a type safe GraphQL client.`)
   .parameter(
diff --git a/src/generator/config/__snapshots__/config.test.ts.snap b/src/generator/config/__snapshots__/config.test.ts.snap
diff --git a/src/generator/config/config.test.ts b/src/generator/config/config.test.ts
@@ -1,5 +1,5 @@
 import { expect } from 'vitest'
-import { test } from '../../../../tests/_/helpers.js'
+import { test } from '../../../tests/_/helpers.js'
 import { createConfig } from './config.js'
 
 test(`can load schema from custom path`, async () => {
diff --git a/src/generator/config/config.ts b/src/generator/config/config.ts
@@ -1,16 +1,16 @@
 import fs from 'node:fs/promises'
 import * as Path from 'node:path'
-import { Graffle } from '../../../entrypoints/__Graffle.js'
-import { Introspection } from '../../../entrypoints/extensions.js'
-import { ConfigManager } from '../../../lib/config-manager/__.js'
-import { fileExists, isPathToADirectory, toAbsolutePath, toFilePath } from '../../../lib/fs.js'
-import { Grafaid } from '../../../lib/grafaid/__.js'
-import { isString } from '../../../lib/prelude.js'
+import { Graffle } from '../../entrypoints/__Graffle.js'
+import { Introspection } from '../../entrypoints/extensions.js'
+import { ConfigManager } from '../../lib/config-manager/__.js'
+import { fileExists, isPathToADirectory, toAbsolutePath, toFilePath } from '../../lib/fs.js'
+import { Grafaid } from '../../lib/grafaid/__.js'
+import { isString } from '../../lib/prelude.js'
 import {
   type Formatter,
   getTypescriptFormatterOrPassthrough,
   passthroughFormatter,
-} from '../../../lib/typescript-formatter.js'
+} from '../../lib/typescript-formatter.js'
 import type { Extension } from '../extension/types.js'
 import { defaultLibraryPaths } from './defaults.js'
 import { defaultName } from './defaults.js'
diff --git a/src/generator/config/defaults.ts b/src/generator/config/defaults.ts
diff --git a/src/generator/config/input.ts b/src/generator/config/input.ts
@@ -1,4 +1,4 @@
-import type { Grafaid } from '../../../lib/grafaid/__.js'
+import type { Grafaid } from '../../lib/grafaid/__.js'
 import type { Extension } from '../extension/types.js'
 
 export interface InputLint {
diff --git a/src/generator/configFile/_.ts b/src/generator/configFile/_.ts
diff --git a/src/generator/configFile/builder.ts b/src/generator/configFile/builder.ts
diff --git a/src/generator/configFile/loader.ts b/src/generator/configFile/loader.ts
@@ -1,8 +1,8 @@
 import * as Path from 'node:path'
-import { Errors } from '../../../lib/errors/__.js'
-import { isPathToADirectory, toAbsolutePath } from '../../../lib/fs.js'
-import { importFirst } from '../../../lib/import-first.js'
-import { isError } from '../../../lib/prelude.js'
+import { Errors } from '../../lib/errors/__.js'
+import { isPathToADirectory, toAbsolutePath } from '../../lib/fs.js'
+import { importFirst } from '../../lib/import-first.js'
+import { isError } from '../../lib/prelude.js'
 import { type Builder, isBuilder } from './builder.js'
 
 interface Config {
diff --git a/src/generator/extension/create.ts b/src/generator/extension/create.ts
diff --git a/src/generator/extension/types.ts b/src/generator/extension/types.ts
@@ -1,5 +1,5 @@
-import type { Code } from '../../../lib/Code.js'
-import type { Grafaid } from '../../../lib/grafaid/__.js'
+import type { Code } from '../../lib/Code.js'
+import type { Grafaid } from '../../lib/grafaid/__.js'
 import type { Config } from '../config/config.js'
 
 export interface Extension {
diff --git a/src/generator/generator/__snapshots__/generate.test.ts.snap b/src/generator/generator/__snapshots__/generate.test.ts.snap
@@ -1220,6 +1220,18 @@ export namespace Schema {
   //
   //
 
+  // todo generate code like this:
+  export interface DateInterface2 extends $.Interface {
+    name: 'DateInterface1'
+    implementors: [DateObject1]
+    fields: {
+      date1: {
+        inlineType: [0]
+        namedType: $Scalar.Date
+      }
+    }
+  }
+
   export type DateInterface1 = $.Interface<'DateInterface1', {
     date1: $.Field<'date1', $.Output.Nullable<$Scalar.Date>, null>
   }, [DateObject1]>
diff --git a/src/generator/generator/generate.test.ts b/src/generator/generator/generate.test.ts
diff --git a/src/generator/generator/generate.ts b/src/generator/generator/generate.ts
@@ -1,5 +1,5 @@
 import fs from 'node:fs/promises'
-import { ModuleGeneratorSchemaDrivenDataMap } from '../../../extensions/CustomScalars/schemaDrivenDataMap/generator.js'
+import { ModuleGeneratorSchemaDrivenDataMap } from '../../extensions/CustomScalars/schemaDrivenDataMap/generator.js'
 import { createConfig } from '../config/config.js'
 import type { Input } from '../config/input.js'
 import { ModuleGenerator_ } from '../generators/_.js'
diff --git a/src/generator/generators/Client.ts b/src/generator/generators/Client.ts
@@ -1,4 +1,4 @@
-import { ModuleGeneratorSchemaDrivenDataMap } from '../../../extensions/CustomScalars/schemaDrivenDataMap/generator.js'
+import { ModuleGeneratorSchemaDrivenDataMap } from '../../extensions/CustomScalars/schemaDrivenDataMap/generator.js'
 import { createModuleGenerator } from '../helpers/moduleGenerator.js'
 import { ModuleGeneratorData } from './Data.js'
 
diff --git a/src/generator/generators/Data.ts b/src/generator/generators/Data.ts
diff --git a/src/generator/generators/MethodsDocument.ts b/src/generator/generators/MethodsDocument.ts
diff --git a/src/generator/generators/MethodsRoot.ts b/src/generator/generators/MethodsRoot.ts
@@ -1,5 +1,5 @@
 // todo remove use of Utils.Aug when schema errors not in use
-import { Grafaid } from '../../../lib/grafaid/__.js'
+import { Grafaid } from '../../lib/grafaid/__.js'
 import { createModuleGenerator } from '../helpers/moduleGenerator.js'
 import { createCodeGenerator } from '../helpers/moduleGeneratorRunner.js'
 import { renderDocumentation, renderName } from '../helpers/render.js'
diff --git a/src/generator/generators/MethodsSelect.ts b/src/generator/generators/MethodsSelect.ts
@@ -1,5 +1,5 @@
 // todo jsdoc
-import { Grafaid } from '../../../lib/grafaid/__.js'
+import { Grafaid } from '../../lib/grafaid/__.js'
 import { createModuleGenerator } from '../helpers/moduleGenerator.js'
 import { renderName, title1 } from '../helpers/render.js'
 import { ModuleGeneratorSelectionSets } from './SelectionSets.js'
diff --git a/src/generator/generators/Scalar.ts b/src/generator/generators/Scalar.ts
@@ -1,4 +1,4 @@
-import { Grafaid } from '../../../lib/grafaid/__.js'
+import { Grafaid } from '../../lib/grafaid/__.js'
 import { createModuleGenerator } from '../helpers/moduleGenerator.js'
 import { typeTitle2 } from '../helpers/render.js'
 
diff --git a/src/generator/generators/Schema.ts b/src/generator/generators/Schema.ts
@@ -1,10 +1,10 @@
-import type { SchemaDrivenDataMap } from '../../../entrypoints/utilities-for-generated.js'
-import { Code } from '../../../lib/Code.js'
-import { Grafaid } from '../../../lib/grafaid/__.js'
-import { entries, isObjectEmpty, values } from '../../../lib/prelude.js'
-import type { SchemaKit } from '../../1_Schema/__.js'
+import type { SchemaDrivenDataMap } from '../../entrypoints/utilities-for-generated.js'
+import type { SchemaKit } from '../../layers/1_Schema/__.js'
+import type { GlobalRegistry } from '../../layers/GlobalRegistry.js'
+import { Code } from '../../lib/Code.js'
+import { Grafaid } from '../../lib/grafaid/__.js'
+import { entries, isObjectEmpty, values } from '../../lib/prelude.js'
 import type { Config } from '../config/config.js'
-import type { GlobalRegistry } from '../GlobalRegistry.js'
 import { identifiers } from '../helpers/identifiers.js'
 import { createModuleGenerator } from '../helpers/moduleGenerator.js'
 import { createCodeGenerator } from '../helpers/moduleGeneratorRunner.js'
diff --git a/src/generator/generators/Select.ts b/src/generator/generators/Select.ts
diff --git a/src/generator/generators/SelectionSets.test-d.ts b/src/generator/generators/SelectionSets.test-d.ts
@@ -1,5 +1,5 @@
 import { assertType, test } from 'vitest'
-import type * as SelectionSets from '../../../../tests/_/schemas/kitchen-sink/graffle/modules/SelectionSets.js'
+import type * as SelectionSets from '../../../tests/_/schemas/kitchen-sink/graffle/modules/SelectionSets.js'
 
 type Q = SelectionSets.Query
 
diff --git a/src/generator/generators/SelectionSets.ts b/src/generator/generators/SelectionSets.ts
@@ -1,11 +1,11 @@
 // todo: generate in JSDoc how the feature maps to GQL syntax.
 // todo: on union fields, JSDoc that mentions the syntax `on*`
 
-import { Code } from '../../../lib/Code.js'
-import { Grafaid } from '../../../lib/grafaid/__.js'
-import { analyzeArgsNullability } from '../../../lib/grafaid/schema/args.js'
-import { RootTypeName } from '../../../lib/grafaid/schema/schema.js'
-import { Select } from '../../2_Select/__.js'
+import { Select } from '../../layers/2_Select/__.js'
+import { Code } from '../../lib/Code.js'
+import { Grafaid } from '../../lib/grafaid/__.js'
+import { analyzeArgsNullability } from '../../lib/grafaid/schema/args.js'
+import { RootTypeName } from '../../lib/grafaid/schema/schema.js'
 import { createModuleGenerator } from '../helpers/moduleGenerator.js'
 import { createCodeGenerator } from '../helpers/moduleGeneratorRunner.js'
 import { getDocumentation, renderDocumentation, renderName, title1, typeTitle2SelectionSet } from '../helpers/render.js'
diff --git a/src/generator/generators/_.ts b/src/generator/generators/_.ts
@@ -1,4 +1,4 @@
-import { ModuleGeneratorSchemaDrivenDataMap } from '../../../extensions/CustomScalars/schemaDrivenDataMap/generator.js'
+import { ModuleGeneratorSchemaDrivenDataMap } from '../../extensions/CustomScalars/schemaDrivenDataMap/generator.js'
 import { createModuleGenerator } from '../helpers/moduleGenerator.js'
 import { ModuleGeneratorClient } from './Client.js'
 import { ModuleGeneratorSelect } from './Select.js'
diff --git a/src/generator/generators/__.ts b/src/generator/generators/__.ts
@@ -1,4 +1,4 @@
-import { capitalizeFirstLetter } from '../../../lib/prelude.js'
+import { capitalizeFirstLetter } from '../../lib/prelude.js'
 import { defaultName } from '../config/defaults.js'
 import { createModuleGenerator } from '../helpers/moduleGenerator.js'
 import { ModuleGenerator_ } from './_.js'
diff --git a/src/generator/generators/global.ts b/src/generator/generators/global.ts
@@ -1,4 +1,4 @@
-import { Code } from '../../../lib/Code.js'
+import { Code } from '../../lib/Code.js'
 import { identifiers } from '../helpers/identifiers.js'
 import { createModuleGenerator } from '../helpers/moduleGenerator.js'
 import { ModuleGeneratorData } from './Data.js'
diff --git a/src/generator/helpers/identifiers.ts b/src/generator/helpers/identifiers.ts
diff --git a/src/generator/helpers/moduleGenerator.ts b/src/generator/helpers/moduleGenerator.ts
diff --git a/src/generator/helpers/moduleGeneratorRunner.ts b/src/generator/helpers/moduleGeneratorRunner.ts
diff --git a/src/generator/helpers/render.ts b/src/generator/helpers/render.ts
@@ -1,7 +1,7 @@
-import { Code } from '../../../lib/Code.js'
-import { Grafaid } from '../../../lib/grafaid/__.js'
-import { getNodeDisplayName } from '../../../lib/grafaid/graphql.js'
-import { borderThickFullWidth, borderThinFullWidth, centerTo } from '../../../lib/text.js'
+import { Code } from '../../lib/Code.js'
+import { Grafaid } from '../../lib/grafaid/__.js'
+import { getNodeDisplayName } from '../../lib/grafaid/graphql.js'
+import { borderThickFullWidth, borderThinFullWidth, centerTo } from '../../lib/text.js'
 import type { Config } from '../config/config.js'
 
 export const title1 = (title: string, subTitle?: string) => {
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 '../../../../4_generator/GlobalRegistry.js'
+import type { GlobalRegistry } from '../../../../GlobalRegistry.js'
 import type { Codec, Mapper } from './codec.js'
 import { JavaScriptScalarCodecs } from './nativeScalarCodecs.js'
 
diff --git a/src/layers/3_InferResult/Alias.ts b/src/layers/3_InferResult/Alias.ts
@@ -1,7 +1,7 @@
+import type { Schema } from '../../generator/generators/Schema.js'
 import type { mergeObjectArray, ValuesOrEmptyObject } from '../../lib/prelude.js'
 import type { SchemaKit } from '../1_Schema/__.js'
 import type { Select } from '../2_Select/__.js'
-import type { Schema } from '../4_generator/generators/Schema.js'
 import type { Field } from './Field.js'
 
 // dprint-ignore
diff --git a/src/layers/3_InferResult/Field.ts b/src/layers/3_InferResult/Field.ts
@@ -1,8 +1,8 @@
 import type { Simplify } from 'type-fest'
+import type { Schema } from '../../generator/generators/Schema.js'
 import type { TSErrorDescriptive } from '../../lib/ts-error.js'
 import type { SchemaKit } from '../1_Schema/__.js'
 import type { Select } from '../2_Select/__.js'
-import type { Schema } from '../4_generator/generators/Schema.js'
 import type { Interface } from './Interface.js'
 import type { Object } from './Object.js'
 import type { Union } from './Union.js'
diff --git a/src/layers/3_InferResult/InlineFragment.ts b/src/layers/3_InferResult/InlineFragment.ts
@@ -1,7 +1,7 @@
+import type { Schema } from '../../generator/generators/Schema.js'
 import { type GetKeyOr } from '../../lib/prelude.js'
 import type { SchemaKit } from '../1_Schema/__.js'
 import type { Select } from '../2_Select/__.js'
-import type { Schema } from '../4_generator/generators/Schema.js'
 import type { Object } from './Object.js'
 
 // dprint-ignore
diff --git a/src/layers/3_InferResult/Interface.ts b/src/layers/3_InferResult/Interface.ts
@@ -1,5 +1,5 @@
+import type { Schema } from '../../generator/generators/Schema.js'
 import type { SchemaKit } from '../1_Schema/__.js'
-import type { Schema } from '../4_generator/generators/Schema.js'
 import type { InlineFragmentTypeConditional } from './InlineFragment.js'
 
 // dprint-ignore
diff --git a/src/layers/3_InferResult/Object.ts b/src/layers/3_InferResult/Object.ts
@@ -1,9 +1,9 @@
 import type { Simplify } from 'type-fest'
+import type { Schema } from '../../generator/generators/Schema.js'
 import { type StringKeyof } from '../../lib/prelude.js'
 import type { TSErrorDescriptive } from '../../lib/ts-error.js'
 import type { SchemaKit } from '../1_Schema/__.js'
 import type { Select } from '../2_Select/__.js'
-import type { Schema } from '../4_generator/generators/Schema.js'
 import type { Alias } from './Alias.js'
 import type { Field } from './Field.js'
 import type { ScalarsWildcard } from './ScalarsWildcard.js'
diff --git a/src/layers/3_InferResult/ScalarsWildcard.ts b/src/layers/3_InferResult/ScalarsWildcard.ts
@@ -1,5 +1,5 @@
+import type { Schema } from '../../generator/generators/Schema.js'
 import type { SchemaKit } from '../1_Schema/__.js'
-import type { Schema } from '../4_generator/generators/Schema.js'
 import type { Field } from './Field.js'
 
 export type ScalarsWildcard<
diff --git a/src/layers/3_InferResult/Union.ts b/src/layers/3_InferResult/Union.ts
@@ -1,5 +1,5 @@
+import type { Schema } from '../../generator/generators/Schema.js'
 import type { SchemaKit } from '../1_Schema/__.js'
-import type { Schema } from '../4_generator/generators/Schema.js'
 import type { InlineFragmentTypeConditional } from './InlineFragment.js'
 
 // dprint-ignore
diff --git a/src/layers/3_InferResult/root.ts b/src/layers/3_InferResult/root.ts
@@ -1,6 +1,6 @@
+import type { Schema } from '../../generator/generators/Schema.js'
 import { type ExcludeNull } from '../../lib/prelude.js'
 import type { SchemaKit } from '../1_Schema/__.js'
-import type { Schema } from '../4_generator/generators/Schema.js'
 import type { Object } from './Object.js'
 
 export type RootViaObject<
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 '../4_generator/GlobalRegistry.js'
+import type { GlobalRegistry } from '../GlobalRegistry.js'
 
 // dprint-ignore
 type Create = <$Name extends GlobalRegistry.ClientNames>(name: $Name) =>
diff --git a/src/layers/6_client/Settings/Config.ts b/src/layers/6_client/Settings/Config.ts
@@ -1,8 +1,8 @@
 import type { GraphQLSchema } from 'graphql'
 import type { SchemaDrivenDataMap } from '../../../extensions/CustomScalars/schemaDrivenDataMap/__.js'
 import type { RequireProperties } from '../../../lib/prelude.js'
-import type { GlobalRegistry } from '../../4_generator/GlobalRegistry.js'
 import type { TransportHttp, TransportMemory } from '../../5_request/types.js'
+import type { GlobalRegistry } from '../../GlobalRegistry.js'
 import type { Extension } from '../extension/extension.js'
 import type { TransportHttpInput } from '../transportHttp/request.js'
 import type { InputStatic } from './Input.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 { SchemaDrivenDataMap } from '../../../extensions/CustomScalars/schemaDrivenDataMap/__.js'
-import type { GlobalRegistry } from '../../4_generator/GlobalRegistry.js'
+import type { GlobalRegistry } from '../../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,7 +1,7 @@
 import type { IsUnknown } from 'type-fest'
 import type { ConfigManager } from '../../../lib/config-manager/__.js'
-import type { GlobalRegistry } from '../../4_generator/GlobalRegistry.js'
 import { Transport } from '../../5_request/types.js'
+import type { GlobalRegistry } from '../../GlobalRegistry.js'
 import { defaultMethodMode } from '../transportHttp/request.js'
 import { outputConfigDefault, type TransportConfigHttp, type TransportConfigMemory } from './Config.js'
 import type { InputOutputEnvelopeLonghand, InputStatic, URLInput } from './Input.js'
diff --git a/src/layers/6_client/Settings/inputIncrementable/inputIncrementable.ts b/src/layers/6_client/Settings/inputIncrementable/inputIncrementable.ts
@@ -1,5 +1,5 @@
-import type { GlobalRegistry } from '../../../4_generator/GlobalRegistry.js'
 import type { Transport, TransportMemory } from '../../../5_request/types.js'
+import type { GlobalRegistry } from '../../../GlobalRegistry.js'
 import type { TransportHttpInput } from '../../transportHttp/request.js'
 import type { Config } from '../Config.js'
 import type { NormalizeInput } from '../InputToConfig.js'
diff --git a/src/layers/6_client/extension/extension.ts b/src/layers/6_client/extension/extension.ts
@@ -4,8 +4,8 @@ import type { AssertConstraint } from '../../../lib/prelude.js'
 import type { TypeFunction } from '../../../lib/type-function/__.js'
 import type { Fn } from '../../../lib/type-function/TypeFunction.js'
 import type { Select } from '../../2_Select/__.js'
-import type { GlobalRegistry } from '../../4_generator/GlobalRegistry.js'
 import type { RequestCore } from '../../5_request/__.js'
+import type { GlobalRegistry } from '../../GlobalRegistry.js'
 import type { Client } from '../client.js'
 import type { GraffleExecutionResultEnvelope } from '../handleOutput.js'
 import type { Config } from '../Settings/Config.js'
diff --git a/src/layers/6_client/handleOutput.ts b/src/layers/6_client/handleOutput.ts
@@ -9,8 +9,8 @@ import {
   type GetOrNever,
   type Values,
 } from '../../lib/prelude.js'
-import type { GlobalRegistry } from '../4_generator/GlobalRegistry.js'
 import type { TransportHttp } from '../5_request/types.js'
+import type { GlobalRegistry } from '../GlobalRegistry.js'
 import type { RunTypeHookOnRequestResult } from './extension/extension.js'
 import type { State } from './fluent.js'
 import {
diff --git a/src/layers/6_client/prefilled.ts b/src/layers/6_client/prefilled.ts
diff --git a/src/layers/6_client/requestMethods/document.ts b/src/layers/6_client/requestMethods/document.ts
diff --git a/src/layers/6_client/requestMethods/requestMethods.ts b/src/layers/6_client/requestMethods/requestMethods.ts
diff --git a/src/layers/GlobalRegistry.ts b/src/layers/GlobalRegistry.ts
diff --git a/tests/_/schemas/generate.ts b/tests/_/schemas/generate.ts
diff --git a/tests/_/schemas/kitchen-sink/graffle/modules/Schema.ts b/tests/_/schemas/kitchen-sink/graffle/modules/Schema.ts

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-export { createExtension as createGeneratorExtension } from '../layers/4_generator/extension/create.js'`
	`1`	`+export { createExtension as createGeneratorExtension } from '../generator/extension/create.js'`
`2`	`2`	`export { createExtension } from '../layers/6_client/extension/extension.js'`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { GlobalRegistry } from '../../layers/4_generator/GlobalRegistry.js'`
	`1`	`+import type { GlobalRegistry } from '../../layers/GlobalRegistry.js'`
`2`	`2`
`3`	`3`	`declare global {`
`4`	`4`	`namespace GraffleGlobal {`