@hey-api/openapi-ts 0.94.2 → 0.94.3

package/dist/{init-C6327prb.mjs → init-OaZZcRie.mjs}

@@ -149,6 +149,7 @@ function getOutput(userConfig) {
 			},
 			format: null,
 			lint: null,
+			module: {},
 			path: "",
 			postProcess: [],
 			preferExportAll: false
@@ -162,13 +163,25 @@ function getOutput(userConfig) {
 					string: (name) => ({ name })
 				},
 				value: fields.fileName
+			}),
+			module: valueToObject({
+				defaultValue: {
+					extension: fields.importFileExtension,
+					resolve: fields.resolveModuleName
+				},
+				mappers: { object: (moduleFields) => ({
+					...moduleFields,
+					extension: fields.importFileExtension ?? moduleFields.extension,
+					resolve: fields.resolveModuleName ?? moduleFields.resolve
+				}) },
+				value: fields.module
 			})
 		}) },
 		value: userOutput
 	});
 	output.tsConfig = loadTsConfig(findTsConfigPath(__dirname$1, output.tsConfigPath));
-	if (output.importFileExtension === void 0 && (output.tsConfig?.compilerOptions?.moduleResolution === "nodenext" || output.tsConfig?.compilerOptions?.moduleResolution === "NodeNext" || output.tsConfig?.compilerOptions?.moduleResolution === "node16" || output.tsConfig?.compilerOptions?.moduleResolution === "Node16" || output.tsConfig?.compilerOptions?.module === "nodenext" || output.tsConfig?.compilerOptions?.module === "NodeNext" || output.tsConfig?.compilerOptions?.module === "node16" || output.tsConfig?.compilerOptions?.module === "Node16")) output.importFileExtension = ".js";
-	if (output.importFileExtension && !output.importFileExtension.startsWith(".")) output.importFileExtension = `.${output.importFileExtension}`;
+	if (output.module.extension === void 0 && (output.tsConfig?.compilerOptions?.moduleResolution === "nodenext" || output.tsConfig?.compilerOptions?.moduleResolution === "NodeNext" || output.tsConfig?.compilerOptions?.moduleResolution === "node16" || output.tsConfig?.compilerOptions?.moduleResolution === "Node16" || output.tsConfig?.compilerOptions?.module === "nodenext" || output.tsConfig?.compilerOptions?.module === "NodeNext" || output.tsConfig?.compilerOptions?.module === "node16" || output.tsConfig?.compilerOptions?.module === "Node16")) output.module.extension = ".js";
+	if (output.module.extension && !output.module.extension.startsWith(".")) output.module.extension = `.${output.module.extension}`;
 	output.postProcess = normalizePostProcess(userOutput.postProcess ?? legacyPostProcess);
 	output.source = resolveSource(output);
 	return output;
