Ref ignores adjacent keywords Draft 7 to 2019-09, correction in the r…

…ules (#50)
json-schema-org · Aug 15, 2024 · 3a57333 · 3a57333
1 parent 15aacea
commit 3a57333
Show file tree

Hide file tree

Showing 22 changed files with 60 additions and 0 deletions.
diff --git a/rules/from-draft7/to-2019-09/001-ref-and-adjecent-keywords-present.json b/rules/from-draft7/to-2019-09/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-draft7/to-2019-09/002-ref-and-x-ref-present.json b/rules/from-draft7/to-2019-09/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-draft7/to-2019-09/003-correct-sideeffects-ref-transform.json b/rules/from-draft7/to-2019-09/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/...unknown-in-previous-draft-deprecated.json → ...unknown-in-previous-draft-deprecated.json b/...unknown-in-previous-draft-deprecated.json → ...unknown-in-previous-draft-deprecated.json
diff --git a/...nknown-in-previous-draft-maxContains.json → ...nknown-in-previous-draft-maxContains.json b/...nknown-in-previous-draft-maxContains.json → ...nknown-in-previous-draft-maxContains.json
diff --git a/...nknown-in-previous-draft-minContains.json → ...nknown-in-previous-draft-minContains.json b/...nknown-in-previous-draft-minContains.json → ...nknown-in-previous-draft-minContains.json
diff --git a/...n-in-previous-draft-dependentSchemas.json → ...n-in-previous-draft-dependentSchemas.json b/...n-in-previous-draft-dependentSchemas.json → ...n-in-previous-draft-dependentSchemas.json
diff --git a/...-in-previous-draft-dependentRequired.json → ...-in-previous-draft-dependentRequired.json b/...-in-previous-draft-dependentRequired.json → ...-in-previous-draft-dependentRequired.json
diff --git a/...006-unknown-in-previous-draft-anchor.json → ...009-unknown-in-previous-draft-anchor.json b/...006-unknown-in-previous-draft-anchor.json → ...009-unknown-in-previous-draft-anchor.json
diff --git a/...unknown-in-previous-draft-vocabulary.json → ...unknown-in-previous-draft-vocabulary.json b/...unknown-in-previous-draft-vocabulary.json → ...unknown-in-previous-draft-vocabulary.json
diff --git a/...wn-in-previous-draft-recursiveAnchor.json → ...wn-in-previous-draft-recursiveAnchor.json b/...wn-in-previous-draft-recursiveAnchor.json → ...wn-in-previous-draft-recursiveAnchor.json
diff --git a/...known-in-previous-draft-recursiveRef.json → ...known-in-previous-draft-recursiveRef.json b/...known-in-previous-draft-recursiveRef.json → ...known-in-previous-draft-recursiveRef.json
diff --git a/...9/010-unknown-in-previous-draft-defs.json → ...9/013-unknown-in-previous-draft-defs.json b/...9/010-unknown-in-previous-draft-defs.json → ...9/013-unknown-in-previous-draft-defs.json
diff --git a/rules/from-draft7/to-2019-09/011-schema.json → rules/from-draft7/to-2019-09/014-schema.json b/rules/from-draft7/to-2019-09/011-schema.json → rules/from-draft7/to-2019-09/014-schema.json
diff --git a/...7/to-2019-09/012-id-starts-with-hash.json → ...7/to-2019-09/015-id-starts-with-hash.json b/...7/to-2019-09/012-id-starts-with-hash.json → ...7/to-2019-09/015-id-starts-with-hash.json
diff --git a/...7/to-2019-09/013-definitions-to-defs.json → ...7/to-2019-09/016-definitions-to-defs.json b/...7/to-2019-09/013-definitions-to-defs.json → ...7/to-2019-09/016-definitions-to-defs.json
diff --git a/...dependencies-children-has-type-array.json → ...dependencies-children-has-type-array.json b/...dependencies-children-has-type-array.json → ...dependencies-children-has-type-array.json
diff --git a/...15-dependencies-to-dependentRequired.json → ...18-dependencies-to-dependentRequired.json b/...15-dependencies-to-dependentRequired.json → ...18-dependencies-to-dependentRequired.json
diff --git a/...ependencies-children-has-type-object.json → ...ependencies-children-has-type-object.json b/...ependencies-children-has-type-object.json → ...ependencies-children-has-type-object.json
diff --git a/...017-dependencies-to-dependentSchemas.json → ...020-dependencies-to-dependentSchemas.json b/...017-dependencies-to-dependentSchemas.json → ...020-dependencies-to-dependentSchemas.json
diff --git a/...019-09/018-dependencies-empty-object.json → ...019-09/021-dependencies-empty-object.json b/...019-09/018-dependencies-empty-object.json → ...019-09/021-dependencies-empty-object.json
diff --git a/test/from-draft7/to-2019-09/ref.json b/test/from-draft7/to-2019-09/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"
+                }
+            }
+        }
+    }
+]