fix test due to injected id field

keystonejs · Jul 25, 2024 · 068c5d3 · 068c5d3
1 parent f72df60
commit 068c5d3
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/packages/core/src/admin-ui/templates/index.ts b/packages/core/src/admin-ui/templates/index.ts
@@ -1,8 +1,6 @@
 import * as Path from 'path'
 import { type GraphQLSchema } from 'graphql'
-import {
-  type ResolvedKeystoneConfig
-} from '../../types'
+import { type ResolvedKeystoneConfig } from '../../types'
 import { type AdminMetaRootVal } from '../../lib/create-admin-meta'
 import { appTemplate } from './app'
 import { homeTemplate } from './home'
@@ -14,7 +12,8 @@ import { nextConfigTemplate } from './next-config'
 
 const pkgDir = Path.dirname(require.resolve('@keystone-6/core/package.json'))
 
-export function writeAdminFiles (config: ResolvedKeystoneConfig,
+export function writeAdminFiles (
+  config: ResolvedKeystoneConfig,
   graphQLSchema: GraphQLSchema,
   adminMeta: AdminMetaRootVal,
   configFileExists: boolean

diff --git 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
@@ -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
@@ -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
@@ -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: {