@dotinc/ogre 0.15.1 → 0.15.2

package/lib/repository.js

@@ -6,18 +6,21 @@ import * as jsondiffpatch from 'jsondiffpatch';
  */
 export class Repository {
     constructor(obj, options) {
-        var _a, _b, _c, _d, _e, _f, _g;
-        this._isReady = false;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        this._readyPromise = new Promise((resolve) => {
+            this._resolveReady = resolve;
+        });
         this.hashFn = (_a = options.overrides) === null || _a === void 0 ? void 0 : _a.calculateCommitHashFn;
         this.serializeObjectFn = (_b = options.overrides) === null || _b === void 0 ? void 0 : _b.serializeObjectFn;
         this.deserializeObjectFn = (_c = options.overrides) === null || _c === void 0 ? void 0 : _c.deserializeObjectFn;
+        this.timestampFn = (_d = options.overrides) === null || _d === void 0 ? void 0 : _d.timestampFn;
         options.history && this.storeRemoteState(options.history);
         this.original = deepClone(obj);
         // store js ref, so obj can still be modified without going through repo.data
         this.data = obj;
         this.observer = observe(obj);
-        this.refs = ((_d = options.history) === null || _d === void 0 ? void 0 : _d.refs)
-            ? mutableMapCopy((_e = options.history) === null || _e === void 0 ? void 0 : _e.refs)
+        this.refs = ((_e = options.history) === null || _e === void 0 ? void 0 : _e.refs)
+            ? mutableMapCopy((_f = options.history) === null || _f === void 0 ? void 0 : _f.refs)
             : new Map([
                 [
                     REFS_HEAD_KEY,
@@ -27,19 +30,19 @@ export class Repository {
                     },
                 ],
             ]);
-        this.commits = (_g = (_f = options.history) === null || _f === void 0 ? void 0 : _f.commits) !== null && _g !== void 0 ? _g : [];
+        this.commits = (_h = (_g = options.history) === null || _g === void 0 ? void 0 : _g.commits) !== null && _h !== void 0 ? _h : [];
         if (!options.history) {
-            this._isReady = true;
+            this._resolveReady(true);
             return;
         }
         // restore history
         const commit = this.commitAtHead();
         if (!commit) {
-            this._isReady = true;
+            this._resolveReady(true);
             return;
         }
         this.moveTo(commit).then(() => {
-            this._isReady = true;
+            this._resolveReady(true);
         });
     }
     storeRemoteState(history) {
@@ -48,18 +51,7 @@ export class Repository {
         this.remoteCommits = immutableArrayCopy(history.commits, (c) => c.hash);
     }
     isReady() {
-        const self = this;
-        function checkFlag(callback) {
-            if (self._isReady === true) {
-                callback(true);
-            }
-            else {
-                setTimeout(() => checkFlag(callback), 10);
-            }
-        }
-        return new Promise((resolve) => {
-            checkFlag(resolve);
-        });
+        return this._readyPromise;
     }
     async push(pushToBackendFn) {
         const success = await pushToBackendFn();
@@ -286,7 +278,7 @@ export class Repository {
             (amend && message === (parent === null || parent === void 0 ? void 0 : parent.message))) {
             throw new Error(`no changes to commit`);
         }
-        const timestamp = new Date();
+        const timestamp = this.timestampFn ? this.timestampFn() : new Date();
         const parentChanges = amend && parent && ((_b = (_a = parent.changes) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0 > 0)
             ? parent.changes
             : [];
@@ -352,8 +344,7 @@ export class Repository {
         return cleanRefValue(ref.value);
     }
     // region History functions
-    collectCommits() {
-        const commit = this.commitAtHead();
+    collectCommits(commit) {
         if (!commit) {
             return [];
         }
@@ -369,7 +360,7 @@ export class Repository {
     getHistory() {
         return {
             refs: new Map(this.refs),
-            commits: this.collectCommits(),
+            commits: this.collectCommits(this.commitAtHead()),
         };
     }
     logs(numberOfCommits) {

package/package.json

@@ -4,7 +4,7 @@
     "type": "git",
     "url": "https://github.com/dotindustries/ogre.git"
   },
-  "version": "0.15.1",
+  "version": "0.15.2",
   "description": "Git-like repository for in-memory object versioning",
   "private": false,
   "main": "lib/index.js",
@@ -49,5 +49,5 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "gitHead": "ca49fdcdec161e884acc33515925f3dbcd0fd8ca"
+  "gitHead": "a7153783f07fc368cb31cac9dd2662e05d3cfb29"
 }

package/src/repository.test.ts

@@ -843,4 +843,42 @@ test("pending changes - push helpers", async (t) => {
       "wrong pending ref update",
     );
   });
+
+  t.test("local remote state is updated after push", async (t) => {
+    const [repo, obj] = await getBaseline();
+    updateHeaderData(obj);
+    const c1 = await repo.commit("header data", testAuthor);
+    addOneNested(obj);
+    const c2 = await repo.commit("first nested", testAuthor);
+    repo.tag("v0.1.0");
+    const history = repo.getHistory();
+    const cm1 = history.commits.find((c) => c.hash === c1);
+    const cm2 = history.commits.find((c) => c.hash === c2);
+
+    const pending = repo.cherry();
+    t.equal(pending.commits.length, 2, "incorrect number of pending commits");
+    t.equal(pending.refs.size, 2, `incorrect number of pending ref updates`);
+    t.matchOnlyStrict(
+      pending.commits,
+      [cm2, cm1],
+      "wrong pending commits",
+    );
+    t.matchOnlyStrict(
+      pending.refs.keys(),
+      ["refs/heads/main", "refs/tags/v0.1.0"],
+      "wrong pending ref update",
+    );
+
+    const remote = repo.remote()
+    console.log("local remote state is updated after push");
+    await repo.push(() => Promise.resolve(true))
+    const remote2 = repo.remote()
+    t.notMatchOnlyStrict(remote, remote2, "remote should be different after push")
+    // now test push
+
+  })
+
+  // t.test("history returns all commits from all branches", async t => {
+  //   t.fail("TODO: implement commits to be gathered from all refs, not just from the HEAD backwards")
+  // })
 });

package/src/repository.ts

@@ -40,6 +40,7 @@ export interface RepositoryOptions {
     calculateCommitHashFn?: (content: CommitHashContent) => Promise<string>;
     serializeObjectFn?: (obj: any) => Promise<string>;
     deserializeObjectFn?: <T>(str: string) => Promise<T>;
+    timestampFn?: () => Date;
   };
 }
 
@@ -121,9 +122,13 @@ export class Repository<T extends { [k: PropertyKey]: any }>
   implements RepositoryObject<T>
 {
   constructor(obj: Partial<T>, options: RepositoryOptions) {
+    this._readyPromise = new Promise<boolean>((resolve) => {
+      this._resolveReady = resolve;
+    });
     this.hashFn = options.overrides?.calculateCommitHashFn;
     this.serializeObjectFn = options.overrides?.serializeObjectFn;
     this.deserializeObjectFn = options.overrides?.deserializeObjectFn;
+    this.timestampFn = options.overrides?.timestampFn;
     options.history && this.storeRemoteState(options.history);
     this.original = deepClone(obj);
     // store js ref, so obj can still be modified without going through repo.data
@@ -144,18 +149,18 @@ export class Repository<T extends { [k: PropertyKey]: any }>
     this.commits = options.history?.commits ?? [];
 
     if (!options.history) {
-      this._isReady = true;
+      this._resolveReady(true);
       return;
     }
 
     // restore history
     const commit = this.commitAtHead();
     if (!commit) {
-      this._isReady = true;
+      this._resolveReady(true);
       return;
     }
     this.moveTo(commit).then(() => {
-      this._isReady = true;
+      this._resolveReady(true);
     });
   }
 
@@ -169,22 +174,11 @@ export class Repository<T extends { [k: PropertyKey]: any }>
   }
 
   private readonly original: T;
-  private _isReady = false;
+  private _readyPromise: Promise<boolean>;
+  private _resolveReady!: (value: boolean) => void;
 
   isReady(): Promise<boolean> {
-    const self = this;
-
-    function checkFlag(callback: (ok: boolean) => void) {
-      if (self._isReady === true) {
-        callback(true);
-      } else {
-        setTimeout(() => checkFlag(callback), 10);
-      }
-    }
-
-    return new Promise((resolve) => {
-      checkFlag(resolve);
-    });
+    return this._readyPromise;
   }
 
   data: T;
@@ -200,6 +194,8 @@ export class Repository<T extends { [k: PropertyKey]: any }>
     | (<T>(str: string) => Promise<T>)
     | undefined;
 
+  private readonly timestampFn: (() => Date) | undefined;
+
   // stores the remote state upon initialization
   private remoteRefs:
     | ReadonlyMap<string, Readonly<Reference>>
@@ -486,7 +482,7 @@ export class Repository<T extends { [k: PropertyKey]: any }>
       throw new Error(`no changes to commit`);
     }
 
-    const timestamp = new Date();
+    const timestamp = this.timestampFn ? this.timestampFn() : new Date();
     const parentChanges =
       amend && parent && (parent.changes?.length ?? 0 > 0)
         ? parent.changes
@@ -564,8 +560,7 @@ export class Repository<T extends { [k: PropertyKey]: any }>
   }
 
   // region History functions
-  private collectCommits() {
-    const commit = this.commitAtHead();
+  private collectCommits(commit?: Commit) {
     if (!commit) {
       return [];
     }
@@ -582,7 +577,7 @@ export class Repository<T extends { [k: PropertyKey]: any }>
   getHistory(): History {
     return {
       refs: new Map(this.refs),
-      commits: this.collectCommits(),
+      commits: this.collectCommits(this.commitAtHead()),
     };
   }