rename KeystoneConfig to KeystonePreConfig

examples/custom-output-paths/my-types.ts

@@ -160,7 +160,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').ResolvedKeystoneConfig<TypeInfo<Session>>
+export type Config<Session = any> = import('@keystone-6/core/types').KeystoneConfig<TypeInfo<Session>>
 
 export type TypeInfo<Session = any> = {
   lists: {

examples/custom-session-invalidation/keystone.ts

@@ -1,7 +1,10 @@
 import { config } from '@keystone-6/core'
 import { statelessSessions } from '@keystone-6/core/session'
 import { createAuth } from '@keystone-6/auth'
-import { lists, type Session } from './schema'
+import {
+  type Session,
+  lists,
+} from './schema'
 import type { Config, Context, TypeInfo } from '.keystone/types'
 
 // WARNING: this example is for demonstration purposes only
@@ -32,13 +35,13 @@ const { withAuth } = createAuth({
   sessionData: 'passwordChangedAt',
 })
 
-function withSessionInvalidation (config: Config<Session>) {
+function withSessionInvalidation (config: Config<Session>): Config<Session> {
   const existingSessionStrategy = config.session!
 
   return {
     ...config,
     session: {
-      ...config.session,
+      ...existingSessionStrategy,
       async get ({ context }: { context: Context }): Promise<Session | undefined> {
         const session = await existingSessionStrategy.get({ context })
         if (!session) return

examples/document-field-customisation/keystone-server/keystone.ts

@@ -1,10 +1,10 @@
 import { config } from '@keystone-6/core'
-import type { KeystoneConfig } from '@keystone-6/core/types'
+import type { KeystoneConfigPre } from '@keystone-6/core/types'
 import { seedDatabase } from './src/seed'
 import { lists } from './src/schema'
-import { type Context, type TypeInfo } from '.keystone/types'
+import type { Context, TypeInfo } from '.keystone/types'
 
-const db: KeystoneConfig<TypeInfo>['db'] = {
+const db: KeystoneConfigPre<TypeInfo>['db'] = {
   provider: 'sqlite',
   url: process.env.DATABASE_URL || 'file:./database.db',
   async onConnect (context: Context) {

examples/extend-graphql-schema-nexus/keystone-types.ts

@@ -276,7 +276,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').ResolvedKeystoneConfig<TypeInfo<Session>>
+export type Config<Session = any> = import('@keystone-6/core/types').KeystoneConfig<TypeInfo<Session>>
 
 export type TypeInfo<Session = any> = {
   lists: {

examples/framework-nextjs-two-servers/keystone-server/keystone.ts

@@ -1,10 +1,10 @@
 import { config } from '@keystone-6/core'
-import type { KeystoneConfig } from '@keystone-6/core/types'
+import type { KeystoneConfigPre } from '@keystone-6/core/types'
 import { seedDatabase } from './src/seed'
 import { lists } from './src/schema'
 import type { Context, TypeInfo } from '.keystone/types'
 
-const db: KeystoneConfig<TypeInfo>['db'] = {
+const db: KeystoneConfigPre<TypeInfo>['db'] = {
   provider: 'sqlite',
   url: process.env.DATABASE_URL || 'file:./database.db',
   async onConnect (context: Context) {

packages/auth/src/index.ts

@@ -4,7 +4,7 @@ import type {
   KeystoneContext,
   SessionStrategy,
   BaseKeystoneTypeInfo,
-  ResolvedKeystoneConfig,
+  KeystoneConfig,
 } from '@keystone-6/core/types'
 import { password, timestamp } from '@keystone-6/core/fields'
 
@@ -134,7 +134,7 @@ export function createAuth<ListTypeInfo extends BaseListTypeInfo> ({
   })
 
   function throwIfInvalidConfig<TypeInfo extends BaseKeystoneTypeInfo> (
-    config: ResolvedKeystoneConfig<TypeInfo>
+    config: KeystoneConfig<TypeInfo>
   ) {
     if (!(listKey in config.lists)) {
       throw new Error(`withAuth cannot find the list "${listKey}"`)
@@ -247,8 +247,8 @@ export function createAuth<ListTypeInfo extends BaseListTypeInfo> ({
    * Automatically extends your configuration with a prescriptive implementation.
    */
   function withAuth<TypeInfo extends BaseKeystoneTypeInfo> (
-    config: ResolvedKeystoneConfig<TypeInfo>
-  ): ResolvedKeystoneConfig<TypeInfo> {
+    config: KeystoneConfig<TypeInfo>
+  ): KeystoneConfig<TypeInfo> {
     throwIfInvalidConfig(config)
     let { ui } = config
     if (!ui?.isDisabled) {

packages/core/src/admin-ui/system/generateAdminUI.ts

@@ -7,7 +7,7 @@ import type { GraphQLSchema } from 'graphql'
 import { type Entry, walk as _walk } from '@nodelib/fs.walk'
 import type {
   AdminFileToWrite,
-  ResolvedKeystoneConfig
+  KeystoneConfig
 } from '../../types'
 import { writeAdminFiles } from '../templates'
 import type { AdminMetaRootVal } from '../../lib/create-admin-meta'
@@ -66,7 +66,7 @@ export async function writeAdminFile (file: AdminFileToWrite, projectAdminPath:
 const pageExtensions = new Set(['.js', '.jsx', '.ts', '.tsx'])
 
 export async function generateAdminUI (
-  config: ResolvedKeystoneConfig,
+  config: KeystoneConfig,
   graphQLSchema: GraphQLSchema,
   adminMeta: AdminMetaRootVal,
   projectAdminPath: string,

packages/core/src/admin-ui/templates/index.ts

@@ -1,7 +1,7 @@
 import * as Path from 'path'
-import { type GraphQLSchema } from 'graphql'
-import { type ResolvedKeystoneConfig } from '../../types'
-import { type AdminMetaRootVal } from '../../lib/create-admin-meta'
+import type { GraphQLSchema } from 'graphql'
+import type { KeystoneConfig } from '../../types'
+import type { AdminMetaRootVal } from '../../lib/create-admin-meta'
 import { appTemplate } from './app'
 import { homeTemplate } from './home'
 import { listTemplate } from './list'
@@ -13,7 +13,7 @@ import { nextConfigTemplate } from './next-config'
 const pkgDir = Path.dirname(require.resolve('@keystone-6/core/package.json'))
 
 export function writeAdminFiles (
-  config: ResolvedKeystoneConfig,
+  config: KeystoneConfig,
   graphQLSchema: GraphQLSchema,
   adminMeta: AdminMetaRootVal,
   configFileExists: boolean

packages/core/src/admin-ui/templates/no-access.ts

@@ -1,6 +1,6 @@
-import type { ResolvedKeystoneConfig } from '../../types'
+import type { KeystoneConfig } from '../../types'
 
-export const noAccessTemplate = (session: ResolvedKeystoneConfig['session']) =>
+export const noAccessTemplate = (session: KeystoneConfig['session']) =>
   `import { getNoAccessPage } from '@keystone-6/core/___internal-do-not-use-will-break-in-patch/admin-ui/pages/NoAccessPage';
 
 export default getNoAccessPage(${JSON.stringify({ sessionsEnabled: !!session })})

packages/core/src/context.ts

@@ -1,12 +1,12 @@
 import type {
   BaseKeystoneTypeInfo,
-  ResolvedKeystoneConfig,
+  KeystoneConfig,
   KeystoneContext
 } from './types'
 import { createSystem } from './lib/createSystem'
 
 export function getContext<TypeInfo extends BaseKeystoneTypeInfo> (
-  config: ResolvedKeystoneConfig<TypeInfo>,
+  config: KeystoneConfig<TypeInfo>,
   PrismaModule: unknown
 ): KeystoneContext<TypeInfo> {
   const system = createSystem(config)

packages/core/src/lib/assets/createFilesContext.ts

@@ -1,8 +1,8 @@
 import { randomBytes } from 'node:crypto'
 
-import {
-  type FilesContext,
-  type ResolvedKeystoneConfig,
+import type {
+  FilesContext,
+  KeystoneConfig,
 } from '../../types'
 import { localFileAssetsAPI } from './local'
 import { s3FileAssetsAPI } from './s3'
@@ -21,7 +21,7 @@ function defaultTransformName (path: string) {
   return `${urlSafeName}-${id}`
 }
 
-export function createFilesContext (config: ResolvedKeystoneConfig): FilesContext {
+export function createFilesContext (config: KeystoneConfig): FilesContext {
   const adaptersMap = new Map<string, FileAdapter>()
 
   for (const [storageKey, storageConfig] of Object.entries(config.storage || {})) {

packages/core/src/lib/assets/createImagesContext.ts

@@ -1,9 +1,9 @@
 import { randomBytes } from 'node:crypto'
 import imageSize from 'image-size'
 
-import {
-  type ImagesContext,
-  type ResolvedKeystoneConfig,
+import type {
+  ImagesContext,
+  KeystoneConfig,
 } from '../../types'
 import type { ImageAdapter } from './types'
 import { localImageAssetsAPI } from './local'
@@ -33,7 +33,7 @@ async function getImageMetadataFromBuffer (buffer: Buffer) {
   return { width, height, filesize: buffer.length, extension }
 }
 
-export function createImagesContext (config: ResolvedKeystoneConfig): ImagesContext {
+export function createImagesContext (config: KeystoneConfig): ImagesContext {
   const imageAssetsAPIs = new Map<string, ImageAdapter>()
   for (const [storageKey, storageConfig] of Object.entries(config.storage || {})) {
     if (storageConfig.type === 'image') {

packages/core/src/lib/context/createContext.ts

@@ -1,17 +1,17 @@
-import {
-  type IncomingMessage,
-  type ServerResponse
+import type {
+  IncomingMessage,
+  ServerResponse
 } from 'http'
 import {
   type ExecutionResult,
   type GraphQLSchema,
   graphql,
   print
 } from 'graphql'
-import {
-  type KeystoneContext,
-  type KeystoneGraphQLAPI,
-  type ResolvedKeystoneConfig,
+import type {
+  KeystoneContext,
+  KeystoneGraphQLAPI,
+  KeystoneConfig,
 } from '../../types'
 
 import { type InitialisedList } from '../core/initialise-lists'
@@ -27,7 +27,7 @@ export function createContext ({
   prismaClient,
   prismaTypes
 }: {
-  config: ResolvedKeystoneConfig
+  config: KeystoneConfig
   lists: Record<string, InitialisedList>
   graphQLSchema: GraphQLSchema
   graphQLSchemaSudo: GraphQLSchema

packages/core/src/lib/core/initialise-lists.ts

@@ -1,19 +1,19 @@
 import type { CacheHint } from '@apollo/cache-control-types'
 import { GraphQLString, isInputObjectType } from 'graphql'
-import {
-  type BaseItem,
-  type BaseListTypeInfo,
-  type CacheHintArgs,
-  type FindManyArgs,
-  type GraphQLTypesForList,
-  type ListGraphQLTypes,
-  type ListHooks,
-  type ResolvedKeystoneConfig,
-  type MaybePromise,
-  type NextFieldType,
-  type FieldTypeFunc,
-  QueryMode
+import type {
+  BaseItem,
+  BaseListTypeInfo,
+  CacheHintArgs,
+  FindManyArgs,
+  GraphQLTypesForList,
+  ListGraphQLTypes,
+  ListHooks,
+  KeystoneConfig,
+  MaybePromise,
+  NextFieldType,
+  FieldTypeFunc,
 } from '../../types'
+import { QueryMode } from '../../types'
 import {
   type GraphQLNames,
   __getNames,
@@ -153,7 +153,7 @@ function throwIfNotAFilter (x: unknown, listKey: string, fieldKey: string) {
   throw new Error(`Configuration option '${listKey}.${fieldKey}' must be either a boolean value or a function. Received '${x}'.`)
 }
 
-type ListConfigType = ResolvedKeystoneConfig['lists'][string]
+type ListConfigType = KeystoneConfig['lists'][string]
 type FieldConfigType = ReturnType<FieldTypeFunc<any>>
 type PartiallyInitialisedList1 = { graphql: { isEnabled: IsListEnabled } }
 type PartiallyInitialisedList2 = Omit<InitialisedList, 'lists' | 'resolvedDbFields'>
@@ -374,7 +374,7 @@ function parseFieldHooks (
 }
 
 function getListsWithInitialisedFields (
-  config: ResolvedKeystoneConfig,
+  config: KeystoneConfig,
   listsRef: Record<string, InitialisedList>,
 ) {
   const { storage: configStorage, lists: listsConfig, db: { provider } } = config
@@ -874,7 +874,7 @@ function graphqlForOutputField (field: InitialisedField) {
   })
 }
 
-export function initialiseLists (config: ResolvedKeystoneConfig): Record<string, InitialisedList> {
+export function initialiseLists (config: KeystoneConfig): Record<string, InitialisedList> {
   const listsRef: Record<string, InitialisedList> = {}
   let intermediateLists
 

packages/core/src/lib/core/prisma-schema-printer.ts

@@ -4,7 +4,7 @@ import type {
 } from '../../types'
 import type { ResolvedDBField } from './resolve-relationships'
 import type { InitialisedList } from './initialise-lists'
-import type { ResolvedKeystoneConfig } from '../../types'
+import type { KeystoneConfig } from '../../types'
 import { areArraysEqual, getDBFieldKeyForFieldOnMultiField } from './utils'
 
 const modifiers = {
@@ -181,7 +181,7 @@ function assertDbFieldIsValidForIdField (
 }
 
 export function printPrismaSchema (
-  config: ResolvedKeystoneConfig,
+  config: KeystoneConfig,
   lists: Record<string, InitialisedList>,
 ) {
   const {

packages/core/src/lib/create-admin-meta.ts

@@ -6,7 +6,7 @@ import type {
   MaybeItemFunction,
   MaybePromise,
   MaybeSessionFunction,
-  ResolvedKeystoneConfig,
+  KeystoneConfig,
 } from '../types'
 import type {
   GraphQLNames
@@ -86,7 +86,7 @@ export type AdminMetaRootVal = {
 }
 
 export function createAdminMeta (
-  config: ResolvedKeystoneConfig,
+  config: KeystoneConfig,
   initialisedLists: Record<string, InitialisedList>
 ) {
   const { lists } = config

packages/core/src/lib/createAdminUIMiddleware.ts

@@ -2,16 +2,16 @@ import url from 'url'
 import path from 'path'
 import type express from 'express'
 import type next from 'next'
-import {
-  type KeystoneContext,
-  type ResolvedKeystoneConfig,
+import type {
+  KeystoneContext,
+  KeystoneConfig,
 } from '../types'
 import { pkgDir } from '../pkg-dir'
 
 const adminErrorHTMLFilepath = path.join(pkgDir, 'static', 'admin-error.html')
 
 export function createAdminUIMiddlewareWithNextApp (
-  config: ResolvedKeystoneConfig,
+  config: KeystoneConfig,
   commonContext: KeystoneContext,
   nextApp: ReturnType<typeof next>
 ) {

packages/core/src/lib/createExpressServer.ts

@@ -17,7 +17,7 @@ import { ApolloServerPluginLandingPageLocalDefault } from '@apollo/server/plugin
 import graphqlUploadExpress from 'graphql-upload/graphqlUploadExpress.js'
 import type {
   KeystoneContext,
-  ResolvedKeystoneConfig,
+  KeystoneConfig,
 } from '../types'
 
 /*
@@ -28,7 +28,7 @@ The Admin UI takes a while to build for dev, and is created separately
 so the CLI can bring up the dev server early to handle GraphQL requests.
 */
 
-function formatError (graphqlConfig: ResolvedKeystoneConfig['graphql']) {
+function formatError (graphqlConfig: KeystoneConfig['graphql']) {
   return (formattedError: GraphQLFormattedError, error: unknown) => {
     let debug = graphqlConfig.debug
     if (debug === undefined) {
@@ -50,7 +50,7 @@ function formatError (graphqlConfig: ResolvedKeystoneConfig['graphql']) {
 }
 
 export async function createExpressServer (
-  config: Pick<ResolvedKeystoneConfig, 'graphql' | 'server' | 'storage'>,
+  config: Pick<KeystoneConfig, 'graphql' | 'server' | 'storage'>,
   context: KeystoneContext
 ): Promise<{
   expressServer: express.Express