Return undefined in most cases to support noImplicitReturns rule

ferdikoomen · ferdikoomen · commit 05d5962144b2 · 2022-04-06T22:21:06.000+02:00
Filter out wrong enum values
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.20.2] - 2022-02-25
+### Fixed
+- Return `undefined` to match `noImplicitReturns` rule
+- Made `BaseHttpRequest` class abstract
+- Filter out wrong enum values
+
 ## [0.20.1] - 2022-02-25
 ### Fixed
 - Support enums with single quotes in names for V2
diff --git a/src/openApi/v2/parser/getEnum.ts b/src/openApi/v2/parser/getEnum.ts
@@ -1,13 +1,14 @@
 import type { Enum } from '../../../client/interfaces/Enum';
-import { isDefined } from '../../../utils/isDefined';
 
 export const 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 const getEnum = (values?: (string | number)[]): Enum[] => {
                         .replace(/^(\d+)/g, '_$1')
                         .replace(/([a-z])([A-Z]+)/g, '$1_$2')
                         .toUpperCase(),
-                    value: `'${value.replace(/'/g, "\\'")}'`,
+                    value: `'${value.replace(/'/g, '\\\'')}'`,
                     type: 'string',
                     description: null,
                 };
diff --git a/src/openApi/v2/parser/getOperationParameterDefault.ts b/src/openApi/v2/parser/getOperationParameterDefault.ts
@@ -6,7 +6,7 @@ export const getOperationParameterDefault = (
     operationParameter: OperationParameter
 ): string | undefined => {
     if (parameter.default === undefined) {
-        return;
+        return undefined;
     }
 
     if (parameter.default === null) {
@@ -38,5 +38,5 @@ export const getOperationParameterDefault = (
             }
     }
 
-    return;
+    return undefined;
 };
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 const 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 const getEnum = (values?: (string | number)[]): Enum[] => {
                         .replace(/^(\d+)/g, '_$1')
                         .replace(/([a-z])([A-Z]+)/g, '$1_$2')
                         .toUpperCase(),
-                    value: `'${value.replace(/'/g, "\\'")}'`,
+                    value: `'${value.replace(/'/g, '\\\'')}'`,
                     type: 'string',
                     description: null,
                 };
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 const getModelDefault = (definition: OpenApiSchema, model?: Model): string | undefined => {
     if (definition.default === undefined) {
-        return;
+        return undefined;
     }
 
     if (definition.default === null) {
@@ -35,5 +35,5 @@ export const getModelDefault = (definition: OpenApiSchema, model?: Model): strin
             }
     }
 
-    return;
+    return undefined;
 };
diff --git a/src/templates/core/angular/getRequestBody.hbs b/src/templates/core/angular/getRequestBody.hbs
@@ -8,5 +8,5 @@ const getRequestBody = (options: ApiRequestOptions): any => {
 			return JSON.stringify(options.body);
 		}
 	}
-	return;
+	return undefined;
 };
diff --git a/src/templates/core/angular/getResponseBody.hbs b/src/templates/core/angular/getResponseBody.hbs
@@ -2,5 +2,5 @@ const getResponseBody = <T>(response: HttpResponse<T>): T | undefined => {
 	if (response.status !== 204 && response.body !== null) {
 		return response.body;
 	}
-	return;
+	return undefined;
 };
diff --git a/src/templates/core/axios/getRequestBody.hbs b/src/templates/core/axios/getRequestBody.hbs
@@ -2,5 +2,5 @@ const getRequestBody = (options: ApiRequestOptions): any => {
 	if (options.body) {
 		return options.body;
 	}
-	return;
+	return undefined;
 };
diff --git a/src/templates/core/axios/getResponseBody.hbs b/src/templates/core/axios/getResponseBody.hbs
@@ -2,5 +2,5 @@ const getResponseBody = (response: AxiosResponse<any>): any => {
 	if (response.status !== 204) {
 		return response.data;
 	}
-	return;
+	return undefined;
 };
diff --git a/src/templates/core/fetch/getRequestBody.hbs b/src/templates/core/fetch/getRequestBody.hbs
@@ -8,5 +8,5 @@ const getRequestBody = (options: ApiRequestOptions): any => {
 			return JSON.stringify(options.body);
 		}
 	}
-	return;
+	return undefined;
 };
diff --git a/src/templates/core/fetch/getResponseBody.hbs b/src/templates/core/fetch/getResponseBody.hbs
@@ -14,5 +14,5 @@ const getResponseBody = async (response: Response): Promise<any> => {
 			console.error(error);
 		}
 	}
-	return;
+	return undefined;
 };
