feat: useMutationEffects now generates correct types on generate

Author: jurerotar

package.json

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

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;

src/generators/utils/generate-files.utils.ts

@@ -1,10 +1,6 @@
 import { ACL_APP_ABILITY_FILE, ACL_CHECK_FILE } from "@/generators/const/acl.const";
-import {
-  APP_REST_CLIENT_FILE,
-  CROSS_TAB_QUERY_INVALIDATION_FILE,
-  QUERY_MODULES_FILE,
-  ZOD_EXTENDED_FILE,
-} from "@/generators/const/deps.const";
+import { APP_REST_CLIENT_FILE, CROSS_TAB_QUERY_INVALIDATION_FILE, MUTATION_EFFECTS_FILE, QUERY_MODULES_FILE, ZOD_EXTENDED_FILE } from "@/generators/const/deps.const";
+import { PACKAGE_IMPORT_PATH } from "@/generators/const/package.const";
 import { DEFAULT_GENERATE_OPTIONS } from "@/generators/const/options.const";
 import { SchemaResolver } from "@/generators/core/SchemaResolver.class";
 import { generateAppAcl } from "@/generators/generate/generateAcl";
@@ -50,7 +46,7 @@ export function getMutationEffectsFiles(data: GenerateData, resolver: SchemaReso
   }
 
   return [
-    ...getAssetFiles([CROSS_TAB_QUERY_INVALIDATION_FILE], resolver),
+    ...getAssetFiles([MUTATION_EFFECTS_FILE, CROSS_TAB_QUERY_INVALIDATION_FILE], resolver),
     {
       fileName: getOutputFileName({
         output: resolver.options.output,
@@ -100,8 +96,17 @@ function getAssetFiles(files: GenerateFile[], resolver: SchemaResolver): Generat
 
 function getAssetFile(file: GenerateFile, resolver: SchemaResolver): GenerateFileData {
   const fileName = getFileNameWithExtension(file);
+  let content = readAssetSync(fileName);
+
+  if (file.fileName === MUTATION_EFFECTS_FILE.fileName) {
+    content = content.replace(
+      'import { OpenApiQueryConfig, QueryModule, InvalidationMap } from "../lib/config/queryConfig.context";',
+      `import { OpenApiQueryConfig, InvalidationMap } from "${PACKAGE_IMPORT_PATH}";\nimport { QueryModule } from "./${QUERY_MODULES_FILE.fileName}";`,
+    );
+  }
+
   return {
     fileName: getOutputFileName({ output: resolver.options.output, fileName }),
-    content: readAssetSync(fileName),
+    content,
   };
 }

src/generators/utils/generate/generate.utils.ts

@@ -53,8 +53,8 @@ export function getQueryModulesImportPath(options: GenerateOptions) {
   return `${getImportPath(options)}${QUERY_MODULES_FILE.fileName}`;
 }
 
-export function getMutationEffectsImportPath(_options: GenerateOptions) {
-  return "@povio/openapi-codegen-cli";
+export function getMutationEffectsImportPath(options: GenerateOptions) {
+  return `${getImportPath(options)}${MUTATION_EFFECTS_FILE.fileName}`;
 }
 
 export function getAclCheckImportPath(options: GenerateOptions) {

src/index.ts

@@ -17,10 +17,7 @@ export type { AppQueryOptions, AppMutationOptions, AppInfiniteQueryOptions } fro
 // Config
 export { OpenApiRouter } from "./lib/config/router.context";
 export { OpenApiQueryConfig } from "./lib/config/queryConfig.context";
-
-// Hooks / Utilities
-export { useMutationEffects } from "./assets/useMutationEffects";
-export type { MutationEffectsOptions, UseMutationEffectsProps } from "./assets/useMutationEffects";
+export type { InvalidationMap } from "./lib/config/queryConfig.context";
 
 // i18n resources (for consumer apps to merge into their i18n config)
 export { ns, resources } from "./lib/config/i18n";