@hey-api/openapi-ts 0.90.2 → 0.90.3

package/dist/{openApi-PX3rDrOF.mjs → openApi-Ci-wjGgv.mjs}

@@ -513,66 +513,6 @@ const valueToObject = ({ defaultValue, mappers: mappers$1, value }) => {
 	return result;
 };
 
-//#endregion
-//#region src/config/output/source/config.ts
-function resolveSource(config) {
-	const source$2 = valueToObject({
-		defaultValue: {
-			enabled: Boolean(config.source),
-			extension: "json",
-			fileName: "source",
-			serialize: (input) => JSON.stringify(input, null, 2)
-		},
-		mappers: { boolean: (enabled) => ({ enabled }) },
-		value: config.source
-	});
-	if (source$2.path === void 0 || source$2.path === true) source$2.path = "";
-	else if (source$2.path === false) source$2.path = null;
-	return source$2;
-}
-
-//#endregion
-//#region src/config/output/config.ts
-function getOutput(userConfig) {
-	if (userConfig.output instanceof Array) throw new Error("Unexpected array of outputs in user configuration. This should have been expanded already.");
-	const output = valueToObject({
-		defaultValue: {
-			clean: true,
-			fileName: {
-				case: "preserve",
-				name: "{{name}}",
-				suffix: ".gen"
-			},
-			format: null,
-			header: "// This file is auto-generated by @hey-api/openapi-ts",
-			indexFile: true,
-			lint: null,
-			path: "",
-			preferExportAll: false
-		},
-		mappers: {
-			object: (fields, defaultValue) => ({
-				...fields,
-				fileName: valueToObject({
-					defaultValue: { ...defaultValue.fileName },
-					mappers: {
-						function: (name) => ({ name }),
-						string: (name) => ({ name })
-					},
-					value: fields.fileName
-				})
-			}),
-			string: (path$4) => ({ path: path$4 })
-		},
-		value: userConfig.output
-	});
-	output.tsConfig = loadTsConfig(findTsConfigPath(output.tsConfigPath));
-	if (output.importFileExtension === void 0 && (output.tsConfig?.options.moduleResolution === ts.ModuleResolutionKind.NodeNext || output.tsConfig?.options.moduleResolution === ts.ModuleResolutionKind.Node16)) output.importFileExtension = ".js";
-	if (output.importFileExtension && !output.importFileExtension.startsWith(".")) output.importFileExtension = `.${output.importFileExtension}`;
-	output.source = resolveSource(output);
-	return output;
-}
-
 //#endregion
 //#region ../../node_modules/.pnpm/isexe@2.0.0/node_modules/isexe/windows.js
 var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
@@ -985,68 +925,169 @@ var require_cross_spawn = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 //#endregion
 //#region src/config/output/postprocess.ts
 var import_cross_spawn = require_cross_spawn();
