Fix an bug in how inputRef types are normalized

.changeset/fifty-poems-march.md

@@ -0,0 +1,6 @@
+---
+'@pothos/plugin-add-graphql': patch
+'@pothos/core': patch
+---
+
+Improve typing of inputRefs and fix incorrectly normalized function properties of inputRef types

packages/core/src/refs/input-object.ts

@@ -2,6 +2,7 @@
 import {
   InputFieldsFromShape,
   InputRef,
+  InputShapeFromFields,
   inputShapeKey,
   RecursivelyNormalizeNullableFields,
   SchemaTypes,
@@ -33,17 +34,11 @@ export class ImplementableInputObjectRef<
     this.builder = builder;
   }
 
-  implement(
-    options: PothosSchemaTypes.InputObjectTypeOptions<
-      Types,
-      InputFieldsFromShape<RecursivelyNormalizeNullableFields<T>>
-    >,
+  implement<Fields extends InputFieldsFromShape<RecursivelyNormalizeNullableFields<T>>>(
+    options: PothosSchemaTypes.InputObjectTypeOptions<Types, Fields>,
   ) {
-    this.builder.inputType<
-      ImplementableInputObjectRef<Types, T>,
-      InputFieldsFromShape<RecursivelyNormalizeNullableFields<T>>
-    >(this, options);
+    this.builder.inputType<ImplementableInputObjectRef<Types, T>, Fields>(this, options);
 
-    return this as InputObjectRef<RecursivelyNormalizeNullableFields<T>>;
+    return this as InputObjectRef<InputShapeFromFields<Fields>>;
   }
 }

packages/core/src/types/utils.ts

@@ -52,6 +52,8 @@ export type RecursivelyNormalizeNullableFields<T> = undefined extends T
   ? RecursivelyNormalizeNullableFields<NonNullable<T>> | null | undefined
   : T extends (infer L)[]
   ? RecursivelyNormalizeNullableFields<L>[]
+  : T extends (...args: any[]) => unknown
+  ? T
   : T extends object
   ? Normalize<
       {

packages/core/tests/__snapshots__/index.test.ts.snap

@@ -52,6 +52,7 @@ enum MyEnum {
 }
 
 input NestedListInput {
+  date: Date
   list: [[Int!]]!
 }
 

packages/core/tests/examples/random-stuff.ts

@@ -13,7 +13,7 @@ interface Types {
     Shaveable: { shaved: boolean };
   };
   Scalars: {
-    Date: { Input: string; Output: string };
+    Date: { Input: Date | string; Output: string | Date };
   };
   Context: { userID: number };
 }
@@ -110,7 +110,7 @@ interface ExampleShape {
     ids: (number | string)[];
     ids2?: number[];
     enum?: MyEnum;
-    date?: string;
+    date?: string | Date;
   };
   id?: number | string;
   ids: (number | string)[];
@@ -169,8 +169,13 @@ builder.objectType('User', {
         example2: t.arg({ type: Example2, required: true }),
         firstN: t.arg.id(),
       },
-      resolve: (parent, args) =>
-        Number.parseInt(String(args.example2.more.more.more.example.id), 10),
+      resolve: (parent, args) => {
+        const d: Date | string = args.example2.more.more.more.example.date!;
+
+        console.log(d);
+
+        return Number.parseInt(String(args.example2.more.more.more.example.id), 10);
+      },
     }),
     // Using a union type
     related: t.field({
@@ -366,13 +371,14 @@ builder.subscriptionType({
 builder.queryField('constructor', (t) => t.boolean({ resolve: () => true }));
 
 const NestedListInput = builder
-  .inputRef<{ list: (number[] | null)[] }>('NestedListInput')
+  .inputRef<{ list: (number[] | null)[]; data?: Date }>('NestedListInput')
   .implement({
     fields: (t) => ({
       list: t.field({
         type: t.listRef(t.listRef('Int'), { required: false }),
         required: true,
       }),
+      date: t.field({ type: 'Date', required: false }),
     }),
   });
 
@@ -388,7 +394,12 @@ builder.queryField('nestedLists', (t) =>
         type: NestedListInput,
       }),
     },
-    resolve: (_, args) => args.input,
+    resolve: (_, args) => {
+      const date: Date | string | null | undefined = args.nestedListInput?.date;
+      void date;
+
+      return args.input;
+    },
   }),
 );
 

packages/plugin-add-graphql/src/schema-builder.ts

@@ -288,7 +288,7 @@ proto.addGraphQLInput = function addGraphQLInput<Shape extends {}>(
     ...options
   }: AddGraphQLInputTypeOptions<SchemaTypes, Shape>,
 ) {
-  const ref = this.inputRef<never>(name);
+  const ref = this.inputRef<Shape>(name);
 
   return ref.implement({
     ...options,
@@ -321,5 +321,5 @@ proto.addGraphQLInput = function addGraphQLInput<Shape extends {}>(
 
       return combinedFields as never;
     },
-  });
+  }) as never;
 };