fix(mocks): array enums handled correctly

anymaniax · Apr 2, 2022 · 0656ae5 · 0656ae5 · vercel · Apr 2, 2022
1 parent df688ea
commit 0656ae5
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 12 deletions.
diff --git a/src/core/generators/mocks.ts b/src/core/generators/mocks.ts
@@ -119,7 +119,7 @@ export const getResponsesMockDefinition = ({
 }) => {
   return asyncReduce(
     response.types.success,
-    async (acc, { value: definition, originalSchema }) => {
+    async (acc, { value: definition, originalSchema, imports }) => {
       if (!definition || generalJSTypesWithArray.includes(definition)) {
         const value = getMockScalarJsTypes(definition);
 
@@ -149,6 +149,7 @@ export const getResponsesMockDefinition = ({
               }
             : {}),
         },
+        imports,
         mockOptions: mockOptionsWithoutFunc,
         operationId,
         tags,

diff --git a/src/core/getters/combine.mock.ts b/src/core/getters/combine.mock.ts
@@ -13,6 +13,7 @@ export const combineSchemasMock = async ({
   tags,
   combine,
   context,
+  imports,
 }: {
   item: SchemaObject & { name: string; path?: string; specKey?: string };
   items: (SchemaObject | ReferenceObject)[];
@@ -22,8 +23,9 @@ export const combineSchemasMock = async ({
   tags: string[];
   combine?: { properties: string[] };
   context: ContextSpecs;
+  imports: GeneratorImport[];
 }) => {
-  let imports: GeneratorImport[] = [];
+  let combineImports: GeneratorImport[] = [];
   let properties: string[] = [...(combine?.properties || [])];
   const value = await asyncReduce(
     items,
@@ -44,9 +46,10 @@ export const combineSchemasMock = async ({
         operationId,
         tags,
         context,
+        imports,
       });
 
-      imports = [...imports, ...resolvedValue.imports];
+      combineImports = [...combineImports, ...resolvedValue.imports];
       properties = [...properties, ...(resolvedValue.properties || [])];
 
       if (!index && !combine) {
@@ -77,7 +80,7 @@ export const combineSchemasMock = async ({
 
   return {
     value,
-    imports,
+    imports: combineImports,
     name: item.name,
     properties,
   };

diff --git a/src/core/getters/object.mock.ts b/src/core/getters/object.mock.ts
@@ -16,13 +16,15 @@ export const getMockObject = async ({
   tags,
   combine,
   context,
+  imports,
 }: {
   item: SchemaObject & { name: string; path?: string; specKey?: string };
   operationId: string;
   mockOptions?: MockOptions;
   tags: string[];
   combine?: { properties: string[] };
   context: ContextSpecs;
+  imports: GeneratorImport[];
 }): Promise<MockDefinition> => {
   if (isReference(item)) {
     return resolveMockValue({
@@ -36,6 +38,7 @@ export const getMockObject = async ({
       operationId,
       tags,
       context,
+      imports,
     });
   }
 
@@ -83,6 +86,7 @@ export const getMockObject = async ({
               operationId,
               tags,
               context,
+              imports,
             });
 
             imports = [...imports, ...resolvedValue.imports];
@@ -125,6 +129,7 @@ export const getMockObject = async ({
       operationId,
       tags,
       context,
+      imports,
     });
 
     return {

diff --git a/src/core/getters/scalar.mock.ts b/src/core/getters/scalar.mock.ts
@@ -14,6 +14,7 @@ import { getMockObject } from './object.mock';
 
 export const getMockScalar = async ({
   item,
+  imports,
   mockOptions,
   operationId,
   tags,
@@ -26,6 +27,7 @@ export const getMockScalar = async ({
     isRef?: boolean;
     specKey?: string;
   };
+  imports: GeneratorImport[];
   mockOptions?: MockOptions;
   operationId: string;
   isRef?: boolean;
@@ -97,7 +99,12 @@ export const getMockScalar = async ({
         return { value: [], imports: [], name: item.name };
       }
 
-      const { value, enums, imports, name } = await resolveMockValue({
+      const {
+        value,
+        enums,
+        imports: resolvedImports,
+        name,
+      } = await resolveMockValue({
         schema: {
           ...item.items,
           name: item.name,
@@ -109,25 +116,32 @@ export const getMockScalar = async ({
         operationId,
         tags,
         context,
+        imports,
       });
 
       if (enums) {
+        const enumImp = imports.find(
+          (imp) => name.replace('[]', '') === imp.name,
+        );
+        const enumValue = enumImp?.name || name;
         return {
           value: `[...Array(faker.datatype.number({min:1, max: ${enums.length}}))].reduce(({values, enums}) => {
-            const newValue = enums[faker.datatype.number({min:1, max: enums.length})];
+            const newValue = enums[faker.datatype.number({min:0, max: enums.length - 1})];
             return {
               values: [...values, newValue],
-              enums: enums.filter((v: ${name}) => newValue !== v)
+              enums: enums.filter((v: ${enumValue}) => newValue !== v)
             }
-          },{ values: [], enums: Object.values(${name})})`,
-          imports,
+          },{ values: [], enums: Object.values(${enumValue})}).values`,
+          imports: enumImp
+            ? [...resolvedImports, { ...enumImp, values: true }]
+            : resolvedImports,
           name: item.name,
         };
       }
 
       return {
         value: `[...Array(faker.datatype.number({min: 1, max: 10}))].map(() => (${value}))`,
-        imports,
+        imports: resolvedImports,
         name: item.name,
       };
     }
@@ -165,6 +179,7 @@ export const getMockScalar = async ({
         tags,
         combine,
         context,
+        imports,
       });
     }
   }

diff --git a/src/core/resolvers/value.mock.ts b/src/core/resolvers/value.mock.ts
@@ -1,5 +1,6 @@
 import { SchemaObject } from 'openapi3-ts';
 import { ContextSpecs, MockOptions } from '../../types';
+import { GeneratorImport } from '../../types/generator';
 import { MockDefinition } from '../../types/mocks';
 import { isReference } from '../../utils/is';
 import { getRefInfo } from '../getters/ref';
@@ -49,13 +50,15 @@ export const resolveMockValue = async ({
   tags,
   combine,
   context,
+  imports,
 }: {
   schema: SchemaObject & { name: string; path?: string; specKey?: string };
   operationId: string;
   mockOptions?: MockOptions;
   tags: string[];
   combine?: { properties: string[] };
   context: ContextSpecs;
+  imports: GeneratorImport[];
 }): Promise<MockDefinition> => {
   if (isReference(schema)) {
     const { name, specKey } = await getRefInfo(schema.$ref, {
@@ -78,6 +81,7 @@ export const resolveMockValue = async ({
       tags,
       combine,
       context,
+      imports,
     });
   }
 
@@ -88,5 +92,6 @@ export const resolveMockValue = async ({
     tags,
     combine,
     context,
+    imports,
   });
 };
diff --git a/src/core/writers/singleMode.ts b/src/core/writers/singleMode.ts
@@ -46,7 +46,16 @@ export const writeSingleMode = async ({
     data += generateClientImports(
       output.client,
       implementation,
-      schemasPath ? [{ exports: imports, dependency: schemasPath }] : [],
+      schemasPath
+        ? [
+            {
+              exports: imports.filter(
+                (imp) => !importsMSW.some((impMSW) => imp.name === impMSW.name),
+              ),
+              dependency: schemasPath,
+            },
+          ]
+        : [],
       specsName,
       !!output.schemas,
       isSyntheticDefaultImportsAllowed,

diff --git a/src/core/writers/tagsMode.ts b/src/core/writers/tagsMode.ts
@@ -51,7 +51,14 @@ export const writeTagsMode = async ({
         data += generateClientImports(
           output.client,
           implementation,
-          [{ exports: imports, dependency: schemasPathRelative }],
+          [
+            {
+              exports: imports.filter(
+                (imp) => !importsMSW.some((impMSW) => imp.name === impMSW.name),
+              ),
+              dependency: schemasPathRelative,
+            },
+          ],
           specsName,
           !!output.schemas,
           isSyntheticDefaultImportsAllowed,