- Cleanup

Ferdi Koomen · Ferdi Koomen · commit e3ff6277d131 · 2020-12-18T17:33:22.000+01:00
diff --git a/src/openApi/v2/parser/getEnum.ts b/src/openApi/v2/parser/getEnum.ts
@@ -1,5 +1,5 @@
 import type { Enum } from '../../../client/interfaces/Enum';
-import { isDefined } from './isDefined';
+import { isDefined } from '../../../utils/isDefined';
 
 export function getEnum(values?: (string | number)[]): Enum[] {
     if (Array.isArray(values)) {
diff --git a/src/openApi/v2/parser/getModel.ts b/src/openApi/v2/parser/getModel.ts
@@ -1,4 +1,5 @@
 import type { Model } from '../../../client/interfaces/Model';
+import { getPattern } from '../../../utils/getPattern';
 import type { OpenApi } from '../interfaces/OpenApi';
 import type { OpenApiSchema } from '../interfaces/OpenApiSchema';
 import { extendEnum } from './extendEnum';
@@ -7,7 +8,6 @@ import { getEnum } from './getEnum';
 import { getEnumFromDescription } from './getEnumFromDescription';
 import { getModelComposition } from './getModelComposition';
 import { getModelProperties } from './getModelProperties';
-import { getPattern } from './getPattern';
 import { getType } from './getType';
 
 export function getModel(openApi: OpenApi, definition: OpenApiSchema, isDefinition: boolean = false, name: string = ''): Model {
diff --git a/src/openApi/v2/parser/getModelComposition.ts b/src/openApi/v2/parser/getModelComposition.ts
@@ -14,8 +14,8 @@ export function getModelComposition(openApi: OpenApi, definitions: OpenApiSchema
         properties: [],
     };
 
-    const modes = definitions.map(definition => getModel(openApi, definition));
-    modes
+    const models = definitions.map(definition => getModel(openApi, definition));
+    models
         .filter(model => {
             const hasProperties = model.properties.length;
             const hasEnums = model.enums.length;
diff --git a/src/openApi/v2/parser/getModelProperties.ts b/src/openApi/v2/parser/getModelProperties.ts
@@ -1,10 +1,10 @@
 import type { Model } from '../../../client/interfaces/Model';
+import { getPattern } from '../../../utils/getPattern';
 import type { OpenApi } from '../interfaces/OpenApi';
 import type { OpenApiSchema } from '../interfaces/OpenApiSchema';
 import { escapeName } from './escapeName';
 import { getComment } from './getComment';
 import type { getModel } from './getModel';
-import { getPattern } from './getPattern';
 import { getType } from './getType';
 
 // Fix for circular dependency
diff --git a/src/openApi/v2/parser/getOperationParameter.ts b/src/openApi/v2/parser/getOperationParameter.ts
@@ -1,4 +1,5 @@
 import type { OperationParameter } from '../../../client/interfaces/OperationParameter';
+import { getPattern } from '../../../utils/getPattern';
 import type { OpenApi } from '../interfaces/OpenApi';
 import type { OpenApiParameter } from '../interfaces/OpenApiParameter';
 import { extendEnum } from './extendEnum';
@@ -8,7 +9,6 @@ import { getEnumFromDescription } from './getEnumFromDescription';
 import { getModel } from './getModel';
 import { getOperationParameterDefault } from './getOperationParameterDefault';
 import { getOperationParameterName } from './getOperationParameterName';
-import { getPattern } from './getPattern';
 import { getType } from './getType';
 
 export function getOperationParameter(openApi: OpenApi, parameter: OpenApiParameter): OperationParameter {
diff --git a/src/openApi/v2/parser/getOperationResponse.ts b/src/openApi/v2/parser/getOperationResponse.ts
@@ -1,9 +1,9 @@
 import type { OperationResponse } from '../../../client/interfaces/OperationResponse';
+import { getPattern } from '../../../utils/getPattern';
 import type { OpenApi } from '../interfaces/OpenApi';
 import type { OpenApiResponse } from '../interfaces/OpenApiResponse';
 import { getComment } from './getComment';
 import { getModel } from './getModel';
-import { getPattern } from './getPattern';
 import { getType } from './getType';
 
 export function getOperationResponse(openApi: OpenApi, response: OpenApiResponse, responseCode: number): OperationResponse {
diff --git a/src/openApi/v3/parser/getEnum.ts b/src/openApi/v3/parser/getEnum.ts
@@ -1,5 +1,5 @@
 import type { Enum } from '../../../client/interfaces/Enum';
-import { isDefined } from './isDefined';
+import { isDefined } from '../../../utils/isDefined';
 
 export function getEnum(values?: (string | number)[]): Enum[] {
     if (Array.isArray(values)) {
diff --git a/src/openApi/v3/parser/getModel.ts b/src/openApi/v3/parser/getModel.ts
@@ -1,4 +1,5 @@
 import type { Model } from '../../../client/interfaces/Model';
+import { getPattern } from '../../../utils/getPattern';
 import type { OpenApi } from '../interfaces/OpenApi';
 import type { OpenApiSchema } from '../interfaces/OpenApiSchema';
 import { extendEnum } from './extendEnum';
@@ -8,7 +9,6 @@ import { getEnumFromDescription } from './getEnumFromDescription';
 import { getModelComposition } from './getModelComposition';
 import { getModelDefault } from './getModelDefault';
 import { getModelProperties } from './getModelProperties';
-import { getPattern } from './getPattern';
 import { getType } from './getType';
 
 export function getModel(openApi: OpenApi, definition: OpenApiSchema, isDefinition: boolean = false, name: string = ''): Model {
diff --git a/src/openApi/v3/parser/getModelComposition.ts b/src/openApi/v3/parser/getModelComposition.ts
@@ -14,8 +14,8 @@ export function getModelComposition(openApi: OpenApi, definitions: OpenApiSchema
         properties: [],
     };
 
-    const modes = definitions.map(definition => getModel(openApi, definition));
-    modes
+    const models = definitions.map(definition => getModel(openApi, definition));
+    models
         .filter(model => {
             const hasProperties = model.properties.length;
             const hasEnums = model.enums.length;
diff --git a/src/openApi/v3/parser/getModelProperties.ts b/src/openApi/v3/parser/getModelProperties.ts
@@ -1,10 +1,10 @@
 import type { Model } from '../../../client/interfaces/Model';
+import { getPattern } from '../../../utils/getPattern';
 import type { OpenApi } from '../interfaces/OpenApi';
 import type { OpenApiSchema } from '../interfaces/OpenApiSchema';
 import { escapeName } from './escapeName';
 import { getComment } from './getComment';
 import type { getModel } from './getModel';
-import { getPattern } from './getPattern';
 import { getType } from './getType';
 
 // Fix for circular dependency
diff --git a/src/openApi/v3/parser/getOperationParameter.ts b/src/openApi/v3/parser/getOperationParameter.ts
@@ -1,11 +1,11 @@
 import type { OperationParameter } from '../../../client/interfaces/OperationParameter';
+import { getPattern } from '../../../utils/getPattern';
 import type { OpenApi } from '../interfaces/OpenApi';
 import type { OpenApiParameter } from '../interfaces/OpenApiParameter';
 import { getComment } from './getComment';
 import { getModel } from './getModel';
 import { getModelDefault } from './getModelDefault';
 import { getOperationParameterName } from './getOperationParameterName';
-import { getPattern } from './getPattern';
 import { getType } from './getType';
 
 export function getOperationParameter(openApi: OpenApi, parameter: OpenApiParameter): OperationParameter {
diff --git a/src/openApi/v3/parser/getOperationRequestBody.ts b/src/openApi/v3/parser/getOperationRequestBody.ts
@@ -1,10 +1,10 @@
 import type { OperationParameter } from '../../../client/interfaces/OperationParameter';
+import { getPattern } from '../../../utils/getPattern';
 import type { OpenApi } from '../interfaces/OpenApi';
 import type { OpenApiRequestBody } from '../interfaces/OpenApiRequestBody';
 import { getComment } from './getComment';
 import { getContent } from './getContent';
 import { getModel } from './getModel';
-import { getPattern } from './getPattern';
 import { getType } from './getType';
 
 export function getOperationRequestBody(openApi: OpenApi, parameter: OpenApiRequestBody): OperationParameter {
diff --git a/src/openApi/v3/parser/getOperationResponse.ts b/src/openApi/v3/parser/getOperationResponse.ts
@@ -1,10 +1,10 @@
 import type { OperationResponse } from '../../../client/interfaces/OperationResponse';
+import { getPattern } from '../../../utils/getPattern';
 import type { OpenApi } from '../interfaces/OpenApi';
 import type { OpenApiResponse } from '../interfaces/OpenApiResponse';
 import { getComment } from './getComment';
 import { getContent } from './getContent';
 import { getModel } from './getModel';
-import { getPattern } from './getPattern';
 import { getType } from './getType';
 
 export function getOperationResponse(openApi: OpenApi, response: OpenApiResponse, responseCode: number): OperationResponse {
diff --git a/src/openApi/v3/parser/getPattern.spec.ts b/src/openApi/v3/parser/getPattern.spec.ts
diff --git a/src/openApi/v3/parser/getPattern.ts b/src/openApi/v3/parser/getPattern.ts
diff --git a/src/openApi/v3/parser/isDefined.ts b/src/openApi/v3/parser/isDefined.ts
diff --git a/src/utils/getPattern.spec.ts b/src/utils/getPattern.spec.ts
diff --git a/src/utils/getPattern.ts b/src/utils/getPattern.ts
diff --git a/src/utils/isDefined.ts b/src/utils/isDefined.ts
diff --git a/src/utils/isEqual.ts b/src/utils/isEqual.ts
@@ -0,0 +1,38 @@
+export function isEqual(a: any, b: any): boolean {
+    if (a === b) {
+        return true;
+    }
+
+    if (a && b && typeof a === 'object' && typeof b === 'object') {
+        if (Array.isArray(a) && Array.isArray(b)) {
+            if (a.length !== b.length) {
+                return false;
+            }
+            for (let i = 0; i < a.length; i++) {
+                if (!isEqual(a[i], b[i])) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        const keysA = Object.keys(a);
+        const keysB = Object.keys(b);
+        if (keysA.length !== keysB.length) {
+            return false;
+        }
+
+        for (let i = 0; i < keysA.length; i++) {
+            const key = keysA[i];
+            if (!Object.prototype.hasOwnProperty.call(b, key)) {
+                return false;
+            }
+            if (!isEqual(a[key], b[key])) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    return a !== a && b !== b;
+}
