Fixed InferSchemaType nullable arrays type inference

fixes Automattic#12420
lpizzinidev · Sep 17, 2022 · ebe610e · ebe610e
1 parent 586c86f
commit ebe610e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/test/types/schema.test.ts b/test/types/schema.test.ts
@@ -741,3 +741,32 @@ function pluginOptions() {
   schema.plugin<any, SomePluginOptions>(pluginFunction2, { option2: 0 });
   expectError(schema.plugin<any, SomePluginOptions>(pluginFunction2, {})); // should error because "option2" is not optional
 }
+
+function gh12420() {
+  const TestSchema = new Schema(
+    {
+      comments: { type: [String], required: false },
+      reference: {
+        type: [
+          {
+            type: { type: String, required: false },
+            value: { type: String, required: false }
+          }
+        ],
+        required: false
+      }
+    },
+    {
+      collection: 'tests',
+      timestamps: false
+    }
+  );
+
+  expectType<{
+    comments?: string[],
+    reference?: {
+      type?: string,
+      value?: string
+    }[]
+  }>({} as InferSchemaType<typeof TestSchema>);
+}
diff --git a/types/inferschematype.d.ts b/types/inferschematype.d.ts
@@ -69,7 +69,7 @@ type IsPathRequired<P, TypeKey extends TypeKeyBaseType> =
   P extends { required: true | [true, string | undefined] } | ArrayConstructor | any[]
     ? true
     : P extends (Record<TypeKey, ArrayConstructor | any[]>)
-      ? P extends { default: undefined }
+      ? P extends { default: undefined } | { required: false }
         ? false
         : true
       : P extends (Record<TypeKey, any>)