fix: 🐛 template identities

dolliejs · Sep 15, 2021 · df5f24f · df5f24f
1 parent 440fab1
commit df5f24f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/packages/dollie-core/src/constants.ts b/packages/dollie-core/src/constants.ts
@@ -2,7 +2,7 @@ const TEMPLATE_CACHE_PATHNAME_PREFIX = '/template';
 const EXTEND_TEMPLATE_LABEL_PREFIX = 'extend:';
 const EXTEND_TEMPLATE_PATHNAME_PREFIX = '/extends';
 const MAIN_TEMPLATE_PATHNAME_PREFIX = '/main';
-const TEMPLATE_FILE_PREFIX = '__template.';
+const TEMPLATE_FILE_IDENTITY = '__template.';
 const TEMPLATE_CONFIG_FILE_NAMES = [
   'dollie.js',
   '.dollie.js',
@@ -16,7 +16,7 @@ export {
   EXTEND_TEMPLATE_LABEL_PREFIX,
   EXTEND_TEMPLATE_PATHNAME_PREFIX,
   MAIN_TEMPLATE_PATHNAME_PREFIX,
-  TEMPLATE_FILE_PREFIX,
+  TEMPLATE_FILE_IDENTITY,
   TEMPLATE_CONFIG_FILE_NAMES,
   EXTEND_TEMPLATE_PREFIX,
 };
diff --git a/packages/dollie-core/src/generators/module.generator.ts b/packages/dollie-core/src/generators/module.generator.ts
@@ -26,7 +26,7 @@ import {
   ModulePropsIncompatibleError,
 } from '../errors';
 import {
-  TEMPLATE_CACHE_PATHNAME_PREFIX, MAIN_TEMPLATE_PATHNAME_PREFIX,
+  TEMPLATE_CACHE_PATHNAME_PREFIX,
 } from '../constants';
 import {
   readTemplateEntities,
@@ -43,7 +43,6 @@ import {
   FileContent,
 } from '@dollie/utils';
 import ejs from 'ejs';
-import path from 'path';
 
 class ModuleGenerator extends Generator implements Generator {
   private modulePathname: string;
@@ -52,7 +51,6 @@ class ModuleGenerator extends Generator implements Generator {
   private moduleProps: InquirerAnswers = {};
   private fileTable: FileTable = {};
   private projectMergeTable: MergeTable = {};
-  private threeFactorCompareTable: FileTable = {};
 
   public constructor(
     templateId: string,
@@ -178,6 +176,7 @@ class ModuleGenerator extends Generator implements Generator {
         absoluteOriginalPathname,
         isBinary,
         isDirectory,
+        isTemplateFile,
       } = entity;
 
       if (isDirectory) {
@@ -192,8 +191,9 @@ class ModuleGenerator extends Generator implements Generator {
         continue;
       }
 
-      const content = ejs.render(contentBuffer.toString(), this.moduleProps);
-      this.threeFactorCompareTable[entityPathname] = content;
+      const content = isTemplateFile
+        ? ejs.render(contentBuffer.toString(), this.moduleProps)
+        : contentBuffer.toString();
 
       if (!_.isArray(this.cacheTable[entityPathname])) {
         this.cacheTable[entityPathname] = [diff(content)];
@@ -208,9 +208,7 @@ class ModuleGenerator extends Generator implements Generator {
   }
 
   public mergeTemplateFiles() {
-    for (const entityPathname of Object.keys(this.cacheTable)) {
-
-    }
+    super.mergeTemplateFiles(false);
   }
 
   public resolveConflicts() {

diff --git a/packages/dollie-core/src/utils/loader.ts b/packages/dollie-core/src/utils/loader.ts
@@ -8,7 +8,7 @@ import {
 import fs from 'fs';
 import {
   TEMPLATE_CACHE_PATHNAME_PREFIX,
-  TEMPLATE_FILE_PREFIX,
+  TEMPLATE_FILE_IDENTITY,
 } from '../constants';
 import {
   LoaderConfig,
@@ -98,9 +98,9 @@ const readTemplateEntities = (
     let relativePathname = initialRelativePathname;
     let absolutePathname = initialAbsolutePathname;
 
-    if (initialEntityName.startsWith(TEMPLATE_FILE_PREFIX)) {
+    if (initialEntityName.startsWith(TEMPLATE_FILE_IDENTITY)) {
       isTemplateFile = true;
-      entityName = initialEntityName.slice(TEMPLATE_FILE_PREFIX.length);
+      entityName = initialEntityName.slice(TEMPLATE_FILE_IDENTITY.length);
       relativePathname = `${relativeDirectoryPathname ? `${relativeDirectoryPathname}/` : ''}${entityName}`;
       absolutePathname = `${absoluteDirectoryPathname ? `${absoluteDirectoryPathname}/` : ''}${entityName}`;
     }