@hanseltime/template-repo-sync 2.2.0 → 2.2.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [2.2.1](https://github.com/HanseltimeIndustries/template-repo-sync/compare/v2.2.0...v2.2.1) (2026-02-22)
+
+
+### Bug Fixes
+
+* template sync afterRef updates ([21dd335](https://github.com/HanseltimeIndustries/template-repo-sync/commit/21dd335045034d132ad5f6ab7944a81c82b96981))
+
 # [2.2.0](https://github.com/HanseltimeIndustries/template-repo-sync/compare/v2.1.2...v2.2.0) (2026-02-21)
 
 

package/lib/cjs/template-sync.js

@@ -61,12 +61,29 @@ async function templateSync(options) {
     const templateSyncConfig = (0, fs_1.existsSync)(cloneConfigPath)
         ? commentJSON.parse((0, fs_1.readFileSync)(cloneConfigPath).toString())
         : { ignore: [] };
-    const localConfigPath = (0, path_1.join)(options.repoDir, `${exports.TEMPLATE_SYNC_LOCAL_CONFIG}.json`);
+    const localConfigFile = `${exports.TEMPLATE_SYNC_LOCAL_CONFIG}.json`;
+    const localConfigPath = (0, path_1.join)(options.repoDir, localConfigFile);
     const localTemplateSyncConfig = (0, fs_1.existsSync)(localConfigPath)
         ? commentJSON.parse((0, fs_1.readFileSync)(localConfigPath).toString())
         : { ignore: [] };
     let filesToSync;
+    const ref = await currentRefDriver({
+        rootDir: tempCloneDir,
+    });
     if (localTemplateSyncConfig.afterRef) {
+        if (ref === localTemplateSyncConfig.afterRef) {
+            // short circuit if the refs match
+            return {
+                localSkipFiles: [],
+                localFileChanges: {},
+                modifiedFiles: {
+                    added: [],
+                    modified: [],
+                    deleted: [],
+                    total: 0,
+                },
+            };
+        }
         filesToSync = await diffDriver(tempCloneDir, localTemplateSyncConfig.afterRef);
     }
     else {
@@ -114,7 +131,6 @@ async function templateSync(options) {
         added: actualAdded,
         modified: actualModified,
         deleted: actualDeleted,
-        total: actualAdded.length + actualModified.length + actualDeleted.length,
     };
     // apply after ref
     if (options.updateAfterRef) {
@@ -126,15 +142,22 @@ async function templateSync(options) {
             const config = commentJSON.parse(configStr);
             config.afterRef = ref;
             (0, fs_1.writeFileSync)(localConfigPath, commentJSON.stringify(config, null, (0, formatting_1.inferJSONIndent)(configStr)));
+            modifiedFiles.modified.push(localConfigFile);
         }
         else {
             (0, fs_1.writeFileSync)(localConfigPath, commentJSON.stringify({ afterRef: ref }, null, 4));
+            modifiedFiles.added.push(localConfigFile);
         }
     }
     return {
         localSkipFiles: Array.from(localSkipFiles),
         localFileChanges,
-        modifiedFiles: modifiedFiles,
+        modifiedFiles: {
+            ...modifiedFiles,
+            total: modifiedFiles.added.length +
+                modifiedFiles.deleted.length +
+                modifiedFiles.modified.length,
+        },
     };
 }
 exports.templateSync = templateSync;

package/lib/esm/template-sync.js

@@ -61,12 +61,29 @@ async function templateSync(options) {
     const templateSyncConfig = (0, fs_1.existsSync)(cloneConfigPath)
         ? commentJSON.parse((0, fs_1.readFileSync)(cloneConfigPath).toString())
         : { ignore: [] };
-    const localConfigPath = (0, path_1.join)(options.repoDir, `${exports.TEMPLATE_SYNC_LOCAL_CONFIG}.json`);
+    const localConfigFile = `${exports.TEMPLATE_SYNC_LOCAL_CONFIG}.json`;
+    const localConfigPath = (0, path_1.join)(options.repoDir, localConfigFile);
     const localTemplateSyncConfig = (0, fs_1.existsSync)(localConfigPath)
         ? commentJSON.parse((0, fs_1.readFileSync)(localConfigPath).toString())
         : { ignore: [] };
     let filesToSync;
+    const ref = await currentRefDriver({
+        rootDir: tempCloneDir,
+    });
     if (localTemplateSyncConfig.afterRef) {
+        if (ref === localTemplateSyncConfig.afterRef) {
+            // short circuit if the refs match
+            return {
+                localSkipFiles: [],
+                localFileChanges: {},
+                modifiedFiles: {
+                    added: [],
+                    modified: [],
+                    deleted: [],
+                    total: 0,
+                },
+            };
+        }
         filesToSync = await diffDriver(tempCloneDir, localTemplateSyncConfig.afterRef);
     }
     else {
@@ -114,7 +131,6 @@ async function templateSync(options) {
         added: actualAdded,
         modified: actualModified,
         deleted: actualDeleted,
-        total: actualAdded.length + actualModified.length + actualDeleted.length,
     };
     // apply after ref
     if (options.updateAfterRef) {
@@ -126,15 +142,22 @@ async function templateSync(options) {
             const config = commentJSON.parse(configStr);
             config.afterRef = ref;
             (0, fs_1.writeFileSync)(localConfigPath, commentJSON.stringify(config, null, (0, formatting_1.inferJSONIndent)(configStr)));
+            modifiedFiles.modified.push(localConfigFile);
         }
         else {
             (0, fs_1.writeFileSync)(localConfigPath, commentJSON.stringify({ afterRef: ref }, null, 4));
+            modifiedFiles.added.push(localConfigFile);
         }
     }
     return {
         localSkipFiles: Array.from(localSkipFiles),
         localFileChanges,
-        modifiedFiles: modifiedFiles,
+        modifiedFiles: {
+            ...modifiedFiles,
+            total: modifiedFiles.added.length +
+                modifiedFiles.deleted.length +
+                modifiedFiles.modified.length,
+        },
     };
 }
 exports.templateSync = templateSync;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hanseltime/template-repo-sync",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "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/template-sync.spec.ts

@@ -292,7 +292,7 @@ describe("templateSync", () => {
     // We will only update the templated.ts
     const mockDiffDriver = jest.fn().mockImplementation(async () => ({
       added: ["src/templated.ts"],
-      modified: ["src/index.ts"], // Add index.ts so we make sure it is still ignored - due to a bug
+      modified: ["src/index.ts"], // Add index.ts so we make sure it is still ignored - see test-fixtures/template/templatesync.json ignores
       deleted: [],
     }));
     const mockCurrentRefDriver = jest
@@ -311,6 +311,12 @@ describe("templateSync", () => {
 
     // since there was no override for this file, no changes from the local file
     expect(result.localFileChanges).toEqual(expect.objectContaining({}));
+    expect(result.modifiedFiles).toEqual({
+      added: ["src/templated.ts"],
+      modified: ["templatesync.local.json"], // Add index.ts so we make sure it is still ignored - due to a bug
+      deleted: [],
+      total: 2,
+    });
 
     // Verify the files
     await fileMatchTemplate(tmpDir, "templatesync.json");
@@ -332,6 +338,73 @@ describe("templateSync", () => {
     });
     expect(dummyCheckoutDriver).not.toHaveBeenCalled();
   });
+  it("Does not update the local templatesync if updateAfterRef is true and the ref is the same", async () => {
+    // Remove the local sync overrides
+    await rm(join(tmpDir, "templatesync.local.json"));
+
+    const mockLocalConfig = {
+      afterRef: "dummySha",
+      ignore: [
+        // We don't have a need for this in here, but it's an example of keeping things cleaner for our custom plugins
+        "plugins/**",
+      ],
+    };
+
+    writeFileSync(
+      join(tmpDir, "templatesync.local.json"),
+      JSON.stringify(mockLocalConfig),
+    );
+
+    // We will only update the templated.ts
+    const mockDiffDriver = jest.fn().mockImplementation(async () => ({
+      added: ["src/templated.ts"],
+      modified: ["src/index.ts"], // Add index.ts so we make sure it is still ignored - see test-fixtures/template/templatesync.json ignores
+      deleted: [],
+    }));
+    const mockCurrentRefDriver = jest
+      .fn()
+      .mockImplementation(async () => "dummySha");
+    const result = await templateSync({
+      tmpCloneDir: "stubbed-by-driver",
+      cloneDriver: dummyCloneDriver,
+      repoUrl: "not-important",
+      repoDir: tmpDir,
+      updateAfterRef: true,
+      diffDriver: mockDiffDriver,
+      currentRefDriver: mockCurrentRefDriver,
+      checkoutDriver: dummyCheckoutDriver,
+    });
+
+    // Nothing shoudl be reported as changing
+    expect(result).toEqual({
+      localFileChanges: {},
+      localSkipFiles: [],
+      modifiedFiles: {
+        added: [],
+        modified: [],
+        deleted: [],
+        total: 0,
+      },
+    });
+    // Verify the files
+    await fileMatchDownstream(tmpDir, "templatesync.json");
+    await fileMatchDownstream(tmpDir, "src/templated.ts");
+
+    // Expect the none of the diff files to work
+    await fileMatchDownstream(tmpDir, "src/index.ts");
+    await fileMatchDownstream(tmpDir, "plugins/custom-plugin.js");
+    await fileMatchDownstream(tmpDir, "package.json");
+
+    // Ensure we have updated the local template field
+    expect(
+      JSON.parse(
+        (await readFile(join(tmpDir, "templatesync.local.json"))).toString(),
+      ),
+    ).toEqual({
+      ...mockLocalConfig,
+    });
+    expect(dummyCheckoutDriver).not.toHaveBeenCalled();
+  });
   it("creates the local templatesync with the current ref if updateAfterRef is true and no local template exists", async () => {
     // Remove the local sync overrides
     await rm(join(tmpDir, "templatesync.local.json"));
@@ -356,6 +429,19 @@ describe("templateSync", () => {
 
     // since there was no override for this file, no changes from the local file
     expect(result.localFileChanges).toEqual(expect.objectContaining({}));
+    expect(result.modifiedFiles).toEqual({
+      added: [
+        "package.json",
+        "src/index.js",
+        "src/templated.js",
+        "src/templated.ts",
+        "templatesync.json",
+        "templatesync.local.json",
+      ],
+      deleted: [],
+      modified: [],
+      total: 6,
+    });
 
     // Verify the files
     await fileMatchTemplate(tmpDir, "templatesync.json");

package/src/template-sync.ts

@@ -125,10 +125,8 @@ export async function templateSync(
       ) as unknown as Config)
     : { ignore: [] };
 
-  const localConfigPath = join(
-    options.repoDir,
-    `${TEMPLATE_SYNC_LOCAL_CONFIG}.json`,
-  );
+  const localConfigFile = `${TEMPLATE_SYNC_LOCAL_CONFIG}.json`;
+  const localConfigPath = join(options.repoDir, localConfigFile);
   const localTemplateSyncConfig: LocalConfig = existsSync(localConfigPath)
     ? (commentJSON.parse(
         readFileSync(localConfigPath).toString(),
@@ -136,7 +134,23 @@ export async function templateSync(
     : { ignore: [] };
 
   let filesToSync: DiffResult;
+  const ref = await currentRefDriver({
+    rootDir: tempCloneDir,
+  });
   if (localTemplateSyncConfig.afterRef) {
+    if (ref === localTemplateSyncConfig.afterRef) {
+      // short circuit if the refs match
+      return {
+        localSkipFiles: [],
+        localFileChanges: {},
+        modifiedFiles: {
+          added: [],
+          modified: [],
+          deleted: [],
+          total: 0,
+        },
+      };
+    }
     filesToSync = await diffDriver(
       tempCloneDir,
       localTemplateSyncConfig.afterRef,
@@ -202,7 +216,6 @@ export async function templateSync(
     added: actualAdded,
     modified: actualModified,
     deleted: actualDeleted,
-    total: actualAdded.length + actualModified.length + actualDeleted.length,
   };
 
   // apply after ref
@@ -219,17 +232,25 @@ export async function templateSync(
         localConfigPath,
         commentJSON.stringify(config, null, inferJSONIndent(configStr)),
       );
+      modifiedFiles.modified.push(localConfigFile);
     } else {
       writeFileSync(
         localConfigPath,
         commentJSON.stringify({ afterRef: ref }, null, 4),
       );
+      modifiedFiles.added.push(localConfigFile);
     }
   }
 
   return {
     localSkipFiles: Array.from(localSkipFiles),
     localFileChanges,
-    modifiedFiles: modifiedFiles,
+    modifiedFiles: {
+      ...modifiedFiles,
+      total:
+        modifiedFiles.added.length +
+        modifiedFiles.deleted.length +
+        modifiedFiles.modified.length,
+    },
   };
 }