swagger-typescript-api 13.6.10 → 13.6.11

package/dist/{src-DsH2wrQK.cjs → src-D7B_7nSd.cjs}

@@ -208,7 +208,7 @@ var ComponentTypeNameResolver = class extends NameResolver {
 //#endregion
 //#region package.json
 var name = "swagger-typescript-api";
-var version = "13.6.10";
+var version = "13.6.11";
 var description = "Generate the API client for Fetch or Axios from an OpenAPI Specification";
 //#endregion
 //#region src/constants.ts
@@ -376,10 +376,15 @@ var CodeGenConfig = class {
 	sortTypes = false;
 	sortRoutes = false;
 	templatePaths = {
+		/** `templates/base` */
 		base: "",
+		/** `templates/default` */
 		default: "",
+		/** `templates/modular` */
 		modular: "",
+		/** usage path if `--templates` option is not set */
 		original: "",
+		/** custom path to templates (`--templates`) */
 		custom: ""
 	};
 	/** Record<templateName, templateContent> */
@@ -479,18 +484,48 @@ var CodeGenConfig = class {
 	Ts = {
 		Keyword: structuredClone(TsKeyword),
 		CodeGenKeyword: structuredClone(TsCodeGenKeyword),
+		/**
+		* $A[] or Array<$A>
+		*/
 		ArrayType: (content) => {
 			if (this.anotherArrayType) return this.Ts.TypeWithGeneric(this.Ts.Keyword.Array, [content]);
 			return `${this.Ts.ExpressionGroup(content)}[]`;
 		},
+		/**
+		* "$A"
+		*/
 		StringValue: (content) => `"${content}"`,
+		/**
+		* $A
+		*/
 		BooleanValue: (content) => `${content}`,
+		/**
+		* $A
+		*/
 		NumberValue: (content) => `${content}`,
+		/**
+		* $A
+		*/
 		NullValue: () => "null",
+		/**
+		* $A1 | $A2
+		*/
 		UnionType: (contents) => (0, es_toolkit.uniq)(contents).join(` ${this.Ts.Keyword.Union} `),
+		/**
+		* ($A1)
+		*/
 		ExpressionGroup: (content) => content ? `(${content})` : "",
+		/**
+		* $A1 & $A2
+		*/
 		IntersectionType: (contents) => (0, es_toolkit.uniq)(contents).join(` ${this.Ts.Keyword.Intersection} `),
+		/**
+		* Record<$A1, $A2>
+		*/
 		RecordType: (key, value) => this.Ts.TypeWithGeneric(this.Ts.Keyword.Record, [key, value]),
+		/**
+		* readonly $key?:$value
+		*/
 		TypeField: ({ readonly, key, optional, value }) => (0, es_toolkit.compact)([
 			readonly && "readonly ",
 			key,
@@ -498,25 +533,57 @@ var CodeGenConfig = class {
 			": ",
 			value
 		]).join(""),
+		/**
+		* [key: $A1]: $A2
+		*/
 		InterfaceDynamicField: (key, value) => `[key: ${key}]: ${value}`,
+		/**
+		* EnumName.EnumKey
+		*/
 		EnumUsageKey: (enumStruct, key) => `${enumStruct}.${key}`,
+		/**
+		* $A1 = $A2
+		*/
 		EnumField: (key, value) => `${key} = ${value}`,
+		/**
+		* /\** description \*\/
+		*/
 		EnumFieldDescription: (description) => {
 			if (description) return `  /** ${description} */`;
 			else return "";
 		},
+		/**
+		* /\** $A0.description \*\/
+		* $A0.key = $A0.value,
+		* /\** $A1.description \*\/
+		* $A1.key = $A1.value,
+		* /\** $AN.description \*\/
+		* $AN.key = $AN.value,
+		*/
 		EnumFieldsWrapper: (contents) => contents.map(({ key, value, description }) => {
 			return (0, es_toolkit.compact)([this.Ts.EnumFieldDescription(description), `  ${this.Ts.EnumField(key, value)}`]).join("\n");
 		}).join(",\n"),
+		/**
+		* {\n $A \n}
+		*/
 		ObjectWrapper: (content) => `{\n${content}\n}`,
+		/**
+		* /** $A *\/
+		*/
 		MultilineComment: (contents, formatFn) => [...contents.length === 1 ? [`/** ${contents[0]} */`] : [
 			"/**",
 			...contents.map((content) => ` * ${content}`),
 			" */"
 		]].map((part) => `${formatFn ? formatFn(part) : part}\n`),
+		/**
+		* $A1<...$A2.join(,)>
+		*/
 		TypeWithGeneric: (typeName, genericArgs) => {
 			return `${typeName}${genericArgs.length ? `<${genericArgs.join(",")}>` : ""}`;
 		},
+		/**
+		* [$A1, $A2, ...$AN]
+		*/
 		Tuple: (values) => {
 			return `[${values.join(", ")}]`;
 		}
@@ -533,6 +600,7 @@ var CodeGenConfig = class {
 		file: () => this.Ts.Keyword.File,
 		string: {
 			$default: this.Ts.Keyword.String,
+			/** formats */
 			binary: () => this.Ts.Keyword.File,
 			byte: () => this.Ts.Keyword.Blob,
 			file: () => this.Ts.Keyword.File,
@@ -656,6 +724,7 @@ var SchemaComponentsMap = class {
 			typeName,
 			rawTypeData,
 			componentName: rawComponentName === "definitions" ? "schemas" : rawComponentName,
+			/** result from schema parser */
 			typeData: null
 		};
 	}
@@ -1195,10 +1264,11 @@ var ObjectSchemaParser = class extends MonoSchemaParser {
 			const rawTypeData = (0, es_toolkit_compat.get)(this.schemaUtils.getSchemaRefType(property), "rawTypeData", {});
 			const nullable = !!(rawTypeData.nullable || property.nullable);
 			const fieldName = this.typeNameFormatter.isValidName(name) ? name : this.config.Ts.StringValue(name);
-			const fieldValue = this.schemaParserFabric.createSchemaParser({
+			const rawFieldValue = this.schemaParserFabric.createSchemaParser({
 				schema: property,
 				schemaPath: [...this.schemaPath, name]
 			}).getInlineParseContent();
+			const fieldValue = nullable ? this.schemaUtils.safeAddNullToType(property, rawFieldValue) : rawFieldValue;
 			const readOnly = property.readOnly;
 			const complexType = this.schemaUtils.getComplexType(property);
 			const rawDataComplexType = this.schemaUtils.getComplexType(rawTypeData);
@@ -1493,7 +1563,10 @@ var SchemaUtils = class {
 	};
 	isNullMissingInType = (schema, type) => {
 		const { nullable, type: schemaType } = schema || {};
-		return (nullable || !!(0, es_toolkit_compat.get)(schema, "x-nullable") || schemaType === this.config.Ts.Keyword.Null) && typeof type === "string" && !type.includes(` ${this.config.Ts.Keyword.Null}`) && !type.includes(`${this.config.Ts.Keyword.Null} `);
+		if (!(nullable || !!(0, es_toolkit_compat.get)(schema, "x-nullable") || schemaType === this.config.Ts.Keyword.Null) || typeof type !== "string") return false;
+		const nullKeyword = this.config.Ts.Keyword.Null;
+		const lastLine = type.trimEnd().split("\n").pop() ?? type;
+		return !lastLine.includes(` ${nullKeyword}`) && !lastLine.includes(`${nullKeyword} `);
 	};
 	safeAddNullToType = (schema, type) => {
 		if (this.isNullMissingInType(schema, type)) return this.config.Ts.UnionType([type, this.config.Ts.Keyword.Null]);
@@ -3002,10 +3075,15 @@ var TemplatesWorker = class {
 		const defaultTemplatesPath = node_path.resolve(__dirname, "../templates/default");
 		const modularTemplatesPath = node_path.resolve(__dirname, "../templates/modular");
 		return {
+			/** `templates/base` */
 			base: baseTemplatesPath,
+			/** `templates/default` */
 			default: defaultTemplatesPath,
+			/** `templates/modular` */
 			modular: modularTemplatesPath,
+			/** usage path if `--templates` option is not set */
 			original: config.modular ? modularTemplatesPath : defaultTemplatesPath,
+			/** custom path to templates (`--templates`) */
 			custom: config.templates && node_path.resolve(process.cwd(), config.templates)
 		};
 	};
@@ -3739,4 +3817,4 @@ Object.defineProperty(exports, "version", {
 	}
 });
 
-//# sourceMappingURL=src-DsH2wrQK.cjs.map
+//# sourceMappingURL=src-D7B_7nSd.cjs.map