orval 8.22.0 → 8.23.0

package/dist/bin/orval.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { c as description, i as startWatcher, l as name, n as loadConfigFile, r as generateSpec, s as normalizeOptions, t as findConfigFile, u as version } from "../config-CotJKggp.mjs";
+import { c as description, i as startWatcher, l as name, n as loadConfigFile, r as generateSpec, s as normalizeOptions, t as findConfigFile, u as version } from "../config-18E5SVPo.mjs";
 import path from "node:path";
 import { Option, program } from "@commander-js/extra-typings";
 import { ErrorWithTag, OutputClient, OutputMode, SupportedFormatter, getWarningCount, isString, log, logError, resetWarnings, setVerbose, startMessage } from "@orval/core";

package/dist/{config-CotJKggp.mjs → config-18E5SVPo.mjs}

@@ -1,11 +1,11 @@
 import { createRequire } from "node:module";
 import path from "node:path";
-import { DefaultTag, FormDataArrayHandling, GetterPropType, NamingConvention, OutputClient, OutputHttpClient, OutputMockType, OutputMode, PropertySortOrder, RefComponentSuffix, SupportedFormatter, asyncReduce, buildDynamicScope, buildSchemaTagMap, collectReferencedComponents, conventionName, createSuccessMessage, dynamicImport, fixCrossDirectoryImports, fixRegularSchemaImports, generateComponentDefinition, generateDependencyImports, generateMutator, generateParameterDefinition, generateSchemasDefinition, generateVerbsOptions, getBaseUrlRuntimeImports, getFileInfo, getFullRoute, getImportExtension, getMockFileExtensionByTypeName, getRefInfo, getRoute, isBoolean, isComponentRef, isFunction, isNullish, isObject, isReference, isString, isUrl, jsDoc, kebab, log, logError, logVerbose, logWarning, pascal, removeFilesAndEmptyFolders, resolveInstalledVersions, resolveRef, resolveValue, splitSchemasByType, upath, writeGeneratedFile, writeSchemas, writeSchemasTagsSplit, writeSingleMode, writeSplitMode, writeSplitTagsMode, writeTagsMode } from "@orval/core";
+import { DefaultTag, FormDataArrayHandling, GetterPropType, NamingConvention, OutputClient, OutputHttpClient, OutputMockType, OutputMode, PropertySortOrder, RefComponentSuffix, SupportedFormatter, asyncReduce, buildDynamicScope, buildSchemaTagMap, collectReferencedComponents, conventionName, createSuccessMessage, dynamicImport, fixCrossDirectoryImports, fixRegularSchemaImports, generateComponentDefinition, generateDependencyImports, generateMutator, generateParameterDefinition, generateSchemasDefinition, generateVerbsOptions, getBaseUrlRuntimeImports, getFileInfo, getFullRoute, getImportExtension, getMockFileExtensionByTypeName, getRefInfo, getRoute, isBoolean, isComponentRef, isFunction, isNullish, isObject, isReference, isString, isUrl, jsDoc, kebab, log, logError, logVerbose, logWarning, pascal, removeFilesAndEmptyFolders, resolveInstalledVersions, resolveRef, resolveValue, splitSchemasByType, upath, writeGeneratedFile, writeSchemas, writeSchemasTagsSplit, writeSingleMode, writeSplitMode, writeSplitTagsMode, writeTagsMode, writeTagsOperationsMode, writeTagsOperationsSplitMode } from "@orval/core";
 import { bundle } from "@scalar/json-magic/bundle";
 import { fetchUrls, parseJson, parseYaml, readFiles } from "@scalar/json-magic/bundle/plugins/node";
 import { upgrade, validate } from "@scalar/openapi-parser";
 import fs, { access, readFile } from "node:fs/promises";
-import { isNullish as isNullish$1, pick, unique } from "remeda";
+import { isNullish as isNullish$1, pick } from "remeda";
 import jsYaml from "js-yaml";
 import * as mock from "@orval/mock";
 import { dedupeStrictMockTypeDeclarations, generateFakerForSchemas, generateMockImports, getDefaultMockOptionsForType } from "@orval/mock";
