@povio/openapi-codegen-cli 2.0.8-rc.4 → 2.0.8-rc.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@povio/openapi-codegen-cli",
-  "version": "2.0.8-rc.4",
+  "version": "2.0.8-rc.41",
   "keywords": [
     "codegen",
     "openapi",
@@ -63,7 +63,7 @@
     "dev:check": "yarn start check --config ./test/config.ts"
   },
   "dependencies": {
-    "i18next": "^25.8.10",
+    "i18next": "^25.8.11",
     "import-fresh": "^3.3.1"
   },
   "devDependencies": {
@@ -71,29 +71,28 @@
     "@casl/ability": "^6.8.0",
     "@casl/react": "^5.0.1",
     "@tanstack/react-query": "~5.90.21",
-    "@types/node": "^20.19.33",
+    "@types/node": "^25.3.0",
     "@types/prompt-sync": "^4.2.3",
     "@types/react": "^19.2.14",
     "@types/yargs": "^17.0.35",
     "@vitejs/plugin-react": "^5.1.4",
     "axios": "^1.13.5",
-    "esbuild": "0.25.12",
+    "esbuild": "0.27.3",
     "handlebars": "^4.7.8",
     "openapi-types": "^12.1.3",
-    "oxfmt": "^0.33.0",
-    "oxlint": "^1.48.0",
-    "oxlint-tsgolint": "^0.14.0",
+    "oxfmt": "^0.34.0",
+    "oxlint": "^1.49.0",
+    "oxlint-tsgolint": "^0.14.1",
     "prompt-sync": "^4.2.0",
     "react": "^19.2.4",
     "reflect-metadata": "^0.2.2",
-    "ts-node": "^10.9.2",
     "ts-pattern": "^5.9.0",
     "tsx": "^4.21.0",
-    "type-fest": "^4.41.0",
+    "type-fest": "^5.4.4",
     "typescript": "^5.9.3",
     "vite": "^7.3.1",
     "vite-plugin-dts": "^4.5.4",
-    "vitest": "3.2.4",
+    "vitest": "4.0.18",
     "yargs": "^17.7.2",
     "zod": "^4.3.6"
   },

package/src/assets/useMutationEffects.ts

@@ -1,7 +1,6 @@
 import { useCallback, useEffect } from "react";
 
 import { QueryKey, useQueryClient } from "@tanstack/react-query";
-
 import { OpenApiQueryConfig, QueryModule, InvalidationMap } from "../lib/config/queryConfig.context";
 import { broadcastQueryInvalidation, setupCrossTabListener } from "./useCrossTabQueryInvalidation";
 
