change id type for BaseItem to be unknown

keystonejs · Jun 26, 2024 · ad7646d · ad7646d
1 parent 3c413cd
commit ad7646d
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/.changeset/fix-baseitem-id.md b/.changeset/fix-baseitem-id.md
@@ -0,0 +1,5 @@
+----
+'@keystone-6/core': patch
+----
+
+Fixes the type of `id` on type `BaseItem`, to be type `unknown`, not `string` - `string` is not guaranteed
diff --git a/packages/auth/src/gql/getInitFirstItemSchema.ts b/packages/auth/src/gql/getInitFirstItemSchema.ts
@@ -61,7 +61,10 @@ export function getInitFirstItemSchema ({
           // the input value can't round-trip like the Upload scalar here is quite low)
           const item = await sudoContext.db[listKey].createOne({ data: { ...data, ...itemData } })
           const sessionToken = (await context.sessionStrategy.start({
-            data: { listKey, itemId: item.id.toString() },
+            data: {
+              listKey,
+              itemId: item.id
+            },
             context,
           }))
 

diff --git a/packages/core/src/types/next-fields.ts b/packages/core/src/types/next-fields.ts
@@ -12,7 +12,10 @@ import {
 
 export { Decimal }
 
-export type BaseItem = { id: { toString(): string }, [key: string]: unknown }
+export type BaseItem = {
+  id: unknown,
+  [key: string]: unknown
+}
 
 export type ListGraphQLTypes = { types: GraphQLTypesForList }
 

diff --git a/packages/core/src/types/type-info.ts b/packages/core/src/types/type-info.ts
@@ -12,7 +12,7 @@ export type BaseListTypeInfo<Session = any> = {
     create: GraphQLInput
     update: GraphQLInput
     where: GraphQLInput
-    uniqueWhere: { readonly id?: string | number | null } & GraphQLInput
+    uniqueWhere: { readonly id?: unknown } & GraphQLInput
     orderBy: Record<string, 'asc' | 'desc' | null>
   }
 

diff --git a/packages/fields-document/src/structure-graphql-input.ts b/packages/fields-document/src/structure-graphql-input.ts
@@ -340,7 +340,7 @@ export async function resolveRelateToManyForUpdateInput (
   value: _UpdateValueManyType,
   context: KeystoneContext,
   foreignListKey: string,
-  prevVal: { id: string }[]
+  prevVal: BaseItem[]
 ) {
   if (
     !Array.isArray(value.connect) &&
@@ -442,7 +442,7 @@ export async function checkUniqueItemExists (
     throw missingItem(operation, uniqueInput)
   }
 
-  return { id: item.id.toString() }
+  return { id: item.id }
 }
 
 async function handleCreateAndUpdate (
@@ -470,7 +470,7 @@ async function resolveCreateMutation (value: any, context: KeystoneContext, fore
     // it could change in the future
     {} as GraphQLResolveInfo
   )) as BaseItem
-  return { id: id.toString() }
+  return { id }
 }
 
 export function resolveRelateToOneForCreateInput (