Merge pull request Ciptex#70 from Ciptex/merge-upstream

moretalk · web-flow · commit 3c18b247486b · 2022-07-11T21:43:09.000+01:00
Merge upstream
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -70,37 +70,37 @@
         "json-schema-ref-parser": "^9.0.9"
     },
     "devDependencies": {
-        "@babel/cli": "7.17.10",
-        "@babel/core": "7.18.5",
-        "@babel/preset-env": "7.18.2",
-        "@babel/preset-typescript": "7.17.12",
+        "@babel/cli": "^7.18.6",
+        "@babel/core": "^7.18.6",
+        "@babel/preset-env": "^7.18.6",
+        "@babel/preset-typescript": "^7.18.6",
         "@rollup/plugin-commonjs": "^22.0.1",
         "@rollup/plugin-node-resolve": "13.3.0",
         "@rollup/plugin-typescript": "8.3.3",
         "@types/express": "4.17.13",
         "@types/glob": "7.2.0",
-        "@types/jest": "^28.1.3",
-        "@types/node": "^18.0.0",
+        "@types/jest": "^28.1.4",
+        "@types/node": "^18.0.3",
         "@types/qs": "6.9.7",
-        "@typescript-eslint/eslint-plugin": "^5.29.0",
-        "@typescript-eslint/parser": "^5.29.0",
+        "@typescript-eslint/eslint-plugin": "^5.30.6",
+        "@typescript-eslint/parser": "^5.30.6",
         "codecov": "3.8.3",
-        "eslint": "^8.18.0",
+        "eslint": "^8.19.0",
         "eslint-config-prettier": "8.5.0",
-        "eslint-plugin-prettier": "4.0.0",
+        "eslint-plugin-prettier": "^4.2.1",
         "eslint-plugin-simple-import-sort": "7.0.0",
         "express": "4.18.1",
         "glob": "8.0.3",
-        "jest": "28.1.1",
-        "jest-cli": "28.1.1",
+        "jest": "^28.1.2",
+        "jest-cli": "^28.1.2",
         "prettier": "^2.7.1",
-        "puppeteer": "^15.1.1",
+        "puppeteer": "^15.3.2",
         "qs": "^6.11.0",
         "rimraf": "^3.0.2",
-        "rollup": "^2.75.7",
-        "rollup-plugin-node-externals": "^4.1.0",
+        "rollup": "^2.76.0",
+        "rollup-plugin-node-externals": "^4.1.1",
         "rollup-plugin-terser": "7.0.2",
-        "ts-node": "10.8.1",
+        "ts-node": "^10.8.2",
         "tslib": "2.4.0",
         "typescript": "^4.7.4"
     }
