refactor: move client layer above core (#967)

graffle-js · Jul 5, 2024 · 8efd3b2 · 8efd3b2
1 parent ee3781d
commit 8efd3b2
Show file tree

Hide file tree

Showing 28 changed files with 12 additions and 9 deletions.
diff --git a/src/entrypoints/alpha/_Graffle.ts b/src/entrypoints/alpha/_Graffle.ts
@@ -1,2 +1,2 @@
-export * from '../../layers/5_client/client.js'
+export * from '../../layers/6_client/client.js'
 export * as Scalars from './scalars.js'
diff --git a/src/entrypoints/alpha/client.ts b/src/entrypoints/alpha/client.ts
@@ -1,2 +1,2 @@
-export { Client, create, createPrefilled, Input, InputPrefilled } from '../../layers/5_client/client.js'
 export { create as createSelect, select } from '../../layers/5_select/select.js'
+export { Client, create, createPrefilled, Input, InputPrefilled } from '../../layers/6_client/client.js'
diff --git a/src/layers/0_functions/types.ts b/src/layers/0_functions/types.ts
@@ -1,5 +1,5 @@
 import type { StandardScalarVariables } from '../../lib/graphql.js'
-import type { DocumentInput, OperationNameInput } from '../5_client/types.js'
+import type { DocumentInput, OperationNameInput } from '../6_client/types.js'
 
 export interface BaseInput {
   document: DocumentInput

diff --git a/src/layers/3_SelectionSet/encode.ts b/src/layers/3_SelectionSet/encode.ts
@@ -2,7 +2,7 @@ import { RootTypeName } from '../../lib/graphql.js'
 import { assertArray, assertObject, lowerCaseFirstLetter } from '../../lib/prelude.js'
 import { Schema } from '../1_Schema/__.js'
 import { readMaybeThunk } from '../1_Schema/core/helpers.js'
-import type { ReturnModeType } from '../5_client/Config.js'
+import type { ReturnModeType } from '../6_client/Config.js'
 import type { SelectionSet } from './__.js'
 import { isSelectFieldName } from './helpers.js'
 import { parseClientDirectiveDefer } from './runtime/directives/defer.js'

diff --git a/src/layers/5_core/types.ts b/src/layers/5_core/types.ts
@@ -1,5 +1,5 @@
 import type { Schema } from '../1_Schema/__.js'
-import type { Config } from '../5_client/Config.js'
+import type { Config } from '../6_client/Config.js'
 
 export type Transport = TransportMemory | TransportHttp
 

diff --git a/src/layers/5_createExtension/createExtension.ts b/src/layers/5_createExtension/createExtension.ts
@@ -1,3 +1,3 @@
-import type { Extension } from '../5_client/client.js'
+import type { Extension } from '../6_client/client.js'
 
 export const createExtension = (input: Extension) => input
diff --git a/src/layers/5_client/Config.ts → src/layers/6_client/Config.ts b/src/layers/5_client/Config.ts → src/layers/6_client/Config.ts
diff --git a/src/layers/5_client/RootTypeMethods.ts → src/layers/6_client/RootTypeMethods.ts b/src/layers/5_client/RootTypeMethods.ts → src/layers/6_client/RootTypeMethods.ts
diff --git a/src/layers/5_client/client.batch.test.ts → src/layers/6_client/client.batch.test.ts b/src/layers/5_client/client.batch.test.ts → src/layers/6_client/client.batch.test.ts
diff --git a/...yers/5_client/client.customScalar.test.ts → ...yers/6_client/client.customScalar.test.ts b/...yers/5_client/client.customScalar.test.ts → ...yers/6_client/client.customScalar.test.ts
diff --git a/...layers/5_client/client.document.test-d.ts → ...layers/6_client/client.document.test-d.ts b/...layers/5_client/client.document.test-d.ts → ...layers/6_client/client.document.test-d.ts
diff --git a/src/layers/5_client/client.document.test.ts → src/layers/6_client/client.document.test.ts b/src/layers/5_client/client.document.test.ts → src/layers/6_client/client.document.test.ts
diff --git a/src/layers/5_client/client.error.test-d.ts → src/layers/6_client/client.error.test-d.ts b/src/layers/5_client/client.error.test-d.ts → src/layers/6_client/client.error.test-d.ts
diff --git a/src/layers/5_client/client.extend.test.ts → src/layers/6_client/client.extend.test.ts b/src/layers/5_client/client.extend.test.ts → src/layers/6_client/client.extend.test.ts
@@ -8,7 +8,10 @@ import { oops } from '../../lib/anyware/specHelpers.js'
 const client = Graffle.create({ schema: 'https://foo', returnMode: 'dataAndErrors' })
 const headers = { 'x-foo': 'bar' }
 
-// todo each extension added should copy, not mutate the client
+test('using an extension returns a copy of the client', () => {
+  const client2 = client.use(async () => {})
+  expect(client2 !== client).toBe(true)
+})
 
 describe(`entrypoint pack`, () => {
   test(`can add header`, async ({ fetch }) => {

diff --git a/src/layers/5_client/client.input.test-d.ts → src/layers/6_client/client.input.test-d.ts b/src/layers/5_client/client.input.test-d.ts → src/layers/6_client/client.input.test-d.ts
diff --git a/src/layers/5_client/client.raw.test.ts → src/layers/6_client/client.raw.test.ts b/src/layers/5_client/client.raw.test.ts → src/layers/6_client/client.raw.test.ts
diff --git a/...yers/5_client/client.returnMode.test-d.ts → ...yers/6_client/client.returnMode.test-d.ts b/...yers/5_client/client.returnMode.test-d.ts → ...yers/6_client/client.returnMode.test-d.ts
diff --git a/...layers/5_client/client.returnMode.test.ts → ...layers/6_client/client.returnMode.test.ts b/...layers/5_client/client.returnMode.test.ts → ...layers/6_client/client.returnMode.test.ts
diff --git a/...5_client/client.rootTypeMethods.test-d.ts → ...6_client/client.rootTypeMethods.test-d.ts b/...5_client/client.rootTypeMethods.test-d.ts → ...6_client/client.rootTypeMethods.test-d.ts
diff --git a/...s/5_client/client.rootTypeMethods.test.ts → ...s/6_client/client.rootTypeMethods.test.ts b/...s/5_client/client.rootTypeMethods.test.ts → ...s/6_client/client.rootTypeMethods.test.ts
diff --git a/src/layers/5_client/client.test.ts → src/layers/6_client/client.test.ts b/src/layers/5_client/client.test.ts → src/layers/6_client/client.test.ts
diff --git a/src/layers/5_client/client.ts → src/layers/6_client/client.ts b/src/layers/5_client/client.ts → src/layers/6_client/client.ts
diff --git a/src/layers/5_client/document.ts → src/layers/6_client/document.ts b/src/layers/5_client/document.ts → src/layers/6_client/document.ts
diff --git a/src/layers/5_client/types.ts → src/layers/6_client/types.ts b/src/layers/5_client/types.ts → src/layers/6_client/types.ts
diff --git a/...layers/6_extensions/Upload/Upload.test.ts → ...layers/7_extensions/Upload/Upload.test.ts b/...layers/6_extensions/Upload/Upload.test.ts → ...layers/7_extensions/Upload/Upload.test.ts
@@ -10,7 +10,7 @@ import { Graffle } from '../../../entrypoints/alpha/main.js'
 import { Upload } from './Upload.js'
 
 import { createYoga } from 'graphql-yoga'
-import type { Client } from '../../5_client/client.js'
+import type { Client } from '../../6_client/client.js'
 
 let server: Server
 let port: number

diff --git a/src/layers/6_extensions/Upload/Upload.ts → src/layers/7_extensions/Upload/Upload.ts b/src/layers/6_extensions/Upload/Upload.ts → src/layers/7_extensions/Upload/Upload.ts
diff --git a/...ayers/6_extensions/Upload/extractFiles.ts → ...ayers/7_extensions/Upload/extractFiles.ts b/...ayers/6_extensions/Upload/extractFiles.ts → ...ayers/7_extensions/Upload/extractFiles.ts
diff --git a/tests/_/helpers.ts b/tests/_/helpers.ts
@@ -11,7 +11,7 @@ interface Fixtures {
 }
 
 import { Graffle } from '../../src/entrypoints/alpha/main.js'
-import type { Client } from '../../src/layers/5_client/client.js'
+import type { Client } from '../../src/layers/6_client/client.js'
 
 export const test = testBase.extend<Fixtures>({
   // @ts-expect-error https://github.com/vitest-dev/vitest/discussions/5710