orval 6.20.0 → 6.21.0

package/dist/bin/orval.js

@@ -29,6 +29,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 // ../../node_modules/lodash.omit/index.js
 var require_lodash = __commonJS({
   "../../node_modules/lodash.omit/index.js"(exports2, module2) {
+    "use strict";
     var LARGE_ARRAY_SIZE = 200;
     var HASH_UNDEFINED = "__lodash_hash_undefined__";
     var INFINITY = 1 / 0;
@@ -3252,13 +3253,13 @@ var import_lodash = __toESM(require_lodash());
 
 // src/api.ts
 var import_core2 = require("@orval/core");
-var import_msw2 = require("@orval/msw");
+var import_mock = require("@orval/mock");
 
 // src/client.ts
 var import_angular = __toESM(require("@orval/angular"));
 var import_axios = __toESM(require("@orval/axios"));
 var import_core = require("@orval/core");
-var import_msw = require("@orval/msw");
+var mock = __toESM(require("@orval/mock"));
 var import_query = __toESM(require("@orval/query"));
 var import_swr = __toESM(require("@orval/swr"));
 var import_zod = __toESM(require("@orval/zod"));
@@ -3326,7 +3327,7 @@ var generateClientHeader = ({
       provideIn,
       hasAwaitedType
     }) : "",
-    implementationMSW: `export const ${titles.implementationMSW} = () => [
+    implementationMock: `export const ${titles.implementationMock} = () => [
 `
   };
 };
@@ -3341,7 +3342,7 @@ var generateClientFooter = ({
   if (!footer) {
     return {
       implementation: "",
-      implementationMSW: `]
+      implementationMock: `]
 `
     };
   }
@@ -3372,7 +3373,7 @@ var generateClientFooter = ({
   }
   return {
     implementation,
-    implementationMSW: `]
+    implementationMock: `]
 `
   };
 };
@@ -3385,22 +3386,22 @@ var generateClientTitle = ({
   if (!generatorTitle) {
     return {
       implementation: "",
-      implementationMSW: `get${(0, import_core.pascal)(title)}MSW`
+      implementationMock: `get${(0, import_core.pascal)(title)}Mock`
     };
   }
   if (customTitleFunc) {
     const customTitle = customTitleFunc(title);
     return {
       implementation: generatorTitle(customTitle),
-      implementationMSW: `get${(0, import_core.pascal)(customTitle)}MSW`
+      implementationMock: `get${(0, import_core.pascal)(customTitle)}Mock`
     };
   }
   return {
     implementation: generatorTitle(title),
-    implementationMSW: `get${(0, import_core.pascal)(title)}MSW`
+    implementationMock: `get${(0, import_core.pascal)(title)}Mock`
   };
 };
-var generateMock = (verbOption, options) => {
+var generateMock2 = (verbOption, options) => {
   if (!options.mock) {
     return {
       implementation: {
@@ -3413,7 +3414,7 @@ var generateMock = (verbOption, options) => {
   if ((0, import_core.isFunction)(options.mock)) {
     return options.mock(verbOption, options);
   }
-  return (0, import_msw.generateMSW)(verbOption, options);
+  return mock.generateMock(verbOption, options);
 };
 var generateOperations = (outputClient = DEFAULT_CLIENT, verbsOptions, options) => {
   return (0, import_core.asyncReduce)(
@@ -3421,15 +3422,15 @@ var generateOperations = (outputClient = DEFAULT_CLIENT, verbsOptions, options)
     async (acc, verbOption) => {
       const { client: generatorClient } = getGeneratorClient(outputClient);
       const client = await generatorClient(verbOption, options, outputClient);
-      const msw = generateMock(verbOption, options);
+      const generatedMock = generateMock2(verbOption, options);
       if (!client.implementation) {
         return acc;
       }
       acc[verbOption.operationId] = {
         implementation: verbOption.doc + client.implementation,
         imports: client.imports,
-        implementationMSW: msw.implementation,
-        importsMSW: msw.imports,
+        implementationMock: generatedMock.implementation,
+        importsMock: generatedMock.imports,
         tags: verbOption.tags,
         mutator: verbOption.mutator,
         clientMutators: client.mutators,
@@ -3515,7 +3516,7 @@ var getApiBuilder = async ({
           pathRoute,
           override: output.override,
           context: resolvedContext,
-          mock: !!output.mock,
+          mock: output.mock,
           output: output.target
         }
       );
@@ -3535,7 +3536,7 @@ var getApiBuilder = async ({
     header: generateClientHeader,
     footer: generateClientFooter,
     imports: generateClientImports,
-    importsMock: import_msw2.generateMSWImports
+    importsMock: import_mock.generateMockImports
   };
 };
 
@@ -3755,13 +3756,14 @@ var importSpecs = async (workspace, options) => {
 
 // src/utils/options.ts
 var import_core7 = require("@orval/core");
+var import_mock2 = require("@orval/mock");
 var import_chalk2 = __toESM(require("chalk"));
 
 // package.json
 var package_default = {
   name: "orval",
   description: "A swagger client generator for typescript",
-  version: "6.20.0",
+  version: "6.21.0",
   license: "MIT",
   files: [
     "dist"
@@ -3813,13 +3815,13 @@ var package_default = {
   },
   dependencies: {
     "@apidevtools/swagger-parser": "^10.1.0",
-    "@orval/angular": "6.20.0",
-    "@orval/axios": "6.20.0",
-    "@orval/core": "6.20.0",
-    "@orval/msw": "6.20.0",
-    "@orval/query": "6.20.0",
-    "@orval/swr": "6.20.0",
-    "@orval/zod": "6.20.0",
+    "@orval/angular": "6.21.0",
+    "@orval/axios": "6.21.0",
+    "@orval/core": "6.21.0",
+    "@orval/mock": "6.21.0",
+    "@orval/query": "6.21.0",
+    "@orval/swr": "6.21.0",
+    "@orval/zod": "6.21.0",
     ajv: "^8.12.0",
     cac: "^6.7.14",
     chalk: "^4.1.2",
@@ -3827,7 +3829,7 @@ var package_default = {
     enquirer: "^2.4.1",
     execa: "^5.1.1",
     "find-up": "5.0.0",
-    "fs-extra": "^10.1.0",
+    "fs-extra": "^11.1.1",
     "lodash.uniq": "^4.5.0",
     "openapi-types": "^12.1.3",
     "openapi3-ts": "^3.2.0",
@@ -4045,7 +4047,7 @@ var loadTsconfig = async (tsconfig, workspace = process.cwd()) => {
 
 // src/utils/options.ts
 var normalizeOptions = async (optionsExport, workspace = process.cwd(), globalOptions = {}) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M, _N, _O, _P, _Q, _R, _S, _T, _U, _V, _W, _X, _Y, _Z, __, _$, _aa, _ba, _ca, _da, _ea, _fa, _ga, _ha, _ia, _ja;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M, _N, _O, _P, _Q, _R, _S, _T, _U, _V, _W, _X, _Y, _Z, __, _$, _aa, _ba, _ca, _da, _ea, _fa, _ga, _ha, _ia, _ja, _ka;
   const options = await ((0, import_core7.isFunction)(optionsExport) ? optionsExport() : optionsExport);
   if (!options.input) {
     (0, import_core7.createLogger)().error(import_chalk2.default.red(`Config require an input`));
@@ -4061,7 +4063,7 @@ var normalizeOptions = async (optionsExport, workspace = process.cwd(), globalOp
     outputOptions.workspace || "",
     workspace
   );
-  const { clean, prettier, client, mode, mock, tslint } = globalOptions;
+  const { clean, prettier, client, mode, tslint } = globalOptions;
   const tsconfig = await loadTsconfig(
     outputOptions.tsconfig || globalOptions.tsconfig,
     workspace
@@ -4070,20 +4072,31 @@ var normalizeOptions = async (optionsExport, workspace = process.cwd(), globalOp
     outputOptions.packageJson || globalOptions.packageJson,
     workspace
   );
+  let mock2 = (_a = outputOptions.mock) != null ? _a : globalOptions.mock;
+  if (typeof mock2 === "boolean" && mock2) {
+    mock2 = import_mock2.DEFAULT_MOCK_OPTIONS;
+  } else if (!mock2) {
+    mock2 = void 0;
+  } else {
+    mock2 = {
+      ...import_mock2.DEFAULT_MOCK_OPTIONS,
+      ...mock2
+    };
+  }
   const normalizedOptions = {
     input: {
       target: globalOptions.input ? normalizePathOrUrl(globalOptions.input, process.cwd()) : normalizePathOrUrl(inputOptions.target, workspace),
       validation: inputOptions.validation || false,
       override: {
         transformer: normalizePath(
-          (_a = inputOptions.override) == null ? void 0 : _a.transformer,
+          (_b = inputOptions.override) == null ? void 0 : _b.transformer,
           workspace
         )
       },
-      converterOptions: (_b = inputOptions.converterOptions) != null ? _b : {},
+      converterOptions: (_c = inputOptions.converterOptions) != null ? _c : {},
       parserOptions: (0, import_core7.mergeDeep)(
         parserDefaultOptions,
-        (_c = inputOptions.parserOptions) != null ? _c : {}
+        (_d = inputOptions.parserOptions) != null ? _d : {}
       ),
       filters: inputOptions.filters
     },
@@ -4091,82 +4104,83 @@ var normalizeOptions = async (optionsExport, workspace = process.cwd(), globalOp
       target: globalOptions.output ? normalizePath(globalOptions.output, process.cwd()) : normalizePath(outputOptions.target, outputWorkspace),
       schemas: normalizePath(outputOptions.schemas, outputWorkspace),
       workspace: outputOptions.workspace ? outputWorkspace : void 0,
-      client: (_e = (_d = outputOptions.client) != null ? _d : client) != null ? _e : import_core7.OutputClient.AXIOS_FUNCTIONS,
-      mode: normalizeOutputMode((_f = outputOptions.mode) != null ? _f : mode),
-      mock: (_h = (_g = outputOptions.mock) != null ? _g : mock) != null ? _h : false,
-      clean: (_j = (_i = outputOptions.clean) != null ? _i : clean) != null ? _j : false,
-      prettier: (_l = (_k = outputOptions.prettier) != null ? _k : prettier) != null ? _l : false,
-      tslint: (_n = (_m = outputOptions.tslint) != null ? _m : tslint) != null ? _n : false,
+      client: (_f = (_e = outputOptions.client) != null ? _e : client) != null ? _f : import_core7.OutputClient.AXIOS_FUNCTIONS,
+      mode: normalizeOutputMode((_g = outputOptions.mode) != null ? _g : mode),
+      mock: mock2,
+      clean: (_i = (_h = outputOptions.clean) != null ? _h : clean) != null ? _i : false,
+      prettier: (_k = (_j = outputOptions.prettier) != null ? _j : prettier) != null ? _k : false,
+      tslint: (_m = (_l = outputOptions.tslint) != null ? _l : tslint) != null ? _m : false,
       tsconfig,
       packageJson,
-      headers: (_o = outputOptions.headers) != null ? _o : false,
-      indexFiles: (_p = outputOptions.indexFiles) != null ? _p : true,
+      headers: (_n = outputOptions.headers) != null ? _n : false,
+      indexFiles: (_o = outputOptions.indexFiles) != null ? _o : true,
       baseUrl: outputOptions.baseUrl,
       override: {
         ...outputOptions.override,
         mock: {
-          arrayMin: (_s = (_r = (_q = outputOptions.override) == null ? void 0 : _q.mock) == null ? void 0 : _r.arrayMin) != null ? _s : 1,
-          arrayMax: (_v = (_u = (_t = outputOptions.override) == null ? void 0 : _t.mock) == null ? void 0 : _u.arrayMax) != null ? _v : 10,
-          ...(_x = (_w = outputOptions.override) == null ? void 0 : _w.mock) != null ? _x : {}
+          arrayMin: (_r = (_q = (_p = outputOptions.override) == null ? void 0 : _p.mock) == null ? void 0 : _q.arrayMin) != null ? _r : 1,
+          arrayMax: (_u = (_t = (_s = outputOptions.override) == null ? void 0 : _s.mock) == null ? void 0 : _t.arrayMax) != null ? _u : 10,
+          ...(_w = (_v = outputOptions.override) == null ? void 0 : _v.mock) != null ? _w : {}
         },
         operations: normalizeOperationsAndTags(
-          (_z = (_y = outputOptions.override) == null ? void 0 : _y.operations) != null ? _z : {},
+          (_y = (_x = outputOptions.override) == null ? void 0 : _x.operations) != null ? _y : {},
           outputWorkspace
         ),
         tags: normalizeOperationsAndTags(
-          (_B = (_A = outputOptions.override) == null ? void 0 : _A.tags) != null ? _B : {},
+          (_A = (_z = outputOptions.override) == null ? void 0 : _z.tags) != null ? _A : {},
           outputWorkspace
         ),
         mutator: normalizeMutator(
           outputWorkspace,
-          (_C = outputOptions.override) == null ? void 0 : _C.mutator
+          (_B = outputOptions.override) == null ? void 0 : _B.mutator
         ),
-        formData: (_G = !(0, import_core7.isBoolean)((_D = outputOptions.override) == null ? void 0 : _D.formData) ? normalizeMutator(
+        formData: (_F = !(0, import_core7.isBoolean)((_C = outputOptions.override) == null ? void 0 : _C.formData) ? normalizeMutator(
           outputWorkspace,
-          (_E = outputOptions.override) == null ? void 0 : _E.formData
-        ) : (_F = outputOptions.override) == null ? void 0 : _F.formData) != null ? _G : true,
-        formUrlEncoded: (_K = !(0, import_core7.isBoolean)((_H = outputOptions.override) == null ? void 0 : _H.formUrlEncoded) ? normalizeMutator(
+          (_D = outputOptions.override) == null ? void 0 : _D.formData
+        ) : (_E = outputOptions.override) == null ? void 0 : _E.formData) != null ? _F : true,
+        formUrlEncoded: (_J = !(0, import_core7.isBoolean)((_G = outputOptions.override) == null ? void 0 : _G.formUrlEncoded) ? normalizeMutator(
           outputWorkspace,
-          (_I = outputOptions.override) == null ? void 0 : _I.formUrlEncoded
-        ) : (_J = outputOptions.override) == null ? void 0 : _J.formUrlEncoded) != null ? _K : true,
+          (_H = outputOptions.override) == null ? void 0 : _H.formUrlEncoded
+        ) : (_I = outputOptions.override) == null ? void 0 : _I.formUrlEncoded) != null ? _J : true,
         paramsSerializer: normalizeMutator(
           outputWorkspace,
-          (_L = outputOptions.override) == null ? void 0 : _L.paramsSerializer
+          (_K = outputOptions.override) == null ? void 0 : _K.paramsSerializer
         ),
-        header: ((_M = outputOptions.override) == null ? void 0 : _M.header) === false ? false : (0, import_core7.isFunction)((_N = outputOptions.override) == null ? void 0 : _N.header) ? (_O = outputOptions.override) == null ? void 0 : _O.header : getDefaultFilesHeader,
-        requestOptions: (_Q = (_P = outputOptions.override) == null ? void 0 : _P.requestOptions) != null ? _Q : true,
+        header: ((_L = outputOptions.override) == null ? void 0 : _L.header) === false ? false : (0, import_core7.isFunction)((_M = outputOptions.override) == null ? void 0 : _M.header) ? (_N = outputOptions.override) == null ? void 0 : _N.header : getDefaultFilesHeader,
+        requestOptions: (_P = (_O = outputOptions.override) == null ? void 0 : _O.requestOptions) != null ? _P : true,
         components: {
           schemas: {
             suffix: import_core7.RefComponentSuffix.schemas,
-            ...(_T = (_S = (_R = outputOptions.override) == null ? void 0 : _R.components) == null ? void 0 : _S.schemas) != null ? _T : {}
+            ...(_S = (_R = (_Q = outputOptions.override) == null ? void 0 : _Q.components) == null ? void 0 : _R.schemas) != null ? _S : {}
           },
           responses: {
             suffix: import_core7.RefComponentSuffix.responses,
-            ...(_W = (_V = (_U = outputOptions.override) == null ? void 0 : _U.components) == null ? void 0 : _V.responses) != null ? _W : {}
+            ...(_V = (_U = (_T = outputOptions.override) == null ? void 0 : _T.components) == null ? void 0 : _U.responses) != null ? _V : {}
           },
           parameters: {
             suffix: import_core7.RefComponentSuffix.parameters,
-            ...(_Z = (_Y = (_X = outputOptions.override) == null ? void 0 : _X.components) == null ? void 0 : _Y.parameters) != null ? _Z : {}
+            ...(_Y = (_X = (_W = outputOptions.override) == null ? void 0 : _W.components) == null ? void 0 : _X.parameters) != null ? _Y : {}
           },
           requestBodies: {
             suffix: import_core7.RefComponentSuffix.requestBodies,
-            ...(_aa = (_$ = (__ = outputOptions.override) == null ? void 0 : __.components) == null ? void 0 : _$.requestBodies) != null ? _aa : {}
+            ...(_$ = (__ = (_Z = outputOptions.override) == null ? void 0 : _Z.components) == null ? void 0 : __.requestBodies) != null ? _$ : {}
           }
         },
         query: {
           useQuery: true,
           useMutation: true,
           signal: true,
-          ...normalizeQueryOptions((_ba = outputOptions.override) == null ? void 0 : _ba.query, workspace)
+          ...normalizeQueryOptions((_aa = outputOptions.override) == null ? void 0 : _aa.query, workspace)
         },
         swr: {
-          ...(_da = (_ca = outputOptions.override) == null ? void 0 : _ca.swr) != null ? _da : {}
+          ...(_ca = (_ba = outputOptions.override) == null ? void 0 : _ba.swr) != null ? _ca : {}
         },
         angular: {
-          provideIn: (_ga = (_fa = (_ea = outputOptions.override) == null ? void 0 : _ea.angular) == null ? void 0 : _fa.provideIn) != null ? _ga : "root"
+          provideIn: (_fa = (_ea = (_da = outputOptions.override) == null ? void 0 : _da.angular) == null ? void 0 : _ea.provideIn) != null ? _fa : "root"
         },
-        useDates: ((_ha = outputOptions.override) == null ? void 0 : _ha.useDates) || false,
-        useDeprecatedOperations: (_ja = (_ia = outputOptions.override) == null ? void 0 : _ia.useDeprecatedOperations) != null ? _ja : true
+        useDates: ((_ga = outputOptions.override) == null ? void 0 : _ga.useDates) || false,
+        useDeprecatedOperations: (_ia = (_ha = outputOptions.override) == null ? void 0 : _ha.useDeprecatedOperations) != null ? _ia : true,
+        useNativeEnums: (_ka = (_ja = outputOptions.override) == null ? void 0 : _ja.useNativeEnums) != null ? _ka : false
       }
     },
     hooks: options.hooks ? normalizeHooks(options.hooks) : {}
@@ -4445,7 +4459,9 @@ var writeSpecs = async (builder, workspace, options, projectName) => {
   }
   if (output.workspace) {
     const workspacePath = output.workspace;
-    let imports = implementationPaths.filter((path) => !path.endsWith(".msw.ts")).map(
+    let imports = implementationPaths.filter(
+      (path) => !output.mock || !path.endsWith(`.${(0, import_core10.getMockFileExtensionByTypeName)(output.mock)}.ts`)
+    ).map(
       (path) => import_core10.upath.relativeSafe(
         workspacePath,
         (0, import_core10.getFileInfo)(path).pathWithoutExtension

package/dist/index.js

@@ -33,6 +33,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // ../../node_modules/lodash.omit/index.js
 var require_lodash = __commonJS({
   "../../node_modules/lodash.omit/index.js"(exports, module2) {
+    "use strict";
     var LARGE_ARRAY_SIZE = 200;
     var HASH_UNDEFINED = "__lodash_hash_undefined__";
     var INFINITY = 1 / 0;
@@ -3263,13 +3264,13 @@ var import_lodash = __toESM(require_lodash());
 
 // src/api.ts
 var import_core2 = require("@orval/core");
-var import_msw2 = require("@orval/msw");
+var import_mock = require("@orval/mock");
 
 // src/client.ts
 var import_angular = __toESM(require("@orval/angular"));
 var import_axios = __toESM(require("@orval/axios"));
 var import_core = require("@orval/core");
-var import_msw = require("@orval/msw");
+var mock = __toESM(require("@orval/mock"));
 var import_query = __toESM(require("@orval/query"));
 var import_swr = __toESM(require("@orval/swr"));
 var import_zod = __toESM(require("@orval/zod"));
@@ -3337,7 +3338,7 @@ var generateClientHeader = ({
       provideIn,
       hasAwaitedType
     }) : "",
-    implementationMSW: `export const ${titles.implementationMSW} = () => [
+    implementationMock: `export const ${titles.implementationMock} = () => [
 `
   };
 };
@@ -3352,7 +3353,7 @@ var generateClientFooter = ({
   if (!footer) {
     return {
       implementation: "",
-      implementationMSW: `]
+      implementationMock: `]
 `
     };
   }
@@ -3383,7 +3384,7 @@ var generateClientFooter = ({
   }
   return {
     implementation,
-    implementationMSW: `]
+    implementationMock: `]
 `
   };
 };
@@ -3396,22 +3397,22 @@ var generateClientTitle = ({
   if (!generatorTitle) {
     return {
       implementation: "",
-      implementationMSW: `get${(0, import_core.pascal)(title)}MSW`
+      implementationMock: `get${(0, import_core.pascal)(title)}Mock`
     };
   }
   if (customTitleFunc) {
     const customTitle = customTitleFunc(title);
     return {
       implementation: generatorTitle(customTitle),
-      implementationMSW: `get${(0, import_core.pascal)(customTitle)}MSW`
+      implementationMock: `get${(0, import_core.pascal)(customTitle)}Mock`
     };
   }
   return {
     implementation: generatorTitle(title),
-    implementationMSW: `get${(0, import_core.pascal)(title)}MSW`
+    implementationMock: `get${(0, import_core.pascal)(title)}Mock`
   };
 };
-var generateMock = (verbOption, options) => {
+var generateMock2 = (verbOption, options) => {
   if (!options.mock) {
     return {
       implementation: {
@@ -3424,7 +3425,7 @@ var generateMock = (verbOption, options) => {
   if ((0, import_core.isFunction)(options.mock)) {
     return options.mock(verbOption, options);
   }
-  return (0, import_msw.generateMSW)(verbOption, options);
+  return mock.generateMock(verbOption, options);
 };
 var generateOperations = (outputClient = DEFAULT_CLIENT, verbsOptions, options) => {
   return (0, import_core.asyncReduce)(
@@ -3432,15 +3433,15 @@ var generateOperations = (outputClient = DEFAULT_CLIENT, verbsOptions, options)
     async (acc, verbOption) => {
       const { client: generatorClient } = getGeneratorClient(outputClient);
       const client = await generatorClient(verbOption, options, outputClient);
-      const msw = generateMock(verbOption, options);
+      const generatedMock = generateMock2(verbOption, options);
       if (!client.implementation) {
         return acc;
       }
       acc[verbOption.operationId] = {
         implementation: verbOption.doc + client.implementation,
         imports: client.imports,
-        implementationMSW: msw.implementation,
-        importsMSW: msw.imports,
+        implementationMock: generatedMock.implementation,
+        importsMock: generatedMock.imports,
         tags: verbOption.tags,
         mutator: verbOption.mutator,
         clientMutators: client.mutators,
@@ -3526,7 +3527,7 @@ var getApiBuilder = async ({
           pathRoute,
           override: output.override,
           context: resolvedContext,
-          mock: !!output.mock,
+          mock: output.mock,
           output: output.target
         }
       );
@@ -3546,7 +3547,7 @@ var getApiBuilder = async ({
     header: generateClientHeader,
     footer: generateClientFooter,
     imports: generateClientImports,
-    importsMock: import_msw2.generateMSWImports
+    importsMock: import_mock.generateMockImports
   };
 };
 
@@ -3766,13 +3767,14 @@ var importSpecs = async (workspace, options) => {
 
 // src/utils/options.ts
 var import_core7 = require("@orval/core");
+var import_mock2 = require("@orval/mock");
 var import_chalk2 = __toESM(require("chalk"));
 
 // package.json
 var package_default = {
   name: "orval",
   description: "A swagger client generator for typescript",
-  version: "6.20.0",
+  version: "6.21.0",
   license: "MIT",
   files: [
     "dist"
@@ -3824,13 +3826,13 @@ var package_default = {
   },
   dependencies: {
     "@apidevtools/swagger-parser": "^10.1.0",
-    "@orval/angular": "6.20.0",
-    "@orval/axios": "6.20.0",
-    "@orval/core": "6.20.0",
-    "@orval/msw": "6.20.0",
-    "@orval/query": "6.20.0",
-    "@orval/swr": "6.20.0",
-    "@orval/zod": "6.20.0",
+    "@orval/angular": "6.21.0",
+    "@orval/axios": "6.21.0",
+    "@orval/core": "6.21.0",
+    "@orval/mock": "6.21.0",
+    "@orval/query": "6.21.0",
+    "@orval/swr": "6.21.0",
+    "@orval/zod": "6.21.0",
     ajv: "^8.12.0",
     cac: "^6.7.14",
     chalk: "^4.1.2",
@@ -3838,7 +3840,7 @@ var package_default = {
     enquirer: "^2.4.1",
     execa: "^5.1.1",
     "find-up": "5.0.0",
-    "fs-extra": "^10.1.0",
+    "fs-extra": "^11.1.1",
     "lodash.uniq": "^4.5.0",
     "openapi-types": "^12.1.3",
     "openapi3-ts": "^3.2.0",
@@ -4059,7 +4061,7 @@ function defineConfig(options) {
   return options;
 }
 var normalizeOptions = async (optionsExport, workspace = process.cwd(), globalOptions = {}) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M, _N, _O, _P, _Q, _R, _S, _T, _U, _V, _W, _X, _Y, _Z, __, _$, _aa, _ba, _ca, _da, _ea, _fa, _ga, _ha, _ia, _ja;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M, _N, _O, _P, _Q, _R, _S, _T, _U, _V, _W, _X, _Y, _Z, __, _$, _aa, _ba, _ca, _da, _ea, _fa, _ga, _ha, _ia, _ja, _ka;
   const options = await ((0, import_core7.isFunction)(optionsExport) ? optionsExport() : optionsExport);
   if (!options.input) {
     (0, import_core7.createLogger)().error(import_chalk2.default.red(`Config require an input`));
@@ -4075,7 +4077,7 @@ var normalizeOptions = async (optionsExport, workspace = process.cwd(), globalOp
     outputOptions.workspace || "",
     workspace
   );
-  const { clean, prettier, client, mode, mock, tslint } = globalOptions;
+  const { clean, prettier, client, mode, tslint } = globalOptions;
   const tsconfig = await loadTsconfig(
     outputOptions.tsconfig || globalOptions.tsconfig,
     workspace
@@ -4084,20 +4086,31 @@ var normalizeOptions = async (optionsExport, workspace = process.cwd(), globalOp
     outputOptions.packageJson || globalOptions.packageJson,
     workspace
   );
+  let mock2 = (_a = outputOptions.mock) != null ? _a : globalOptions.mock;
+  if (typeof mock2 === "boolean" && mock2) {
+    mock2 = import_mock2.DEFAULT_MOCK_OPTIONS;
+  } else if (!mock2) {
+    mock2 = void 0;
+  } else {
+    mock2 = {
+      ...import_mock2.DEFAULT_MOCK_OPTIONS,
+      ...mock2
+    };
+  }
   const normalizedOptions = {
     input: {
       target: globalOptions.input ? normalizePathOrUrl(globalOptions.input, process.cwd()) : normalizePathOrUrl(inputOptions.target, workspace),
       validation: inputOptions.validation || false,
       override: {
         transformer: normalizePath(
-          (_a = inputOptions.override) == null ? void 0 : _a.transformer,
+          (_b = inputOptions.override) == null ? void 0 : _b.transformer,
           workspace
         )
       },
-      converterOptions: (_b = inputOptions.converterOptions) != null ? _b : {},
+      converterOptions: (_c = inputOptions.converterOptions) != null ? _c : {},
       parserOptions: (0, import_core7.mergeDeep)(
         parserDefaultOptions,
-        (_c = inputOptions.parserOptions) != null ? _c : {}
+        (_d = inputOptions.parserOptions) != null ? _d : {}
       ),
       filters: inputOptions.filters
     },
@@ -4105,82 +4118,83 @@ var normalizeOptions = async (optionsExport, workspace = process.cwd(), globalOp
       target: globalOptions.output ? normalizePath(globalOptions.output, process.cwd()) : normalizePath(outputOptions.target, outputWorkspace),
       schemas: normalizePath(outputOptions.schemas, outputWorkspace),
       workspace: outputOptions.workspace ? outputWorkspace : void 0,
-      client: (_e = (_d = outputOptions.client) != null ? _d : client) != null ? _e : import_core7.OutputClient.AXIOS_FUNCTIONS,
-      mode: normalizeOutputMode((_f = outputOptions.mode) != null ? _f : mode),
-      mock: (_h = (_g = outputOptions.mock) != null ? _g : mock) != null ? _h : false,
-      clean: (_j = (_i = outputOptions.clean) != null ? _i : clean) != null ? _j : false,
-      prettier: (_l = (_k = outputOptions.prettier) != null ? _k : prettier) != null ? _l : false,
-      tslint: (_n = (_m = outputOptions.tslint) != null ? _m : tslint) != null ? _n : false,
+      client: (_f = (_e = outputOptions.client) != null ? _e : client) != null ? _f : import_core7.OutputClient.AXIOS_FUNCTIONS,
+      mode: normalizeOutputMode((_g = outputOptions.mode) != null ? _g : mode),
+      mock: mock2,
+      clean: (_i = (_h = outputOptions.clean) != null ? _h : clean) != null ? _i : false,
+      prettier: (_k = (_j = outputOptions.prettier) != null ? _j : prettier) != null ? _k : false,
+      tslint: (_m = (_l = outputOptions.tslint) != null ? _l : tslint) != null ? _m : false,
       tsconfig,
       packageJson,
-      headers: (_o = outputOptions.headers) != null ? _o : false,
-      indexFiles: (_p = outputOptions.indexFiles) != null ? _p : true,
+      headers: (_n = outputOptions.headers) != null ? _n : false,
+      indexFiles: (_o = outputOptions.indexFiles) != null ? _o : true,
       baseUrl: outputOptions.baseUrl,
       override: {
         ...outputOptions.override,
         mock: {
-          arrayMin: (_s = (_r = (_q = outputOptions.override) == null ? void 0 : _q.mock) == null ? void 0 : _r.arrayMin) != null ? _s : 1,
-          arrayMax: (_v = (_u = (_t = outputOptions.override) == null ? void 0 : _t.mock) == null ? void 0 : _u.arrayMax) != null ? _v : 10,
-          ...(_x = (_w = outputOptions.override) == null ? void 0 : _w.mock) != null ? _x : {}
+          arrayMin: (_r = (_q = (_p = outputOptions.override) == null ? void 0 : _p.mock) == null ? void 0 : _q.arrayMin) != null ? _r : 1,
+          arrayMax: (_u = (_t = (_s = outputOptions.override) == null ? void 0 : _s.mock) == null ? void 0 : _t.arrayMax) != null ? _u : 10,
+          ...(_w = (_v = outputOptions.override) == null ? void 0 : _v.mock) != null ? _w : {}
         },
         operations: normalizeOperationsAndTags(
-          (_z = (_y = outputOptions.override) == null ? void 0 : _y.operations) != null ? _z : {},
+          (_y = (_x = outputOptions.override) == null ? void 0 : _x.operations) != null ? _y : {},
           outputWorkspace
         ),
         tags: normalizeOperationsAndTags(
-          (_B = (_A = outputOptions.override) == null ? void 0 : _A.tags) != null ? _B : {},
+          (_A = (_z = outputOptions.override) == null ? void 0 : _z.tags) != null ? _A : {},
           outputWorkspace
         ),
         mutator: normalizeMutator(
           outputWorkspace,
-          (_C = outputOptions.override) == null ? void 0 : _C.mutator
+          (_B = outputOptions.override) == null ? void 0 : _B.mutator
         ),
-        formData: (_G = !(0, import_core7.isBoolean)((_D = outputOptions.override) == null ? void 0 : _D.formData) ? normalizeMutator(
+        formData: (_F = !(0, import_core7.isBoolean)((_C = outputOptions.override) == null ? void 0 : _C.formData) ? normalizeMutator(
           outputWorkspace,
-          (_E = outputOptions.override) == null ? void 0 : _E.formData
-        ) : (_F = outputOptions.override) == null ? void 0 : _F.formData) != null ? _G : true,
-        formUrlEncoded: (_K = !(0, import_core7.isBoolean)((_H = outputOptions.override) == null ? void 0 : _H.formUrlEncoded) ? normalizeMutator(
+          (_D = outputOptions.override) == null ? void 0 : _D.formData
+        ) : (_E = outputOptions.override) == null ? void 0 : _E.formData) != null ? _F : true,
+        formUrlEncoded: (_J = !(0, import_core7.isBoolean)((_G = outputOptions.override) == null ? void 0 : _G.formUrlEncoded) ? normalizeMutator(
           outputWorkspace,
-          (_I = outputOptions.override) == null ? void 0 : _I.formUrlEncoded
-        ) : (_J = outputOptions.override) == null ? void 0 : _J.formUrlEncoded) != null ? _K : true,
+          (_H = outputOptions.override) == null ? void 0 : _H.formUrlEncoded
+        ) : (_I = outputOptions.override) == null ? void 0 : _I.formUrlEncoded) != null ? _J : true,
         paramsSerializer: normalizeMutator(
           outputWorkspace,
-          (_L = outputOptions.override) == null ? void 0 : _L.paramsSerializer
+          (_K = outputOptions.override) == null ? void 0 : _K.paramsSerializer
         ),
-        header: ((_M = outputOptions.override) == null ? void 0 : _M.header) === false ? false : (0, import_core7.isFunction)((_N = outputOptions.override) == null ? void 0 : _N.header) ? (_O = outputOptions.override) == null ? void 0 : _O.header : getDefaultFilesHeader,
-        requestOptions: (_Q = (_P = outputOptions.override) == null ? void 0 : _P.requestOptions) != null ? _Q : true,
+        header: ((_L = outputOptions.override) == null ? void 0 : _L.header) === false ? false : (0, import_core7.isFunction)((_M = outputOptions.override) == null ? void 0 : _M.header) ? (_N = outputOptions.override) == null ? void 0 : _N.header : getDefaultFilesHeader,
+        requestOptions: (_P = (_O = outputOptions.override) == null ? void 0 : _O.requestOptions) != null ? _P : true,
         components: {
           schemas: {
             suffix: import_core7.RefComponentSuffix.schemas,
-            ...(_T = (_S = (_R = outputOptions.override) == null ? void 0 : _R.components) == null ? void 0 : _S.schemas) != null ? _T : {}
+            ...(_S = (_R = (_Q = outputOptions.override) == null ? void 0 : _Q.components) == null ? void 0 : _R.schemas) != null ? _S : {}
           },
           responses: {
             suffix: import_core7.RefComponentSuffix.responses,
-            ...(_W = (_V = (_U = outputOptions.override) == null ? void 0 : _U.components) == null ? void 0 : _V.responses) != null ? _W : {}
+            ...(_V = (_U = (_T = outputOptions.override) == null ? void 0 : _T.components) == null ? void 0 : _U.responses) != null ? _V : {}
           },
           parameters: {
             suffix: import_core7.RefComponentSuffix.parameters,
-            ...(_Z = (_Y = (_X = outputOptions.override) == null ? void 0 : _X.components) == null ? void 0 : _Y.parameters) != null ? _Z : {}
+            ...(_Y = (_X = (_W = outputOptions.override) == null ? void 0 : _W.components) == null ? void 0 : _X.parameters) != null ? _Y : {}
           },
           requestBodies: {
             suffix: import_core7.RefComponentSuffix.requestBodies,
-            ...(_aa = (_$ = (__ = outputOptions.override) == null ? void 0 : __.components) == null ? void 0 : _$.requestBodies) != null ? _aa : {}
+            ...(_$ = (__ = (_Z = outputOptions.override) == null ? void 0 : _Z.components) == null ? void 0 : __.requestBodies) != null ? _$ : {}
           }
         },
         query: {
           useQuery: true,
           useMutation: true,
           signal: true,
-          ...normalizeQueryOptions((_ba = outputOptions.override) == null ? void 0 : _ba.query, workspace)
+          ...normalizeQueryOptions((_aa = outputOptions.override) == null ? void 0 : _aa.query, workspace)
         },
         swr: {
-          ...(_da = (_ca = outputOptions.override) == null ? void 0 : _ca.swr) != null ? _da : {}
+          ...(_ca = (_ba = outputOptions.override) == null ? void 0 : _ba.swr) != null ? _ca : {}
         },
         angular: {
-          provideIn: (_ga = (_fa = (_ea = outputOptions.override) == null ? void 0 : _ea.angular) == null ? void 0 : _fa.provideIn) != null ? _ga : "root"
+          provideIn: (_fa = (_ea = (_da = outputOptions.override) == null ? void 0 : _da.angular) == null ? void 0 : _ea.provideIn) != null ? _fa : "root"
         },
-        useDates: ((_ha = outputOptions.override) == null ? void 0 : _ha.useDates) || false,
-        useDeprecatedOperations: (_ja = (_ia = outputOptions.override) == null ? void 0 : _ia.useDeprecatedOperations) != null ? _ja : true
+        useDates: ((_ga = outputOptions.override) == null ? void 0 : _ga.useDates) || false,
+        useDeprecatedOperations: (_ia = (_ha = outputOptions.override) == null ? void 0 : _ha.useDeprecatedOperations) != null ? _ia : true,
+        useNativeEnums: (_ka = (_ja = outputOptions.override) == null ? void 0 : _ja.useNativeEnums) != null ? _ka : false
       }
     },
     hooks: options.hooks ? normalizeHooks(options.hooks) : {}
@@ -4459,7 +4473,9 @@ var writeSpecs = async (builder, workspace, options, projectName) => {
   }
   if (output.workspace) {
     const workspacePath = output.workspace;
-    let imports = implementationPaths.filter((path) => !path.endsWith(".msw.ts")).map(
+    let imports = implementationPaths.filter(
+      (path) => !output.mock || !path.endsWith(`.${(0, import_core10.getMockFileExtensionByTypeName)(output.mock)}.ts`)
+    ).map(
       (path) => import_core10.upath.relativeSafe(
         workspacePath,
         (0, import_core10.getFileInfo)(path).pathWithoutExtension

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "orval",
   "description": "A swagger client generator for typescript",
-  "version": "6.20.0",
+  "version": "6.21.0",
   "license": "MIT",
   "files": [
     "dist"
@@ -53,13 +53,13 @@
   },
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.1.0",
-    "@orval/angular": "6.20.0",
-    "@orval/axios": "6.20.0",
-    "@orval/core": "6.20.0",
-    "@orval/msw": "6.20.0",
-    "@orval/query": "6.20.0",
-    "@orval/swr": "6.20.0",
-    "@orval/zod": "6.20.0",
+    "@orval/angular": "6.21.0",
+    "@orval/axios": "6.21.0",
+    "@orval/core": "6.21.0",
+    "@orval/mock": "6.21.0",
+    "@orval/query": "6.21.0",
+    "@orval/swr": "6.21.0",
+    "@orval/zod": "6.21.0",
     "ajv": "^8.12.0",
     "cac": "^6.7.14",
     "chalk": "^4.1.2",
@@ -67,7 +67,7 @@
     "enquirer": "^2.4.1",
     "execa": "^5.1.1",
     "find-up": "5.0.0",
-    "fs-extra": "^10.1.0",
+    "fs-extra": "^11.1.1",
     "lodash.uniq": "^4.5.0",
     "openapi-types": "^12.1.3",
     "openapi3-ts": "^3.2.0",