swagger-typescript-api 13.2.17 → 13.2.18

package/dist/cli.cjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const require_generate_templates = require('./generate-templates-wjE78AWV.cjs');
+const require_generate_templates = require('./generate-templates-C4JBmSNw.cjs');
 const require_index = require('./index.cjs');
 let node_path = require("node:path");
 node_path = require_generate_templates.__toESM(node_path);

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { d as version, l as description, n as TemplatesGenConfig, o as CodeGenConfig, s as HTTP_CLIENT, t as generateTemplates, u as name } from "./generate-templates-BO-5CKCm.mjs";
+import { d as version, l as description, n as TemplatesGenConfig, o as CodeGenConfig, s as HTTP_CLIENT, t as generateTemplates, u as name } from "./generate-templates-DGQlyLhe.mjs";
 import { generateApi } from "./index.mjs";
 import * as path$1 from "node:path";
 import { loadConfig } from "c12";

package/dist/{generate-templates-wjE78AWV.cjs → generate-templates-C4JBmSNw.cjs}

@@ -223,7 +223,7 @@ var ComponentTypeNameResolver = class extends NameResolver {
 //#endregion
 //#region package.json
 var name = "swagger-typescript-api";
-var version = "13.2.17";
+var version = "13.2.18";
 var description = "Generate the API client for Fetch or Axios from an OpenAPI Specification";
 
 //#endregion
@@ -292,6 +292,17 @@ const SCHEMA_TYPES$1 = {
 	COMPLEX_UNKNOWN: "__unknown"
 };
 
+//#endregion
+//#region src/util/object-assign.ts
+const objectAssign = (target, updater) => {
+	if (!updater) return;
+	const update = typeof updater === "function" ? updater(target) : updater;
+	if (!update) return;
+	const undefinedKeys = Object.entries(update).filter(([, value]) => value === void 0).map(([key]) => key);
+	(0, es_toolkit.merge)(target, update);
+	for (const key of undefinedKeys) target[key] = void 0;
+};
+
 //#endregion
 //#region src/configuration.ts
 const TsKeyword = {
@@ -602,8 +613,8 @@ var CodeGenConfig = class {
 	];
 	templateExtensions = [".eta", ".ejs"];
 	constructor({ codeGenConstructs, primitiveTypeConstructs, constants, templateInfos, hooks, ...otherConfig }) {
-		Object.assign(this.Ts, codeGenConstructs);
-		Object.assign(this.primitiveTypes, primitiveTypeConstructs);
+		objectAssign(this.Ts, codeGenConstructs);
+		objectAssign(this.primitiveTypes, primitiveTypeConstructs);
 		this.defaultResponseType = this.Ts.Keyword.Void;
 		this.update({
 			...otherConfig,
@@ -623,7 +634,7 @@ var CodeGenConfig = class {
 		this.componentTypeNameResolver = new ComponentTypeNameResolver(this, []);
 	}
 	update = (update) => {
-		Object.assign(this, update);
+		objectAssign(this, update);
 		if (this.enumNamesAsValues) this.extractEnums = true;
 	};
 };
@@ -703,10 +714,14 @@ var SchemaFormatters = class {
 				$content: parsedSchema.content,
 				content: this.config.Ts.UnionType(parsedSchema.content.map(({ value }) => value))
 			};
+			const escapedContent = parsedSchema.content.map((item) => ({
+				...item,
+				description: item.description ? this.escapeJSDocContent(item.description) : ""
+			}));
 			return {
 				...parsedSchema,
 				$content: parsedSchema.content,
-				content: this.config.Ts.EnumFieldsWrapper(parsedSchema.content)
+				content: this.config.Ts.EnumFieldsWrapper(escapedContent)
 			};
 		},
 		[SCHEMA_TYPES$1.OBJECT]: (parsedSchema) => {
@@ -748,11 +763,16 @@ var SchemaFormatters = class {
 		const schemaType = (0, es_toolkit_compat.get)(parsedSchema, ["schemaType"]) || (0, es_toolkit_compat.get)(parsedSchema, ["$parsed", "schemaType"]);
 		return (0, es_toolkit_compat.get)(this, [formatType, schemaType])?.(parsedSchema) || parsedSchema;
 	};
+	escapeJSDocContent = (content) => {
+		if (content === void 0) return "";
+		return (typeof content === "string" ? content : String(content)).replace(/\*\//g, "*\\/");
+	};
 	formatDescription = (description, inline) => {
 		if (!description) return "";
-		if (!description.includes("\n")) return description;
-		if (inline) return (0, es_toolkit.compact)(description.split(/\n/g).map((part) => part.trim())).join(" ");
-		return description.replace(/\n$/g, "");
+		const escapedDescription = this.escapeJSDocContent(description);
+		if (!escapedDescription.includes("\n")) return escapedDescription;
+		if (inline) return (0, es_toolkit.compact)(escapedDescription.split(/\n/g).map((part) => part.trim())).join(" ");
+		return escapedDescription.replace(/\n$/g, "");
 	};
 	formatObjectContent = (content) => {
 		const fields = [];
@@ -1319,7 +1339,7 @@ var SchemaParser = class {
 	schemaWalker;
 	typeName;
 	schema;
-	schemaPath = [];
+	schemaPath;
 	constructor(schemaParserFabric, { typeName, schema, schemaPath } = {}) {
 		this.schemaParserFabric = schemaParserFabric;
 		this.config = schemaParserFabric.config;
@@ -2749,6 +2769,7 @@ var CodeGenProcess = class {
 			utils: {
 				Ts: this.config.Ts,
 				formatDescription: this.schemaParserFabric.schemaFormatters.formatDescription,
+				escapeJSDocContent: this.schemaParserFabric.schemaFormatters.escapeJSDocContent,
 				internalCase: es_toolkit_compat.camelCase,
 				classNameCase: pascalCase,
 				pascalCase,
@@ -2966,7 +2987,7 @@ var TemplatesGenConfig = class {
 		this.update(config);
 	}
 	update = (update) => {
-		Object.assign(this, update);
+		objectAssign(this, update);
 	};
 };
 
@@ -3153,4 +3174,4 @@ Object.defineProperty(exports, 'version', {
     return version;
   }
 });
-//# sourceMappingURL=generate-templates-wjE78AWV.cjs.map
+//# sourceMappingURL=generate-templates-C4JBmSNw.cjs.map