Improve type meta-schema

hyperjump-io · Aug 2, 2024 · 93f13e4 · 93f13e4
1 parent 6eeca3e
commit 93f13e4
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 30 deletions.
diff --git a/draft-04/schema.js b/draft-04/schema.js
@@ -206,13 +206,19 @@ of valid schemas written for this particular dialect.`
       "description": _enum.description
     },
     "type": {
-      "anyOf": [
-        { "$ref": "#/definitions/simpleTypes" },
+      "type": ["string", "array"],
+      "allOf": [
+        {
+          "if": { "type": "string" },
+          "then": { "$ref": "#/definitions/simpleTypes" }
+        },
         {
-          "type": "array",
-          "items": { "$ref": "#/definitions/simpleTypes" },
-          "minItems": 1,
-          "uniqueItems": true
+          "if": { "type": "array" },
+          "then": {
+            "items": { "$ref": "#/definitions/simpleTypes" },
+            "minItems": 1,
+            "uniqueItems": true
+          }
         }
       ],
       "description": type.description

diff --git a/draft-06/schema.js b/draft-06/schema.js
@@ -231,13 +231,19 @@ of valid schemas written for this particular dialect.`
       "description": _enum.description
     },
     "type": {
-      "anyOf": [
-        { "$ref": "#/definitions/simpleTypes" },
+      "type": ["string", "array"],
+      "allOf": [
+        {
+          "if": { "type": "string" },
+          "then": { "$ref": "#/definitions/simpleTypes" }
+        },
         {
-          "type": "array",
-          "items": { "$ref": "#/definitions/simpleTypes" },
-          "minItems": 1,
-          "uniqueItems": true
+          "if": { "type": "array" },
+          "then": {
+            "items": { "$ref": "#/definitions/simpleTypes" },
+            "minItems": 1,
+            "uniqueItems": true
+          }
         }
       ],
       "description": type.description

diff --git a/draft-07/schema.js b/draft-07/schema.js
@@ -255,13 +255,19 @@ of valid schemas written for this particular dialect.`
       "description": _enum.description
     },
     "type": {
-      "anyOf": [
-        { "$ref": "#/definitions/simpleTypes" },
+      "type": ["string", "array"],
+      "allOf": [
+        {
+          "if": { "type": "string" },
+          "then": { "$ref": "#/definitions/simpleTypes" }
+        },
         {
-          "type": "array",
-          "items": { "$ref": "#/definitions/simpleTypes" },
-          "minItems": 1,
-          "uniqueItems": true
+          "if": { "type": "array" },
+          "then": {
+            "items": { "$ref": "#/definitions/simpleTypes" },
+            "minItems": 1,
+            "uniqueItems": true
+          }
         }
       ],
       "description": type.description

diff --git a/draft-2019-09/meta/validation.js b/draft-2019-09/meta/validation.js
@@ -109,13 +109,19 @@ export default {
       "description": _enum.description
     },
     "type": {
-      "anyOf": [
-        { "$ref": "#/$defs/simpleTypes" },
+      "type": ["string", "array"],
+      "allOf": [
         {
-          "type": "array",
-          "items": { "$ref": "#/$defs/simpleTypes" },
-          "minItems": 1,
-          "uniqueItems": true
+          "if": { "type": "string" },
+          "then": { "$ref": "#/$defs/simpleTypes" }
+        },
+        {
+          "if": { "type": "array" },
+          "then": {
+            "items": { "$ref": "#/$defs/simpleTypes" },
+            "minItems": 1,
+            "uniqueItems": true
+          }
         }
       ],
       "description": type.description

diff --git a/draft-2020-12/meta/validation.js b/draft-2020-12/meta/validation.js
@@ -111,13 +111,19 @@ export default {
       "description": _enum.description
     },
     "type": {
-      "anyOf": [
-        { "$ref": "#/$defs/simpleTypes" },
+      "type": ["string", "array"],
+      "allOf": [
         {
-          "type": "array",
-          "items": { "$ref": "#/$defs/simpleTypes" },
-          "minItems": 1,
-          "uniqueItems": true
+          "if": { "type": "string" },
+          "then": { "$ref": "#/$defs/simpleTypes" }
+        },
+        {
+          "if": { "type": "array" },
+          "then": {
+            "items": { "$ref": "#/$defs/simpleTypes" },
+            "minItems": 1,
+            "uniqueItems": true
+          }
         }
       ],
       "description": type.description