@dotinc/ogre 0.5.0 → 0.6.0

package/.tap/test-results/src/repository.test.ts.tap

@@ -1,9 +1,9 @@
 TAP version 14
 # Subtest: diff is ok
     ok 1 - main is pointing at wrong commit
-    ok 2 - invalid \# of change entries: [{"op":"add","path":"/nested/0","value":{"uuid":"054a46dd-f3dd-4f56-a7ed-1d17a38a687d","name":"new name"}},{"op":"add","path":"/nested/1","value":{"uuid":"ff2346f8-0d88-4d12-848b-1b35f63e8b38","name":"first name"}}]
+    ok 2 - invalid \# of change entries: [{"op":"add","path":"/nested/0","value":{"uuid":"aa929d75-cfce-4798-9f2d-7ff07a2ae610","name":"new name"}},{"op":"add","path":"/nested/1","value":{"uuid":"154ef374-8162-4d02-a72a-af0c6181535c","name":"first name"}}]
     1..2
-ok 1 - diff is ok # time=88.992ms
+ok 1 - diff is ok # time=59.877ms
 
 # Subtest: restore
     # Subtest: history check
@@ -13,7 +13,7 @@ ok 1 - diff is ok # time=88.992ms
         ok 4 - incorrect \# of commits
         ok 5 - incorrect \# of changelog entries
         1..5
-    ok 1 - history check # time=116.216ms
+    ok 1 - history check # time=85.095ms
     
     # Subtest: reconstruct with 2 commits
         ok 1 - main is pointing at wrong commit
@@ -22,10 +22,10 @@ ok 1 - diff is ok # time=88.992ms
         ok 4 - incorrect \# of commits
         ok 5 - incorrect \# of changelog entries
         1..5
-    ok 2 - reconstruct with 2 commits # time=8.342ms
+    ok 2 - reconstruct with 2 commits # time=6.821ms
     
     1..2
-ok 2 - restore # time=167.323ms
+ok 2 - restore # time=140.616ms
 
 # Subtest: history
     # Subtest: history contains HEAD ref
@@ -34,15 +34,15 @@ ok 2 - restore # time=167.323ms
         ok 3 - should be equal
         ok 4 - should be equal
         1..4
-    ok 1 - history contains HEAD ref # time=105.224ms
+    ok 1 - history contains HEAD ref # time=62.587ms
     
     # Subtest: empty history unreachable HEAD
         ok 1 - expected to throw
         1..1
-    ok 2 - empty history unreachable HEAD # time=2.508ms
+    ok 2 - empty history unreachable HEAD # time=2.454ms
     
     1..2
-ok 3 - history # time=187.749ms
+ok 3 - history # time=172.026ms
 
 # Subtest: reset
     # Subtest: reset hard
@@ -50,14 +50,88 @@ ok 3 - history # time=187.749ms
         ok 2 - wrong \# of changes in diff
         ok 3 - failed to reset
         1..3
-    ok 1 - reset hard # time=3.467ms
+    ok 1 - reset hard # time=2.495ms
     
     1..1
