@hanseltime/template-repo-sync 2.0.4 → 2.1.1

package/src/merge-file.ts

@@ -1,8 +1,8 @@
 import { isMatch, some } from "micromatch";
-import { Config, MergeContext, MergePlugin } from "./types";
+import { Config, FileOperation, MergeContext, MergePlugin } from "./types";
 import { extname, join } from "path";
 import { existsSync } from "fs";
-import { readFile } from "fs/promises";
+import { readFile, rm } from "fs/promises";
 import { loadPlugin } from "./load-plugin";
 import { Change, diffLines } from "diff";
 import { outputFile } from "fs-extra";
@@ -12,6 +12,7 @@ interface MergeFileOptions {
   templateSyncConfig: Config;
   tempCloneDir: string;
   cwd: string;
+  fileOperation: FileOperation;
 }
 
 interface MergeFileReturn {
@@ -51,6 +52,17 @@ export async function mergeFile(
   const filePath = join(cwd, relPath);
   const templatePath = join(tempCloneDir, relPath);
 
+  // Unless there's a need, we remove files that were deleted and don't pass them to plugins yet
+  if (context.fileOperation === "deleted") {
+    if (existsSync(filePath)) {
+      await rm(filePath);
+    }
+    return {
+      ignoredDueToLocal: false,
+      localChanges: [],
+    };
+  }
+
   const mergeConfig = templateSyncConfig.merge?.find((mergeConfig) =>
     isMatch(relPath, mergeConfig.glob),
   );

package/src/template-sync.spec.ts

@@ -209,9 +209,11 @@ describe("templateSync", () => {
     );
 
     // We will only update the templated.ts
-    const mockDiffDriver = jest
-      .fn()
-      .mockImplementation(async () => ["src/templated.ts"]);
+    const mockDiffDriver = jest.fn().mockImplementation(async () => ({
+      added: ["src/templated.ts"],
+      modified: [],
+      deleted: [],
+    }));
     const result = await templateSync({
       tmpCloneDir: "stubbed-by-driver",
       cloneDriver: dummyCloneDriver,
@@ -252,9 +254,11 @@ describe("templateSync", () => {
     );
 
     // We will only update the templated.ts
-    const mockDiffDriver = jest
-      .fn()
-      .mockImplementation(async () => ["src/templated.ts"]);
+    const mockDiffDriver = jest.fn().mockImplementation(async () => ({
+      added: ["src/templated.ts"],
+      modified: [],
+      deleted: [],
+    }));
     const mockCurrentRefDriver = jest
       .fn()
       .mockImplementation(async () => "newestSha");
@@ -297,9 +301,9 @@ describe("templateSync", () => {
     await rm(join(tmpDir, "templatesync.local.json"));
 
     // We will only update the templated.ts
-    const mockDiffDriver = jest
-      .fn()
-      .mockImplementation(async () => ["src/templated.ts"]);
+    const mockDiffDriver = jest.fn().mockImplementation(async () => ({
+      added: ["src/templated.ts"],
+    }));
     const mockCurrentRefDriver = jest
       .fn()
       .mockImplementation(async () => "newestSha");

package/src/template-sync.ts

@@ -1,12 +1,12 @@
 import { join } from "path";
 import { existsSync, readFileSync, writeFileSync } from "fs";
 import { getAllFilesInDir } from "./match";
-import { Config, LocalConfig } from "./types";
+import { Config, FileOperation, LocalConfig } from "./types";
 import { mergeFile } from "./merge-file";
 import { gitClone } from "./clone-drivers/git-clone";
 import { Change } from "diff";
 import { TemplateCloneDriverFn } from "./clone-drivers";
-import { TemplateDiffDriverFn, gitDiff } from "./diff-drivers";
+import { DiffResult, TemplateDiffDriverFn, gitDiff } from "./diff-drivers";
 import { gitCurrentRef } from "./ref-drivers";
 import { TemplateRefDriverFn } from "./ref-drivers/types";
 import { inferJSONIndent } from "./formatting";
@@ -124,17 +124,21 @@ export async function templateSync(
       ) as unknown as LocalConfig)
     : { ignore: [] };
 
-  let filesToSync: string[];
+  let filesToSync: DiffResult;
   if (localTemplateSyncConfig.afterRef) {
     filesToSync = await diffDriver(
       tempCloneDir,
       localTemplateSyncConfig.afterRef,
     );
   } else {
-    filesToSync = getAllFilesInDir(tempCloneDir, [
-      ...templateSyncConfig.ignore,
-      ".git/**",
-    ]);
+    filesToSync = {
+      added: getAllFilesInDir(tempCloneDir, [
+        ...templateSyncConfig.ignore,
+        ".git/**",
+      ]),
+      deleted: [],
+      modified: [],
+    };
   }
 
   const localSkipFiles: string[] = [];
@@ -142,21 +146,27 @@ export async function templateSync(
     [filePath: string]: Change[];
   } = {};
 
-  await Promise.all(
-    filesToSync.map(async (f) => {
+  const fileSyncFactory = (op: FileOperation) => {
+    return async (f: string) => {
       const result = await mergeFile(f, {
         localTemplateSyncConfig,
         templateSyncConfig,
         tempCloneDir,
         cwd: options.repoDir,
+        fileOperation: op,
       });
       if (result.ignoredDueToLocal) {
         localSkipFiles.push(f);
       } else if (result?.localChanges && result.localChanges.length > 0) {
         localFileChanges[f] = result.localChanges;
       }
-    }),
-  );
+    };
+  };
+
+  // Added and modified have the same setup for now
+  await Promise.all(filesToSync.added.map(fileSyncFactory("added")));
+  await Promise.all(filesToSync.modified.map(fileSyncFactory("modified")));
+  await Promise.all(filesToSync.deleted.map(fileSyncFactory("deleted")));
 
   // apply after ref
   if (options.updateAfterRef) {

package/src/types.ts

@@ -125,3 +125,5 @@ export interface MergePlugin<PluginOptions> {
    */
   validate(options: unknown): string[] | undefined;
 }
+
+export type FileOperation = "added" | "modified" | "deleted";