@dabble/patches 0.8.19 → 0.8.20

package/dist/json-patch/applyPatch.js

@@ -3,6 +3,7 @@ import { getTypes } from "./ops/index.js";
 import { runWithObject } from "./state.js";
 import { exit } from "./utils/exit.js";
 import { getType } from "./utils/getType.js";
+import { isSoftOp, pathExistsInState } from "./utils/softWrites.js";
 function applyPatch(object, patches, opts = {}, custom) {
   if (patches.length === 0) {
     return object;
@@ -14,6 +15,9 @@ function applyPatch(object, patches, opts = {}, custom) {
   return runWithObject(object, types, patches.length > 1, (state) => {
     for (let i = 0, imax = patches.length; i < imax; i++) {
       const patch = patches[i];
+      if (isSoftOp(patch) && pathExistsInState(state.root[""], patch.path)) {
+        continue;
+      }
       const handler = getType(state, patch)?.apply;
       const error = handler ? handler(state, "" + patch.path, patch.from || patch.value) : `[op:${patch.op}] unknown`;
       if (error) {

package/dist/json-patch/utils/index.d.ts

@@ -8,7 +8,7 @@ export { isAdd, mapAndFilterOps, transformRemove, updateRemovedOps } from './ops
 export { getArrayIndex, getArrayPrefixAndIndex, getIndexAndEnd, getPrefix, getPrefixAndProp, getProp, getPropAfter, isArrayPath } from './paths.js';
 export { EMPTY, EMPTY_ARRAY, getValue, pluck, pluckWithShallowCopy } from './pluck.js';
 export { shallowCopy } from './shallowCopy.js';
-export { filterSoftWritesAgainstState, isEmptyContainer, updateSoftWrites } from './softWrites.js';
+export { filterSoftWritesAgainstState, isEmptyContainer, isSoftOp, pathExistsInState, updateSoftWrites } from './softWrites.js';
 export { toArrayIndex } from './toArrayIndex.js';
 export { toKeys } from './toKeys.js';
 export { updateArrayIndexes } from './updateArrayIndexes.js';

package/dist/json-patch/utils/softWrites.d.ts

@@ -7,10 +7,17 @@ declare function isEmptyContainer(value: any): boolean;
  * for any value that already exists.
  */
 declare function updateSoftWrites(overPath: string, ops: JSONPatchOp[], originalValue: any): JSONPatchOp[];
+/**
+ * Returns true when an op carries soft semantics — either an explicit
+ * `soft: true` flag, or an empty-container `add` (treated as initialization
+ * by convention). Mirrors the check used by the LWW consolidation algorithm.
+ */
+declare function isSoftOp(op: JSONPatchOp): boolean;
 /**
  * Filters out soft writes that would overwrite existing data in state.
  * Used when baseRev: 0 is jumped forward, bypassing normal transformation.
  */
 declare function filterSoftWritesAgainstState(ops: JSONPatchOp[], state: any): JSONPatchOp[];
+declare function pathExistsInState(state: any, path: string): boolean;
 
-export { filterSoftWritesAgainstState, isEmptyContainer, updateSoftWrites };
+export { filterSoftWritesAgainstState, isEmptyContainer, isSoftOp, pathExistsInState, updateSoftWrites };

package/dist/json-patch/utils/softWrites.js

@@ -16,10 +16,12 @@ function updateSoftWrites(overPath, ops, originalValue) {
     return op;
   });
 }
+function isSoftOp(op) {
+  return op.soft === true || op.op === "add" && isEmptyContainer(op.value);
+}
 function filterSoftWritesAgainstState(ops, state) {
   return ops.filter((op) => {
-    const isSoft = op.soft || op.op === "add" && isEmptyContainer(op.value);
-    if (!isSoft) return true;
+    if (!isSoftOp(op)) return true;
     return !pathExistsInState(state, op.path);
   });
 }
@@ -37,5 +39,7 @@ function pathExistsInState(state, path) {
 export {
   filterSoftWritesAgainstState,
   isEmptyContainer,
+  isSoftOp,
+  pathExistsInState,
   updateSoftWrites
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dabble/patches",
-  "version": "0.8.19",
+  "version": "0.8.20",
   "description": "Immutable JSON Patch implementation based on RFC 6902 supporting operational transformation and last-writer-wins",
   "author": "Jacob Wright <jacwright@gmail.com>",
   "bugs": {