fix: 🐛 module config handler context

dolliejs · Sep 2, 2021 · 2828ce9 · 2828ce9
1 parent 38ba52d
commit 2828ce9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/packages/dollie-core/src/generators/module.generator.ts b/packages/dollie-core/src/generators/module.generator.ts
@@ -13,7 +13,10 @@ import {
 import Generator from '../generator.abstract';
 import * as _ from 'lodash';
 import {
-  diff, parseFileTextToMergeBlocks, parseMergeBlocksToText,
+  diff,
+  parseFileTextToMergeBlocks,
+  parseMergeBlocksToText,
+  parseDiffToMergeBlocks,
 } from '../diff';
 import {
   ParameterInvalidError,
@@ -152,7 +155,7 @@ class ModuleGenerator extends Generator implements Generator {
           lodash: _,
         },
         exists: this.exists.bind(this),
-        getEntity: this.getEntity.bind(this),
+        getFileContent: this.getFileContent.bind(this),
       });
 
       if (_.isBoolean(result) && !result) {
@@ -350,7 +353,7 @@ class ModuleGenerator extends Generator implements Generator {
         lodash: _,
       },
       exists: this.exists.bind(this),
-      getEntity: this.getEntity.bind(this),
+      getFileContent: this.getFileContent.bind(this),
     };
 
     const patterns = {};
@@ -385,12 +388,17 @@ class ModuleGenerator extends Generator implements Generator {
     return false;
   }
 
-  private async exists(pathname: string) {
+  private exists(pathname: string) {
     return this.files.findIndex((file) => file.relativeOriginalPathname === pathname) !== -1;
   }
 
-  private async getEntity(pathname: string) {
-    return this.files.find((file) => file.absoluteOriginalPathname === pathname);
+  private getFileContent(pathname: string) {
+    const diffs = this.cacheTable[pathname];
+    if (!_.isArray(diffs) || diffs.length === 0) {
+      return '';
+    }
+    const currentFileDiff = diffs[0];
+    return parseMergeBlocksToText(parseDiffToMergeBlocks(currentFileDiff));
   }
 }
 

diff --git a/packages/dollie-core/src/interfaces.ts b/packages/dollie-core/src/interfaces.ts
@@ -95,15 +95,15 @@ export type TemplateCleanUpFunction = (data: TemplateCleanupData) => void;
 export type ExtendTemplateConfig = Record<string, Omit<TemplateConfig, 'extendTemplates'>>;
 
 export type ModuleEntityAlias = Record<string, string>;
-export type EntityExistenceChecker = (pathname: string) => Promise<boolean>;
-export type EntityReader = (pathname: string) => Promise<TemplateFileItem>;
+export type EntityExistenceChecker = (pathname: string) => boolean;
+export type EntityReader = (pathname: string) => FileContent;
 
 export interface ModuleConfigHandlerContext {
   moduleId: string;
   props: InquirerAnswers;
   context: GeneralHandlerContext;
   exists: EntityExistenceChecker;
-  getEntity: EntityReader;
+  getFileContent: EntityReader;
 }
 
 export type ModuleDeleteConfigHandler = (data: ModuleConfigHandlerContext) => Promise<string | string[]>;