@@ -34,37 +33,36 @@ export function useMutationEffects({ currentModule }: UseMutationEffectsProps) {
       options: MutationEffectsOptions = {},
       updateKeys?: QueryKey[],
     ) => {
-      const {
-        invalidateCurrentModule = true,
-        invalidateModules,
-        invalidateKeys,
-        preferUpdate,
-        invalidationMap,
-      } = options;
-      const shouldUpdate = preferUpdate || (preferUpdate === undefined && config.preferUpdate);
-      const shouldInvalidateCurrentModule =
-        invalidateCurrentModule || (invalidateCurrentModule === undefined && config.invalidateCurrentModule);
+      const { invalidateCurrentModule, invalidateModules, invalidateKeys, preferUpdate } = options;
+      const shouldUpdate = preferUpdate ?? config.preferUpdate ?? false;
+      const shouldInvalidateCurrentModule = invalidateCurrentModule ?? config.invalidateCurrentModule ?? true;
 
       const isQueryKeyEqual = (keyA: QueryKey, keyB: QueryKey) =>
         keyA.length === keyB.length && keyA.every((item, index) => item === keyB[index]);
+      const isQueryKeyPrefix = (queryKey: QueryKey, prefixKey: QueryKey) =>
+        prefixKey.length <= queryKey.length && prefixKey.every((item, index) => item === queryKey[index]);
+      const mappedInvalidationKeys = config.invalidationMap?.[currentModule]?.(data, variables);
 
-      const invalidatedQueryKeys: QueryKey[] = [];
+      const shouldInvalidateQuery = (queryKey: QueryKey) => {
+        const isUpdateKey = updateKeys?.some((key) => isQueryKeyEqual(queryKey, key));
+        if (shouldUpdate && isUpdateKey) {
+          return false;
+        }
 
-      queryClient.invalidateQueries({
-        predicate: ({ queryKey }) => {
-          const isUpdateKey = updateKeys?.some((key) => isQueryKeyEqual(queryKey, key));
-          if (shouldUpdate && isUpdateKey) {
-            return false;
-          }
+        const isCurrentModule = shouldInvalidateCurrentModule && queryKey[0] === currentModule;
+        const isInvalidateModule = !!invalidateModules && invalidateModules.some((module) => queryKey[0] === module);
+        const isInvalidateKey = !!invalidateKeys && invalidateKeys.some((key) => isQueryKeyPrefix(queryKey, key));
+        const isMappedKey =
+          !!mappedInvalidationKeys && mappedInvalidationKeys.some((key) => isQueryKeyPrefix(queryKey, key));
 
-          const isCurrentModule = shouldInvalidateCurrentModule && queryKey[0] === currentModule;
-          const isInvalidateModule = !!invalidateModules && invalidateModules.some((module) => queryKey[0] === module);
-          const isInvalidateKey = !!invalidateKeys && invalidateKeys.some((key) => isQueryKeyEqual(queryKey, key));
+        return isCurrentModule || isInvalidateModule || isInvalidateKey || isMappedKey;
+      };
 
-          const map = (invalidationMap || config.invalidationMap)?.[currentModule]?.(data, variables);
-          const isMappedKey = !!map && map.some((key) => isQueryKeyEqual(queryKey, key));
+      const invalidatedQueryKeys: QueryKey[] = [];
 
-          const shouldInvalidate = isCurrentModule || isInvalidateModule || isInvalidateKey || isMappedKey;
+      queryClient.invalidateQueries({
+        predicate: ({ queryKey }) => {
+          const shouldInvalidate = shouldInvalidateQuery(queryKey);
 
           if (shouldInvalidate && config.crossTabInvalidation) {
             invalidatedQueryKeys.push([...queryKey]);
@@ -82,7 +80,14 @@ export function useMutationEffects({ currentModule }: UseMutationEffectsProps) {
         updateKeys.map((queryKey) => queryClient.setQueryData(queryKey, data));
       }
     },
-    [queryClient, currentModule, config.preferUpdate, config.invalidationMap, config.crossTabInvalidation],
+    [
+      queryClient,
+      currentModule,
+      config.preferUpdate,
+      config.invalidateCurrentModule,
+      config.invalidationMap,
+      config.crossTabInvalidation,
+    ],
   );
 
   return { runMutationEffects };

package/src/generators/templates/partials/query-use-infinite-query.hbs

@@ -1,9 +1,10 @@
 {{! Js docs }}
 {{{genQueryJsDocs endpoint infiniteQuery=true}}}
 {{! Infinite query definition}}
-export const {{infiniteQueryName endpoint}} = <TData>({{#if (endpointParams endpoint)}}{ {{{endpointArgs endpoint excludePageParam=true}}} }: { {{{genEndpointParams endpoint excludePageParam=true}}} }, {{/if}}options?: AppInfiniteQueryOptions<typeof {{importedEndpointName endpoint}}, TData>{{#if hasAxiosRequestConfig}}, {{axiosRequestConfigName}}?: {{axiosRequestConfigType}}{{/if}}) => {
+export const {{infiniteQueryName endpoint}} = <TData>({{#if (endpointParams endpoint)}}{{#if (endpointParamsAllOptional endpoint excludePageParam=true)}}params: { {{{genEndpointParams endpoint excludePageParam=true}}} } = {}{{else}}{ {{{endpointArgs endpoint excludePageParam=true}}} }: { {{{genEndpointParams endpoint excludePageParam=true}}} }{{/if}}, {{/if}}options?: AppInfiniteQueryOptions<typeof {{importedEndpointName endpoint}}, TData>{{#if hasAxiosRequestConfig}}, {{axiosRequestConfigName}}?: {{axiosRequestConfigType}}{{/if}}) => {
   {{! Use acl check }}
   {{#if hasAclCheck}}const { checkAcl } = {{aclCheckHook}}();{{/if}}
+  {{#if (endpointParams endpoint)}}{{#if (endpointParamsAllOptional endpoint excludePageParam=true)}}const { {{{endpointArgs endpoint excludePageParam=true}}} } = params;{{/if}}{{/if}}
 
   return {{infiniteQueryHook}}({
     queryKey: keys.{{endpointName endpoint}}Infinite({{#if (endpointParams endpoint)}}{{{endpointArgs endpoint excludePageParam=true}}}{{/if}}),
@@ -18,4 +19,4 @@ export const {{infiniteQueryName endpoint}} = <TData>({{#if (endpointParams endp
     },
     ...options,
   });
-};
+};

package/src/generators/templates/partials/query-use-query.hbs

@@ -1,10 +1,11 @@
 {{! Js docs }}
 {{{genQueryJsDocs endpoint query=true}}}
 {{! Query definition}}
-export const {{queryName endpoint}} = <TData>({{#if (endpointParams endpoint)}}{ {{{endpointArgs endpoint}}} }: { {{{genEndpointParams endpoint}}} }, {{/if}}options?: AppQueryOptions<typeof {{importedEndpointName endpoint}}, TData>{{#if hasAxiosRequestConfig}}, {{axiosRequestConfigName}}?: {{axiosRequestConfigType}}{{/if}}) => {
+export const {{queryName endpoint}} = <TData>({{#if (endpointParams endpoint)}}{{#if (endpointParamsAllOptional endpoint)}}params: { {{{genEndpointParams endpoint}}} } = {}{{else}}{ {{{endpointArgs endpoint}}} }: { {{{genEndpointParams endpoint}}} }{{/if}}, {{/if}}options?: AppQueryOptions<typeof {{importedEndpointName endpoint}}, TData>{{#if hasAxiosRequestConfig}}, {{axiosRequestConfigName}}?: {{axiosRequestConfigType}}{{/if}}) => {
   {{! Use acl check }}
   {{#if hasAclCheck}}const { checkAcl } = {{aclCheckHook}}();{{/if}}
-  
+  {{#if (endpointParams endpoint)}}{{#if (endpointParamsAllOptional endpoint)}}const { {{{endpointArgs endpoint}}} } = params;{{/if}}{{/if}}
+
   return {{queryHook}}({
     queryKey: keys.{{endpointName endpoint}}({{#if (endpointParams endpoint)}}{{{endpointArgs endpoint}}}{{/if}}),
     queryFn: {{#if hasQueryFn}}() => {{#if hasQueryFnBody}}{ {{/if}} 
@@ -13,4 +14,4 @@ export const {{queryName endpoint}} = <TData>({{#if (endpointParams endpoint)}}{
     {{#if hasQueryFnBody}} }{{/if}},
     ...options,
   });
-};
+};