Use "id" as the identifier property for Draft3

See: #83 Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>
sourcemeta · Nov 2, 2022 · 6adb824 · 6adb824
1 parent 8733f80
commit 6adb824
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/bindings/node/index.js b/bindings/node/index.js
@@ -29,7 +29,7 @@ async function transformer (root, path, ruleset, trails, originalSchema, from) {
               return true
             }
 
-            if (_.has(root, trail.path.concat(from === 'draft4' ? 'id' : '$id'))) {
+            if (_.has(root, trail.path.concat(jsonschema.getIdProperty(from)))) {
               return false
             }
           }

diff --git a/bindings/node/jsonschema.js b/bindings/node/jsonschema.js
@@ -13,8 +13,12 @@ exports.usesVocabulary = (_root, value, _vocabulary) => {
   return false
 }
 
+exports.getIdProperty = (version) {
+  return [ 'draft3', 'draft4' ].includes(version) ? 'id' : '$id'
+}
+
 exports.matches = async (schema, value) => {
-  const idProperty = METASCHEMAS[schema.$schema] === 'draft4' ? 'id' : '$id'
+  const idProperty = exports.getIdProperty(METASCHEMAS[schema.$schema])
   jsonschema.add(schema)
   const result = await jsonschema.validate(jsonschema.get(schema[idProperty]), value)
   return result.valid