@hey-api/openapi-ts 0.90.2 → 0.90.3

package/dist/index.cjs

@@ -1,6 +1,6 @@
 
-const require_openApi = require('./openApi-BwUPqtP_.cjs');
-const require_src = require('./src-hU76ergi.cjs');
+const require_openApi = require('./openApi-BetJIgjU.cjs');
+const require_src = require('./src-CJqsBn3S.cjs');
 
 exports.$ = require_openApi.$;
 exports.Logger = require_src.Logger;

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 
-import { A as ctx, C as regexp, D as TypeTsDsl, E as TsDsl, F as Casing, I as LazyOrAsync, L as MaybeArray, M as OperationPath, N as OperationStrategy, O as ExampleOptions, P as IR, S as TypeScriptRenderer, T as MaybeTsDsl, _ as Client$2, a as Plugin, b as DollarTsDsl, c as OpenApiOperationObject, d as OpenApiResponseObject, f as OpenApiSchemaObject, g as ExpressionTransformer, h as TypeTransformer, i as DefinePlugin, j as CallArgs, k as TsDslContext, l as OpenApiParameterObject, m as Logger, n as UserConfig, o as OpenApi, p as Context, s as OpenApiMetaObject, u as OpenApiRequestBodyObject, v as PluginHandler, w as keywords, x as reserved, y as $ } from "./config-84ipCnU3.cjs";
+import { A as ctx, C as regexp, D as TypeTsDsl, E as TsDsl, F as Casing, I as LazyOrAsync, L as MaybeArray, M as OperationPath, N as OperationStrategy, O as ExampleOptions, P as IR, S as TypeScriptRenderer, T as MaybeTsDsl, _ as Client$2, a as Plugin, b as DollarTsDsl, c as OpenApiOperationObject, d as OpenApiResponseObject, f as OpenApiSchemaObject, g as ExpressionTransformer, h as TypeTransformer, i as DefinePlugin, j as CallArgs, k as TsDslContext, l as OpenApiParameterObject, m as Logger, n as UserConfig, o as OpenApi, p as Context, s as OpenApiMetaObject, u as OpenApiRequestBodyObject, v as PluginHandler, w as keywords, x as reserved, y as $ } from "./config-Cmhj4J0r.cjs";
 import { HttpClient, HttpErrorResponse, HttpHeaders, HttpRequest, HttpResponse } from "@angular/common/http";
 import { Injector } from "@angular/core";
 import { AxiosError, AxiosInstance, AxiosRequestHeaders, AxiosResponse, AxiosStatic, CreateAxiosDefaults } from "axios";

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 
-import { A as keywords, B as IR, C as Client$1, D as reserved, E as DollarTsDsl, F as TsDslContext, H as LazyOrAsync, I as ctx, L as CallArgs, M as TsDsl, N as TypeTsDsl, O as TypeScriptRenderer, P as ExampleOptions, R as OperationPath, S as Client$3, T as $, U as MaybeArray, V as Casing, _ as Client$2, a as Plugin, b as Client$5, c as OpenApiOperationObject, d as OpenApiResponseObject, f as OpenApiSchemaObject, g as ExpressionTransformer, h as TypeTransformer, i as DefinePlugin, j as MaybeTsDsl, k as regexp, l as OpenApiParameterObject, m as Logger, n as UserConfig, o as OpenApi, p as Context, s as OpenApiMetaObject, u as OpenApiRequestBodyObject, v as PluginHandler, w as Client, x as Client$4, y as Client$6, z as OperationStrategy } from "./config-BzR0jtGH.mjs";
+import { A as keywords, B as IR, C as Client$1, D as reserved, E as DollarTsDsl, F as TsDslContext, H as LazyOrAsync, I as ctx, L as CallArgs, M as TsDsl, N as TypeTsDsl, O as TypeScriptRenderer, P as ExampleOptions, R as OperationPath, S as Client$3, T as $, U as MaybeArray, V as Casing, _ as Client$2, a as Plugin, b as Client$5, c as OpenApiOperationObject, d as OpenApiResponseObject, f as OpenApiSchemaObject, g as ExpressionTransformer, h as TypeTransformer, i as DefinePlugin, j as MaybeTsDsl, k as regexp, l as OpenApiParameterObject, m as Logger, n as UserConfig, o as OpenApi, p as Context, s as OpenApiMetaObject, u as OpenApiRequestBodyObject, v as PluginHandler, w as Client, x as Client$4, y as Client$6, z as OperationStrategy } from "./config-kLkHIaUr.mjs";
 import "@hey-api/codegen-core";
 
 //#region src/generate.d.ts

package/dist/index.mjs

@@ -1,5 +1,5 @@
 
