@hey-api/openapi-ts 0.90.7 → 0.90.9

package/dist/{openApi-B6J9qPwL.mjs → openApi-CE_z8tev.mjs}

@@ -1,6 +1,6 @@
 
 import { createRequire } from "node:module";
-import { Project, StructureModel, fromRef, isNode, isRef, isSymbol, log, nodeBrand, ref, refs } from "@hey-api/codegen-core";
+import { Project, StructureModel, detectInteractiveSession, fromRef, isNode, isRef, isSymbol, loadConfigFile, log, nodeBrand, ref, refs } from "@hey-api/codegen-core";
 import colors from "ansi-colors";
 import fs from "node:fs";
 import path from "node:path";
@@ -432,6 +432,76 @@ const getInput = (userConfig) => {
 	return inputs;
 };
 
+//#endregion
+//#region src/config/expand.ts
+function expandToJobs(configs) {
+	const jobs = [];
+	let jobIndex = 0;
+	for (const config of configs) {
+		const inputs = getInput(config);
+		const outputs = config.output instanceof Array ? config.output : [config.output];
+		if (outputs.length === 1) jobs.push({
+			config: {
+				...config,
+				input: inputs,
+				output: outputs[0]
+			},
+			index: jobIndex++
+		});
+		else if (outputs.length > 1 && inputs.length !== outputs.length) {
+			console.warn(`⚙️ ${colors.yellow("Warning:")} You provided ${colors.cyan(String(inputs.length))} ${colors.cyan(inputs.length === 1 ? "input" : "inputs")} and ${colors.yellow(String(outputs.length))} ${colors.yellow("outputs")}. This will produce identical output in multiple locations. You likely want to provide a single output or the same number of outputs as inputs.`);
+			for (const output of outputs) jobs.push({
+				config: {
+					...config,
+					input: inputs,
+					output
+				},
+				index: jobIndex++
+			});
+		} else if (outputs.length > 1) outputs.forEach((output, index) => {
+			jobs.push({
+				config: {
+					...config,
+					input: inputs[index],
+					output
+				},
+				index: jobIndex++
+			});
+		});
+	}
+	return jobs;
+}
+
+//#endregion
+//#region src/config/packages.ts
+/**
+* Finds and reads the project's package.json file by searching upwards from the config file location,
+* or from process.cwd() if no config file is provided.
+* This ensures we get the correct dependencies even in monorepo setups.
+*
+* @param configFilePath - The path to the configuration file (e.g., openapi-ts.config.ts)
+* @returns An object containing all project dependencies (dependencies, devDependencies, peerDependencies, optionalDependencies)
+*/
+const getProjectDependencies = (configFilePath) => {
+	let currentDir = configFilePath ? path.dirname(configFilePath) : process.cwd();
+	while (currentDir !== path.dirname(currentDir)) {
+		const packageJsonPath = path.join(currentDir, "package.json");
+		if (fs.existsSync(packageJsonPath)) try {
+			const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
+			return {
+				...packageJson.dependencies,
+				...packageJson.devDependencies,
+				...packageJson.peerDependencies,
+				...packageJson.optionalDependencies
+			};
+		} catch {}
+		const parentDir = path.dirname(currentDir);
+		if (parentDir === currentDir) break;
+		currentDir = parentDir;
+	}
+	return {};
+};
+
 //#endregion
 //#region src/config/logs.ts
 const getLogs = (userConfig) => {
@@ -448,27 +518,6 @@ const getLogs = (userConfig) => {
 	return logs;
 };
 
-//#endregion
-//#region src/config/merge.ts
-const mergeObjects = (objA, objB) => {
-	const a = objA || {};
-	const b = objB || {};
-	return {
-		...a,
-		...b
-	};
-};
-const mergeConfigs = (configA, configB) => {
-	const a = configA || {};
-	const b = configB || {};
-	const merged = {
-		...a,
-		...b
-	};
-	if (typeof merged.logs === "object") merged.logs = mergeObjects(a.logs, b.logs);
-	return merged;
-};
-
 //#endregion
 //#region src/config/utils/config.ts
 const isPlainObject = (value) => typeof value === "object" && value !== null && !Array.isArray(value) && typeof value !== "function";
@@ -1088,36 +1137,6 @@ function normalizePostProcess(input) {
 	});
 }
 
