Handle ref from draft3 to draft4 (#55)

json-schema-org · Sep 2, 2024 · ceb54a7 · ceb54a7
1 parent e23ae02
commit ceb54a7
Show file tree

Hide file tree

Showing 40 changed files with 62 additions and 2 deletions.
diff --git a/rules/from-draft3/to-draft4/001-ref-and-adjecent-keywords-present.json b/rules/from-draft3/to-draft4/001-ref-and-adjecent-keywords-present.json
@@ -0,0 +1,10 @@
+{
+    "vocabulary": "core",
+    "condition": [ 
+        { "operation": "has-key", "path": [], "value": "$ref" },
+        { "operation": "type-is", "path": [ {} ], "value": [ "array", "booelan", "integer", "number", "object", "string" ] }
+    ],
+    "transform": [
+        { "operation": "prefix-until-unique", "path": [ {} ], "value": "x-" } 
+    ]
+}
diff --git a/rules/from-draft3/to-draft4/002-ref-and-x-ref-present.json b/rules/from-draft3/to-draft4/002-ref-and-x-ref-present.json
@@ -0,0 +1,10 @@
+{
+    "vocabulary": "core",
+    "condition": [ 
+        { "operation": "has-key", "path": [], "value": "$ref" },
+        { "operation": "has-key", "path": [], "value": "x-$ref" }
+    ],
+    "transform": [
+        { "operation": "prefix-until-unique", "path": [ "x-$ref" ], "value": "x-" } 
+    ]
+}
diff --git a/rules/from-draft3/to-draft4/003-correct-sideeffects-ref-transform.json b/rules/from-draft3/to-draft4/003-correct-sideeffects-ref-transform.json
@@ -0,0 +1,9 @@
+{
+    "vocabulary": "core",
+    "condition": [ 
+        { "operation": "has-key", "path": [], "value": "x-$ref" }
+    ],
+    "transform": [
+        { "operation": "move", "to": [ "$ref" ], "from": [ "x-$ref" ] } 
+    ]
+}
diff --git a/.../002-unknown-in-previous-draft-anyOf.json → .../004-unknown-in-previous-draft-anyOf.json b/.../002-unknown-in-previous-draft-anyOf.json → .../004-unknown-in-previous-draft-anyOf.json
diff --git a/.../003-unknown-in-previous-draft-allOf.json → .../005-unknown-in-previous-draft-allOf.json b/.../003-unknown-in-previous-draft-allOf.json → .../005-unknown-in-previous-draft-allOf.json
diff --git a/.../004-unknown-in-previous-draft-oneOf.json → .../006-unknown-in-previous-draft-oneOf.json b/.../004-unknown-in-previous-draft-oneOf.json → .../006-unknown-in-previous-draft-oneOf.json
diff --git a/...t4/005-unknown-in-previous-draft-not.json → ...t4/007-unknown-in-previous-draft-not.json b/...t4/005-unknown-in-previous-draft-not.json → ...t4/007-unknown-in-previous-draft-not.json
diff --git a/...nknown-in-previous-draft-definitions.json → ...nknown-in-previous-draft-definitions.json b/...nknown-in-previous-draft-definitions.json → ...nknown-in-previous-draft-definitions.json
diff --git a/...nown-in-previous-draft-maxProperties.json → ...nown-in-previous-draft-maxProperties.json b/...nown-in-previous-draft-maxProperties.json → ...nown-in-previous-draft-maxProperties.json
diff --git a/...nown-in-previous-draft-minProperties.json → ...nown-in-previous-draft-minProperties.json b/...nown-in-previous-draft-minProperties.json → ...nown-in-previous-draft-minProperties.json
diff --git a/rules/from-draft3/to-draft4/009-schema.json → rules/from-draft3/to-draft4/011-schema.json b/rules/from-draft3/to-draft4/009-schema.json → rules/from-draft3/to-draft4/011-schema.json
diff --git a/...draft4/010-type-has-value-equals-any.json → ...draft4/012-type-has-value-equals-any.json b/...draft4/010-type-has-value-equals-any.json → ...draft4/012-type-has-value-equals-any.json
diff --git a/...draft4/011-type-has-any-in-its-array.json → ...draft4/013-type-has-any-in-its-array.json b/...draft4/011-type-has-any-in-its-array.json → ...draft4/013-type-has-any-in-its-array.json
diff --git a/...one-object-in-its-array-anyOf-absent.json → ...one-object-in-its-array-anyOf-absent.json b/...one-object-in-its-array-anyOf-absent.json → ...one-object-in-its-array-anyOf-absent.json
diff --git a/...-and-strings-in-its-array-initialize.json → ...-and-strings-in-its-array-initialize.json b/...-and-strings-in-its-array-initialize.json → ...-and-strings-in-its-array-initialize.json
diff --git a/rules/from-draft3/to-draft4/016-type-has-objects-and-strings-in-its-array.json b/rules/from-draft3/to-draft4/016-type-has-objects-and-strings-in-its-array.json
@@ -7,6 +7,6 @@
         { "operation": "type-is", "path": [ "type", {} ], "value": "string" }
     ],
     "transform": [
-        { "operation": "remove", "path": [ "type", {} ] }
+        { "operation": "copy", "to": [ "anyOf", "-", "type", "-" ], "from": [ "type", {} ] }
     ]
 }