@@ -4088,28 +4101,21 @@ var TypeScriptRenderer = class TypeScriptRenderer {
 	*/
 	_header;
 	/**
-	* Whether `export * from 'module'` should be used when possible instead of named exports.
-	*
-	* @private
-	*/
-	_preferExportAll;
-	/**
-	* Controls whether imports/exports include a file extension (e.g., '.ts' or '.js').
+	* Options for module specifier resolution.
 	*
 	* @private
 	*/
-	_preferFileExtension;
+	_module;
 	/**
-	* Optional function to transform module specifiers.
+	* Whether `export * from 'module'` should be used when possible instead of named exports.
 	*
 	* @private
 	*/
-	_resolveModuleName;
+	_preferExportAll;
 	constructor(args = {}) {
 		this._header = args.header;
+		this._module = args.module;
 		this._preferExportAll = args.preferExportAll ?? false;
-		this._preferFileExtension = args.preferFileExtension ?? "";
-		this._resolveModuleName = args.resolveModuleName;
 	}
 	render(ctx) {
 		const header = typeof this._header === "function" ? this._header(ctx) : this._header;
@@ -4168,10 +4174,10 @@ var TypeScriptRenderer = class TypeScriptRenderer {
 			const sortKey = moduleSortKey({
 				file: ctx.file,
 				fromFile: exp.from,
-				preferFileExtension: this._preferFileExtension,
+				preferFileExtension: this._module?.extension || "",
 				root: ctx.project.root
 			});
-			const modulePath = this._resolveModuleName?.(sortKey[2]) ?? sortKey[2];
+			const modulePath = this._module?.resolve?.(sortKey[2], ctx) ?? sortKey[2];
 			const [groupIndex] = sortKey;
 			if (!groups.has(groupIndex)) groups.set(groupIndex, /* @__PURE__ */ new Map());
 			const moduleMap = groups.get(groupIndex);
@@ -4212,10 +4218,10 @@ var TypeScriptRenderer = class TypeScriptRenderer {
 			const sortKey = moduleSortKey({
 				file: ctx.file,
 				fromFile: imp.from,
-				preferFileExtension: this._preferFileExtension,
+				preferFileExtension: this._module?.extension || "",
 				root: ctx.project.root
 			});
-			const modulePath = this._resolveModuleName?.(sortKey[2]) ?? sortKey[2];
+			const modulePath = this._module?.resolve?.(sortKey[2], ctx) ?? sortKey[2];
 			const [groupIndex] = sortKey;
 			if (!groups.has(groupIndex)) groups.set(groupIndex, /* @__PURE__ */ new Map());
 			const moduleMap = groups.get(groupIndex);
@@ -5419,7 +5425,7 @@ function renameFile({ filePath, project, renamed }) {
 		renamed.set(name, renamedName);
 	}
 }
-function replaceImports({ filePath, header, meta, renamed }) {
+function replaceImports({ filePath, header, module, renamed }) {
 	let content = fs.readFileSync(filePath, "utf8");
 	if (isEnvironment("development")) {
 		content = content.replace(/from\s+['"]\.\.\/\.\.\/client-core\/bundle\//g, "from '../core/");
@@ -5430,7 +5436,7 @@ function replaceImports({ filePath, header, meta, renamed }) {
 		const extension = path.extname(importPath);
 		const fileName = path.basename(importPath, extension);
 		const importDir = path.dirname(importPath);
-		const replacedName = (renamed.get(fileName) ?? fileName) + (meta.importFileExtension ? meta.importFileExtension : extension);
+		const replacedName = (renamed.get(fileName) ?? fileName) + (module.extension ? module.extension : extension);
 		return match.slice(0, importIndex) + [importDir, replacedName].filter(Boolean).join("/") + match.slice(importIndex + importPath.length);
 	});
 	content = `${header ?? ""}${content}`;
@@ -5439,7 +5445,7 @@ function replaceImports({ filePath, header, meta, renamed }) {
 /**
 * Creates a `client` folder containing the same modules as the client package.
 */
-function generateClientBundle({ header, meta, outputPath, plugin, project }) {
+function generateClientBundle({ header, module, outputPath, plugin, project }) {
 	const renamed = /* @__PURE__ */ new Map();
 	const headerPrefix = outputHeaderToPrefix({
 		defaultValue: ["// This file is auto-generated by @hey-api/openapi-ts"],
@@ -5472,14 +5478,14 @@ function generateClientBundle({ header, meta, outputPath, plugin, project }) {
 		for (const file of coreFiles) replaceImports({
 			filePath: path.resolve(coreOutputPath, file),
 			header: headerPrefix,
-			meta,
+			module,
 			renamed
 		});
 		const clientFiles = fs.readdirSync(clientOutputPath);
 		for (const file of clientFiles) replaceImports({
 			filePath: path.resolve(clientOutputPath, file),
 			header: headerPrefix,
-			meta,
+			module,
 			renamed
 		});
 		return renamed;
@@ -6332,8 +6338,10 @@ const dateExpressions = ({ dataExpression, schema }) => {
 //#region src/plugins/@hey-api/transformers/plugin.ts
 const dataVariableName = "data";
 const buildingSymbols = /* @__PURE__ */ new Set();
-const isNodeReturnStatement = (node) => node["~dsl"] === "ReturnTsDsl";
-const schemaResponseTransformerNodes = ({ plugin, schema }) => {
+function isNodeReturnStatement(node) {
+	return node["~dsl"] === "ReturnTsDsl";
+}
+function schemaResponseTransformerNodes({ plugin, schema }) {
 	const nodes = processSchemaType({
 		dataExpression: $(dataVariableName),
 		plugin,
@@ -6344,8 +6352,8 @@ const schemaResponseTransformerNodes = ({ plugin, schema }) => {
 		if (!isNodeReturnStatement(last)) nodes.push($.return(dataVariableName));
 	}
 	return nodes;
-};
-const processSchemaType = ({ dataExpression, plugin, schema }) => {
+}
+function processSchemaType({ dataExpression, plugin, schema }) {
 	if (schema.$ref) {
 		const query = {
 			category: "transform",
@@ -6450,14 +6458,16 @@ const processSchemaType = ({ dataExpression, plugin, schema }) => {
 	}
 	for (const transformer of plugin.config.transformers) {
 		const t = transformer({
+			$,
 			config: plugin.config,
 			dataExpression,
+			plugin,
 			schema
 		});
 		if (t) return t;
 	}
 	return [];
-};
+}
 const handler$9 = ({ plugin }) => {
 	plugin.forEach("operation", ({ operation }) => {
 		const { response } = operationResponsesMap(operation);
@@ -7266,7 +7276,11 @@ function createVisitor$4(config) {
 			}
 			const transformersPlugin = ctx.plugin.getPlugin("@hey-api/transformers");
 			if (transformersPlugin?.config.typeTransformers) for (const typeTransformer of transformersPlugin.config.typeTransformers) {
-				const typeNode = typeTransformer({ schema });
+				const typeNode = typeTransformer({
+					$,
+					plugin: transformersPlugin,
+					schema
+				});
 				if (typeNode) return {
 					meta: defaultMeta$2(schema),
 					type: typeNode
@@ -15912,4 +15926,4 @@ async function resolveJobs({ logger, userConfigs }) {
 
 //#endregion
 export { postProcessors as _, clientDefaultConfig as a, TypeScriptRenderer as c, reserved as d, keywords as f, getTypedConfig as g, getClientPlugin as h, generateClientBundle as i, TsDslContext as l, TsDsl as m, defaultPlugins as n, clientDefaultMeta as o, regexp as p, clientPluginHandler as r, $ as s, resolveJobs as t, ctx as u };
-//# sourceMappingURL=init-C6327prb.mjs.map
+//# sourceMappingURL=init-OaZZcRie.mjs.map