@penkov/swagger-code-gen 1.13.0 → 1.15.0

package/dist/method.js

@@ -7,6 +7,12 @@ export const SHARED_BODIES_PREFIX = '#/components/requestBodies/';
 const sortByIn = HashMap.of(['path', 0], ['query', 1], ['header', 2], ['cookie', 3], ['body', 4]);
 export const supportedBodyMimeTypes = HashMap.of(['application/json', 'Json'], ['application/x-www-form-urlencoded', 'Form'], ['multipart/form-data', 'File'], ['application/octet-stream', 'Binary']);
 export class Method {
+    static parseModeByMimeType(mimeType) {
+        if (mimeType.startsWith('text/') || mimeType.includes('xml')) {
+            return 'text';
+        }
+        return 'json';
+    }
     constructor(path, method, def, schemasTypes, options, pool) {
         this.path = path;
         this.method = method;
@@ -132,10 +138,27 @@ export class Method {
             .getOrElseValue({});
         const mimeTypes = option(respDef.content)
             .map(content => Collection.from(Object.keys(content)).toMap(mimeType => [mimeType, content[mimeType]])).getOrElseValue(HashMap.empty);
-        this.response = mimeTypes.get('application/json')
-            .orElseValue(mimeTypes.values.headOption)
-            .filter(p => option(p.schema).isDefined)
+        const responseMimeType = mimeTypes.get('application/json')
+            .map(_ => 'application/json')
+            .orElse(() => mimeTypes.keySet.headOption)
+            .getOrElseValue('application/json');
+        const responseParseMode = Method.parseModeByMimeType(responseMimeType);
+        this.response = mimeTypes.get(responseMimeType)
+            .filter(p => option(p.schema).isDefined || responseParseMode === 'text')
             .map(p => {
+            if (responseParseMode === 'text') {
+                const r = Property.fromDefinition('', '', { type: 'string' }, schemasTypes, options).copy({
+                    nullable: false,
+                    required: true,
+                });
+                return {
+                    asProperty: r,
+                    responseType: 'string',
+                    description: respDef.description,
+                    mimeType: responseMimeType,
+                    parseMode: responseParseMode,
+                };
+            }
             if (p.schema.type === 'object' && p.schema['properties'] && Object.keys(p.schema['properties']).length > 0) {
                 const inPlaceObject = NameUtils.normaliseClassname(def.operationId + 'Response$' + method);
                 const r = Property.fromDefinition(inPlaceObject, '', {
@@ -149,7 +172,9 @@ export class Method {
                     asProperty: r,
                     responseType: inPlaceObject,
                     description: respDef.description,
-                    inPlace: p.schema
+                    inPlace: p.schema,
+                    mimeType: responseMimeType,
+                    parseMode: responseParseMode,
                 };
             }
             else {
@@ -161,12 +186,16 @@ export class Method {
                     asProperty: r,
                     responseType: r.jsType,
                     description: respDef.description,
+                    mimeType: responseMimeType,
+                    parseMode: responseParseMode,
                 };
             }
         })
             .getOrElseValue(({
             asProperty: Property.fromDefinition('', 'UNKNOWN', { type: 'any' }, schemasTypes, options),
             responseType: 'any',
+            mimeType: responseMimeType,
+            parseMode: responseParseMode,
         }));
         this.wrapParamsInObject = this.parameters.size > 2 || (this.body.nonEmpty) && this.parameters.nonEmpty;
     }

package/dist/templates/index.ejs

@@ -86,20 +86,52 @@ function objectToFormWwwEncoded(o: Record<string, any>): string {
         .join('&');
 }
 
-async function requestImpl<T>(request: Request, requestOptions: RequestOptions): Promise<T> {
+type ResponseParseMode = 'json' | 'text';
+
+function normaliseCharset(charset: string): string {
+    const normalized = charset.trim().toLowerCase();
+    if (normalized === 'cp1251') {
+        return 'windows-1251';
+    }
+    return normalized;
+}
+
+function extractCharset(contentType: string | null): string {
+    if (contentType == null) {
+        return 'utf-8';
+    }
+    const match = contentType.match(/charset\s*=\s*("?)([^";\s]+)\1/i);
+    return normaliseCharset(match?.[2] || 'utf-8');
+}
+
+async function readResponseText(response: Response): Promise<string> {
+    const payload = await response.arrayBuffer();
+    const charset = extractCharset(response.headers.get('content-type'));
+    try {
+        return new TextDecoder(charset).decode(payload);
+    } catch {
+        return new TextDecoder('utf-8').decode(payload);
+    }
+}
+
+async function requestImpl<T>(request: Request, requestOptions: RequestOptions, parseMode: ResponseParseMode = 'json'): Promise<T> {
     const preProcessed = requestOptions.preProcessRequest ? await requestOptions.preProcessRequest(request) : request;
     const resp = await fetch(preProcessed);
     const postProcessed = requestOptions.postProcessResponse ? await requestOptions.postProcessResponse(preProcessed, resp) : resp;
     if (postProcessed.ok) {
+        if (parseMode === 'text') {
+            return (await readResponseText(postProcessed)) as T;
+        }
+
         let json: any = null;
         if (postProcessed.headers.has('content-length')) {
             const ctLent = postProcessed.headers.get('content-length');
             const ct = ctLent != null ? parseInt(ctLent): 0;
             if (ct > 0) {
-                json = await postProcessed.json()
+                json = JSON.parse((await readResponseText(postProcessed)).replace(/^\uFEFF/, ''))
             }
         } else {
-            json = await postProcessed.json()
+            json = JSON.parse((await readResponseText(postProcessed)).replace(/^\uFEFF/, ''))
         }
         return json as T;
     } else {
@@ -139,5 +171,3 @@ methods.foreach(method => {
 <%- include('scats-api-client.ejs'); %>
 
 <% } %>
-
-

package/dist/templates/method.ejs

@@ -76,7 +76,7 @@ export async function <%= method.endpointName %><%= body.map(b => b.suffix).getO
 
     const headers: HeadersInit = {
         ...requestOptions.headers || {},
-        'Accept': 'application/json',
+        'Accept': '<%= method.response.mimeType %>',
         <%_ if (body.nonEmpty && body.get.mimeType !== 'multipart/form-data') {%>
         'Content-Type': '<%= body.get.mimeType %>',
         <%_ }  -%>
@@ -97,5 +97,5 @@ export async function <%= method.endpointName %><%= body.map(b => b.suffix).getO
         signal: requestOptions.signal,
         headers: headers
     });
-    return requestImpl<<%- method.response.responseType %>>(request, requestOptions);
+    return requestImpl<<%- method.response.responseType %>>(request, requestOptions, '<%= method.response.parseMode %>');
 }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@penkov/swagger-code-gen",
-  "version": "1.13.0",
+  "version": "1.15.0",
   "type": "module",
   "bin": {
-    "generate-client": "./dist/cli.mjs"
+    "generate-client": "dist/cli.mjs"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/papirosko/swagger-code-gen"
+    "url": "git+https://github.com/papirosko/swagger-code-gen.git"
   },
   "keywords": [
     "swagger",