Add ref case for Draft 6 to Draft 7 transform (#53)

Co-authored-by: Juan Cruz Viotti <[email protected]>
json-schema-org · Aug 16, 2024 · 0a0ed54 · 0a0ed54
1 parent 3a57333
commit 0a0ed54
Show file tree

Hide file tree

Showing 13 changed files with 60 additions and 0 deletions.
diff --git a/rules/from-draft6/to-draft7/001-ref-and-adjecent-keywords-present.json b/rules/from-draft6/to-draft7/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", "boolean", "integer", "number", "object", "string" ] }
+    ],
+    "transform": [
+        { "operation": "prefix-until-unique", "path": [ {} ], "value": "x-" } 
+    ]
+}
diff --git a/rules/from-draft6/to-draft7/002-ref-and-x-ref-present.json b/rules/from-draft6/to-draft7/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-draft6/to-draft7/003-correct-sideeffects-ref-transform.json b/rules/from-draft6/to-draft7/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/...01-unknown-in-previous-draft-comment.json → ...04-unknown-in-previous-draft-comment.json b/...01-unknown-in-previous-draft-comment.json → ...04-unknown-in-previous-draft-comment.json
diff --git a/...ft7/002-unknown-in-previous-draft-if.json → ...ft7/005-unknown-in-previous-draft-if.json b/...ft7/002-unknown-in-previous-draft-if.json → ...ft7/005-unknown-in-previous-draft-if.json
diff --git a/...7/003-unknown-in-previous-draft-then.json → ...7/006-unknown-in-previous-draft-then.json b/...7/003-unknown-in-previous-draft-then.json → ...7/006-unknown-in-previous-draft-then.json
diff --git a/...7/004-unknown-in-previous-draft-else.json → ...7/007-unknown-in-previous-draft-else.json b/...7/004-unknown-in-previous-draft-else.json → ...7/007-unknown-in-previous-draft-else.json
diff --git a/...wn-in-previous-draft-contentEncoding.json → ...wn-in-previous-draft-contentEncoding.json b/...wn-in-previous-draft-contentEncoding.json → ...wn-in-previous-draft-contentEncoding.json
diff --git a/...n-in-previous-draft-contentMediaType.json → ...n-in-previous-draft-contentMediaType.json b/...n-in-previous-draft-contentMediaType.json → ...n-in-previous-draft-contentMediaType.json
diff --git a/...7-unknown-in-previous-draft-readOnly.json → ...0-unknown-in-previous-draft-readOnly.json b/...7-unknown-in-previous-draft-readOnly.json → ...0-unknown-in-previous-draft-readOnly.json
diff --git a/...-unknown-in-previous-draft-writeOnly.json → ...-unknown-in-previous-draft-writeOnly.json b/...-unknown-in-previous-draft-writeOnly.json → ...-unknown-in-previous-draft-writeOnly.json
diff --git a/rules/from-draft6/to-draft7/009-schema.json → rules/from-draft6/to-draft7/012-schema.json b/rules/from-draft6/to-draft7/009-schema.json → rules/from-draft6/to-draft7/012-schema.json
diff --git a/test/from-draft6/to-draft7/ref.json b/test/from-draft6/to-draft7/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"
+                }
+            }
+        }
+    }
+]