@hey-api/json-schema-ref-parser 1.3.0 → 1.3.1

package/dist/index.mjs

@@ -751,10 +751,22 @@ const inventory$Ref = ({ $refKey, $refParent, $refs, indirections, inventory, in
 			pointer = $refs._resolve($refPath, pathFromRoot, options);
 		} catch (error) {
 			if (error instanceof MissingPointerError) {
-				console.warn(`Skipping unresolvable $ref: ${$refPath}`);
-				return;
-			}
-			throw error;
+				const hash$1 = getHash($refPath);
+				if (hash$1) {
+					const baseFile = stripHash($refPath);
+					for (const filePath of Object.keys($refs._$refs)) {
+						if (filePath === baseFile) continue;
+						try {
+							pointer = $refs._resolve(filePath + hash$1, pathFromRoot, options);
+							if (pointer) break;
+						} catch {}
+					}
+				}
+				if (!pointer) {
+					console.warn(`Skipping unresolvable $ref: ${$refPath}`);
+					return;
+				}
+			} else throw error;
 		}
 		if (pointer) resolvedRefs.set($refPath, pointer);
 	}
@@ -787,19 +799,23 @@ const inventory$Ref = ({ $refKey, $refParent, $refs, indirections, inventory, in
 	};
 	inventory.push(newEntry);
 	inventoryLookup.add(newEntry);
-	if (!existingEntry || external) crawl$1({
-		$refs,
-		indirections: indirections + 1,
-		inventory,
-		inventoryLookup,
-		key: null,
-		options,
-		parent: pointer.value,
-		path: pointer.path,
-		pathFromRoot,
-		resolvedRefs,
-		visitedObjects
-	});
+	if (!existingEntry || external) {
+		let crawlPath = pointer.path;
+		if (file !== stripHash($refPath)) crawlPath = file + getHash(pointer.path);
+		crawl$1({
+			$refs,
+			indirections: indirections + 1,
+			inventory,
+			inventoryLookup,
+			key: null,
+			options,
+			parent: pointer.value,
+			path: crawlPath,
+			pathFromRoot,
+			resolvedRefs,
+			visitedObjects
+		});
+	}
 };
 /**
 * Recursively crawls the given value, and inventories all JSON references.
@@ -1009,7 +1025,11 @@ function remap(parser, inventory) {
 					if (mapped && typeof mapped === "string") proposedBase = mapped;
 				}
 			} catch {}
-			defName = uniqueName(container, `${proposedBase}_${lastToken(entry.hash)}`);
+			const schemaName = lastToken(entry.hash);
+			let proposed = schemaName;
+			if (!usedNamesByObj.has(container)) usedNamesByObj.set(container, new Set(Object.keys(container || {})));
+			if (usedNamesByObj.get(container).has(proposed)) proposed = `${proposedBase}_${schemaName}`;
+			defName = uniqueName(container, proposed);
 			namesForPrefix.set(targetKey, defName);
 			container[defName] = entry.value;
 		}
@@ -1864,12 +1884,25 @@ var $RefParser = class {
 					merged.components[sec][newName] = cloneAndRewrite(val, refMap, tagMap, prefix, stripHash(sourcePath));
 				}
 			}
+			const HTTP_METHODS = new Set([
+				"delete",
+				"get",
+				"head",
+				"options",
+				"patch",
+				"post",
+				"put",
+				"trace"
+			]);
 			const srcPaths = schema.paths || {};
-			for (const [p, item] of Object.entries(srcPaths)) {
-				let targetPath = p;
-				if (merged.paths[p]) targetPath = `/${prefix}/${p.startsWith("/") ? p.substring(1) : p}`;
-				merged.paths[targetPath] = cloneAndRewrite(item, refMap, tagMap, prefix, stripHash(sourcePath));
-			}
+			for (const [p, item] of Object.entries(srcPaths)) if (merged.paths[p]) {
+				const hasMethodConflict = Object.keys(item).filter((k) => HTTP_METHODS.has(k)).some((m) => merged.paths[p][m] !== void 0);
+				const rewritten = cloneAndRewrite(item, refMap, tagMap, prefix, stripHash(sourcePath));
+				if (hasMethodConflict) {
+					const trimmed = p.startsWith("/") ? p.substring(1) : p;
+					merged.paths[`/${prefix}/${trimmed}`] = rewritten;
+				} else Object.assign(merged.paths[p], rewritten);
+			} else merged.paths[p] = cloneAndRewrite(item, refMap, tagMap, prefix, stripHash(sourcePath));
 		}
 		if (tags.length > 0) merged.tags = tags;
 		const rootPath = this.schemaManySources[0] || cwd();