diff --git a/src/templates/core/node/getRequestBody.hbs b/src/templates/core/node/getRequestBody.hbs
@@ -8,5 +8,5 @@ const getRequestBody = (options: ApiRequestOptions): any => {
 			return JSON.stringify(options.body);
 		}
 	}
-	return;
+	return undefined;
 };
diff --git a/src/templates/core/node/getResponseBody.hbs b/src/templates/core/node/getResponseBody.hbs
@@ -14,5 +14,5 @@ const getResponseBody = async (response: Response): Promise<any> => {
 			console.error(error);
 		}
 	}
-	return;
+	return undefined;
 };
diff --git a/src/templates/core/xhr/getRequestBody.hbs b/src/templates/core/xhr/getRequestBody.hbs
@@ -9,5 +9,5 @@ const getRequestBody = (options: ApiRequestOptions): any => {
 		}
 	}
 
-	return;
+	return undefined;
 };
diff --git a/src/templates/core/xhr/getResponseBody.hbs b/src/templates/core/xhr/getResponseBody.hbs
@@ -14,5 +14,5 @@ const getResponseBody = (xhr: XMLHttpRequest): any => {
 			console.error(error);
 		}
 	}
-	return;
+	return undefined;
 };
diff --git a/src/utils/discriminator.ts b/src/utils/discriminator.ts
@@ -27,7 +27,7 @@ export const findOneOfParentDiscriminator = (openApi: OpenApi, parent?: Model):
             }
         }
     }
-    return;
+    return undefined;
 };
 
 export const mapPropertyValue = (discriminator: OpenApiDiscriminator, parent: Model): string => {
diff --git a/test/__snapshots__/index.spec.ts.snap b/test/__snapshots__/index.spec.ts.snap
@@ -410,7 +410,7 @@ const getRequestBody = (options: ApiRequestOptions): any => {
             return JSON.stringify(options.body);
         }
     }
-    return;
+    return undefined;
 };
 
 export const sendRequest = async (
@@ -466,7 +466,7 @@ const getResponseBody = async (response: Response): Promise<any> => {
             console.error(error);
         }
     }
-    return;
+    return undefined;
 };
 
 const catchErrorCodes = (options: ApiRequestOptions, result: ApiResult): void => {
@@ -3421,7 +3421,7 @@ const getRequestBody = (options: ApiRequestOptions): any => {
             return JSON.stringify(options.body);
         }
     }
-    return;
+    return undefined;
 };
 
 export const sendRequest = async (
@@ -3477,7 +3477,7 @@ const getResponseBody = async (response: Response): Promise<any> => {
             console.error(error);
         }
     }
-    return;
+    return undefined;
 };
 
 const catchErrorCodes = (options: ApiRequestOptions, result: ApiResult): void => {

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ export const getOperationParameterDefault = (`
`6`	`6`	`operationParameter: OperationParameter`
`7`	`7`	`): string \| undefined => {`
`8`	`8`	`if (parameter.default === undefined) {`
`9`		`- return;`
	`9`	`+ return undefined;`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`if (parameter.default === null) {`
`@@ -38,5 +38,5 @@ export const getOperationParameterDefault = (`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
`41`		`- return;`
	`41`	`+ return undefined;`
`42`	`42`	`};`
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 const 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 const getModelDefault = (definition: OpenApiSchema, model?: Model): strin`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
`38`		`- return;`
	`38`	`+ return undefined;`
`39`	`39`	`};`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,5 @@ const getRequestBody = (options: ApiRequestOptions): any => {`
`8`	`8`	`return JSON.stringify(options.body);`
`9`	`9`	`}`
`10`	`10`	`}`
`11`		`- return;`
	`11`	`+ return undefined;`
`12`	`12`	`};`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@ const getResponseBody = <T>(response: HttpResponse<T>): T \| undefined => {`
`2`	`2`	`if (response.status !== 204 && response.body !== null) {`
`3`	`3`	`return response.body;`
`4`	`4`	`}`
`5`		`- return;`
	`5`	`+ return undefined;`
`6`	`6`	`};`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@ const getRequestBody = (options: ApiRequestOptions): any => {`
`2`	`2`	`if (options.body) {`
`3`	`3`	`return options.body;`
`4`	`4`	`}`
`5`		`- return;`
	`5`	`+ return undefined;`
`6`	`6`	`};`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@ const getResponseBody = (response: AxiosResponse<any>): any => {`
`2`	`2`	`if (response.status !== 204) {`
`3`	`3`	`return response.data;`
`4`	`4`	`}`
`5`		`- return;`
	`5`	`+ return undefined;`
`6`	`6`	`};`