fix(ts-client): schema import in generated types (#732)

Author: jasonkuhrt

package.json

@@ -13,10 +13,16 @@
         "default": "./build/entrypoints/main.js"
       }
     },
-    "./alpha": {
+    "./alpha/client": {
       "import": {
-        "types": "./build/entrypoints/alpha.d.ts",
-        "default": "./build/entrypoints/alpha.js"
+        "types": "./build/entrypoints/alpha/client.d.ts",
+        "default": "./build/entrypoints/alpha/client.js"
+      }
+    },
+    "./alpha/types": {
+      "import": {
+        "types": "./build/entrypoints/alpha/types.d.ts",
+        "default": "./build/entrypoints/alpha/types.js"
       }
     }
   },

src/Schema/__Schema.ts renamed to src/Schema/_.ts

@@ -1,4 +1,4 @@
-export * as Schema from './__Schema.js'
+export * as Schema from './_.js'
 export { Args, As, Field } from './Field/__.js'
 export { __typename, List, Nullable } from './Field/Type.js'
 export { Index } from './Index.js'

src/Schema/__.ts

@@ -0,0 +1 @@
+export * from '../../client.js'

src/entrypoints/alpha.ts

@@ -0,0 +1 @@
+export * from '../../Schema/__.js'

src/entrypoints/alpha/client.ts

@@ -319,6 +319,7 @@ const scalarTypeMap: Record<string, 'string' | 'number' | 'boolean'> = {
 // high level
 
 interface Input {
+  schemaModulePath?: string
   schemaSource: string
   options?: {
     TSDoc?: {
@@ -362,7 +363,9 @@ export const generateCode = (input: Input) => {
 
   let code = ``
 
-  code += `import type * as _ from '../../../src/Schema/__.js'\n\n`
+  const schemaModulePath = input.schemaModulePath ?? `graphql-client/alpha/schema`
+
+  code += `import type * as _ from ${Code.quote(schemaModulePath)}\n\n`
 
   code += Code.export$(
     Code.namespace(
@@ -443,9 +446,10 @@ export const generateCode = (input: Input) => {
 export const generateFile = async (params: {
   schemaPath: string
   typeScriptPath: string
+  schemaModulePath?: string
 }) => {
   // todo use @dprint/formatter
   const schemaSource = await fs.readFile(params.schemaPath, `utf8`)
-  const code = generateCode({ schemaSource })
+  const code = generateCode({ schemaSource, ...params })
   await fs.writeFile(params.typeScriptPath, code, { encoding: `utf8` })
 }

src/entrypoints/alpha/schema.ts

@@ -1,7 +1,7 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`generates types from GraphQL SDL file 1`] = `
-"import type * as _ from '../../../src/Schema/__.js'
+"import type * as _ from "../../../src/Schema/__.js"
 
 export namespace $ {
 export interface Index {

src/generator/generator.ts

@@ -4,6 +4,7 @@ import { generateFile } from '../../src/generator/generator.js'
 
 test(`generates types from GraphQL SDL file`, async () => {
   await generateFile({
+    schemaModulePath: `../../../src/Schema/__.js`,
     schemaPath: `./tests/builder/_/schema.graphql`,
     typeScriptPath: `./tests/builder/_/schema.ts`,
   })