@@ -29,7 +29,7 @@ import { parseArgsStringToArgv } from "string-argv";
 import { createJiti } from "jiti";
 //#region package.json
 var name = "orval";
-var version = "8.22.0";
+var version = "8.23.0";
 var description = "A swagger client generator for typescript";
 //#endregion
 //#region src/client.ts
@@ -545,6 +545,7 @@ function createFormData(workspace, formData) {
 function normalizeSchemasOption(schemas, workspace) {
 	if (!schemas) return;
 	if (isString(schemas)) return normalizePath(schemas, workspace);
+	if (!isString(schemas.path) || schemas.path.trim() === "") throw new Error(styleText("red", `\`schemas.path\` is required when \`schemas\` is an object (e.g. \`schemas: { path: './model', type: 'zod' }\`). To generate schemas alongside the target instead, omit \`schemas\` or set \`schemas: false\`.`));
 	validatePackageSpecifier(schemas.importPath, "schemas.importPath");
 	return {
 		path: normalizePath(schemas.path, workspace),
@@ -607,7 +608,8 @@ function normalizeEffectOptions(effect) {
 			response: effect?.generate?.response ?? true
 		},
 		generateEachHttpStatus: effect?.generateEachHttpStatus ?? false,
-		useBrandedTypes: effect?.useBrandedTypes ?? false
+		useBrandedTypes: effect?.useBrandedTypes ?? false,
+		exactOptional: effect?.exactOptional ?? false
 	};
 }
 async function normalizeOptions(optionsExport, workspace = process.cwd(), globalOptions = {}) {
@@ -784,6 +786,7 @@ async function normalizeOptions(optionsExport, workspace = process.cwd(), global
 					generateReusableSchemas: outputOptions.override?.zod?.generateReusableSchemas ?? false,
 					generateMeta: outputOptions.override?.zod?.generateMeta ?? false,
 					generateDiscriminatedUnion: outputOptions.override?.zod?.generateDiscriminatedUnion ?? false,
+					exactOptional: outputOptions.override?.zod?.exactOptional ?? false,
 					dateTimeOptions: outputOptions.override?.zod?.dateTimeOptions ?? { offset: true },
 					timeOptions: outputOptions.override?.zod?.timeOptions ?? {}
 				},
@@ -1527,6 +1530,30 @@ async function collectFilePaths(paths) {
 	return results;
 }
 //#endregion
+//#region src/utils/barrel.ts
+const RE_EXPORT_SPECIFIER = /export\s+\*\s+from\s*['"]([^'"]+)['"]/g;
+/**
+* Extract the set of `export * from '...'` module specifiers from barrel
+* content. Quote-agnostic (matches both `'` and `"`) so it is unaffected by a
+* formatter changing quote style between generations.
+*/
+function readReExportSpecifiers(content) {
+	return new Set([...content.matchAll(RE_EXPORT_SPECIFIER)].map((m) => m[1]));
+}
+/**
+* Return the deduplicated list of specifiers for a barrel by unioning the
+* freshly generated `specifiers` with whatever re-exports already exist on
+* disk. Merging on the bare specifier (rather than the formatted line) makes
+* the barrel idempotent across regenerations regardless of how an external
+* formatter rewrites quotes, semicolons, or whitespace. On-disk order is
+* preserved and new specifiers are appended — matching the previous append
+* ordering — so callers control any sorting they want.
+*/
+async function mergeBarrelSpecifiers(filePath, specifiers) {
+	const existing = await fs$2.pathExists(filePath) ? readReExportSpecifiers(await fs$2.readFile(filePath, "utf8")) : /* @__PURE__ */ new Set();
+	return [...new Set([...existing, ...specifiers])];
+}
+//#endregion
 //#region src/utils/execute-hook.ts
 const executeHook = async (name, commands = [], args = []) => {
 	log(styleText("white", `Running ${name} hook...`));
@@ -1650,7 +1677,7 @@ const generateReusableSchemaSet = (refs, context, options) => {
 			operationId: "",
 			location: "schema",
 			schemaName: name
-		} : void 0, options.variant);
+		} : void 0, options.variant, options.exactOptional);
 		entries.push({
 			ref,
 			name,
@@ -1915,19 +1942,11 @@ const groupSchemasByFilePath = (schemas) => {
 async function writeZodSchemaIndex(schemasPath, fileExtension, header, schemaNames, namingConvention, shouldMergeExisting = false, tsconfig) {
 	const importFileExtension = getImportExtension(fileExtension, tsconfig);
 	const indexPath = path.join(schemasPath, `index.ts`);
-	let existingExports = "";
-	if (shouldMergeExisting && await fs$2.pathExists(indexPath)) {
-		const existingContent = await fs$2.readFile(indexPath, "utf8");
-		const headerMatch = /^(\/\*\*[\s\S]*?\*\/\n)?/.exec(existingContent);
-		const headerPart = headerMatch ? headerMatch[0] : "";
-		existingExports = existingContent.slice(headerPart.length).trim();
-	}
-	const newExports = schemaNames.map((schemaName) => {
-		return `export * from './${conventionName(schemaName, namingConvention)}${importFileExtension}';`;
-	}).toSorted().join("\n");
-	const allExports = existingExports ? `${existingExports}\n${newExports}` : newExports;
-	const uniqueExports = [...new Set(allExports.split("\n"))].filter((line) => line.trim()).toSorted().join("\n");
-	await fs$2.outputFile(indexPath, `${header}\n${uniqueExports}\n`);
+	const newSpecifiers = [...new Set(schemaNames.map((schemaName) => {
+		return `./${conventionName(schemaName, namingConvention)}${importFileExtension}`;
+	}))];
+	const exports = (shouldMergeExisting ? await mergeBarrelSpecifiers(indexPath, newSpecifiers) : newSpecifiers).toSorted().map((specifier) => `export * from '${specifier}';`).join("\n");
+	await fs$2.outputFile(indexPath, `${header}\n${exports}\n`);
 }
 async function writeZodSchemaTagsSplitBarrel(schemasPath, fileExtension, header, componentDirs, verbDirs, namingConvention, tsconfig) {
 	const importExt = getImportExtension(fileExtension, tsconfig);
@@ -1975,7 +1994,7 @@ function generateZodSchemasInline(builder, output, includeZodImport = true, para
 		const parsedZodDefinition = parseZodValidationSchemaDefinition(generateZodValidationSchemaDefinition(dereference(schemaObject, context), context, name, strict, isZodV4, {
 			required: true,
 			emitMeta: output.override.zod.generateMeta
-		}), context, coerce, strict, isZodV4, void 0, void 0, output.override.zod.variant);
+		}), context, coerce, strict, isZodV4, void 0, void 0, output.override.zod.variant, output.override.zod.exactOptional);
 		schemas.push({
 			schemaName: name,
 			consts: parsedZodDefinition.consts,
@@ -2009,6 +2028,7 @@ function generateZodSchemasInlineReusable(builder, output, includeZodImport = tr
 		coerce,
 		variant: output.override.zod.variant,
 		generateMeta: output.override.zod.generateMeta,
+		exactOptional: output.override.zod.exactOptional,
 		paramsMutator
 	})).map((entry) => renderReusableSchemaEntry(entry, context, output.override.zod.variant).content).join("\n\n");
 	const zodImport = includeZodImport ? `${getZodSchemaImportStatement(output.override.zod.variant)}\n` : "";
@@ -2042,7 +2062,7 @@ async function writeZodSchemas(builder, schemasPath, fileExtension, header, outp
 		const parsedZodDefinition = parseZodValidationSchemaDefinition(generateZodValidationSchemaDefinition(dereference(schemaObject, context), context, name, strict, isZodV4, {
 			required: true,
 			emitMeta: output.override.zod.generateMeta
-		}), context, coerce, strict, isZodV4, void 0, void 0, output.override.zod.variant);
+		}), context, coerce, strict, isZodV4, void 0, void 0, output.override.zod.variant, output.override.zod.exactOptional);
 		schemasToWrite.push({
 			schemaName: name,
 			filePath,
@@ -2092,6 +2112,7 @@ async function writeZodSchemasReusable(builder, schemasPath, fileExtension, head
 		coerce,
 		variant: output.override.zod.variant,
 		generateMeta: output.override.zod.generateMeta,
+		exactOptional: output.override.zod.exactOptional,
 		paramsMutator
 	}));
 	const componentNames = new Set(Object.keys(builder.spec.components?.schemas ?? {}).map((schemaName) => resolveSchemaName(`#/components/schemas/${schemaName}`, context)));
