refactor: organize dirs by layer (#805)

jasonkuhrt · Apr 27, 2024 · 5b13f30 · 5b13f30
1 parent 4f6d3a8
commit 5b13f30
Show file tree

Hide file tree

Showing 109 changed files with 127 additions and 127 deletions.
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 '../generator/files.js'
+import { generateFiles } from '../layers/2_generator/files.js'
 
 const args = Command.create().description(`Generate a type safe GraphQL client.`)
   .parameter(`schema`, z.string().min(1).describe(`File path to where your GraphQL schema is.`))

diff --git a/src/entrypoints/alpha/client.ts b/src/entrypoints/alpha/client.ts
@@ -1,2 +1,2 @@
-export * from '../../client/client.js'
-export { create as createSelect, select } from '../../select.js'
+export * from '../../layers/4_client/client.js'
+export { create as createSelect, select } from '../../layers/4_select/select.js'
diff --git a/src/entrypoints/alpha/scalars.ts b/src/entrypoints/alpha/scalars.ts
@@ -1 +1 @@
-export * from '../../Schema/Hybrid/types/Scalar/Scalar.js'
+export * from '../../layers/1_Schema/Hybrid/types/Scalar/Scalar.js'
diff --git a/src/entrypoints/alpha/schema.ts b/src/entrypoints/alpha/schema.ts
@@ -1,3 +1,3 @@
-export { ResultSet } from '../../client/ResultSet/__.js'
-export { SelectionSet } from '../../client/SelectionSet/__.js'
-export * from '../../Schema/__.js'
+export * from '../../layers/1_Schema/__.js'
+export { ResultSet } from '../../layers/3_IO/ResultSet/__.js'
+export { SelectionSet } from '../../layers/3_IO/SelectionSet/__.js'
diff --git a/src/entrypoints/main.ts b/src/entrypoints/main.ts
@@ -1,18 +1,18 @@
-import { ClientError } from '../raw/classes/ClientError.js'
+import { ClientError } from '../legacy/classes/ClientError.js'
 import {
   type BatchRequestDocument,
   type BatchRequestsExtendedOptions,
   type BatchRequestsOptions,
-} from '../raw/functions/batchRequests.js'
-import type { RequestExtendedOptions } from '../raw/functions/request.js'
-import { request } from '../raw/functions/request.js'
-import type { GraphQLResponse, RequestMiddleware, ResponseMiddleware } from '../raw/helpers/types.js'
-import type { RawRequestOptions, RequestDocument, RequestOptions, Variables } from '../raw/helpers/types.js'
-export { GraphQLClient } from '../raw/classes/GraphQLClient.js'
-export { batchRequests } from '../raw/functions/batchRequests.js'
-export { gql } from '../raw/functions/gql.js'
-export { rawRequest } from '../raw/functions/rawRequest.js'
-export { analyzeDocument } from '../raw/helpers/analyzeDocument.js'
+} from '../legacy/functions/batchRequests.js'
+import type { RequestExtendedOptions } from '../legacy/functions/request.js'
+import { request } from '../legacy/functions/request.js'
+import type { GraphQLResponse, RequestMiddleware, ResponseMiddleware } from '../legacy/helpers/types.js'
+import type { RawRequestOptions, RequestDocument, RequestOptions, Variables } from '../legacy/helpers/types.js'
+export { GraphQLClient } from '../legacy/classes/GraphQLClient.js'
+export { batchRequests } from '../legacy/functions/batchRequests.js'
+export { gql } from '../legacy/functions/gql.js'
+export { rawRequest } from '../legacy/functions/rawRequest.js'
+export { analyzeDocument } from '../legacy/helpers/analyzeDocument.js'
 export {
   BatchRequestDocument,
   BatchRequestsExtendedOptions,

diff --git a/src/Schema/Args.ts → src/layers/1_Schema/Args.ts b/src/Schema/Args.ts → src/layers/1_Schema/Args.ts
diff --git a/src/Schema/Field.ts → src/layers/1_Schema/Field.ts b/src/Schema/Field.ts → src/layers/1_Schema/Field.ts
diff --git a/src/Schema/Hybrid/_.ts → src/layers/1_Schema/Hybrid/_.ts b/src/Schema/Hybrid/_.ts → src/layers/1_Schema/Hybrid/_.ts
diff --git a/src/Schema/Hybrid/__.ts → src/layers/1_Schema/Hybrid/__.ts b/src/Schema/Hybrid/__.ts → src/layers/1_Schema/Hybrid/__.ts
diff --git a/src/Schema/Hybrid/types/Enum.ts → src/layers/1_Schema/Hybrid/types/Enum.ts b/src/Schema/Hybrid/types/Enum.ts → src/layers/1_Schema/Hybrid/types/Enum.ts
diff --git a/src/Schema/Hybrid/types/Scalar/Scalar.ts → ...rs/1_Schema/Hybrid/types/Scalar/Scalar.ts b/src/Schema/Hybrid/types/Scalar/Scalar.ts → ...rs/1_Schema/Hybrid/types/Scalar/Scalar.ts
diff --git a/src/Schema/Hybrid/types/Scalar/__.ts → ...layers/1_Schema/Hybrid/types/Scalar/__.ts b/src/Schema/Hybrid/types/Scalar/__.ts → ...layers/1_Schema/Hybrid/types/Scalar/__.ts
diff --git a/src/Schema/Hybrid/types/Scalar/codec.ts → ...ers/1_Schema/Hybrid/types/Scalar/codec.ts b/src/Schema/Hybrid/types/Scalar/codec.ts → ...ers/1_Schema/Hybrid/types/Scalar/codec.ts
diff --git a/...Hybrid/types/Scalar/nativeScalarCodecs.ts → ...Hybrid/types/Scalar/nativeScalarCodecs.ts b/...Hybrid/types/Scalar/nativeScalarCodecs.ts → ...Hybrid/types/Scalar/nativeScalarCodecs.ts
diff --git a/src/Schema/Input/Input.ts → src/layers/1_Schema/Input/Input.ts b/src/Schema/Input/Input.ts → src/layers/1_Schema/Input/Input.ts
diff --git a/src/Schema/Input/__.ts → src/layers/1_Schema/Input/__.ts b/src/Schema/Input/__.ts → src/layers/1_Schema/Input/__.ts
diff --git a/src/Schema/Input/typeGroups.ts → src/layers/1_Schema/Input/typeGroups.ts b/src/Schema/Input/typeGroups.ts → src/layers/1_Schema/Input/typeGroups.ts
diff --git a/src/Schema/Input/types/InputObject.ts → ...ayers/1_Schema/Input/types/InputObject.ts b/src/Schema/Input/types/InputObject.ts → ...ayers/1_Schema/Input/types/InputObject.ts
diff --git a/src/Schema/Input/types/List.ts → src/layers/1_Schema/Input/types/List.ts b/src/Schema/Input/types/List.ts → src/layers/1_Schema/Input/types/List.ts
diff --git a/src/Schema/Input/types/Nullable.ts → src/layers/1_Schema/Input/types/Nullable.ts b/src/Schema/Input/types/Nullable.ts → src/layers/1_Schema/Input/types/Nullable.ts
diff --git a/src/Schema/Output/Output.ts → src/layers/1_Schema/Output/Output.ts b/src/Schema/Output/Output.ts → src/layers/1_Schema/Output/Output.ts
@@ -1,4 +1,4 @@
-import type { TSError } from '../../lib/TSError.js'
+import type { TSError } from '../../../lib/TSError.js'
 import { readMaybeThunk } from '../core/helpers.js'
 import type { Any, Named } from './typeGroups.js'
 import type { __typename } from './types/__typename.js'

diff --git a/src/Schema/Output/__.ts → src/layers/1_Schema/Output/__.ts b/src/Schema/Output/__.ts → src/layers/1_Schema/Output/__.ts
diff --git a/src/Schema/Output/typeGroups.ts → src/layers/1_Schema/Output/typeGroups.ts b/src/Schema/Output/typeGroups.ts → src/layers/1_Schema/Output/typeGroups.ts
diff --git a/src/Schema/Output/types/Interface.ts → ...layers/1_Schema/Output/types/Interface.ts b/src/Schema/Output/types/Interface.ts → ...layers/1_Schema/Output/types/Interface.ts
diff --git a/src/Schema/Output/types/List.ts → src/layers/1_Schema/Output/types/List.ts b/src/Schema/Output/types/List.ts → src/layers/1_Schema/Output/types/List.ts
diff --git a/src/Schema/Output/types/Nullable.ts → src/layers/1_Schema/Output/types/Nullable.ts b/src/Schema/Output/types/Nullable.ts → src/layers/1_Schema/Output/types/Nullable.ts
diff --git a/src/Schema/Output/types/Object.ts → src/layers/1_Schema/Output/types/Object.ts b/src/Schema/Output/types/Object.ts → src/layers/1_Schema/Output/types/Object.ts
diff --git a/src/Schema/Output/types/Union.ts → src/layers/1_Schema/Output/types/Union.ts b/src/Schema/Output/types/Union.ts → src/layers/1_Schema/Output/types/Union.ts
diff --git a/src/Schema/Output/types/__typename.ts → ...ayers/1_Schema/Output/types/__typename.ts b/src/Schema/Output/types/__typename.ts → ...ayers/1_Schema/Output/types/__typename.ts
diff --git a/src/Schema/_.ts → src/layers/1_Schema/_.ts b/src/Schema/_.ts → src/layers/1_Schema/_.ts
diff --git a/src/Schema/__.ts → src/layers/1_Schema/__.ts b/src/Schema/__.ts → src/layers/1_Schema/__.ts
diff --git a/src/Schema/core/Index.ts → src/layers/1_Schema/core/Index.ts b/src/Schema/core/Index.ts → src/layers/1_Schema/core/Index.ts
@@ -1,4 +1,4 @@
-import type { GlobalRegistry } from '../../globalRegistry.js'
+import type { GlobalRegistry } from '../../2_generator/globalRegistry.js'
 import type { Output } from '../Output/__.js'
 
 export interface Index {

diff --git a/src/Schema/core/Named/NamedType.test-d.ts → ...s/1_Schema/core/Named/NamedType.test-d.ts b/src/Schema/core/Named/NamedType.test-d.ts → ...s/1_Schema/core/Named/NamedType.test-d.ts
diff --git a/src/Schema/core/Named/NamedType.ts → src/layers/1_Schema/core/Named/NamedType.ts b/src/Schema/core/Named/NamedType.ts → src/layers/1_Schema/core/Named/NamedType.ts
@@ -1,4 +1,4 @@
-import type { Digit, Letter } from '../../../lib/prelude.js'
+import type { Digit, Letter } from '../../../../lib/prelude.js'
 
 /**
  * @see http://spec.graphql.org/draft/#sec-Names

diff --git a/src/Schema/core/Named/_.ts → src/layers/1_Schema/core/Named/_.ts b/src/Schema/core/Named/_.ts → src/layers/1_Schema/core/Named/_.ts
diff --git a/src/Schema/core/Named/__.ts → src/layers/1_Schema/core/Named/__.ts b/src/Schema/core/Named/__.ts → src/layers/1_Schema/core/Named/__.ts
diff --git a/src/Schema/core/helpers.ts → src/layers/1_Schema/core/helpers.ts b/src/Schema/core/helpers.ts → src/layers/1_Schema/core/helpers.ts
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
@@ -518,7 +518,7 @@ export namespace Union {
 `;
 
 exports[`schema2 5`] = `
-"export * from '../../../../src/Schema/Hybrid/types/Scalar/Scalar.js'
+"export * from '../../../../src/layers/1_Schema/Hybrid/types/Scalar/Scalar.js'
 export * from '../../customScalarCodecs.js'
 "
 `;

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/generator/code/Error.ts → src/layers/2_generator/code/Error.ts b/src/generator/code/Error.ts → src/layers/2_generator/code/Error.ts
diff --git a/src/generator/code/Index.ts → src/layers/2_generator/code/Index.ts b/src/generator/code/Index.ts → src/layers/2_generator/code/Index.ts
@@ -1,6 +1,6 @@
 import { isUnionType } from 'graphql'
-import { Code } from '../../lib/Code.js'
-import { hasMutation, hasQuery, hasSubscription, unwrapToNamed } from '../../lib/graphql.js'
+import { Code } from '../../../lib/Code.js'
+import { hasMutation, hasQuery, hasSubscription, unwrapToNamed } from '../../../lib/graphql.js'
 import type { Config } from './generateCode.js'
 import { moduleNameSchemaBuildtime } from './SchemaBuildtime.js'
 

diff --git a/src/generator/code/Scalar.ts → src/layers/2_generator/code/Scalar.ts b/src/generator/code/Scalar.ts → src/layers/2_generator/code/Scalar.ts
diff --git a/src/generator/code/SchemaBuildtime.ts → ...ayers/2_generator/code/SchemaBuildtime.ts b/src/generator/code/SchemaBuildtime.ts → ...ayers/2_generator/code/SchemaBuildtime.ts
@@ -8,7 +8,7 @@ import type {
 } from 'graphql'
 import { isEnumType, isListType, isNamedType } from 'graphql'
 import _ from 'json-bigint'
-import { Code } from '../../lib/Code.js'
+import { Code } from '../../../lib/Code.js'
 import type {
   AnyClass,
   AnyField,
@@ -17,15 +17,15 @@ import type {
   Describable,
   NamedNameToClass,
   NameToClassNamedType,
-} from '../../lib/graphql.js'
+} from '../../../lib/graphql.js'
 import {
   getNodeDisplayName,
   isDeprecatableNode,
   isGraphQLOutputField,
   type NameToClass,
   unwrapToNonNull,
-} from '../../lib/graphql.js'
-import { entries, values } from '../../lib/prelude.js'
+} from '../../../lib/graphql.js'
+import { entries, values } from '../../../lib/prelude.js'
 import type { Config } from './generateCode.js'
 
 export const moduleNameSchemaBuildtime = `SchemaBuildtime`

diff --git a/src/generator/code/SchemaRuntime.ts → src/layers/2_generator/code/SchemaRuntime.ts b/src/generator/code/SchemaRuntime.ts → src/layers/2_generator/code/SchemaRuntime.ts
@@ -18,8 +18,8 @@ import {
   isScalarType,
   isUnionType,
 } from 'graphql'
-import type { AnyClass, AnyGraphQLOutputField } from '../../lib/graphql.js'
-import { hasMutation, hasQuery, hasSubscription, unwrapToNamed, unwrapToNonNull } from '../../lib/graphql.js'
+import type { AnyClass, AnyGraphQLOutputField } from '../../../lib/graphql.js'
+import { hasMutation, hasQuery, hasSubscription, unwrapToNamed, unwrapToNonNull } from '../../../lib/graphql.js'
 import type { Config } from './generateCode.js'
 import { moduleNameScalar } from './Scalar.js'
 

diff --git a/src/generator/code/Select.ts → src/layers/2_generator/code/Select.ts b/src/generator/code/Select.ts → src/layers/2_generator/code/Select.ts
diff --git a/src/generator/code/generateCode.ts → src/layers/2_generator/code/generateCode.ts b/src/generator/code/generateCode.ts → src/layers/2_generator/code/generateCode.ts
@@ -2,8 +2,8 @@ import type { Formatter } from '@dprint/formatter'
 import type { GraphQLObjectType, GraphQLSchema } from 'graphql'
 import { buildSchema } from 'graphql'
 import * as Path from 'node:path'
-import type { TypeMapByKind } from '../../lib/graphql.js'
-import { getTypeMapByKind } from '../../lib/graphql.js'
+import type { TypeMapByKind } from '../../../lib/graphql.js'
+import { getTypeMapByKind } from '../../../lib/graphql.js'
 import { generateError } from './Error.js'
 import { generateGlobal } from './global.js'
 import { generateIndex } from './Index.js'

diff --git a/src/generator/code/global.ts → src/layers/2_generator/code/global.ts b/src/generator/code/global.ts → src/layers/2_generator/code/global.ts
diff --git a/src/generator/files.test.ts → src/layers/2_generator/files.test.ts b/src/generator/files.test.ts → src/layers/2_generator/files.test.ts
diff --git a/src/generator/files.ts → src/layers/2_generator/files.ts b/src/generator/files.ts → src/layers/2_generator/files.ts
@@ -3,7 +3,7 @@ import { getPath } from '@dprint/typescript'
 import _ from 'json-bigint'
 import fs from 'node:fs/promises'
 import * as Path from 'node:path'
-import { fileExists } from '../lib/prelude.js'
+import { fileExists } from '../../lib/prelude.js'
 import type { OptionsInput } from './code/generateCode.js'
 import { generateCode, type Input as GenerateInput } from './code/generateCode.js'
 

diff --git a/src/globalRegistry.ts → src/layers/2_generator/globalRegistry.ts b/src/globalRegistry.ts → src/layers/2_generator/globalRegistry.ts
@@ -1,5 +1,5 @@
-import type { TSError } from './lib/TSError.js'
-import type { Schema } from './Schema/__.js'
+import type { TSError } from '../../lib/TSError.js'
+import type { Schema } from '../1_Schema/__.js'
 
 declare global {
   // todo some kind of distinct prefix

diff --git a/src/client/ResultSet/ResultSet.test-d.ts → ...layers/3_IO/ResultSet/ResultSet.test-d.ts b/src/client/ResultSet/ResultSet.test-d.ts → ...layers/3_IO/ResultSet/ResultSet.test-d.ts
@@ -1,8 +1,8 @@
 /* eslint-disable @typescript-eslint/ban-types */
 
 import { expectTypeOf, test } from 'vitest'
-import type { Index } from '../../../tests/_/schema/generated/Index.js'
-import type * as Schema from '../../../tests/_/schema/generated/SchemaBuildtime.js'
+import type { Index } from '../../../../tests/_/schema/generated/Index.js'
+import type * as Schema from '../../../../tests/_/schema/generated/SchemaBuildtime.js'
 import type { SelectionSet } from '../SelectionSet/__.js'
 import type { ResultSet } from './__.js'
 

diff --git a/src/client/ResultSet/ResultSet.ts → src/layers/3_IO/ResultSet/ResultSet.ts b/src/client/ResultSet/ResultSet.ts → src/layers/3_IO/ResultSet/ResultSet.ts
@@ -1,10 +1,10 @@
 /* eslint-disable @typescript-eslint/ban-types */
 
 import type { Simplify } from 'type-fest'
-import type { ExcludeNull, GetKeyOr, SimplifyDeep } from '../../lib/prelude.js'
-import type { TSError } from '../../lib/TSError.js'
-import type { Schema, SomeField } from '../../Schema/__.js'
-import type { PickScalarFields } from '../../Schema/Output/Output.js'
+import type { ExcludeNull, GetKeyOr, SimplifyDeep } from '../../../lib/prelude.js'
+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 '../SelectionSet/__.js'
 
 export type Query<$SelectionSet extends object, $Index extends Schema.Index> = Root<$SelectionSet, $Index, 'Query'>

diff --git a/src/client/ResultSet/__.ts → src/layers/3_IO/ResultSet/__.ts b/src/client/ResultSet/__.ts → src/layers/3_IO/ResultSet/__.ts
diff --git a/...lient/SelectionSet/SelectionSet.test-d.ts → .../3_IO/SelectionSet/SelectionSet.test-d.ts b/...lient/SelectionSet/SelectionSet.test-d.ts → .../3_IO/SelectionSet/SelectionSet.test-d.ts
@@ -1,5 +1,5 @@
 import { assertType, expectTypeOf, test } from 'vitest'
-import type { Index } from '../../../tests/_/schema/generated/Index.js'
+import type { Index } from '../../../../tests/_/schema/generated/Index.js'
 import type { SelectionSet } from './__.js'
 
 type Q = SelectionSet.Query<Index>

diff --git a/src/client/SelectionSet/SelectionSet.ts → src/layers/3_IO/SelectionSet/SelectionSet.ts b/src/client/SelectionSet/SelectionSet.ts → src/layers/3_IO/SelectionSet/SelectionSet.ts
@@ -1,15 +1,15 @@
 /* eslint-disable @typescript-eslint/ban-types */
 
-import type { MaybeList, StringNonEmpty, Values } from '../../lib/prelude.js'
-import type { TSError } from '../../lib/TSError.js'
+import type { MaybeList, StringNonEmpty, Values } from '../../../lib/prelude.js'
+import type { TSError } from '../../../lib/TSError.js'
 import type {
   InputFieldsAllNullable,
   OmitNullableFields,
   PickNullableFields,
   Schema,
   SomeField,
   SomeFields,
-} from '../../Schema/__.js'
+} from '../../1_Schema/__.js'
 
 export type Query<$Index extends Schema.Index> = Root<$Index, 'Query'>
 

diff --git a/src/client/SelectionSet/_.ts → src/layers/3_IO/SelectionSet/_.ts b/src/client/SelectionSet/_.ts → src/layers/3_IO/SelectionSet/_.ts
diff --git a/src/client/SelectionSet/__.ts → src/layers/3_IO/SelectionSet/__.ts b/src/client/SelectionSet/__.ts → src/layers/3_IO/SelectionSet/__.ts
diff --git a/...ts__/toGraphQLDocumentString.test.ts.snap → ...ts__/toGraphQLDocumentString.test.ts.snap b/...ts__/toGraphQLDocumentString.test.ts.snap → ...ts__/toGraphQLDocumentString.test.ts.snap
diff --git a/...ectionSet/toGraphQLDocumentString.test.ts → ...ectionSet/toGraphQLDocumentString.test.ts b/...ectionSet/toGraphQLDocumentString.test.ts → ...ectionSet/toGraphQLDocumentString.test.ts
@@ -1,7 +1,7 @@
 import { parse, print } from 'graphql'
 import { describe, expect, test } from 'vitest'
-import type { Index } from '../../../tests/_/schema/generated/Index.js'
-import { $Index as schemaIndex } from '../../../tests/_/schema/generated/SchemaRuntime.js'
+import type { Index } from '../../../../tests/_/schema/generated/Index.js'
+import { $Index as schemaIndex } from '../../../../tests/_/schema/generated/SchemaRuntime.js'
 import type { SelectionSet } from './__.js'
 import type { Context } from './toGraphQLDocumentString.js'
 import { rootTypeSelectionSet } from './toGraphQLDocumentString.js'

diff --git a/...t/SelectionSet/toGraphQLDocumentString.ts → ...O/SelectionSet/toGraphQLDocumentString.ts b/...t/SelectionSet/toGraphQLDocumentString.ts → ...O/SelectionSet/toGraphQLDocumentString.ts
@@ -1,8 +1,8 @@
-import { RootTypeName } from '../../lib/graphql.js'
-import { lowerCaseFirstLetter } from '../../lib/prelude.js'
-import { Schema } from '../../Schema/__.js'
-import { readMaybeThunk } from '../../Schema/core/helpers.js'
-import type { ReturnModeType } from '../Config.js'
+import { RootTypeName } from '../../../lib/graphql.js'
+import { lowerCaseFirstLetter } from '../../../lib/prelude.js'
+import { Schema } from '../../1_Schema/__.js'
+import { readMaybeThunk } from '../../1_Schema/core/helpers.js'
+import type { ReturnModeType } from '../../4_client/Config.js'
 import type { SelectionSet } from './__.js'
 import { aliasPattern, fragmentPattern } from './SelectionSet.js'
 

diff --git a/src/client/Config.ts → src/layers/4_client/Config.ts b/src/client/Config.ts → src/layers/4_client/Config.ts
@@ -1,8 +1,8 @@
 import type { ExecutionResult } from 'graphql'
-import type { GlobalRegistry } from '../globalRegistry.js'
-import type { GraphQLExecutionResultError } from '../lib/graphql.js'
-import type { SetProperty } from '../lib/prelude.js'
-import type { Schema } from '../Schema/__.js'
+import type { GraphQLExecutionResultError } from '../../lib/graphql.js'
+import type { SetProperty } from '../../lib/prelude.js'
+import type { Schema } from '../1_Schema/__.js'
+import type { GlobalRegistry } from '../2_generator/globalRegistry.js'
 
 export type ReturnModeType =
   | ReturnModeTypeGraphQL

diff --git a/src/client/RootTypeMethods.ts → src/layers/4_client/RootTypeMethods.ts b/src/client/RootTypeMethods.ts → src/layers/4_client/RootTypeMethods.ts
@@ -1,7 +1,9 @@
-import type { OperationName } from '../lib/graphql.js'
-import type { Exact } from '../lib/prelude.js'
-import type { TSError } from '../lib/TSError.js'
-import type { InputFieldsAllNullable, Schema } from '../Schema/__.js'
+import type { OperationName } from '../../lib/graphql.js'
+import type { Exact } from '../../lib/prelude.js'
+import type { TSError } from '../../lib/TSError.js'
+import type { InputFieldsAllNullable, Schema } from '../1_Schema/__.js'
+import type { ResultSet } from '../3_IO/ResultSet/__.js'
+import type { SelectionSet } from '../3_IO/SelectionSet/__.js'
 import type {
   AugmentRootTypeSelectionWithTypename,
   Config,
@@ -10,8 +12,6 @@ import type {
   ReturnModeRootField,
   ReturnModeRootType,
 } from './Config.js'
-import type { ResultSet } from './ResultSet/__.js'
-import type { SelectionSet } from './SelectionSet/__.js'
 
 type RootTypeFieldContext = {
   Config: Config

diff --git a/src/client/client.customScalar.test.ts → ...yers/4_client/client.customScalar.test.ts b/src/client/client.customScalar.test.ts → ...yers/4_client/client.customScalar.test.ts
@@ -1,8 +1,8 @@
 /* eslint-disable */
 import { beforeEach, describe, expect, test } from 'vitest'
-import { db } from '../../tests/_/db.js'
-import { $Index as schemaIndex } from '../../tests/_/schema/generated/SchemaRuntime.js'
-import { setupMockServer } from '../../tests/raw/__helpers.js'
+import { db } from '../../../tests/_/db.js'
+import { $Index as schemaIndex } from '../../../tests/_/schema/generated/SchemaRuntime.js'
+import { setupMockServer } from '../../../tests/legacy/__helpers.js'
 import { create } from './client.js'
 
 const ctx = setupMockServer()

diff --git a/src/client/client.document.test-d.ts → ...layers/4_client/client.document.test-d.ts b/src/client/client.document.test-d.ts → ...layers/4_client/client.document.test-d.ts
@@ -1,7 +1,7 @@
 import { describe, expectTypeOf, test } from 'vitest'
-import * as Schema from '../../tests/_/schema/schema.js'
-import * as SchemaMutationOnly from '../../tests/_/schemaMutationOnly/schema.js'
-import * as SchemaQueryOnly from '../../tests/_/schemaQueryOnly/schema.js'
+import * as Schema from '../../../tests/_/schema/schema.js'
+import * as SchemaMutationOnly from '../../../tests/_/schemaMutationOnly/schema.js'
+import * as SchemaQueryOnly from '../../../tests/_/schemaQueryOnly/schema.js'
 import { create } from './client.js'
 
 const client = create({ schema: Schema.schema, schemaIndex: Schema.$Index })

diff --git a/src/client/client.document.test.ts → src/layers/4_client/client.document.test.ts b/src/client/client.document.test.ts → src/layers/4_client/client.document.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, test } from 'vitest'
-import { db } from '../../tests/_/db.js'
-import { $Index } from '../../tests/_/schema/generated/SchemaRuntime.js'
-import { schema } from '../../tests/_/schema/schema.js'
+import { db } from '../../../tests/_/db.js'
+import { $Index } from '../../../tests/_/schema/generated/SchemaRuntime.js'
+import { schema } from '../../../tests/_/schema/schema.js'
 import { create } from './client.js'
 
 // todo test with custom scalars

diff --git a/src/client/client.error.test-d.ts → src/layers/4_client/client.error.test-d.ts b/src/client/client.error.test-d.ts → src/layers/4_client/client.error.test-d.ts
@@ -1,7 +1,7 @@
 /* eslint-disable */
 import { expectTypeOf, test } from 'vitest'
-import { isError } from '../../tests/_/schema/generated/Error.js'
-import * as Schema from '../../tests/_/schema/schema.js'
+import { isError } from '../../../tests/_/schema/generated/Error.js'
+import * as Schema from '../../../tests/_/schema/schema.js'
 import { create } from './client.js'
 
 const client = create({ schema: Schema.schema, schemaIndex: Schema.$Index })

diff --git a/src/client/client.input.test-d.ts → src/layers/4_client/client.input.test-d.ts b/src/client/client.input.test-d.ts → src/layers/4_client/client.input.test-d.ts
@@ -1,6 +1,6 @@
 import { test } from 'vitest'
-import { $Index } from '../../tests/_/schema/generated/SchemaRuntime.js'
-import { schema } from '../../tests/_/schema/schema.js'
+import { $Index } from '../../../tests/_/schema/generated/SchemaRuntime.js'
+import { schema } from '../../../tests/_/schema/schema.js'
 import { create } from './client.js'
 
 test(`works`, () => {

diff --git a/src/client/client.returnMode.test-d.ts → ...yers/4_client/client.returnMode.test-d.ts b/src/client/client.returnMode.test-d.ts → ...yers/4_client/client.returnMode.test-d.ts
@@ -3,9 +3,9 @@ import { ExecutionResult } from 'graphql'
 import { ObjMap } from 'graphql/jsutils/ObjMap.js'
 import { describe } from 'node:test'
 import { expectTypeOf, test } from 'vitest'
-import { $Index as schemaIndex } from '../../tests/_/schema/generated/SchemaRuntime.js'
-import { schema } from '../../tests/_/schema/schema.js'
-import { GraphQLExecutionResultError } from '../lib/graphql.js'
+import { $Index as schemaIndex } from '../../../tests/_/schema/generated/SchemaRuntime.js'
+import { schema } from '../../../tests/_/schema/schema.js'
+import { GraphQLExecutionResultError } from '../../lib/graphql.js'
 import { create } from './client.js'
 
 // dprint-ignore

diff --git a/src/client/client.returnMode.test.ts → ...layers/4_client/client.returnMode.test.ts b/src/client/client.returnMode.test.ts → ...layers/4_client/client.returnMode.test.ts
@@ -1,9 +1,9 @@
 /* eslint-disable */
 import { describe, expect, test } from 'vitest'
-import { db } from '../../tests/_/db.js'
-import { $Index as schemaIndex } from '../../tests/_/schema/generated/SchemaRuntime.js'
-import { schema } from '../../tests/_/schema/schema.js'
-import { __typename } from '../Schema/_.js'
+import { db } from '../../../tests/_/db.js'
+import { $Index as schemaIndex } from '../../../tests/_/schema/generated/SchemaRuntime.js'
+import { schema } from '../../../tests/_/schema/schema.js'
+import { __typename } from '../1_Schema/_.js'
 import { create } from './client.js'
 
 // dprint-ignore

diff --git a/src/client/client.rootTypeMethods.test-d.ts → ...4_client/client.rootTypeMethods.test-d.ts b/src/client/client.rootTypeMethods.test-d.ts → ...4_client/client.rootTypeMethods.test-d.ts
@@ -1,7 +1,7 @@
 /* eslint-disable */
 import { expectTypeOf, test } from 'vitest'
-import * as Schema from '../../tests/_/schema/schema.js'
-import { GraphQLExecutionResultError } from '../lib/graphql.js'
+import * as Schema from '../../../tests/_/schema/schema.js'
+import { GraphQLExecutionResultError } from '../../lib/graphql.js'
 import { create } from './client.js'
 
 const client = create({ schema: Schema.schema, schemaIndex: Schema.$Index })

diff --git a/src/client/client.rootTypeMethods.test.ts → ...s/4_client/client.rootTypeMethods.test.ts b/src/client/client.rootTypeMethods.test.ts → ...s/4_client/client.rootTypeMethods.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, test } from 'vitest'
-import { db } from '../../tests/_/db.js'
-import * as Schema from '../../tests/_/schema/schema.js'
+import { db } from '../../../tests/_/db.js'
+import * as Schema from '../../../tests/_/schema/schema.js'
 import { create } from './client.js'
 
 const client = create({ schema: Schema.schema, schemaIndex: Schema.$Index })