Merge pull request ajv-validator#1463 from ajv-validator/revert-1455-…

…master Revert "add unknown => empty mapping in JTDSchemaType"
darlanalves · Feb 23, 2021 · 19e52da · 19e52da
2 parents ec68e7b + 7d759e6
commit 19e52da
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 41 deletions.
diff --git a/lib/types/jtd-schema.ts b/lib/types/jtd-schema.ts
@@ -133,8 +133,6 @@ export type JTDSchemaType<T, D extends Record<string, unknown> = Record<string,
       // NOTE there should only be one type that extends Record<string, never> so unions
       // shouldn't be a worry
       | (T extends Record<string, never> ? unknown : never)
-      // unknown also allows empty schema
-      | (unknown extends T ? unknown : never)
       // null
       // NOTE we have to check this too because null as an exclusive type also
       // qualifies for the empty schema

diff --git a/spec/types/jtd-schema.spec.ts b/spec/types/jtd-schema.spec.ts
@@ -175,7 +175,17 @@ describe("JTDSchemaType", () => {
       nullable: true,
     }
 
-    void [properties, optionalProperties, mixedProperties, fewerProperties, propertiesNull]
+    // can't use properties for any object (e.g. keyof = never)
+    const noProperties: TypeEquality<JTDSchemaType<unknown>, never> = true
+
+    void [
+      properties,
+      optionalProperties,
+      mixedProperties,
+      fewerProperties,
+      propertiesNull,
+      noProperties,
+    ]
   })
 
   it("should typecheck discriminator schemas", () => {
@@ -227,15 +237,6 @@ describe("JTDSchemaType", () => {
         },
       },
     }
-    const unionWithDiscriminator: JTDSchemaType<A | B> = {
-      discriminator: "type",
-      mapping: {
-        a: {properties: {type: {enum: ["a"]}, a: {type: "float64"}}},
-        b: {
-          optionalProperties: {b: {type: "string"}},
-        },
-      },
-    }
     const unionNull: JTDSchemaType<A | B | null> = {
       discriminator: "type",
       mapping: {
@@ -253,29 +254,18 @@ describe("JTDSchemaType", () => {
       never
     > = true
 
-    void [
-      union,
-      unionDuplicate,
-      unionMissing,
-      multOne,
-      multTwo,
-      unionWithDiscriminator,
-      unionNull,
-      noCommon,
-    ]
+    void [union, unionDuplicate, unionMissing, multOne, multTwo, unionNull, noCommon]
   })
 
   it("should typecheck empty schemas", () => {
     const empty: JTDSchemaType<Record<string, never>> = {}
-    // unknown can be null
-    const emptyUnknown: JTDSchemaType<unknown> = {nullable: true}
     // can only use empty for empty and null
     // @ts-expect-error
     const emptyButFull: JTDSchemaType<{a: string}> = {}
     const emptyNull: JTDSchemaType<null> = {nullable: true}
     const emptyMeta: JTDSchemaType<Record<string, never>> = {metadata: {}}
 
-    void [empty, emptyUnknown, emptyButFull, emptyNull, emptyMeta]
+    void [empty, emptyButFull, emptyNull, emptyMeta]
   })
 
   it("should typecheck ref schemas", () => {
@@ -316,22 +306,7 @@ describe("JTDSchemaType", () => {
       nullable: true,
     }
 
-    // can type recursive schemas
-    type LinkedList = {val: number; next: LinkedList} | null
-    const linkedListSchema: JTDSchemaType<LinkedList, {node: LinkedList}> = {
-      definitions: {
-        node: {
-          properties: {
-            val: {type: "float64"},
-            next: {ref: "node"},
-          },
-          nullable: true,
-        },
-      },
-      ref: "node",
-    }
-
-    void [refs, missingDef, missingType, nullRefs, refsNullOne, refsNullTwo, linkedListSchema]
+    void [refs, missingDef, missingType, nullRefs, refsNullOne, refsNullTwo]
   })
 
   it("should typecheck metadata schemas", () => {