Fix generated list types to allow passing a value directly when a Gra…

…phQL list of the value is expected (#5910)

.changeset/funny-mice-drum.md

@@ -0,0 +1,6 @@
+---
+'@keystone-next/keystone': patch
+'@keystone-next/types': patch
+---
+
+Fixed generated list types to allow passing a value directly when a GraphQL list of the value is expected

packages-next/keystone/src/lib/context/server-side-graphql-client.ts

@@ -120,8 +120,10 @@ const getItems = async ({
 }: {
   listKey: string;
   where?: Record<string, any> | null;
-  sortBy?: readonly string[] | null;
-  orderBy?: readonly Record<string, 'asc' | 'desc' | null>[];
+  sortBy?: string | readonly string[] | null;
+  orderBy?:
+    | Record<string, 'asc' | 'desc' | null>
+    | readonly Record<string, 'asc' | 'desc' | null>[];
   first?: number | null;
   skip?: number | null;
   pageSize?: number;

packages-next/keystone/src/lib/schema-type-printer.tsx

@@ -29,7 +29,7 @@ function printInputTypesFromSchema(
   let ast = parse(schema);
   let printTypeNodeWithoutNullable = (node: ListTypeNode | NamedTypeNode): string => {
     if (node.kind === 'ListType') {
-      return `ReadonlyArray<${printTypeNode(node.type)}>`;
+      return `ReadonlyArray<${printTypeNode(node.type)}> | ${printTypeNode(node.type)}`;
     }
     let name = node.name.value;
     if (schemaObj.getType(name) instanceof GraphQLScalarType) {

packages-next/keystone/src/scripts/tests/__snapshots__/artifacts.test.ts.snap

@@ -12,22 +12,38 @@ type Scalars = {
 };
 
 export type TodoWhereInput = {
-  readonly AND?: ReadonlyArray<TodoWhereInput> | null;
-  readonly OR?: ReadonlyArray<TodoWhereInput> | null;
+  readonly AND?: ReadonlyArray<TodoWhereInput> | TodoWhereInput | null;
+  readonly OR?: ReadonlyArray<TodoWhereInput> | TodoWhereInput | null;
   readonly id?: Scalars['ID'] | null;
   readonly id_not?: Scalars['ID'] | null;
   readonly id_lt?: Scalars['ID'] | null;
   readonly id_lte?: Scalars['ID'] | null;
   readonly id_gt?: Scalars['ID'] | null;
   readonly id_gte?: Scalars['ID'] | null;
-  readonly id_in?: ReadonlyArray<Scalars['ID'] | null> | null;
-  readonly id_not_in?: ReadonlyArray<Scalars['ID'] | null> | null;
+  readonly id_in?:
+    | ReadonlyArray<Scalars['ID'] | null>
+    | Scalars['ID']
+    | null
+    | null;
+  readonly id_not_in?:
+    | ReadonlyArray<Scalars['ID'] | null>
+    | Scalars['ID']
+    | null
+    | null;
   readonly title?: Scalars['String'] | null;
   readonly title_not?: Scalars['String'] | null;
   readonly title_contains?: Scalars['String'] | null;
   readonly title_not_contains?: Scalars['String'] | null;
-  readonly title_in?: ReadonlyArray<Scalars['String'] | null> | null;
-  readonly title_not_in?: ReadonlyArray<Scalars['String'] | null> | null;
+  readonly title_in?:
+    | ReadonlyArray<Scalars['String'] | null>
+    | Scalars['String']
+    | null
+    | null;
+  readonly title_not_in?:
+    | ReadonlyArray<Scalars['String'] | null>
+    | Scalars['String']
+    | null
+    | null;
 };
 
 export type TodoWhereUniqueInput = {
@@ -84,8 +100,8 @@ export type TodoListTypeInfo = {
   args: {
     listQuery: {
       readonly where?: TodoWhereInput;
-      readonly sortBy?: ReadonlyArray<SortTodosBy> | null;
-      readonly orderBy?: ReadonlyArray<TodoOrderByInput>;
+      readonly sortBy?: ReadonlyArray<SortTodosBy> | SortTodosBy | null;
+      readonly orderBy?: ReadonlyArray<TodoOrderByInput> | TodoOrderByInput;
       readonly first?: Scalars['Int'] | null;
       readonly skip?: Scalars['Int'];
     };

packages-next/types/src/utils.ts

@@ -14,8 +14,10 @@ export type BaseGeneratedListTypes = {
       readonly search?: string | null;
       readonly first?: number | null;
       readonly skip?: number | null;
-      readonly orderBy?: readonly Record<string, 'asc' | 'desc' | null>[];
-      readonly sortBy?: ReadonlyArray<string> | null;
+      readonly orderBy?:
+        | Record<string, 'asc' | 'desc' | null>
+        | readonly Record<string, 'asc' | 'desc' | null>[];
+      readonly sortBy?: string | ReadonlyArray<string> | null;
     };
   };
 };