feat: enhance overrideResponse assignment

packages/mock/src/createOverrideVariable.ts

@@ -0,0 +1,24 @@
+import { overrideVarName } from './faker/getters';
+import { MockSchemaObject } from './types';
+
+export function createOverrideVariable(path?: string) {
+  let index = 0;
+
+  if (!path) {
+    return overrideVarName;
+  }
+
+  return (
+    overrideVarName +
+    path
+      ?.replace('#.', '')
+      .split('.')
+      .reduce((acc, key) => {
+        if (key !== '[]') {
+          return acc + `?.['${key}']`;
+        } else {
+          return acc + `?.[index_${index++}]`;
+        }
+      }, '')
+  );
+}

packages/mock/src/faker/getters/object.ts

@@ -128,8 +128,6 @@ export const getMockObject = ({
       })
       .filter(Boolean);
 
-    properyScalars.push(`...${overrideVarName}`);
-
     value += properyScalars.join(', ');
     value +=
       !combine ||

packages/mock/src/faker/getters/scalar.ts

@@ -15,6 +15,7 @@ import {
 import { MockDefinition, MockSchemaObject } from '../../types';
 import { getMockObject } from './object';
 import { DEFAULT_FORMAT_MOCK } from '../constants';
+import { createOverrideVariable } from '../../createOverrideVariable';
 
 export const getMockScalar = ({
   item,
@@ -195,10 +196,10 @@ export const getMockScalar = ({
 
       return {
         value:
-          `Array.from({ length: faker.number.int({ ` +
+          `Array.from({ length: Math.max(${createOverrideVariable(item.path)}?.length ?? 0,  faker.number.int({ ` +
           `min: ${mockOptions?.arrayMin}, ` +
-          `max: ${mockOptions?.arrayMax} }) ` +
-          `}, (_, i) => i + 1).map(() => (${mapValue}))`,
+          `max: ${mockOptions?.arrayMax} })) ` +
+          `}, (_, i) => i + 1).map((_, index_${item.path?.match(/\[\]/g)?.length ?? 0}) => (${mapValue}))`,
         imports: resolvedImports,
         name: item.name,
       };

packages/mock/src/msw/index.ts

@@ -24,6 +24,10 @@ const getMSWDependencies = (locale?: string): GeneratorDependency[] => [
     exports: [{ name: 'faker', values: true }],
     dependency: locale ? `@faker-js/faker/locale/${locale}` : '@faker-js/faker',
   },
+  {
+    exports: [{ name: 'merge', default: true, values: true }],
+    dependency: 'lodash/merge',
+  },
 ];
 
 export const generateMSWImports: GenerateMockImports = ({
@@ -103,9 +107,10 @@ export const ${handlerName} = (${isReturnHttpResponse && !isTextPlain ? `overrid
 
   return {
     implementation: {
-      function: isReturnHttpResponse
-        ? `export const ${functionName} = (${isResponseOverridable ? `overrideResponse: any = {}` : ''}): ${returnType} => (${value})\n\n`
-        : '',
+      function:
+        value && value !== 'undefined'
+          ? `export const ${functionName} = (${isResponseOverridable ? `overrideResponse: any = {}` : ''}): ${returnType} => ${isResponseOverridable ? `merge((${value}), overrideResponse)` : `(${value}) as any`}\n\n`
+          : '',
       handlerName: handlerName,
       handler: handlerImplementation,
     },