@ai-matrx/office 0.8.30 → 0.8.31

package/dist/univer-collab.cjs

@@ -2367,7 +2367,8 @@ registerRangedResource({
   }),
   removeOf: (sheet, key) => ({ id: "sheet.mutation.delete-conditional-rule", params: { subUnitId: sheet, cfId: key, derived: true } }),
   hasFormula: (m) => CF_FORMULA(cfRule(m)),
-  orderedAdds: true
+  orderedAdds: true,
+  setsOverwrite: true
 });
 var DV = { add: "data-validation.mutation.addRule", update: "data-validation.mutation.updateRule", remove: "data-validation.mutation.removeRule" };
 var DV_RANGE = 1;
@@ -3599,6 +3600,24 @@ function transformMutation(x, y, side) {
   return ok2([x]);
 }
 var blocked = (p) => !Array.isArray(p);
+function compactDerivedSets(ops) {
+  if (ops.length < 2) return ops;
+  const later = /* @__PURE__ */ new Set();
+  const out = [];
+  for (let i = ops.length - 1; i >= 0; i--) {
+    const m = ops[i];
+    const spec = rangedSpecOf(m.id);
+    if (spec?.setsOverwrite && spec.ids[m.id] === "set") {
+      const at = (k, facet2) => `${spec.family}|${sheetOf(m)}|${k}|${facet2}`;
+      const facet = spec.facet?.(m) ?? "all";
+      const keys = spec.keys(m);
+      if (isDerived(m) && keys.every((k) => later.has(at(k, facet)) || later.has(at(k, "all")))) continue;
+      for (const k of keys) later.add(at(k, facet));
+    }
+    out.push(m);
+  }
+  return out.length === ops.length ? ops : out.reverse();
+}
 function tSeq(xs, ys, side, acc) {
   if (xs.length === 0 || ys.length === 0) return [xs, ys];
   if (xs.length === 1 && ys.length === 1) {
@@ -3622,33 +3641,17 @@ function tSeq(xs, ys, side, acc) {
       }
       const r = tSeq(curX, [y], side, acc);
       if (blocked(r)) return r;
-      curX = r[0];
+      curX = r[0].length > 1 ? compactDerivedSets(r[0]) : r[0];
       for (const m of r[1]) nextY.push(m);
     }
     for (const m of curX) outX.push(m);
-    curY = nextY;
+    curY = compactDerivedSets(nextY);
   }
-  return [outX, curY];
-}
-function tSeqOld(xs, ys, side, acc) {
-  if (xs.length === 0 || ys.length === 0) return [xs, ys];
-  if (xs.length === 1 && ys.length === 1) return tSeq(xs, ys, side, acc);
-  if (xs.length > 1) {
-    const first2 = tSeqOld([xs[0]], ys, side, acc);
-    if (blocked(first2)) return first2;
-    const rest2 = tSeqOld(xs.slice(1), first2[1], side, acc);
-    if (blocked(rest2)) return rest2;
-    return [[...first2[0], ...rest2[0]], rest2[1]];
-  }
-  const first = tSeqOld(xs, [ys[0]], side, acc);
-  if (blocked(first)) return first;
-  const rest = tSeqOld(first[0], ys.slice(1), side, acc);
-  if (blocked(rest)) return rest;
-  return [rest[0], [...first[1], ...rest[1]]];
+  return [compactDerivedSets(outX), curY];
 }
 function transformGroup(x, y, side) {
   const acc = { lost: [], dropped: [] };
-  const r = (process.env.OLD_TSEQ ? tSeqOld : tSeq)([...x], [...y], side, acc);
+  const r = tSeq([...x], [...y], side, acc);
   if (blocked(r)) return r;
   return { op: r[0], lost: [...new Set(acc.lost)], dropped: [...new Set(acc.dropped)] };
 }