@@ -2220,7 +2241,7 @@ async function writeZodSchemasFromVerbs(verbOptions, schemasPath, fileExtension,
 		const parsedZodDefinition = parseZodValidationSchemaDefinition("bodyContentType" in entry && entry.bodyContentType === "multipart/form-data" ? generateFormDataZodSchema(schema, zodContext, name, strict, isZodV4, "encoding" in entry ? entry.encoding : void 0, useReusableSchemas) : generateZodValidationSchemaDefinition(schema, zodContext, name, strict, isZodV4, {
 			required: true,
 			useReusableSchemas
-		}), zodContext, coerce, strict, isZodV4, void 0, void 0, output.override.zod.variant);
+		}), zodContext, coerce, strict, isZodV4, void 0, void 0, output.override.zod.variant, output.override.zod.exactOptional);
 		let zodExpression = parsedZodDefinition.zod;
 		let importStatements;
 		if (useReusableSchemas && parsedZodDefinition.usedRefs.size > 0) {
@@ -2323,8 +2344,7 @@ async function addOperationSchemasReExport(schemaPath, operationSchemasPath, hea
 	const esmImportPath = upath.getRelativeImportPath(schemaIndexPath, operationSchemasPath);
 	const exportLine = `export * from '${esmImportPath}';\n`;
 	if (await fs$2.pathExists(schemaIndexPath)) {
-		const existingContent = await fs$2.readFile(schemaIndexPath, "utf8");
-		if (!new RegExp(String.raw`export\s*\*\s*from\s*['"]${esmImportPath.replaceAll(/[.*+?^${}()|[\]\\]/g, String.raw`\$&`)}['"]`).test(existingContent)) await fs$2.appendFile(schemaIndexPath, exportLine);
+		if (!readReExportSpecifiers(await fs$2.readFile(schemaIndexPath, "utf8")).has(esmImportPath)) await fs$2.appendFile(schemaIndexPath, exportLine);
 	} else {
 		const content = header && header.trim().length > 0 ? `${header}\n${exportLine}` : exportLine;
 		await fs$2.outputFile(schemaIndexPath, content);
@@ -2431,9 +2451,15 @@ function shouldGenerateSchemas(output, hasOperations) {
 function getImplementationPathsForIndex(output, implementationPaths, indexFile) {
 	const shouldExcludeSelf = output.indexFiles;
 	const paths = shouldExcludeSelf ? excludeFilePath(implementationPaths, indexFile) : implementationPaths;
-	if (!(shouldExcludeSelf && output.mode === OutputMode.SPLIT && getComparableFilePath(output.target) === getComparableFilePath(indexFile))) return paths;
+	if (shouldExcludeSelf && output.mode === OutputMode.SPLIT && getComparableFilePath(output.target) === getComparableFilePath(indexFile)) {
+		const targetInfo = getFileInfo(output.target, { extension: output.fileExtension });
+		return excludeFilePath(paths, path.join(targetInfo.dirname, `${targetInfo.filename}.schemas${output.fileExtension}`));
+	}
+	if (!(output.mode === OutputMode.TAGS_OPERATIONS || output.mode === OutputMode.TAGS_OPERATIONS_SPLIT) || !shouldExcludeSelf) return paths;
 	const targetInfo = getFileInfo(output.target, { extension: output.fileExtension });
-	return excludeFilePath(paths, path.join(targetInfo.dirname, `${targetInfo.filename}.schemas${output.fileExtension}`));
+	const rootBarrel = path.join(targetInfo.dirname, `index${output.fileExtension}`);
+	const globalSchemas = path.join(targetInfo.dirname, `${targetInfo.filename}.schemas${output.fileExtension}`);
+	return paths.filter((p) => getComparableFilePath(p) === getComparableFilePath(rootBarrel) || getComparableFilePath(p) === getComparableFilePath(globalSchemas));
 }
 async function writeSpecs(builder, workspace, options, projectName) {
 	const { info, schemas, target } = builder;
@@ -2569,8 +2595,7 @@ async function writeSpecs(builder, workspace, options, projectName) {
 		const indexFile = path.join(workspacePath, "index.ts");
 		const mockExtensions = output.mock.generators.map((g) => getMockFileExtensionByTypeName(g));
 		const importExtension = getImportExtension(output.fileExtension, output.tsconfig);
-		const implementationPathsForIndex = getImplementationPathsForIndex(output, implementationPaths, indexFile);
-		const imports = implementationPathsForIndex.filter((p) => mockExtensions.length === 0 || !mockExtensions.some((ext) => p.endsWith(`.${ext}.ts`))).map((p) => {
+		const imports = getImplementationPathsForIndex(output, implementationPaths, indexFile).filter((p) => mockExtensions.length === 0 || !mockExtensions.some((ext) => p.endsWith(`.${ext}.ts`))).map((p) => {
 			const relative = upath.getRelativeImportPath(indexFile, p, true);
 			return (relative.endsWith(output.fileExtension) ? relative.slice(0, -output.fileExtension.length) : relative.replace(/\.[^/.]+$/, "")) + importExtension;
 		});
@@ -2581,11 +2606,11 @@ async function writeSpecs(builder, workspace, options, projectName) {
 		if (output.operationSchemas) imports.push(upath.getRelativeImportPath(indexFile, getFileInfo(output.operationSchemas).dirname));
 		if (output.indexFiles) {
 			if (await fs$2.pathExists(indexFile)) {
-				const data = await fs$2.readFile(indexFile, "utf8");
-				const importsNotDeclared = imports.filter((imp) => !data.includes(`export * from '${imp}'`));
-				await fs$2.appendFile(indexFile, unique(importsNotDeclared).map((imp) => `export * from '${imp}';\n`).join(""));
-			} else await fs$2.outputFile(indexFile, unique(imports).map((imp) => `export * from '${imp}';`).join("\n") + "\n");
-			implementationPaths = [indexFile, ...implementationPathsForIndex];
+				const declared = readReExportSpecifiers(await fs$2.readFile(indexFile, "utf8"));
+				const toAdd = [...new Set(imports.filter((imp) => !declared.has(imp)))];
+				if (toAdd.length > 0) await fs$2.appendFile(indexFile, toAdd.map((imp) => `export * from '${imp}';\n`).join(""));
+			} else await fs$2.outputFile(indexFile, `${[...new Set(imports)].map((imp) => `export * from '${imp}';`).join("\n")}\n`);
+			implementationPaths = [indexFile, ...excludeFilePath(implementationPaths, indexFile)];
 		}
 	}
 	if (builder.extraFiles.length > 0) {
@@ -2636,6 +2661,8 @@ function getWriteMode(mode) {
 		case OutputMode.SPLIT: return writeSplitMode;
 		case OutputMode.TAGS: return writeTagsMode;
 		case OutputMode.TAGS_SPLIT: return writeSplitTagsMode;
+		case OutputMode.TAGS_OPERATIONS: return writeTagsOperationsMode;
+		case OutputMode.TAGS_OPERATIONS_SPLIT: return writeTagsOperationsSplitMode;
 		default: return writeSingleMode;
 	}
 }
@@ -2725,4 +2752,4 @@ async function loadConfigFile(configFilePath) {
 //#endregion
 export { defineConfig as a, description as c, startWatcher as i, name as l, loadConfigFile as n, defineTransformer as o, generateSpec as r, normalizeOptions as s, findConfigFile as t, version as u };
 
-//# sourceMappingURL=config-CotJKggp.mjs.map
+//# sourceMappingURL=config-18E5SVPo.mjs.map