@hyperjump/json-schema 0.23.3 → 0.23.5

package/lib/keywords/additionalItems6.js

@@ -17,7 +17,16 @@ const interpret = ([numberOfItems, additionalItems], instance, ast, dynamicAncho
 };
 
 const collectEvaluatedItems = (keywordValue, instance, ast, dynamicAnchors) => {
-  return interpret(keywordValue, instance, ast, dynamicAnchors) && new Set(Instance.map((item, ndx) => ndx, instance));
+  if (!interpret(keywordValue, instance, ast, dynamicAnchors)) {
+    return false;
+  }
+
+  const evaluatedIndexes = new Set();
+  for (let ndx = keywordValue[0]; ndx < Instance.length(instance); ndx++) {
+    evaluatedIndexes.add(ndx);
+  }
+
+  return evaluatedIndexes;
 };
 
 module.exports = { compile, interpret, collectEvaluatedItems };

package/lib/keywords/dynamicRef.js

@@ -6,15 +6,14 @@ const compile = async (dynamicRef, ast) => {
   const [, fragment] = splitUrl(Schema.value(dynamicRef));
   const referencedSchema = await Schema.get(Schema.value(dynamicRef), dynamicRef);
   await Core.compileSchema(referencedSchema, ast);
-  return [referencedSchema.id, fragment];
+  return [referencedSchema.id, fragment, Schema.uri(referencedSchema)];
 };
 
-const interpret = ([id, fragment], instance, ast, dynamicAnchors) => {
+const interpret = ([id, fragment, ref], instance, ast, dynamicAnchors) => {
   if (fragment in ast.metaData[id].dynamicAnchors) {
     return Core.interpretSchema(dynamicAnchors[fragment], instance, ast, dynamicAnchors);
   } else {
-    const pointer = Schema.getAnchorPointer(ast.metaData[id], fragment);
-    return Core.interpretSchema(`${id}#${encodeURI(pointer)}`, instance, ast, dynamicAnchors);
+    return Core.interpretSchema(ref, instance, ast, dynamicAnchors);
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperjump/json-schema",
-  "version": "0.23.3",
+  "version": "0.23.5",
   "description": "A JSON Schema Validator",
   "main": "lib/index.js",
   "exports": {
@@ -13,7 +13,7 @@
     "test": "mocha --require ts-node/register 'lib/**/*.spec.ts'",
     "build": "rollup --config rollup.config.js",
     "prepublishOnly": "npm run build",
-    "postinstall": "node -e \"require('fs').rmSync('dist', { recursive: true })\""
+    "postinstall": "node -e \"require('fs').rmSync('dist', { force: true, recursive: true })\""
   },
   "repository": "github:hyperjump-io/json-schema-validator",
   "keywords": [
@@ -35,6 +35,7 @@
   "devDependencies": {
     "@rollup/plugin-commonjs": "*",
     "@rollup/plugin-node-resolve": "*",
+    "@rollup/plugin-terser": "*",
     "@types/chai": "*",
     "@types/mocha": "*",
     "@typescript-eslint/eslint-plugin": "*",
@@ -48,12 +49,12 @@
     "mocha": "*",
     "rimraf": "*",
     "rollup": "*",
-    "rollup-plugin-terser": "*",
     "ts-node": "*",
     "typescript": "*"
   },
   "dependencies": {
     "@hyperjump/json-schema-core": "^0.28.0",
-    "fastest-stable-stringify": "^2.0.2"
+    "fastest-stable-stringify": "^2.0.2",
+    "just-curry-it": "^5.3.0"
   }
 }