swagger-typescript-api 13.3.0 → 13.4.0

package/dist/index.mjs

@@ -1,13 +1,2 @@
-import { a as CodeGenProcess, c as constants_exports, i as SCHEMA_TYPES, r as RequestContentKind, t as generateTemplates } from "./generate-templates-BaT2BiRR.mjs";
-import { consola as consola$1 } from "consola";
-
-//#region src/index.ts
-async function generateApi(config) {
-	if (config.debug) consola$1.level = Number.MAX_SAFE_INTEGER;
-	if (config.silent) consola$1.level = 0;
-	return await new CodeGenProcess(config).start();
-}
-
-//#endregion
+import { a as SCHEMA_TYPES, c as constants_exports, i as RequestContentKind, n as generateTemplates, t as generateApi } from "./src-BPFXd2rf.mjs";
 export { RequestContentKind, SCHEMA_TYPES, constants_exports as constants, generateApi, generateTemplates };
-//# sourceMappingURL=index.mjs.map

package/dist/{generate-templates-BaT2BiRR.mjs → src-BPFXd2rf.mjs}

@@ -1,4 +1,4 @@
-import { t as __exportAll } from "./chunk-DQk6qfdC.mjs";
+import { t as __exportAll } from "./chunk-CfYAbeIz.mjs";
 import * as module from "node:module";
 import consola, { consola as consola$1 } from "consola";
 import * as esToolkit from "es-toolkit";
@@ -19,7 +19,6 @@ import SwaggerParser from "@apidevtools/swagger-parser";
 import * as url$1 from "node:url";
 import url from "node:url";
 import { Eta } from "eta";
-
 //#region src/code-formatter.ts
 var CodeFormatter = class {
 	config;
@@ -93,7 +92,6 @@ var TsLanguageServiceHost = class {
 		return typescript.sys.fileExists(path);
 	}
 };
-
 //#endregion
 //#region src/util/name-resolver.ts
 var NameResolver = class {
@@ -144,14 +142,12 @@ var NameResolver = class {
 		return null;
 	}
 };
-
 //#endregion
 //#region src/util/random.ts
 const getRandomInt = (min = 0, max = 1) => {
 	if (min === max) return min;
 	return Math.round(Math.random() * (max - min) + min);
 };
-
 //#endregion
 //#region src/component-type-name-resolver.ts
 var ComponentTypeNameResolver = class extends NameResolver {
@@ -175,13 +171,11 @@ var ComponentTypeNameResolver = class extends NameResolver {
 		});
 	}
 };
-
 //#endregion
 //#region package.json
 var name = "swagger-typescript-api";
-var version = "13.3.0";
+var version = "13.4.0";
 var description = "Generate the API client for Fetch or Axios from an OpenAPI Specification";
