Add ref adjacent keywords case for Draft4 to Draft 6 transform (#52)

json-schema-org · Aug 25, 2024 · 943afe2 · 943afe2
1 parent 0a0ed54
commit 943afe2
Show file tree

Hide file tree

Showing 15 changed files with 60 additions and 0 deletions.
diff --git a/rules/from-draft4/to-draft6/001-ref-and-adjecent-keywords-present.json b/rules/from-draft4/to-draft6/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-draft4/to-draft6/002-ref-and-x-ref-present.json b/rules/from-draft4/to-draft6/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-draft4/to-draft6/003-correct-sideeffects-ref-transform.json b/rules/from-draft4/to-draft6/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/.../001-unknown-in-previous-draft-const.json → .../004-unknown-in-previous-draft-const.json b/.../001-unknown-in-previous-draft-const.json → .../004-unknown-in-previous-draft-const.json
diff --git a/...2-unknown-in-previous-draft-contains.json → ...5-unknown-in-previous-draft-contains.json b/...2-unknown-in-previous-draft-contains.json → ...5-unknown-in-previous-draft-contains.json
diff --git a/...3-unknown-in-previous-draft-examples.json → ...6-unknown-in-previous-draft-examples.json b/...3-unknown-in-previous-draft-examples.json → ...6-unknown-in-previous-draft-examples.json
diff --git a/...nown-in-previous-draft-propertyNames.json → ...nown-in-previous-draft-propertyNames.json b/...nown-in-previous-draft-propertyNames.json → ...nown-in-previous-draft-propertyNames.json
diff --git a/...t6/005-unknown-in-previous-draft-$id.json → ...t6/008-unknown-in-previous-draft-$id.json b/...t6/005-unknown-in-previous-draft-$id.json → ...t6/008-unknown-in-previous-draft-$id.json
diff --git a/rules/from-draft4/to-draft6/006-schema.json → rules/from-draft4/to-draft6/009-schema.json b/rules/from-draft4/to-draft6/006-schema.json → rules/from-draft4/to-draft6/009-schema.json
diff --git a/...from-draft4/to-draft6/007-id-present.json → ...from-draft4/to-draft6/010-id-present.json b/...from-draft4/to-draft6/007-id-present.json → ...from-draft4/to-draft6/010-id-present.json
diff --git a/...t6/008-exclusiveMaximum-boolean-true.json → ...t6/011-exclusiveMaximum-boolean-true.json b/...t6/008-exclusiveMaximum-boolean-true.json → ...t6/011-exclusiveMaximum-boolean-true.json
diff --git a/...6/009-exclusiveMaximum-boolean-false.json → ...6/012-exclusiveMaximum-boolean-false.json b/...6/009-exclusiveMaximum-boolean-false.json → ...6/012-exclusiveMaximum-boolean-false.json
diff --git a/...t6/010-exclusiveMinimum-boolean-true.json → ...t6/013-exclusiveMinimum-boolean-true.json b/...t6/010-exclusiveMinimum-boolean-true.json → ...t6/013-exclusiveMinimum-boolean-true.json
diff --git a/...6/011-exclusiveMinimum-boolean-false.json → ...6/014-exclusiveMinimum-boolean-false.json b/...6/011-exclusiveMinimum-boolean-false.json → ...6/014-exclusiveMinimum-boolean-false.json
diff --git a/test/from-draft4/to-draft6/ref.json b/test/from-draft4/to-draft6/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"
+                }
+            }
+        }
+    }
+]