@orval/core 8.5.2 → 8.5.3

package/dist/index.d.mts

@@ -2018,14 +2018,16 @@ declare function toObjectString<T>(props: T[], path?: keyof T): string;
  */
 declare function getNumberWord(num: number): string;
 /**
- * Escapes a specific character in a string by prefixing it with a backslash.
+ * Escapes a specific character in a string by prefixing all of its occurrences with a backslash.
  *
  * @param str - The string to escape, or null.
  * @param char - The character to escape. Defaults to single quote (').
  * @returns The escaped string, or null if the input is null.
  * @example
  * escape("don't") // returns "don\'t"
+ * escape("it's John's") // returns "it\'s John\'s"
  * escape('say "hello"', '"') // returns 'say \\"hello\\"'
+ * escape("a'''b", "'") // returns "a\'\'\'b"
  */
 declare function escape(str: string | null, char?: string): string | undefined;
 /**

package/dist/index.mjs

@@ -2,7 +2,7 @@ import { t as __exportAll } from "./chunk-C7Uep-_p.mjs";
 import { createRequire } from "node:module";
 import { entries, groupBy, isArray, isBoolean, isBoolean as isBoolean$1, isEmptyish, isFunction, isNullish, isNullish as isNullish$1, isNumber, isString, isString as isString$1, prop, unique, uniqueBy, uniqueWith } from "remeda";
 import { keyword } from "esutils";
-import path from "node:path";
+import nodePath from "node:path";
 import { compare } from "compare-versions";
 import debug from "debug";
 import { pathToFileURL } from "node:url";
@@ -134,7 +134,7 @@ function isReference(obj) {
 	return !isNullish$1(obj) && Object.hasOwn(obj, "$ref");
 }
 function isDirectory(pathValue) {
-	return !path.extname(pathValue);
+	return !nodePath.extname(pathValue);
 }
 function isObject(x) {
 	return Object.prototype.toString.call(x) === "[object Object]";
@@ -461,14 +461,14 @@ async function dynamicImport(toImport, from = process.cwd(), takeDefault = true)
 	if (!toImport) return toImport;
 	try {
 		if (isString(toImport)) {
-			const fileUrl = pathToFileURL(path.resolve(from, toImport));
-			const data = path.extname(fileUrl.href) === ".json" ? await import(fileUrl.href, { with: { type: "json" } }) : await import(fileUrl.href);
+			const fileUrl = pathToFileURL(nodePath.resolve(from, toImport));
+			const data = nodePath.extname(fileUrl.href) === ".json" ? await import(fileUrl.href, { with: { type: "json" } }) : await import(fileUrl.href);
 			if (takeDefault && (isObject(data) || isModule(data)) && data.default) return data.default;
 			return data;
 		}
 		return toImport;
 	} catch (error) {
-		throw new Error(`Oups... 🍻. Path: ${String(toImport)} => ${String(error)}`);
+		throw new Error(`Oups... 🍻. Path: ${String(toImport)} => ${String(error)}`, { cause: error });
 	}
 }
 
@@ -482,14 +482,14 @@ function getExtension(path) {
 //#region src/utils/file.ts
 function getFileInfo(target = "", { backupFilename = "filename", extension = ".ts" } = {}) {
 	const isDir = isDirectory(target);
-	const filePath = isDir ? path.join(target, backupFilename + extension) : target;
+	const filePath = isDir ? nodePath.join(target, backupFilename + extension) : target;
 	return {
 		path: filePath,
 		pathWithoutExtension: filePath.replace(/\.[^/.]+$/, ""),
 		extension,
 		isDirectory: isDir,
-		dirname: path.dirname(filePath),
-		filename: path.basename(filePath, extension.startsWith(".") ? extension : `.${extension}`)
+		dirname: nodePath.dirname(filePath),
+		filename: nodePath.basename(filePath, extension.startsWith(".") ? extension : `.${extension}`)
 	};
 }
 async function removeFilesAndEmptyFolders(patterns, dir) {
@@ -565,7 +565,7 @@ function startMessage({ name, version, description }) {
 	return `🍻 ${styleText(["cyan", "bold"], name)} ${styleText("green", `v${version}`)}${description ? ` - ${description}` : ""}`;
 }
 function logError(err, tag) {
-	let message = "";
+	let message;
 	if (err instanceof Error) {
 		message = (err.message || err.stack) ?? "Unknown error";
 		if (err.cause) {
@@ -693,13 +693,13 @@ function toUnix(value) {
 	return value;
 }
 function join(...args) {
-	return toUnix(path.join(...args.map((a) => toUnix(a))));
+	return toUnix(nodePath.join(...args.map((a) => toUnix(a))));
 }
 /**
 * Behaves exactly like `path.relative(from, to)`, but keeps the first meaningful "./"
 */
 function relativeSafe(from, to) {
-	return normalizeSafe(`.${separator}${toUnix(path.relative(toUnix(from), toUnix(to)))}`);
+	return normalizeSafe(`.${separator}${toUnix(nodePath.relative(toUnix(from), toUnix(to)))}`);
 }
 function getSchemaFileName(path) {
 	return path.replace(`.${getExtension(path)}`, "").slice(path.lastIndexOf("/") + 1);
@@ -708,13 +708,13 @@ const separator = "/";
 function normalizeSafe(value) {
 	let result;
 	value = toUnix(value);
-	result = toUnix(path.normalize(value));
+	result = toUnix(nodePath.normalize(value));
 	if (value.startsWith("./") && !result.startsWith("./") && !result.startsWith("..")) result = "./" + result;
 	else if (value.startsWith("//") && !result.startsWith("//")) result = value.startsWith("//./") ? "//." + result : "/" + result;
 	return result;
 }
 function joinSafe(...values) {
-	let result = toUnix(path.join(...values.map((v) => toUnix(v))));
+	let result = toUnix(nodePath.join(...values.map((v) => toUnix(v))));
 	if (values.length > 0) {
 		const firstValue = toUnix(values[0]);
 		if (firstValue.startsWith("./") && !result.startsWith("./") && !result.startsWith("..")) result = "./" + result;
@@ -745,14 +745,14 @@ function joinSafe(...values) {
 * @returns The relative import path string.
 */
 function getRelativeImportPath(importerFilePath, exporterFilePath, includeFileExtension = false) {
-	if (!path.isAbsolute(importerFilePath)) throw new Error(`'importerFilePath' is not an absolute path. "${importerFilePath}"`);
-	if (!path.isAbsolute(exporterFilePath)) throw new Error(`'exporterFilePath' is not an absolute path. "${exporterFilePath}"`);
-	const importerDir = path.dirname(importerFilePath);
-	const relativePath = path.relative(importerDir, exporterFilePath);
-	let posixPath = path.posix.join(...relativePath.split(path.sep));
+	if (!nodePath.isAbsolute(importerFilePath)) throw new Error(`'importerFilePath' is not an absolute path. "${importerFilePath}"`);
+	if (!nodePath.isAbsolute(exporterFilePath)) throw new Error(`'exporterFilePath' is not an absolute path. "${exporterFilePath}"`);
+	const importerDir = nodePath.dirname(importerFilePath);
+	const relativePath = nodePath.relative(importerDir, exporterFilePath);
+	let posixPath = nodePath.posix.join(...relativePath.split(nodePath.sep));
 	if (!posixPath.startsWith("./") && !posixPath.startsWith("../")) posixPath = `./${posixPath}`;
 	if (!includeFileExtension) {
-		const ext = path.extname(posixPath);
+		const ext = nodePath.extname(posixPath);
 		if (ext && posixPath.endsWith(ext)) posixPath = posixPath.slice(0, -ext.length);
 	}
 	return posixPath;
@@ -762,20 +762,20 @@ function getRelativeImportPath(importerFilePath, exporterFilePath, includeFileEx
 //#region src/utils/resolve-version.ts
 function resolveInstalledVersion(packageName, fromDir) {
 	try {
-		const require = createRequire(path.join(fromDir, "noop.js"));
+		const require = createRequire(nodePath.join(fromDir, "noop.js"));
 		try {
 			return require(`${packageName}/package.json`).version;
 		} catch (directError) {
 			if (directError instanceof Error && "code" in directError && directError.code === "ERR_PACKAGE_PATH_NOT_EXPORTED") {
 				const entryPath = require.resolve(packageName);
-				let dir = path.dirname(entryPath);
-				while (dir !== path.parse(dir).root) {
-					const pkgPath = path.join(dir, "package.json");
+				let dir = nodePath.dirname(entryPath);
+				while (dir !== nodePath.parse(dir).root) {
+					const pkgPath = nodePath.join(dir, "package.json");
 					if (existsSync(pkgPath)) {
 						const pkgData = JSON.parse(readFileSync(pkgPath, "utf8"));
 						if (pkgData.name === packageName) return pkgData.version;
 					}
-					dir = path.dirname(dir);
+					dir = nodePath.dirname(dir);
 				}
 				return;
 			}
@@ -918,17 +918,19 @@ function getNumberWord(num) {
 	return [...num.toString()].reduce((acc, n) => acc + NUMBERS[n], "");
 }
 /**
-* Escapes a specific character in a string by prefixing it with a backslash.
+* Escapes a specific character in a string by prefixing all of its occurrences with a backslash.
 *
 * @param str - The string to escape, or null.
 * @param char - The character to escape. Defaults to single quote (').
 * @returns The escaped string, or null if the input is null.
 * @example
 * escape("don't") // returns "don\'t"
+* escape("it's John's") // returns "it\'s John\'s"
 * escape('say "hello"', '"') // returns 'say \\"hello\\"'
+* escape("a'''b", "'") // returns "a\'\'\'b"
 */
 function escape(str, char = "'") {
-	return str?.replace(char, `\\${char}`);
+	return str?.replaceAll(char, `\\${char}`);
 }
 /**
 * Escape all characters not included in SingleStringCharacters and
@@ -3969,19 +3971,26 @@ function getSchemaGroups(schemaPath, schemas, namingConvention, fileExtension) {
 }
 function getCanonicalMap(schemaGroups, schemaPath, namingConvention, fileExtension) {
 	const canonicalPathMap = /* @__PURE__ */ new Map();
+	const canonicalNameMap = /* @__PURE__ */ new Map();
 	for (const [key, groupSchemas] of Object.entries(schemaGroups)) {
-		const canonicalPath = getPath(schemaPath, conventionName(groupSchemas[0].name, namingConvention), fileExtension);
-		canonicalPathMap.set(key, {
-			importPath: canonicalPath,
+		const canonicalInfo = {
+			importPath: getPath(schemaPath, conventionName(groupSchemas[0].name, namingConvention), fileExtension),
 			name: groupSchemas[0].name
-		});
+		};
+		canonicalPathMap.set(key, canonicalInfo);
+		for (const schema of groupSchemas) canonicalNameMap.set(schema.name, canonicalInfo);
 	}
-	return canonicalPathMap;
+	return {
+		canonicalPathMap,
+		canonicalNameMap
+	};
 }
-function normalizeCanonicalImportPaths(schemas, canonicalPathMap, schemaPath, namingConvention, fileExtension) {
+function normalizeCanonicalImportPaths(schemas, canonicalPathMap, canonicalNameMap, schemaPath, namingConvention, fileExtension) {
 	for (const schema of schemas) schema.imports = schema.imports.map((imp) => {
+		const canonicalByName = canonicalNameMap.get(imp.name);
 		const resolvedImportKey = resolveImportKey(schemaPath, imp.importPath ?? `./${conventionName(imp.name, namingConvention)}`, fileExtension);
-		const canonical = canonicalPathMap.get(resolvedImportKey);
+		const canonicalByPath = canonicalPathMap.get(resolvedImportKey);
+		const canonical = canonicalByName ?? canonicalByPath;
 		if (!canonical?.importPath) return imp;
 		const importPath = removeFileExtension(relativeSafe(schemaPath, canonical.importPath.replaceAll("\\", "/")), fileExtension);
 		return {
@@ -4020,8 +4029,8 @@ function getSchema({ schema: { imports, model }, target, header, namingConventio
 	file += model;
 	return file;
 }
-function getPath(path$1, name, fileExtension) {
-	return path.join(path$1, `${name}${fileExtension}`);
+function getPath(path, name, fileExtension) {
+	return nodePath.join(path, `${name}${fileExtension}`);
 }
 function writeModelInline(acc, model) {
 	return acc + `${model}\n`;
@@ -4041,12 +4050,13 @@ async function writeSchema({ path, schema, target, namingConvention, fileExtensi
 			namingConvention
 		}));
 	} catch (error) {
-		throw new Error(`Oups... 🍻. An Error occurred while writing schema ${name} => ${String(error)}`);
+		throw new Error(`Oups... 🍻. An Error occurred while writing schema ${name} => ${String(error)}`, { cause: error });
 	}
 }
 async function writeSchemas({ schemaPath, schemas, target, namingConvention, fileExtension, header, indexFiles }) {
 	const schemaGroups = getSchemaGroups(schemaPath, schemas, namingConvention, fileExtension);
-	normalizeCanonicalImportPaths(schemas, getCanonicalMap(schemaGroups, schemaPath, namingConvention, fileExtension), schemaPath, namingConvention, fileExtension);
+	const { canonicalPathMap, canonicalNameMap } = getCanonicalMap(schemaGroups, schemaPath, namingConvention, fileExtension);
+	normalizeCanonicalImportPaths(schemas, canonicalPathMap, canonicalNameMap, schemaPath, namingConvention, fileExtension);
 	for (const groupSchemas of Object.values(schemaGroups)) {
 		if (groupSchemas.length === 1) {
 			await writeSchema({
@@ -4069,7 +4079,7 @@ async function writeSchemas({ schemaPath, schemas, target, namingConvention, fil
 		});
 	}
 	if (indexFiles) {
-		const schemaFilePath = path.join(schemaPath, `index${fileExtension}`);
+		const schemaFilePath = nodePath.join(schemaPath, `index${fileExtension}`);
 		await fs$1.ensureFile(schemaFilePath);
 		const ext = fileExtension.endsWith(".ts") ? fileExtension.slice(0, -3) : fileExtension;
 		const conventionNamesSet = new Set(Object.values(schemaGroups).map((group) => conventionName(group[0].name, namingConvention)));
@@ -4083,7 +4093,7 @@ async function writeSchemas({ schemaPath, schemas, target, namingConvention, fil
 			const fileContent = `${header}\n${[...new Set([...existingExports, ...currentExports])].toSorted((a, b) => a.localeCompare(b)).join("\n")}`;
 			await fs$1.writeFile(schemaFilePath, fileContent, { encoding: "utf8" });
 		} catch (error) {
-			throw new Error(`Oups... 🍻. An Error occurred while writing schema index file ${schemaFilePath} => ${String(error)}`);
+			throw new Error(`Oups... 🍻. An Error occurred while writing schema index file ${schemaFilePath} => ${String(error)}`, { cause: error });
 		}
 	}
 }
@@ -4092,7 +4102,7 @@ async function writeSchemas({ schemaPath, schemas, target, namingConvention, fil
 //#region src/writers/generate-imports-for-builder.ts
 function generateImportsForBuilder(output, imports, relativeSchemasPath) {
 	const isZodSchemaOutput = isObject(output.schemas) && output.schemas.type === "zod";
-	let schemaImports = [];
+	let schemaImports;
 	if (output.indexFiles) schemaImports = isZodSchemaOutput ? [{
 		exports: imports.filter((i) => !i.importPath),
 		dependency: joinSafe(relativeSchemasPath, "index.zod")
@@ -4298,7 +4308,7 @@ async function writeSingleMode({ builder, output, projectName, header, needSchem
 		return [path];
 	} catch (error) {
 		const errorMsg = error instanceof Error ? error.message : "unknown error";
-		throw new Error(`Oups... 🍻. An Error occurred while writing file => ${errorMsg}`);
+		throw new Error(`Oups... 🍻. An Error occurred while writing file => ${errorMsg}`, { cause: error });
 	}
 }
 
@@ -4338,7 +4348,7 @@ async function writeSplitMode({ builder, output, projectName, header, needSchema
 			isAllowSyntheticDefaultImports,
 			options: isFunction(output.mock) ? void 0 : output.mock
 		});
-		const schemasPath = output.schemas ? void 0 : path.join(dirname, filename + ".schemas" + extension);
+		const schemasPath = output.schemas ? void 0 : nodePath.join(dirname, filename + ".schemas" + extension);
 		if (schemasPath && needSchema) {
 			const schemasData = header + generateModelsInline(builder.schemas);
 			await fs$1.outputFile(schemasPath, schemasData);
@@ -4363,9 +4373,9 @@ async function writeSplitMode({ builder, output, projectName, header, needSchema
 		implementationData += `\n${implementation}`;
 		mockData += `\n${implementationMock}`;
 		const implementationFilename = filename + (OutputClient.ANGULAR === output.client ? ".service" : "") + extension;
-		const implementationPath = path.join(dirname, implementationFilename);
+		const implementationPath = nodePath.join(dirname, implementationFilename);
 		await fs$1.outputFile(implementationPath, implementationData);
-		const mockPath = output.mock ? path.join(dirname, filename + "." + getMockFileExtensionByTypeName(output.mock) + extension) : void 0;
+		const mockPath = output.mock ? nodePath.join(dirname, filename + "." + getMockFileExtensionByTypeName(output.mock) + extension) : void 0;
 		if (mockPath) await fs$1.outputFile(mockPath, mockData);
 		return [
 			implementationPath,
@@ -4373,7 +4383,7 @@ async function writeSplitMode({ builder, output, projectName, header, needSchema
 			...mockPath ? [mockPath] : []
 		];
 	} catch (error) {
-		throw new Error(`Oups... 🍻. An Error occurred while splitting => ${String(error)}`);
+		throw new Error(`Oups... 🍻. An Error occurred while splitting => ${String(error)}`, { cause: error });
 	}
 }
 
@@ -4502,7 +4512,7 @@ async function writeSplitTagsMode({ builder, output, projectName, header, needSc
 	const target = generateTargetForTags(builder, output);
 	const isAllowSyntheticDefaultImports = isSyntheticDefaultImportsAllow(output.tsconfig);
 	const mockOption = output.mock && !isFunction(output.mock) ? output.mock : void 0;
-	const indexFilePath = mockOption?.indexMockFiles ? path.join(dirname, "index." + getMockFileExtensionByTypeName(mockOption) + extension) : void 0;
+	const indexFilePath = mockOption?.indexMockFiles ? nodePath.join(dirname, "index." + getMockFileExtensionByTypeName(mockOption) + extension) : void 0;
 	if (indexFilePath) await fs$1.outputFile(indexFilePath, "");
 	const tagEntries = Object.entries(target);
 	const generatedFilePathsArray = await Promise.all(tagEntries.map(async ([tag, target]) => {
@@ -4510,7 +4520,7 @@ async function writeSplitTagsMode({ builder, output, projectName, header, needSc
 			const { imports, implementation, implementationMock, importsMock, mutators, clientMutators, formData, fetchReviver, formUrlEncoded, paramsSerializer } = target;
 			let implementationData = header;
 			let mockData = header;
-			const importerPath = path.join(dirname, tag, tag + extension);
+			const importerPath = nodePath.join(dirname, tag, tag + extension);
 			const relativeSchemasPath = output.schemas ? getRelativeImportPath(importerPath, getFileInfo(isString(output.schemas) ? output.schemas : output.schemas.path, { extension: output.fileExtension }).dirname) : "../" + filename + ".schemas";
 			const importsForBuilder = generateImportsForBuilder(output, imports, relativeSchemasPath);
 			implementationData += builder.imports({
@@ -4535,7 +4545,7 @@ async function writeSplitTagsMode({ builder, output, projectName, header, needSc
 				isAllowSyntheticDefaultImports,
 				options: isFunction(output.mock) ? void 0 : output.mock
 			});
-			const schemasPath = output.schemas ? void 0 : path.join(dirname, filename + ".schemas" + extension);
+			const schemasPath = output.schemas ? void 0 : nodePath.join(dirname, filename + ".schemas" + extension);
 			if (schemasPath && needSchema) {
 				const schemasData = header + generateModelsInline(builder.schemas);
 				await fs$1.outputFile(schemasPath, schemasData);
@@ -4576,9 +4586,9 @@ async function writeSplitTagsMode({ builder, output, projectName, header, needSc
 			implementationData += `\n${implementation}`;
 			mockData += `\n${implementationMock}`;
 			const implementationFilename = tag + (OutputClient.ANGULAR === output.client ? ".service" : "") + extension;
-			const implementationPath = path.join(dirname, tag, implementationFilename);
+			const implementationPath = nodePath.join(dirname, tag, implementationFilename);
 			await fs$1.outputFile(implementationPath, implementationData);
-			const mockPath = output.mock ? path.join(dirname, tag, tag + "." + getMockFileExtensionByTypeName(output.mock) + extension) : void 0;
+			const mockPath = output.mock ? nodePath.join(dirname, tag, tag + "." + getMockFileExtensionByTypeName(output.mock) + extension) : void 0;
 			if (mockPath) await fs$1.outputFile(mockPath, mockData);
 			return [
 				implementationPath,
@@ -4586,7 +4596,7 @@ async function writeSplitTagsMode({ builder, output, projectName, header, needSc
 				...mockPath ? [mockPath] : []
 			];
 		} catch (error) {
-			throw new Error(`Oups... 🍻. An Error occurred while splitting tag ${tag} => ${String(error)}`);
+			throw new Error(`Oups... 🍻. An Error occurred while splitting tag ${tag} => ${String(error)}`, { cause: error });
 		}
 	}));
 	if (indexFilePath && mockOption) {
@@ -4638,7 +4648,7 @@ async function writeTagsMode({ builder, output, projectName, header, needSchema
 					options: isFunction(output.mock) ? void 0 : output.mock
 				});
 			}
-			const schemasPath = output.schemas ? void 0 : path.join(dirname, filename + ".schemas" + extension);
+			const schemasPath = output.schemas ? void 0 : nodePath.join(dirname, filename + ".schemas" + extension);
 			if (schemasPath && needSchema) {
 				const schemasData = header + generateModelsInline(builder.schemas);
 				await fs$1.outputFile(schemasPath, schemasData);
@@ -4666,11 +4676,11 @@ async function writeTagsMode({ builder, output, projectName, header, needSchema
 				data += "\n\n";
 				data += implementationMock;
 			}
-			const implementationPath = path.join(dirname, `${kebab(tag)}${extension}`);
+			const implementationPath = nodePath.join(dirname, `${kebab(tag)}${extension}`);
 			await fs$1.outputFile(implementationPath, data);
 			return [implementationPath, ...schemasPath ? [schemasPath] : []];
 		} catch (error) {
-			throw new Error(`Oups... 🍻. An Error occurred while writing tag ${tag} => ${String(error)}`);
+			throw new Error(`Oups... 🍻. An Error occurred while writing tag ${tag} => ${String(error)}`, { cause: error });
 		}
 	}))).flat();
 }