-
 //#endregion
 //#region src/constants.ts
 var constants_exports = /* @__PURE__ */ __exportAll({
@@ -247,7 +241,6 @@ const SCHEMA_TYPES$1 = {
 	COMPLEX_NOT: "not",
 	COMPLEX_UNKNOWN: "__unknown"
 };
-
 //#endregion
 //#region src/util/object-assign.ts
 const objectAssign = (target, updater) => {
@@ -258,7 +251,6 @@ const objectAssign = (target, updater) => {
 	merge(target, update);
 	for (const key of undefinedKeys) target[key] = void 0;
 };
-
 //#endregion
 //#region src/configuration.ts
 const TsKeyword = {
@@ -272,6 +264,7 @@ const TsKeyword = {
 	Undefined: "undefined",
 	Object: "object",
 	File: "File",
+	Blob: "Blob",
 	Date: "Date",
 	Type: "type",
 	Enum: "enum",
@@ -595,13 +588,11 @@ var CodeGenConfig = class {
 		if (this.enumNamesAsValues) this.extractEnums = true;
 	};
 };
-
 //#endregion
 //#region src/util/pascal-case.ts
 function pascalCase(value) {
 	return upperFirst(camelCase(value));
 }
-
 //#endregion
 //#region src/schema-components-map.ts
 var SchemaComponentsMap = class {
@@ -678,7 +669,6 @@ var SchemaComponentsMap = class {
 		});
 	}
 };
-
 //#endregion
 //#region src/schema-parser/schema-formatters.ts
 var SchemaFormatters = class {
@@ -769,7 +759,6 @@ var SchemaFormatters = class {
 		return fields.join("");
 	};
 };
-
 //#endregion
 //#region src/util/sort-by-property.ts
 const sortByProperty = (propertyName) => (o1, o2) => {
@@ -777,7 +766,6 @@ const sortByProperty = (propertyName) => (o1, o2) => {
 	if (o1[propertyName] < o2[propertyName]) return -1;
 	return 0;
 };
-
 //#endregion
 //#region src/schema-parser/mono-schema-parser.ts
 var MonoSchemaParser = class {
@@ -810,7 +798,6 @@ var MonoSchemaParser = class {
 		return this.schemaUtils.buildTypeNameFromPath(this.schemaPath);
 	};
 };
-
 //#endregion
 //#region src/schema-parser/base-schema-parsers/array.ts
 var ArraySchemaParser = class extends MonoSchemaParser {
@@ -844,7 +831,6 @@ var ArraySchemaParser = class extends MonoSchemaParser {
 		};
 	}
 };
-
 //#endregion
 //#region src/schema-parser/base-schema-parsers/complex.ts
 var ComplexSchemaParser = class extends MonoSchemaParser {
@@ -868,7 +854,6 @@ var ComplexSchemaParser = class extends MonoSchemaParser {
 		};
 	}
 };
-
 //#endregion
 //#region src/schema-parser/base-schema-parsers/discriminator.ts
 var DiscriminatorSchemaParser = class extends MonoSchemaParser {
@@ -947,7 +932,7 @@ var DiscriminatorSchemaParser = class extends MonoSchemaParser {
 			const mappingUsageKey = mappingPropertySchemaEnumKeysMap[mappingKey] || ts.StringValue(mappingKey);
 			if (ableToCreateMappingType) return ts.TypeWithGeneric(mappingTypeName, [mappingUsageKey, content]);
 			return ts.ExpressionGroup(ts.IntersectionType([ts.ObjectWrapper(ts.TypeField({
-				key: discriminator.propertyName,
+				key: ts.StringValue(discriminator.propertyName),
 				value: mappingUsageKey
 			})), content]));
 		};
@@ -1036,7 +1021,6 @@ var DiscriminatorSchemaParser = class extends MonoSchemaParser {
 		return { content: ts.ExpressionGroup(this.schemaParser._complexSchemaParsers[complexType](this.schema)) };
 	};
 };
-
 //#endregion
 //#region src/schema-parser/util/enum-key-resolver.ts
 var EnumKeyResolver = class extends NameResolver {
@@ -1049,7 +1033,6 @@ var EnumKeyResolver = class extends NameResolver {
 		});
 	}
 };
-
 //#endregion
 //#region src/schema-parser/base-schema-parsers/enum.ts
 var EnumSchemaParser = class extends MonoSchemaParser {
@@ -1151,7 +1134,6 @@ var EnumSchemaParser = class extends MonoSchemaParser {
 		return this.enumKeyResolver.resolve([formatted]);
 	};
 };
-
 //#endregion
 //#region src/schema-parser/base-schema-parsers/object.ts
 var ObjectSchemaParser = class extends MonoSchemaParser {
@@ -1220,7 +1202,6 @@ var ObjectSchemaParser = class extends MonoSchemaParser {
 		return propertiesContent;
 	};
 };
-
 //#endregion
 //#region src/schema-parser/base-schema-parsers/primitive.ts
 var PrimitiveSchemaParser = class extends MonoSchemaParser {
@@ -1241,11 +1222,17 @@ var PrimitiveSchemaParser = class extends MonoSchemaParser {
 				schemaPath: this.schemaPath
 			}).getInlineParseContent();
 			else recordValuesContent = this.config.Ts.Keyword.Any;
