orval 6.21.0 → 6.22.0

package/dist/bin/orval.js

@@ -3264,17 +3264,17 @@ var import_query = __toESM(require("@orval/query"));
 var import_swr = __toESM(require("@orval/swr"));
 var import_zod = __toESM(require("@orval/zod"));
 var DEFAULT_CLIENT = import_core.OutputClient.AXIOS;
-var GENERATOR_CLIENT = {
-  axios: (0, import_axios.default)({ type: "axios" })(),
-  "axios-functions": (0, import_axios.default)({ type: "axios-functions" })(),
-  angular: (0, import_angular.default)()(),
-  "react-query": (0, import_query.default)({ type: "react-query" })(),
-  "svelte-query": (0, import_query.default)({ type: "svelte-query" })(),
-  "vue-query": (0, import_query.default)({ type: "vue-query" })(),
-  swr: (0, import_swr.default)()(),
-  zod: (0, import_zod.default)()()
-};
-var getGeneratorClient = (outputClient) => {
+var getGeneratorClient = (outputClient, output) => {
+  const GENERATOR_CLIENT = {
+    axios: (0, import_axios.default)({ type: "axios" })(),
+    "axios-functions": (0, import_axios.default)({ type: "axios-functions" })(),
+    angular: (0, import_angular.default)()(),
+    "react-query": (0, import_query.default)({ output, type: "react-query" })(),
+    "svelte-query": (0, import_query.default)({ output, type: "svelte-query" })(),
+    "vue-query": (0, import_query.default)({ output, type: "vue-query" })(),
+    swr: (0, import_swr.default)()(),
+    zod: (0, import_zod.default)()()
+  };
   const generator = (0, import_core.isFunction)(outputClient) ? outputClient(GENERATOR_CLIENT) : GENERATOR_CLIENT[outputClient];
   if (!generator) {
     throw `Oups... \u{1F37B}. Client not found: ${outputClient}`;
@@ -3290,9 +3290,10 @@ var generateClientImports = ({
   isAllowSyntheticDefaultImports,
   hasGlobalMutator,
   hasParamsSerializerOptions,
-  packageJson
+  packageJson,
+  output
 }) => {
-  const { dependencies } = getGeneratorClient(client);
+  const { dependencies } = getGeneratorClient(client, output);
   return (0, import_core.generateDependencyImports)(
     implementation,
     dependencies ? [
@@ -3315,9 +3316,10 @@ var generateClientHeader = ({
   isMutator,
   provideIn,
   hasAwaitedType,
-  titles
+  titles,
+  output
 }) => {
-  const { header } = getGeneratorClient(outputClient);
+  const { header } = getGeneratorClient(outputClient, output);
   return {
     implementation: header ? header({
       title: titles.implementation,
@@ -3336,9 +3338,10 @@ var generateClientFooter = ({
   operationNames,
   hasMutator,
   hasAwaitedType,
-  titles
+  titles,
+  output
 }) => {
-  const { footer } = getGeneratorClient(outputClient);
+  const { footer } = getGeneratorClient(outputClient, output);
   if (!footer) {
     return {
       implementation: "",
@@ -3380,9 +3383,10 @@ var generateClientFooter = ({
 var generateClientTitle = ({
   outputClient = DEFAULT_CLIENT,
   title,
-  customTitleFunc
+  customTitleFunc,
+  output
 }) => {
-  const { title: generatorTitle } = getGeneratorClient(outputClient);
+  const { title: generatorTitle } = getGeneratorClient(outputClient, output);
   if (!generatorTitle) {
     return {
       implementation: "",
@@ -3414,13 +3418,19 @@ var generateMock2 = (verbOption, options) => {
   if ((0, import_core.isFunction)(options.mock)) {
     return options.mock(verbOption, options);
   }
-  return mock.generateMock(verbOption, options);
+  return mock.generateMock(
+    verbOption,
+    options
+  );
 };
-var generateOperations = (outputClient = DEFAULT_CLIENT, verbsOptions, options) => {
+var generateOperations = (outputClient = DEFAULT_CLIENT, verbsOptions, options, output) => {
   return (0, import_core.asyncReduce)(
     verbsOptions,
     async (acc, verbOption) => {
-      const { client: generatorClient } = getGeneratorClient(outputClient);
+      const { client: generatorClient } = getGeneratorClient(
+        outputClient,
+        output
+      );
       const client = await generatorClient(verbOption, options, outputClient);
       const generatedMock = generateMock2(verbOption, options);
       if (!client.implementation) {
@@ -3429,7 +3439,9 @@ var generateOperations = (outputClient = DEFAULT_CLIENT, verbsOptions, options)
       acc[verbOption.operationId] = {
         implementation: verbOption.doc + client.implementation,
         imports: client.imports,
+        // @ts-expect-error // FIXME
         implementationMock: generatedMock.implementation,
+        // @ts-expect-error // FIXME
         importsMock: generatedMock.imports,
         tags: verbOption.tags,
         mutator: verbOption.mutator,
@@ -3517,8 +3529,10 @@ var getApiBuilder = async ({
           override: output.override,
           context: resolvedContext,
           mock: output.mock,
+          // @ts-expect-error // FIXME
           output: output.target
-        }
+        },
+        output
       );
       acc.schemas.push(...schemas);
       acc.operations = { ...acc.operations, ...pathOperations };
@@ -3552,6 +3566,7 @@ var importOpenApi = async ({
   const specs = await generateInputSpecs({ specs: data, input, workspace });
   const schemas = getApiSchemas({ output, target, workspace, specs });
   const api = await getApiBuilder({
+    // @ts-expect-error // FIXME
     input,
     output,
     context: {
@@ -3732,6 +3747,7 @@ var importSpecs = async (workspace, options) => {
   if ((0, import_core4.isObject)(input.target)) {
     return importOpenApi({
       data: { [workspace]: input.target },
+      // @ts-expect-error // FIXME
       input,
       output,
       target: workspace,
@@ -3740,6 +3756,7 @@ var importSpecs = async (workspace, options) => {
   }
   const isPathUrl = (0, import_core4.isUrl)(input.target);
   const data = await resolveSpecs(
+    // @ts-expect-error // FIXME
     input.target,
     input.parserOptions,
     isPathUrl,
@@ -3747,8 +3764,10 @@ var importSpecs = async (workspace, options) => {
   );
   return importOpenApi({
     data,
+    // @ts-expect-error // FIXME
     input,
     output,
+    // @ts-expect-error // FIXME
     target: input.target,
     workspace
   });
@@ -3763,7 +3782,7 @@ var import_chalk2 = __toESM(require("chalk"));
 var package_default = {
   name: "orval",
   description: "A swagger client generator for typescript",
-  version: "6.21.0",
+  version: "6.22.0",
   license: "MIT",
   files: [
     "dist"
@@ -3806,7 +3825,8 @@ var package_default = {
     build: "tsup ./src/bin/orval.ts ./src/index.ts --target node12 --clean --dts",
     dev: "tsup ./src/bin/orval.ts ./src/index.ts --target node12 --clean --watch ./src --onSuccess 'yarn generate-api'",
     lint: "eslint src/**/*.ts",
-    "generate-api": "node ./dist/bin/orval.js --config ../../samples/react-query/basic/orval.config.ts"
+    "generate-api": "node ./dist/bin/orval.js --config ../../samples/react-query/basic/orval.config.ts",
+    test: "tsc --noEmit && vitest --passWithNoTests"
   },
   devDependencies: {
     "@types/inquirer": "^9.0.6",
@@ -3815,13 +3835,13 @@ var package_default = {
   },
   dependencies: {
     "@apidevtools/swagger-parser": "^10.1.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",
+    "@orval/angular": "6.22.0",
+    "@orval/axios": "6.22.0",
+    "@orval/core": "6.22.0",
+    "@orval/mock": "6.22.0",
+    "@orval/query": "6.22.0",
+    "@orval/swr": "6.22.0",
+    "@orval/zod": "6.22.0",
     ajv: "^8.12.0",
     cac: "^6.7.14",
     chalk: "^4.1.2",
@@ -3829,7 +3849,7 @@ var package_default = {
     enquirer: "^2.4.1",
     execa: "^5.1.1",
     "find-up": "5.0.0",
-    "fs-extra": "^11.1.1",
+    "fs-extra": "^11.2.0",
     "lodash.uniq": "^4.5.0",
     "openapi-types": "^12.1.3",
     "openapi3-ts": "^3.2.0",
@@ -4047,7 +4067,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, _ka;
+  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, _la, _ma;
   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`));
@@ -4181,7 +4201,9 @@ var normalizeOptions = async (optionsExport, workspace = process.cwd(), globalOp
         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
-      }
+      },
+      allParamsOptional: (_la = outputOptions.allParamsOptional) != null ? _la : false,
+      urlEncodeParameters: (_ma = outputOptions.urlEncodeParameters) != null ? _ma : false
     },
     hooks: options.hooks ? normalizeHooks(options.hooks) : {}
   };

package/dist/index.js

@@ -3275,17 +3275,17 @@ var import_query = __toESM(require("@orval/query"));
 var import_swr = __toESM(require("@orval/swr"));
 var import_zod = __toESM(require("@orval/zod"));
 var DEFAULT_CLIENT = import_core.OutputClient.AXIOS;
-var GENERATOR_CLIENT = {
-  axios: (0, import_axios.default)({ type: "axios" })(),
-  "axios-functions": (0, import_axios.default)({ type: "axios-functions" })(),
-  angular: (0, import_angular.default)()(),
-  "react-query": (0, import_query.default)({ type: "react-query" })(),
-  "svelte-query": (0, import_query.default)({ type: "svelte-query" })(),
-  "vue-query": (0, import_query.default)({ type: "vue-query" })(),
-  swr: (0, import_swr.default)()(),
-  zod: (0, import_zod.default)()()
-};
-var getGeneratorClient = (outputClient) => {
+var getGeneratorClient = (outputClient, output) => {
+  const GENERATOR_CLIENT = {
+    axios: (0, import_axios.default)({ type: "axios" })(),
+    "axios-functions": (0, import_axios.default)({ type: "axios-functions" })(),
+    angular: (0, import_angular.default)()(),
+    "react-query": (0, import_query.default)({ output, type: "react-query" })(),
+    "svelte-query": (0, import_query.default)({ output, type: "svelte-query" })(),
+    "vue-query": (0, import_query.default)({ output, type: "vue-query" })(),
+    swr: (0, import_swr.default)()(),
+    zod: (0, import_zod.default)()()
+  };
   const generator = (0, import_core.isFunction)(outputClient) ? outputClient(GENERATOR_CLIENT) : GENERATOR_CLIENT[outputClient];
   if (!generator) {
     throw `Oups... \u{1F37B}. Client not found: ${outputClient}`;
@@ -3301,9 +3301,10 @@ var generateClientImports = ({
   isAllowSyntheticDefaultImports,
   hasGlobalMutator,
   hasParamsSerializerOptions,
-  packageJson
+  packageJson,
+  output
 }) => {
-  const { dependencies } = getGeneratorClient(client);
+  const { dependencies } = getGeneratorClient(client, output);
   return (0, import_core.generateDependencyImports)(
     implementation,
     dependencies ? [
@@ -3326,9 +3327,10 @@ var generateClientHeader = ({
   isMutator,
   provideIn,
   hasAwaitedType,
-  titles
+  titles,
+  output
 }) => {
-  const { header } = getGeneratorClient(outputClient);
+  const { header } = getGeneratorClient(outputClient, output);
   return {
     implementation: header ? header({
       title: titles.implementation,
@@ -3347,9 +3349,10 @@ var generateClientFooter = ({
   operationNames,
   hasMutator,
   hasAwaitedType,
-  titles
+  titles,
+  output
 }) => {
-  const { footer } = getGeneratorClient(outputClient);
+  const { footer } = getGeneratorClient(outputClient, output);
   if (!footer) {
     return {
       implementation: "",
@@ -3391,9 +3394,10 @@ var generateClientFooter = ({
 var generateClientTitle = ({
   outputClient = DEFAULT_CLIENT,
   title,
-  customTitleFunc
+  customTitleFunc,
+  output
 }) => {
-  const { title: generatorTitle } = getGeneratorClient(outputClient);
+  const { title: generatorTitle } = getGeneratorClient(outputClient, output);
   if (!generatorTitle) {
     return {
       implementation: "",
@@ -3425,13 +3429,19 @@ var generateMock2 = (verbOption, options) => {
   if ((0, import_core.isFunction)(options.mock)) {
     return options.mock(verbOption, options);
   }
-  return mock.generateMock(verbOption, options);
+  return mock.generateMock(
+    verbOption,
+    options
+  );
 };
-var generateOperations = (outputClient = DEFAULT_CLIENT, verbsOptions, options) => {
+var generateOperations = (outputClient = DEFAULT_CLIENT, verbsOptions, options, output) => {
   return (0, import_core.asyncReduce)(
     verbsOptions,
     async (acc, verbOption) => {
-      const { client: generatorClient } = getGeneratorClient(outputClient);
+      const { client: generatorClient } = getGeneratorClient(
+        outputClient,
+        output
+      );
       const client = await generatorClient(verbOption, options, outputClient);
       const generatedMock = generateMock2(verbOption, options);
       if (!client.implementation) {
@@ -3440,7 +3450,9 @@ var generateOperations = (outputClient = DEFAULT_CLIENT, verbsOptions, options)
       acc[verbOption.operationId] = {
         implementation: verbOption.doc + client.implementation,
         imports: client.imports,
+        // @ts-expect-error // FIXME
         implementationMock: generatedMock.implementation,
+        // @ts-expect-error // FIXME
         importsMock: generatedMock.imports,
         tags: verbOption.tags,
         mutator: verbOption.mutator,
@@ -3528,8 +3540,10 @@ var getApiBuilder = async ({
           override: output.override,
           context: resolvedContext,
           mock: output.mock,
+          // @ts-expect-error // FIXME
           output: output.target
-        }
+        },
+        output
       );
       acc.schemas.push(...schemas);
       acc.operations = { ...acc.operations, ...pathOperations };
@@ -3563,6 +3577,7 @@ var importOpenApi = async ({
   const specs = await generateInputSpecs({ specs: data, input, workspace });
   const schemas = getApiSchemas({ output, target, workspace, specs });
   const api = await getApiBuilder({
+    // @ts-expect-error // FIXME
     input,
     output,
     context: {
@@ -3743,6 +3758,7 @@ var importSpecs = async (workspace, options) => {
   if ((0, import_core4.isObject)(input.target)) {
     return importOpenApi({
       data: { [workspace]: input.target },
+      // @ts-expect-error // FIXME
       input,
       output,
       target: workspace,
@@ -3751,6 +3767,7 @@ var importSpecs = async (workspace, options) => {
   }
   const isPathUrl = (0, import_core4.isUrl)(input.target);
   const data = await resolveSpecs(
+    // @ts-expect-error // FIXME
     input.target,
     input.parserOptions,
     isPathUrl,
@@ -3758,8 +3775,10 @@ var importSpecs = async (workspace, options) => {
   );
   return importOpenApi({
     data,
+    // @ts-expect-error // FIXME
     input,
     output,
+    // @ts-expect-error // FIXME
     target: input.target,
     workspace
   });
@@ -3774,7 +3793,7 @@ var import_chalk2 = __toESM(require("chalk"));
 var package_default = {
   name: "orval",
   description: "A swagger client generator for typescript",
-  version: "6.21.0",
+  version: "6.22.0",
   license: "MIT",
   files: [
     "dist"
@@ -3817,7 +3836,8 @@ var package_default = {
     build: "tsup ./src/bin/orval.ts ./src/index.ts --target node12 --clean --dts",
     dev: "tsup ./src/bin/orval.ts ./src/index.ts --target node12 --clean --watch ./src --onSuccess 'yarn generate-api'",
     lint: "eslint src/**/*.ts",
-    "generate-api": "node ./dist/bin/orval.js --config ../../samples/react-query/basic/orval.config.ts"
+    "generate-api": "node ./dist/bin/orval.js --config ../../samples/react-query/basic/orval.config.ts",
+    test: "tsc --noEmit && vitest --passWithNoTests"
   },
   devDependencies: {
     "@types/inquirer": "^9.0.6",
@@ -3826,13 +3846,13 @@ var package_default = {
   },
   dependencies: {
     "@apidevtools/swagger-parser": "^10.1.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",
+    "@orval/angular": "6.22.0",
+    "@orval/axios": "6.22.0",
+    "@orval/core": "6.22.0",
+    "@orval/mock": "6.22.0",
+    "@orval/query": "6.22.0",
+    "@orval/swr": "6.22.0",
+    "@orval/zod": "6.22.0",
     ajv: "^8.12.0",
     cac: "^6.7.14",
     chalk: "^4.1.2",
@@ -3840,7 +3860,7 @@ var package_default = {
     enquirer: "^2.4.1",
     execa: "^5.1.1",
     "find-up": "5.0.0",
-    "fs-extra": "^11.1.1",
+    "fs-extra": "^11.2.0",
     "lodash.uniq": "^4.5.0",
     "openapi-types": "^12.1.3",
     "openapi3-ts": "^3.2.0",
@@ -4061,7 +4081,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, _ka;
+  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, _la, _ma;
   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`));
@@ -4195,7 +4215,9 @@ var normalizeOptions = async (optionsExport, workspace = process.cwd(), globalOp
         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
-      }
+      },
+      allParamsOptional: (_la = outputOptions.allParamsOptional) != null ? _la : false,
+      urlEncodeParameters: (_ma = outputOptions.urlEncodeParameters) != null ? _ma : false
     },
     hooks: options.hooks ? normalizeHooks(options.hooks) : {}
   };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "orval",
   "description": "A swagger client generator for typescript",
-  "version": "6.21.0",
+  "version": "6.22.0",
   "license": "MIT",
   "files": [
     "dist"
@@ -44,7 +44,8 @@
     "build": "tsup ./src/bin/orval.ts ./src/index.ts --target node12 --clean --dts",
     "dev": "tsup ./src/bin/orval.ts ./src/index.ts --target node12 --clean --watch ./src --onSuccess 'yarn generate-api'",
     "lint": "eslint src/**/*.ts",
-    "generate-api": "node ./dist/bin/orval.js --config ../../samples/react-query/basic/orval.config.ts"
+    "generate-api": "node ./dist/bin/orval.js --config ../../samples/react-query/basic/orval.config.ts",
+    "test": "tsc --noEmit && vitest --passWithNoTests"
   },
   "devDependencies": {
     "@types/inquirer": "^9.0.6",
@@ -53,13 +54,13 @@
   },
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.1.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",
+    "@orval/angular": "6.22.0",
+    "@orval/axios": "6.22.0",
+    "@orval/core": "6.22.0",
+    "@orval/mock": "6.22.0",
+    "@orval/query": "6.22.0",
+    "@orval/swr": "6.22.0",
+    "@orval/zod": "6.22.0",
     "ajv": "^8.12.0",
     "cac": "^6.7.14",
     "chalk": "^4.1.2",
@@ -67,7 +68,7 @@
     "enquirer": "^2.4.1",
     "execa": "^5.1.1",
     "find-up": "5.0.0",
-    "fs-extra": "^11.1.1",
+    "fs-extra": "^11.2.0",
     "lodash.uniq": "^4.5.0",
     "openapi-types": "^12.1.3",
     "openapi3-ts": "^3.2.0",