@vorplex/core 0.0.32 → 0.0.34

package/dist/modules/changes/changes.util.d.ts

@@ -1,4 +1,4 @@
-export type ArrayChange = Record<`$${number}` | `$${number}+`, any | typeof $Changes.deleted>;
+export type ArrayChange = Record<`$${number}` | `$${number}+` | `${'$'}{${string | number}}`, any | typeof $Changes.deleted>;
 export interface ChangeCompareResult {
     differences: any;
     similarities: any;
@@ -29,15 +29,12 @@ export interface ChangeRebase<T = any> {
              * The `.source` with local conflicting changes applied
              */
             local: T;
-            /**
-             * The remote with local non-conflicting changes applied
-             */
-            result: T;
         };
     };
 }
 export declare class $Changes {
     static readonly deleted: "[deleted]";
+    private static valueHasId;
     /**
      * Compute a minimal change object between `a` (base) and `b` (target).
      * Returns `undefined` when there is no difference.

package/dist/modules/changes/changes.util.js

@@ -1,6 +1,9 @@
 import { $Value } from '../value/value.util';
 export class $Changes {
     static deleted = '[deleted]';
+    static valueHasId(value) {
+        return value !== null && typeof value === 'object' && !Array.isArray(value) && 'id' in value;
+    }
     /**
      * Compute a minimal change object between `a` (base) and `b` (target).
      * Returns `undefined` when there is no difference.
@@ -25,6 +28,30 @@ export class $Changes {
             return Object.keys(changes).length ? changes : undefined;
         }
         function getArrayChanges(base, target) {
+            const idKey = (id) => '$' + '{' + id + '}';
+            function getIdBasedArrayChanges(base, target) {
+                const changes = {};
+                const targetById = new Map(target.filter($Changes.valueHasId).map((item) => [item.id, item]));
+                const baseIds = new Set(base.filter($Changes.valueHasId).map((item) => item.id));
+                for (const item of base) {
+                    if (!$Changes.valueHasId(item))
+                        continue;
+                    const targetItem = targetById.get(item.id);
+                    if (targetItem === undefined) {
+                        changes[idKey(item.id)] = $Changes.deleted;
+                    }
+                    else {
+                        const diff = $Changes.get(item, targetItem);
+                        if (diff !== undefined)
+                            changes[idKey(item.id)] = diff;
+                    }
+                }
+                for (let i = 0; i < target.length; i++) {
+                    if ($Changes.valueHasId(target[i]) && !baseIds.has(target[i].id))
+                        changes[`$${i}+`] = target[i];
+                }
+                return Object.keys(changes).length ? changes : undefined;
+            }
             function getArrayOperations(base, target) {
                 function getLcsMatrix(a, b) {
                     const matrix = Array.from({ length: a.length + 1 }, () => new Array(b.length + 1).fill(0));
@@ -60,12 +87,14 @@ export class $Changes {
             }
             if (!target.length)
                 return [];
+            if (base.every($Changes.valueHasId) && target.every($Changes.valueHasId))
+                return getIdBasedArrayChanges(base, target);
             const operations = getArrayOperations(base, target);
             const paired = [];
             for (let i = 0; i < operations.length; i++) {
                 const current = operations[i];
                 const next = operations[i + 1];
-                if (current.type === 'delete' && next?.type === 'insert') {
+                if (current.type === 'delete' && next?.type === 'insert' && $Value.isPrimitive(base[current.sourceIndex])) {
                     paired.push({ type: 'update', sourceIndex: current.sourceIndex, targetIndex: next.targetIndex, value: next.value });
                     i++;
                 }
@@ -147,7 +176,10 @@ export class $Changes {
             else if ($Value.equals(aValue, bValue)) {
                 similarities[key] = aValue;
             }
-            else if ($Value.isObject(aValue) && $Value.isObject(bValue) && !/^\$\d+\+$/.test(key)) {
+            else if (/^\$\d+\+$/.test(key)) {
+                differences[key] = aValue;
+            }
+            else if ($Value.isObject(aValue) && $Value.isObject(bValue)) {
                 const nested = $Changes.compareChanges(aValue, bValue);
                 if (nested.differences !== undefined)
                     differences[key] = nested.differences;
@@ -173,9 +205,19 @@ export class $Changes {
             const updates = new Map();
             const inserts = new Map();
             for (const [key, value] of Object.entries(changes)) {
+                const idMatch = key.match(/^\$\{(?<id>.+)\}$/);
                 const insertMatch = key.match(/^\$(?<index>\d+)\+$/);
                 const updateMatch = key.match(/^\$(?<index>\d+)$/);
-                if (insertMatch) {
+                if (idMatch) {
+                    const index = base.findIndex((item) => $Changes.valueHasId(item) && String(item.id) === idMatch.groups.id);
+                    if (index !== -1) {
+                        if (value === $Changes.deleted)
+                            deletes.push(index);
+                        else
+                            updates.set(index, value);
+                    }
+                }
+                else if (insertMatch) {
                     inserts.set(Number.parseInt(insertMatch.groups.index, 10), value);
                 }
                 else if (updateMatch) {
@@ -210,11 +252,13 @@ export class $Changes {
                 return false;
             if (!Object.keys(change).length)
                 return false;
-            for (const k of Object.keys(change)) {
-                if (!k.startsWith('$'))
+            for (const key of Object.keys(change)) {
+                if (!key.startsWith('$'))
                     return false;
-                const key = k.endsWith('+') ? k.slice(1, -1) : k.slice(1);
-                if (Number.isNaN(Number.parseInt(key, 10)))
+                if (/^\$\{.+\}$/.test(key))
+                    continue;
+                const index = key.endsWith('+') ? key.slice(1, -1) : key.slice(1);
+                if (Number.isNaN(Number.parseInt(index, 10)))
                     return false;
             }
             return true;
@@ -276,17 +320,15 @@ export class $Changes {
             return { result };
         }
         const sourceWithDifferences = $Changes.apply(source, remoteCompare.differences, localCompare.differences, remoteCompare.similarities, localCompare.similarities);
-        const mergedWithLocalDifferences = $Changes.apply(remote, localCompare.differences);
         return {
-            result: $Changes.apply(mergedWithLocalDifferences, localCompare.conflicts),
+            result: $Changes.apply(remote, local),
             conflict: {
                 local: localCompare,
                 remote: remoteCompare,
                 merge: {
                     source: sourceWithDifferences,
                     remote: $Changes.apply(sourceWithDifferences, remoteCompare.conflicts),
-                    local: $Changes.apply(sourceWithDifferences, localCompare.conflicts),
-                    result: mergedWithLocalDifferences,
+                    local: $Changes.apply(sourceWithDifferences, localCompare.conflicts)
                 },
             },
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vorplex/core",
-  "version": "0.0.32",
+  "version": "0.0.34",
   "type": "module",
   "sideEffects": false,
   "files": [