-			contentType = this.config.Ts.RecordType(recordKeysContent, recordValuesContent);
+			const recordType = this.config.Ts.RecordType(recordKeysContent, recordValuesContent);
+			contentType = propertyNamesSchema ? this.config.Ts.TypeWithGeneric("Partial", [recordType]) : recordType;
 		}
 		if (Array.isArray(type) && type.length) contentType = this.schemaParser._complexSchemaParsers.oneOf({
 			...typeof this.schema === "object" ? this.schema : {},
-			oneOf: type.map((type) => ({ type }))
+			oneOf: type.map((t) => {
+				const branch = { type: t };
+				Object.assign(branch, this.schema);
+				branch.type = t;
+				return branch;
+			})
 		});
 		if (Array.isArray(items) && type === SCHEMA_TYPES$1.ARRAY) contentType = this.config.Ts.Tuple(items.map((item) => this.schemaParserFabric.createSchemaParser({
 			schema: item,
@@ -1264,7 +1251,6 @@ var PrimitiveSchemaParser = class extends MonoSchemaParser {
 		};
 	}
 };
-
 //#endregion
 //#region src/schema-parser/complex-schema-parsers/all-of.ts
 var AllOfSchemaParser = class extends MonoSchemaParser {
@@ -1276,7 +1262,6 @@ var AllOfSchemaParser = class extends MonoSchemaParser {
 		return this.schemaUtils.safeAddNullToType(this.schema, type);
 	}
 };
-
 //#endregion
 //#region src/schema-parser/complex-schema-parsers/any-of.ts
 var AnyOfSchemaParser = class extends MonoSchemaParser {
@@ -1288,7 +1273,6 @@ var AnyOfSchemaParser = class extends MonoSchemaParser {
 		return this.schemaUtils.safeAddNullToType(this.schema, type);
 	}
 };
-
 //#endregion
 //#region src/schema-parser/complex-schema-parsers/not.ts
 var NotSchemaParser = class extends MonoSchemaParser {
@@ -1296,7 +1280,6 @@ var NotSchemaParser = class extends MonoSchemaParser {
 		return this.config.Ts.Keyword.Any;
 	}
 };
-
 //#endregion
 //#region src/schema-parser/complex-schema-parsers/one-of.ts
 var OneOfSchemaParser = class extends MonoSchemaParser {
@@ -1308,7 +1291,6 @@ var OneOfSchemaParser = class extends MonoSchemaParser {
 		return this.schemaUtils.safeAddNullToType(this.schema, type);
 	}
 };
-
 //#endregion
 //#region src/schema-parser/schema-parser.ts
 var SchemaParser = class {
@@ -1421,7 +1403,6 @@ var SchemaParser = class {
 		};
 	};
 };
-
 //#endregion
 //#region src/schema-parser/schema-utils.ts
 var SchemaUtils = class {
@@ -1430,6 +1411,22 @@ var SchemaUtils = class {
 		this.schemaComponentsMap = schemaComponentsMap;
 		this.typeNameFormatter = typeNameFormatter;
 	}
+	isBinaryLikeContentMediaType = (contentMediaType) => {
+		if (typeof contentMediaType !== "string" || !contentMediaType) return false;
+		const mediaType = contentMediaType.split(";")[0]?.trim().toLowerCase();
+		if (!mediaType) return false;
+		/**
+		* `contentMediaType` comes from JSON Schema. In practice it is often used to
+		* signal "this string is a file/blob", but it may also be used for textual
+		* payloads (json/xml/etc). We treat only binary-ish media types as `File`.
+		*/
+		if (mediaType.startsWith("text/")) return false;
+		if (mediaType.includes("json") || mediaType.includes("+json")) return false;
+		if (mediaType.includes("xml") || mediaType.includes("+xml")) return false;
+		if (mediaType === "application/x-www-form-urlencoded") return false;
+		if (mediaType === "application/javascript" || mediaType === "application/ecmascript" || mediaType === "application/graphql" || mediaType === "application/yaml" || mediaType === "application/x-yaml") return false;
+		return mediaType === "application/octet-stream" || mediaType.startsWith("image/") || mediaType.startsWith("audio/") || mediaType.startsWith("video/") || mediaType.startsWith("font/") || mediaType.startsWith("model/") || mediaType.startsWith("application/");
+	};
 	getRequiredProperties = (schema) => {
 		return uniq(schema && Array.isArray(schema.required) && schema.required || []);
 	};
@@ -1538,9 +1535,12 @@ var SchemaUtils = class {
 		else {
 			const primitiveType = this.getSchemaPrimitiveType(schema);
 			if (primitiveType == null) return this.config.Ts.Keyword.Any;
-			const typeAlias = get(this.config.primitiveTypes, [primitiveType, schema.format]) || get(this.config.primitiveTypes, [primitiveType, "$default"]) || this.config.primitiveTypes[primitiveType];
-			if (typeof typeAlias === "function") resultType = typeAlias(schema, this);
-			else resultType = typeAlias || primitiveType;
+			if (primitiveType === this.config.Ts.Keyword.String && !schema.format && this.isBinaryLikeContentMediaType(schema.contentMediaType)) resultType = this.config.Ts.UnionType([this.config.Ts.Keyword.File, this.config.Ts.Keyword.Blob]);
+			else {
+				const typeAlias = get(this.config.primitiveTypes, [primitiveType, schema.format]) || get(this.config.primitiveTypes, [primitiveType, "$default"]) || this.config.primitiveTypes[primitiveType];
+				if (typeof typeAlias === "function") resultType = typeAlias(schema, this);
+				else resultType = typeAlias || primitiveType;
+			}
 		}
 		if (!resultType) return this.config.Ts.Keyword.Any;
 		return this.checkAndAddRequiredKeys(schema, this.safeAddNullToType(schema, resultType));
@@ -1564,7 +1564,6 @@ var SchemaUtils = class {
 		}
 	};
 };
-
 //#endregion
 //#region src/schema-parser/schema-parser-fabric.ts
 var SchemaParserFabric = class {
@@ -1634,11 +1633,9 @@ var SchemaParserFabric = class {
 		}).getParseContent();
 	};
 };
