swagger-typescript-api 13.12.5 → 13.13.0

package/dist/{src-BTi82JcX.mjs → src-DXotSN2p.mjs}

@@ -171,7 +171,7 @@ var ComponentTypeNameResolver = class extends NameResolver {
 //#endregion
 //#region package.json
 var name = "swagger-typescript-api";
-var version = "13.12.5";
+var version = "13.13.0";
 var description = "Generate the API client for Fetch or Axios from an OpenAPI Specification";
 //#endregion
 //#region src/constants.ts
@@ -296,6 +296,10 @@ var CodeGenConfig = class {
 	enumStyle = "enum";
 	/** @deprecated Use enumStyle: "union" instead */
 	generateUnionEnums = false;
+	/** CLI flag. Extension appended to generated relative imports: "" (default), ".js", or ".ts". */
+	importFileExtension = "";
+	/** CLI flag. Emit `import type` / inline `type` for type-only imports. */
+	typeOnlyImports = false;
 	/** CLI flag */
 	addReadonly = false;
 	enumNamesAsValues = false;
@@ -384,6 +388,7 @@ var CodeGenConfig = class {
 	enumKeyPrefix = "";
 	enumKeySuffix = "";
 	patch = false;
+	disableExternalSchemas = false;
 	preferExistingSchemaNamesForExternalRefs = false;
 	componentTypeNameResolver;
 	/** name of the main exported class */
@@ -665,6 +670,12 @@ var CodeGenConfig = class {
 	}
 	update = (update) => {
 		objectAssign(this, update);
+		this.importFileExtension ??= "";
+		if (![
+			"",
+			".js",
+			".ts"
+		].includes(this.importFileExtension)) throw new Error(`Invalid \`importFileExtension\` value "${this.importFileExtension}". Expected "", ".js", or ".ts".`);
 		if (this.enumNamesAsValues) this.extractEnums = true;
 		if (this.generateUnionEnums) {
 			consola$1.warn("`generateUnionEnums` is deprecated. Use `enumStyle: \"union\"` instead.");
@@ -827,6 +838,7 @@ var SchemaComponentsMap = class {
 		if (localFound != null) return localFound;
 		const { resolvedSwaggerSchema } = this.config;
 		if (resolvedSwaggerSchema.isLocalRef($ref)) return null;
+		if (this.config.disableExternalSchemas) return null;
 		const foundByRef = resolvedSwaggerSchema.getRef($ref);
 		const refDetails = resolvedSwaggerSchema.getRefDetails($ref);
 		if (foundByRef != null) {
@@ -1010,10 +1022,11 @@ var MonoSchemaParser = class {
 var ArraySchemaParser = class extends MonoSchemaParser {
 	parse() {
 		let contentType;
-		const { type, description, items } = this.schema || {};
-		if (Array.isArray(items) && type === SCHEMA_TYPES$1.ARRAY) {
+		const { type, description, items, prefixItems } = this.schema || {};
+		const tupleItems = Array.isArray(prefixItems) ? prefixItems : Array.isArray(items) ? items : null;
+		if (tupleItems && type === SCHEMA_TYPES$1.ARRAY) {
 			const tupleContent = [];
-			for (const item of items) tupleContent.push(this.schemaParserFabric.createSchemaParser({
+			for (const item of tupleItems) tupleContent.push(this.schemaParserFabric.createSchemaParser({
 				schema: item,
 				schemaPath: this.schemaPath
 			}).getInlineParseContent());
@@ -1046,6 +1059,7 @@ var ComplexSchemaParser = class extends MonoSchemaParser {
 		const complexSchemaItems = Array.isArray(this.schema[complexType]) ? this.schema[complexType] : [];
 		const simpleSchema = omit(this.schema, Object.keys(this.schemaParser._complexSchemaParsers));
 		const complexSchemaContent = this.schemaParser._complexSchemaParsers[complexType](this.schema);
+		const shouldParseSimpleSchema = this.schemaUtils.getInternalSchemaType(simpleSchema) === SCHEMA_TYPES$1.OBJECT || this.schemaUtils.isRefSchema(simpleSchema);
 		return {
 			...typeof this.schema === "object" ? this.schema : {},
 			$schemaPath: this.schemaPath.slice(),
@@ -1055,10 +1069,10 @@ var ComplexSchemaParser = class extends MonoSchemaParser {
 			typeIdentifier: this.config.Ts.Keyword.Type,
 			name: this.typeName,
 			description: this.schemaFormatters.formatDescription(this.schema.description || compact(complexSchemaItems.map((item) => item.description))[0] || ""),
-			content: this.config.Ts.IntersectionType(compact([this.config.Ts.ExpressionGroup(complexSchemaContent), this.schemaUtils.getInternalSchemaType(simpleSchema) === SCHEMA_TYPES$1.OBJECT && this.config.Ts.ExpressionGroup(this.schemaParserFabric.createSchemaParser({
+			content: this.config.Ts.IntersectionType(this.schemaUtils.filterSchemaContents(compact([complexSchemaContent, shouldParseSimpleSchema && this.schemaParserFabric.createSchemaParser({
 				schema: simpleSchema,
 				schemaPath: this.schemaPath
-			}).getInlineParseContent())])) || this.config.Ts.Keyword.Any
+			}).getInlineParseContent()]), (content) => content !== this.config.Ts.Keyword.Any).map((content) => this.config.Ts.ExpressionGroup(content))) || this.config.Ts.Keyword.Any
 		};
 	}
 };
@@ -1570,6 +1584,7 @@ var SchemaParser = class {
 		if (!this.schema.$parsed) {
 			if (!this.typeName && this.schemaUtils.isRefSchema(this.schema)) this.typeName = this.schemaUtils.getSchemaType(this.schema);
 			if (this.schema.items && !Array.isArray(this.schema.items) && !this.schema.type) this.schema.type = SCHEMA_TYPES$1.ARRAY;
+			if (this.schema.additionalProperties && !this.schema.type) this.schema.type = SCHEMA_TYPES$1.OBJECT;
 			if (Array.isArray(this.schema.enum) && this.schema.enum.length === 1 && this.schema.enum[0] == null) {
 				consola$1.debug("invalid enum schema", this.schema);
 				this.schema = { type: this.config.Ts.Keyword.Null };
@@ -1922,10 +1937,12 @@ var SchemaRoutes = class {
 		})]);
 	}
 	/**
-	* `extractResponseBody` / `extractResponseError` call `createParsedComponent`, which
-	* registers `#/components/schemas/<typeName>`. If that key already exists (e.g.
-	* `MergeFluffyData` in definitions), the map entry would be overwritten unless we
-	* pick another name via `resolveTypeName` after reserving the colliding one.
+	* `extractResponseBody` / `extractResponseError` / `extractRequestParams` call
+	* `createParsedComponent`, which registers `#/components/schemas/<typeName>`. If that
+	* key already exists (e.g. `MergeFluffyData` in definitions, or a request-body model
+	* named `GetOrderParams` next to a `getOrder` operation), the map entry would be
+	* overwritten unless we pick another name via `resolveTypeName` after reserving the
+	* colliding one.
 	*
 	* `getComponents` may be missing in narrow unit tests that pass a stub map.
 	*
@@ -2289,7 +2306,7 @@ var SchemaRoutes = class {
 		const fixedSchema = this.config.hooks.onCreateRequestParams(schema);
 		if (fixedSchema) return fixedSchema;
 		if (extractRequestParams) {
-			const generatedTypeName = this.schemaUtils.resolveTypeName(routeName.usage, {
+			const generatedTypeName = this.extractTypeNameWithoutSchemaKeyCollision(routeName.usage, {
 				suffixes: this.config.extractingOptions.requestParamsSuffix,
 				resolver: this.config.extractingOptions.requestParamsNameResolver
 			});
@@ -4225,4 +4242,4 @@ async function generateApi(config) {
 //#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-BTi82JcX.mjs.map
+//# sourceMappingURL=src-DXotSN2p.mjs.map