Merge pull request #192 from dotindustries/fix/reset_fn

Fix reset function

Author: nadilas

packages/ogre/src/checkout.test.ts

@@ -1,7 +1,7 @@
 import { test } from "tap";
 import {
   addOneStep,
-  ComplexObject,
+  type ComplexObject,
   getBaseline,
   sumChanges,
   testAuthor,

packages/ogre/src/commit.test.ts

@@ -2,7 +2,7 @@ import { test } from "tap";
 
 import {
   addOneStep,
-  ComplexObject,
+  type ComplexObject,
   getBaseline,
   sumChanges,
   testAuthor,

packages/ogre/src/commit.ts

@@ -1,5 +1,5 @@
 import { digest } from "./hash.js";
-import { Operation } from "fast-json-patch";
+import type {Operation} from "fast-json-patch";
 
 export interface Commit {
   /*The hash of the commit. Is a sha256 of:

packages/ogre/src/git2json.ts

@@ -1,5 +1,5 @@
-import { Commit } from "./commit.js";
-import { History, Reference } from "./interfaces.js";
+import type {Commit} from "./commit.js";
+import type {History, Reference} from "./interfaces.js";
 import {
   cleanAuthor,
   createHeadRefValue,

packages/ogre/src/index.ts

@@ -1,9 +1,11 @@
 export * from "./interfaces.js";
 export * from "./repository.js";
-export { Commit } from "./commit.js";
+export type { Commit } from "./commit.js";
 export * from "./ref.js";
 export * from "./size.js";
 export * from "./utils.js";
 export * from "./git2json.js";
 
-export { compare, deepClone, Operation, JsonPatchError } from "fast-json-patch";
+export {compare, deepClone, JsonPatchError} from "fast-json-patch";
+export type { Operation } from "fast-json-patch";
+

packages/ogre/src/interfaces.ts

@@ -1,4 +1,4 @@
-import { Commit } from "./commit.js";
+import type {Commit} from "./commit.js";
 
 export interface Reference {
   name: string;

packages/ogre/src/repository.test.ts

@@ -5,13 +5,13 @@ import { Repository } from "./repository.js";
 import {
   addOneStep,
   addOneStep as addOneNested,
-  ComplexObject,
+  type ComplexObject,
   getBaseline,
   sumChanges,
   testAuthor,
   updateHeaderData,
 } from "./test.utils.js";
-import { Reference } from "./interfaces.js";
+import type {Reference} from "./interfaces.js";
 import { compare } from "fast-json-patch";
 import {objectToTree, treeToObject} from "./serialize.js";
 
@@ -60,6 +60,13 @@ test("restore", async (t) => {
       "main is pointing at wrong commit",
     );
     t.equal(history.commits.length, 2, "incorrect # of commits");
+    const logs = repo.logs()
+    t.equal(logs.length, 3, "incorrect # of logs")
+    const logs1 = repo.logs(1)
+    t.equal(logs1.length, 1, "incorrect # of logs retrieved")
+
+    const logs2 = repo.logs(100)
+    t.equal(logs2.length, 3, "incorrect # of logs retrieved")
 
     // start reconstruction
     const p = {};
@@ -280,7 +287,7 @@ test("history", async (t) => {
 });
 
 test("reset", async (t) => {
-  t.test("reset hard", async (t) => {
+  t.test("discard uncommitted changes", async (t) => {
     const [repo, co] = await getBaseline();
     co.uuid = "asdf";
     const hash = await repo.commit("baseline", testAuthor);
@@ -292,10 +299,60 @@ test("reset", async (t) => {
     t.equal(diff.length, changes, "wrong # of changes in diff");
 
     // reset
-    repo.reset("hard");
+    await repo.reset("hard");
     const diff2 = await repo.diff(hash);
     t.equal(diff2.length, 0, "failed to reset");
   });
+
+  t.test("reset to earlier commit", async t => {
+    const [repo, co] = await getBaseline();
+    co.uuid = "asdf";
+    const hash = await repo.commit("baseline", testAuthor);
+    const h1 = repo.getHistory();
+    t.equal(h1.commits.length, 1);
+
+    // do changes
+    const changes = updateHeaderData(co);
+    const hash2 = await repo.commit("header data", testAuthor);
+    const h2 = repo.getHistory();
+    t.equal(h2.commits.length, 2);
+    const diff = await repo.diff(hash);
+    t.equal(diff.length, changes, "wrong # of changes in diff");
+    t.equal(hash !== hash2, true, "hash should not be the same");
+
+    // reset
+    await repo.reset("hard", hash);
+    const diff2 = await repo.diff(hash);
+    t.equal(diff2.length, 0, "failed to reset");
+    const h3 = repo.getHistory()
+    t.equal(h3.refs.get("refs/heads/main")!.value, hash, "main should point to first hash");
+  })
+
+  t.test("reset to earlier version tag", async t => {
+    const [repo, co] = await getBaseline();
+    co.uuid = "asdf";
+    const hash = await repo.commit("baseline", testAuthor);
+    repo.tag("v0.1.0")
+    const h1 = repo.getHistory();
+    t.equal(h1.commits.length, 1);
+
+    // do changes
+    const changes = updateHeaderData(co);
+    const hash2 = await repo.commit("header data", testAuthor);
+    repo.tag("v0.2.0")
+    const h2 = repo.getHistory();
+    t.equal(h2.commits.length, 2);
+    const diff = await repo.diff(hash);
+    t.equal(diff.length, changes, "wrong # of changes in diff");
+    t.equal(hash !== hash2, true, "hash should not be the same");
+
+    // reset
+    await repo.reset("hard", "v0.1.0");
+    const diff2 = await repo.diff(hash);
+    t.equal(diff2.length, 0, "failed to reset");
+    const h3 = repo.getHistory()
+    t.equal(h3.refs.get("refs/heads/main")!.value, hash, "main should point to first hash");
+  })
 });
 
 test("status", async (t) => {

packages/ogre/src/repository.ts

@@ -1,13 +1,12 @@
 import {
   applyPatch,
-  applyReducer,
   compare,
   deepClone,
   generate,
   JsonPatchError,
   observe,
-  Observer,
-  Operation,
+  type Observer,
+  type Operation,
   unobserve,
   validate,
 } from "fast-json-patch";
@@ -22,12 +21,12 @@ import {
   headValueRefPrefix,
   immutableArrayCopy,
   immutableMapCopy,
+  refKeysAtCommit,
   localHeadPathPrefix,
   mapPath,
   mutableMapCopy,
   REFS_HEAD_KEY,
   REFS_MAIN_KEY,
-  refsAtCommit,
   shaishToCommit,
   tagToRef,
   validateBranchName,
@@ -380,14 +379,16 @@ export class Repository<T extends { [k: PropertyKey]: any }>
     const [commit] = shaishToCommit(shaish, this.refs, this.commits);
     await this.moveTo(commit);
 
-    const refs = refsAtCommit(this.refs, commit);
+    const commitAtHEAD = this.mustCommitAtHead()
+    const refs = refKeysAtCommit(this.refs, commitAtHEAD);
+
     // reset only moves heads and not tags
-    const moveableRefs = refs.filter((r) =>
-      r.name.startsWith(localHeadPathPrefix()),
+    const moveableRefs = refs.filter((ref) =>
+      ref.startsWith(localHeadPathPrefix()),
     );
 
     for (const ref of moveableRefs) {
-      this.moveRef(ref.name, commit);
+      this.moveRef(ref, commit);
     }
 
     if (mode === "hard") {

packages/ogre/src/test.utils.ts

@@ -1,6 +1,6 @@
 import { v4 as uuid4 } from "uuid";
-import { Repository, RepositoryObject } from "./repository.js";
-import { Commit } from "./commit.js";
+import { Repository, type RepositoryObject } from "./repository.js";
+import type {Commit} from "./commit.js";
 
 export type NestedObject = {
   name?: string;

packages/ogre/src/utils.test.ts

@@ -1,7 +1,7 @@
 import { test } from "tap";
 import { cleanAuthor, mapPath, shaishToCommit } from "./utils.js";
 import { Repository } from "./repository.js";
-import { ComplexObject, testAuthor } from "./test.utils.js";
+import {type ComplexObject, testAuthor } from "./test.utils.js";
 
 test("author <email@domain.info>", (t) => {
   const [name, email] = cleanAuthor("author <email@domain.info>");