Improve type meta-schema

Author: jdesrosiers

draft-04/schema.js

@@ -125,13 +125,19 @@ export default {
       "uniqueItems": true
     },
     "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
+          }
         }
       ]
     },

draft-06/schema.js

@@ -134,13 +134,19 @@ export default {
       "uniqueItems": true
     },
     "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
+          }
         }
       ]
     },

draft-07/schema.js

@@ -147,13 +147,19 @@ export default {
       "uniqueItems": true
     },
     "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
+          }
         }
       ]
     },

draft-2019-09/meta/validation.js

@@ -53,13 +53,19 @@ export default {
       "items": true
     },
     "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
+          }
         }
       ]
     }

draft-2020-12/meta/validation.js

@@ -53,13 +53,19 @@ export default {
       "items": true
     },
     "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
+          }
         }
       ]
     }