-ok 4 - reset # time=73.017ms
+ok 4 - reset # time=65.322ms
+
+# Subtest: status
+    # Subtest: clean repo no change
+        ok 1 - Shouldn't have pending changes
+        1..1
+    ok 1 - clean repo no change # time=383.866ms
+    
+    # Subtest: clean repo pending change
+        ok 1 - Status doesn't contain changes
+        1..1
+    ok 2 - clean repo pending change # time=0.618ms
+    
+    # Subtest: reading status doesn't clean observer
+        ok 1 - Status doesn't contain changes
+        ok 2 - Status doesn't contain changes
+        ok 3 - different pending changes??
+        1..3
+    ok 3 - reading status doesn't clean observer # time=0.99ms
+    
+    # Subtest: after commit no change
+        ok 1 - Shouldn't have pending changes
+        1..1
+    ok 4 - after commit no change # time=1.194ms
+    
+    # Subtest: after commit pending change
+        ok 1 - Shouldn't have pending changes
+        ok 2 - Status doesn't contain changes
+        1..2
+    ok 5 - after commit pending change # time=1.322ms
+    
+    # Subtest: after commit pending change for rewrite array
+        ok 1 - Shouldn't have pending changes
+        ok 2 - Status doesn't contain changes
+        1..2
+    ok 6 - after commit pending change for rewrite array # time=1.325ms
+    
+    # Subtest: change of nested array element prop
+        ok 1 - Shouldn't have pending changes
+        ok 2 - Status doesn't contain changes
+        1..2
+    ok 7 - change of nested array element prop # time=1.704ms
+    
+    1..7
+ok 5 - status # time=447.711ms
+
+# Subtest: apply
+    # Subtest: single patch
+        ok 1 - Shouldn't have pending changes
+        ok 2 - Failed to apply patch
+        ok 3 - The final state does not match up
+        ok 4 - Status doesn't contain changes
+        ok 5 - It should have the right changes
+        1..5
+    ok 1 - single patch # time=116.271ms
+    
+    # Subtest: patch for undefined props doesn't work as expected https://github.com/Starcounter-Jack/JSON-Patch/issues/280
+        ok 1 - Shouldn't have pending changes
+        ok 2 - Failed to apply patch
+        ok 3 - The final state shoould not match up, because patch failed
+        ok 4 - Status doesn't contain changes
+        1..4
+    ok 2 - patch for undefined props doesn't work as expected https://github.com/Starcounter-Jack/JSON-Patch/issues/280 # time=3.777ms
+    
+    # Subtest: multiple patches
+        ok 1 - Shouldn't have pending changes
+        ok 2 - Failed to apply patch
+        ok 3 - Status doesn't contain changes
+        ok 4 - It should have the right changes
+        ok 5 - The final state does not match up
+        1..5
+    ok 3 - multiple patches # time=1.47ms
+    
+    1..3
+ok 6 - apply # time=174.216ms
 
 # Subtest: restoring from history
     ok 1 - restored object does not equal last version.
     1..1
-ok 5 - restoring from history # time=16.296ms
+ok 7 - restoring from history # time=3.033ms
 
-1..5
+1..7

package/.tap/test-results/src/tag.test.ts.tap

@@ -2,18 +2,18 @@ TAP version 14
 # Subtest: cannot tag on an empty repo
     ok 1 - expected to throw
     1..1
-ok 1 - cannot tag on an empty repo # time=26.547ms
+ok 1 - cannot tag on an empty repo # time=15.405ms
 
 # Subtest: can create simple tag pointing to HEAD
     ok 1 - should be equal
     ok 2 - tag is not pointing to expected commit
     ok 3 - reference was not present in history
     1..3
-ok 2 - can create simple tag pointing to HEAD # time=7.579ms
+ok 2 - can create simple tag pointing to HEAD # time=8.818ms
 
 # Subtest: cannot create tag with whitespace
     ok 1 - expected to throw
     1..1
-ok 3 - cannot create tag with whitespace # time=2.772ms
+ok 3 - cannot create tag with whitespace # time=2.471ms
 
 1..3

package/.tap/test-results/src/utils.test.ts.tap

@@ -3,41 +3,41 @@ TAP version 14
     ok 1 - should be equal
     ok 2 - should be equal
     1..2
-ok 1 - author <email@domain.info> # time=3.979ms
+ok 1 - author <email@domain.info> # time=3.986ms
 
 # Subtest: author with space <email@domain.info>
     ok 1 - should be equal
     ok 2 - should be equal
     1..2
-ok 2 - author with space <email@domain.info> # time=0.662ms
+ok 2 - author with space <email@domain.info> # time=0.849ms
 
 # Subtest: author @handle
     ok 1 - should be equal
     ok 2 - should be equal
     1..2
-ok 3 - author @handle # time=0.455ms
+ok 3 - author @handle # time=0.609ms
 
 # Subtest: author with space @handle
     ok 1 - should be equal
     ok 2 - should be equal
     1..2
-ok 4 - author with space @handle # time=0.419ms
+ok 4 - author with space @handle # time=0.553ms
 
 # Subtest: email@domain.info
     ok 1 - should be equal
     ok 2 - should be equal
     1..2
-ok 5 - email@domain.info # time=0.61ms
+ok 5 - email@domain.info # time=0.726ms
 
 # Subtest: @handle
     ok 1 - should be equal
     ok 2 - should be equal
     1..2
-ok 6 - @handle # time=0.591ms
+ok 6 - @handle # time=0.699ms
 
 # Subtest: empty author
     ok 1 - expected to throw
     1..1
