@povio/openapi-codegen-cli 2.0.8-rc.3 → 2.0.8-rc.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@povio/openapi-codegen-cli",
-  "version": "2.0.8-rc.3",
+  "version": "2.0.8-rc.5",
   "keywords": [
     "codegen",
     "openapi",

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";
 
@@ -28,43 +27,37 @@ export function useMutationEffects({ currentModule }: UseMutationEffectsProps) {
   }, [queryClient, config.crossTabInvalidation]);
 
   const runMutationEffects = useCallback(
-    async <TData, TVariables>(
-      data: TData,
-      variables: TVariables,
-      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);
+    async <TData, TVariables>(data: TData, variables: TVariables, options: MutationEffectsOptions = {}, updateKeys?: QueryKey[]) => {
+      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 +75,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/query-modules.hbs

@@ -1,9 +1,5 @@
-import { QueryModule as BaseQueryModule } from "../lib/config/queryConfig.context";
-
 export const enum QueryModule {
    {{#each modules as | module |}}
    {{module.tag}} = "{{module.namespace}}",
    {{/each}}
 }
-
-export type QueryModuleType = QueryModule | BaseQueryModule;

package/dist/assets/useCrossTabQueryInvalidation.mjs

@@ -1,23 +0,0 @@
-const CROSS_TAB_INVALIDATE_KEY = "__rq_invalidate__";
-const broadcastQueryInvalidation = (queryKeys) => {
-  localStorage.setItem(CROSS_TAB_INVALIDATE_KEY, JSON.stringify({ keys: queryKeys, timestamp: Date.now() }));
-};
-let isListenerSetUp = false;
-const setupCrossTabListener = (queryClient) => {
-  if (isListenerSetUp) return;
-  isListenerSetUp = true;
-  window.addEventListener("storage", (e) => {
-    if (e.key !== CROSS_TAB_INVALIDATE_KEY || !e.newValue) return;
-    try {
-      const { keys } = JSON.parse(e.newValue);
-      for (const queryKey of keys) {
-        queryClient.invalidateQueries({ queryKey });
-      }
-    } catch {
-    }
-  });
-};
-export {
-  broadcastQueryInvalidation,
-  setupCrossTabListener
-};

package/dist/assets/useMutationEffects.mjs

@@ -1,56 +0,0 @@
-import { useEffect, useCallback } from "react";
-import { useQueryClient } from "@tanstack/react-query";
-import { OpenApiQueryConfig } from "../lib/config/queryConfig.context.mjs";
-import { setupCrossTabListener, broadcastQueryInvalidation } from "./useCrossTabQueryInvalidation.mjs";
-function useMutationEffects({ currentModule }) {
-  const queryClient = useQueryClient();
-  const config = OpenApiQueryConfig.useConfig();
-  useEffect(() => {
-    if (!config.crossTabInvalidation) return;
-    setupCrossTabListener(queryClient);
-  }, [queryClient, config.crossTabInvalidation]);
-  const runMutationEffects = useCallback(
-    async (data, variables, options = {}, updateKeys) => {
-      const {
-        invalidateCurrentModule = true,
-        invalidateModules,
-        invalidateKeys,
-        preferUpdate,
-        invalidationMap
-      } = options;
-      const shouldUpdate = preferUpdate || preferUpdate === void 0 && config.preferUpdate;
-      const shouldInvalidateCurrentModule = invalidateCurrentModule || invalidateCurrentModule === void 0 && config.invalidateCurrentModule;
-      const isQueryKeyEqual = (keyA, keyB) => keyA.length === keyB.length && keyA.every((item, index) => item === keyB[index]);
-      const invalidatedQueryKeys = [];
-      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) => isQueryKeyEqual(queryKey, key));
-          const map = (invalidationMap || config.invalidationMap)?.[currentModule]?.(data, variables);
-          const isMappedKey = !!map && map.some((key) => isQueryKeyEqual(queryKey, key));
-          const shouldInvalidate = isCurrentModule || isInvalidateModule || isInvalidateKey || isMappedKey;
-          if (shouldInvalidate && config.crossTabInvalidation) {
-            invalidatedQueryKeys.push([...queryKey]);
-          }
-          return shouldInvalidate;
-        }
-      });
-      if (config.crossTabInvalidation && invalidatedQueryKeys.length > 0) {
-        broadcastQueryInvalidation(invalidatedQueryKeys);
-      }
-      if (shouldUpdate && updateKeys) {
-        updateKeys.map((queryKey) => queryClient.setQueryData(queryKey, data));
-      }
-    },
-    [queryClient, currentModule, config.preferUpdate, config.invalidationMap, config.crossTabInvalidation]
-  );
-  return { runMutationEffects };
-}
-export {
-  useMutationEffects
-};