-
 //#endregion
 //#region src/util/id.ts
 const generateId = () => crypto.randomUUID();
-
 //#endregion
 //#region src/schema-routes/util/specific-arg-name-resolver.ts
 var SpecificArgNameResolver = class extends NameResolver {
@@ -1651,7 +1648,6 @@ var SpecificArgNameResolver = class extends NameResolver {
 		});
 	}
 };
-
 //#endregion
 //#region src/schema-routes/schema-routes.ts
 const CONTENT_KIND = {
@@ -1974,7 +1970,7 @@ var SchemaRoutes = class {
 		if (schema && schema.typeData && !schema.typeData.description && requestBody?.description) schema.typeData.description = requestBody.description;
 		return {
 			...requestBody || {},
-			paramName: requestBodyName || requestBody?.name || DEFAULT_BODY_ARG_NAME,
+			paramName: requestBodyName || requestBody?.name || "data",
 			contentTypes,
 			contentKind,
 			schema,
@@ -2269,7 +2265,6 @@ var SchemaRoutes = class {
 		return routes.slice().sort((routeA, routeB) => routeA.routeName.usage.localeCompare(routeB.routeName.usage));
 	};
 };
-
 //#endregion
 //#region src/resolved-swagger-schema.ts
 var ResolvedSwaggerSchema = class ResolvedSwaggerSchema {
@@ -2619,7 +2614,6 @@ var ResolvedSwaggerSchema = class ResolvedSwaggerSchema {
 		return resolvedSwaggerSchema;
 	}
 };
-
 //#endregion
 //#region src/util/request.ts
 var Request = class {
@@ -2640,7 +2634,6 @@ var Request = class {
 		}
 	}
 };
-
 //#endregion
 //#region src/swagger-schema-resolver.ts
 var SwaggerSchemaResolver = class {
@@ -2752,7 +2745,6 @@ var SwaggerSchemaResolver = class {
 		}
 	}
 };
