Merge pull request #12 from dolliejs/refactor/origin-loaders

refactor: 💡 refactor origin params and origin loader
dolliejs · Jul 6, 2021 · a2864bb · a2864bb
2 parents 33c8074 + 0b53ba6
commit a2864bb
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/packages/@dollie/cli/package.json b/packages/@dollie/cli/package.json
@@ -32,6 +32,7 @@
   },
   "dependencies": {
     "@dollie/core": "^3.0.0",
+    "@dollie/origins": "^3.0.0",
     "chalk": "^4.1.1",
     "commander": "^7.2.0",
     "figlet": "^1.5.0",

diff --git a/packages/@dollie/cli/src/commands/init.ts b/packages/@dollie/cli/src/commands/init.ts
@@ -17,6 +17,7 @@ import _ from 'lodash';
 import inquirer from 'inquirer';
 import chalk from 'chalk';
 import figlet from 'figlet';
+import { loadOrigins } from '../../../origins/lib';
 
 export type ConflictSolveApproachType = 'simple' | 'select' | 'edit' | 'ignore';
 export type ManualResult = 'all' | 'none' | 'former' | 'current';
@@ -217,9 +218,11 @@ export default (config: DollieCLIConfigSchema) => {
         const errorLogger = new ErrorLogger();
         const infoLogger = new InfoLogger();
 
+        infoLogger.log('Loading origins...');
+
         const context = new Context(name, template, {
           generator: {
-            origins: config.origins || {},
+            origins: await loadOrigins(config.origins || {}),
             origin: config.origin || {},
             loader: _.get(config, 'loader'),
             getTemplateProps: async (questions) => {

diff --git a/packages/@dollie/core/src/diff.ts b/packages/@dollie/core/src/diff.ts
@@ -27,7 +27,7 @@ const diff = (originalContent: string, currentContent?: string): DiffChange[] =>
   return result;
 };
 
-const merge = (originalChanges: DiffChange[], diffList: DiffChange[][], pathname: string): DiffChange[] => {
+const merge = (originalChanges: DiffChange[], diffList: DiffChange[][]): DiffChange[] => {
   if (!originalChanges) {
     return [];
   }
@@ -55,6 +55,7 @@ const merge = (originalChanges: DiffChange[], diffList: DiffChange[][], pathname
         }
       }
     }
+
     const addedChangeLineNumbers = currentDiff
       .filter((change) => change.added)
       .map((change) => change.lineNumber);
@@ -95,12 +96,16 @@ const merge = (originalChanges: DiffChange[], diffList: DiffChange[][], pathname
     }
   }
 
-  return blocks.reduce((result, currentBlock) => {
+  return blocks.reduce((currentResult, currentBlock) => {
     const currentPatchItem = patches.shift();
+
+    const result = currentResult.concat(currentBlock);
+
     if (!currentPatchItem) {
-      return result.concat(currentBlock);
+      return result;
     }
-    return result.concat(currentBlock).concat(currentPatchItem.changes);
+
+    return result.concat(currentPatchItem.changes);
   }, []);
 };
 

diff --git a/packages/@dollie/core/src/generator.ts b/packages/@dollie/core/src/generator.ts
@@ -90,9 +90,7 @@ class Generator {
   }
 
   public async initialize() {
-    this.messageHandler('Initializing origins...');
-
-    this.origins = await loadOrigins(this.config.origins);
+    this.origins = _.get(this, 'config.origins') || [];
 
     if (_.isString(this.templateOriginName)) {
       if (!this.templateOriginName.includes(':')) {
@@ -273,7 +271,7 @@ class Generator {
         } else {
           const originalDiffChanges = diffs[0];
           const forwardDiffChangesGroup = diffs.slice(1);
-          const mergedDiffChanges = merge(originalDiffChanges, forwardDiffChangesGroup, entityPathname);
+          const mergedDiffChanges = merge(originalDiffChanges, forwardDiffChangesGroup);
           this.mergeTable[entityPathname] = parseDiffToMergeBlocks(mergedDiffChanges);
         }
       } else {

diff --git a/packages/@dollie/core/src/interfaces.ts b/packages/@dollie/core/src/interfaces.ts
@@ -1,7 +1,6 @@
 import {
   DollieOrigin,
   DollieOriginConfig,
-  DollieOriginMap,
 } from '@dollie/origins';
 import { Change } from 'diff';
 import { Volume } from 'memfs';
@@ -35,7 +34,7 @@ export type ConflictSolveResult = MergeBlock | 'ignored' | null;
 
 export interface DollieGeneratorConfig {
   origin?: DollieOriginConfig;
-  origins?: DollieOriginMap;
+  origins?: DollieOrigin[];
   loader?: LoaderConfig;
   getTemplateProps?: (questions: DollieQuestion[]) => Promise<DollieAnswers>;
   conflictsSolver?: (data: ConflictSolverData) => Promise<ConflictSolveResult>;