diff --git a/...t4/015-type-has-objects-in-its-array.json → ...t4/017-type-has-objects-in-its-array.json b/...t4/015-type-has-objects-in-its-array.json → ...t4/017-type-has-objects-in-its-array.json
diff --git a/...has-objects-and-strings-in-its-array.json → ...has-objects-and-strings-in-its-array.json b/...has-objects-and-strings-in-its-array.json → ...has-objects-and-strings-in-its-array.json
@@ -7,6 +7,6 @@
         { "operation": "type-is", "path": [ "type", {} ], "value": "string" }
     ],
     "transform": [
-        { "operation": "copy", "to": [ "anyOf", "-", "type", "-" ], "from": [ "type", {} ] }
+        { "operation": "remove", "path": [ "type", {} ] }
     ]
 }
diff --git a/...t4/017-type-has-boolean-in-its-array.json → ...t4/019-type-has-boolean-in-its-array.json b/...t4/017-type-has-boolean-in-its-array.json → ...t4/019-type-has-boolean-in-its-array.json
diff --git a/...to-draft4/017-type-is-an-empty-array.json → ...to-draft4/020-type-is-an-empty-array.json b/...to-draft4/017-type-is-an-empty-array.json → ...to-draft4/020-type-is-an-empty-array.json
diff --git a/...t4/018-disallow-has-value-equals-any.json → ...t4/021-disallow-has-value-equals-any.json b/...t4/018-disallow-has-value-equals-any.json → ...t4/021-disallow-has-value-equals-any.json
diff --git a/...t4/019-disallow-has-any-in-its-array.json → ...t4/022-disallow-has-any-in-its-array.json b/...t4/019-disallow-has-any-in-its-array.json → ...t4/022-disallow-has-any-in-its-array.json
diff --git a/...object-in-its-array-initialize-allOf.json → ...object-in-its-array-initialize-allOf.json b/...object-in-its-array-initialize-allOf.json → ...object-in-its-array-initialize-allOf.json
diff --git a/...-has-atleast-one-object-in-its-array.json → ...-has-atleast-one-object-in-its-array.json b/...-has-atleast-one-object-in-its-array.json → ...-has-atleast-one-object-in-its-array.json
diff --git a/...is-an-array-of-strings-allOf-present.json → ...is-an-array-of-strings-allOf-present.json b/...is-an-array-of-strings-allOf-present.json → ...is-an-array-of-strings-allOf-present.json
diff --git a/...-is-an-array-of-strings-allOf-absent.json → ...-is-an-array-of-strings-allOf-absent.json b/...-is-an-array-of-strings-allOf-absent.json → ...-is-an-array-of-strings-allOf-absent.json
diff --git a/...raft4/024-disallow-is-an-empty-array.json → ...raft4/027-disallow-is-an-empty-array.json b/...raft4/024-disallow-is-an-empty-array.json → ...raft4/027-disallow-is-an-empty-array.json
diff --git a/...pendencies-children-have-type-string.json → ...pendencies-children-have-type-string.json b/...pendencies-children-have-type-string.json → ...pendencies-children-have-type-string.json
diff --git a/...rom-draft3/to-draft4/026-divisiblyBy.json → ...rom-draft3/to-draft4/029-divisiblyBy.json b/...rom-draft3/to-draft4/026-divisiblyBy.json → ...rom-draft3/to-draft4/029-divisiblyBy.json
diff --git a/...027-extends-is-an-array-allOf-absent.json → ...030-extends-is-an-array-allOf-absent.json b/...027-extends-is-an-array-allOf-absent.json → ...030-extends-is-an-array-allOf-absent.json
diff --git a/...28-extends-is-an-array-allOf-present.json → ...31-extends-is-an-array-allOf-present.json b/...28-extends-is-an-array-allOf-present.json → ...31-extends-is-an-array-allOf-present.json
diff --git a/...29-extends-is-an-object-allOf-absent.json → ...32-extends-is-an-object-allOf-absent.json b/...29-extends-is-an-object-allOf-absent.json → ...32-extends-is-an-object-allOf-absent.json
diff --git a/...0-extends-is-an-object-allOf-present.json → ...3-extends-is-an-object-allOf-present.json b/...0-extends-is-an-object-allOf-present.json → ...3-extends-is-an-object-allOf-present.json
diff --git a/...t3/to-draft4/031-empty-extends-array.json → ...t3/to-draft4/034-empty-extends-array.json b/...t3/to-draft4/031-empty-extends-array.json → ...t3/to-draft4/034-empty-extends-array.json
diff --git a/...false-present-in-properties's-values.json → ...false-present-in-properties's-values.json b/...false-present-in-properties's-values.json → ...false-present-in-properties's-values.json
diff --git a/...-required-is-present-in-outer-schema.json → ...-required-is-present-in-outer-schema.json b/...-required-is-present-in-outer-schema.json → ...-required-is-present-in-outer-schema.json
diff --git a/...hema-and-required-true-in-properties.json → ...hema-and-required-true-in-properties.json b/...hema-and-required-true-in-properties.json → ...hema-and-required-true-in-properties.json
diff --git a/...-true-present-in-properties's-values.json → ...-true-present-in-properties's-values.json b/...-true-present-in-properties's-values.json → ...-true-present-in-properties's-values.json
diff --git a/...empty-required-array-in-outer-schema.json → ...empty-required-array-in-outer-schema.json b/...empty-required-array-in-outer-schema.json → ...empty-required-array-in-outer-schema.json
diff --git a/test/from-draft3/to-draft4/ref.json b/test/from-draft3/to-draft4/ref.json
@@ -0,0 +1,31 @@
+[
+    {
+        "title": "$ref present in schema, with adjacent keywords",
+        "from": {
+            "id": "http://example.com",
+            "properties": {
+                "foo": {
+                    "$ref": "/bar",
+                    "type": "string",
+                    "id": "zoo"
+                },
+                "bar": {
+                    "id": "bar"
+                }
+            }
+        },
+        "to": {
+            "id": "http://example.com",
+            "properties": {
+                "foo": {
+                    "$ref": "/bar",
+                    "x-type": "string",
+                    "x-id": "zoo"
+                },
+                "bar": {
+                    "id": "bar"
+                }
+            }
+        }
+    }
+]