@orval/core 7.13.2 → 7.14.0

package/dist/index.d.ts

@@ -1532,6 +1532,40 @@ declare const dynamicImport: <T>(toImport: T | string, from?: string, takeDefaul
 //#region src/utils/extension.d.ts
 declare const getExtension: (path: string) => "yaml" | "json";
 //#endregion
+//#region src/utils/file.d.ts
+declare const getFileInfo: (target?: string, {
+  backupFilename,
+  extension
+}?: {
+  backupFilename?: string;
+  extension?: string;
+}) => {
+  path: string;
+  pathWithoutExtension: string;
+  extension: string;
+  isDirectory: boolean;
+  dirname: string;
+  filename: string;
+};
+declare function loadFile(filePath?: string, options?: {
+  root?: string;
+  defaultFileName?: string;
+  alias?: Record<string, string>;
+  tsconfig?: Tsconfig;
+}): Promise<{
+  path: string;
+  file?: string;
+  error?: unknown;
+  cached?: boolean;
+}>;
+declare function removeFilesAndEmptyFolders(patterns: string[], dir: string): Promise<void>;
+//#endregion
+//#region src/utils/file-extensions.d.ts
+declare const getMockFileExtensionByTypeName: (mock: GlobalMockOptions | ClientMockBuilder) => string;
+//#endregion
+//#region src/utils/is-body-verb.d.ts
+declare const getIsBodyVerb: (verb: Verbs) => boolean;
+//#endregion
 //#region src/utils/logger.d.ts
 declare const log: (message?: any, ...optionalParams: any[]) => void;
 declare const startMessage: ({
@@ -1575,43 +1609,6 @@ interface LoggerOptions {
 }
 declare function createLogger(level?: LogLevel, options?: LoggerOptions): Logger;
 //#endregion
-//#region src/utils/file.d.ts
-declare const getFileInfo: (target?: string, {
-  backupFilename,
-  extension
-}?: {
-  backupFilename?: string;
-  extension?: string;
-}) => {
-  path: string;
-  pathWithoutExtension: string;
-  extension: string;
-  isDirectory: boolean;
-  dirname: string;
-  filename: string;
-};
-declare function loadFile<File = any>(filePath?: string, options?: {
-  root?: string;
-  defaultFileName?: string;
-  logLevel?: LogLevel;
-  isDefault?: boolean;
-  alias?: Record<string, string>;
-  tsconfig?: Tsconfig;
-  load?: boolean;
-}): Promise<{
-  path: string;
-  file?: File;
-  error?: any;
-  cached?: boolean;
-}>;
-declare function removeFilesAndEmptyFolders(patterns: string[], dir: string): Promise<void>;
-//#endregion
-//#region src/utils/file-extensions.d.ts
-declare const getMockFileExtensionByTypeName: (mock: GlobalMockOptions | ClientMockBuilder) => string;
-//#endregion
-//#region src/utils/is-body-verb.d.ts
-declare const getIsBodyVerb: (verb: Verbs) => boolean;
-//#endregion
 //#region src/utils/merge-deep.d.ts
 declare function mergeDeep<T extends Record<string, any>, U extends Record<string, any>>(source: T, target: U): T & U;
 //#endregion

package/dist/index.js

@@ -47,12 +47,12 @@ let micromatch = require("micromatch");
 micromatch = __toESM(micromatch);
 let debug = require("debug");
 debug = __toESM(debug);
-let node_readline = require("node:readline");
-node_readline = __toESM(node_readline);
 let compare_versions = require("compare-versions");
 compare_versions = __toESM(compare_versions);
 let node_url = require("node:url");
 node_url = __toESM(node_url);
+let node_readline = require("node:readline");
+node_readline = __toESM(node_readline);
 let swagger2openapi = require("swagger2openapi");
 swagger2openapi = __toESM(swagger2openapi);
 let __ibm_cloud_openapi_ruleset = require("@ibm-cloud/openapi-ruleset");
@@ -192,100 +192,6 @@ function createDebugger(ns, options = {}) {
 	};
 }
 
-//#endregion
-//#region src/utils/logger.ts
-const log = console.log;
-const startMessage = ({ name, version, description }) => `🍻 ${chalk.default.cyan.bold(name)} ${chalk.default.green(`v${version}`)}${description ? ` - ${description}` : ""}`;
-const logError = (err, tag) => {
-	log(chalk.default.red([
-		"🛑",
-		tag ? `${tag} -` : void 0,
-		err instanceof Error ? err.stack : err
-	].filter(Boolean).join(" ")));
-};
-const mismatchArgsMessage = (mismatchArgs) => {
-	log(chalk.default.yellow(`${mismatchArgs.join(", ")} ${mismatchArgs.length === 1 ? "is" : "are"} not defined in your configuration!`));
-};
-const createSuccessMessage = (backend) => {
-	log(`🎉 ${backend ? `${chalk.default.green(backend)} - ` : ""}Your OpenAPI spec has been converted into ready to use orval!`);
-};
-const ibmOpenapiValidatorWarnings = (warnings) => {
-	log(chalk.default.yellow("(!) Warnings"));
-	for (const i of warnings) log(chalk.default.yellow(`Message : ${i.message}\nPath    : ${i.path.join(", ")}`));
-};
-const ibmOpenapiValidatorErrors = (errors) => {
-	log(chalk.default.red("(!) Errors"));
-	for (const i of errors) log(chalk.default.red(`Message : ${i.message}\nPath    : ${i.path.join(", ")}`));
-};
-const LogLevels = {
-	silent: 0,
-	error: 1,
-	warn: 2,
-	info: 3
-};
-let lastType;
-let lastMsg;
-let sameCount = 0;
-function clearScreen() {
-	const repeatCount = process.stdout.rows - 2;
-	const blank = repeatCount > 0 ? "\n".repeat(repeatCount) : "";
-	console.log(blank);
-	node_readline.default.cursorTo(process.stdout, 0, 0);
-	node_readline.default.clearScreenDown(process.stdout);
-}
-function createLogger(level = "info", options = {}) {
-	const { prefix = "[vite]", allowClearScreen = true } = options;
-	const thresh = LogLevels[level];
-	const clear = allowClearScreen && process.stdout.isTTY && !process.env.CI ? clearScreen : () => {};
-	function output(type, msg, options$1 = {}) {
-		if (thresh >= LogLevels[type]) {
-			const method = type === "info" ? "log" : type;
-			const format = () => {
-				if (options$1.timestamp) {
-					const tag = type === "info" ? chalk.default.cyan.bold(prefix) : type === "warn" ? chalk.default.yellow.bold(prefix) : chalk.default.red.bold(prefix);
-					return `${chalk.default.dim((/* @__PURE__ */ new Date()).toLocaleTimeString())} ${tag} ${msg}`;
-				} else return msg;
-			};
-			if (type === lastType && msg === lastMsg) {
-				sameCount++;
-				clear();
-				console[method](format(), chalk.default.yellow(`(x${sameCount + 1})`));
-			} else {
-				sameCount = 0;
-				lastMsg = msg;
-				lastType = type;
-				if (options$1.clear) clear();
-				console[method](format());
-			}
-		}
-	}
-	const warnedMessages = /* @__PURE__ */ new Set();
-	const logger = {
-		hasWarned: false,
-		info(msg, opts) {
-			output("info", msg, opts);
-		},
-		warn(msg, opts) {
-			logger.hasWarned = true;
-			output("warn", msg, opts);
-		},
-		warnOnce(msg, opts) {
-			if (warnedMessages.has(msg)) return;
-			logger.hasWarned = true;
-			output("warn", msg, opts);
-			warnedMessages.add(msg);
-		},
-		error(msg, opts) {
-			logger.hasWarned = true;
-			output("error", msg, opts);
-		},
-		clearScreen(type) {
-			if (thresh >= LogLevels[type]) clear();
-		}
-	};
-	return logger;
-}
-
 //#endregion
 //#region src/utils/file.ts
 const getFileInfo = (target = "", { backupFilename = "filename", extension = ".ts" } = {}) => {
@@ -306,15 +212,12 @@ const getFileInfo = (target = "", { backupFilename = "filename", extension = ".t
 const debug$1 = createDebugger("orval:file-load");
 const cache = /* @__PURE__ */ new Map();
 async function loadFile(filePath, options) {
-	const { root = process.cwd(), isDefault = true, defaultFileName, logLevel, alias, tsconfig, load = true } = options ?? {};
+	const { root = process.cwd(), defaultFileName, alias, tsconfig } = options ?? {};
 	const start = Date.now();
 	let resolvedPath;
-	let isTS = false;
 	let isMjs = false;
-	if (filePath) {
-		resolvedPath = node_path.default.resolve(filePath);
-		isTS = filePath.endsWith(".ts");
-	} else if (defaultFileName) {
+	if (filePath) resolvedPath = node_path.default.resolve(filePath);
+	else if (defaultFileName) {
 		const jsFile = node_path.default.resolve(root, `${defaultFileName}.js`);
 		if (node_fs.default.existsSync(jsFile)) resolvedPath = jsFile;
 		if (!resolvedPath) {
@@ -330,10 +233,7 @@ async function loadFile(filePath, options) {
 		}
 		if (!resolvedPath) {
 			const tsFile = node_path.default.resolve(root, `${defaultFileName}.ts`);
-			if (node_fs.default.existsSync(tsFile)) {
-				resolvedPath = tsFile;
-				isTS = true;
-			}
+			if (node_fs.default.existsSync(tsFile)) resolvedPath = tsFile;
 		}
 	}
 	if (!resolvedPath) if (filePath) throw new Error(chalk.default.red(`File not found => ${filePath}`));
@@ -347,24 +247,8 @@ async function loadFile(filePath, options) {
 		cached: true
 	};
 	try {
-		let file;
-		if (!file && !isTS && !isMjs) try {
-			delete require.cache[require.resolve(resolvedPath)];
-			file = require(resolvedPath);
-			debug$1(`cjs loaded in ${Date.now() - start}ms`);
-		} catch (error) {
-			if (!new RegExp([
-				`Cannot use import statement`,
-				`Must use import to load ES Module`,
-				`Unexpected token`,
-				`Unexpected identifier`
-			].join("|")).test(error.message)) throw error;
-		}
-		if (!file) {
-			const { code } = await bundleFile(resolvedPath, isMjs, root || node_path.default.dirname(normalizeResolvedPath), alias, tsconfig?.compilerOptions);
-			file = load ? await loadFromBundledFile(resolvedPath, code, isDefault) : code;
-			debug$1(`bundled file loaded in ${Date.now() - start}ms`);
-		}
+		const { code: file } = await bundleFile(resolvedPath, isMjs, root || node_path.default.dirname(normalizeResolvedPath), alias, tsconfig?.compilerOptions);
+		debug$1(`bundled file loaded in ${Date.now() - start}ms`);
 		cache.set(resolvedPath, { file });
 		return {
 			path: normalizeResolvedPath,
@@ -459,19 +343,6 @@ async function bundleFile(fileName, mjs = false, workspace, alias, compilerOptio
 		dependencies: result.metafile ? Object.keys(result.metafile.inputs) : []
 	};
 }
-async function loadFromBundledFile(fileName, bundledCode, isDefault) {
-	const extension = node_path.default.extname(fileName);
-	const defaultLoader = require.extensions[extension];
-	require.extensions[extension] = (module$1, filename) => {
-		if (filename === fileName) module$1._compile(bundledCode, filename);
-		else defaultLoader(module$1, filename);
-	};
-	delete require.cache[require.resolve(fileName)];
-	const raw = require(fileName);
-	const file = isDefault && raw.__esModule ? raw.default : raw;
-	require.extensions[extension] = defaultLoader;
-	return file;
-}
 async function removeFilesAndEmptyFolders(patterns, dir) {
 	const files = await (0, globby.default)(patterns, {
 		cwd: dir,
@@ -533,10 +404,7 @@ const relativeSafe = (from, to) => {
 	return normalizeSafe(`.${separator}${normalizedRelativePath}`);
 };
 const getSpecName = (specKey, target) => {
-	if (isUrl(specKey)) {
-		const url = new URL(target);
-		return specKey.replace(url.origin, "").replace(getFileInfo(url.pathname).dirname, "").replace(`.${getExtension(specKey)}`, "");
-	}
+	if (isUrl(specKey)) return specKey;
 	return "/" + path$1.normalize(path$1.relative(getFileInfo(target).dirname, specKey)).split("../").join("").replace(`.${getExtension(specKey)}`, "");
 };
 const getSchemaFileName = (path$3) => {
@@ -733,6 +601,7 @@ const conventionName = (name, convention) => {
 //#region src/utils/compare-version.ts
 const compareVersions = (firstVersion, secondVersions, operator = ">=") => {
 	if (firstVersion === "latest" || firstVersion === "*") return true;
+	if (firstVersion.startsWith("catalog:")) return true;
 	return (0, compare_versions.compare)(firstVersion.replace(/(\s(.*))/, ""), secondVersions, operator);
 };
 
@@ -847,6 +716,100 @@ const getMockFileExtensionByTypeName = (mock) => {
 //#region src/utils/is-body-verb.ts
 const getIsBodyVerb = (verb) => VERBS_WITH_BODY.includes(verb);
 
+//#endregion
+//#region src/utils/logger.ts
+const log = console.log;
+const startMessage = ({ name, version, description }) => `🍻 ${chalk.default.cyan.bold(name)} ${chalk.default.green(`v${version}`)}${description ? ` - ${description}` : ""}`;
+const logError = (err, tag) => {
+	log(chalk.default.red([
+		"🛑",
+		tag ? `${tag} -` : void 0,
+		err instanceof Error ? err.stack : err
+	].filter(Boolean).join(" ")));
+};
+const mismatchArgsMessage = (mismatchArgs) => {
+	log(chalk.default.yellow(`${mismatchArgs.join(", ")} ${mismatchArgs.length === 1 ? "is" : "are"} not defined in your configuration!`));
+};
+const createSuccessMessage = (backend) => {
+	log(`🎉 ${backend ? `${chalk.default.green(backend)} - ` : ""}Your OpenAPI spec has been converted into ready to use orval!`);
+};
+const ibmOpenapiValidatorWarnings = (warnings) => {
+	log(chalk.default.yellow("(!) Warnings"));
+	for (const i of warnings) log(chalk.default.yellow(`Message : ${i.message}\nPath    : ${i.path.join(", ")}`));
+};
+const ibmOpenapiValidatorErrors = (errors) => {
+	log(chalk.default.red("(!) Errors"));
+	for (const i of errors) log(chalk.default.red(`Message : ${i.message}\nPath    : ${i.path.join(", ")}`));
+};
+const LogLevels = {
+	silent: 0,
+	error: 1,
+	warn: 2,
+	info: 3
+};
+let lastType;
+let lastMsg;
+let sameCount = 0;
+function clearScreen() {
+	const repeatCount = process.stdout.rows - 2;
+	const blank = repeatCount > 0 ? "\n".repeat(repeatCount) : "";
+	console.log(blank);
+	node_readline.default.cursorTo(process.stdout, 0, 0);
+	node_readline.default.clearScreenDown(process.stdout);
+}
+function createLogger(level = "info", options = {}) {
+	const { prefix = "[vite]", allowClearScreen = true } = options;
+	const thresh = LogLevels[level];
+	const clear = allowClearScreen && process.stdout.isTTY && !process.env.CI ? clearScreen : () => {};
+	function output(type, msg, options$1 = {}) {
+		if (thresh >= LogLevels[type]) {
+			const method = type === "info" ? "log" : type;
+			const format = () => {
+				if (options$1.timestamp) {
+					const tag = type === "info" ? chalk.default.cyan.bold(prefix) : type === "warn" ? chalk.default.yellow.bold(prefix) : chalk.default.red.bold(prefix);
+					return `${chalk.default.dim((/* @__PURE__ */ new Date()).toLocaleTimeString())} ${tag} ${msg}`;
+				} else return msg;
+			};
+			if (type === lastType && msg === lastMsg) {
+				sameCount++;
+				clear();
+				console[method](format(), chalk.default.yellow(`(x${sameCount + 1})`));
+			} else {
+				sameCount = 0;
+				lastMsg = msg;
+				lastType = type;
+				if (options$1.clear) clear();
+				console[method](format());
+			}
+		}
+	}
+	const warnedMessages = /* @__PURE__ */ new Set();
+	const logger = {
+		hasWarned: false,
+		info(msg, opts) {
+			output("info", msg, opts);
+		},
+		warn(msg, opts) {
+			logger.hasWarned = true;
+			output("warn", msg, opts);
+		},
+		warnOnce(msg, opts) {
+			if (warnedMessages.has(msg)) return;
+			logger.hasWarned = true;
+			output("warn", msg, opts);
+			warnedMessages.add(msg);
+		},
+		error(msg, opts) {
+			logger.hasWarned = true;
+			output("error", msg, opts);
+		},
+		clearScreen(type) {
+			if (thresh >= LogLevels[type]) clear();
+		}
+	};
+	return logger;
+}
+
 //#endregion
 //#region src/utils/merge-deep.ts
 const isObject$1 = (obj) => obj && typeof obj === "object";
@@ -1127,7 +1090,10 @@ const getRefInfo = ($ref, context) => {
 		originalName,
 		refPaths
 	};
-	const path$3 = isUrl(context.specKey) ? resolveUrl(context.specKey, pathname) : resolve(getFileInfo(context.specKey).dirname, pathname);
+	let path$3;
+	if (isUrl($ref)) path$3 = $ref;
+	else if (isUrl(context.specKey)) path$3 = resolveUrl(context.specKey, pathname);
+	else path$3 = resolve(getFileInfo(context.specKey).dirname, pathname);
 	return {
 		name: sanitize(pascal(originalName) + suffix, {
 			es5keyword: true,
@@ -2713,11 +2679,9 @@ const generateMutator = async ({ output, mutator, name, workspace, tsconfig }) =
 	const errorTypeName = mutator.default ? `${pascal(name)}ErrorType` : "ErrorType";
 	const bodyTypeName = mutator.default ? `${pascal(name)}${BODY_TYPE_NAME}` : BODY_TYPE_NAME;
 	const { file, cached } = await loadFile(importPath, {
-		isDefault: false,
 		root: workspace,
 		alias: mutator.alias,
-		tsconfig,
-		load: false
+		tsconfig
 	});
 	if (file) {
 		const mutatorInfoName = isDefault ? "default" : mutator.name;