orval 6.29.1 → 6.30.1

package/README.md

@@ -24,6 +24,5 @@ You can find below some samples
 - [svelte query](https://github.com/anymaniax/orval/tree/master/samples/svelte-query)
 - [vue query](https://github.com/anymaniax/orval/tree/master/samples/vue-query)
 - [react app with swr](https://github.com/anymaniax/orval/tree/master/samples/react-app-with-swr)
-- [nx fastify react](https://github.com/anymaniax/orval/tree/master/samples/nx-fastify-react)
 - [angular app](https://github.com/anymaniax/orval/tree/master/samples/angular-app)
 - [hono](https://github.com/anymaniax/orval/tree/master/samples/hono)

package/dist/bin/orval.js

@@ -3262,6 +3262,7 @@ var import_query = __toESM(require("@orval/query"));
 var import_swr = __toESM(require("@orval/swr"));
 var import_zod = __toESM(require("@orval/zod"));
 var import_hono = __toESM(require("@orval/hono"));
+var import_fetch = __toESM(require("@orval/fetch"));
 var DEFAULT_CLIENT = import_core.OutputClient.AXIOS;
 var getGeneratorClient = (outputClient, output) => {
   const GENERATOR_CLIENT = {
@@ -3273,7 +3274,8 @@ var getGeneratorClient = (outputClient, output) => {
     "vue-query": (0, import_query.default)({ output, type: "vue-query" })(),
     swr: (0, import_swr.default)()(),
     zod: (0, import_zod.default)()(),
-    hono: (0, import_hono.default)()()
+    hono: (0, import_hono.default)()(),
+    fetch: (0, import_fetch.default)()()
   };
   const generator = (0, import_core.isFunction)(outputClient) ? outputClient(GENERATOR_CLIENT) : GENERATOR_CLIENT[outputClient];
   if (!generator) {
@@ -3594,7 +3596,7 @@ var importOpenApi = async ({
 }) => {
   var _a;
   const specs = await generateInputSpecs({ specs: data, input, workspace });
-  const schemas = getApiSchemas({ output, target, workspace, specs });
+  const schemas = getApiSchemas({ input, output, target, workspace, specs });
   const api = await getApiBuilder({
     // @ts-expect-error // FIXME
     input,
@@ -3643,6 +3645,7 @@ var generateInputSpecs = async ({
   );
 };
 var getApiSchemas = ({
+  input,
   output,
   target,
   workspace,
@@ -3650,7 +3653,7 @@ var getApiSchemas = ({
 }) => {
   return Object.entries(specs).reduce(
     (acc, [specKey, spec]) => {
-      var _a, _b, _c, _d;
+      var _a, _b, _c, _d, _e;
       const context = {
         specKey,
         target,
@@ -3658,23 +3661,25 @@ var getApiSchemas = ({
         specs,
         output
       };
+      const parsedSchemas = spec.openapi ? (_a = spec.components) == null ? void 0 : _a.schemas : getAllSchemas(spec, specKey);
       const schemaDefinition = (0, import_core3.generateSchemasDefinition)(
-        !spec.openapi ? getAllSchemas(spec, specKey) : (_a = spec.components) == null ? void 0 : _a.schemas,
+        parsedSchemas,
         context,
-        output.override.components.schemas.suffix
+        output.override.components.schemas.suffix,
+        (_b = input.filters) == null ? void 0 : _b.schemas
       );
       const responseDefinition = (0, import_core3.generateComponentDefinition)(
-        (_b = spec.components) == null ? void 0 : _b.responses,
+        (_c = spec.components) == null ? void 0 : _c.responses,
         context,
         output.override.components.responses.suffix
       );
       const bodyDefinition = (0, import_core3.generateComponentDefinition)(
-        (_c = spec.components) == null ? void 0 : _c.requestBodies,
+        (_d = spec.components) == null ? void 0 : _d.requestBodies,
         context,
         output.override.components.requestBodies.suffix
       );
       const parameters = (0, import_core3.generateParameterDefinition)(
-        (_d = spec.components) == null ? void 0 : _d.parameters,
+        (_e = spec.components) == null ? void 0 : _e.parameters,
         context,
         output.override.components.parameters.suffix
       );
@@ -3807,7 +3812,7 @@ var import_chalk2 = __toESM(require("chalk"));
 var package_default = {
   name: "orval",
   description: "A swagger client generator for typescript",
-  version: "6.29.1",
+  version: "6.30.1",
   license: "MIT",
   files: [
     "dist"
@@ -3861,18 +3866,19 @@ var package_default = {
   },
   dependencies: {
     "@apidevtools/swagger-parser": "^10.1.0",
-    "@orval/angular": "6.29.1",
-    "@orval/axios": "6.29.1",
-    "@orval/core": "6.29.1",
-    "@orval/hono": "6.29.1",
-    "@orval/mock": "6.29.1",
-    "@orval/query": "6.29.1",
-    "@orval/swr": "6.29.1",
-    "@orval/zod": "6.29.1",
+    "@orval/angular": "6.30.1",
+    "@orval/axios": "6.30.1",
+    "@orval/core": "6.30.1",
+    "@orval/fetch": "6.30.1",
+    "@orval/hono": "6.30.1",
+    "@orval/mock": "6.30.1",
+    "@orval/query": "6.30.1",
+    "@orval/swr": "6.30.1",
+    "@orval/zod": "6.30.1",
     ajv: "^8.12.0",
     cac: "^6.7.14",
     chalk: "^4.1.2",
-    chokidar: "^3.5.3",
+    chokidar: "^3.6.0",
     enquirer: "^2.4.1",
     execa: "^5.1.1",
     "find-up": "5.0.0",
@@ -4093,7 +4099,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, _la, _ma, _na, _oa, _pa, _qa, _ra, _sa, _ta, _ua, _va, _wa, _xa, _ya, _za, _Aa, _Ba, _Ca, _Da, _Ea, _Fa, _Ga, _Ha, _Ia, _Ja, _Ka, _La, _Ma, _Na, _Oa, _Pa, _Qa, _Ra, _Sa, _Ta, _Ua, _Va, _Wa, _Xa, _Ya, _Za, __a, _$a, _ab, _bb, _cb, _db, _eb, _fb, _gb, _hb, _ib, _jb, _kb, _lb, _mb, _nb, _ob, _pb, _qb, _rb, _sb, _tb, _ub, _vb, _wb, _xb, _yb, _zb, _Ab, _Bb, _Cb, _Db, _Eb, _Fb, _Gb, _Hb, _Ib, _Jb, _Kb, _Lb, _Mb, _Nb, _Ob, _Pb;
+  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, _na, _oa, _pa, _qa, _ra, _sa, _ta, _ua, _va, _wa, _xa, _ya, _za, _Aa, _Ba, _Ca, _Da, _Ea, _Fa, _Ga, _Ha, _Ia, _Ja, _Ka, _La, _Ma, _Na, _Oa, _Pa, _Qa, _Ra, _Sa, _Ta, _Ua, _Va, _Wa, _Xa, _Ya, _Za, __a, _$a, _ab, _bb, _cb, _db, _eb, _fb, _gb, _hb, _ib, _jb, _kb, _lb, _mb, _nb, _ob, _pb, _qb, _rb, _sb, _tb, _ub, _vb, _wb, _xb, _yb, _zb, _Ab, _Bb, _Cb, _Db, _Eb, _Fb, _Gb, _Hb, _Ib, _Jb, _Kb, _Lb, _Mb, _Nb, _Ob, _Pb, _Qb, _Rb, _Sb, _Tb, _Ub, _Vb, _Wb, _Xb, _Yb, _Zb, __b, _$b, _ac, _bc, _cc, _dc, _ec, _fc, _gc;
   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`));
@@ -4131,20 +4137,29 @@ var normalizeOptions = async (optionsExport, workspace = process.cwd(), globalOp
     };
   }
   const defaultFileExtension = ".ts";
+  const globalQueryOptions = {
+    useQuery: (_d = (_c = (_b = outputOptions.override) == null ? void 0 : _b.query) == null ? void 0 : _c.useQuery) != null ? _d : true,
+    useMutation: (_g = (_f = (_e = outputOptions.override) == null ? void 0 : _e.query) == null ? void 0 : _f.useMutation) != null ? _g : true,
+    signal: (_j = (_i = (_h = outputOptions.override) == null ? void 0 : _h.query) == null ? void 0 : _i.signal) != null ? _j : true,
+    shouldExportMutatorHooks: (_m = (_l = (_k = outputOptions.override) == null ? void 0 : _k.query) == null ? void 0 : _l.shouldExportMutatorHooks) != null ? _m : true,
+    shouldExportHttpClient: (_p = (_o = (_n = outputOptions.override) == null ? void 0 : _n.query) == null ? void 0 : _o.shouldExportHttpClient) != null ? _p : true,
+    shouldExportQueryKey: (_s = (_r = (_q = outputOptions.override) == null ? void 0 : _q.query) == null ? void 0 : _r.shouldExportQueryKey) != null ? _s : true,
+    ...normalizeQueryOptions((_t = outputOptions.override) == null ? void 0 : _t.query, workspace)
+  };
   const normalizedOptions = {
     input: {
       target: globalOptions.input ? normalizePathOrUrl(globalOptions.input, process.cwd()) : normalizePathOrUrl(inputOptions.target, workspace),
       validation: inputOptions.validation || false,
       override: {
         transformer: normalizePath(
-          (_b = inputOptions.override) == null ? void 0 : _b.transformer,
+          (_u = inputOptions.override) == null ? void 0 : _u.transformer,
           workspace
         )
       },
-      converterOptions: (_c = inputOptions.converterOptions) != null ? _c : {},
+      converterOptions: (_v = inputOptions.converterOptions) != null ? _v : {},
       parserOptions: (0, import_core7.mergeDeep)(
         parserDefaultOptions,
-        (_d = inputOptions.parserOptions) != null ? _d : {}
+        (_w = inputOptions.parserOptions) != null ? _w : {}
       ),
       filters: inputOptions.filters
     },
@@ -4153,122 +4168,128 @@ var normalizeOptions = async (optionsExport, workspace = process.cwd(), globalOp
       schemas: normalizePath(outputOptions.schemas, outputWorkspace),
       fileExtension: outputOptions.fileExtension || defaultFileExtension,
       workspace: outputOptions.workspace ? outputWorkspace : void 0,
-      client: (_f = (_e = outputOptions.client) != null ? _e : client) != null ? _f : import_core7.OutputClient.AXIOS_FUNCTIONS,
-      mode: normalizeOutputMode((_g = outputOptions.mode) != null ? _g : mode),
+      client: (_y = (_x = outputOptions.client) != null ? _x : client) != null ? _y : import_core7.OutputClient.AXIOS_FUNCTIONS,
+      mode: normalizeOutputMode((_z = outputOptions.mode) != null ? _z : 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,
-      biome: (_o = (_n = outputOptions.biome) != null ? _n : biome) != null ? _o : false,
+      clean: (_B = (_A = outputOptions.clean) != null ? _A : clean) != null ? _B : false,
+      prettier: (_D = (_C = outputOptions.prettier) != null ? _C : prettier) != null ? _D : false,
+      tslint: (_F = (_E = outputOptions.tslint) != null ? _E : tslint) != null ? _F : false,
+      biome: (_H = (_G = outputOptions.biome) != null ? _G : biome) != null ? _H : false,
       tsconfig,
       packageJson,
-      headers: (_p = outputOptions.headers) != null ? _p : false,
-      indexFiles: (_q = outputOptions.indexFiles) != null ? _q : true,
+      headers: (_I = outputOptions.headers) != null ? _I : false,
+      indexFiles: (_J = outputOptions.indexFiles) != null ? _J : true,
       baseUrl: outputOptions.baseUrl,
-      unionAddMissingProperties: (_r = outputOptions.unionAddMissingProperties) != null ? _r : false,
+      unionAddMissingProperties: (_K = outputOptions.unionAddMissingProperties) != null ? _K : false,
       override: {
         ...outputOptions.override,
         mock: {
-          arrayMin: (_u = (_t = (_s = outputOptions.override) == null ? void 0 : _s.mock) == null ? void 0 : _t.arrayMin) != null ? _u : 1,
-          arrayMax: (_x = (_w = (_v = outputOptions.override) == null ? void 0 : _v.mock) == null ? void 0 : _w.arrayMax) != null ? _x : 10,
-          ...(_z = (_y = outputOptions.override) == null ? void 0 : _y.mock) != null ? _z : {}
+          arrayMin: (_N = (_M = (_L = outputOptions.override) == null ? void 0 : _L.mock) == null ? void 0 : _M.arrayMin) != null ? _N : 1,
+          arrayMax: (_Q = (_P = (_O = outputOptions.override) == null ? void 0 : _O.mock) == null ? void 0 : _P.arrayMax) != null ? _Q : 10,
+          ...(_S = (_R = outputOptions.override) == null ? void 0 : _R.mock) != null ? _S : {}
         },
         operations: normalizeOperationsAndTags(
-          (_B = (_A = outputOptions.override) == null ? void 0 : _A.operations) != null ? _B : {},
-          outputWorkspace
+          (_U = (_T = outputOptions.override) == null ? void 0 : _T.operations) != null ? _U : {},
+          outputWorkspace,
+          {
+            query: globalQueryOptions
+          }
         ),
         tags: normalizeOperationsAndTags(
-          (_D = (_C = outputOptions.override) == null ? void 0 : _C.tags) != null ? _D : {},
-          outputWorkspace
+          (_W = (_V = outputOptions.override) == null ? void 0 : _V.tags) != null ? _W : {},
+          outputWorkspace,
+          {
+            query: globalQueryOptions
+          }
         ),
         mutator: normalizeMutator(
           outputWorkspace,
-          (_E = outputOptions.override) == null ? void 0 : _E.mutator
+          (_X = outputOptions.override) == null ? void 0 : _X.mutator
         ),
-        formData: (_I = !(0, import_core7.isBoolean)((_F = outputOptions.override) == null ? void 0 : _F.formData) ? normalizeMutator(
+        formData: (_$ = !(0, import_core7.isBoolean)((_Y = outputOptions.override) == null ? void 0 : _Y.formData) ? normalizeMutator(
           outputWorkspace,
-          (_G = outputOptions.override) == null ? void 0 : _G.formData
-        ) : (_H = outputOptions.override) == null ? void 0 : _H.formData) != null ? _I : true,
-        formUrlEncoded: (_M = !(0, import_core7.isBoolean)((_J = outputOptions.override) == null ? void 0 : _J.formUrlEncoded) ? normalizeMutator(
+          (_Z = outputOptions.override) == null ? void 0 : _Z.formData
+        ) : (__ = outputOptions.override) == null ? void 0 : __.formData) != null ? _$ : true,
+        formUrlEncoded: (_da = !(0, import_core7.isBoolean)((_aa = outputOptions.override) == null ? void 0 : _aa.formUrlEncoded) ? normalizeMutator(
           outputWorkspace,
-          (_K = outputOptions.override) == null ? void 0 : _K.formUrlEncoded
-        ) : (_L = outputOptions.override) == null ? void 0 : _L.formUrlEncoded) != null ? _M : true,
+          (_ba = outputOptions.override) == null ? void 0 : _ba.formUrlEncoded
+        ) : (_ca = outputOptions.override) == null ? void 0 : _ca.formUrlEncoded) != null ? _da : true,
         paramsSerializer: normalizeMutator(
           outputWorkspace,
-          (_N = outputOptions.override) == null ? void 0 : _N.paramsSerializer
+          (_ea = outputOptions.override) == null ? void 0 : _ea.paramsSerializer
         ),
-        header: ((_O = outputOptions.override) == null ? void 0 : _O.header) === false ? false : (0, import_core7.isFunction)((_P = outputOptions.override) == null ? void 0 : _P.header) ? (_Q = outputOptions.override) == null ? void 0 : _Q.header : getDefaultFilesHeader,
-        requestOptions: (_S = (_R = outputOptions.override) == null ? void 0 : _R.requestOptions) != null ? _S : true,
+        header: ((_fa = outputOptions.override) == null ? void 0 : _fa.header) === false ? false : (0, import_core7.isFunction)((_ga = outputOptions.override) == null ? void 0 : _ga.header) ? (_ha = outputOptions.override) == null ? void 0 : _ha.header : getDefaultFilesHeader,
+        requestOptions: (_ja = (_ia = outputOptions.override) == null ? void 0 : _ia.requestOptions) != null ? _ja : true,
         components: {
           schemas: {
             suffix: import_core7.RefComponentSuffix.schemas,
-            itemSuffix: (_W = (_V = (_U = (_T = outputOptions.override) == null ? void 0 : _T.components) == null ? void 0 : _U.schemas) == null ? void 0 : _V.itemSuffix) != null ? _W : "Item",
-            ...(_Z = (_Y = (_X = outputOptions.override) == null ? void 0 : _X.components) == null ? void 0 : _Y.schemas) != null ? _Z : {}
+            itemSuffix: (_na = (_ma = (_la = (_ka = outputOptions.override) == null ? void 0 : _ka.components) == null ? void 0 : _la.schemas) == null ? void 0 : _ma.itemSuffix) != null ? _na : "Item",
+            ...(_qa = (_pa = (_oa = outputOptions.override) == null ? void 0 : _oa.components) == null ? void 0 : _pa.schemas) != null ? _qa : {}
           },
           responses: {
             suffix: import_core7.RefComponentSuffix.responses,
-            ...(_aa = (_$ = (__ = outputOptions.override) == null ? void 0 : __.components) == null ? void 0 : _$.responses) != null ? _aa : {}
+            ...(_ta = (_sa = (_ra = outputOptions.override) == null ? void 0 : _ra.components) == null ? void 0 : _sa.responses) != null ? _ta : {}
           },
           parameters: {
             suffix: import_core7.RefComponentSuffix.parameters,
-            ...(_da = (_ca = (_ba = outputOptions.override) == null ? void 0 : _ba.components) == null ? void 0 : _ca.parameters) != null ? _da : {}
+            ...(_wa = (_va = (_ua = outputOptions.override) == null ? void 0 : _ua.components) == null ? void 0 : _va.parameters) != null ? _wa : {}
           },
           requestBodies: {
             suffix: import_core7.RefComponentSuffix.requestBodies,
-            ...(_ga = (_fa = (_ea = outputOptions.override) == null ? void 0 : _ea.components) == null ? void 0 : _fa.requestBodies) != null ? _ga : {}
+            ...(_za = (_ya = (_xa = outputOptions.override) == null ? void 0 : _xa.components) == null ? void 0 : _ya.requestBodies) != null ? _za : {}
           }
         },
-        hono: normalizeHonoOptions((_ha = outputOptions.override) == null ? void 0 : _ha.hono, workspace),
+        hono: normalizeHonoOptions((_Aa = outputOptions.override) == null ? void 0 : _Aa.hono, workspace),
         query: {
-          useQuery: (_ka = (_ja = (_ia = outputOptions.override) == null ? void 0 : _ia.query) == null ? void 0 : _ja.useQuery) != null ? _ka : true,
-          useMutation: (_na = (_ma = (_la = outputOptions.override) == null ? void 0 : _la.query) == null ? void 0 : _ma.useMutation) != null ? _na : true,
-          signal: (_qa = (_pa = (_oa = outputOptions.override) == null ? void 0 : _oa.query) == null ? void 0 : _pa.signal) != null ? _qa : true,
-          shouldExportMutatorHooks: (_ta = (_sa = (_ra = outputOptions.override) == null ? void 0 : _ra.query) == null ? void 0 : _sa.shouldExportMutatorHooks) != null ? _ta : true,
-          shouldExportHttpClient: (_wa = (_va = (_ua = outputOptions.override) == null ? void 0 : _ua.query) == null ? void 0 : _va.shouldExportHttpClient) != null ? _wa : true,
-          shouldExportQueryKey: (_za = (_ya = (_xa = outputOptions.override) == null ? void 0 : _xa.query) == null ? void 0 : _ya.shouldExportQueryKey) != null ? _za : true,
-          ...normalizeQueryOptions((_Aa = outputOptions.override) == null ? void 0 : _Aa.query, workspace)
+          useQuery: (_Da = (_Ca = (_Ba = outputOptions.override) == null ? void 0 : _Ba.query) == null ? void 0 : _Ca.useQuery) != null ? _Da : true,
+          useMutation: (_Ga = (_Fa = (_Ea = outputOptions.override) == null ? void 0 : _Ea.query) == null ? void 0 : _Fa.useMutation) != null ? _Ga : true,
+          signal: (_Ja = (_Ia = (_Ha = outputOptions.override) == null ? void 0 : _Ha.query) == null ? void 0 : _Ia.signal) != null ? _Ja : true,
+          shouldExportMutatorHooks: (_Ma = (_La = (_Ka = outputOptions.override) == null ? void 0 : _Ka.query) == null ? void 0 : _La.shouldExportMutatorHooks) != null ? _Ma : true,
+          shouldExportHttpClient: (_Pa = (_Oa = (_Na = outputOptions.override) == null ? void 0 : _Na.query) == null ? void 0 : _Oa.shouldExportHttpClient) != null ? _Pa : true,
+          shouldExportQueryKey: (_Sa = (_Ra = (_Qa = outputOptions.override) == null ? void 0 : _Qa.query) == null ? void 0 : _Ra.shouldExportQueryKey) != null ? _Sa : true,
+          ...normalizeQueryOptions((_Ta = outputOptions.override) == null ? void 0 : _Ta.query, workspace)
         },
         zod: {
           strict: {
-            param: (_Ea = (_Da = (_Ca = (_Ba = outputOptions.override) == null ? void 0 : _Ba.zod) == null ? void 0 : _Ca.strict) == null ? void 0 : _Da.param) != null ? _Ea : false,
-            query: (_Ia = (_Ha = (_Ga = (_Fa = outputOptions.override) == null ? void 0 : _Fa.zod) == null ? void 0 : _Ga.strict) == null ? void 0 : _Ha.query) != null ? _Ia : false,
-            header: (_Ma = (_La = (_Ka = (_Ja = outputOptions.override) == null ? void 0 : _Ja.zod) == null ? void 0 : _Ka.strict) == null ? void 0 : _La.header) != null ? _Ma : false,
-            body: (_Qa = (_Pa = (_Oa = (_Na = outputOptions.override) == null ? void 0 : _Na.zod) == null ? void 0 : _Oa.strict) == null ? void 0 : _Pa.body) != null ? _Qa : false,
-            response: (_Ua = (_Ta = (_Sa = (_Ra = outputOptions.override) == null ? void 0 : _Ra.zod) == null ? void 0 : _Sa.strict) == null ? void 0 : _Ta.response) != null ? _Ua : false
+            param: (_Xa = (_Wa = (_Va = (_Ua = outputOptions.override) == null ? void 0 : _Ua.zod) == null ? void 0 : _Va.strict) == null ? void 0 : _Wa.param) != null ? _Xa : false,
+            query: (_$a = (__a = (_Za = (_Ya = outputOptions.override) == null ? void 0 : _Ya.zod) == null ? void 0 : _Za.strict) == null ? void 0 : __a.query) != null ? _$a : false,
+            header: (_db = (_cb = (_bb = (_ab = outputOptions.override) == null ? void 0 : _ab.zod) == null ? void 0 : _bb.strict) == null ? void 0 : _cb.header) != null ? _db : false,
+            body: (_hb = (_gb = (_fb = (_eb = outputOptions.override) == null ? void 0 : _eb.zod) == null ? void 0 : _fb.strict) == null ? void 0 : _gb.body) != null ? _hb : false,
+            response: (_lb = (_kb = (_jb = (_ib = outputOptions.override) == null ? void 0 : _ib.zod) == null ? void 0 : _jb.strict) == null ? void 0 : _kb.response) != null ? _lb : false
           },
           coerce: {
-            param: (_Ya = (_Xa = (_Wa = (_Va = outputOptions.override) == null ? void 0 : _Va.zod) == null ? void 0 : _Wa.coerce) == null ? void 0 : _Xa.param) != null ? _Ya : false,
-            query: (_ab = (_$a = (__a = (_Za = outputOptions.override) == null ? void 0 : _Za.zod) == null ? void 0 : __a.coerce) == null ? void 0 : _$a.query) != null ? _ab : false,
-            header: (_eb = (_db = (_cb = (_bb = outputOptions.override) == null ? void 0 : _bb.zod) == null ? void 0 : _cb.coerce) == null ? void 0 : _db.header) != null ? _eb : false,
-            body: (_ib = (_hb = (_gb = (_fb = outputOptions.override) == null ? void 0 : _fb.zod) == null ? void 0 : _gb.coerce) == null ? void 0 : _hb.body) != null ? _ib : false,
-            response: (_mb = (_lb = (_kb = (_jb = outputOptions.override) == null ? void 0 : _jb.zod) == null ? void 0 : _kb.coerce) == null ? void 0 : _lb.response) != null ? _mb : false
+            param: (_pb = (_ob = (_nb = (_mb = outputOptions.override) == null ? void 0 : _mb.zod) == null ? void 0 : _nb.coerce) == null ? void 0 : _ob.param) != null ? _pb : false,
+            query: (_tb = (_sb = (_rb = (_qb = outputOptions.override) == null ? void 0 : _qb.zod) == null ? void 0 : _rb.coerce) == null ? void 0 : _sb.query) != null ? _tb : false,
+            header: (_xb = (_wb = (_vb = (_ub = outputOptions.override) == null ? void 0 : _ub.zod) == null ? void 0 : _vb.coerce) == null ? void 0 : _wb.header) != null ? _xb : false,
+            body: (_Bb = (_Ab = (_zb = (_yb = outputOptions.override) == null ? void 0 : _yb.zod) == null ? void 0 : _zb.coerce) == null ? void 0 : _Ab.body) != null ? _Bb : false,
+            response: (_Fb = (_Eb = (_Db = (_Cb = outputOptions.override) == null ? void 0 : _Cb.zod) == null ? void 0 : _Db.coerce) == null ? void 0 : _Eb.response) != null ? _Fb : false
           },
           preprocess: {
-            ...((_pb = (_ob = (_nb = outputOptions.override) == null ? void 0 : _nb.zod) == null ? void 0 : _ob.preprocess) == null ? void 0 : _pb.param) ? {
+            ...((_Ib = (_Hb = (_Gb = outputOptions.override) == null ? void 0 : _Gb.zod) == null ? void 0 : _Hb.preprocess) == null ? void 0 : _Ib.param) ? {
               param: normalizeMutator(
                 workspace,
                 outputOptions.override.zod.preprocess.param
               )
             } : {},
-            ...((_sb = (_rb = (_qb = outputOptions.override) == null ? void 0 : _qb.zod) == null ? void 0 : _rb.preprocess) == null ? void 0 : _sb.query) ? {
+            ...((_Lb = (_Kb = (_Jb = outputOptions.override) == null ? void 0 : _Jb.zod) == null ? void 0 : _Kb.preprocess) == null ? void 0 : _Lb.query) ? {
               query: normalizeMutator(
                 workspace,
                 outputOptions.override.zod.preprocess.query
               )
             } : {},
-            ...((_vb = (_ub = (_tb = outputOptions.override) == null ? void 0 : _tb.zod) == null ? void 0 : _ub.preprocess) == null ? void 0 : _vb.header) ? {
+            ...((_Ob = (_Nb = (_Mb = outputOptions.override) == null ? void 0 : _Mb.zod) == null ? void 0 : _Nb.preprocess) == null ? void 0 : _Ob.header) ? {
               header: normalizeMutator(
                 workspace,
                 outputOptions.override.zod.preprocess.header
               )
             } : {},
-            ...((_yb = (_xb = (_wb = outputOptions.override) == null ? void 0 : _wb.zod) == null ? void 0 : _xb.preprocess) == null ? void 0 : _yb.body) ? {
+            ...((_Rb = (_Qb = (_Pb = outputOptions.override) == null ? void 0 : _Pb.zod) == null ? void 0 : _Qb.preprocess) == null ? void 0 : _Rb.body) ? {
               body: normalizeMutator(
                 workspace,
                 outputOptions.override.zod.preprocess.body
               )
             } : {},
-            ...((_Bb = (_Ab = (_zb = outputOptions.override) == null ? void 0 : _zb.zod) == null ? void 0 : _Ab.preprocess) == null ? void 0 : _Bb.response) ? {
+            ...((_Ub = (_Tb = (_Sb = outputOptions.override) == null ? void 0 : _Sb.zod) == null ? void 0 : _Tb.preprocess) == null ? void 0 : _Ub.response) ? {
               response: normalizeMutator(
                 workspace,
                 outputOptions.override.zod.preprocess.response
@@ -4277,19 +4298,19 @@ var normalizeOptions = async (optionsExport, workspace = process.cwd(), globalOp
           }
         },
         swr: {
-          ...(_Db = (_Cb = outputOptions.override) == null ? void 0 : _Cb.swr) != null ? _Db : {}
+          ...(_Wb = (_Vb = outputOptions.override) == null ? void 0 : _Vb.swr) != null ? _Wb : {}
         },
         angular: {
-          provideIn: (_Gb = (_Fb = (_Eb = outputOptions.override) == null ? void 0 : _Eb.angular) == null ? void 0 : _Fb.provideIn) != null ? _Gb : "root"
+          provideIn: (_Zb = (_Yb = (_Xb = outputOptions.override) == null ? void 0 : _Xb.angular) == null ? void 0 : _Yb.provideIn) != null ? _Zb : "root"
         },
-        useDates: ((_Hb = outputOptions.override) == null ? void 0 : _Hb.useDates) || false,
-        useDeprecatedOperations: (_Jb = (_Ib = outputOptions.override) == null ? void 0 : _Ib.useDeprecatedOperations) != null ? _Jb : true,
-        useNativeEnums: (_Lb = (_Kb = outputOptions.override) == null ? void 0 : _Kb.useNativeEnums) != null ? _Lb : false,
-        suppressReadonlyModifier: ((_Mb = outputOptions.override) == null ? void 0 : _Mb.suppressReadonlyModifier) || false
+        useDates: ((__b = outputOptions.override) == null ? void 0 : __b.useDates) || false,
+        useDeprecatedOperations: (_ac = (_$b = outputOptions.override) == null ? void 0 : _$b.useDeprecatedOperations) != null ? _ac : true,
+        useNativeEnums: (_cc = (_bc = outputOptions.override) == null ? void 0 : _bc.useNativeEnums) != null ? _cc : false,
+        suppressReadonlyModifier: ((_dc = outputOptions.override) == null ? void 0 : _dc.suppressReadonlyModifier) || false
       },
-      allParamsOptional: (_Nb = outputOptions.allParamsOptional) != null ? _Nb : false,
-      urlEncodeParameters: (_Ob = outputOptions.urlEncodeParameters) != null ? _Ob : false,
-      optionsParamRequired: (_Pb = outputOptions.optionsParamRequired) != null ? _Pb : false
+      allParamsOptional: (_ec = outputOptions.allParamsOptional) != null ? _ec : false,
+      urlEncodeParameters: (_fc = outputOptions.urlEncodeParameters) != null ? _fc : false,
+      optionsParamRequired: (_gc = outputOptions.optionsParamRequired) != null ? _gc : false
     },
     hooks: options.hooks ? normalizeHooks(options.hooks) : {}
   };
@@ -4342,7 +4363,7 @@ var normalizePath = (path, workspace) => {
   }
   return import_core7.upath.resolve(workspace, path);
 };
-var normalizeOperationsAndTags = (operationsOrTags, workspace) => {
+var normalizeOperationsAndTags = (operationsOrTags, workspace, global2) => {
   return Object.fromEntries(
     Object.entries(operationsOrTags).map(
       ([
@@ -4364,7 +4385,7 @@ var normalizeOperationsAndTags = (operationsOrTags, workspace) => {
           {
             ...rest,
             ...query2 ? {
-              query: normalizeQueryOptions(query2, workspace)
+              query: normalizeQueryOptions(query2, workspace, global2.query)
             } : {},
             ...zod2 ? {
               zod: {
@@ -4480,7 +4501,8 @@ var normalizeHonoOptions = (hono2 = {}, workspace) => {
     validator: (_a = hono2.validator) != null ? _a : true
   };
 };
-var normalizeQueryOptions = (queryOptions = {}, outputWorkspace) => {
+var normalizeQueryOptions = (queryOptions = {}, outputWorkspace, globalOptions = {}) => {
+  var _a, _b, _c, _d;
   if (queryOptions.options) {
     console.warn(
       "[WARN] Using query options is deprecated and will be removed in a future major release. Please use queryOptions or mutationOptions instead."
@@ -4495,25 +4517,37 @@ var normalizeQueryOptions = (queryOptions = {}, outputWorkspace) => {
     ...!(0, import_core7.isUndefined)(queryOptions.useSuspenseInfiniteQuery) ? { useSuspenseInfiniteQuery: queryOptions.useSuspenseInfiniteQuery } : {},
     ...queryOptions.useInfiniteQueryParam ? { useInfiniteQueryParam: queryOptions.useInfiniteQueryParam } : {},
     ...queryOptions.options ? { options: queryOptions.options } : {},
+    ...globalOptions.queryKey ? {
+      queryKey: globalOptions.queryKey
+    } : {},
     ...(queryOptions == null ? void 0 : queryOptions.queryKey) ? {
       queryKey: normalizeMutator(outputWorkspace, queryOptions == null ? void 0 : queryOptions.queryKey)
     } : {},
+    ...globalOptions.queryOptions ? {
+      queryOptions: globalOptions.queryOptions
+    } : {},
     ...(queryOptions == null ? void 0 : queryOptions.queryOptions) ? {
       queryOptions: normalizeMutator(
         outputWorkspace,
         queryOptions == null ? void 0 : queryOptions.queryOptions
       )
     } : {},
+    ...globalOptions.mutationOptions ? {
+      mutationOptions: globalOptions.mutationOptions
+    } : {},
     ...(queryOptions == null ? void 0 : queryOptions.mutationOptions) ? {
       mutationOptions: normalizeMutator(
         outputWorkspace,
         queryOptions == null ? void 0 : queryOptions.mutationOptions
       )
     } : {},
-    ...!(0, import_core7.isUndefined)(queryOptions.shouldExportMutatorHooks) ? { shouldExportMutatorHooks: queryOptions.shouldExportMutatorHooks } : {},
-    ...!(0, import_core7.isUndefined)(queryOptions.shouldExportQueryKey) ? { shouldExportQueryKey: queryOptions.shouldExportQueryKey } : {},
-    ...!(0, import_core7.isUndefined)(queryOptions.shouldExportHttpClient) ? { shouldExportHttpClient: queryOptions.shouldExportHttpClient } : {},
-    ...!(0, import_core7.isUndefined)(queryOptions.signal) ? { signal: queryOptions.signal } : {},
+    shouldExportQueryKey: (_a = queryOptions.shouldExportQueryKey) != null ? _a : globalOptions.shouldExportQueryKey,
+    shouldExportHttpClient: (_b = queryOptions.shouldExportHttpClient) != null ? _b : globalOptions.shouldExportHttpClient,
+    shouldExportMutatorHooks: (_c = queryOptions.shouldExportMutatorHooks) != null ? _c : globalOptions.shouldExportMutatorHooks,
+    signal: (_d = queryOptions.signal) != null ? _d : globalOptions.signal,
+    ...!(0, import_core7.isUndefined)(globalOptions.version) ? {
+      version: globalOptions.version
+    } : {},
     ...!(0, import_core7.isUndefined)(queryOptions.version) ? { version: queryOptions.version } : {}
   };
 };