inline listTypeInfoName and other loops

keystonejs · Apr 4, 2024 · 722a6b5 · 722a6b5
1 parent 2fae918
commit 722a6b5
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 41 deletions.
diff --git a/examples/custom-output-paths/my-types.ts b/examples/custom-output-paths/my-types.ts
@@ -138,7 +138,6 @@ type ResolvedPostCreateInput = {
   content?: import('./node_modules/.myprisma/client').Prisma.PostCreateInput['content']
   publishDate?: import('./node_modules/.myprisma/client').Prisma.PostCreateInput['publishDate']
 }
-
 type ResolvedPostUpdateInput = {
   id?: undefined
   title?: import('./node_modules/.myprisma/client').Prisma.PostUpdateInput['title']

diff --git a/examples/extend-graphql-schema-nexus/keystone-types.ts b/examples/extend-graphql-schema-nexus/keystone-types.ts
@@ -220,7 +220,6 @@ type ResolvedPostCreateInput = {
   publishDate?: import('./node_modules/.myprisma/client').Prisma.PostCreateInput['publishDate']
   author?: import('./node_modules/.myprisma/client').Prisma.PostCreateInput['author']
 }
-
 type ResolvedPostUpdateInput = {
   id?: undefined
   title?: import('./node_modules/.myprisma/client').Prisma.PostUpdateInput['title']
@@ -229,13 +228,11 @@ type ResolvedPostUpdateInput = {
   publishDate?: import('./node_modules/.myprisma/client').Prisma.PostUpdateInput['publishDate']
   author?: import('./node_modules/.myprisma/client').Prisma.PostUpdateInput['author']
 }
-
 type ResolvedAuthorCreateInput = {
   id?: import('./node_modules/.myprisma/client').Prisma.AuthorCreateInput['id']
   name?: import('./node_modules/.myprisma/client').Prisma.AuthorCreateInput['name']
   posts?: import('./node_modules/.myprisma/client').Prisma.AuthorCreateInput['posts']
 }
-
 type ResolvedAuthorUpdateInput = {
   id?: undefined
   name?: import('./node_modules/.myprisma/client').Prisma.AuthorUpdateInput['name']

diff --git a/packages/core/src/lib/typescript-schema-printer.ts b/packages/core/src/lib/typescript-schema-printer.ts
@@ -186,42 +186,8 @@ export function printGeneratedTypes (
   graphQLSchema: GraphQLSchema,
   lists: Record<string, InitialisedList>
 ) {
-  const interimCreateUpdateTypes = []
-  const listsTypeInfo = []
-  const listsNamespaces = []
   prismaClientPath = stringify(prismaClientPath).replace(/'/g, `\\'`)
 
-  for (const [listKey, list] of Object.entries(lists)) {
-    const listTypeInfoName = `Lists.${listKey}.TypeInfo<Session>`
-
-    if (list.graphql.isEnabled.create) {
-      interimCreateUpdateTypes.push(
-        printInterimType(
-          prismaClientPath,
-          list,
-          listKey,
-          list.graphql.names.createInputName,
-          'Create'
-        )
-      )
-    }
-
-    if (list.graphql.isEnabled.update) {
-      interimCreateUpdateTypes.push(
-        printInterimType(
-          prismaClientPath,
-          list,
-          listKey,
-          list.graphql.names.updateInputName,
-          'Update'
-        )
-      )
-    }
-
-    listsTypeInfo.push(`    readonly ${listKey}: ${listTypeInfoName}`)
-    listsNamespaces.push(printListTypeInfo(prismaClientPath, listKey, list))
-  }
-
   return [
     '/* eslint-disable */',
     '',
@@ -235,17 +201,47 @@ export function printGeneratedTypes (
       Decimal: `import('@keystone-6/core/types').Decimal | string`,
     }),
     '',
-    interimCreateUpdateTypes.join('\n\n'),
+    ...(function* () {
+      for (const [listKey, list] of Object.entries(lists)) {
+        if (list.graphql.isEnabled.create) {
+          yield printInterimType(
+            prismaClientPath,
+            list,
+            listKey,
+            list.graphql.names.createInputName,
+            'Create'
+          )
+        }
+
+        if (list.graphql.isEnabled.update) {
+          yield printInterimType(
+            prismaClientPath,
+            list,
+            listKey,
+            list.graphql.names.updateInputName,
+            'Update'
+          )
+        }
+      }
+    }()),
     '',
     'export declare namespace Lists {',
-    ...listsNamespaces,
+    ...(function* () {
+      for (const [listKey, list] of Object.entries(lists)) {
+        yield printListTypeInfo(prismaClientPath, listKey, list)
+      }
+    })(),
     '}',
     `export type Context<Session = any> = import('@keystone-6/core/types').KeystoneContext<TypeInfo<Session>>`,
     `export type Config<Session = any> = import('@keystone-6/core/types').KeystoneConfig<TypeInfo<Session>>`,
     '',
     'export type TypeInfo<Session = any> = {',
     `  lists: {`,
-    ...listsTypeInfo,
+    ...(function* () {
+      for (const listKey in lists) {
+        yield `    readonly ${listKey}: Lists.${listKey}.TypeInfo<Session>`
+      }
+    })(),
     `  }`,
     `  prisma: import('${prismaClientPath}').PrismaClient`,
     `  session: Session`,