-import { C as defaultPaginationKeywords, S as definePluginConfig, _ as regexp, a as defaultPlugins, b as OperationPath, c as clientDefaultConfig, d as $, f as TypeScriptRenderer, g as keywords, h as reserved, l as clientDefaultMeta, m as ctx, o as clientPluginHandler, p as TsDslContext, v as TsDsl, x as OperationStrategy } from "./openApi-PX3rDrOF.mjs";
-import { i as Logger, n as utils, r as createClient, t as defineConfig } from "./src-BCi83sdM.mjs";
+import { C as defaultPaginationKeywords, S as definePluginConfig, _ as regexp, a as defaultPlugins, b as OperationPath, c as clientDefaultConfig, d as $, f as TypeScriptRenderer, g as keywords, h as reserved, l as clientDefaultMeta, m as ctx, o as clientPluginHandler, p as TsDslContext, v as TsDsl, x as OperationStrategy } from "./openApi-Ci-wjGgv.mjs";
+import { i as Logger, n as utils, r as createClient, t as defineConfig } from "./src-CV7EsNIp.mjs";
 
 export { $, Logger, OperationPath, OperationStrategy, TsDsl, TsDslContext, TypeScriptRenderer, clientDefaultConfig, clientDefaultMeta, clientPluginHandler, createClient, ctx, defaultPaginationKeywords, defaultPlugins, defineConfig, definePluginConfig, keywords, regexp, reserved, utils };

package/dist/internal.cjs

@@ -1,5 +1,5 @@
 
-const require_openApi = require('./openApi-BwUPqtP_.cjs');
+const require_openApi = require('./openApi-BetJIgjU.cjs');
 
 exports.getSpec = require_openApi.getSpec;
 exports.initConfigs = require_openApi.initConfigs;

package/dist/internal.d.cts

@@ -1,5 +1,5 @@
 
-import { m as Logger, n as UserConfig, p as Context, r as Input, t as Config } from "./config-84ipCnU3.cjs";
+import { m as Logger, n as UserConfig, p as Context, r as Input, t as Config } from "./config-Cmhj4J0r.cjs";
 import { getResolvedInput } from "@hey-api/json-schema-ref-parser";
 
 //#region src/config/init.d.ts

package/dist/internal.d.mts

@@ -1,5 +1,5 @@
 
-import { m as Logger, n as UserConfig, p as Context, r as Input, t as Config } from "./config-BzR0jtGH.mjs";
+import { m as Logger, n as UserConfig, p as Context, r as Input, t as Config } from "./config-kLkHIaUr.mjs";
 import { getResolvedInput } from "@hey-api/json-schema-ref-parser";
 
 //#region src/config/init.d.ts

package/dist/internal.mjs

@@ -1,4 +1,4 @@
 
-import { i as initConfigs, r as getSpec, t as parseOpenApiSpec } from "./openApi-PX3rDrOF.mjs";
+import { i as initConfigs, r as getSpec, t as parseOpenApiSpec } from "./openApi-Ci-wjGgv.mjs";
 
 export { getSpec, initConfigs, parseOpenApiSpec };

package/dist/{openApi-BwUPqtP_.cjs → openApi-BetJIgjU.cjs}

@@ -540,66 +540,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$10) => ({ path: path$10 })
-		},
-		value: userConfig.output
-	});
-	output.tsConfig = loadTsConfig(findTsConfigPath(output.tsConfigPath));
-	if (output.importFileExtension === void 0 && (output.tsConfig?.options.moduleResolution === typescript.default.ModuleResolutionKind.NodeNext || output.tsConfig?.options.moduleResolution === typescript.default.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) => {
@@ -1012,68 +952,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$10) => [
+const postProcessors = {
+	"biome:format": {
+		args: [
 			"format",
 			"--write",
-			path$10
+			"{{path}}"
 		],
 		command: "biome",
 		name: "Biome (Format)"
 	},
-	prettier: {
-		args: (path$10) => [
-			"--ignore-unknown",
-			path$10,
-			"--write",
-			"--ignore-path",
-			"./.prettierignore"
-		],
-		command: "prettier",
-		name: "Prettier"
-	}
-};
-/**
-* Map of supported linters
-*/
-const linters = {
-	biome: {
-		args: (path$10) => [
+	"biome:lint": {
+		args: [
 			"lint",
 			"--apply",
-			path$10
+			"{{path}}"
 		],
 		command: "biome",
 		name: "Biome (Lint)"
 	},
 	eslint: {
-		args: (path$10) => [path$10, "--fix"],
+		args: ["{{path}}", "--fix"],
 		command: "eslint",
 		name: "ESLint"
 	},
+	oxfmt: {
+		args: ["{{path}}"],
+		command: "oxfmt",
+		name: "Oxfmt"
+	},
 	oxlint: {
-		args: (path$10) => ["--fix", path$10],
+		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 ${ansi_colors.default.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 === typescript.default.ModuleResolutionKind.NodeNext || output.tsConfig?.options.moduleResolution === typescript.default.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);
+		}
+		_hey_api_codegen_core.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);
+		}
+		_hey_api_codegen_core.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
 /**
@@ -21675,4 +21716,4 @@ Object.defineProperty(exports, 'toCase', {
     return toCase;
   }
 });
-//# sourceMappingURL=openApi-BwUPqtP_.cjs.map
+//# sourceMappingURL=openApi-BetJIgjU.cjs.map