@hanseltime/template-repo-sync 2.0.4 → 2.1.0

package/.github/workflows/test-flow.yaml

@@ -53,6 +53,11 @@ jobs:
         run: |
           npm run lint
           npx prettier . --check
+      # Add git config user for some intgration testing
+      - name: setup git
+        run: |
+          git config --global user.name github-int-test
+          git config --global user.email github-int-test@github.com
       - name: testing
         run: |
           npm run test

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [2.1.0](https://github.com/HanseltimeIndustries/template-repo-sync/compare/v2.0.4...v2.1.0) (2026-02-08)
+
+
+### Features
+
+* add support for template repo file deletions ([dd5d732](https://github.com/HanseltimeIndustries/template-repo-sync/commit/dd5d7324e17a0c015a4fb1abd78c079eea58693d))
+
 ## [2.0.4](https://github.com/HanseltimeIndustries/template-repo-sync/compare/v2.0.3...v2.0.4) (2026-02-05)
 
 

package/lib/cjs/diff-drivers/git-diff.d.ts

@@ -1 +1,12 @@
-export declare function gitDiff(gitDir: string, afterRef: string): Promise<string[]>;
+/**
+ * For a given directory with a git configuration, this will return the modified, added, and
+ * deleted files since the last afterRef
+ * @param gitDir The git directory folder
+ * @param afterRef The git ref to look for diffs after
+ * @returns
+ */
+export declare function gitDiff(gitDir: string, afterRef: string): Promise<{
+    modified: string[];
+    added: string[];
+    deleted: string[];
+}>;

package/lib/cjs/diff-drivers/git-diff.js

@@ -2,12 +2,40 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.gitDiff = void 0;
 const child_process_1 = require("child_process");
+/**
+ * For a given directory with a git configuration, this will return the modified, added, and
+ * deleted files since the last afterRef
+ * @param gitDir The git directory folder
+ * @param afterRef The git ref to look for diffs after
+ * @returns
+ */
 async function gitDiff(gitDir, afterRef) {
-    const diffFilesStr = (0, child_process_1.execSync)(`git diff ${afterRef}.. --name-only`, {
+    const baseCommand = `git diff ${afterRef}.. --no-renames --name-only`;
+    const modifiedFiles = (0, child_process_1.execSync)(`${baseCommand} --diff-filter=M`, {
         cwd: gitDir,
     })
         .toString()
-        .trim();
-    return diffFilesStr.split("\n");
+        .trim()
+        .split("\n")
+        .filter((s) => s !== "");
+    const addedFiles = (0, child_process_1.execSync)(`${baseCommand} --diff-filter=A`, {
+        cwd: gitDir,
+    })
+        .toString()
+        .trim()
+        .split("\n")
+        .filter((s) => s !== "");
+    const deletedFiles = (0, child_process_1.execSync)(`${baseCommand} --diff-filter=D`, {
+        cwd: gitDir,
+    })
+        .toString()
+        .trim()
+        .split("\n")
+        .filter((s) => s !== "");
+    return {
+        modified: modifiedFiles,
+        added: addedFiles,
+        deleted: deletedFiles,
+    };
 }
 exports.gitDiff = gitDiff;

package/lib/cjs/diff-drivers/types.d.ts

@@ -1,5 +1,10 @@
+export interface DiffResult {
+    modified: string[];
+    added: string[];
+    deleted: string[];
+}
 /**
  * A function that operates within the gitDir, and returns the list of file paths
  * since the last sha
  */
-export type TemplateDiffDriverFn = (gitDir: string, afterRef: string) => Promise<string[]>;
+export type TemplateDiffDriverFn = (gitDir: string, afterRef: string) => Promise<DiffResult>;

package/lib/cjs/merge-file.d.ts

@@ -1,10 +1,11 @@
-import { Config } from "./types";
+import { Config, FileOperation } from "./types";
 import { Change } from "diff";
 interface MergeFileOptions {
     localTemplateSyncConfig: Config;
     templateSyncConfig: Config;
     tempCloneDir: string;
     cwd: string;
+    fileOperation: FileOperation;
 }
 interface MergeFileReturn {
     /**

package/lib/cjs/merge-file.js

@@ -26,6 +26,16 @@ async function mergeFile(relPath, context) {
     const ext = (0, path_1.extname)(relPath);
     const filePath = (0, path_1.join)(cwd, relPath);
     const templatePath = (0, path_1.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 ((0, fs_1.existsSync)(templatePath)) {
+            await (0, promises_1.rm)(templatePath);
+            return {
+                ignoredDueToLocal: false,
+                localChanges: [],
+            };
+        }
+    }
     const mergeConfig = templateSyncConfig.merge?.find((mergeConfig) => (0, micromatch_1.isMatch)(relPath, mergeConfig.glob));
     const localMergeConfig = localTemplateSyncConfig.merge?.find((mergeConfig) => (0, micromatch_1.isMatch)(relPath, mergeConfig.glob));
     const mergeHandler = mergeConfig

package/lib/cjs/template-sync.js

@@ -69,27 +69,38 @@ async function templateSync(options) {
         filesToSync = await diffDriver(tempCloneDir, localTemplateSyncConfig.afterRef);
     }
     else {
-        filesToSync = (0, match_1.getAllFilesInDir)(tempCloneDir, [
-            ...templateSyncConfig.ignore,
-            ".git/**",
-        ]);
+        filesToSync = {
+            added: (0, match_1.getAllFilesInDir)(tempCloneDir, [
+                ...templateSyncConfig.ignore,
+                ".git/**",
+            ]),
+            deleted: [],
+            modified: [],
+        };
     }
     const localSkipFiles = [];
     const localFileChanges = {};
-    await Promise.all(filesToSync.map(async (f) => {
-        const result = await (0, merge_file_1.mergeFile)(f, {
-            localTemplateSyncConfig,
-            templateSyncConfig,
-            tempCloneDir,
-            cwd: options.repoDir,
-        });
-        if (result.ignoredDueToLocal) {
-            localSkipFiles.push(f);
-        }
-        else if (result?.localChanges && result.localChanges.length > 0) {
-            localFileChanges[f] = result.localChanges;
-        }
-    }));
+    const fileSyncFactory = (op) => {
+        return async (f) => {
+            const result = await (0, merge_file_1.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) {
         const ref = await currentRefDriver({

package/lib/cjs/types.d.ts

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

package/lib/esm/diff-drivers/git-diff.js

@@ -2,12 +2,40 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.gitDiff = void 0;
 const child_process_1 = require("child_process");
+/**
+ * For a given directory with a git configuration, this will return the modified, added, and
+ * deleted files since the last afterRef
+ * @param gitDir The git directory folder
+ * @param afterRef The git ref to look for diffs after
+ * @returns
+ */
 async function gitDiff(gitDir, afterRef) {
-    const diffFilesStr = (0, child_process_1.execSync)(`git diff ${afterRef}.. --name-only`, {
+    const baseCommand = `git diff ${afterRef}.. --no-renames --name-only`;
+    const modifiedFiles = (0, child_process_1.execSync)(`${baseCommand} --diff-filter=M`, {
         cwd: gitDir,
     })
         .toString()
-        .trim();
-    return diffFilesStr.split("\n");
+        .trim()
+        .split("\n")
+        .filter((s) => s !== "");
+    const addedFiles = (0, child_process_1.execSync)(`${baseCommand} --diff-filter=A`, {
+        cwd: gitDir,
+    })
+        .toString()
+        .trim()
+        .split("\n")
+        .filter((s) => s !== "");
+    const deletedFiles = (0, child_process_1.execSync)(`${baseCommand} --diff-filter=D`, {
+        cwd: gitDir,
+    })
+        .toString()
+        .trim()
+        .split("\n")
+        .filter((s) => s !== "");
+    return {
+        modified: modifiedFiles,
+        added: addedFiles,
+        deleted: deletedFiles,
+    };
 }
 exports.gitDiff = gitDiff;

package/lib/esm/merge-file.js

@@ -26,6 +26,16 @@ async function mergeFile(relPath, context) {
     const ext = (0, path_1.extname)(relPath);
     const filePath = (0, path_1.join)(cwd, relPath);
     const templatePath = (0, path_1.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 ((0, fs_1.existsSync)(templatePath)) {
+            await (0, promises_1.rm)(templatePath);
+            return {
+                ignoredDueToLocal: false,
+                localChanges: [],
+            };
+        }
+    }
     const mergeConfig = templateSyncConfig.merge?.find((mergeConfig) => (0, micromatch_1.isMatch)(relPath, mergeConfig.glob));
     const localMergeConfig = localTemplateSyncConfig.merge?.find((mergeConfig) => (0, micromatch_1.isMatch)(relPath, mergeConfig.glob));
     const mergeHandler = mergeConfig

package/lib/esm/template-sync.js

@@ -69,27 +69,38 @@ async function templateSync(options) {
         filesToSync = await diffDriver(tempCloneDir, localTemplateSyncConfig.afterRef);
     }
     else {
-        filesToSync = (0, match_1.getAllFilesInDir)(tempCloneDir, [
-            ...templateSyncConfig.ignore,
-            ".git/**",
-        ]);
+        filesToSync = {
+            added: (0, match_1.getAllFilesInDir)(tempCloneDir, [
+                ...templateSyncConfig.ignore,
+                ".git/**",
+            ]),
+            deleted: [],
+            modified: [],
+        };
     }
     const localSkipFiles = [];
     const localFileChanges = {};
-    await Promise.all(filesToSync.map(async (f) => {
-        const result = await (0, merge_file_1.mergeFile)(f, {
-            localTemplateSyncConfig,
-            templateSyncConfig,
-            tempCloneDir,
-            cwd: options.repoDir,
-        });
-        if (result.ignoredDueToLocal) {
-            localSkipFiles.push(f);
-        }
-        else if (result?.localChanges && result.localChanges.length > 0) {
-            localFileChanges[f] = result.localChanges;
-        }
-    }));
+    const fileSyncFactory = (op) => {
+        return async (f) => {
+            const result = await (0, merge_file_1.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) {
         const ref = await currentRefDriver({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hanseltime/template-repo-sync",
-  "version": "2.0.4",
+  "version": "2.1.0",
   "description": "An npm library that enables pluggable, customizable synchronization between template repos",
   "main": "lib/cjs/index.js",
   "types": "lib/cjs/index.d.ts",

package/src/diff-drivers/git-diff.spec.ts

@@ -0,0 +1,73 @@
+import { execSync } from "child_process";
+import * as fs from "fs";
+import * as path from "path";
+import { gitDiff } from "./git-diff";
+
+describe("gitDiff", () => {
+  let tempDir: string;
+
+  beforeEach(() => {
+    tempDir = fs.mkdtempSync("gitdiff-test");
+    // Initialize a git repo
+    execSync("git init", { cwd: tempDir });
+    fs.writeFileSync(path.join(tempDir, "file1.txt"), "hello");
+    fs.writeFileSync(path.join(tempDir, "second.txt"), "second");
+    fs.writeFileSync(path.join(tempDir, "third.txt"), "third");
+    execSync("git add . && git commit -m 'initial'", { cwd: tempDir });
+  });
+
+  afterEach(() => {
+    fs.rmSync(tempDir, { recursive: true, force: true });
+  });
+
+  it("handles a rename as a delete and an add", async () => {
+    const firstCommit = execSync("git rev-parse HEAD", { cwd: tempDir })
+      .toString()
+      .trim();
+
+    // Perform a rename
+    execSync("git mv file1.txt file2.txt", { cwd: tempDir });
+    execSync("git commit -m 'rename'", { cwd: tempDir });
+
+    const result = await gitDiff(tempDir, firstCommit);
+
+    // Because of --no-renames:
+    expect(result).toEqual({
+      deleted: ["file1.txt"],
+      added: ["file2.txt"],
+      modified: [],
+    });
+  });
+  it("handles a added, deleted, and modified appropriately across multiple commits", async () => {
+    const firstCommit = execSync("git rev-parse HEAD", { cwd: tempDir })
+      .toString()
+      .trim();
+
+    // Perform a rename
+    execSync("git mv file1.txt file2.txt", { cwd: tempDir });
+    execSync("git commit -m 'rename'", { cwd: tempDir });
+
+    // Perform adds
+    fs.writeFileSync(path.join(tempDir, "another.txt"), "another file");
+    execSync("git add . && git commit -m 'adding another file'", {
+      cwd: tempDir,
+    });
+
+    // Perform a modify
+    fs.writeFileSync(path.join(tempDir, "third.txt"), "third+");
+    execSync("git add . && git commit -m 'modifying third'", { cwd: tempDir });
+
+    // Perform a delete
+    fs.rmSync(path.join(tempDir, "second.txt"));
+    execSync("git add . && git commit -m 'deleting second'", { cwd: tempDir });
+
+    const result = await gitDiff(tempDir, firstCommit);
+
+    // Because of --no-renames:
+    expect(result).toEqual({
+      deleted: expect.arrayContaining(["file1.txt", "second.txt"]),
+      added: expect.arrayContaining(["file2.txt", "another.txt"]),
+      modified: ["third.txt"],
+    });
+  });
+});

package/src/diff-drivers/git-diff.ts

@@ -1,10 +1,39 @@
 import { execSync } from "child_process";
 
+/**
+ * For a given directory with a git configuration, this will return the modified, added, and
+ * deleted files since the last afterRef
+ * @param gitDir The git directory folder
+ * @param afterRef The git ref to look for diffs after
+ * @returns
+ */
 export async function gitDiff(gitDir: string, afterRef: string) {
-  const diffFilesStr = execSync(`git diff ${afterRef}.. --name-only`, {
+  const baseCommand = `git diff ${afterRef}.. --no-renames --name-only`;
+  const modifiedFiles = execSync(`${baseCommand} --diff-filter=M`, {
     cwd: gitDir,
   })
     .toString()
-    .trim();
-  return diffFilesStr.split("\n");
+    .trim()
+    .split("\n")
+    .filter((s) => s !== "");
+  const addedFiles = execSync(`${baseCommand} --diff-filter=A`, {
+    cwd: gitDir,
+  })
+    .toString()
+    .trim()
+    .split("\n")
+    .filter((s) => s !== "");
+  const deletedFiles = execSync(`${baseCommand} --diff-filter=D`, {
+    cwd: gitDir,
+  })
+    .toString()
+    .trim()
+    .split("\n")
+    .filter((s) => s !== "");
+
+  return {
+    modified: modifiedFiles,
+    added: addedFiles,
+    deleted: deletedFiles,
+  };
 }

package/src/diff-drivers/types.ts

@@ -1,3 +1,9 @@
+export interface DiffResult {
+  modified: string[];
+  added: string[];
+  deleted: string[];
+}
+
 /**
  * A function that operates within the gitDir, and returns the list of file paths
  * since the last sha
@@ -5,4 +11,4 @@
 export type TemplateDiffDriverFn = (
   gitDir: string,
   afterRef: string,
-) => Promise<string[]>;
+) => Promise<DiffResult>;