dist: update

sagold · Dec 6, 2024 · 4b1eef7 · 4b1eef7
1 parent 4eb6aa9
commit 4b1eef7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/dist/jsonSchemaLibrary.js b/dist/jsonSchemaLibrary.js
diff --git a/dist/lib/schemaNode.d.ts b/dist/lib/schemaNode.d.ts
@@ -11,7 +11,7 @@ export type SchemaNode = {
     draft: Draft;
     pointer: string;
     schema: JsonSchema;
-    path: JsonSchema[];
+    path: [string, JsonSchema][];
     next: typeof next;
     merge: typeof merge;
     resolveRef: typeof resolveRef;

diff --git a/dist/module/lib/resolveRef.js b/dist/module/lib/resolveRef.js
@@ -6,20 +6,22 @@ function resolveRecursiveRef(node) {
     // RESTRICT BY CHANGE IN BASE-URL
     let startIndex = 0;
     for (let i = history.length - 1; i >= 0; i--) {
-        if (history[i].$id && /^https?:\/\//.test(history[i].$id) && history[i].$recursiveAnchor !== true) {
+        const step = history[i][1];
+        if (step.$id && /^https?:\/\//.test(step.$id) && step.$recursiveAnchor !== true) {
             startIndex = i;
             break;
         }
     }
     // FROM THERE FIND FIRST OCCURENCE OF ANCHOR
-    const firstAnchor = history.find((s, index) => index >= startIndex && s.$recursiveAnchor === true);
+    const firstAnchor = history.find((s, index) => index >= startIndex && s[1].$recursiveAnchor === true);
     if (firstAnchor) {
-        return node.next(firstAnchor);
+        return node.next(firstAnchor[1]);
     }
     // THEN RETURN LATEST BASE AS TARGET
     for (let i = history.length - 1; i >= 0; i--) {
-        if (history[i].$id) {
-            return node.next(history[i]);
+        const step = history[i][1];
+        if (step.$id) {
+            return node.next(step);
         }
     }
     // OR RETURN ROOT

diff --git a/dist/module/lib/schemaNode.js b/dist/module/lib/schemaNode.js
@@ -8,7 +8,7 @@ function merge(schema, ...omit) {
     }
     const node = this;
     const mergedSchema = mergeSchema(node.schema, schema, ...omit);
-    return { ...node, schema: mergedSchema, path: [...node.path, node.schema] };
+    return { ...node, schema: mergedSchema, path: [...node.path, [node.pointer, node.schema]] };
 }
 function resolveRef() {
     const node = this;
@@ -29,7 +29,7 @@ function next(schema, key) {
         ...node,
         pointer: key ? `${node.pointer}/${key}` : node.pointer,
         schema,
-        path: [...node.path, node.schema]
+        path: [...node.path, [node.pointer, node.schema]]
     };
 }
 export function isSchemaNode(value) {