- Working on better File type handeling

Author: ferdikoomen

package.json

@@ -1,6 +1,6 @@
 {
     "name": "openapi-typescript-codegen",
-    "version": "0.5.0-alpha",
+    "version": "0.5.0-beta",
     "description": "NodeJS library that generates Typescript or Javascript clients based on the OpenAPI specification.",
     "author": "Ferdi Koomen",
     "homepage": "https://github.com/ferdikoomen/openapi-typescript-codegen",

src/openApi/v2/parser/constants.ts

@@ -1,5 +1,5 @@
 export enum PrimaryType {
-    FILE = 'File',
+    FILE = 'any', // File or Buffer?
     OBJECT = 'any',
     ARRAY = 'any',
     BOOLEAN = 'boolean',

src/openApi/v2/parser/getMappedType.spec.ts

@@ -2,7 +2,7 @@ import { getMappedType } from './getMappedType';
 
 describe('getMappedType', () => {
     it('should map types to the basics', () => {
-        expect(getMappedType('File')).toEqual('File');
+        expect(getMappedType('File')).toEqual('any');
         expect(getMappedType('String')).toEqual('string');
         expect(getMappedType('date')).toEqual('string');
         expect(getMappedType('date-time')).toEqual('string');

src/openApi/v3/parser/constants.ts

@@ -1,5 +1,5 @@
 export enum PrimaryType {
-    FILE = 'File',
+    FILE = 'any', // File or Buffer?
     OBJECT = 'any',
     ARRAY = 'any[]',
     BOOLEAN = 'boolean',

src/openApi/v3/parser/getMappedType.spec.ts

@@ -2,7 +2,7 @@ import { getMappedType } from './getMappedType';
 
 describe('getMappedType', () => {
     it('should map types to the basics', () => {
-        expect(getMappedType('File')).toEqual('File');
+        expect(getMappedType('File')).toEqual('any');
         expect(getMappedType('String')).toEqual('string');
         expect(getMappedType('date')).toEqual('string');
         expect(getMappedType('date-time')).toEqual('string');

src/templates/core/functions/getHeaders.hbs renamed to src/templates/core/fetch/getHeaders.hbs

@@ -9,11 +9,9 @@ function getHeaders(options: ApiRequestOptions): Headers {
     }
 
     if (options.body) {
-        if (options.body instanceof Blob) {
-            if (options.body.type) {
-                headers.append('Content-Type', options.body.type);
-            }
-        } else if (typeof options.body === 'string') {
+        if (isBlob(options.body)) {
+            headers.append('Content-Type', options.body.type || 'application/octet-stream');
+        } else if (isString(options.body)) {
             headers.append('Content-Type', 'text/plain');
         } else {
             headers.append('Content-Type', 'application/json');

src/templates/core/fetch/getRequestBody.hbs

@@ -3,9 +3,7 @@ function getRequestBody(options: ApiRequestOptions): BodyInit | undefined {
         return getFormData(options.formData);
     }
     if (options.body) {
-        if (options.body instanceof Blob) {
-            return options.body;
-        } else if (typeof options.body === 'string') {
+        if (isString(options.body) || isBlob(options.body)) {
             return options.body;
         } else {
             return JSON.stringify(options.body);

src/templates/core/fetch/getResponseHeader.hbs

@@ -1,7 +1,7 @@
 function getResponseHeader(response: Response, responseHeader?: string): string | null {
     if (responseHeader) {
         const content = response.headers.get(responseHeader);
-        if (typeof content === 'string') {
+        if (isString(content)) {
             return content;
         }
     }

src/templates/core/fetch/request.hbs

@@ -8,6 +8,12 @@ import { OpenAPI } from './OpenAPI';
 {{>functions/isDefined}}
 
 
+{{>functions/isString}}
+
+
+{{>functions/isBlob}}
+
+
 {{>functions/getQueryString}}
 
 
@@ -17,7 +23,7 @@ import { OpenAPI } from './OpenAPI';
 {{>functions/getFormData}}
 
 
-{{>functions/getHeaders}}
+{{>fetch/getHeaders}}
 
 
 {{>fetch/getRequestBody}}

src/templates/core/functions/isBinary.hbs

@@ -0,0 +1,6 @@
+function isBinary(value: any): value is Buffer | ArrayBuffer | ArrayBufferView {
+    const isBuffer = Buffer.isBuffer(value);
+    const isArrayBuffer = types.isArrayBuffer(value);
+    const isArrayBufferView = types.isArrayBufferView(value);
+    return isBuffer || isArrayBuffer || isArrayBufferView;
+}