document-model 1.7.0 → 1.8.0

package/dist/node/cjs/internal/{object-BMm0OLWL.js → object-BMOaYPkd.js}

@@ -158,16 +158,16 @@ var safeStableStringify = { exports: {} };
   exports2.stringify = stringify;
   exports2.configure = configure;
   module2.exports = stringify;
-  const strEscapeSequencesRegExp = /[\u0000-\u001f\u0022\u005c\ud800-\udfff]|[\ud800-\udbff](?![\udc00-\udfff])|(?:[^\ud800-\udbff]|^)[\udc00-\udfff]/;
+  const strEscapeSequencesRegExp = /[\u0000-\u001f\u0022\u005c\ud800-\udfff]/;
   function strEscape(str) {
     if (str.length < 5e3 && !strEscapeSequencesRegExp.test(str)) {
       return `"${str}"`;
     }
     return JSON.stringify(str);
   }
-  function insertSort(array) {
-    if (array.length > 200) {
-      return array.sort();
+  function sort(array, comparator) {
+    if (array.length > 200 || comparator) {
+      return array.sort(comparator);
     }
     for (let i = 1; i < array.length; i++) {
       const currentValue = array[i];
@@ -222,6 +222,16 @@ var safeStableStringify = { exports: {} };
     }
     return '"[Circular]"';
   }
+  function getDeterministicOption(options) {
+    let value;
+    if (hasOwnProperty.call(options, "deterministic")) {
+      value = options.deterministic;
+      if (typeof value !== "boolean" && typeof value !== "function") {
+        throw new TypeError('The "deterministic" argument must be of type boolean or comparator function');
+      }
+    }
+    return value === void 0 ? true : value;
+  }
   function getBooleanOption(options, key) {
     let value;
     if (hasOwnProperty.call(options, key)) {
@@ -291,7 +301,8 @@ var safeStableStringify = { exports: {} };
     }
     const circularValue = getCircularValueOption(options);
     const bigint = getBooleanOption(options, "bigint");
-    const deterministic = getBooleanOption(options, "deterministic");
+    const deterministic = getDeterministicOption(options);
+    const comparator = typeof deterministic === "function" ? deterministic : void 0;
     const maximumDepth = getPositiveIntegerOption(options, "maximumDepth");
     const maximumBreadth = getPositiveIntegerOption(options, "maximumBreadth");
     function stringifyFnReplacer(key, parent, stack, replacer, spacer, indentation) {
@@ -366,7 +377,7 @@ ${indentation}`;
           }
           const maximumPropertiesToStringify = Math.min(keyLength, maximumBreadth);
           if (deterministic && !isTypedArrayWithEntries(value)) {
-            keys = insertSort(keys);
+            keys = sort(keys, comparator);
           }
           stack.push(value);
           for (let i = 0; i < maximumPropertiesToStringify; i++) {
@@ -567,7 +578,7 @@ ${indentation}`;
             separator = join;
           }
           if (deterministic) {
-            keys = insertSort(keys);
+            keys = sort(keys, comparator);
           }
           stack.push(value);
           for (let i = 0; i < maximumPropertiesToStringify; i++) {
@@ -626,7 +637,8 @@ ${originalIndentation}`;
             return circularValue;
           }
           let res = "";
-          if (Array.isArray(value)) {
+          const hasLength = value.length !== void 0;
+          if (hasLength && Array.isArray(value)) {
             if (value.length === 0) {
               return "[]";
             }
@@ -660,14 +672,14 @@ ${originalIndentation}`;
           }
           let separator = "";
           let maximumPropertiesToStringify = Math.min(keyLength, maximumBreadth);
-          if (isTypedArrayWithEntries(value)) {
+          if (hasLength && isTypedArrayWithEntries(value)) {
             res += stringifyTypedArray(value, ",", maximumBreadth);
             keys = keys.slice(value.length);
             maximumPropertiesToStringify -= value.length;
             separator = ",";
           }
           if (deterministic) {
-            keys = insertSort(keys);
+            keys = sort(keys, comparator);
           }
           stack.push(value);
           for (let i = 0; i < maximumPropertiesToStringify; i++) {
@@ -759,168 +771,6 @@ function v4(options, buf, offset) {
   rnds[8] = rnds[8] & 63 | 128;
   return unsafeStringify(rnds);
 }
-function setNameOperation(document, name) {
-  return { ...document, name };
-}
-function undoOperation(document, action, skip) {
-  const { scope, input } = action;
-  const defaultResult = {
-    document,
-    action,
-    skip
-  };
-  return mutative.create(defaultResult, (draft) => {
-    if (draft.document.operations[scope].length < 1) {
-      throw new Error(
-        `Cannot undo: no operations in history for scope "${scope}"`
-      );
-    }
-    if (input < 1) {
-      throw new Error(
-        `Invalid UNDO action: input value must be greater than 0`
-      );
-    }
-    if (draft.skip > 0) {
-      throw new Error(
-        `Cannot undo: skip value from reducer cannot be used with UNDO action`
-      );
-    }
-    const lastOperation = draft.document.operations[scope].at(-1);
-    const isLatestOpNOOP = lastOperation && lastOperation.type === "NOOP" && lastOperation.skip > 0;
-    draft.skip += input;
-    if (isLatestOpNOOP) {
-      draft.skip += lastOperation.skip;
-      const preLastOperation = draft.document.operations[scope][draft.document.operations[scope].length - 2];
-      if (preLastOperation && lastOperation.index - preLastOperation.index === 1) {
-        draft.document.operations[scope].pop();
-      }
-    }
-    if (draft.document.operations[scope].length < draft.skip) {
-      throw new Error(
-        `Cannot undo: you can't undo more operations than the ones in the scope history`
-      );
-    }
-    const operationsLastIndex = draft.document.operations[scope].length - 1;
-    let skippedOpsLeft = input;
-    let index = isLatestOpNOOP ? operationsLastIndex - lastOperation.skip : operationsLastIndex;
-    while (skippedOpsLeft > 0 && index >= 0) {
-      const op = draft.document.operations[scope][index];
-      if (!op) {
-        skippedOpsLeft--;
-        index--;
-        continue;
-      }
-      if (op.type === "NOOP" && op.skip > 0) {
-        index = index - (op.skip + 1);
-        draft.skip += op.skip + 1;
-      } else {
-        draft.document.clipboard.push({ ...op });
-        skippedOpsLeft--;
-        index--;
-      }
-    }
-    draft.action = noop(scope);
-  });
-}
-function redoOperation(document, action, skip) {
-  const { scope, input } = action;
-  const defaultResult = {
-    document,
-    action,
-    skip
-  };
-  return mutative.create(defaultResult, (draft) => {
-    if (draft.skip > 0) {
-      throw new Error(
-        `Cannot redo: skip value from reducer cannot be used with REDO action`
-      );
-    }
-    if (input > 1) {
-      throw new Error(
-        `Cannot redo: you can only redo one operation at a time`
-      );
-    }
-    if (input < 1) {
-      throw new Error(`Invalid REDO action: invalid redo input value`);
-    }
-    if (draft.document.clipboard.length < 1) {
-      throw new Error(`Cannot redo: no operations in the clipboard`);
-    }
-    const operationIndex = draft.document.clipboard.findLastIndex(
-      (op) => op.scope === scope
-    );
-    if (operationIndex < 0) {
-      throw new Error(
-        `Cannot redo: no operations in clipboard for scope "${scope}"`
-      );
-    }
-    const operation = draft.document.clipboard.splice(operationIndex, 1)[0];
-    draft.action = mutative.castDraft({
-      type: operation.type,
-      scope: operation.scope,
-      input: operation.input
-    });
-  });
-}
-function pruneOperation(document, action, wrappedReducer) {
-  const { scope } = action;
-  const operations = document.operations[scope];
-  let {
-    input: { start, end }
-  } = action;
-  start = start || 0;
-  end = end || operations.length;
-  const actionsToPrune = operations.slice(start, end);
-  const actionsToKeepStart = operations.slice(0, start);
-  const actionsToKeepEnd = operations.slice(end);
-  const newDocument = replayOperations(
-    document.initialState,
-    {
-      ...document.operations,
-      [scope]: actionsToKeepStart.concat(actionsToPrune)
-    },
-    wrappedReducer
-  );
-  const { name, state: newState } = newDocument;
-  const loadStateIndex = actionsToKeepStart.length;
-  const loadStateTimestamp = actionsToKeepStart.length ? actionsToKeepStart[actionsToKeepStart.length - 1].timestamp : actionsToKeepEnd.length ? actionsToKeepEnd[0].timestamp : (/* @__PURE__ */ new Date()).toISOString();
-  return replayOperations(
-    document.initialState,
-    {
-      ...document.operations,
-      [scope]: [
-        ...actionsToKeepStart,
-        {
-          ...loadState(
-            { name, state: newState },
-            actionsToPrune.length
-          ),
-          timestamp: loadStateTimestamp,
-          index: loadStateIndex,
-          hash: hashDocument({ state: newState }, "global")
-        },
-        ...actionsToKeepEnd.map((action2, index) => ({
-          ...action2,
-          index: loadStateIndex + index + 1
-        }))
-      ]
-    },
-    wrappedReducer
-  );
-}
-function loadStateOperation(oldDocument, newDocument) {
-  return {
-    ...oldDocument,
-    name: newDocument.name,
-    state: newDocument.state ?? { global: {}, local: {} }
-  };
-}
-const SET_NAME = "SET_NAME";
-const UNDO = "UNDO";
-const REDO = "REDO";
-const PRUNE = "PRUNE";
-const LOAD_STATE = "LOAD_STATE";
-const NOOP = "NOOP";
 function writeFile(path$1, name, data) {
   const filePath = path.join(path$1, name);
   fs.mkdirSync(path$1, { recursive: true });
@@ -1487,6 +1337,13 @@ function filterDocumentOperationsResultingState(documentOperations) {
     {}
   );
 }
+function diffOperations(clearedOperationsA, clearedOperationsB) {
+  return clearedOperationsA.filter(
+    (operationA) => !clearedOperationsB.some(
+      (operationB) => operationA.index === operationB.index
+    )
+  );
+}
 const documentHelpers = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   IntegrityIssueSubType,
@@ -1495,6 +1352,7 @@ const documentHelpers = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.def
   attachBranch,
   checkCleanedOperationsIntegrity,
   checkOperationsIntegrity,
+  diffOperations,
   filterDocumentOperationsResultingState,
   filterDuplicatedOperations,
   garbageCollect,
@@ -1643,6 +1501,141 @@ async function getLocalFile(path2) {
   const data = buffer.toString("base64");
   return { data, hash: hash(data), mimeType, ...attributes };
 }
+function setNameOperation(document, name) {
+  return { ...document, name };
+}
+function undoOperation(document, action, skip) {
+  const { scope, input } = action;
+  const defaultResult = {
+    document,
+    action,
+    skip,
+    reuseLastOperationIndex: false
+  };
+  return mutative.create(defaultResult, (draft) => {
+    const operations = [...document.operations[scope]];
+    const sortedOperations = sortOperations$1(operations);
+    draft.action = noop(scope);
+    const lastOperation = sortedOperations.at(-1);
+    let nextIndex = (lastOperation == null ? void 0 : lastOperation.index) ?? -1;
+    const isNewNoop = (lastOperation == null ? void 0 : lastOperation.type) !== "NOOP";
+    if (isNewNoop) {
+      nextIndex = nextIndex + 1;
+    } else {
+      draft.reuseLastOperationIndex = true;
+    }
+    const nextOperationHistory = isNewNoop ? [...sortedOperations, { index: nextIndex, skip: 0 }] : sortedOperations;
+    draft.skip = nextSkipNumber(nextOperationHistory);
+    if (lastOperation && draft.skip > lastOperation.skip + 1) {
+      draft.skip = draft.skip + 1;
+    }
+    if (draft.skip < 0) {
+      throw new Error(
+        `Cannot undo: you can't undo more operations than the ones in the scope history`
+      );
+    }
+  });
+}
+function redoOperation(document, action, skip) {
+  const { scope, input } = action;
+  const defaultResult = {
+    document,
+    action,
+    skip,
+    reuseLastOperationIndex: false
+  };
+  return mutative.create(defaultResult, (draft) => {
+    if (draft.skip > 0) {
+      throw new Error(
+        `Cannot redo: skip value from reducer cannot be used with REDO action`
+      );
+    }
+    if (input > 1) {
+      throw new Error(
+        `Cannot redo: you can only redo one operation at a time`
+      );
+    }
+    if (input < 1) {
+      throw new Error(`Invalid REDO action: invalid redo input value`);
+    }
+    if (draft.document.clipboard.length < 1) {
+      throw new Error(`Cannot redo: no operations in the clipboard`);
+    }
+    const operationIndex = draft.document.clipboard.findLastIndex(
+      (op) => op.scope === scope
+    );
+    if (operationIndex < 0) {
+      throw new Error(
+        `Cannot redo: no operations in clipboard for scope "${scope}"`
+      );
+    }
+    const operation = draft.document.clipboard.splice(operationIndex, 1)[0];
+    draft.action = mutative.castDraft({
+      type: operation.type,
+      scope: operation.scope,
+      input: operation.input
+    });
+  });
+}
+function pruneOperation(document, action, wrappedReducer) {
+  const { scope } = action;
+  const operations = document.operations[scope];
+  let {
+    input: { start, end }
+  } = action;
+  start = start || 0;
+  end = end || operations.length;
+  const actionsToPrune = operations.slice(start, end);
+  const actionsToKeepStart = operations.slice(0, start);
+  const actionsToKeepEnd = operations.slice(end);
+  const newDocument = replayOperations(
+    document.initialState,
+    {
+      ...document.operations,
+      [scope]: actionsToKeepStart.concat(actionsToPrune)
+    },
+    wrappedReducer
+  );
+  const { name, state: newState } = newDocument;
+  const loadStateIndex = actionsToKeepStart.length;
+  const loadStateTimestamp = actionsToKeepStart.length ? actionsToKeepStart[actionsToKeepStart.length - 1].timestamp : actionsToKeepEnd.length ? actionsToKeepEnd[0].timestamp : (/* @__PURE__ */ new Date()).toISOString();
+  return replayOperations(
+    document.initialState,
+    {
+      ...document.operations,
+      [scope]: [
+        ...actionsToKeepStart,
+        {
+          ...loadState(
+            { name, state: newState },
+            actionsToPrune.length
+          ),
+          timestamp: loadStateTimestamp,
+          index: loadStateIndex,
+          hash: hashDocument({ state: newState }, "global")
+        },
+        ...actionsToKeepEnd.map((action2, index) => ({
+          ...action2,
+          index: loadStateIndex + index + 1
+        }))
+      ]
+    },
+    wrappedReducer
+  );
+}
+function loadStateOperation(oldDocument, newDocument) {
+  return {
+    ...oldDocument,
+    name: newDocument.name,
+    state: newDocument.state ?? { global: {}, local: {} }
+  };
+}
+const SET_NAME = "SET_NAME";
+const UNDO = "UNDO";
+const REDO = "REDO";
+const PRUNE = "PRUNE";
+const LOAD_STATE = "LOAD_STATE";
+const NOOP = "NOOP";
 function getNextRevision(document, action) {
   let latestOperation;
   if ("index" in action) {
@@ -1662,7 +1655,7 @@ function updateHeader(document, action) {
     lastModified: (/* @__PURE__ */ new Date()).toISOString()
   };
 }
-function updateOperations(document, action, skip = 0) {
+function updateOperations(document, action, skip = 0, reuseLastOperationIndex = false) {
   if ([UNDO, REDO, PRUNE].includes(action.type)) {
     return document;
   }
@@ -1670,7 +1663,8 @@ function updateOperations(document, action, skip = 0) {
   const operations = document.operations[scope].slice();
   let operationId;
   const latestOperation = operations.at(-1);
-  let nextIndex = ((latestOperation == null ? void 0 : latestOperation.index) ?? -1) + 1;
+  const lastOperationIndex = (latestOperation == null ? void 0 : latestOperation.index) ?? -1;
+  let nextIndex = reuseLastOperationIndex ? lastOperationIndex : lastOperationIndex + 1;
   if ("index" in action) {
     if (action.index - skip > nextIndex) {
       throw new Error(
@@ -1697,8 +1691,13 @@ function updateOperations(document, action, skip = 0) {
     operations: { ...document.operations, [scope]: operations }
   };
 }
-function updateDocument(document, action, skip = 0) {
-  let newDocument = updateOperations(document, action, skip);
+function updateDocument(document, action, skip = 0, reuseLastOperationIndex = false) {
+  let newDocument = updateOperations(
+    document,
+    action,
+    skip,
+    reuseLastOperationIndex
+  );
   newDocument = updateHeader(newDocument, action);
   return newDocument;
 }
@@ -1722,7 +1721,7 @@ function processUndoRedo(document, action, skip) {
     case REDO:
       return redoOperation(document, action, skip);
     default:
-      return { document, action, skip };
+      return { document, action, skip, reuseLastOperationIndex: false };
   }
 }
 function processSkipOperation(document, action, customReducer, skipValue, reuseOperationResultingState = false, resultingStateParser = parseResultingState) {
@@ -1772,6 +1771,37 @@ function processSkipOperation(document, action, customReducer, skipValue, reuseO
     })
   };
 }
+function processUndoOperation(document, scope, customReducer, reuseOperationResultingState = false, resultingStateParser = parseResultingState) {
+  const operations = [...document.operations[scope]];
+  const sortedOperations = sortOperations$1(operations);
+  sortedOperations.pop();
+  const documentOperations = garbageCollectDocumentOperations(
+    { ...document.operations }
+  );
+  const clearedOperations = [...documentOperations[scope]];
+  const diff = diffOperations(
+    garbageCollect(sortedOperations),
+    clearedOperations
+  );
+  const doc = replayOperations(
+    document.initialState,
+    documentOperations,
+    customReducer,
+    void 0,
+    void 0,
+    void 0,
+    void 0,
+    {
+      reuseHash: true,
+      reuseOperationResultingState,
+      operationResultingStateParser: resultingStateParser
+    }
+  );
+  const clipboard = sortOperations$1(
+    [...document.clipboard, ...diff].filter((op) => op.type !== "NOOP")
+  ).reverse();
+  return { ...doc, clipboard };
+}
 function baseReducer(document, action, customReducer, dispatch, options = {}) {
   const {
     skip,
@@ -1780,14 +1810,46 @@ function baseReducer(document, action, customReducer, dispatch, options = {}) {
     reuseOperationResultingState = false,
     operationResultingStateParser
   } = options;
-  const _action = { ...action };
-  const skipValue = skip || 0;
+  let _action = { ...action };
+  let skipValue = skip || 0;
   let newDocument = { ...document };
+  let reuseLastOperationIndex = false;
   const shouldProcessSkipOperation = !ignoreSkipOperations && (skipValue > 0 || "index" in _action && _action.skip > 0);
+  if (isUndoRedo(_action)) {
+    const {
+      skip: calculatedSkip,
+      action: transformedAction,
+      document: processedDocument,
+      reuseLastOperationIndex: reuseIndex
+    } = processUndoRedo(document, _action, skipValue);
+    _action = transformedAction;
+    skipValue = calculatedSkip;
+    newDocument = processedDocument;
+    reuseLastOperationIndex = reuseIndex;
+  } else {
+    newDocument = {
+      ...newDocument,
+      clipboard: []
+    };
+  }
   if (isBaseAction(_action)) {
     newDocument = _baseReducer(newDocument, _action, customReducer);
   }
-  newDocument = updateDocument(newDocument, _action, skipValue);
+  newDocument = updateDocument(
+    newDocument,
+    _action,
+    skipValue,
+    reuseLastOperationIndex
+  );
+  const isUndoAction = isUndo(action);
+  if (isUndoAction) {
+    const result = processUndoOperation(
+      newDocument,
+      action.scope,
+      customReducer
+    );
+    return result;
+  }
   if (shouldProcessSkipOperation) {
     newDocument = processSkipOperation(
       newDocument,
@@ -1927,6 +1989,9 @@ function isNoopOperation(op) {
 function isUndoRedo(action) {
   return [UNDO, REDO].includes(action.type);
 }
+function isUndo(action) {
+  return action.type === UNDO;
+}
 function isBaseAction(action) {
   return [SET_NAME, UNDO, REDO, PRUNE, LOAD_STATE].includes(action.type);
 }
@@ -2022,23 +2087,6 @@ function mapSkippedOperations(operations, skippedHeadOperations) {
   }
   return scopeOpsWithIgnore.reverse();
 }
-function calculateSkipsLeft(operations, currentIndex, skip) {
-  const sortedOperations = operations.slice().sort((a, b) => a.skip - b.skip).sort((a, b) => a.index - b.index);
-  let skipsLeft = skip;
-  let skipsToPerform = 0;
-  let lastIndex = currentIndex;
-  for (const operation of sortedOperations.reverse()) {
-    const distance = lastIndex - operation.index;
-    skipsLeft = skipsLeft - distance;
-    if (skipsLeft > -1) {
-      skipsToPerform++;
-      lastIndex = operation.index;
-    } else {
-      break;
-    }
-  }
-  return skipsToPerform;
-}
 function sortOperations(operations) {
   return Object.values(operations).flatMap((array) => array).sort(
     (a, b) => new Date(a.timestamp).getTime() - new Date(b.timestamp).getTime()
@@ -2412,7 +2460,6 @@ exports.buildOperationSignature = buildOperationSignature;
 exports.buildOperationSignatureMessage = buildOperationSignatureMessage;
 exports.buildOperationSignatureParams = buildOperationSignatureParams;
 exports.buildSignedOperation = buildSignedOperation;
-exports.calculateSkipsLeft = calculateSkipsLeft;
 exports.createAction = createAction;
 exports.createDocument = createDocument;
 exports.createExtendedState = createExtendedState;
@@ -2429,6 +2476,7 @@ exports.hex2ab = hex2ab;
 exports.isBaseAction = isBaseAction;
 exports.isNoopOperation = isNoopOperation;
 exports.isSameDocument = isSameDocument;
+exports.isUndo = isUndo;
 exports.isUndoRedo = isUndoRedo;
 exports.loadFromFile = loadFromFile;
 exports.loadFromInput = loadFromInput;
@@ -2448,4 +2496,4 @@ exports.updateHeader = updateHeader;
 exports.validateOperations = validateOperations;
 exports.verifyOperationSignature = verifyOperationSignature;
 exports.zod = zod;
-//# sourceMappingURL=object-BMm0OLWL.js.map
+//# sourceMappingURL=object-BMOaYPkd.js.map