@dotinc/ogre 0.15.2 → 0.15.4

package/src/checkout.test.ts

@@ -109,6 +109,50 @@ test("checkout and create new branch with at least 1 commit", async (t) => {
   );
 });
 
+test("checkout tag leaves HEAD detached", async (t) => {
+  const [repo] = await getBaseline();
+  repo.data.name = "new name";
+  const commitHash = await repo.commit("tagged change", testAuthor);
+  repo.tag("1.0.0");
+
+  // Move main forward so tag and main diverge
+  repo.data.description = "newer change";
+  await repo.commit("after tag", testAuthor);
+
+  // Checkout the tag
+  await repo.checkout("1.0.0");
+  t.equal(repo.branch(), "HEAD", "HEAD should be detached after tag checkout");
+  t.equal(repo.head(), commitHash, "HEAD should point to tagged commit hash");
+});
+
+test("commit after tag checkout does not move tag", async (t) => {
+  const [repo] = await getBaseline();
+  repo.data.name = "tagged";
+  const taggedCommit = await repo.commit("tagged change", testAuthor);
+  repo.tag("1.0.0");
+
+  await repo.checkout("1.0.0");
+
+  // Commit on detached HEAD
+  repo.data.description = "detached work";
+  const detachedCommit = await repo.commit("detached commit", testAuthor);
+
+  // Tag should NOT have moved
+  t.equal(
+    repo.ref("refs/tags/1.0.0"),
+    taggedCommit,
+    "tag should still point to original commit",
+  );
+  // HEAD should point to the new detached commit
+  t.equal(repo.head(), detachedCommit, "HEAD should point to detached commit");
+  // refs/heads/main should not have changed
+  t.equal(
+    repo.ref("refs/heads/main"),
+    taggedCommit,
+    "main should not move",
+  );
+});
+
 test("replacing default branch on empty master removes main", async (t) => {
   const cx: ComplexObject = {
     nested: [],

package/src/repository.ts

@@ -2,12 +2,8 @@ import {
   applyPatch,
   compare,
   deepClone,
-  generate,
   JsonPatchError,
-  observe,
-  type Observer,
   type Operation,
-  unobserve,
   validate,
 } from "fast-json-patch";
 import type { Commit, CommitHashContent } from "./commit.js";
@@ -28,6 +24,7 @@ import {
   REFS_HEAD_KEY,
   REFS_MAIN_KEY,
   shaishToCommit,
+  isTagRef,
   tagToRef,
   validateBranchName,
   validateRef,
@@ -133,7 +130,7 @@ export class Repository<T extends { [k: PropertyKey]: any }>
     this.original = deepClone(obj);
     // store js ref, so obj can still be modified without going through repo.data
     this.data = obj as T;
-    this.observer = observe(obj as T);
+    this._snapshot = deepClone(obj) as T;
     this.refs = options.history?.refs
       ? mutableMapCopy(options.history?.refs)
       : new Map<string, Reference>([
@@ -204,7 +201,7 @@ export class Repository<T extends { [k: PropertyKey]: any }>
   // stores the remote state upon initialization
   private remoteCommits: ReadonlyArray<Readonly<string>> | undefined;
 
-  private observer: Observer<T>;
+  private _snapshot: T;
 
   private readonly refs: Map<string, Reference>;
   private readonly commits: Array<Commit>;
@@ -326,9 +323,8 @@ export class Repository<T extends { [k: PropertyKey]: any }>
       return;
     }
 
-    this.observer.unobserve();
     jsondiffpatch.patch(this.data, patchToTarget);
-    this.observer = observe(this.data);
+    this._snapshot = deepClone(this.data);
   }
 
   // FIXME: refactor this to use jsondiffpatch delta instead of json-patch for advanced type support
@@ -368,10 +364,6 @@ export class Repository<T extends { [k: PropertyKey]: any }>
     mode: "soft" | "hard" | undefined = "hard",
     shaish: string | undefined = REFS_HEAD_KEY,
   ): Promise<void> {
-    if (mode === "hard") {
-      unobserve(this.data, this.observer);
-    }
-
     const [commit] = shaishToCommit(shaish, this.refs, this.commits);
     await this.moveTo(commit);
 
@@ -386,10 +378,6 @@ export class Repository<T extends { [k: PropertyKey]: any }>
     for (const ref of moveableRefs) {
       this.moveRef(ref, commit);
     }
-
-    if (mode === "hard") {
-      this.observer = observe(this.data);
-    }
   }
 
   branch(): string {
@@ -448,10 +436,9 @@ export class Repository<T extends { [k: PropertyKey]: any }>
         this.commits,
       );
       await this.moveTo(commit);
-      this.moveRef(
-        REFS_HEAD_KEY,
-        isRef && refKey !== undefined ? refKey : commit,
-      );
+      // Only follow branch refs. Tags produce detached HEAD (like git).
+      const isBranchRef = isRef && refKey !== undefined && !isTagRef(refKey);
+      this.moveRef(REFS_HEAD_KEY, isBranchRef ? refKey : commit);
     }
   }
 
@@ -473,14 +460,14 @@ export class Repository<T extends { [k: PropertyKey]: any }>
       }
     }
 
-    // FIXME: refactor this to use parent tree vs this.data instead to get json-patch
-    const patch = generate(this.observer);
+    const patch = compare(this._snapshot, this.data);
     if (
       (patch.length === 0 && !amend) ||
       (amend && message === parent?.message)
     ) {
       throw new Error(`no changes to commit`);
     }
+    this._snapshot = deepClone(this.data);
 
     const timestamp = this.timestampFn ? this.timestampFn() : new Date();
     const parentChanges =