fix 2 more issues

Automattic · Jul 4, 2022 · a2ff573 · a2ff573
1 parent 3feb8af
commit a2ff573
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/test/types/schema.test.ts b/test/types/schema.test.ts
@@ -650,7 +650,7 @@ function gh12030() {
     createdAt: { type: Date, default: Date.now }
   });
 
-  // expectType<{ createdAt: Date }>({} as InferSchemaType<typeof Schema2>);
+  expectType<{ createdAt: Date }>({} as InferSchemaType<typeof Schema2>);
 
   const Schema3 = new Schema({
     users: [
@@ -668,13 +668,13 @@ function gh12030() {
     data: { type: { role: String }, default: {} }
   });
 
-  // expectType<{ data: { role?: string } }>({} as InferSchemaType<typeof Schema4>);
+  expectType<{ data: { role?: string } }>({} as InferSchemaType<typeof Schema4>);
 
   const Schema5 = new Schema({
     data: { type: { role: Object }, default: {} }
   });
 
-  // expectType<{ data: { role?: string } }>({} as InferSchemaType<typeof Schema5>);
+  expectType<{ data: { role?: string } }>({} as InferSchemaType<typeof Schema5>);
 
   const Schema6 = new Schema({
     track: {

diff --git a/types/inferschematype.d.ts b/types/inferschematype.d.ts
@@ -89,9 +89,9 @@ type IsPathRequired<P, TypeKey extends TypeKeyBaseType> =
       ? P extends { default: undefined }
         ? false
         : true
-      : P extends (Record<TypeKey, NumberSchemaDefinition | StringSchemaDefinition | BooleanSchemaDefinition | DateSchemaDefinition>)
-        ? P extends { default: ResolvePathType<P[TypeKey]> }
-          ? true
+      : P extends (Record<TypeKey, any>)
+        ? P extends { default: any }
+          ? IfEquals<P['default'], undefined, false, true>
           : false
         : false;