@verdant-web/common 2.7.3 → 2.9.0

package/dist/esm/undo.js

@@ -1,6 +1,9 @@
 import { applyPatch } from './operation.js';
+import { PatchCreator } from './patch.js';
+import { isRef } from './refs.js';
 import { cloneDeep } from './utils.js';
-export function getUndoOperations(oid, initial, operations, getNow) {
+export function getUndoOperations(oid, initial, operations, getNow, getSubId, authz) {
+    const patchCreator = new PatchCreator(getNow, getSubId);
     if (initial === undefined || initial === null) {
         // if the initial state is nothing, then the undo is to delete everything.
         // there's nothing else to worry about!
@@ -11,6 +14,7 @@ export function getUndoOperations(oid, initial, operations, getNow) {
                 data: {
                     op: 'delete',
                 },
+                authz,
             },
         ];
     }
@@ -20,190 +24,93 @@ export function getUndoOperations(oid, initial, operations, getNow) {
     let state = cloneDeep(initial);
     const undoOperations = [];
     for (const operation of operations) {
-        const undo = getUndoOperation(oid, state, operation, getNow);
+        const undo = getUndoOperation(oid, state, operation, patchCreator, authz);
         undoOperations.unshift(...undo);
         applyPatch(state, operation.data);
     }
     return undoOperations;
 }
-function getUndoOperation(oid, initial, operation, getNow) {
+function getUndoOperation(oid, initial, operation, patchCreator, authz) {
+    var _a, _b;
     const data = operation.data;
     switch (data.op) {
         case 'set':
+            if (initial[data.name] === undefined) {
+                return patchCreator.createRemove(oid, data.name, authz);
+            }
+            return patchCreator.createSet(oid, data.name, initial[data.name], authz);
         case 'remove':
-            return [
-                {
-                    oid,
-                    timestamp: getNow(),
-                    data: {
-                        op: 'set',
-                        name: data.name,
-                        value: initial[data.name],
-                    },
-                },
-            ];
+            if (initial[data.name] === undefined) {
+                return [];
+            }
+            return patchCreator.createSet(oid, data.name, initial[data.name], authz);
         case 'list-insert':
-            return [
-                {
-                    oid,
-                    timestamp: getNow(),
-                    data: {
-                        op: 'list-delete',
-                        index: data.index,
-                        count: 1,
-                    },
-                },
-            ];
+            if (data.value === undefined && ((_a = data.values) === null || _a === void 0 ? void 0 : _a.length) === 0)
+                return [];
+            return patchCreator.createListDelete(oid, data.index, data.value ? 1 : ((_b = data.values) === null || _b === void 0 ? void 0 : _b.length) || 0, authz);
         case 'list-delete':
-            return [
-                {
-                    oid,
-                    timestamp: getNow(),
-                    data: {
-                        op: 'list-insert',
-                        index: data.index,
-                        values: initial.slice(data.index, data.count),
-                    },
-                },
-            ];
+            return patchCreator.createListInsertMany(oid, data.index, initial.slice(data.index, data.index + data.count), authz);
         case 'list-move-by-ref':
-            return [
-                {
-                    oid,
-                    timestamp: getNow(),
-                    data: {
-                        op: 'list-move-by-ref',
-                        value: data.value,
-                        index: initial.indexOf(data.value),
-                    },
-                },
-            ];
+            return patchCreator.createListMoveByRef(oid, data.value, findItemRefIndex(initial, data.value), authz);
         case 'list-move-by-index':
-            return [
-                {
-                    oid,
-                    timestamp: getNow(),
-                    data: {
-                        op: 'list-move-by-index',
-                        from: data.to,
-                        to: data.from,
-                    },
-                },
-            ];
+            return patchCreator.createListMoveByIndex(oid, data.to, data.from, authz);
         case 'delete':
-            return [
-                {
-                    oid,
-                    timestamp: getNow(),
-                    data: {
-                        op: 'initialize',
-                        value: initial,
-                    },
-                },
-            ];
+            return patchCreator.createInitialize(initial, oid, authz, true);
         case 'list-push':
-            return [
-                {
-                    oid,
-                    timestamp: getNow(),
-                    data: {
-                        op: 'list-remove',
-                        value: data.value,
-                        // best heuristic here - remove the last instance of the item.
-                        only: 'last',
-                    },
-                },
-            ];
+            return patchCreator.createListRemove(oid, data.value, 'last', authz);
         case 'list-remove':
             if (data.only === 'last') {
-                const index = initial.lastIndexOf(data.value);
-                return [
-                    {
-                        oid,
-                        timestamp: getNow(),
-                        data: {
-                            op: 'list-insert',
-                            index,
-                            values: [data.value],
-                        },
-                    },
-                ];
+                const index = findItemRefIndex(initial, data.value, 0, 'backward');
+                if (index === -1) {
+                    // if the value isn't in the list, then there's nothing to undo.
+                    return [];
+                }
+                return patchCreator.createListInsert(oid, index, data.value, authz);
             }
             else if (data.only === 'first') {
-                const index = initial.indexOf(data.value);
-                return [
-                    {
-                        oid,
-                        timestamp: getNow(),
-                        data: {
-                            op: 'list-insert',
-                            index,
-                            values: [data.value],
-                        },
-                    },
-                ];
+                const index = findItemRefIndex(initial, data.value);
+                if (index === -1) {
+                    // if the value isn't in the list, then there's nothing to undo.
+                    return [];
+                }
+                return patchCreator.createListInsert(oid, index, data.value, authz);
             }
             else {
                 // find all instances of value and restore them at their
                 // original index
                 const indexesOfValue = [];
-                let index = initial.indexOf(data.value);
+                let index = findItemRefIndex(initial, data.value);
                 while (index !== -1) {
                     indexesOfValue.push(index);
-                    index = initial.indexOf(data.value, index + 1);
+                    index = findItemRefIndex(initial, data.value, index + 1);
                 }
-                return indexesOfValue.map((index) => ({
-                    oid,
-                    timestamp: getNow(),
-                    data: {
-                        op: 'list-insert',
-                        index,
-                        value: data.value,
-                    },
-                }));
+                return indexesOfValue.flatMap((index) => patchCreator.createListInsert(oid, index, data.value, authz));
             }
         case 'list-add':
             // this one is kind of ambiguous. in theory the set may have
             // already included the value and so no change happened. but
             // basically we infer the intent is to remove what was meant
             // to be added by this change.
-            return [
-                {
-                    oid,
-                    timestamp: getNow(),
-                    data: {
-                        op: 'list-remove',
-                        value: data.value,
-                        only: 'last',
-                    },
-                },
-            ];
+            return patchCreator.createListRemove(oid, data.value, 'last', authz);
         case 'list-set':
-            return [
-                {
-                    oid,
-                    timestamp: getNow(),
-                    data: {
-                        op: 'list-set',
-                        index: data.index,
-                        value: initial[data.index],
-                    },
-                },
-            ];
+            if (initial[data.index] !== undefined) {
+                return patchCreator.createListSet(oid, data.index, initial[data.index], authz);
+            }
+            return patchCreator.createListDelete(oid, data.index, 1, authz);
         case 'initialize':
-            return [
-                {
-                    oid,
-                    timestamp: getNow(),
-                    data: {
-                        op: 'delete',
-                    },
-                },
-            ];
+            return patchCreator.createDelete(oid, authz);
         case 'touch':
             return [];
         default:
             throw new Error(`Cannot undo operation type: ${data.op}`);
     }
 }
+function findItemRefIndex(list, item, from = 0, dir = 'forward') {
+    const method = dir === 'forward' ? 'findIndex' : 'findLastIndex';
+    // for object items, attempt to find the matching item by OID.
+    if (isRef(item)) {
+        return list[method]((i, idx) => isRef(i) && i.id === item.id && idx >= from);
+    }
+    return list[method]((i, idx) => i === item && idx >= from);
+}
 //# sourceMappingURL=undo.js.map

package/dist/esm/undo.js.map

@@ -1 +1 @@
-{"version":3,"file":"undo.js","sourceRoot":"","sources":["../../src/undo.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"undo.js","sourceRoot":"","sources":["../../src/undo.ts"],"names":[],"mappings":"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"}

package/dist/esm/undo.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/esm/undo.test.js

@@ -0,0 +1,81 @@
+import { describe, expect, it } from 'vitest';
+import { assignOid, createOid, createRef } from './oids.js';
+import { PatchCreator } from './patch.js';
+import { getUndoOperations } from './undo.js';
+function createClock(start = 0) {
+    let time = start;
+    function clock() {
+        return `${time++}`;
+    }
+    clock.reset = () => {
+        time = start;
+    };
+    return clock;
+}
+describe('undo', () => {
+    it('correctly removes added list items', () => {
+        const clock = createClock();
+        const patchCreator = new PatchCreator(clock, createClock());
+        const initial = [1, 2];
+        const oid = createOid('test', 'foo');
+        const operations = patchCreator.createListSet(oid, 2, 3);
+        clock.reset();
+        const undos = getUndoOperations(oid, initial, operations, clock);
+        clock.reset();
+        expect(undos).toEqual(patchCreator.createListDelete(oid, 2, 1));
+    });
+    it('correctly restores removed items by ref', () => {
+        const clock = createClock();
+        const patchCreator = new PatchCreator(clock, createClock());
+        const initial = assignOid([createRef('test/a:1'), createRef('test/a:2'), createRef('test/a:3')], 'test/a');
+        const operations = patchCreator.createListRemove('test/a', initial[1], 'last');
+        clock.reset();
+        const undos = getUndoOperations('test/a', initial, operations, clock);
+        clock.reset();
+        expect(undos).toEqual(patchCreator.createListInsert('test/a', 1, initial[1]));
+    });
+    it('undoes list insert with 1 item', () => {
+        const clock = createClock();
+        const patchCreator = new PatchCreator(clock, createClock());
+        const initial = [1, 2];
+        const oid = createOid('test', 'foo');
+        const operations = patchCreator.createListInsert(oid, 1, 3);
+        clock.reset();
+        const undos = getUndoOperations(oid, initial, operations, clock);
+        clock.reset();
+        expect(undos).toEqual(patchCreator.createListDelete(oid, 1, 1));
+    });
+    it('undoes list insert with multiple items', () => {
+        const clock = createClock();
+        const patchCreator = new PatchCreator(clock, createClock());
+        const initial = [1, 2];
+        const oid = createOid('test', 'foo');
+        const operations = patchCreator.createListInsertMany(oid, 1, [3, 4]);
+        clock.reset();
+        const undos = getUndoOperations(oid, initial, operations, clock);
+        clock.reset();
+        expect(undos).toEqual(patchCreator.createListDelete(oid, 1, 2));
+    });
+    it('undoes initialize with delete', () => {
+        const clock = createClock();
+        const patchCreator = new PatchCreator(clock, createClock());
+        const initial = { foo: 'bar' };
+        const oid = createOid('test', 'foo');
+        const operations = patchCreator.createInitialize(initial, oid);
+        clock.reset();
+        const undos = getUndoOperations(oid, initial, operations, clock);
+        clock.reset();
+        expect(undos).toEqual(patchCreator.createDelete(oid));
+    });
+    it('undoes an object move by ref', () => {
+        const clock = createClock();
+        const patchCreator = new PatchCreator(clock, createClock());
+        const initial = assignOid([createRef('test/a:1'), createRef('test/a:2'), createRef('test/a:3')], 'test/a');
+        const operations = patchCreator.createListMoveByRef('test/a', initial[1], 0);
+        clock.reset();
+        const undos = getUndoOperations('test/a', initial, operations, clock);
+        clock.reset();
+        expect(undos).toEqual(patchCreator.createListMoveByRef('test/a', initial[1], 1));
+    });
+});
+//# sourceMappingURL=undo.test.js.map

package/dist/esm/undo.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"undo.test.js","sourceRoot":"","sources":["../../src/undo.test.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verdant-web/common",
-  "version": "2.7.3",
+  "version": "2.9.0",
   "access": "public",
   "type": "module",
   "exports": {

package/src/authz.ts

@@ -18,6 +18,8 @@ function decode(str: string): string {
 }
 
 export type AuthorizationKey = string & {
+	// virtual type only used for type checking to try to sort
+	// out between encoded and decoded string values.
 	'@@type': 'authz';
 };
 

package/src/baseline.ts

@@ -2,9 +2,11 @@
 // written upon rebasing. If you apply ops to an undefined
 // snapshot without an initialize, it remains undefined.
 
+import { AuthorizationKey } from './authz.js';
+
 export type DocumentBaseline<T extends any = any> = {
 	oid: string;
 	snapshot: T;
 	timestamp: string;
-	authz?: string;
+	authz?: AuthorizationKey;
 };