refactor: extensions top level dir (#1194)

graffle-js · Oct 16, 2024 · 5dac1bd · 5dac1bd
1 parent c82d244
commit 5dac1bd
Show file tree

Hide file tree

Showing 56 changed files with 105 additions and 137 deletions.
diff --git a/src/entrypoints/extensions.ts b/src/entrypoints/extensions.ts
@@ -1,5 +1,5 @@
-export { Introspection } from '../layers/7_extensions/Introspection/Introspection.js'
-export { Opentelemetry } from '../layers/7_extensions/Opentelemetry/Opentelemetry.js'
-export { SchemaErrors } from '../layers/7_extensions/SchemaErrors/SchemaErrors.js'
-export { Throws } from '../layers/7_extensions/Throws/Throws.js'
-export { Upload } from '../layers/7_extensions/Upload/Upload.js'
+export { Introspection } from '../extensions/Introspection/Introspection.js'
+export { Opentelemetry } from '../extensions/Opentelemetry/Opentelemetry.js'
+export { SchemaErrors } from '../extensions/SchemaErrors/SchemaErrors.js'
+export { Throws } from '../extensions/Throws/Throws.js'
+export { Upload } from '../extensions/Upload/Upload.js'
diff --git a/src/entrypoints/utilities-for-generated.ts b/src/entrypoints/utilities-for-generated.ts
@@ -1,4 +1,5 @@
 export { type Simplify } from 'type-fest'
+export { type SchemaDrivenDataMap } from '../extensions/CustomScalars/schemaDrivenDataMap/types.js'
 export * from '../layers/2_Select/__.js'
 export { type SchemaIndex as SchemaIndexBase } from '../layers/4_generator/generators/SchemaIndex.js'
 export type {
@@ -8,6 +9,5 @@ export type {
 } 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 SchemaDrivenDataMap } from '../layers/7_extensions/CustomScalars/schemaDrivenDataMap/types.js'
 export { type Exact, type ExactNonEmpty, type UnionExpanded } from '../lib/prelude.js'
 export { TypeFunction } from '../lib/type-function/__.js'
diff --git a/...extensions/CustomScalars/CustomScalars.ts → ...extensions/CustomScalars/CustomScalars.ts b/...extensions/CustomScalars/CustomScalars.ts → ...extensions/CustomScalars/CustomScalars.ts
@@ -1,5 +1,5 @@
-import { normalizeRequestToNode } from '../../../lib/grafaid/request.js'
-import { createExtension } from '../../6_client/extension/extension.js'
+import { createExtension } from '../../layers/6_client/extension/extension.js'
+import { normalizeRequestToNode } from '../../lib/grafaid/request.js'
 import { decodeResultData } from './decode.js'
 import { encodeRequestVariables } from './encode.js'
 

diff --git a/...7_extensions/CustomScalars/decode.test.ts → src/extensions/CustomScalars/decode.test.ts b/...7_extensions/CustomScalars/decode.test.ts → src/extensions/CustomScalars/decode.test.ts
@@ -1,10 +1,10 @@
 import { describe, expect } from 'vitest'
-import { createResponse, test } from '../../../../tests/_/helpers.js'
-import { db } from '../../../../tests/_/schemas/db.js'
-import type { Graffle } from '../../../../tests/_/schemas/kitchen-sink/graffle/__.js'
-import { Grafaid } from '../../../lib/grafaid/__.js'
-import { Select } from '../../2_Select/__.js'
-import { SelectionSetGraphqlMapper } from '../../3_SelectGraphQLMapper/__.js'
+import { createResponse, test } from '../../../tests/_/helpers.js'
+import { db } from '../../../tests/_/schemas/db.js'
+import type { Graffle } from '../../../tests/_/schemas/kitchen-sink/graffle/__.js'
+import { Select } from '../../layers/2_Select/__.js'
+import { SelectionSetGraphqlMapper } from '../../layers/3_SelectGraphQLMapper/__.js'
+import { Grafaid } from '../../lib/grafaid/__.js'
 
 const date0Encoded = db.date0.toISOString()
 

diff --git a/...yers/7_extensions/CustomScalars/decode.ts → src/extensions/CustomScalars/decode.ts b/...yers/7_extensions/CustomScalars/decode.ts → src/extensions/CustomScalars/decode.ts
@@ -1,6 +1,6 @@
 import { Kind } from 'graphql'
-import type { Grafaid } from '../../../lib/grafaid/__.js'
-import { applyCodec } from '../../1_Schema/Hybrid/types/Scalar/Scalar.js'
+import { applyCodec } from '../../layers/1_Schema/Hybrid/types/Scalar/Scalar.js'
+import type { Grafaid } from '../../lib/grafaid/__.js'
 import { SchemaDrivenDataMap } from './schemaDrivenDataMap/types.js'
 
 /**

diff --git a/...7_extensions/CustomScalars/encode.test.ts → src/extensions/CustomScalars/encode.test.ts b/...7_extensions/CustomScalars/encode.test.ts → src/extensions/CustomScalars/encode.test.ts
@@ -1,12 +1,12 @@
 import { expect } from 'vitest'
-import { test } from '../../../../tests/_/helpers.js'
-import { db } from '../../../../tests/_/schemas/db.js'
-import type { Graffle } from '../../../../tests/_/schemas/kitchen-sink/graffle/__.js'
-import { schemaDrivenDataMap } from '../../../../tests/_/schemas/kitchen-sink/graffle/modules/SchemaDrivenDataMap.js'
-import { Spy } from '../../../../tests/_/SpyExtension.js'
-import { Grafaid } from '../../../lib/grafaid/__.js'
-import { Select } from '../../2_Select/__.js'
-import { SelectionSetGraphqlMapper } from '../../3_SelectGraphQLMapper/__.js'
+import { test } from '../../../tests/_/helpers.js'
+import { db } from '../../../tests/_/schemas/db.js'
+import type { Graffle } from '../../../tests/_/schemas/kitchen-sink/graffle/__.js'
+import { schemaDrivenDataMap } from '../../../tests/_/schemas/kitchen-sink/graffle/modules/SchemaDrivenDataMap.js'
+import { Spy } from '../../../tests/_/SpyExtension.js'
+import { Select } from '../../layers/2_Select/__.js'
+import { SelectionSetGraphqlMapper } from '../../layers/3_SelectGraphQLMapper/__.js'
+import { Grafaid } from '../../lib/grafaid/__.js'
 
 const date0Encoded = db.date0.toISOString()
 const date1Encoded = db.date1.toISOString()

diff --git a/...yers/7_extensions/CustomScalars/encode.ts → src/extensions/CustomScalars/encode.ts b/...yers/7_extensions/CustomScalars/encode.ts → src/extensions/CustomScalars/encode.ts
@@ -1,5 +1,5 @@
-import { Grafaid } from '../../../lib/grafaid/__.js'
-import { applyCodec } from '../../1_Schema/Hybrid/types/Scalar/Scalar.js'
+import { applyCodec } from '../../layers/1_Schema/Hybrid/types/Scalar/Scalar.js'
+import { Grafaid } from '../../lib/grafaid/__.js'
 import { SchemaDrivenDataMap } from './schemaDrivenDataMap/types.js'
 
 export const encodeRequestVariables = ({ sddm, request }: {

diff --git a/...mScalars/schemaDrivenDataMap/generator.ts → ...mScalars/schemaDrivenDataMap/generator.ts b/...mScalars/schemaDrivenDataMap/generator.ts → ...mScalars/schemaDrivenDataMap/generator.ts
@@ -1,11 +1,11 @@
-import { Code } from '../../../../lib/Code.js'
-import { Grafaid } from '../../../../lib/grafaid/__.js'
-import { entries } from '../../../../lib/prelude.js'
-import type { Config } from '../../../4_generator/config.js'
-import { ModuleGeneratorScalar } from '../../../4_generator/generators/Scalar.js'
-import { createModuleGenerator } from '../../../4_generator/helpers/moduleGenerator.js'
-import { createCodeGenerator } from '../../../4_generator/helpers/moduleGeneratorRunner.js'
-import { title1 } from '../../../4_generator/helpers/render.js'
+import type { Config } from '../../../layers/4_generator/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 { Code } from '../../../lib/Code.js'
+import { Grafaid } from '../../../lib/grafaid/__.js'
+import { entries } from '../../../lib/prelude.js'
 import { propertyNames, SchemaDrivenDataMap } from './types.js'
 
 const identifiers = {

diff --git a/...ustomScalars/schemaDrivenDataMap/types.ts → ...ustomScalars/schemaDrivenDataMap/types.ts b/...ustomScalars/schemaDrivenDataMap/types.ts → ...ustomScalars/schemaDrivenDataMap/types.ts
@@ -1,5 +1,5 @@
-import type { Grafaid } from '../../../../lib/grafaid/__.js'
-import { Scalar, type Scalar as SchemaScalar } from '../../../1_Schema/_.js'
+import { Scalar, type Scalar as SchemaScalar } from '../../../layers/1_Schema/_.js'
+import type { Grafaid } from '../../../lib/grafaid/__.js'
 
 export const propertyNames = {
   k: `k`,

diff --git a/...extensions/Introspection/Introspection.ts → ...extensions/Introspection/Introspection.ts b/...extensions/Introspection/Introspection.ts → ...extensions/Introspection/Introspection.ts
@@ -1,9 +1,9 @@
 import { getIntrospectionQuery, type IntrospectionQuery } from 'graphql'
-import type { Extension, SimplifyNullable } from '../../../entrypoints/main.js'
-import type { Fluent } from '../../../lib/fluent/__.js'
-import { createExtension } from '../../6_client/extension/extension.js'
-import type { FnParametersProperty } from '../../6_client/fluent.js'
-import type { HandleOutput } from '../../6_client/handleOutput.js'
+import type { Extension, SimplifyNullable } from '../../entrypoints/main.js'
+import { createExtension } from '../../layers/6_client/extension/extension.js'
+import type { FnParametersProperty } from '../../layers/6_client/fluent.js'
+import type { HandleOutput } from '../../layers/6_client/handleOutput.js'
+import type { Fluent } from '../../lib/fluent/__.js'
 import { createConfig, type Input } from './config.js'
 
 /**

diff --git a/...yers/7_extensions/Introspection/config.ts → src/extensions/Introspection/config.ts b/...yers/7_extensions/Introspection/config.ts → src/extensions/Introspection/config.ts
diff --git a/...extensions/Introspection/documentation.md → ...extensions/Introspection/documentation.md b/...extensions/Introspection/documentation.md → ...extensions/Introspection/documentation.md
diff --git a/...extensions/Opentelemetry/Opentelemetry.ts → ...extensions/Opentelemetry/Opentelemetry.ts b/...extensions/Opentelemetry/Opentelemetry.ts → ...extensions/Opentelemetry/Opentelemetry.ts
@@ -1,5 +1,5 @@
 import { trace, type Tracer } from '@opentelemetry/api'
-import { createExtension } from '../../6_client/extension/extension.js'
+import { createExtension } from '../../layers/6_client/extension/extension.js'
 import { createConfig, type Input } from './config.js'
 
 export const Opentelemetry = (input?: Input) => {

diff --git a/...yers/7_extensions/Opentelemetry/config.ts → src/extensions/Opentelemetry/config.ts b/...yers/7_extensions/Opentelemetry/config.ts → src/extensions/Opentelemetry/config.ts
diff --git a/...extensions/Opentelemetry/documentation.md → ...extensions/Opentelemetry/documentation.md b/...extensions/Opentelemetry/documentation.md → ...extensions/Opentelemetry/documentation.md
diff --git a/...nsions/SchemaErrors/SchemaError.test-d.ts → ...nsions/SchemaErrors/SchemaError.test-d.ts b/...nsions/SchemaErrors/SchemaError.test-d.ts → ...nsions/SchemaErrors/SchemaError.test-d.ts
@@ -1,7 +1,7 @@
 import { describe, expectTypeOf, test } from 'vitest'
-import { Graffle } from '../../../../tests/_/schemas/kitchen-sink/graffle/__.js'
-import { schema } from '../../../../tests/_/schemas/kitchen-sink/schema.js'
-import { type Extension } from '../../6_client/extension/extension.js'
+import { Graffle } from '../../../tests/_/schemas/kitchen-sink/graffle/__.js'
+import { schema } from '../../../tests/_/schemas/kitchen-sink/schema.js'
+import { type Extension } from '../../layers/6_client/extension/extension.js'
 import { SchemaErrors } from './SchemaErrors.js'
 
 const g = Graffle.create({ schema }).use(SchemaErrors())

diff --git a/...ensions/SchemaErrors/SchemaErrors.test.ts → ...ensions/SchemaErrors/SchemaErrors.test.ts b/...ensions/SchemaErrors/SchemaErrors.test.ts → ...ensions/SchemaErrors/SchemaErrors.test.ts
@@ -1,16 +1,16 @@
 import { parse } from 'graphql'
 import { describe, expect } from 'vitest'
-import { test } from '../../../../tests/_/helpers.js'
-import { db } from '../../../../tests/_/schemas/db.js'
-import { Graffle } from '../../../../tests/_/schemas/kitchen-sink/graffle/__.js'
-import { schemaDrivenDataMap } from '../../../../tests/_/schemas/kitchen-sink/graffle/modules/SchemaDrivenDataMap.js'
-import type { Query } from '../../../../tests/_/schemas/kitchen-sink/graffle/modules/SelectionSets.js'
-import { schema } from '../../../../tests/_/schemas/kitchen-sink/schema.js'
-import type { Errors } from '../../../lib/errors/__.js'
-import { Select } from '../../2_Select/__.js'
-import { SelectionSetGraphqlMapper } from '../../3_SelectGraphQLMapper/__.js'
-import { graffleMappedToRequest } from '../../5_request/core.js'
-import { injectTypenameOnRootResultFields } from '../../5_request/schemaErrors.js'
+import { test } from '../../../tests/_/helpers.js'
+import { db } from '../../../tests/_/schemas/db.js'
+import { Graffle } from '../../../tests/_/schemas/kitchen-sink/graffle/__.js'
+import { schemaDrivenDataMap } from '../../../tests/_/schemas/kitchen-sink/graffle/modules/SchemaDrivenDataMap.js'
+import type { Query } from '../../../tests/_/schemas/kitchen-sink/graffle/modules/SelectionSets.js'
+import { schema } from '../../../tests/_/schemas/kitchen-sink/schema.js'
+import { Select } from '../../layers/2_Select/__.js'
+import { SelectionSetGraphqlMapper } from '../../layers/3_SelectGraphQLMapper/__.js'
+import { graffleMappedToRequest } from '../../layers/5_request/core.js'
+import { injectTypenameOnRootResultFields } from '../../layers/5_request/schemaErrors.js'
+import type { Errors } from '../../lib/errors/__.js'
 import { SchemaErrors } from './SchemaErrors.js'
 
 const graffle = Graffle

diff --git a/...7_extensions/SchemaErrors/SchemaErrors.ts → src/extensions/SchemaErrors/SchemaErrors.ts b/...7_extensions/SchemaErrors/SchemaErrors.ts → src/extensions/SchemaErrors/SchemaErrors.ts
@@ -1,9 +1,9 @@
-import { Errors } from '../../../lib/errors/__.js'
-import { normalizeRequestToNode } from '../../../lib/grafaid/request.js'
-import { type ExcludeNullAndUndefined, isString } from '../../../lib/prelude.js'
-import { isRecordLikeObject } from '../../../lib/prelude.js'
-import { injectTypenameOnRootResultFields } from '../../5_request/schemaErrors.js'
-import { createExtension, type Extension } from '../../6_client/extension/extension.js'
+import { injectTypenameOnRootResultFields } from '../../layers/5_request/schemaErrors.js'
+import { createExtension, type Extension } from '../../layers/6_client/extension/extension.js'
+import { Errors } from '../../lib/errors/__.js'
+import { normalizeRequestToNode } from '../../lib/grafaid/request.js'
+import { type ExcludeNullAndUndefined, isString } from '../../lib/prelude.js'
+import { isRecordLikeObject } from '../../lib/prelude.js'
 import { SchemaDrivenDataMap } from '../CustomScalars/schemaDrivenDataMap/types.js'
 
 export const SchemaErrors = () => {

diff --git a/..._extensions/SchemaErrors/documentation.md → src/extensions/SchemaErrors/documentation.md b/..._extensions/SchemaErrors/documentation.md → src/extensions/SchemaErrors/documentation.md
diff --git a/...yers/7_extensions/Throws/Throws.test-d.ts → src/extensions/Throws/Throws.test-d.ts b/...yers/7_extensions/Throws/Throws.test-d.ts → src/extensions/Throws/Throws.test-d.ts
diff --git a/...layers/7_extensions/Throws/Throws.test.ts → src/extensions/Throws/Throws.test.ts b/...layers/7_extensions/Throws/Throws.test.ts → src/extensions/Throws/Throws.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, test } from 'vitest'
-import { db } from '../../../../tests/_/schemas/db.js'
-import { Graffle } from '../../../../tests/_/schemas/kitchen-sink/graffle/__.js'
-import { schema } from '../../../../tests/_/schemas/kitchen-sink/schema.js'
+import { db } from '../../../tests/_/schemas/db.js'
+import { Graffle } from '../../../tests/_/schemas/kitchen-sink/graffle/__.js'
+import { schema } from '../../../tests/_/schemas/kitchen-sink/schema.js'
 import { Throws } from './Throws.js'
 
 const graffle = Graffle.create({ schema }).use(Throws()).throws()

diff --git a/src/layers/7_extensions/Throws/Throws.ts → src/extensions/Throws/Throws.ts b/src/layers/7_extensions/Throws/Throws.ts → src/extensions/Throws/Throws.ts
@@ -1,9 +1,9 @@
-import { type BuilderConfig, createExtension, type Extension, type WithInput } from '../../../entrypoints/main.js'
-import type { ConfigManager } from '../../../lib/config-manager/__.js'
+import { type BuilderConfig, createExtension, type Extension, type WithInput } from '../../entrypoints/main.js'
+import type { ConfigManager } from '../../lib/config-manager/__.js'
 // todo: no deep imports, rethink these utilities and/or how they are exported from the graffle package.
-import type { Fluent } from '../../../lib/fluent/__.js'
-import type { IncrementWthNewConfig } from '../../6_client/client.js'
-import type { FnParametersProperty } from '../../6_client/fluent.js'
+import type { IncrementWthNewConfig } from '../../layers/6_client/client.js'
+import type { FnParametersProperty } from '../../layers/6_client/fluent.js'
+import type { Fluent } from '../../lib/fluent/__.js'
 
 export const Throws = () => {
   return createExtension<ThrowsExtension>({

diff --git a/...yers/7_extensions/Throws/documentation.md → src/extensions/Throws/documentation.md b/...yers/7_extensions/Throws/documentation.md → src/extensions/Throws/documentation.md
diff --git a/...layers/7_extensions/Upload/Upload.test.ts → src/extensions/Upload/Upload.test.ts b/...layers/7_extensions/Upload/Upload.test.ts → src/extensions/Upload/Upload.test.ts
@@ -2,13 +2,13 @@
 // @vitest-environment node
 
 import { afterAll, beforeAll, beforeEach, expect, test } from 'vitest'
-import { schema } from '../../../../tests/_/schemas/upload/schema.js'
-import { Graffle } from '../../../entrypoints/main.js'
+import { schema } from '../../../tests/_/schemas/upload/schema.js'
+import { Graffle } from '../../entrypoints/main.js'
 import { Upload } from './Upload.js'
 
-import { type SchemaService, serveSchema } from '../../../../tests/_/lib/serveSchema.js'
-import type { Client } from '../../6_client/client.js'
-import type { OutputConfigDefault, TransportConfigHttp } from '../../6_client/Settings/Config.js'
+import { type SchemaService, serveSchema } from '../../../tests/_/lib/serveSchema.js'
+import type { Client } from '../../layers/6_client/client.js'
+import type { OutputConfigDefault, TransportConfigHttp } from '../../layers/6_client/Settings/Config.js'
 
 let schemaServer: SchemaService
 

diff --git a/src/layers/7_extensions/Upload/Upload.ts → src/extensions/Upload/Upload.ts b/src/layers/7_extensions/Upload/Upload.ts → src/extensions/Upload/Upload.ts
@@ -1,5 +1,5 @@
-import { createExtension } from '../../../entrypoints/main.js'
-import type { Variables } from '../../../lib/grafaid/graphql.js'
+import { createExtension } from '../../entrypoints/main.js'
+import type { Variables } from '../../lib/grafaid/graphql.js'
 import { createBody } from './createBody.js'
 
 /**

diff --git a/src/layers/7_extensions/Upload/createBody.ts → src/extensions/Upload/createBody.ts b/src/layers/7_extensions/Upload/createBody.ts → src/extensions/Upload/createBody.ts
@@ -1,4 +1,4 @@
-import type { RequestConfig } from '../../../lib/grafaid/http/http.js'
+import type { RequestConfig } from '../../lib/grafaid/http/http.js'
 import extractFiles from './extractFiles.js'
 
 export const createBody = (input: RequestConfig): FormData => {

diff --git a/...yers/7_extensions/Upload/documentation.md → src/extensions/Upload/documentation.md b/...yers/7_extensions/Upload/documentation.md → src/extensions/Upload/documentation.md
diff --git a/...ayers/7_extensions/Upload/extractFiles.ts → src/extensions/Upload/extractFiles.ts b/...ayers/7_extensions/Upload/extractFiles.ts → src/extensions/Upload/extractFiles.ts
diff --git a/src/layers/3_SelectGraphQLMapper/context.ts b/src/layers/3_SelectGraphQLMapper/context.ts
@@ -1,6 +1,6 @@
+import type { SchemaDrivenDataMap } from '../../extensions/CustomScalars/schemaDrivenDataMap/types.js'
 import type { Grafaid } from '../../lib/grafaid/__.js'
 import { Nodes } from '../../lib/grafaid/_Nodes.js'
-import type { SchemaDrivenDataMap } from '../7_extensions/CustomScalars/schemaDrivenDataMap/types.js'
 import { inferVariableType } from './inferVariableType.js'
 import type { Options } from './nodes/1_Document.js'
 

diff --git a/src/layers/3_SelectGraphQLMapper/inferVariableType.ts b/src/layers/3_SelectGraphQLMapper/inferVariableType.ts
@@ -1,5 +1,5 @@
-import { isScalar } from '../1_Schema/Hybrid/types/Scalar/Scalar.js'
-import type { SchemaDrivenDataMap } from '../7_extensions/CustomScalars/schemaDrivenDataMap/types.js'
+import type { SchemaDrivenDataMap } from '../../extensions/CustomScalars/schemaDrivenDataMap/types.js'
+import { isScalar } from '../../layers/1_Schema/Hybrid/types/Scalar/Scalar.js'
 
 /**
  * Infer the type of a variable for the given argument.

diff --git a/src/layers/3_SelectGraphQLMapper/mapper.ts b/src/layers/3_SelectGraphQLMapper/mapper.ts
@@ -1,4 +1,4 @@
-import type { SchemaDrivenDataMap } from '../7_extensions/CustomScalars/schemaDrivenDataMap/types.js'
+import type { SchemaDrivenDataMap } from '../../extensions/CustomScalars/schemaDrivenDataMap/types.js'
 import type { OperationContext } from './context.js'
 
 export type GraphQLPreOperationMapper<

diff --git a/src/layers/3_SelectGraphQLMapper/nodes/2_OperationDefinition.ts b/src/layers/3_SelectGraphQLMapper/nodes/2_OperationDefinition.ts
@@ -1,7 +1,7 @@
+import type { SchemaDrivenDataMap } from '../../../extensions/CustomScalars/schemaDrivenDataMap/types.js'
 import type { Grafaid } from '../../../lib/grafaid/__.js'
 import { Nodes } from '../../../lib/grafaid/_Nodes.js'
 import type { Select } from '../../2_Select/__.js'
-import type { SchemaDrivenDataMap } from '../../7_extensions/CustomScalars/schemaDrivenDataMap/types.js'
 import { createOperationContext } from '../context.js'
 import { type GraphQLPreOperationMapper } from '../mapper.js'
 import type { Options } from './1_Document.js'

diff --git a/src/layers/3_SelectGraphQLMapper/nodes/3_GraffleSelectionSetRoot.ts b/src/layers/3_SelectGraphQLMapper/nodes/3_GraffleSelectionSetRoot.ts
@@ -1,6 +1,6 @@
+import type { SchemaDrivenDataMap } from '../../../extensions/CustomScalars/schemaDrivenDataMap/types.js'
 import { Nodes } from '../../../lib/grafaid/_Nodes.js'
 import { Select } from '../../2_Select/__.js'
-import type { SchemaDrivenDataMap } from '../../7_extensions/CustomScalars/schemaDrivenDataMap/types.js'
 import { type GraphQLPostOperationMapper } from '../mapper.js'
 import { fromGraffleSelectionObjectLevel } from './4_GraffleSelectionObjectLevel.js'
 

diff --git a/src/layers/3_SelectGraphQLMapper/nodes/4_GraffleSelectionObjectLevel.ts b/src/layers/3_SelectGraphQLMapper/nodes/4_GraffleSelectionObjectLevel.ts
@@ -1,8 +1,8 @@
+import type { SchemaDrivenDataMap } from '../../../extensions/CustomScalars/schemaDrivenDataMap/types.js'
 import type { Grafaid } from '../../../lib/grafaid/__.js'
 import { Nodes } from '../../../lib/grafaid/_Nodes.js'
 import { casesExhausted, isNonNull } from '../../../lib/prelude.js'
 import type { ParsedSelectionObjectLevel } from '../../2_Select/_.js'
-import type { SchemaDrivenDataMap } from '../../7_extensions/CustomScalars/schemaDrivenDataMap/types.js'
 import type { GraphQLPostOperationMapper } from '../mapper.js'
 import { toGraphQLField } from './5_Field.js'
 import { toGraphQLInlineFragments } from './5_InlineFragments.js'

diff --git a/src/layers/3_SelectGraphQLMapper/nodes/5_Field.ts b/src/layers/3_SelectGraphQLMapper/nodes/5_Field.ts
@@ -1,6 +1,6 @@
+import { SchemaDrivenDataMap } from '../../../extensions/CustomScalars/schemaDrivenDataMap/types.js'
 import { Nodes } from '../../../lib/grafaid/_Nodes.js'
 import { Select } from '../../2_Select/__.js'
-import { SchemaDrivenDataMap } from '../../7_extensions/CustomScalars/schemaDrivenDataMap/types.js'
 import type { GraphQLPostOperationMapper } from '../mapper.js'
 import { collectForInlineFragmentLike } from './_collect.js'
 import { toGraphQLArgument } from './Argument.js'

diff --git a/src/layers/3_SelectGraphQLMapper/nodes/5_InlineFragments.ts b/src/layers/3_SelectGraphQLMapper/nodes/5_InlineFragments.ts
@@ -1,7 +1,7 @@
+import type { SchemaDrivenDataMap } from '../../../entrypoints/utilities-for-generated.js'
 import type { Grafaid } from '../../../lib/grafaid/__.js'
 import { Nodes } from '../../../lib/grafaid/_Nodes.js'
 import { Select } from '../../2_Select/__.js'
-import type { SchemaDrivenDataMap } from '../../7_extensions/CustomScalars/schemaDrivenDataMap/types.js'
 import type { GraphQLPostOperationMapper } from '../mapper.js'
 import { collectForInlineFragmentLike } from './_collect.js'
 

diff --git a/src/layers/3_SelectGraphQLMapper/nodes/Argument.ts b/src/layers/3_SelectGraphQLMapper/nodes/Argument.ts
@@ -1,6 +1,6 @@
+import type { SchemaDrivenDataMap } from '../../../extensions/CustomScalars/schemaDrivenDataMap/types.js'
 import { Nodes } from '../../../lib/grafaid/_Nodes.js'
 import { Select } from '../../2_Select/__.js'
-import type { SchemaDrivenDataMap } from '../../7_extensions/CustomScalars/schemaDrivenDataMap/types.js'
 import { type GraphQLPostOperationMapper } from '../mapper.js'
 import { toGraphQLValue } from './Value.js'
 

diff --git a/src/layers/3_SelectGraphQLMapper/nodes/Value.ts b/src/layers/3_SelectGraphQLMapper/nodes/Value.ts
@@ -1,7 +1,7 @@
+import { SchemaDrivenDataMap } from '../../../extensions/CustomScalars/schemaDrivenDataMap/types.js'
 import type { Grafaid } from '../../../lib/grafaid/__.js'
 import { Nodes } from '../../../lib/grafaid/_Nodes.js'
 import type { Scalar } from '../../1_Schema/_.js'
-import { SchemaDrivenDataMap } from '../../7_extensions/CustomScalars/schemaDrivenDataMap/types.js'
 import type { OperationContext } from '../context.js'
 import { type GraphQLPostOperationMapper } from '../mapper.js'
 

diff --git a/src/layers/3_SelectGraphQLMapper/nodes/_collect.ts b/src/layers/3_SelectGraphQLMapper/nodes/_collect.ts
@@ -1,6 +1,6 @@
+import type { SchemaDrivenDataMap } from '../../../extensions/CustomScalars/schemaDrivenDataMap/types.js'
 import type { Grafaid } from '../../../lib/grafaid/__.js'
 import type { Select } from '../../2_Select/__.js'
-import type { SchemaDrivenDataMap } from '../../7_extensions/CustomScalars/schemaDrivenDataMap/types.js'
 import type { GraphQLPostOperationMapper } from '../mapper.js'
 import { fromGraffleSelectionObjectLevel } from './4_GraffleSelectionObjectLevel.js'
 import { toGraphQLDirective } from './Directive.js'

diff --git a/src/layers/4_generator/generate.ts b/src/layers/4_generator/generate.ts
@@ -1,5 +1,5 @@
 import fs from 'node:fs/promises'
-import { ModuleGeneratorSchemaDrivenDataMap } from '../7_extensions/CustomScalars/schemaDrivenDataMap/generator.js'
+import { ModuleGeneratorSchemaDrivenDataMap } from '../../extensions/CustomScalars/schemaDrivenDataMap/generator.js'
 import { type Config, createConfig, type Input } from './config.js'
 import { ModuleGenerator_ } from './generators/_.js'
 import { ModuleGenerator__ } from './generators/__.js'