From a0740f4fa551348b26875abc8e09f39de8e371f1 Mon Sep 17 00:00:00 2001
From: Gautam Singh <5769869+gautamsi@users.noreply.github.com>
Date: Sat, 29 Jun 2024 01:54:51 -0500
Subject: [PATCH] fix test due to injected id field

---
 packages/core/src/lib/createSystem.ts                | 2 +-
 packages/core/src/lib/defaults.ts                    | 4 ++--
 packages/core/src/types/next-fields.ts               | 2 +-
 tests/cli-tests/__snapshots__/artifacts.test.ts.snap | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/core/src/lib/createSystem.ts b/packages/core/src/lib/createSystem.ts
index 615fac636d2..2121bb9a088 100644
--- a/packages/core/src/lib/createSystem.ts
+++ b/packages/core/src/lib/createSystem.ts
@@ -201,7 +201,7 @@ function formatUrl (provider: ResolvedKeystoneConfig['db']['provider'], url: str
 }
 
 export function createSystem (config_: KeystoneConfig | ResolvedKeystoneConfig) {
-  const config = resolveDefaults(config_ as KeystoneConfig)
+  const config = resolveDefaults(config_ as KeystoneConfig, true)
   const lists = initialiseLists(config)
   const adminMeta = createAdminMeta(config, lists)
   const graphQLSchema = createGraphQLSchema(config, lists, adminMeta, false)
diff --git a/packages/core/src/lib/defaults.ts b/packages/core/src/lib/defaults.ts
index 2772e902c00..d3caa91db4c 100644
--- a/packages/core/src/lib/defaults.ts
+++ b/packages/core/src/lib/defaults.ts
@@ -76,7 +76,7 @@ function defaultIsAccessAllowed ({ session, sessionStrategy }: KeystoneContext)
 export async function noop () {}
 function identity<T> (x: T) { return x }
 
-export function resolveDefaults<TypeInfo extends BaseKeystoneTypeInfo> (config: KeystoneConfig<TypeInfo>): ResolvedKeystoneConfig<TypeInfo> {
+export function resolveDefaults<TypeInfo extends BaseKeystoneTypeInfo> (config: KeystoneConfig<TypeInfo>, injectIdField = false): ResolvedKeystoneConfig<TypeInfo> {
   if (!['postgresql', 'sqlite', 'mysql'].includes(config.db.provider)) {
     throw new TypeError(`"db.provider" only supports "sqlite", "postgresql" or "mysql"`)
   }
@@ -126,7 +126,7 @@ export function resolveDefaults<TypeInfo extends BaseKeystoneTypeInfo> (config:
       schemaPath: config.graphql?.schemaPath ?? 'schema.graphql',
       extendGraphqlSchema: config.graphql?.extendGraphqlSchema ?? ((s) => s),
     },
-    lists: injectDefaults(config, defaultIdField),
+    lists: injectIdField ? injectDefaults(config, defaultIdField) : config.lists,
     server: {
       maxFileSize: 200 * 1024 * 1024, // 200 MiB
       extendExpressApp: config.server?.extendExpressApp ?? noop,
diff --git a/packages/core/src/types/next-fields.ts b/packages/core/src/types/next-fields.ts
index fa3cadc1b8d..ab0bf683b5a 100644
--- a/packages/core/src/types/next-fields.ts
+++ b/packages/core/src/types/next-fields.ts
@@ -1,5 +1,5 @@
 import Decimal from 'decimal.js'
-import { graphql } from '..'
+import { graphql } from './schema'
 import { type BaseListTypeInfo } from './type-info'
 import { type CommonFieldConfig } from './config'
 import { type DatabaseProvider } from './core'
diff --git a/tests/cli-tests/__snapshots__/artifacts.test.ts.snap b/tests/cli-tests/__snapshots__/artifacts.test.ts.snap
index 2b31990428e..2702901fbad 100644
--- a/tests/cli-tests/__snapshots__/artifacts.test.ts.snap
+++ b/tests/cli-tests/__snapshots__/artifacts.test.ts.snap
@@ -151,7 +151,7 @@ export declare namespace Lists {
   }
 }
 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 Config<Session = any> = import('@keystone-6/core/types').ResolvedKeystoneConfig<TypeInfo<Session>>
 
 export type TypeInfo<Session = any> = {
   lists: {