diff --git a/src/openApi/v3/parser/escapeName.spec.ts b/src/openApi/v3/parser/escapeName.spec.ts
@@ -2,7 +2,7 @@ import { escapeName } from './escapeName';
 
 describe('escapeName', () => {
     it('should escape', () => {
-        expect(escapeName('')).toEqual('');
+        expect(escapeName('')).toEqual("''");
         expect(escapeName('fooBar')).toEqual('fooBar');
         expect(escapeName('Foo Bar')).toEqual(`'Foo Bar'`);
         expect(escapeName('foo bar')).toEqual(`'foo bar'`);
diff --git a/src/openApi/v3/parser/escapeName.ts b/src/openApi/v3/parser/escapeName.ts
@@ -1,5 +1,5 @@
-export function escapeName(value: string): string {
-    if (value) {
+export const escapeName = (value: string): string => {
+    if (value || value === '') {
         const validName = /^[a-zA-Z_$][\w$]+$/g.test(value);
         if (!validName) {
             return `'${value}'`;
diff --git a/src/openApi/v3/parser/extendEnum.ts b/src/openApi/v3/parser/extendEnum.ts
@@ -1,4 +1,5 @@
 import type { Enum } from '../../../client/interfaces/Enum';
+import { isString } from '../../../utils/isString';
 import type { WithEnumExtension } from '../interfaces/Extensions/WithEnumExtension';
 
 /**
@@ -7,9 +8,9 @@ import type { WithEnumExtension } from '../interfaces/Extensions/WithEnumExtensi
  * @param enumerators
  * @param definition
  */
-export function extendEnum(enumerators: Enum[], definition: WithEnumExtension): Enum[] {
-    const names = definition['x-enum-varnames'];
-    const descriptions = definition['x-enum-descriptions'];
+export const extendEnum = (enumerators: Enum[], definition: WithEnumExtension): Enum[] => {
+    const names = definition['x-enum-varnames']?.filter(isString);
+    const descriptions = definition['x-enum-descriptions']?.filter(isString);
 
     return enumerators.map((enumerator, index) => ({
         name: names?.[index] || enumerator.name,
diff --git a/src/openApi/v3/parser/getEnum.ts b/src/openApi/v3/parser/getEnum.ts
@@ -1,13 +1,14 @@
 import type { Enum } from '../../../client/interfaces/Enum';
-import { isDefined } from '../../../utils/isDefined';
 
 export function getEnum(values?: (string | number)[]): Enum[] {
     if (Array.isArray(values)) {
         return values
             .filter((value, index, arr) => {
                 return arr.indexOf(value) === index;
             })
-            .filter(isDefined)
+            .filter((value: any) => {
+                return typeof value === 'number' || typeof value === 'string';
+            })
             .map(value => {
                 if (typeof value === 'number') {
                     return {
@@ -23,7 +24,7 @@ export function getEnum(values?: (string | number)[]): Enum[] {
                         .replace(/^(\d+)/g, '_$1')
                         .replace(/([a-z])([A-Z]+)/g, '$1_$2')
                         .toUpperCase(),
-                    value: `'${value}'`,
+                    value: `'${value.replace(/'/g, "\\'")}'`,
                     type: 'string',
                     description: null,
                 };
diff --git a/src/openApi/v3/parser/getModel.ts b/src/openApi/v3/parser/getModel.ts
@@ -5,7 +5,6 @@ import type { OpenApiSchema } from '../interfaces/OpenApiSchema';
 import { extendEnum } from './extendEnum';
 import { getComment } from './getComment';
 import { getEnum } from './getEnum';
-import { getEnumFromDescription } from './getEnumFromDescription';
 import { getModelComposition } from './getModelComposition';
 import { getModelDefault } from './getModelDefault';
 import { getModelProperties } from './getModelProperties';
@@ -73,18 +72,6 @@ export function getModel(
         }
     }
 
-    if ((definition.type === 'int' || definition.type === 'integer') && definition.description) {
-        const enumerators = getEnumFromDescription(definition.description);
-        if (enumerators.length) {
-            model.export = 'enum';
-            model.type = 'number';
-            model.base = 'number';
-            model.enum.push(...enumerators);
-            model.default = getModelDefault(definition, model);
-            return model;
-        }
-    }
-
     if (definition.type === 'array' && definition.items) {
         if (definition.items.$ref) {
             const arrayItems = getType(definition.items.$ref);
diff --git a/src/openApi/v3/parser/getModelDefault.ts b/src/openApi/v3/parser/getModelDefault.ts
@@ -3,7 +3,7 @@ import type { OpenApiSchema } from '../interfaces/OpenApiSchema';
 
 export function getModelDefault(definition: OpenApiSchema, model?: Model): string | undefined {
     if (definition.default === undefined) {
-        return;
+        return undefined;
     }
 
     if (definition.default === null) {
@@ -35,5 +35,5 @@ export function getModelDefault(definition: OpenApiSchema, model?: Model): strin
             }
     }
 
-    return;
+    return undefined;
 }
diff --git a/src/openApi/v3/parser/getServices.spec.ts b/src/openApi/v3/parser/getServices.spec.ts
@@ -0,0 +1,18 @@
+import { getServices } from './getServices';
+
+describe('getServices', () => {
+    it('should create a unnamed service if tags are empty', () => {
+        const services = getServices({
+            openapi: '3',
+            info: { title: 'x', version: '1' },
+            paths: {
+                '/api/trips': {
+                    get: { tags: [], responses: { 200: { description: 'X' }, default: { description: 'default' } } },
+                },
+            },
+        });
+
+        expect(services).toHaveLength(1);
+        expect(services[0].name).toEqual('Unnamed');
+    });
+});
diff --git a/src/openApi/v3/parser/getServices.ts b/src/openApi/v3/parser/getServices.ts
@@ -30,8 +30,8 @@ export function getServices(openApi: OpenApi): Service[] {
                         case 'patch':
                             // Each method contains an OpenAPI operation, we parse the operation
                             const op = path[method]!;
-
-                            let tags = op.tags?.filter(unique) || ['Service'];
+                            const uniqueTags = op.tags?.filter(unique);
+                            let tags = uniqueTags?.length ? uniqueTags : ['Unnamed'];
 
                             //Remove Tags that are not in the x-tagGroups Extension
                             if (tagGroups) {
diff --git a/src/templates/core/CancelablePromise.hbs b/src/templates/core/CancelablePromise.hbs
@@ -20,7 +20,7 @@ export interface OnCancel {
 }
 
 export class CancelablePromise<T> implements Promise<T> {
-    readonly [Symbol.toStringTag]: string = "Promise";
+	readonly [Symbol.toStringTag]!: string;
 
     #isPending: boolean;
     #isCancelled: boolean;
diff --git a/src/templates/core/axios/getHeaders.hbs b/src/templates/core/axios/getHeaders.hbs
@@ -25,6 +25,18 @@ async function getHeaders(options: ApiRequestOptions, config: OpenAPIConfig2, fo
         const credentials = base64(`${accountSid}:${authToken}`);
         headers['Authorization'] = `Basic ${credentials}`;
     }
+    
+	if (options.body) {
+		if (options.mediaType) {
+			headers['Content-Type'] = options.mediaType;
+		} else if (isBlob(options.body)) {
+			headers['Content-Type'] = options.body.type || 'application/octet-stream';
+		} else if (isString(options.body)) {
+			headers['Content-Type'] = 'text/plain';
+		} else if (!isFormData(options.body)) {
+			headers['Content-Type'] = 'application/json';
+		}
+	}
 
-    return headers;
-}
+	return headers;
+};
diff --git a/src/templates/core/axios/getRequestBody.hbs b/src/templates/core/axios/getRequestBody.hbs
@@ -1,6 +1,6 @@
-function getRequestBody(options: ApiRequestOptions): any {
-    if (options.body) {
-        return options.body;
-    }
-    return;
-}
+const getRequestBody = (options: ApiRequestOptions): any => {
+	if (options.body) {
+		return options.body;
+	}
+	return undefined;
+};
diff --git a/src/templates/core/axios/getResponseBody.hbs b/src/templates/core/axios/getResponseBody.hbs
@@ -1,6 +1,6 @@
-function getResponseBody(response: AxiosResponse<any>): any {
-    if (response.status !== 204) {
-        return response.data;
-    }
-    return;
-}
+const getResponseBody = (response: AxiosResponse<any>): any => {
+	if (response.status !== 204) {
+		return response.data;
+	}
+	return undefined;
+};
diff --git a/src/templates/core/axios/getResponseHeader.hbs b/src/templates/core/axios/getResponseHeader.hbs
@@ -1,9 +1,9 @@
-function getResponseHeader(response: AxiosResponse<any>, responseHeader?: string): string | undefined {
-    if (responseHeader) {
-        const content = response.headers[responseHeader];
-        if (isString(content)) {
-            return content;
-        }
-    }
-    return;
-}
+const getResponseHeader = (response: AxiosResponse<any>, responseHeader?: string): string | undefined => {
+	if (responseHeader) {
+		const content = response.headers[responseHeader];
+		if (isString(content)) {
+			return content;
+		}
+	}
+	return undefined;
+};
diff --git a/src/templates/core/axios/request.hbs b/src/templates/core/axios/request.hbs
@@ -1,6 +1,7 @@
 {{>header}}
 
-import axios, { AxiosError, AxiosRequestConfig, AxiosResponse } from 'axios';
+import axios from 'axios';
+import type { AxiosError, AxiosRequestConfig, AxiosResponse } from 'axios';
 import FormData from 'form-data';
 
 import { ApiError } from './ApiError';
@@ -26,6 +27,9 @@ import { OpenAPI } from './OpenAPI';
 {{>functions/isBlob}}
 
 
+{{>functions/isFormData}}
+
+
 {{>functions/isSuccess}}
 
 
diff --git a/src/templates/core/axios/sendRequest.hbs b/src/templates/core/axios/sendRequest.hbs
@@ -1,33 +1,33 @@
-async function sendRequest(
+const sendRequest = async <T>(
     options: ApiRequestOptions,
     url: string,
     formData: FormData | undefined,
     body: any,
     headers: Record<string, string>,
     onCancel: OnCancel,
     openApiConfig: OpenAPIConfig2
-): Promise<AxiosResponse<any>> {
+): Promise<AxiosResponse<T>> => {
     const source = axios.CancelToken.source();
     const newUrl = openApiConfig.edge ? url.replace("{edge}", openApiConfig.edge) : url;
 
-    const config: AxiosRequestConfig = {
+    const requestConfig: AxiosRequestConfig = {
         url: newUrl,
         headers,
-        data: body || formData,
+        data: body ?? formData,
         method: options.method,
         cancelToken: source.token,
         validateStatus: () => true,
     };
 
     onCancel(() => source.cancel('The user aborted a request.'));
 
-    try {
-        return await axios.request(config);
-    } catch (error) {
-        const axiosError = error as AxiosError;
-        if (axiosError.response) {
-            return axiosError.response;
-        }
-        throw error;
-    }
-}
+	try {
+		return await axios.request(requestConfig);
+	} catch (error) {
+		const axiosError = error as AxiosError<T>;
+		if (axiosError.response) {
+			return axiosError.response;
+		}
+		throw error;
+	}
+};
diff --git a/src/templates/core/functions/getFormData.hbs b/src/templates/core/functions/getFormData.hbs
@@ -20,7 +20,7 @@ function getFormData(options: ApiRequestOptions): FormData | undefined {
                 }
             });
 
-        return formData;
-    }
-    return;
-}
+		return formData;
+	}
+	return undefined;
+};
diff --git a/src/templates/core/functions/getQueryString.hbs b/src/templates/core/functions/getQueryString.hbs
@@ -1,9 +1,25 @@
-function getQueryString(params: Record<string, any>): string {
-    const qs: string[] = [];
+const getQueryString = (params: Record<string, any>): string => {
+	const qs: string[] = [];
 
-    const append = (key: string, value: any) => {
-        qs.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`);
-    };
+	const append = (key: string, value: any) => {
+		qs.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`);
+	};
+
+	const process = (key: string, value: any) => {
+		if (isDefined(value)) {
+			if (Array.isArray(value)) {
+				value.forEach(v => {
+					process(key, v);
+				});
+			} else if (typeof value === 'object') {
+				Object.entries(value).forEach(([k, v]) => {
+					process(`${key}[${k}]`, v);
+				});
+			} else {
+				append(key, value);
+			}
+		}
+	};
 
     Object.entries(params)
         .filter(([_, value]) => isDefined(value))
@@ -15,9 +31,9 @@ function getQueryString(params: Record<string, any>): string {
             }
         });
 
-    if (qs.length > 0) {
-        return `?${qs.join('&')}`;
-    }
+	if (qs.length > 0) {
+		return `?${qs.join('&')}`;
+	}
 
     return '';
 }
diff --git a/src/utils/discriminator.ts b/src/utils/discriminator.ts
@@ -27,7 +27,7 @@ export function findOneOfParentDiscriminator(openApi: OpenApi, parent?: Model):
             }
         }
     }
-    return;
+    return undefined;
 }
 
 export function mapPropertyValue(discriminator: OpenApiDiscriminator, parent: Model): string {
diff --git a/types/index.d.ts b/types/index.d.ts

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import type { OpenApiSchema } from '../interfaces/OpenApiSchema';`
`3`	`3`
`4`	`4`	`export function getModelDefault(definition: OpenApiSchema, model?: Model): string \| undefined {`
`5`	`5`	`if (definition.default === undefined) {`
`6`		`- return;`
	`6`	`+ return undefined;`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`if (definition.default === null) {`
`@@ -35,5 +35,5 @@ export function getModelDefault(definition: OpenApiSchema, model?: Model): strin`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
`38`		`- return;`
	`38`	`+ return undefined;`
`39`	`39`	`}`