Transform items to prefixItems in $ref

See: #43 Signed-off-by: Juan Cruz Viotti <[email protected]>
sourcemeta · Aug 24, 2022 · 01c50ac · 01c50ac
1 parent 0813647
commit 01c50ac
Show file tree

Hide file tree

Showing 7 changed files with 148 additions and 3 deletions.
diff --git a/bindings/node/index.js b/bindings/node/index.js
@@ -41,8 +41,8 @@ async function transformer (root, path, ruleset, trails, originalSchema, from) {
         omit: (object, keys) => {
           return _.omit(object, _.castArray(keys))
         },
-        replace: (value, string, replacement) => {
-          return value.replaceAll(string, replacement)
+        replace: (value, regex, replacement) => {
+          return value.replace(new RegExp(regex, 'g'), replacement)
         }
       })
 

diff --git a/rules/jsonschema-2019-09-to-2020-12.json b/rules/jsonschema-2019-09-to-2020-12.json
@@ -47,6 +47,32 @@
         ]
       }
     },
+    {
+      "vocabulary": "https://json-schema.org/draft/2019-09/vocab/validation",
+      "condition": {
+        "$schema": "https://json-schema.org/draft/2020-12/schema",
+        "$id": "https://github.com/sourcemeta/alterschema/rules/jsonschema-2019-09-to-2020-12/open-tuple-in-ref",
+        "$comment": "https://json-schema.org/draft/2020-12/release-notes.html",
+        "type": "object",
+        "required": [ "$ref" ],
+        "properties": {
+          "$ref": {
+            "type": "string",
+            "pattern": "/items/\\d+"
+          }
+        }
+      },
+      "transform": {
+        "$merge": [
+          { "$eval": "omit(schema, '$ref')" },
+          {
+            "$$ref": {
+              "$eval": "replace(schema['$ref'], '/items/(\\d+)', '/prefixItems/$1')"
+            }
+          }
+        ]
+      }
+    },
     {
       "vocabulary": "https://json-schema.org/draft/2019-09/vocab/validation",
       "condition": {

diff --git a/rules/jsonschema-draft7-to-2019-09.json b/rules/jsonschema-draft7-to-2019-09.json
@@ -89,7 +89,7 @@
           { "$eval": "omit(schema, '$ref')" },
           {
             "$$ref": {
-              "$eval": "replace(schema['$ref'], 'definitions', '$defs')"
+              "$eval": "replace(schema['$ref'], '/definitions/', '/$defs/')"
             }
           }
         ]

diff --git a/test/rules/jsonschema-2019-09-to-2020-12.json b/test/rules/jsonschema-2019-09-to-2020-12.json
@@ -167,5 +167,39 @@
         "foo": { "$dynamicRef": "#" }
       }
     }
+  },
+  {
+    "name": "items to prefixItems within $ref",
+    "schema": {
+      "$schema": "https://json-schema.org/draft/2019-09/schema",
+      "items": [
+        { "type": "integer" },
+        { "$ref": "#/items/0" }
+      ]
+    },
+    "expected": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "prefixItems": [
+        { "type": "integer" },
+        { "$ref": "#/prefixItems/0" }
+      ]
+    }
+  },
+  {
+    "name": "items not to prefixItems within $ref",
+    "schema": {
+      "$schema": "https://json-schema.org/draft/2019-09/schema",
+      "items": { "type": "integer" },
+      "properties": {
+        "foo": { "$ref": "#/items" }
+      }
+    },
+    "expected": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "items": { "type": "integer" },
+      "properties": {
+        "foo": { "$ref": "#/items" }
+      }
+    }
   }
 ]
diff --git a/test/rules/jsonschema-draft4-to-2020-12.json b/test/rules/jsonschema-draft4-to-2020-12.json
@@ -225,5 +225,22 @@
         { "$ref": "#/prefixItems/0" }
       ]
     }
+  },
+  {
+    "name": "items not to prefixItems within $ref",
+    "schema": {
+      "$schema": "http://json-schema.org/draft-04/schema#",
+      "items": { "type": "integer" },
+      "properties": {
+        "foo": { "$ref": "#/items" }
+      }
+    },
+    "expected": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "items": { "type": "integer" },
+      "properties": {
+        "foo": { "$ref": "#/items" }
+      }
+    }
   }
 ]
diff --git a/test/rules/jsonschema-draft6-to-2020-12.json b/test/rules/jsonschema-draft6-to-2020-12.json
@@ -149,5 +149,39 @@
         "foo": false
       }
     }
+  },
+  {
+    "name": "items to prefixItems within $ref",
+    "schema": {
+      "$schema": "http://json-schema.org/draft-06/schema#",
+      "items": [
+        { "type": "integer" },
+        { "$ref": "#/items/0" }
+      ]
+    },
+    "expected": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "prefixItems": [
+        { "type": "integer" },
+        { "$ref": "#/prefixItems/0" }
+      ]
+    }
+  },
+  {
+    "name": "items not to prefixItems within $ref",
+    "schema": {
+      "$schema": "http://json-schema.org/draft-06/schema#",
+      "items": { "type": "integer" },
+      "properties": {
+        "foo": { "$ref": "#/items" }
+      }
+    },
+    "expected": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "items": { "type": "integer" },
+      "properties": {
+        "foo": { "$ref": "#/items" }
+      }
+    }
   }
 ]
diff --git a/test/rules/jsonschema-draft7-to-2020-12.json b/test/rules/jsonschema-draft7-to-2020-12.json
@@ -183,5 +183,39 @@
         }
       }
     }
+  },
+  {
+    "name": "items to prefixItems within $ref",
+    "schema": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "items": [
+        { "type": "integer" },
+        { "$ref": "#/items/0" }
+      ]
+    },
+    "expected": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "prefixItems": [
+        { "type": "integer" },
+        { "$ref": "#/prefixItems/0" }
+      ]
+    }
+  },
+  {
+    "name": "items not to prefixItems within $ref",
+    "schema": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "items": { "type": "integer" },
+      "properties": {
+        "foo": { "$ref": "#/items" }
+      }
+    },
+    "expected": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "items": { "type": "integer" },
+      "properties": {
+        "foo": { "$ref": "#/items" }
+      }
+    }
   }
 ]