-ok 7 - empty author # time=2.247ms
+ok 7 - empty author # time=2.326ms
 
 1..7

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+# v0.6.0 (Sat Mar 02 2024)
+
+#### 🚀 Enhancement
+
+- feat: status and apply [#156](https://github.com/dotindustries/ogre/pull/156) ([@nadilas](https://github.com/nadilas))
+- feat: status and apply ([@nadilas](https://github.com/nadilas))
+
+#### Authors: 1
+
+- [@nadilas](https://github.com/nadilas)
+
+---
+
 # v0.5.0 (Sat Feb 24 2024)
 
 #### 🚀 Enhancement

package/lib/index.d.ts

@@ -5,3 +5,4 @@ export * from "./ref";
 export * from "./size";
 export * from "./utils";
 export * from "./git2json";
+export { compare, deepClone, Operation, JsonPatchError } from "fast-json-patch";

package/lib/index.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.JsonPatchError = exports.deepClone = exports.compare = void 0;
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./interfaces"), exports);
 tslib_1.__exportStar(require("./repository"), exports);
@@ -7,3 +8,7 @@ tslib_1.__exportStar(require("./ref"), exports);
 tslib_1.__exportStar(require("./size"), exports);
 tslib_1.__exportStar(require("./utils"), exports);
 tslib_1.__exportStar(require("./git2json"), exports);
+var fast_json_patch_1 = require("fast-json-patch");
+Object.defineProperty(exports, "compare", { enumerable: true, get: function () { return fast_json_patch_1.compare; } });
+Object.defineProperty(exports, "deepClone", { enumerable: true, get: function () { return fast_json_patch_1.deepClone; } });
+Object.defineProperty(exports, "JsonPatchError", { enumerable: true, get: function () { return fast_json_patch_1.JsonPatchError; } });

package/lib/repository.d.ts

@@ -1,4 +1,4 @@
-import { Operation } from "fast-json-patch";
+import { Operation, JsonPatchError } from "fast-json-patch";
 import { Commit } from "./commit";
 import { History } from "./interfaces";
 export declare const REFS_HEAD_KEY = "HEAD";
@@ -20,6 +20,15 @@ export interface RepositoryObject<T extends {
      * @param shaishTo expression (e.g. refs (branches, tags), commitSha)
      */
     diff(shaishFrom: string, shaishTo?: string): Operation[];
+    /**
+     * Returns pending changes.
+     */
+    status(): Operation[];
+    /**
+     * Applies a patch to the repository's HEAD
+     * @param patch
+     */
+    apply(patch: Operation[]): void;
     head(): string;
     ref(reference: string): string | undefined;
     commit(message: string, author: string, amend?: boolean): Promise<string>;
@@ -52,8 +61,10 @@ export declare class Repository<T extends {
     private readonly refs;
     private readonly commits;
     private moveTo;
+    apply(patch: Operation[]): JsonPatchError | undefined;
     reset(mode?: "soft" | "hard" | undefined, shaish?: string | undefined): void;
     branch(): string;
+    status(): Operation[];
     diff(shaishFrom: string, shaishTo?: string): Operation[];
     checkout(shaish: string, createBranch?: boolean): void;
     commit(message: string, author: string, amend?: boolean): Promise<string>;
@@ -84,3 +95,4 @@ export declare const validateRef: (name: string, oneLevel?: boolean) => void;
 export declare const printChangeLog: <T extends {
     [k: string]: any;
 }>(repository: RepositoryObject<T>) => void;
+export declare const printChange: (chg: Operation) => void;

package/lib/repository.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.printChangeLog = exports.validateRef = exports.validateBranchName = exports.tagToRef = exports.brancheNameToRef = exports.cleanRefValue = exports.isTagRef = exports.createHeadRefValue = exports.Repository = exports.REFS_MAIN_KEY = exports.REFS_HEAD_KEY = void 0;
+exports.printChange = exports.printChangeLog = exports.validateRef = exports.validateBranchName = exports.tagToRef = exports.brancheNameToRef = exports.cleanRefValue = exports.isTagRef = exports.createHeadRefValue = exports.Repository = exports.REFS_MAIN_KEY = exports.REFS_HEAD_KEY = void 0;
 const fast_json_patch_1 = require("fast-json-patch");
 const commit_1 = require("./commit");
 const ref_1 = require("./ref");
@@ -44,10 +44,18 @@ class Repository {
         if (!patchToTarget || patchToTarget.length < 1) {
             return;
         }
-        (0, fast_json_patch_1.unobserve)(this.data, this.observer);
+        this.observer.unobserve();
         patchToTarget.reduce(fast_json_patch_1.applyReducer, this.data);
         this.observer = (0, fast_json_patch_1.observe)(this.data);
     }
+    apply(patch) {
+        const err = (0, fast_json_patch_1.validate)(patch, this.data);
+        if (err) {
+            return err;
+        }
+        (0, fast_json_patch_1.applyPatch)(this.data, patch);
+        // const changed = patch.reduce(applyReducer, this.data);
+    }
     reset(mode = "hard", shaish = exports.REFS_HEAD_KEY) {
         if (mode === "hard") {
             (0, fast_json_patch_1.unobserve)(this.data, this.observer);
@@ -76,6 +84,14 @@ class Repository {
         }
         return exports.REFS_HEAD_KEY; // detached state
     }
+    status() {
+        const commit = this.commitAtHead();
+        if (!commit) {
+            // on root repo return the pending changes
+            return (0, fast_json_patch_1.compare)(this.original, this.data); // this.observer.patches is empty?? :(
+        }
+        return this.diff(commit.hash);
+    }
     diff(shaishFrom, shaishTo) {
         const [cFrom] = shaishToCommit(shaishFrom, this.refs, this.commits);
         let target;
@@ -321,20 +337,6 @@ const treeToObject = (tree) => {
     return JSON.parse((0, fflate_1.strFromU8)((0, fflate_1.decompressSync)(Buffer.from(tree, "base64"))));
 };
 const getLastItem = (thePath) => thePath.substring(thePath.lastIndexOf("/") + 1);
-/**
- * Traverses the commit tree backwards and reassembles the changelog
- * @param commit
- * @param commitsList
- */
-const traverseAndCollectChangelog = (commit, commitsList) => {
-    let c = commit;
-    let clog = [];
-    while (c !== undefined) {
-        clog = [...commit.changes, ...clog];
-        c = commitsList.find((parent) => parent.hash === (c === null || c === void 0 ? void 0 : c.parent));
-    }
-    return clog;
-};
 const mapPath = (from, to, commits) => {
     let c = to;
     while (c !== undefined) {
@@ -458,16 +460,28 @@ exports.validateRef = validateRef;
  */
 const printChangeLog = (repository) => {
     console.log("----------------------------------------------------------");
-    console.log(`Changelog at ${repository.head()}`);
+    console.log("Changelog");
+    console.log("----------------------------------------------------------");
     const history = repository.getHistory();
     const head = commitAtRefIn(repository.head(), history.refs, history.commits);
     if (!head) {
         throw new Error(`fatal: HEAD is not defined`);
     }
-    const changeLog = traverseAndCollectChangelog(head, history.commits);
-    for (const [, chg] of changeLog.entries()) {
-        console.log(`  ${JSON.stringify(chg)}`);
+    let c = head;
+    while (c) {
+        console.log(`${c.hash} ${refsAtCommit(history.refs, c)
+            .map((r) => r.name)
+            .join(" ")}`);
+        for (const chg of c.changes) {
+            (0, exports.printChange)(chg);
+        }
+        c = history.commits.find((parent) => parent.hash === (c === null || c === void 0 ? void 0 : c.parent));
     }
+    console.log("End of changelog");
     console.log("----------------------------------------------------------");
 };
 exports.printChangeLog = printChangeLog;
+const printChange = (chg) => {
+    console.log(`  ${JSON.stringify(chg)}`);
+};
+exports.printChange = printChange;

package/lib/test.utils.d.ts

@@ -11,10 +11,7 @@ export declare type ComplexObject = {
     nested: NestedObject[];
 };
 export declare const testAuthor = "User name <name@domain.com>";
-export declare function getBaseline(): Promise<[
-    RepositoryObject<ComplexObject>,
-    ComplexObject
-]>;
+export declare function getBaseline(obj?: Partial<ComplexObject>): Promise<[RepositoryObject<ComplexObject>, ComplexObject]>;
 export declare function updateHeaderData(wrapped: ComplexObject): number;
 export declare function addOneStep(wrapped: ComplexObject): number;
 export declare function sumChanges(commits: Commit[] | undefined): number | undefined;

package/lib/test.utils.js

@@ -4,12 +4,13 @@ exports.sumChanges = exports.addOneStep = exports.updateHeaderData = exports.get
 const uuid_1 = require("uuid");
 const repository_1 = require("./repository");
 exports.testAuthor = "User name <name@domain.com>";
-async function getBaseline() {
+async function getBaseline(obj) {
     const co = {
         uuid: undefined,
         name: undefined,
         description: undefined,
         nested: [],
+        ...obj,
     };
     const repo = new repository_1.Repository(co, {});
     return [repo, co];

package/package.json

@@ -4,7 +4,7 @@
     "type": "git",
     "url": "https://github.com/dotindustries/ogre.git"
   },
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Git-like repository for in-memory object versioning",
   "private": false,
   "main": "lib/index.js",
@@ -37,5 +37,5 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "gitHead": "c6bad3ae8bf832cd9f9f9186cd3c37cf96420a46"
+  "gitHead": "38430801d71ee222edd396ddffa4f23263c9ad1c"
 }

package/src/commit.test.ts

@@ -7,6 +7,7 @@ import {
   testAuthor,
   updateHeaderData,
 } from "./test.utils";
+import { printChangeLog } from "./repository";
 
 test("baseline with 1 commit and zero changelog entries", async (t) => {
   const [repo] = await getBaseline();
@@ -40,6 +41,23 @@ test("no commit without changes after recent commit", async (t) => {
   });
 });
 
+test("overwrite nested array changes are recognized", async (t) => {
+  const [repo] = await getBaseline();
+  repo.data.name = "new name";
+  await repo.commit("baseline", testAuthor);
+  repo.data.nested = [{ name: "new item", uuid: "asdf" }];
+  await repo.commit("overwrite nested array", testAuthor);
+});
+
+test("change of nested array element is recognized", async (t) => {
+  const [repo] = await getBaseline();
+  repo.data.name = "new name";
+  addOneStep(repo.data);
+  await repo.commit("baseline", testAuthor);
+  repo.data.nested[0].name = "another name which is different";
+  await repo.commit("changed nested array object", testAuthor);
+});
+
 test("treeHash of commit is matching content", async (t) => {
   const [repo] = await getBaseline();
   repo.data.name = "new name";

package/src/index.ts

@@ -5,3 +5,5 @@ export * from "./ref";
 export * from "./size";
 export * from "./utils";
 export * from "./git2json";
+
+export { compare, deepClone, Operation, JsonPatchError } from "fast-json-patch";

package/src/repository.test.ts

@@ -1,7 +1,8 @@
 import { test } from "tap";
 
-import { Repository } from "./repository";
+import { printChange, printChangeLog, Repository } from "./repository";
 import {
+  addOneStep,
   addOneStep as addOneNested,
   ComplexObject,
   getBaseline,
@@ -10,6 +11,7 @@ import {
   updateHeaderData,
 } from "./test.utils";
 import { History, Reference } from "./interfaces";
+import { compare, Operation } from "fast-json-patch";
 
 test("diff is ok", async (t) => {
   const [repo, obj] = await getBaseline();
@@ -188,3 +190,146 @@ test("reset", async (t) => {
     t.equal(diff2.length, 0, "failed to reset");
   });
 });
+
+test("status", async (t) => {
+  t.test("clean repo no change", async (t) => {
+    const [repo] = await getBaseline();
+    const cleanState = repo.status();
+    t.match(cleanState, [], "Shouldn't have pending changes");
+  });
+  t.test("clean repo pending change", async (t) => {
+    const [repo] = await getBaseline({ name: "base name" });
+    repo.data.name = "changed name";
+    const dirtyState = repo.status();
+    t.equal(dirtyState.length, 1, "Status doesn't contain changes");
+  });
+  t.test("reading status doesn't clean observer", async (t) => {
+    const [repo] = await getBaseline({ name: "base name" });
+    repo.data.name = "changed name";
+    const dirtyState = repo.status();
+    t.equal(dirtyState.length, 1, "Status doesn't contain changes");
+
+    const dirtyState2 = repo.status();
+    t.equal(dirtyState2.length, 1, "Status doesn't contain changes");
+    t.match(dirtyState2, dirtyState2, "different pending changes??");
+  });
+  t.test("after commit no change", async (t) => {
+    const [repo] = await getBaseline();
+    repo.data.name = "new name";
+    await repo.commit("baseline", testAuthor);
+    const cleanState = repo.status();
+    t.match(cleanState, [], "Shouldn't have pending changes");
+  });
+  t.test("after commit pending change", async (t) => {
+    const [repo] = await getBaseline();
+    repo.data.name = "new name";
+    await repo.commit("baseline", testAuthor);
+    const cleanState = repo.status();
+    t.match(cleanState, [], "Shouldn't have pending changes");
+    repo.data.name = "changed name";
+    const dirtyState = repo.status();
+    t.equal(dirtyState.length, 1, "Status doesn't contain changes");
+  });
+  t.test("after commit pending change for rewrite array", async (t) => {
+    const [repo] = await getBaseline();
+    repo.data.name = "new name";
+    await repo.commit("baseline", testAuthor);
+    const cleanState = repo.status();
+    t.match(cleanState, [], "Shouldn't have pending changes");
+    repo.data.nested = [{ name: "new item", uuid: "asdf" }];
+    const dirtyState = repo.status();
+    t.equal(dirtyState.length, 1, "Status doesn't contain changes");
+  });
+  t.test("change of nested array element prop", async (t) => {
+    const [repo] = await getBaseline();
+    repo.data.name = "new name";
+    addOneStep(repo.data);
+    await repo.commit("baseline", testAuthor);
+    const cleanState = repo.status();
+    t.match(cleanState, [], "Shouldn't have pending changes");
+    repo.data.nested[0].name = "another name which is different";
+    const dirtyState = repo.status();
+    t.equal(dirtyState?.length, 1, "Status doesn't contain changes");
+  });
+});
+
+test("apply", async (t) => {
+  t.test("single patch", async (t) => {
+    const [repo] = await getBaseline({ name: "base name" });
+    const cleanState = repo.status();
+    t.match(cleanState, [], "Shouldn't have pending changes");
+
+    const targetState = {
+      uuid: undefined,
+      name: "a name",
+      description: undefined,
+      nested: [{ name: "new item", uuid: "asdf" }],
+    };
+    const patches = compare(repo.data, targetState);
+    // this should record changes on the observer
+    const err = repo.apply(patches);
+    t.match(err, undefined, "Failed to apply patch");
+    t.match(repo.data, targetState, "The final state does not match up");
+    const dirtyState = repo.status();
+    t.equal(dirtyState.length, 2, "Status doesn't contain changes");
+    t.match(dirtyState, patches, "It should have the right changes");
+  });
+
+  t.test(
+    "patch for undefined props doesn't work as expected https://github.com/Starcounter-Jack/JSON-Patch/issues/280",
+    async (t) => {
+      const [repo] = await getBaseline();
+      const cleanState = repo.status();
+      t.match(cleanState, [], "Shouldn't have pending changes");
+
+      const targetState: ComplexObject = {
+        uuid: undefined,
+        description: undefined,
+        name: "a name",
+        nested: [],
+      };
+      const patches = compare(repo.data, targetState);
+      // this should record changes on the observer
+      const err = repo.apply(patches);
+      t.match(
+        err,
+        {
+          name: "OPERATION_PATH_UNRESOLVABLE",
+          operation: {
+            op: "replace",
+            path: "/name",
+            value: "a name",
+          },
+        },
+        "Failed to apply patch",
+      );
+      t.notMatch(
+        repo.data,
+        targetState,
+        "The final state shoould not match up, because patch failed",
+      );
+      const dirtyState = repo.status();
+      t.equal(dirtyState.length, 0, "Status doesn't contain changes");
+    },
+  );
+
+  t.test("multiple patches", async (t) => {
+    const [repo] = await getBaseline({ name: "base name" });
+
+    const cleanState = repo.status();
+    t.match(cleanState, [], "Shouldn't have pending changes");
+    const targetState = {
+      uuid: undefined,
+      name: "a name",
+      description: undefined,
+      nested: [{ name: "new item", uuid: "asdf" }],
+    };
+    const patches = compare(repo.data, targetState);
+    const err = repo.apply(patches);
+    t.equal(err, undefined, "Failed to apply patch");
+    const dirtyState = repo.status();
+    t.equal(dirtyState?.length, 2, "Status doesn't contain changes");
+    t.match(dirtyState, patches, "It should have the right changes");
+    t.match(repo.data, targetState, "The final state does not match up");
+  });
+});