-/**
-* Map of supported formatters
-*/
-const formatters = {
-	biome: {
-		args: (path$4) => [
+const postProcessors = {
+	"biome:format": {
+		args: [
 			"format",
 			"--write",
-			path$4
+			"{{path}}"
 		],
 		command: "biome",
 		name: "Biome (Format)"
 	},
-	prettier: {
-		args: (path$4) => [
-			"--ignore-unknown",
-			path$4,
-			"--write",
-			"--ignore-path",
-			"./.prettierignore"
-		],
-		command: "prettier",
-		name: "Prettier"
-	}
-};
-/**
-* Map of supported linters
-*/
-const linters = {
-	biome: {
-		args: (path$4) => [
+	"biome:lint": {
+		args: [
 			"lint",
 			"--apply",
-			path$4
+			"{{path}}"
 		],
 		command: "biome",
 		name: "Biome (Lint)"
 	},
 	eslint: {
-		args: (path$4) => [path$4, "--fix"],
+		args: ["{{path}}", "--fix"],
 		command: "eslint",
 		name: "ESLint"
 	},
+	oxfmt: {
+		args: ["{{path}}"],
+		command: "oxfmt",
+		name: "Oxfmt"
+	},
 	oxlint: {
-		args: (path$4) => ["--fix", path$4],
+		args: ["--fix", "{{path}}"],
 		command: "oxlint",
-		name: "oxlint"
+		name: "Oxlint"
+	},
+	prettier: {
+		args: [
+			"--ignore-unknown",
+			"{{path}}",
+			"--write",
+			"--ignore-path",
+			"./.prettierignore"
+		],
+		command: "prettier",
+		name: "Prettier"
 	}
 };
-const postprocessOutput = (config) => {
-	if (config.lint) {
-		const module$1 = linters[config.lint];
-		console.log(`✨ Running ${module$1.name}`);
-		(0, import_cross_spawn.sync)(module$1.command, module$1.args(config.path));
-	}
-	if (config.format) {
-		const module$1 = formatters[config.format];
-		console.log(`✨ Running ${module$1.name}`);
-		(0, import_cross_spawn.sync)(module$1.command, module$1.args(config.path));
+const postprocessOutput = (config, jobPrefix) => {
+	for (const processor of config.postProcess) {
+		const resolved = typeof processor === "string" ? postProcessors[processor] : processor;
+		const name = resolved.name ?? resolved.command;
+		const args = resolved.args.map((arg) => arg.replace("{{path}}", config.path));
+		console.log(`${jobPrefix}🧹 Running ${colors.cyanBright(name)}`);
+		(0, import_cross_spawn.sync)(resolved.command, args);
 	}
 };
 
+//#endregion
+//#region src/config/output/source/config.ts
+function resolveSource(config) {
+	const source$2 = valueToObject({
+		defaultValue: {
+			enabled: Boolean(config.source),
+			extension: "json",
+			fileName: "source",
+			serialize: (input) => JSON.stringify(input, null, 2)
+		},
+		mappers: { boolean: (enabled) => ({ enabled }) },
+		value: config.source
+	});
+	if (source$2.path === void 0 || source$2.path === true) source$2.path = "";
+	else if (source$2.path === false) source$2.path = null;
+	return source$2;
+}
+
+//#endregion
+//#region src/config/output/config.ts
+function getOutput(userConfig) {
+	if (userConfig.output instanceof Array) throw new Error("Unexpected array of outputs in user configuration. This should have been expanded already.");
+	const userOutput = typeof userConfig.output === "string" ? { path: userConfig.output } : userConfig.output ?? {};
+	const legacyPostProcess = resolveLegacyPostProcess(userOutput);
+	const output = valueToObject({
+		defaultValue: {
+			clean: true,
+			fileName: {
+				case: "preserve",
+				name: "{{name}}",
+				suffix: ".gen"
+			},
+			format: null,
+			header: "// This file is auto-generated by @hey-api/openapi-ts",
+			indexFile: true,
+			lint: null,
+			path: "",
+			postProcess: [],
+			preferExportAll: false
+		},
+		mappers: { object: (fields, defaultValue) => ({
+			...fields,
+			fileName: valueToObject({
+				defaultValue: { ...defaultValue.fileName },
+				mappers: {
+					function: (name) => ({ name }),
+					string: (name) => ({ name })
+				},
+				value: fields.fileName
+			})
+		}) },
+		value: userOutput
+	});
+	output.tsConfig = loadTsConfig(findTsConfigPath(output.tsConfigPath));
+	if (output.importFileExtension === void 0 && (output.tsConfig?.options.moduleResolution === ts.ModuleResolutionKind.NodeNext || output.tsConfig?.options.moduleResolution === ts.ModuleResolutionKind.Node16)) output.importFileExtension = ".js";
+	if (output.importFileExtension && !output.importFileExtension.startsWith(".")) output.importFileExtension = `.${output.importFileExtension}`;
+	output.postProcess = normalizePostProcess(userOutput.postProcess ?? legacyPostProcess);
+	output.source = resolveSource(output);
+	return output;
+}
+function resolveLegacyPostProcess(config) {
+	const result = [];
+	if (config.lint !== void 0) {
+		let processor;
+		let preset;
+		if (config.lint) {
+			preset = config.lint === "biome" ? "biome:lint" : config.lint;
+			processor = postProcessors[preset];
+			if (processor) result.push(processor);
+		}
+		log.warnDeprecated({
+			context: "output",
+			field: "lint",
+			replacement: `postProcess: [${processor && preset ? `'${preset}'` : ""}]`
+		});
+	}
+	if (config.format !== void 0) {
+		let processor;
+		let preset;
+		if (config.format) {
+			preset = config.format === "biome" ? "biome:format" : config.format;
+			processor = postProcessors[preset];
+			if (processor) result.push(processor);
+		}
+		log.warnDeprecated({
+			context: "output",
+			field: "format",
+			replacement: `postProcess: [${processor && preset ? `'${preset}'` : ""}]`
+		});
+	}
+	return result;
+}
+function normalizePostProcess(input) {
+	if (!input) return [];
+	return input.map((item) => {
+		if (typeof item === "string") {
+			const preset = postProcessors[item];
+			if (!preset) throw new Error(`Unknown post-processor preset: "${item}"`);
+			return preset;
+		}
+		return {
+			name: item.name ?? item.command,
+			...item
+		};
+	});
+}
+
 //#endregion
 //#region src/config/packages.ts
 /**
@@ -21445,4 +21486,4 @@ const parseOpenApiSpec = ({ config, dependencies, logger, spec }) => {
 
 //#endregion
 export { openGitHubIssueWithCrashReport as A, defaultPaginationKeywords as C, ConfigValidationError as D, ConfigError as E, shouldReportCrash as M, loadPackageJson as N, JobError as O, definePluginConfig as S, getLogs as T, regexp as _, defaultPlugins as a, OperationPath as b, clientDefaultConfig as c, $ as d, TypeScriptRenderer as f, keywords as g, reserved as h, initConfigs as i, printCrashReport as j, logCrashReport as k, clientDefaultMeta as l, ctx as m, buildGraph as n, clientPluginHandler as o, TsDslContext as p, getSpec as r, generateClientBundle as s, parseOpenApiSpec as t, toCase as u, TsDsl as v, postprocessOutput as w, OperationStrategy as x, getClientPlugin as y };
-//# sourceMappingURL=openApi-PX3rDrOF.mjs.map
+//# sourceMappingURL=openApi-Ci-wjGgv.mjs.map