swagger-typescript-api 13.6.2 → 13.6.4

package/dist/{src-BQOg3KNL.mjs → src-eiRlSfN6.mjs}

@@ -13,9 +13,9 @@ import * as nanoid from "nanoid";
 import { typeGuard } from "yummies/type-guard";
 import * as crypto from "node:crypto";
 import * as swagger2openapi from "swagger2openapi";
-import * as YAML from "yaml";
 import * as fs from "node:fs";
 import SwaggerParser from "@apidevtools/swagger-parser";
+import * as YAML from "yaml";
 import * as url$1 from "node:url";
 import url from "node:url";
 import { Eta } from "eta";
@@ -174,7 +174,7 @@ var ComponentTypeNameResolver = class extends NameResolver {
 //#endregion
 //#region package.json
 var name = "swagger-typescript-api";
-var version = "13.6.2";
+var version = "13.6.4";
 var description = "Generate the API client for Fetch or Axios from an OpenAPI Specification";
 //#endregion
 //#region src/constants.ts
@@ -1838,7 +1838,7 @@ var SchemaRoutes = class {
 	getRequestInfoTypes = ({ requestInfos, parsedSchemas, operationId, defaultType, resolvedSwaggerSchema }) => {
 		const result = [];
 		for (const [status, requestInfo] of Object.entries(requestInfos || {})) {
-			const contentTypes = this.getContentTypes([requestInfo], operationId);
+			const contentTypes = this.getContentTypes([requestInfo]);
 			const links = this.getRouteLinksFromResponse(resolvedSwaggerSchema, requestInfo, status);
 			result.push({
 				...requestInfo || {},
@@ -2043,11 +2043,53 @@ var SchemaRoutes = class {
 			});
 			const idx = responseBodyInfo.responses.indexOf(responseBodyInfo.success.schema);
 			const successResponse = responseBodyInfo.success;
-			if (successResponse.schema && !successResponse.schema.$ref) {
-				const contentKind = successResponse.schema.contentKind;
-				const schema = this.getSchemaFromRequestType(successResponse.schema);
+			const contentKind = successResponse.schema?.contentKind;
+			const actualSchema = this.getSchemaFromRequestType(successResponse.schema);
+			if (actualSchema && !actualSchema.$ref) {
 				successResponse.schema = this.schemaParserFabric.createParsedComponent({
-					schema,
+					schema: actualSchema,
+					typeName,
+					schemaPath: [routeInfo.operationId]
+				});
+				successResponse.schema.contentKind = contentKind;
+				if (successResponse.schema.typeData) successResponse.schema.typeData.isExtractedResponseBody = true;
+				successResponse.type = this.schemaParserFabric.getInlineParseContent({ $ref: successResponse.schema.$ref });
+				if (idx > -1) Object.assign(responseBodyInfo.responses[idx], {
+					...successResponse.schema,
+					type: successResponse.type
+				});
+			} else if (responseBodyInfo.success.isBinary) {
+				successResponse.schema = this.schemaParserFabric.createParsedComponent({
+					schema: {
+						type: "string",
+						format: "byte"
+					},
+					typeName,
+					schemaPath: [routeInfo.operationId]
+				});
+				successResponse.schema.contentKind = contentKind;
+				if (successResponse.schema.typeData) successResponse.schema.typeData.isExtractedResponseBody = true;
+				successResponse.type = this.config.Ts.Keyword.Blob;
+				if (idx > -1) Object.assign(responseBodyInfo.responses[idx], {
+					...successResponse.schema,
+					type: successResponse.type
+				});
+			} else if (actualSchema?.$ref) {
+				successResponse.schema = this.schemaParserFabric.createParsedComponent({
+					schema: actualSchema,
+					typeName,
+					schemaPath: [routeInfo.operationId]
+				});
+				successResponse.schema.contentKind = contentKind;
+				if (successResponse.schema.typeData) successResponse.schema.typeData.isExtractedResponseBody = true;
+				successResponse.type = this.schemaParserFabric.getInlineParseContent({ $ref: successResponse.schema.$ref });
+				if (idx > -1) Object.assign(responseBodyInfo.responses[idx], {
+					...successResponse.schema,
+					type: successResponse.type
+				});
+			} else if (successResponse.schema && actualSchema === null && (responseBodyInfo.success.type === this.config.Ts.Keyword.Any || responseBodyInfo.success.type === this.config.defaultResponseType)) {
+				successResponse.schema = this.schemaParserFabric.createParsedComponent({
+					schema: {},
 					typeName,
 					schemaPath: [routeInfo.operationId]
 				});
@@ -2285,6 +2327,48 @@ var SchemaRoutes = class {
 	};
 };
 //#endregion
+//#region src/util/parse-schema-content.ts
+function normalizeYamlEscapedLineBreaks(content) {
+	let normalized = "";
+	let inDoubleQuotedScalar = false;
+	let escaped = false;
+	for (let index = 0; index < content.length; index += 1) {
+		const currentChar = content[index];
+		if (!inDoubleQuotedScalar) {
+			if (currentChar === "\"") inDoubleQuotedScalar = true;
+			normalized += currentChar;
+			continue;
+		}
+		if (escaped) {
+			normalized += currentChar;
+			escaped = false;
+			continue;
+		}
+		if (currentChar === "\\") {
+			const nextChar = content[index + 1];
+			if (nextChar === "\n" || nextChar === "\r") {
+				index += 1;
+				if (nextChar === "\r" && content[index + 1] === "\n") index += 1;
+				while (content[index + 1] === " " || content[index + 1] === "	") index += 1;
+				continue;
+			}
+			normalized += currentChar;
+			escaped = true;
+			continue;
+		}
+		if (currentChar === "\"") inDoubleQuotedScalar = false;
+		normalized += currentChar;
+	}
+	return normalized;
+}
+function parseSchemaContent(content) {
+	try {
+		return JSON.parse(content);
+	} catch {
+		return YAML.parse(normalizeYamlEscapedLineBreaks(content));
+	}
+}
+//#endregion
 //#region src/resolved-swagger-schema.ts
 var ResolvedSwaggerSchema = class ResolvedSwaggerSchema {
 	parsedRefsCache = /* @__PURE__ */ new Map();
@@ -2350,11 +2434,10 @@ var ResolvedSwaggerSchema = class ResolvedSwaggerSchema {
 			if (!response.ok) return null;
 			const content = await response.text();
 			try {
-				const parsed = JSON.parse(content);
+				const parsed = parseSchemaContent(content);
 				if (parsed && typeof parsed === "object") return parsed;
 			} catch {
-				const parsed = YAML.parse(content);
-				if (parsed && typeof parsed === "object") return parsed;
+				return null;
 			}
 		} catch (e) {
 			consola.debug(e);
@@ -2517,21 +2600,11 @@ var ResolvedSwaggerSchema = class ResolvedSwaggerSchema {
 		if (this.externalSchemaCache.has(filePath)) return this.externalSchemaCache.get(filePath) || null;
 		if (!fs.existsSync(filePath)) return null;
 		try {
-			const content = fs.readFileSync(filePath, "utf8");
-			const parsed = JSON.parse(content);
+			const parsed = parseSchemaContent(fs.readFileSync(filePath, "utf8"));
 			this.externalSchemaCache.set(filePath, parsed);
 			return parsed;
 		} catch {
-			try {
-				const content = fs.readFileSync(filePath, "utf8");
-				const parsed = YAML.parse(content);
-				if (parsed && typeof parsed === "object") {
-					this.externalSchemaCache.set(filePath, parsed);
-					return parsed;
-				}
-			} catch (e) {
-				consola.debug(e);
-			}
+			consola.debug("Failed to parse external schema", filePath);
 		}
 		return null;
 	}
@@ -2728,11 +2801,7 @@ var SwaggerSchemaResolver = class {
 	}
 	processSwaggerSchemaFile(file) {
 		if (typeof file !== "string") return file;
-		try {
-			return JSON.parse(file);
-		} catch {
-			return YAML.parse(file);
-		}
+		return parseSchemaContent(file);
 	}
 	normalizeRefValue(ref) {
 		const refWithoutSlashBeforeHash = ref.split("/#/").join("#/");
@@ -3471,4 +3540,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-BQOg3KNL.mjs.map
+//# sourceMappingURL=src-eiRlSfN6.mjs.map