@apidevtools/json-schema-ref-parser 15.3.3 → 15.3.5

package/dist/lib/bundle.js

@@ -12,9 +12,12 @@ import { getSchemaBasePath } from "./util/schema-resources.js";
  */
 function bundle(parser, options) {
     // console.log('Bundling $ref pointers in %s', parser.$refs._root$Ref.path);
+    const rootScopeBase = parser.$refs._root$Ref.dynamicIdScope
+        ? getSchemaBasePath(parser.$refs._root$Ref.path, parser.schema)
+        : parser.$refs._root$Ref.path;
     // Build an inventory of all $ref pointers in the JSON Schema
     const inventory = [];
-    crawl(parser, "schema", parser.$refs._root$Ref.path + "#", parser.$refs._root$Ref.path, parser.$refs._root$Ref.dynamicIdScope, "#", 0, inventory, parser.$refs, options);
+    crawl(parser, "schema", parser.$refs._root$Ref.path + "#", rootScopeBase, parser.$refs._root$Ref.dynamicIdScope, "#", 0, inventory, parser.$refs, options);
     // Get the root schema's $id (if any) for qualifying refs inside sub-schemas with their own $id
     const rootId = parser.schema && typeof parser.schema === "object" && "$id" in parser.schema
         ? parser.schema.$id
@@ -44,8 +47,8 @@ function crawl(parent, key, path, scopeBase, dynamicIdScope, pathFromRoot, indir
     const bundleOptions = (options.bundle || {});
     const isExcludedPath = bundleOptions.excludedPathMatcher || (() => false);
     if (obj && typeof obj === "object" && !ArrayBuffer.isView(obj) && !isExcludedPath(pathFromRoot)) {
-        const currentScopeBase = dynamicIdScope ? getSchemaBasePath(scopeBase, obj) : scopeBase;
-        if ($Ref.isAllowed$Ref(obj, options, dynamicIdScope)) {
+        const currentScopeBase = scopeBase;
+        if ($Ref.isAllowed$Ref(obj)) {
             inventory$Ref(parent, key, path, currentScopeBase, dynamicIdScope, pathFromRoot, indirections, inventory, $refs, options);
         }
         else {
@@ -71,12 +74,14 @@ function crawl(parent, key, path, scopeBase, dynamicIdScope, pathFromRoot, indir
                 const keyPath = Pointer.join(path, key);
                 const keyPathFromRoot = Pointer.join(pathFromRoot, key);
                 const value = obj[key];
-                if ($Ref.isAllowed$Ref(value, options, dynamicIdScope)) {
-                    const valueScopeBase = dynamicIdScope ? getSchemaBasePath(currentScopeBase, value) : currentScopeBase;
-                    inventory$Ref(obj, key, keyPath, valueScopeBase, dynamicIdScope, keyPathFromRoot, indirections, inventory, $refs, options);
+                const childScopeBase = dynamicIdScope && value && typeof value === "object" && !ArrayBuffer.isView(value)
+                    ? getSchemaBasePath(currentScopeBase, value)
+                    : currentScopeBase;
+                if ($Ref.isAllowed$Ref(value)) {
+                    inventory$Ref(obj, key, keyPath, childScopeBase, dynamicIdScope, keyPathFromRoot, indirections, inventory, $refs, options);
                 }
                 else {
-                    crawl(obj, key, keyPath, currentScopeBase, dynamicIdScope, keyPathFromRoot, indirections, inventory, $refs, options);
+                    crawl(obj, key, keyPath, childScopeBase, dynamicIdScope, keyPathFromRoot, indirections, inventory, $refs, options);
                 }
                 // We need to ensure that we have an object to work with here because we may be crawling
                 // an `examples` schema and `value` may be nullish.

package/dist/lib/dereference.js

@@ -13,8 +13,11 @@ export default dereference;
  */
 function dereference(parser, options) {
     const start = Date.now();
+    const rootScopeBase = parser.$refs._root$Ref.dynamicIdScope
+        ? getSchemaBasePath(parser.$refs._root$Ref.path, parser.schema)
+        : parser.$refs._root$Ref.path;
     // console.log('Dereferencing $ref pointers in %s', parser.$refs._root$Ref.path);
-    const dereferenced = crawl(parser.schema, parser.$refs._root$Ref.path, parser.$refs._root$Ref.path, parser.$refs._root$Ref.dynamicIdScope, "#", new Set(), new Set(), new Map(), parser.$refs, options, start, 0);
+    const dereferenced = crawl(parser.schema, parser.$refs._root$Ref.path, rootScopeBase, parser.$refs._root$Ref.dynamicIdScope, "#", new Set(), new Set(), new Map(), parser.$refs, options, start, 0);
     parser.$refs.circular = dereferenced.circular;
     parser.schema = dereferenced.value;
 }
@@ -52,8 +55,8 @@ function crawl(obj, path, scopeBase, dynamicIdScope, pathFromRoot, parents, proc
         if (obj && typeof obj === "object" && !ArrayBuffer.isView(obj) && !isExcludedPath(pathFromRoot)) {
             parents.add(obj);
             processedObjects.add(obj);
-            const currentScopeBase = dynamicIdScope ? getSchemaBasePath(scopeBase, obj) : scopeBase;
-            if ($Ref.isAllowed$Ref(obj, options, dynamicIdScope)) {
+            const currentScopeBase = scopeBase;
+            if ($Ref.isAllowed$Ref(obj, options)) {
                 dereferenced = dereference$Ref(obj, path, currentScopeBase, dynamicIdScope, pathFromRoot, parents, processedObjects, dereferencedCache, $refs, options, startTime, depth);
                 result.circular = dereferenced.circular;
                 result.value = dereferenced.value;
@@ -67,10 +70,12 @@ function crawl(obj, path, scopeBase, dynamicIdScope, pathFromRoot, parents, proc
                         continue;
                     }
                     const value = obj[key];
+                    const childScopeBase = dynamicIdScope && value && typeof value === "object" && !ArrayBuffer.isView(value)
+                        ? getSchemaBasePath(currentScopeBase, value)
+                        : currentScopeBase;
                     let circular;
-                    if ($Ref.isAllowed$Ref(value, options, dynamicIdScope)) {
-                        const valueScopeBase = dynamicIdScope ? getSchemaBasePath(currentScopeBase, value) : currentScopeBase;
-                        dereferenced = dereference$Ref(value, keyPath, valueScopeBase, dynamicIdScope, keyPathFromRoot, parents, processedObjects, dereferencedCache, $refs, options, startTime, depth);
+                    if ($Ref.isAllowed$Ref(value, options)) {
+                        dereferenced = dereference$Ref(value, keyPath, childScopeBase, dynamicIdScope, keyPathFromRoot, parents, processedObjects, dereferencedCache, $refs, options, startTime, depth);
                         circular = dereferenced.circular;
                         // Avoid pointless mutations; breaks frozen objects to no profit
                         if (obj[key] !== dereferenced.value) {
@@ -107,7 +112,7 @@ function crawl(obj, path, scopeBase, dynamicIdScope, pathFromRoot, parents, proc
                     }
                     else {
                         if (!parents.has(value)) {
-                            dereferenced = crawl(value, keyPath, currentScopeBase, dynamicIdScope, keyPathFromRoot, parents, processedObjects, dereferencedCache, $refs, options, startTime, depth + 1);
+                            dereferenced = crawl(value, keyPath, childScopeBase, dynamicIdScope, keyPathFromRoot, parents, processedObjects, dereferencedCache, $refs, options, startTime, depth + 1);
                             circular = dereferenced.circular;
                             // Avoid pointless mutations; breaks frozen objects to no profit
                             if (obj[key] !== dereferenced.value) {
@@ -153,10 +158,18 @@ function dereference$Ref($ref, path, scopeBase, dynamicIdScope, pathFromRoot, pa
         // If the cached object however is _not_ circular and there are additional keys alongside our
         // `$ref` pointer here we should merge them back in and return that.
         if (!cache.circular) {
-            if (Object.keys($ref).length > 1) {
+            const refKeys = Object.keys($ref);
+            if (refKeys.length > 1) {
+                const extraKeys = {};
+                for (const key of refKeys) {
+                    if (key !== "$ref" && !(key in cache.value)) {
+                        // @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
+                        extraKeys[key] = $ref[key];
+                    }
+                }
                 return {
                     circular: cache.circular,
-                    value: $Ref.dereference($ref, cache.value, options, dynamicIdScope),
+                    value: Object.assign({}, cache.value, extraKeys),
                 };
             }
             return cache;
@@ -202,7 +215,7 @@ function dereference$Ref($ref, path, scopeBase, dynamicIdScope, pathFromRoot, pa
         foundCircularReference(path, $refs, options);
     }
     // Dereference the JSON reference
-    let dereferencedValue = $Ref.dereference($ref, pointer.value, options, dynamicIdScope);
+    let dereferencedValue = $Ref.dereference($ref, pointer.value, options);
     // Crawl the dereferenced value (unless it's circular)
     if (!circular) {
         // Determine if the dereferenced value is circular

package/dist/lib/pointer.js

@@ -74,7 +74,7 @@ class Pointer {
         const found = [];
         // Crawl the object, one token at a time
         this.value = unwrapOrThrow(obj);
-        if (this.$ref.dynamicIdScope) {
+        if (this.$ref.dynamicIdScope && !isAliasedResource(this.$ref)) {
             this.scopeBase = getSchemaBasePath(this.scopeBase, this.value);
         }
         for (let i = 0; i < tokens.length; i++) {
@@ -163,7 +163,7 @@ class Pointer {
         }
         // Crawl the object, one token at a time
         this.value = unwrapOrThrow(obj);
-        if (this.$ref.dynamicIdScope) {
+        if (this.$ref.dynamicIdScope && !isAliasedResource(this.$ref)) {
             this.scopeBase = getSchemaBasePath(this.scopeBase, this.value);
         }
         for (let i = 0; i < tokens.length - 1; i++) {
@@ -256,7 +256,7 @@ class Pointer {
  */
 function resolveIf$Ref(pointer, options, pathFromRoot) {
     // Is the value a JSON reference? (and allowed?)
-    if ($Ref.isAllowed$Ref(pointer.value, options, pointer.$ref.dynamicIdScope)) {
+    if ($Ref.isAllowed$Ref(pointer.value, options)) {
         const resolutionBase = pointer.$ref.dynamicIdScope ? pointer.scopeBase : pointer.path;
         const $refPath = url.resolve(resolutionBase, pointer.value.$ref);
         if ($refPath === pointer.path && !isRootPath(pathFromRoot)) {
@@ -272,10 +272,7 @@ function resolveIf$Ref(pointer, options, pathFromRoot) {
             if ($Ref.isExtended$Ref(pointer.value)) {
                 // This JSON reference "extends" the resolved value, rather than simply pointing to it.
                 // So the resolved path does NOT change.  Just the value does.
-                pointer.value = $Ref.dereference(pointer.value, resolved.value, options, pointer.$ref.dynamicIdScope);
-                if (pointer.$ref.dynamicIdScope) {
-                    pointer.scopeBase = getSchemaBasePath(pointer.scopeBase, pointer.value);
-                }
+                pointer.value = $Ref.dereference(pointer.value, resolved.value, options);
                 return false;
             }
             else {
@@ -283,9 +280,10 @@ function resolveIf$Ref(pointer, options, pathFromRoot) {
                 pointer.$ref = resolved.$ref;
                 pointer.path = resolved.path;
                 pointer.value = resolved.value;
-                pointer.scopeBase = pointer.$ref.dynamicIdScope
-                    ? getSchemaBasePath(pointer.$ref.path, pointer.value)
-                    : pointer.$ref.path;
+                // `pointer.$ref.path` is already the canonical location of the resolved resource.
+                // Re-applying the resource's own `$id` here would duplicate nested path segments
+                // such as `nested/nested/foo.json`.
+                pointer.scopeBase = pointer.$ref.path;
             }
             return true;
         }
@@ -327,3 +325,6 @@ function unwrapOrThrow(value) {
 function isRootPath(pathFromRoot) {
     return typeof pathFromRoot == "string" && Pointer.parse(pathFromRoot).length == 0;
 }
+function isAliasedResource($ref) {
+    return Boolean($ref.path && $ref.path in $ref.$refs._aliases);
+}

package/dist/lib/ref.d.ts

@@ -114,7 +114,7 @@ declare class $Ref<S extends object = JSONSchema, O extends ParserOptions<S> = P
      * @param options
      * @returns
      */
-    static isAllowed$Ref<S extends object = JSONSchema>(value: unknown, options?: ParserOptions<S>, allowPlainNameFragments?: boolean): true | undefined;
+    static isAllowed$Ref<S extends object = JSONSchema>(value: unknown, options?: ParserOptions<S>): true | undefined;
     /**
      * Determines whether the given value is a JSON reference that "extends" its resolved value.
      * That is, it has extra properties (in addition to "$ref"), so rather than simply pointing to
@@ -182,6 +182,6 @@ declare class $Ref<S extends object = JSONSchema, O extends ParserOptions<S> = P
      * @param options - The options
      * @returns - Returns the dereferenced value
      */
-    static dereference<S extends object = JSONSchema, O extends ParserOptions<S> = ParserOptions<S>>($ref: $Ref<S, O>, resolvedValue: S, options?: O, useSpecCompliantRefSiblings?: boolean): S;
+    static dereference<S extends object = JSONSchema, O extends ParserOptions<S> = ParserOptions<S>>($ref: $Ref<S, O>, resolvedValue: S, options?: O): S;
 }
 export default $Ref;

package/dist/lib/ref.js

@@ -170,16 +170,12 @@ class $Ref {
      * @param options
      * @returns
      */
-    static isAllowed$Ref(value, options, allowPlainNameFragments = false) {
+    static isAllowed$Ref(value, options) {
         if (this.is$Ref(value)) {
             if (value.$ref.substring(0, 2) === "#/" || value.$ref === "#") {
                 // It's a JSON Pointer reference, which is always allowed
                 return true;
             }
-            else if (allowPlainNameFragments && value.$ref[0] === "#") {
-                // JSON Schema 2019-09+ allows plain-name fragments declared via $anchor/$dynamicAnchor
-                return true;
-            }
             else if (value.$ref[0] !== "#" && (!options || options.resolve?.external)) {
                 // It's an external reference, which is allowed by the options
                 return true;
@@ -256,10 +252,7 @@ class $Ref {
      * @param options - The options
      * @returns - Returns the dereferenced value
      */
-    static dereference($ref, resolvedValue, options, useSpecCompliantRefSiblings = false) {
-        if ($Ref.isExtended$Ref($ref) && useSpecCompliantRefSiblings) {
-            return preserveRefSiblings($ref, resolvedValue);
-        }
+    static dereference($ref, resolvedValue, options) {
         if (resolvedValue && typeof resolvedValue === "object" && $Ref.isExtended$Ref($ref)) {
             const merged = {};
             for (const key of Object.keys($ref)) {
@@ -294,24 +287,6 @@ class $Ref {
         }
     }
 }
-function preserveRefSiblings(refValue, resolvedValue) {
-    const preserved = {};
-    const existingAllOf = "allOf" in refValue ? refValue.allOf : undefined;
-    for (const key of Object.keys(refValue)) {
-        if (key !== "$ref" && key !== "allOf") {
-            preserved[key] = refValue[key];
-        }
-    }
-    const allOf = [resolvedValue];
-    if (Array.isArray(existingAllOf)) {
-        allOf.push(...existingAllOf);
-    }
-    else if (existingAllOf !== undefined) {
-        allOf.push(existingAllOf);
-    }
-    preserved.allOf = allOf;
-    return preserved;
-}
 function deepMerge(target, source) {
     //return {...target, ...source};
     // If either isn't an object, just return source (overwrite)

package/dist/lib/refs.d.ts

@@ -80,7 +80,6 @@ export default class $Refs<S extends object = JSONSchema, O extends ParserOption
      */
     _add(path: string): $Ref<S, O>;
     _addAlias(path: string, value: S, pathType?: string | unknown, dynamicIdScope?: boolean): $Ref<S, O>;
-    _addExactAlias(path: string, targetPath: string): string;
     /**
      * Resolves the given JSON reference.
      *
@@ -99,7 +98,6 @@ export default class $Refs<S extends object = JSONSchema, O extends ParserOption
      */
     _$refs: $RefsMap<S, O>;
     _aliases: $RefsMap<S, O>;
-    _exactAliases: Record<string, string>;
     /**
      * The {@link $Ref} object that is the root of the JSON schema.
      *

package/dist/lib/refs.js

@@ -99,7 +99,7 @@ export default class $Refs {
      */
     _get$Ref(path) {
         path = url.resolve(this._root$Ref.path, path);
-        return this._getRef(this._exactAliases[path] || path);
+        return this._getRef(path);
     }
     /**
      * Creates a new {@link $Ref} object and adds it to this {@link $Refs} object.
@@ -127,13 +127,6 @@ export default class $Refs {
         this._aliases[withoutHash] = $ref;
         return $ref;
     }
-    _addExactAlias(path, targetPath) {
-        if (!path || this._exactAliases[path]) {
-            return this._exactAliases[path];
-        }
-        this._exactAliases[path] = targetPath;
-        return targetPath;
-    }
     /**
      * Resolves the given JSON reference.
      *
@@ -145,12 +138,11 @@ export default class $Refs {
      */
     _resolve(path, pathFromRoot, options) {
         const absPath = url.resolve(this._root$Ref.path, path);
-        const canonicalPath = this._exactAliases[absPath] || absPath;
-        const $ref = this._getRef(canonicalPath);
+        const $ref = this._getRef(absPath);
         if (!$ref) {
             throw new Error(`Error resolving $ref pointer "${path}". \n"${url.stripHash(absPath)}" not found.`);
         }
-        return $ref.resolve(canonicalPath, options, path, pathFromRoot);
+        return $ref.resolve(absPath, options, path, pathFromRoot);
     }
     /**
      * A map of paths/urls to {@link $Ref} objects
@@ -160,7 +152,6 @@ export default class $Refs {
      */
     _$refs = {};
     _aliases = {};
-    _exactAliases = {};
     /**
      * The {@link $Ref} object that is the root of the JSON schema.
      *
@@ -177,7 +168,6 @@ export default class $Refs {
         this.circular = false;
         this._$refs = {};
         this._aliases = {};
-        this._exactAliases = {};
         // @ts-ignore
         this._root$Ref = null;
     }

package/dist/lib/resolve-external.js

@@ -20,8 +20,11 @@ function resolveExternal(parser, options) {
         return Promise.resolve();
     }
     try {
+        const rootScopeBase = parser.$refs._root$Ref.dynamicIdScope
+            ? getSchemaBasePath(parser.$refs._root$Ref.path, parser.schema)
+            : parser.$refs._root$Ref.path;
         // console.log('Resolving $ref pointers in %s', parser.$refs._root$Ref.path);
-        const promises = crawl(parser.schema, parser.$refs._root$Ref.path + "#", parser.$refs._root$Ref.path, parser.$refs._root$Ref.dynamicIdScope, parser.$refs, options);
+        const promises = crawl(parser.schema, parser.$refs._root$Ref.path + "#", rootScopeBase, parser.$refs._root$Ref.dynamicIdScope, parser.$refs, options);
         return Promise.all(promises);
     }
     catch (e) {
@@ -49,7 +52,7 @@ function crawl(obj, path, scopeBase, dynamicIdScope, $refs, options, seen, exter
     let promises = [];
     if (obj && typeof obj === "object" && !ArrayBuffer.isView(obj) && !seen.has(obj)) {
         seen.add(obj); // Track previously seen objects to avoid infinite recursion
-        const currentScopeBase = dynamicIdScope ? getSchemaBasePath(scopeBase, obj) : scopeBase;
+        const currentScopeBase = scopeBase;
         if ($Ref.isExternal$Ref(obj)) {
             promises.push(resolve$Ref(obj, path, currentScopeBase, dynamicIdScope, $refs, options));
         }
@@ -57,7 +60,9 @@ function crawl(obj, path, scopeBase, dynamicIdScope, $refs, options, seen, exter
         for (const key of keys) {
             const keyPath = Pointer.join(path, key);
             const value = obj[key];
-            const childScopeBase = dynamicIdScope && $Ref.isExternal$Ref(value) ? getSchemaBasePath(currentScopeBase, value) : currentScopeBase;
+            const childScopeBase = dynamicIdScope && value && typeof value === "object" && !ArrayBuffer.isView(value)
+                ? getSchemaBasePath(currentScopeBase, value)
+                : currentScopeBase;
             promises = promises.concat(crawl(value, keyPath, childScopeBase, dynamicIdScope, $refs, options, seen, external));
         }
     }

package/dist/lib/util/schema-resources.js

@@ -20,22 +20,20 @@ export function registerSchemaResources($refs, basePath, value, pathType, dynami
         return;
     }
     const seen = new Set();
-    const visit = (node, scopeBase, pointerTokens) => {
+    const visit = (node, scopeBase) => {
         if (!node || typeof node !== "object" || ArrayBuffer.isView(node) || seen.has(node)) {
             return;
         }
         seen.add(node);
         const nextScopeBase = getSchemaBasePath(scopeBase, node);
-        const resourcePointerTokens = nextScopeBase === scopeBase ? pointerTokens : [];
         if (nextScopeBase !== scopeBase) {
             $refs._addAlias(nextScopeBase, node, pathType, dynamicIdScope);
         }
-        registerAnchorAliases($refs, nextScopeBase, resourcePointerTokens, node);
         for (const key of Object.keys(node)) {
-            visit(node[key], nextScopeBase, [...resourcePointerTokens, key]);
+            visit(node[key], nextScopeBase);
         }
     };
-    visit(value, basePath, []);
+    visit(value, basePath);
 }
 function getSchemaId(value) {
     if (value &&
@@ -47,26 +45,3 @@ function getSchemaId(value) {
     }
     return undefined;
 }
-function registerAnchorAliases($refs, scopeBase, pointerTokens, value) {
-    if (!value || typeof value !== "object" || ArrayBuffer.isView(value)) {
-        return;
-    }
-    const resourceBase = url.stripHash(scopeBase);
-    const targetPath = pointerTokens.length > 0 ? joinPointerPath(resourceBase, pointerTokens) : `${resourceBase}#`;
-    const anchors = [
-        value.$anchor,
-        value.$dynamicAnchor,
-    ];
-    for (const anchor of anchors) {
-        if (typeof anchor === "string" && anchor.length > 0) {
-            $refs._addExactAlias(`${resourceBase}#${anchor}`, targetPath);
-        }
-    }
-}
-function joinPointerPath(basePath, tokens) {
-    let path = `${basePath}#`;
-    for (const token of tokens) {
-        path += `/${token.replace(/~/g, "~0").replace(/\//g, "~1")}`;
-    }
-    return path;
-}

package/dist/lib/util/url.js

@@ -4,7 +4,7 @@ const protocolPattern = /^(\w{2,}):\/\//i;
 const jsonPointerSlash = /~1/g;
 const jsonPointerTilde = /~0/g;
 import { isWindows } from "./is-windows.js";
-const isAbsoluteWin32Path = /^[a-zA-Z]:\\/;
+const isAbsoluteWin32Path = /^[a-zA-Z]:[\\/]/;
 // RegExp patterns to URL-encode special characters in local filesystem paths
 const urlEncodePatterns = [
     [/\?/g, "%3F"],
@@ -381,6 +381,9 @@ export function fromFileSystemPath(path) {
  * Converts a URL to a local filesystem path.
  */
 export function toFileSystemPath(path, keepFileProtocol) {
+    // Bare "%" characters are valid in filesystem paths, but they make `decodeURI` throw.
+    // Escape only the non-encoded ones so percent-encoded sequences still decode normally.
+    path = path.replace(/%(?![0-9A-Fa-f]{2})/g, "%25");
     // Step 1: `decodeURI` will decode characters such as Cyrillic characters, spaces, etc.
     path = decodeURI(path);
     // Step 2: Manually decode characters that are not decoded by `decodeURI`.

package/lib/bundle.ts

@@ -35,6 +35,9 @@ function bundle<S extends object = JSONSchema, O extends ParserOptions<S> = Pars
   options: O,
 ) {
   // console.log('Bundling $ref pointers in %s', parser.$refs._root$Ref.path);
+  const rootScopeBase = parser.$refs._root$Ref.dynamicIdScope
+    ? getSchemaBasePath(parser.$refs._root$Ref.path!, parser.schema)
+    : parser.$refs._root$Ref.path!;
 
   // Build an inventory of all $ref pointers in the JSON Schema
   const inventory: InventoryEntry[] = [];
@@ -42,7 +45,7 @@ function bundle<S extends object = JSONSchema, O extends ParserOptions<S> = Pars
     parser,
     "schema",
     parser.$refs._root$Ref.path + "#",
-    parser.$refs._root$Ref.path!,
+    rootScopeBase,
     parser.$refs._root$Ref.dynamicIdScope,
     "#",
     0,
@@ -96,8 +99,8 @@ function crawl<S extends object = JSONSchema, O extends ParserOptions<S> = Parse
   const isExcludedPath = bundleOptions.excludedPathMatcher || (() => false);
 
   if (obj && typeof obj === "object" && !ArrayBuffer.isView(obj) && !isExcludedPath(pathFromRoot)) {
-    const currentScopeBase = dynamicIdScope ? getSchemaBasePath(scopeBase, obj) : scopeBase;
-    if ($Ref.isAllowed$Ref(obj, options, dynamicIdScope)) {
+    const currentScopeBase = scopeBase;
+    if ($Ref.isAllowed$Ref(obj)) {
       inventory$Ref(parent, key, path, currentScopeBase, dynamicIdScope, pathFromRoot, indirections, inventory, $refs, options);
     } else {
       // Crawl the object in a specific order that's optimized for bundling.
@@ -121,14 +124,17 @@ function crawl<S extends object = JSONSchema, O extends ParserOptions<S> = Parse
         const keyPath = Pointer.join(path, key);
         const keyPathFromRoot = Pointer.join(pathFromRoot, key);
         const value = obj[key];
+        const childScopeBase =
+          dynamicIdScope && value && typeof value === "object" && !ArrayBuffer.isView(value)
+            ? getSchemaBasePath(currentScopeBase, value)
+            : currentScopeBase;
 
-        if ($Ref.isAllowed$Ref(value, options, dynamicIdScope)) {
-          const valueScopeBase = dynamicIdScope ? getSchemaBasePath(currentScopeBase, value) : currentScopeBase;
+        if ($Ref.isAllowed$Ref(value)) {
           inventory$Ref(
             obj,
             key,
             keyPath,
-            valueScopeBase,
+            childScopeBase,
             dynamicIdScope,
             keyPathFromRoot,
             indirections,
@@ -137,7 +143,7 @@ function crawl<S extends object = JSONSchema, O extends ParserOptions<S> = Parse
             options,
           );
         } else {
-          crawl(obj, key, keyPath, currentScopeBase, dynamicIdScope, keyPathFromRoot, indirections, inventory, $refs, options);
+          crawl(obj, key, keyPath, childScopeBase, dynamicIdScope, keyPathFromRoot, indirections, inventory, $refs, options);
         }
 
         // We need to ensure that we have an object to work with here because we may be crawling

package/lib/dereference.ts

@@ -21,11 +21,14 @@ function dereference<S extends object = JSONSchema, O extends ParserOptions<S> =
   options: O,
 ) {
   const start = Date.now();
+  const rootScopeBase = parser.$refs._root$Ref.dynamicIdScope
+    ? getSchemaBasePath(parser.$refs._root$Ref.path!, parser.schema)
+    : parser.$refs._root$Ref.path!;
   // console.log('Dereferencing $ref pointers in %s', parser.$refs._root$Ref.path);
   const dereferenced = crawl<S, O>(
     parser.schema,
     parser.$refs._root$Ref.path!,
-    parser.$refs._root$Ref.path!,
+    rootScopeBase,
     parser.$refs._root$Ref.dynamicIdScope,
     "#",
     new Set(),
@@ -92,9 +95,9 @@ function crawl<S extends object = JSONSchema, O extends ParserOptions<S> = Parse
     if (obj && typeof obj === "object" && !ArrayBuffer.isView(obj) && !isExcludedPath(pathFromRoot)) {
       parents.add(obj);
       processedObjects.add(obj);
-      const currentScopeBase = dynamicIdScope ? getSchemaBasePath(scopeBase, obj) : scopeBase;
+      const currentScopeBase = scopeBase;
 
-      if ($Ref.isAllowed$Ref(obj, options, dynamicIdScope)) {
+      if ($Ref.isAllowed$Ref(obj, options)) {
         dereferenced = dereference$Ref(
           obj,
           path,
@@ -123,14 +126,17 @@ function crawl<S extends object = JSONSchema, O extends ParserOptions<S> = Parse
           }
 
           const value = obj[key];
+          const childScopeBase =
+            dynamicIdScope && value && typeof value === "object" && !ArrayBuffer.isView(value)
+              ? getSchemaBasePath(currentScopeBase, value)
+              : currentScopeBase;
           let circular;
 
-          if ($Ref.isAllowed$Ref(value, options, dynamicIdScope)) {
-            const valueScopeBase = dynamicIdScope ? getSchemaBasePath(currentScopeBase, value) : currentScopeBase;
+          if ($Ref.isAllowed$Ref(value, options)) {
             dereferenced = dereference$Ref(
               value,
               keyPath,
-              valueScopeBase,
+              childScopeBase,
               dynamicIdScope,
               keyPathFromRoot,
               parents,
@@ -183,7 +189,7 @@ function crawl<S extends object = JSONSchema, O extends ParserOptions<S> = Parse
               dereferenced = crawl(
                 value,
                 keyPath,
-                currentScopeBase,
+                childScopeBase,
                 dynamicIdScope,
                 keyPathFromRoot,
                 parents,
@@ -257,10 +263,18 @@ function dereference$Ref<S extends object = JSONSchema, O extends ParserOptions<
     // If the cached object however is _not_ circular and there are additional keys alongside our
     // `$ref` pointer here we should merge them back in and return that.
     if (!cache.circular) {
-      if (Object.keys($ref).length > 1) {
+      const refKeys = Object.keys($ref);
+      if (refKeys.length > 1) {
+        const extraKeys = {};
+        for (const key of refKeys) {
+          if (key !== "$ref" && !(key in cache.value)) {
+            // @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
+            extraKeys[key] = $ref[key];
+          }
+        }
         return {
           circular: cache.circular,
-          value: $Ref.dereference($ref, cache.value, options, dynamicIdScope),
+          value: Object.assign({}, cache.value, extraKeys),
         };
       }
 
@@ -310,7 +324,7 @@ function dereference$Ref<S extends object = JSONSchema, O extends ParserOptions<
   }
 
   // Dereference the JSON reference
-  let dereferencedValue = $Ref.dereference($ref, pointer.value, options, dynamicIdScope);
+  let dereferencedValue = $Ref.dereference($ref, pointer.value, options);
 
   // Crawl the dereferenced value (unless it's circular)
   if (!circular) {

package/lib/pointer.ts

@@ -95,7 +95,7 @@ class Pointer<S extends object = JSONSchema, O extends ParserOptions<S> = Parser
 
     // Crawl the object, one token at a time
     this.value = unwrapOrThrow(obj);
-    if (this.$ref.dynamicIdScope) {
+    if (this.$ref.dynamicIdScope && !isAliasedResource(this.$ref)) {
       this.scopeBase = getSchemaBasePath(this.scopeBase, this.value);
     }
 
@@ -196,7 +196,7 @@ class Pointer<S extends object = JSONSchema, O extends ParserOptions<S> = Parser
 
     // Crawl the object, one token at a time
     this.value = unwrapOrThrow(obj);
-    if (this.$ref.dynamicIdScope) {
+    if (this.$ref.dynamicIdScope && !isAliasedResource(this.$ref)) {
       this.scopeBase = getSchemaBasePath(this.scopeBase, this.value);
     }
 
@@ -308,7 +308,7 @@ function resolveIf$Ref<S extends object = JSONSchema, O extends ParserOptions<S>
 ) {
   // Is the value a JSON reference? (and allowed?)
 
-  if ($Ref.isAllowed$Ref(pointer.value, options, pointer.$ref.dynamicIdScope)) {
+  if ($Ref.isAllowed$Ref(pointer.value, options)) {
     const resolutionBase = pointer.$ref.dynamicIdScope ? pointer.scopeBase : pointer.path;
     const $refPath = url.resolve(resolutionBase, pointer.value.$ref);
 
@@ -326,19 +326,17 @@ function resolveIf$Ref<S extends object = JSONSchema, O extends ParserOptions<S>
       if ($Ref.isExtended$Ref(pointer.value)) {
         // This JSON reference "extends" the resolved value, rather than simply pointing to it.
         // So the resolved path does NOT change.  Just the value does.
-        pointer.value = $Ref.dereference(pointer.value, resolved.value, options, pointer.$ref.dynamicIdScope);
-        if (pointer.$ref.dynamicIdScope) {
-          pointer.scopeBase = getSchemaBasePath(pointer.scopeBase, pointer.value);
-        }
+        pointer.value = $Ref.dereference(pointer.value, resolved.value, options);
         return false;
       } else {
         // Resolve the reference
         pointer.$ref = resolved.$ref;
         pointer.path = resolved.path;
         pointer.value = resolved.value;
-        pointer.scopeBase = pointer.$ref.dynamicIdScope
-          ? getSchemaBasePath(pointer.$ref.path!, pointer.value)
-          : pointer.$ref.path!;
+        // `pointer.$ref.path` is already the canonical location of the resolved resource.
+        // Re-applying the resource's own `$id` here would duplicate nested path segments
+        // such as `nested/nested/foo.json`.
+        pointer.scopeBase = pointer.$ref.path!;
       }
 
       return true;
@@ -385,3 +383,7 @@ function unwrapOrThrow(value: unknown) {
 function isRootPath(pathFromRoot: string | unknown): boolean {
   return typeof pathFromRoot == "string" && Pointer.parse(pathFromRoot).length == 0;
 }
+
+function isAliasedResource($ref: $Ref<any, any>) {
+  return Boolean($ref.path && $ref.path in $ref.$refs._aliases);
+}

package/lib/ref.ts

@@ -199,18 +199,11 @@ class $Ref<S extends object = JSONSchema, O extends ParserOptions<S> = ParserOpt
    * @param options
    * @returns
    */
-  static isAllowed$Ref<S extends object = JSONSchema>(
-    value: unknown,
-    options?: ParserOptions<S>,
-    allowPlainNameFragments = false,
-  ) {
+  static isAllowed$Ref<S extends object = JSONSchema>(value: unknown, options?: ParserOptions<S>) {
     if (this.is$Ref(value)) {
       if (value.$ref.substring(0, 2) === "#/" || value.$ref === "#") {
         // It's a JSON Pointer reference, which is always allowed
         return true;
-      } else if (allowPlainNameFragments && value.$ref[0] === "#") {
-        // JSON Schema 2019-09+ allows plain-name fragments declared via $anchor/$dynamicAnchor
-        return true;
       } else if (value.$ref[0] !== "#" && (!options || options.resolve?.external)) {
         // It's an external reference, which is allowed by the options
         return true;
@@ -293,12 +286,7 @@ class $Ref<S extends object = JSONSchema, O extends ParserOptions<S> = ParserOpt
     $ref: $Ref<S, O>,
     resolvedValue: S,
     options?: O,
-    useSpecCompliantRefSiblings = false,
   ): S {
-    if ($Ref.isExtended$Ref($ref) && useSpecCompliantRefSiblings) {
-      return preserveRefSiblings($ref, resolvedValue) as S;
-    }
-
     if (resolvedValue && typeof resolvedValue === "object" && $Ref.isExtended$Ref($ref)) {
       const merged = {} as Partial<S>;
       for (const key of Object.keys($ref)) {
@@ -337,27 +325,6 @@ class $Ref<S extends object = JSONSchema, O extends ParserOptions<S> = ParserOpt
   }
 }
 
-function preserveRefSiblings<T>(refValue: Record<string, any>, resolvedValue: T): T {
-  const preserved = {} as Record<string, any>;
-  const existingAllOf = "allOf" in refValue ? refValue.allOf : undefined;
-
-  for (const key of Object.keys(refValue)) {
-    if (key !== "$ref" && key !== "allOf") {
-      preserved[key] = refValue[key];
-    }
-  }
-
-  const allOf = [resolvedValue];
-  if (Array.isArray(existingAllOf)) {
-    allOf.push(...existingAllOf);
-  } else if (existingAllOf !== undefined) {
-    allOf.push(existingAllOf);
-  }
-
-  preserved.allOf = allOf;
-  return preserved as T;
-}
-
 function deepMerge<T>(target: Partial<T>, source: Partial<T>): T {
   //return {...target, ...source};
 

package/lib/refs.ts

@@ -112,7 +112,7 @@ export default class $Refs<S extends object = JSONSchema, O extends ParserOption
    */
   _get$Ref(path: string) {
     path = url.resolve(this._root$Ref.path!, path);
-    return this._getRef(this._exactAliases[path] || path);
+    return this._getRef(path);
   }
 
   /**
@@ -149,15 +149,6 @@ export default class $Refs<S extends object = JSONSchema, O extends ParserOption
     return $ref;
   }
 
-  _addExactAlias(path: string, targetPath: string) {
-    if (!path || this._exactAliases[path]) {
-      return this._exactAliases[path];
-    }
-
-    this._exactAliases[path] = targetPath;
-    return targetPath;
-  }
-
   /**
    * Resolves the given JSON reference.
    *
@@ -169,14 +160,13 @@ export default class $Refs<S extends object = JSONSchema, O extends ParserOption
    */
   _resolve(path: string, pathFromRoot: string, options?: O) {
     const absPath = url.resolve(this._root$Ref.path!, path);
-    const canonicalPath = this._exactAliases[absPath] || absPath;
-    const $ref = this._getRef(canonicalPath);
+    const $ref = this._getRef(absPath);
 
     if (!$ref) {
       throw new Error(`Error resolving $ref pointer "${path}". \n"${url.stripHash(absPath)}" not found.`);
     }
 
-    return $ref.resolve(canonicalPath, options, path, pathFromRoot);
+    return $ref.resolve(absPath, options, path, pathFromRoot);
   }
 
   /**
@@ -189,8 +179,6 @@ export default class $Refs<S extends object = JSONSchema, O extends ParserOption
 
   _aliases: $RefsMap<S, O> = {};
 
-  _exactAliases: Record<string, string> = {};
-
   /**
    * The {@link $Ref} object that is the root of the JSON schema.
    *
@@ -209,7 +197,6 @@ export default class $Refs<S extends object = JSONSchema, O extends ParserOption
 
     this._$refs = {};
     this._aliases = {};
-    this._exactAliases = {};
 
     // @ts-ignore
     this._root$Ref = null;

package/lib/resolve-external.ts

@@ -29,11 +29,14 @@ function resolveExternal<S extends object = JSONSchema, O extends ParserOptions<
   }
 
   try {
+    const rootScopeBase = parser.$refs._root$Ref.dynamicIdScope
+      ? getSchemaBasePath(parser.$refs._root$Ref.path!, parser.schema)
+      : parser.$refs._root$Ref.path!;
     // console.log('Resolving $ref pointers in %s', parser.$refs._root$Ref.path);
     const promises = crawl(
       parser.schema,
       parser.$refs._root$Ref.path + "#",
-      parser.$refs._root$Ref.path!,
+      rootScopeBase,
       parser.$refs._root$Ref.dynamicIdScope,
       parser.$refs,
       options,
@@ -75,7 +78,7 @@ function crawl<S extends object = JSONSchema, O extends ParserOptions<S> = Parse
 
   if (obj && typeof obj === "object" && !ArrayBuffer.isView(obj) && !seen.has(obj)) {
     seen.add(obj); // Track previously seen objects to avoid infinite recursion
-    const currentScopeBase = dynamicIdScope ? getSchemaBasePath(scopeBase, obj) : scopeBase;
+    const currentScopeBase = scopeBase;
     if ($Ref.isExternal$Ref(obj)) {
       promises.push(resolve$Ref<S, O>(obj, path, currentScopeBase, dynamicIdScope, $refs, options));
     }
@@ -85,7 +88,9 @@ function crawl<S extends object = JSONSchema, O extends ParserOptions<S> = Parse
       const keyPath = Pointer.join(path, key);
       const value = obj[key as keyof typeof obj] as string | JSONSchema | Buffer | undefined;
       const childScopeBase =
-        dynamicIdScope && $Ref.isExternal$Ref(value) ? getSchemaBasePath(currentScopeBase, value) : currentScopeBase;
+        dynamicIdScope && value && typeof value === "object" && !ArrayBuffer.isView(value)
+          ? getSchemaBasePath(currentScopeBase, value)
+          : currentScopeBase;
       promises = promises.concat(crawl(value, keyPath, childScopeBase, dynamicIdScope, $refs, options, seen, external));
     }
   }

package/lib/util/schema-resources.ts

@@ -38,7 +38,7 @@ export function registerSchemaResources<S extends object = JSONSchema, O extends
 
   const seen = new Set<object>();
 
-  const visit = (node: unknown, scopeBase: string, pointerTokens: string[]) => {
+  const visit = (node: unknown, scopeBase: string) => {
     if (!node || typeof node !== "object" || ArrayBuffer.isView(node) || seen.has(node)) {
       return;
     }
@@ -46,18 +46,16 @@ export function registerSchemaResources<S extends object = JSONSchema, O extends
     seen.add(node);
 
     const nextScopeBase = getSchemaBasePath(scopeBase, node);
-    const resourcePointerTokens = nextScopeBase === scopeBase ? pointerTokens : [];
     if (nextScopeBase !== scopeBase) {
       $refs._addAlias(nextScopeBase, node as S, pathType, dynamicIdScope);
     }
-    registerAnchorAliases($refs, nextScopeBase, resourcePointerTokens, node);
 
     for (const key of Object.keys(node)) {
-      visit((node as Record<string, unknown>)[key], nextScopeBase, [...resourcePointerTokens, key]);
+      visit((node as Record<string, unknown>)[key], nextScopeBase);
     }
   };
 
-  visit(value, basePath, []);
+  visit(value, basePath);
 }
 
 function getSchemaId(value: unknown): string | undefined {
@@ -73,37 +71,3 @@ function getSchemaId(value: unknown): string | undefined {
 
   return undefined;
 }
-
-function registerAnchorAliases<S extends object = JSONSchema, O extends ParserOptions<S> = ParserOptions<S>>(
-  $refs: $Refs<S, O>,
-  scopeBase: string,
-  pointerTokens: string[],
-  value: unknown,
-) {
-  if (!value || typeof value !== "object" || ArrayBuffer.isView(value)) {
-    return;
-  }
-
-  const resourceBase = url.stripHash(scopeBase);
-  const targetPath = pointerTokens.length > 0 ? joinPointerPath(resourceBase, pointerTokens) : `${resourceBase}#`;
-  const anchors = [
-    (value as { $anchor?: unknown }).$anchor,
-    (value as { $dynamicAnchor?: unknown }).$dynamicAnchor,
-  ];
-
-  for (const anchor of anchors) {
-    if (typeof anchor === "string" && anchor.length > 0) {
-      $refs._addExactAlias(`${resourceBase}#${anchor}`, targetPath);
-    }
-  }
-}
-
-function joinPointerPath(basePath: string, tokens: string[]) {
-  let path = `${basePath}#`;
-
-  for (const token of tokens) {
-    path += `/${token.replace(/~/g, "~0").replace(/\//g, "~1")}`;
-  }
-
-  return path;
-}

package/lib/util/url.ts

@@ -7,7 +7,7 @@ const jsonPointerTilde = /~0/g;
 
 import { isWindows } from "./is-windows.js";
 
-const isAbsoluteWin32Path = /^[a-zA-Z]:\\/;
+const isAbsoluteWin32Path = /^[a-zA-Z]:[\\/]/;
 
 // RegExp patterns to URL-encode special characters in local filesystem paths
 const urlEncodePatterns = [
@@ -426,6 +426,10 @@ export function fromFileSystemPath(path: string) {
  * Converts a URL to a local filesystem path.
  */
 export function toFileSystemPath(path: string | undefined, keepFileProtocol?: boolean): string {
+  // Bare "%" characters are valid in filesystem paths, but they make `decodeURI` throw.
+  // Escape only the non-encoded ones so percent-encoded sequences still decode normally.
+  path = path!.replace(/%(?![0-9A-Fa-f]{2})/g, "%25");
+
   // Step 1: `decodeURI` will decode characters such as Cyrillic characters, spaces, etc.
   path = decodeURI(path!);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apidevtools/json-schema-ref-parser",
-  "version": "15.3.3",
+  "version": "15.3.5",
   "description": "Parse, Resolve, and Dereference JSON Schema $ref pointers",
   "type": "module",
   "types": "dist/lib/index.d.ts",
@@ -15,7 +15,7 @@
     "test": "vitest --coverage",
     "test:specific": "vitest invalid",
     "test:node": "yarn test",
-    "test:browser": "cross-env BROWSER=\"true\" yarn test",
+    "test:browser": "node ./test/fixtures/run-browser-tests.mjs",
     "test:update": "vitest -u",
     "test:watch": "vitest -w"
   },
@@ -83,7 +83,7 @@
     "@types/node": "^25",
     "@typescript-eslint/eslint-plugin": "^8.57.2",
     "@typescript-eslint/parser": "^8.57.2",
-    "@vitest/coverage-v8": "^4.1.1",
+    "@vitest/coverage-v8": "^4.1.2",
     "cross-env": "^10.1.0",
     "eslint": "^10.1.0",
     "eslint-config-prettier": "^10.1.8",
@@ -97,7 +97,7 @@
     "rimraf": "^6.1.3",
     "typescript": "^6.0.2",
     "typescript-eslint": "^8.57.2",
-    "vitest": "^4.1.1"
+    "vitest": "^4.1.2"
   },
   "release": {
     "branches": [