-
 //#endregion
 //#region src/templates-worker.ts
 const require = module.createRequire(import.meta.url);
@@ -2840,7 +2832,6 @@ var TemplatesWorker = class {
 		}, { includeFile: (path, configuration) => this.renderTemplate(this.getTemplateContent(path), configuration) });
 	};
 };
-
 //#endregion
 //#region src/translators/translator.ts
 var Translator = class {
@@ -2854,7 +2845,6 @@ var Translator = class {
 		throw new Error("not implemented");
 	}
 };
-
 //#endregion
 //#region src/translators/javascript.ts
 var JavascriptTranslator = class extends Translator {
@@ -2895,7 +2885,6 @@ var JavascriptTranslator = class extends Translator {
 		}];
 	};
 };
-
 //#endregion
 //#region src/type-name-formatter.ts
 var TypeNameFormatter = class {
@@ -2934,7 +2923,6 @@ var TypeNameFormatter = class {
 		return name;
 	};
 };
-
 //#endregion
 //#region src/util/file-system.ts
 var FileSystem = class {
@@ -2986,7 +2974,6 @@ var FileSystem = class {
 		return fs.writeFileSync(absolutePath, fileContent);
 	};
 };
-
 //#endregion
 //#region src/util/lodash-compat.ts
 function createLodashCompat() {
@@ -2995,7 +2982,6 @@ function createLodashCompat() {
 		...esToolkitCompat
 	};
 }
-
 //#endregion
 //#region src/code-gen-process.ts
 const PATCHABLE_INSTANCES = [
@@ -3285,7 +3271,6 @@ var CodeGenProcess = class {
 		for (const instanceKey of PATCHABLE_INSTANCES) if (instanceKey !== key && key in this[instanceKey]) this[instanceKey][key] = value;
 	};
 };
-
 //#endregion
 //#region types/index.ts
 let RequestContentKind = /* @__PURE__ */ function(RequestContentKind) {
@@ -3311,7 +3296,6 @@ let SCHEMA_TYPES = /* @__PURE__ */ function(SCHEMA_TYPES) {
 	SCHEMA_TYPES["COMPLEX_UNKNOWN"] = "__unknown";
 	return SCHEMA_TYPES;
 }({});
-
 //#endregion
 //#region src/commands/generate-templates/configuration.ts
 var TemplatesGenConfig = class {
@@ -3330,7 +3314,6 @@ var TemplatesGenConfig = class {
 		objectAssign(this, update);
 	};
 };
-
 //#endregion
 //#region src/commands/generate-templates/templates-gen-process.ts
 const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
@@ -3432,7 +3415,6 @@ var TemplatesGenProcess = class {
 		return this.fileSystem.getFileContent(path.resolve(this.rootDir, pathToFile));
 	};
 };
-
 //#endregion
 //#region src/commands/generate-templates/index.ts
 async function generateTemplates(config) {
@@ -3440,7 +3422,14 @@ async function generateTemplates(config) {
 	if (config.silent) consola$1.level = 0;
 	return await new TemplatesGenProcess(config).start();
 }
-
 //#endregion
-export { CodeGenProcess as a, constants_exports as c, version as d, SCHEMA_TYPES as i, description as l, TemplatesGenConfig as n, CodeGenConfig as o, RequestContentKind as r, HTTP_CLIENT as s, generateTemplates as t, name as u };
-//# sourceMappingURL=generate-templates-BaT2BiRR.mjs.map
+//#region src/index.ts
+async function generateApi(config) {
+	if (config.debug) consola$1.level = Number.MAX_SAFE_INTEGER;
+	if (config.silent) consola$1.level = 0;
+	return await new CodeGenProcess(config).start();
+}
+//#endregion
+export { SCHEMA_TYPES as a, constants_exports as c, version as d, RequestContentKind as i, description as l, generateTemplates as n, CodeGenConfig as o, TemplatesGenConfig as r, HTTP_CLIENT as s, generateApi as t, name as u };
+
+//# sourceMappingURL=src-BPFXd2rf.mjs.map