-//#endregion
-//#region src/config/packages.ts
-/**
-* Finds and reads the project's package.json file by searching upwards from the config file location,
-* or from process.cwd() if no config file is provided.
-* This ensures we get the correct dependencies even in monorepo setups.
-*
-* @param configFilePath - The path to the configuration file (e.g., openapi-ts.config.ts)
-* @returns An object containing all project dependencies (dependencies, devDependencies, peerDependencies, optionalDependencies)
-*/
-const getProjectDependencies = (configFilePath) => {
-	let currentDir = configFilePath ? path.dirname(configFilePath) : process.cwd();
-	while (currentDir !== path.dirname(currentDir)) {
-		const packageJsonPath = path.join(currentDir, "package.json");
-		if (fs.existsSync(packageJsonPath)) try {
-			const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
-			return {
-				...packageJson.dependencies,
-				...packageJson.devDependencies,
-				...packageJson.peerDependencies,
-				...packageJson.optionalDependencies
-			};
-		} catch {}
-		const parentDir = path.dirname(currentDir);
-		if (parentDir === currentDir) break;
-		currentDir = parentDir;
-	}
-	return {};
-};
-
 //#endregion
 //#region src/config/parser.ts
 const defaultPaginationKeywords = [
@@ -3930,16 +3949,21 @@ const Mixed$25 = DocMixin(TsDsl);
 var ObjectPropTsDsl = class extends Mixed$25 {
 	"~dsl" = "ObjectPropTsDsl";
 	_value;
-	meta;
+	_meta;
 	constructor(meta) {
 		super();
-		this.meta = meta;
+		this._meta = meta;
+	}
+	get kind() {
+		return this._meta.kind;
+	}
+	get propName() {
+		return this._meta.name;
 	}
 	analyze(ctx$1) {
 		super.analyze(ctx$1);
 		ctx$1.analyze(this._value);
 	}
-	/** Returns true when all required builder calls are present. */
 	get isValid() {
 		return this.missingRequiredCalls().length === 0;
 	}
@@ -3951,33 +3975,33 @@ var ObjectPropTsDsl = class extends Mixed$25 {
 	toAst() {
 		this.$validate();
 		const node = this.$node(this._value);
-		if (this.meta.kind === "spread") {
+		if (this._meta.kind === "spread") {
 			if (ts.isStatement(node)) throw new Error("Invalid spread: object spread must be an expression, not a statement.");
 			const result$1 = ts.factory.createSpreadAssignment(node);
 			return this.$docs(result$1);
 		}
-		if (this.meta.kind === "getter") {
-			const getter = new GetterTsDsl(this.meta.name).do(node);
+		if (this._meta.kind === "getter") {
+			const getter = new GetterTsDsl(this._meta.name).do(node);
 			const result$1 = this.$node(getter);
 			return this.$docs(result$1);
 		}
-		if (this.meta.kind === "setter") {
-			const setter = new SetterTsDsl(this.meta.name).do(node);
+		if (this._meta.kind === "setter") {
+			const setter = new SetterTsDsl(this._meta.name).do(node);
 			const result$1 = this.$node(setter);
 			return this.$docs(result$1);
 		}
-		if (ts.isIdentifier(node) && node.text === this.meta.name) {
-			const result$1 = ts.factory.createShorthandPropertyAssignment(this.meta.name);
+		if (ts.isIdentifier(node) && node.text === this._meta.name) {
+			const result$1 = ts.factory.createShorthandPropertyAssignment(this._meta.name);
 			return this.$docs(result$1);
 		}
 		if (ts.isStatement(node)) throw new Error("Invalid property: object property value must be an expression, not a statement.");
-		const result = ts.factory.createPropertyAssignment(this.meta.kind === "computed" ? ts.factory.createComputedPropertyName(this.$node(new IdTsDsl(this.meta.name))) : this.$node(safePropName(this.meta.name)), node);
+		const result = ts.factory.createPropertyAssignment(this._meta.kind === "computed" ? ts.factory.createComputedPropertyName(this.$node(new IdTsDsl(this._meta.name))) : this.$node(safePropName(this._meta.name)), node);
 		return this.$docs(result);
 	}
 	$validate() {
 		const missing = this.missingRequiredCalls();
 		if (missing.length === 0) return;
-		throw new Error(`Object property${this.meta.name ? ` "${this.meta.name}"` : ""} missing ${missing.join(" and ")}`);
+		throw new Error(`Object property${this._meta.name ? ` "${this._meta.name}"` : ""} missing ${missing.join(" and ")}`);
 	}
 	missingRequiredCalls() {
 		const missing = [];
@@ -3991,26 +4015,34 @@ var ObjectPropTsDsl = class extends Mixed$25 {
 const Mixed$24 = AsMixin(ExprMixin(HintMixin(LayoutMixin(TsDsl))));
 var ObjectTsDsl = class extends Mixed$24 {
 	"~dsl" = "ObjectTsDsl";
-	_props = [];
+	_props = /* @__PURE__ */ new Map();
+	_spreadCounter = 0;
 	constructor(...props) {
 		super();
 		this.props(...props);
 	}
 	analyze(ctx$1) {
 		super.analyze(ctx$1);
-		for (const prop of this._props) ctx$1.analyze(prop);
+		for (const prop of this._props.values()) ctx$1.analyze(prop);
 	}
-	/** Adds a computed property (e.g. `{ [expr]: value }`). */
+	/** Returns composite key for the property. */
+	_propKey(prop) {
+		if (prop.kind === "spread") return `spread:${this._spreadCounter++}`;
+		return `${prop.kind}:${prop.propName}`;
+	}
+	/** Adds a computed property (e.g. `{ [expr]: value }`), or removes if null. */
 	computed(name, expr) {
-		this._props.push(new ObjectPropTsDsl({
+		if (expr === null) this._props.delete(`computed:${name}`);
+		else this._props.set(`computed:${name}`, new ObjectPropTsDsl({
 			kind: "computed",
 			name
 		}).value(expr));
 		return this;
 	}
-	/** Adds a getter property (e.g. `{ get foo() { ... } }`). */
+	/** Adds a getter property (e.g. `{ get foo() { ... } }`), or removes if null. */
 	getter(name, stmt) {
-		this._props.push(new ObjectPropTsDsl({
+		if (stmt === null) this._props.delete(`getter:${name}`);
+		else this._props.set(`getter:${name}`, new ObjectPropTsDsl({
 			kind: "getter",
 			name
 		}).value(stmt));
@@ -4018,15 +4050,16 @@ var ObjectTsDsl = class extends Mixed$24 {
 	}
 	/** Returns true if object has at least one property or spread. */
 	hasProps() {
-		return this._props.length > 0;
+		return this._props.size > 0;
 	}
 	/** Returns true if object has no properties or spreads. */
 	get isEmpty() {
-		return this._props.length === 0;
+		return this._props.size === 0;
 	}
-	/** Adds a property assignment. */
+	/** Adds a property assignment, or removes if null. */
 	prop(name, expr) {
-		this._props.push(new ObjectPropTsDsl({
+		if (expr === null) this._props.delete(`prop:${name}`);
+		else this._props.set(`prop:${name}`, new ObjectPropTsDsl({
 			kind: "prop",
 			name
 		}).value(expr));
@@ -4034,12 +4067,13 @@ var ObjectTsDsl = class extends Mixed$24 {
 	}
 	/** Adds multiple properties. */
 	props(...props) {
-		this._props.push(...props);
+		for (const prop of props) this._props.set(this._propKey(prop), prop);
 		return this;
 	}
-	/** Adds a setter property (e.g. `{ set foo(v) { ... } }`). */
+	/** Adds a setter property (e.g. `{ set foo(v) { ... } }`), or removes if null. */
 	setter(name, stmt) {
-		this._props.push(new ObjectPropTsDsl({
+		if (stmt === null) this._props.delete(`setter:${name}`);
+		else this._props.set(`setter:${name}`, new ObjectPropTsDsl({
 			kind: "setter",
 			name
 		}).value(stmt));
@@ -4047,11 +4081,13 @@ var ObjectTsDsl = class extends Mixed$24 {
 	}
 	/** Adds a spread property (e.g. `{ ...options }`). */
 	spread(expr) {
-		this._props.push(new ObjectPropTsDsl({ kind: "spread" }).value(expr));
+		const key = `spread:${this._spreadCounter++}`;
+		this._props.set(key, new ObjectPropTsDsl({ kind: "spread" }).value(expr));
 		return this;
 	}
 	toAst() {
-		const node = ts.factory.createObjectLiteralExpression(this.$node(this._props), this.$multiline(this._props.length));
+		const props = [...this._props.values()];
+		const node = ts.factory.createObjectLiteralExpression(this.$node(props), this.$multiline(props.length));
 		return this.$hint(node);
 	}
 };
@@ -4550,6 +4586,14 @@ var TypeIdxSigTsDsl = class extends Mixed$10 {
 		this.name.set(name);
 		fn?.(this);
 	}
+	/** Element kind. */
+	get kind() {
+		return "idxSig";
+	}
+	/** Index signature parameter name. */
+	get propName() {
+		return this.name.toString();
+	}
 	analyze(ctx$1) {
 		super.analyze(ctx$1);
 		ctx$1.analyze(this._key);
@@ -4600,6 +4644,14 @@ var TypePropTsDsl = class extends Mixed$9 {
 		this.name.set(name);
 		fn(this);
 	}
+	/** Element kind. */
+	get kind() {
+		return "prop";
+	}
+	/** Property name. */
+	get propName() {
+		return this.name.toString();
+	}
 	analyze(ctx$1) {
 		super.analyze(ctx$1);
 		ctx$1.analyze(this._type);
@@ -4623,33 +4675,40 @@ const Mixed$8 = TsDsl;
 var TypeObjectTsDsl = class extends Mixed$8 {
 	"~dsl" = "TypeObjectTsDsl";
 	scope = "type";
-	props = [];
+	_props = /* @__PURE__ */ new Map();
 	analyze(ctx$1) {
 		super.analyze(ctx$1);
-		for (const prop of this.props) ctx$1.analyze(prop);
+		for (const prop of this._props.values()) ctx$1.analyze(prop);
 	}
-	/** Returns true if object has at least one property or spread. */
+	/** Returns true if object has at least one property or index signature. */
 	hasProps() {
-		return this.props.length > 0;
+		return this._props.size > 0;
 	}
-	/** Adds an index signature to the object type. */
+	/** Adds an index signature to the object type, or removes if fn is null. */
 	idxSig(name, fn) {
-		const idx = new TypeIdxSigTsDsl(name, fn);
-		this.props.push(idx);
+		const key = `idxSig:${name}`;
+		if (fn === null) this._props.delete(key);
+		else this._props.set(key, new TypeIdxSigTsDsl(name, fn));
 		return this;
 	}
-	/** Returns true if object has no properties or spreads. */
+	/** Returns true if object has no properties or index signatures. */
 	get isEmpty() {
-		return !this.props.length;
+		return this._props.size === 0;
 	}
-	/** Adds a property signature (returns property builder). */
+	/** Adds a property signature, or removes if fn is null. */
 	prop(name, fn) {
-		const prop = new TypePropTsDsl(name, fn);
-		this.props.push(prop);
+		const key = `prop:${name}`;
+		if (fn === null) this._props.delete(key);
+		else this._props.set(key, new TypePropTsDsl(name, fn));
+		return this;
+	}
+	/** Adds multiple properties/index signatures. */
+	props(...members) {
+		for (const member of members) this._props.set(`${member.kind}:${member.propName}`, member);
 		return this;
 	}
 	toAst() {
-		return ts.factory.createTypeLiteralNode(this.$node(this.props));
+		return ts.factory.createTypeLiteralNode(this.$node([...this._props.values()]));
 	}
 };
 
@@ -14980,119 +15039,98 @@ const getPlugins = ({ dependencies, userConfig }) => {
 	});
 };
 
+//#endregion
+//#region src/config/resolve.ts
+const resolveConfig = (validated, dependencies) => {
+	const logs = getLogs(validated.job.config);
+	const input = getInput(validated.job.config);
+	const output = getOutput(validated.job.config);
+	const parser = getParser(validated.job.config);
+	output.path = path.resolve(process.cwd(), output.path);
+	let plugins;
+	try {
+		plugins = getPlugins({
+			dependencies,
+			userConfig: validated.job.config
+		});
+	} catch (error) {
+		validated.errors.push(error);
+		plugins = {
+			pluginOrder: [],
+			plugins: {}
+		};
+	}
+	const config = {
+		configFile: validated.job.config.configFile ?? "",
+		dryRun: validated.job.config.dryRun ?? false,
+		input,
+		interactive: validated.job.config.interactive ?? detectInteractiveSession(),
+		logs,
+		output,
+		parser,
+		pluginOrder: plugins.pluginOrder,
+		plugins: plugins.plugins
+	};
+	if (logs.level === "debug") {
+		const jobPrefix = colors.gray(`[Job ${validated.job.index}] `);
+		console.warn(`${jobPrefix}${colors.cyan("config:")}`, config);
+	}
+	return {
+		config,
+		errors: validated.errors,
+		index: validated.job.index
+	};
+};
+
+//#endregion
+//#region src/config/validate.ts
+function validateJobs(jobs) {
+	return jobs.map((job) => {
+		const errors = [];
+		const { config } = job;
+		if (!getInput(config).length) errors.push(new ConfigError("missing input - which OpenAPI specification should we use to generate your output?"));
+		if (!getOutput(config).path) errors.push(new ConfigError("missing output - where should we generate your output?"));
+		return {
+			errors,
+			job
+		};
+	});
+}
+
 //#endregion
 //#region src/config/init.ts
 /**
-* Detect if the current session is interactive based on TTY status and environment variables.
-* This is used as a fallback when the user doesn't explicitly set the interactive option.
 * @internal
 */
-const detectInteractiveSession = () => Boolean(process.stdin.isTTY && process.stdout.isTTY && !process.env.CI && !process.env.NO_INTERACTIVE && !process.env.NO_INTERACTION);
-/**
-* @internal
-*/
-const initConfigs = async ({ logger, userConfigs }) => {
+async function resolveJobs({ logger, userConfigs }) {
 	const configs = [];
 	let dependencies = {};
 	const eventLoad = logger.timeEvent("load");
 	for (const userConfig of userConfigs) {
-		let configurationFile = void 0;
-		if (userConfig?.configFile) {
+		let configFile;
+		if (userConfig.configFile) {
 			const parts = userConfig.configFile.split(".");
-			configurationFile = parts.slice(0, parts.length - 1).join(".");
-		}
-		const eventC12 = logger.timeEvent("c12");
-		const { loadConfig } = await import("c12");
-		const { config: configFromFile, configFile: loadedConfigFile } = await loadConfig({
-			configFile: configurationFile,
-			name: "openapi-ts"
-		});
-		eventC12.timeEnd();
-		if (!Object.keys(dependencies).length) dependencies = getProjectDependencies(Object.keys(configFromFile).length ? loadedConfigFile : void 0);
-		const mergedConfigs = configFromFile instanceof Array ? configFromFile.map((config) => mergeConfigs(config, userConfig)) : [mergeConfigs(configFromFile, userConfig)];
-		for (const mergedConfig of mergedConfigs) {
-			const input = getInput(mergedConfig);
-			if (mergedConfig.output instanceof Array) {
-				const countInputs = input.length;
-				const countOutputs = mergedConfig.output.length;
-				if (countOutputs > 1) if (countInputs !== countOutputs) {
-					console.warn(`⚙️ ${colors.yellow("Warning:")} You provided ${colors.cyan(String(countInputs))} ${colors.cyan(countInputs === 1 ? "input" : "inputs")} and ${colors.yellow(String(countOutputs))} ${colors.yellow("outputs")}. This is probably not what you want as it will produce identical output in multiple locations. You most likely want to provide a single output or the same number of outputs as inputs.`);
-					for (const output of mergedConfig.output) configs.push({
-						...mergedConfig,
-						input,
-						output
-					});
-				} else mergedConfig.output.forEach((output, index) => {
-					configs.push({
-						...mergedConfig,
-						input: input[index],
-						output
-					});
-				});
-				else configs.push({
-					...mergedConfig,
-					input,
-					output: mergedConfig.output[0] ?? ""
-				});
-			} else configs.push({
-				...mergedConfig,
-				input
-			});
+			configFile = parts.slice(0, parts.length - 1).join(".");
 		}
+		const loaded = await loadConfigFile({
+			configFile,
+			logger,
+			name: "openapi-ts",
+			userConfig
+		});
+		if (!Object.keys(dependencies).length) dependencies = getProjectDependencies(loaded.foundConfig ? loaded.configFile : void 0);
+		configs.push(...loaded.configs);
 	}
 	eventLoad.timeEnd();
-	const results = [];
 	const eventBuild = logger.timeEvent("build");
-	for (const userConfig of configs) {
-		const logs = getLogs(userConfig);
-		const input = getInput(userConfig);
-		const output = getOutput(userConfig);
-		const parser = getParser(userConfig);
-		const errors = [];
-		if (!input.length) errors.push(new ConfigError("missing input - which OpenAPI specification should we use to generate your output?"));
-		if (!output.path) errors.push(new ConfigError("missing output - where should we generate your output?"));
-		output.path = path.resolve(process.cwd(), output.path);
-		let plugins;
-		try {
-			plugins = getPlugins({
-				dependencies,
-				userConfig
-			});
-		} catch (error) {
-			errors.push(error);
-			plugins = {
-				pluginOrder: [],
-				plugins: {}
-			};
-		}
-		const config = {
-			configFile: userConfig.configFile ?? "",
-			dryRun: userConfig.dryRun ?? false,
-			input,
-			interactive: userConfig.interactive ?? detectInteractiveSession(),
-			logs,
-			output,
-			parser,
-			pluginOrder: plugins.pluginOrder,
-			plugins: plugins.plugins
-		};
-		const jobIndex = results.length;
-		if (logs.level === "debug") {
-			const jobPrefix = colors.gray(`[Job ${jobIndex + 1}] `);
-			console.warn(`${jobPrefix}${colors.cyan("config:")}`, config);
-		}
-		results.push({
-			config,
-			errors,
-			jobIndex
-		});
-	}
+	const resolvedJobs = validateJobs(expandToJobs(configs)).map((validated) => resolveConfig(validated, dependencies));
 	eventBuild.timeEnd();
 	return {
 		dependencies,
-		results
+		jobs: resolvedJobs,
+		results: resolvedJobs
 	};
-};
+}
 
 //#endregion
 //#region src/plugins/@hey-api/client-core/bundle/params.ts
@@ -21732,5 +21770,5 @@ 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-B6J9qPwL.mjs.map
+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, resolveJobs 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-CE_z8tev.mjs.map