ooxml-core 0.11.0 → 0.12.0

package/dist/automation/index.cjs

@@ -20598,8 +20598,9 @@ var AreaIndex = class {
   wide = /* @__PURE__ */ new Map();
   add(area, node) {
     const { start, end } = area.range;
-    if (start.row === end.row && start.col === end.col) {
-      push2(inner(this.cells, area.sheet), cellKey(start.row, start.col), node);
+    if (start.row === end.row && end.col - start.col + 1 <= BUCKET_WIDTH) {
+      const cells3 = inner(this.cells, area.sheet);
+      for (let col = start.col; col <= end.col; col++) push2(cells3, cellKey(start.row, col), node);
       return;
     }
     const entry = { range: area.range, node };
@@ -20825,7 +20826,8 @@ function writeFootprint(sheet, footprint, m) {
       }
       if (cell) {
         cell.value = value;
-        cell.spillAnchor = { row, col };
+        if (!isSpilledCell(cell) || cell.spillAnchor.row !== row || cell.spillAnchor.col !== col)
+          cell.spillAnchor = { row, col };
       } else {
         const spilled = { value, spillAnchor: { row, col } };
         putCell(sheet, r, c2, spilled);
@@ -20872,6 +20874,7 @@ var EngineHost = class {
   columnIndex;
   reverseIndex;
   footprintIndex;
+  fullOrder;
   /** Range reads cached for one evaluation pass (see `readBlock`). */
   blockCache = /* @__PURE__ */ new Map();
   /** Counts reads that hit a formula still being evaluated (a circular reference). */
@@ -21044,6 +21047,7 @@ var EngineHost = class {
     if (this.footprints.delete(node)) this.footprintIndex = void 0;
   }
   graphChanged() {
+    this.fullOrder = void 0;
     this.columnIndex = void 0;
     this.reverseIndex = void 0;
     this.footprintIndex = void 0;
@@ -21074,52 +21078,6 @@ var EngineHost = class {
   }
 };
 
-// src/xlsx/formula/engine-types.ts
-var CIRCULAR_REFERENCE_WARNING = "The workbook contains circular references; the cells involved show 0.";
-
-// src/xlsx/formula/engine-util.ts
-function finalize(value, host) {
-  let result2;
-  if (value instanceof RefValue) {
-    if (value.areas.length !== 1) return ERR.VALUE;
-    if (value.isCell()) {
-      const area = value.areas[0];
-      result2 = host.readCell(area.sheet, area.range.start.row, area.range.start.col);
-    } else result2 = toMatrix(host, value);
-  } else if (value instanceof LambdaValue) return ERR.CALC;
-  else result2 = value;
-  if (result2 instanceof Matrix) {
-    if (result2.rows === 1 && result2.cols === 1) result2 = result2.get(0, 0);
-    else return result2.block().mapValues(clean);
-  }
-  return clean(result2);
-}
-function clean(value) {
-  if (value === null) return 0;
-  if (typeof value === "number") {
-    if (!Number.isFinite(value)) return ERR.NUM;
-    return value === 0 ? 0 : value;
-  }
-  return value;
-}
-var rangeHas = (range, row, col) => row >= range.start.row && row <= range.end.row && col >= range.start.col && col <= range.end.col;
-function sameRange(a, b) {
-  if (!a || !b) return a === b || !a && !b;
-  return a.start.row === b.start.row && a.start.col === b.start.col && a.end.row === b.end.row && a.end.col === b.end.col;
-}
-function boundingBox(ranges) {
-  const first4 = ranges[0];
-  const start = { ...first4.start };
-  const end = { ...first4.end };
-  for (const r of ranges) {
-    start.row = Math.min(start.row, r.start.row);
-    start.col = Math.min(start.col, r.start.col);
-    end.row = Math.max(end.row, r.end.row);
-    end.col = Math.max(end.col, r.end.col);
-  }
-  return { start, end };
-}
-
 // src/xlsx/formula/scc.ts
 function stronglyConnected(nodes, successors) {
   const index2 = /* @__PURE__ */ new Map();
@@ -21172,6 +21130,63 @@ function stronglyConnected(nodes, successors) {
   return out;
 }
 
+// src/xlsx/formula/engine-order.ts
+function formulaOrder(nodes, successors) {
+  const ranks = /* @__PURE__ */ new Map();
+  const components = stronglyConnected(nodes, successors).map((members, rank4) => {
+    for (const member of members) ranks.set(member, rank4);
+    const first4 = members[0];
+    return { nodes: members, cyclic: members.length > 1 || successors(first4).includes(first4) };
+  });
+  return { components, ranks };
+}
+
+// src/xlsx/formula/engine-types.ts
+var CIRCULAR_REFERENCE_WARNING = "The workbook contains circular references; the cells involved show 0.";
+
+// src/xlsx/formula/engine-util.ts
+function finalize(value, host) {
+  let result2;
+  if (value instanceof RefValue) {
+    if (value.areas.length !== 1) return ERR.VALUE;
+    if (value.isCell()) {
+      const area = value.areas[0];
+      result2 = host.readCell(area.sheet, area.range.start.row, area.range.start.col);
+    } else result2 = toMatrix(host, value);
+  } else if (value instanceof LambdaValue) return ERR.CALC;
+  else result2 = value;
+  if (result2 instanceof Matrix) {
+    if (result2.rows === 1 && result2.cols === 1) result2 = result2.get(0, 0);
+    else return result2.block().mapValues(clean);
+  }
+  return clean(result2);
+}
+function clean(value) {
+  if (value === null) return 0;
+  if (typeof value === "number") {
+    if (!Number.isFinite(value)) return ERR.NUM;
+    return value === 0 ? 0 : value;
+  }
+  return value;
+}
+var rangeHas = (range, row, col) => row >= range.start.row && row <= range.end.row && col >= range.start.col && col <= range.end.col;
+function sameRange(a, b) {
+  if (!a || !b) return a === b || !a && !b;
+  return a.start.row === b.start.row && a.start.col === b.start.col && a.end.row === b.end.row && a.end.col === b.end.col;
+}
+function boundingBox(ranges) {
+  const first4 = ranges[0];
+  const start = { ...first4.start };
+  const end = { ...first4.end };
+  for (const r of ranges) {
+    start.row = Math.min(start.row, r.start.row);
+    start.col = Math.min(start.col, r.start.col);
+    end.row = Math.max(end.row, r.end.row);
+    end.col = Math.max(end.col, r.end.col);
+  }
+  return { start, end };
+}
+
 // src/xlsx/formula/store.ts
 function storeResult(sheet, node, cell, result2, claims) {
   const { row, col } = node;
@@ -21191,9 +21206,9 @@ function storeResult(sheet, node, cell, result2, claims) {
     return;
   }
   const footprint = footprintFor(row, col, result2);
-  if (node.spill) clearFootprint(sheet, node.spill, row, col);
-  delete node.spill;
   if (!footprint || !footprintFree(sheet, footprint, row, col, claims)) {
+    if (node.spill) clearFootprint(sheet, node.spill, row, col);
+    delete node.spill;
     node.blockedSpill = footprint ?? {
       start: { row, col },
       end: {
@@ -21204,6 +21219,7 @@ function storeResult(sheet, node, cell, result2, claims) {
     cell.value = ERR.SPILL;
     return;
   }
+  if (node.spill && !sameRange(node.spill, footprint)) clearFootprint(sheet, node.spill, row, col);
   delete node.blockedSpill;
   writeFootprint(sheet, footprint, result2);
   node.spill = footprint;
@@ -21226,7 +21242,7 @@ var EngineCore = class extends EngineHost {
       const dirty = everything && round2 === 0 ? current : this.closure(current);
       this.footprintChanges = [];
       this.evaluatedAt = /* @__PURE__ */ new Map();
-      this.evaluateSet(dirty);
+      this.evaluateSet(dirty, everything && round2 === 0);
       if (this.footprintChanges.length === 0) break;
       const next = /* @__PURE__ */ new Set();
       const reverse2 = this.reverse();
@@ -21268,7 +21284,7 @@ var EngineCore = class extends EngineHost {
     }
     return out;
   }
-  evaluateSet(dirty) {
+  evaluateSet(dirty, full) {
     this.boundsCache.clear();
     this.blockCache.clear();
     const columns = this.columns();
@@ -21278,24 +21294,25 @@ var EngineCore = class extends EngineHost {
       let out = succCache.get(node);
       if (out) return out;
       const found = [];
+      const anchors = /* @__PURE__ */ new Set();
       for (const dep of node.deps) {
         columns.nodesIn(dep, found);
-        const anchors = [];
         footprints.dependents(dep.sheet, dep.range, anchors);
-        for (const anchor of anchors) if (anchor.spill ?? anchor.arrayRange) found.push(anchor);
       }
-      out = [...new Set(found)].filter((n) => dirty.has(n));
+      for (const anchor of anchors) if (anchor.spill ?? anchor.arrayRange) found.push(anchor);
+      out = found.length ? [...new Set(found)].filter((n) => dirty.has(n)) : [];
       succCache.set(node, out);
       return out;
     };
-    const order = stronglyConnected(dirty, successors);
+    const order = full && this.fullOrder || formulaOrder(dirty, successors);
+    if (full) this.fullOrder = order;
     this.pending = new Set(dirty);
     this.dynamicCycleHits = /* @__PURE__ */ new Set();
     try {
-      for (const component of order) {
-        const first4 = component[0];
-        if (component.length > 1 || successors(first4).includes(first4)) {
-          for (const node of component) this.markCycle(node);
+      for (const component of order.components) {
+        const first4 = component.nodes[0];
+        if (component.cyclic) {
+          for (const node of component.nodes) this.markCycle(node);
         } else if (this.pending.has(first4)) {
           this.computeFrom(first4);
         }
@@ -21374,6 +21391,7 @@ var EngineCore = class extends EngineHost {
       return !!other && other !== node && !!other.spill && rangeHas(other.spill, r, c2);
     });
     if (!sameRange(before, node.spill) || !sameRange(blockedBefore, node.blockedSpill)) {
+      this.updateOrder(node, before, blockedBefore);
       this.footprintIndex = void 0;
       this.blockCache.clear();
     }
@@ -21393,10 +21411,30 @@ var EngineCore = class extends EngineHost {
       }
     }
   }
+  /** New spill edges may reuse the order only when every reader already follows its anchor. */
+  updateOrder(node, before, blockedBefore) {
+    const order = this.fullOrder;
+    if (!order) return;
+    if (before || blockedBefore || !node.spill || node.blockedSpill) {
+      this.fullOrder = void 0;
+      return;
+    }
+    const rank4 = order.ranks.get(node);
+    if (rank4 === void 0) {
+      this.fullOrder = void 0;
+      return;
+    }
+    const readers = /* @__PURE__ */ new Set();
+    this.reverse().dependents(node.sheet, node.spill, readers);
+    for (const reader of readers) {
+      if ((order.ranks.get(reader) ?? -1) <= rank4) {
+        this.fullOrder = void 0;
+        return;
+      }
+    }
+  }
   frameFor(sheet, row, col, root, legacy = false) {
-    const frame = { host: this, sheet, row, col, scope: void 0, depth: 0 };
-    if (legacy) Object.assign(frame, { legacy: true });
-    return root ? { ...frame, root } : frame;
+    return { host: this, sheet, row, col, scope: void 0, depth: 0, root, legacy };
   }
   evaluateFormula(node) {
     if (!node.ast) return node.parseError ?? ERR.NAME;
@@ -35675,7 +35713,7 @@ function setCell(shape2, name, value, formula) {
   if (formula) node.setAttribute("F", formula);
   else if (attribute2(node, "F") !== "No Formula") node.removeAttribute("F");
 }
-function admitted(root, shapeId, masterMovePins = /* @__PURE__ */ new Set()) {
+function admitted(root, shapeId, masterMovePins = /* @__PURE__ */ new Set(), masterDimensions = /* @__PURE__ */ new Map()) {
   const containers = children4(root, "Shapes");
   if (containers.length !== 1)
     fail2("UNSUPPORTED_GEOMETRY_EDIT", "One local Shapes container is required.");
@@ -35704,12 +35742,17 @@ function admitted(root, shapeId, masterMovePins = /* @__PURE__ */ new Set()) {
       "UNSUPPORTED_GEOMETRY_EDIT",
       "Only local 2D shapes are admitted; line routing and glue are unsupported."
     );
-  if (!(numeric4(local.get("Width")) > 0) || !(numeric4(local.get("Height")) > 0))
-    fail2("UNSUPPORTED_GEOMETRY_EDIT", "Positive local Width and Height caches are required.");
+  const proven = masterDimensions.get(shape2);
+  if (!(numeric4(local.get("Width"), proven?.width) > 0) || !(numeric4(local.get("Height"), proven?.height) > 0))
+    fail2("UNSUPPORTED_GEOMETRY_EDIT", "Positive proven Width and Height caches are required.");
   return shape2;
 }
-function protectedShape(shape2, document) {
+function protectedShape(shape2, document, masterMovePins = /* @__PURE__ */ new Set()) {
   const local = cells(shape2);
+  const certifiedMove = shape2.hasAttribute("Master") && ["PinX", "PinY"].every((name) => {
+    const node = local.get(name);
+    return node !== void 0 && masterMovePins.has(node);
+  });
   const styles = /* @__PURE__ */ new Map();
   for (const container of children4(document, "StyleSheets"))
     for (const node of children4(container, "StyleSheet")) {
@@ -35717,9 +35760,13 @@ function protectedShape(shape2, document) {
       if (!id || styles.has(id)) fail2("EDIT_PROTECTED_CELL", "Ambiguous protection style IDs.");
       styles.set(id, node);
     }
-  const inactive = (cell) => {
+  const validateProtection = (cell) => {
     try {
-      if (cell.hasAttribute("E") || visioFormulaCachedValue(attribute2(cell, "V") ?? "", attribute2(cell, "U")).unit !== "scalar" || numeric4(cell) !== 0)
+      const cached3 = numeric4(cell);
+      const operationIndependent = certifiedMove && ["LockWidth", "LockHeight", "LockAspect", "LockDelete"].includes(
+        attribute2(cell, "N") ?? ""
+      );
+      if (cell.hasAttribute("E") || visioFormulaCachedValue(attribute2(cell, "V") ?? "", attribute2(cell, "U")).unit !== "scalar" || !(cached3 === 0 || operationIndependent && cached3 === 1))
         fail2("EDIT_PROTECTED_CELL", "Inherited protection is active or invalid.");
       const source2 = executableCellFormula(attribute2(cell, "F"));
       if (!source2) return;
@@ -35730,12 +35777,12 @@ function protectedShape(shape2, document) {
         source2,
         () => fail2("EDIT_PROTECTED_CELL", "Inherited protection has dependencies.")
       );
-      if (result2.unit !== "scalar" || result2.value !== 0)
-        fail2("EDIT_PROTECTED_CELL", "Inherited protection formula is active or stale.");
+      if (result2.unit !== "scalar" || result2.value !== cached3)
+        fail2("EDIT_PROTECTED_CELL", "Inherited protection formula cache is stale.");
     } catch (error) {
       fail2(
         "EDIT_PROTECTED_CELL",
-        `Inherited protection cannot be proven inactive: ${error instanceof Error ? error.message : "invalid cache"}`
+        `Inherited protection cannot be proven safe for this operation: ${error instanceof Error ? error.message : "invalid cache"}`
       );
     }
   };
@@ -35747,16 +35794,18 @@ function protectedShape(shape2, document) {
     if (!style) fail2("EDIT_PROTECTED_CELL", "Protection style ancestry cannot be resolved.");
     const cell = cells(style).get(lock), parent = attribute2(style, category);
     if (cell && attribute2(cell, "F") !== "Inh") {
-      inactive(cell);
+      validateProtection(cell);
       return cell;
     }
     if (cell) {
-      inactive(cell);
+      validateProtection(cell);
       if (parent === void 0 || parent === id)
         fail2("EDIT_PROTECTED_CELL", "Inherited protection has no provable parent.");
       const inherited = resolve(parent, category, lock, seen);
       if (!inherited)
-        fail2("EDIT_PROTECTED_CELL", "Inherited protection has no explicit inactive ancestor.");
+        fail2("EDIT_PROTECTED_CELL", "Inherited protection has no explicit provable ancestor.");
+      if (numeric4(cell) !== numeric4(inherited))
+        fail2("EDIT_PROTECTED_CELL", "Delegated protection cache disagrees with its ancestor.");
       return inherited;
     }
     return parent !== void 0 && parent !== id ? resolve(parent, category, lock, seen) : void 0;
@@ -35833,6 +35882,130 @@ function resizeGeometry(shape2, roots, edit, check3) {
   }
 }
 
+// src/visio/edit-master-move.ts
+var protection = [
+  "LockMoveX",
+  "LockMoveY",
+  "LockWidth",
+  "LockHeight",
+  "LockAspect",
+  "LockDelete"
+];
+var dimensions2 = ["PinX", "PinY", "Width", "Height", "LocPinX", "LocPinY"];
+var emptyMasterMoveProof = () => ({
+  pins: /* @__PURE__ */ new Set(),
+  dimensions: /* @__PURE__ */ new Map()
+});
+function prepareMasterMovePins(roots, commands, bindings, check3) {
+  const result2 = /* @__PURE__ */ new Set();
+  const provenDimensions = /* @__PURE__ */ new Map();
+  let work = 1e5;
+  const charge = (amount = 1) => {
+    check3();
+    work -= amount;
+    if (work < 0)
+      fail2("EDIT_UNSUPPORTED_PACKAGE_DEPENDENCY", "Master move preparation budget exceeded.");
+  };
+  const analyze2 = (formula) => {
+    charge(formula.length);
+    return analyzeVisioFormula(formula);
+  };
+  for (const command2 of commands) {
+    charge();
+    const root = roots.get(command2.pageId);
+    const instance = children4(children4(root, "Shapes")[0], "Shape").find(
+      (shape2) => attribute2(shape2, "ID") === command2.shapeId
+    );
+    if (!instance?.hasAttribute("Master")) continue;
+    if (command2.type !== "move-shape")
+      fail2("UNSUPPORTED_GEOMETRY_EDIT", "Master-linked resizing and deletion remain unsupported.");
+    const binding = bindings.find((candidate) => candidate.instance === instance);
+    if (!binding) fail2("UNSUPPORTED_GEOMETRY_EDIT", "A unique effective master root is required.");
+    for (const node of [instance, binding.template]) {
+      charge();
+      if (attribute2(node, "Type") !== "Shape" || children4(node, "Shapes").length || children4(node, "ForeignData").length || children4(node, "Rel").length || ["1", "true"].includes(attribute2(node, "Del") ?? ""))
+        fail2("UNSUPPORTED_GEOMETRY_EDIT", "Master moves require top-level local 2D shape roots.");
+    }
+    for (const name of ["BeginX", "BeginY", "EndX", "EndY"])
+      if (binding.cells.has(name.toLowerCase()))
+        fail2("UNSUPPORTED_GEOMETRY_EDIT", "Master lines and endpoint routing remain unsupported.");
+    const oneD = binding.cells.get("oned")?.node;
+    charge();
+    if (oneD && (numeric4(oneD) !== 0 || visioFormulaCachedValue(attribute2(oneD, "V") ?? "", attribute2(oneD, "U")).unit !== "scalar" || executableCellFormula(attribute2(oneD, "F"))))
+      fail2("UNSUPPORTED_GEOMETRY_EDIT", "A static effective 2D master is required.");
+    const local = cells(instance);
+    for (const name of dimensions2) {
+      const effective = binding.cells.get(name.toLowerCase())?.node;
+      for (const node of /* @__PURE__ */ new Set([effective, ...local.has(name) ? [local.get(name)] : []])) {
+        charge();
+        numeric4(node);
+        if (visioFormulaCachedValue("0", attribute2(node, "U") ?? "DL").unit !== "length")
+          fail2("EDIT_FORMULA_UNIT", "Master transform caches require length units.");
+      }
+    }
+    const dimension = (name) => numeric4(local.get(name) ?? binding.cells.get(name.toLowerCase())?.node);
+    const width = dimension("Width"), height = dimension("Height");
+    if (width <= 0 || height <= 0)
+      fail2("UNSUPPORTED_GEOMETRY_EDIT", "Positive proven effective dimensions are required.");
+    provenDimensions.set(instance, { width, height });
+    for (const name of protection) {
+      charge();
+      const node = binding.cells.get(name.toLowerCase())?.node;
+      const cached3 = node ? numeric4(node) : NaN;
+      const moving = name === "LockMoveX" || name === "LockMoveY";
+      if (!node || visioFormulaCachedValue(attribute2(node, "V") ?? "", attribute2(node, "U")).unit !== "scalar" || ![0, 1].includes(cached3) || moving && cached3 !== 0)
+        fail2(
+          "EDIT_PROTECTED_CELL",
+          "Effective master protection must be proven boolean with inactive movement locks."
+        );
+      const formula = executableCellFormula(attribute2(node, "F"));
+      if (formula) {
+        const analysis = analyze2(formula);
+        if (analysis.dynamic || analysis.references.length || analysis.unsupportedFunctions.length)
+          fail2("EDIT_PROTECTED_CELL", "Effective master protection dependencies are unsupported.");
+        const value = evaluateVisioFormula(
+          formula,
+          () => fail2("EDIT_PROTECTED_CELL", "Unexpected protection dependency."),
+          { onStep: () => charge() }
+        );
+        if (value.unit !== "scalar" || value.value !== cached3)
+          fail2("EDIT_PROTECTED_CELL", "Effective master protection cache is stale.");
+      }
+    }
+    for (const name of ["PinX", "PinY"]) {
+      charge();
+      const node = local.get(name);
+      if (!node)
+        fail2("EDIT_PROTECTED_CELL", "The rotation pin must be an explicit local override.");
+      if (binding.cells.get(name.toLowerCase())?.node !== node)
+        fail2("EDIT_PROTECTED_CELL", "The rotation pin must be an explicit local override.");
+      charge(executableCellFormula(attribute2(node, "F"))?.length ?? 0);
+      editableCell(node);
+      const inherited = binding.inheritedCells.get(name.toLowerCase())?.node;
+      numeric4(inherited);
+      if (visioFormulaCachedValue("0", attribute2(inherited, "U") ?? "DL").unit !== "length")
+        fail2("EDIT_FORMULA_UNIT", "Inherited rotation pins require length units.");
+      const formula = executableCellFormula(attribute2(inherited, "F"));
+      if (formula) {
+        const analysis = analyze2(formula);
+        if (analysis.guarded || analysis.dynamic || analysis.unsupportedFunctions.length)
+          fail2("EDIT_PROTECTED_CELL", "Protected or redirected master pins cannot be overridden.");
+      }
+      result2.add(node);
+    }
+  }
+  if (result2.size) {
+    const indexed = indexCells(roots, { check: check3 });
+    const pins = new Set(
+      [...indexed.values()].filter((cell) => cell.node && result2.has(cell.node)).map(key)
+    );
+    for (const cell of indexed.values())
+      if (charge(), cell.dependencies.some((dependency) => pins.has(dependency)))
+        fail2("EDIT_UNSUPPORTED_DEPENDENCY", "A page cache depends on a master rotation pin.");
+  }
+  return { pins: result2, dimensions: provenDimensions };
+}
+
 // src/visio/edit-geometry.ts
 function createRectangle(root, edit) {
   const doc = root.ownerDocument;
@@ -35895,7 +36068,8 @@ function createRectangle(root, edit) {
   container.appendChild(shape2);
   return shape2;
 }
-function applyGeometryEdit(roots, document, edit, check3, masterMovePins = /* @__PURE__ */ new Set()) {
+function applyGeometryEdit(roots, document, edit, check3, masterMoveProof = emptyMasterMoveProof()) {
+  const masterMovePins = masterMoveProof.pins, masterDimensions = masterMoveProof.dimensions;
   check3();
   const root = roots.get(edit.pageId);
   if (!root) fail2("EDIT_TARGET_NOT_FOUND", "Page does not exist.");
@@ -35910,9 +36084,10 @@ function applyGeometryEdit(roots, document, edit, check3, masterMovePins = /* @_
     const shape2 = admitted(
       root,
       edit.shapeId,
-      edit.type === "move-shape" ? masterMovePins : /* @__PURE__ */ new Set()
+      edit.type === "move-shape" ? masterMovePins : /* @__PURE__ */ new Set(),
+      edit.type === "move-shape" ? masterDimensions : /* @__PURE__ */ new Map()
     );
-    protectedShape(shape2, document);
+    protectedShape(shape2, document, edit.type === "move-shape" ? masterMovePins : /* @__PURE__ */ new Set());
     if (edit.type !== "delete-shape") {
       for (const connections2 of children4(root, "Connects"))
         for (const connection of children4(connections2, "Connect"))
@@ -35934,9 +36109,10 @@ function applyGeometryEdit(roots, document, edit, check3, masterMovePins = /* @_
       return [edit.pageId];
     }
     if (edit.type === "move-shape") {
+      const proven = masterDimensions.get(shape2);
       expected = {
-        width: numeric4(local.get("Width")),
-        height: numeric4(local.get("Height")),
+        width: numeric4(local.get("Width"), proven?.width),
+        height: numeric4(local.get("Height"), proven?.height),
         x: edit.x,
         y: edit.y
       };
@@ -35944,10 +36120,7 @@ function applyGeometryEdit(roots, document, edit, check3, masterMovePins = /* @_
         ["PinX", edit.x, "LockMoveX"],
         ["PinY", edit.y, "LockMoveY"]
       ]) {
-        if (numeric4(
-          local.get(name),
-          name === "PinX" ? numeric4(local.get("Width")) / 2 : numeric4(local.get("Height")) / 2
-        ) === value)
+        if (numeric4(local.get(name), name === "PinX" ? expected.width / 2 : expected.height / 2) === value)
           continue;
         unlocked(lock);
         editableCell(local.get(name));
@@ -35990,10 +36163,14 @@ function applyGeometryEdit(roots, document, edit, check3, masterMovePins = /* @_
   }
   if (!changed.length) return [];
   const affectedPages = recalculateVisioCells(roots, changed, { check: check3, masterMovePins });
-  const result2 = cells(
-    admitted(root, edit.shapeId, edit.type === "move-shape" ? masterMovePins : /* @__PURE__ */ new Set())
+  const resultShape = admitted(
+    root,
+    edit.shapeId,
+    edit.type === "move-shape" ? masterMovePins : /* @__PURE__ */ new Set(),
+    edit.type === "move-shape" ? masterDimensions : /* @__PURE__ */ new Map()
   );
-  if (expected && (numeric4(result2.get("Width")) !== expected.width || numeric4(result2.get("Height")) !== expected.height || numeric4(result2.get("PinX"), expected.width / 2) !== expected.x || numeric4(result2.get("PinY"), expected.height / 2) !== expected.y))
+  const result2 = cells(resultShape), provenResult = masterDimensions.get(resultShape);
+  if (expected && (numeric4(result2.get("Width"), provenResult?.width) !== expected.width || numeric4(result2.get("Height"), provenResult?.height) !== expected.height || numeric4(result2.get("PinX"), expected.width / 2) !== expected.x || numeric4(result2.get("PinY"), expected.height / 2) !== expected.y))
     fail2(
       "EDIT_UNSUPPORTED_DEPENDENCY",
       "Dependent formulas would violate the requested geometry or fixed rotation pin."
@@ -36040,117 +36217,29 @@ function analyzeVisioMasterFormula(source2, options) {
   return { ...analysis, references: [...references.values()], dynamic: dynamic2, readsText, readsTheme };
 }
 
-// src/visio/edit-master-move.ts
-var protection = [
-  "LockMoveX",
-  "LockMoveY",
-  "LockWidth",
-  "LockHeight",
-  "LockAspect",
-  "LockDelete"
-];
-var dimensions2 = ["PinX", "PinY", "Width", "Height", "LocPinX", "LocPinY"];
-function prepareMasterMovePins(roots, commands, bindings, check3) {
-  const result2 = /* @__PURE__ */ new Set();
-  let work = 1e5;
-  const charge = (amount = 1) => {
-    check3();
-    work -= amount;
-    if (work < 0)
-      fail2("EDIT_UNSUPPORTED_PACKAGE_DEPENDENCY", "Master move preparation budget exceeded.");
-  };
-  const analyze2 = (formula) => {
-    charge(formula.length);
-    return analyzeVisioFormula(formula);
-  };
-  for (const command2 of commands) {
-    charge();
-    const root = roots.get(command2.pageId);
-    const instance = children4(children4(root, "Shapes")[0], "Shape").find(
-      (shape2) => attribute2(shape2, "ID") === command2.shapeId
-    );
-    if (!instance?.hasAttribute("Master")) continue;
-    if (command2.type !== "move-shape")
-      fail2("UNSUPPORTED_GEOMETRY_EDIT", "Master-linked resizing and deletion remain unsupported.");
-    const binding = bindings.find((candidate) => candidate.instance === instance);
-    if (!binding) fail2("UNSUPPORTED_GEOMETRY_EDIT", "A unique effective master root is required.");
-    for (const node of [instance, binding.template]) {
-      charge();
-      if (attribute2(node, "Type") !== "Shape" || children4(node, "Shapes").length || children4(node, "ForeignData").length || children4(node, "Rel").length || ["1", "true"].includes(attribute2(node, "Del") ?? ""))
-        fail2("UNSUPPORTED_GEOMETRY_EDIT", "Master moves require top-level local 2D shape roots.");
-    }
-    for (const name of ["BeginX", "BeginY", "EndX", "EndY"])
-      if (binding.cells.has(name.toLowerCase()))
-        fail2("UNSUPPORTED_GEOMETRY_EDIT", "Master lines and endpoint routing remain unsupported.");
-    const oneD = binding.cells.get("oned")?.node;
-    charge();
-    if (oneD && (numeric4(oneD) !== 0 || visioFormulaCachedValue(attribute2(oneD, "V") ?? "", attribute2(oneD, "U")).unit !== "scalar" || executableCellFormula(attribute2(oneD, "F"))))
-      fail2("UNSUPPORTED_GEOMETRY_EDIT", "A static effective 2D master is required.");
-    const local = cells(instance);
-    for (const name of dimensions2) {
-      charge();
-      const node = local.get(name);
-      numeric4(node);
-      if (visioFormulaCachedValue("0", attribute2(node, "U") ?? "DL").unit !== "length")
-        fail2("EDIT_FORMULA_UNIT", "Master transform caches require length units.");
-    }
-    if (numeric4(local.get("Width")) <= 0 || numeric4(local.get("Height")) <= 0)
-      fail2("UNSUPPORTED_GEOMETRY_EDIT", "Positive explicit local dimensions are required.");
-    for (const name of protection) {
-      charge();
-      const node = binding.cells.get(name.toLowerCase())?.node;
-      if (!node || visioFormulaCachedValue(attribute2(node, "V") ?? "", attribute2(node, "U")).unit !== "scalar" || numeric4(node) !== 0)
-        fail2(
-          "EDIT_PROTECTED_CELL",
-          "Effective master protection must be explicitly proven inactive."
-        );
-      const formula = executableCellFormula(attribute2(node, "F"));
-      if (formula) {
-        const analysis = analyze2(formula);
-        if (analysis.dynamic || analysis.references.length || analysis.unsupportedFunctions.length)
-          fail2("EDIT_PROTECTED_CELL", "Effective master protection dependencies are unsupported.");
-        const value = evaluateVisioFormula(
-          formula,
-          () => fail2("EDIT_PROTECTED_CELL", "Unexpected protection dependency."),
-          { onStep: () => charge() }
-        );
-        if (value.unit !== "scalar" || value.value !== 0)
-          fail2("EDIT_PROTECTED_CELL", "Effective master protection is active or stale.");
-      }
-    }
-    for (const name of ["PinX", "PinY"]) {
-      charge();
-      const node = local.get(name);
-      if (binding.cells.get(name.toLowerCase())?.node !== node)
-        fail2("EDIT_PROTECTED_CELL", "The rotation pin must be an explicit local override.");
-      charge(executableCellFormula(attribute2(node, "F"))?.length ?? 0);
-      editableCell(node);
-      const inherited = binding.inheritedCells.get(name.toLowerCase())?.node;
-      numeric4(inherited);
-      if (visioFormulaCachedValue("0", attribute2(inherited, "U") ?? "DL").unit !== "length")
-        fail2("EDIT_FORMULA_UNIT", "Inherited rotation pins require length units.");
-      const formula = executableCellFormula(attribute2(inherited, "F"));
-      if (formula) {
-        const analysis = analyze2(formula);
-        if (analysis.guarded || analysis.dynamic || analysis.unsupportedFunctions.length)
-          fail2("EDIT_PROTECTED_CELL", "Protected or redirected master pins cannot be overridden.");
-      }
-      result2.add(node);
-    }
-  }
-  if (result2.size) {
-    const indexed = indexCells(roots, { check: check3 });
-    const pins = new Set(
-      [...indexed.values()].filter((cell) => cell.node && result2.has(cell.node)).map(key)
+// src/visio/edit-master-index.ts
+function inheritedProtection(node, ancestor) {
+  try {
+    const boolean2 = (cell) => {
+      if (!cell || cell.hasAttribute("E"))
+        fail2("EDIT_PROTECTED_CELL", "Inherited protection has an unresolved or error cache.");
+      const value = visioFormulaCachedValue(attribute2(cell, "V") ?? "", attribute2(cell, "U"));
+      if (value.unit !== "scalar" || ![0, 1].includes(value.value))
+        fail2("EDIT_PROTECTED_CELL", "Inherited protection requires scalar boolean caches.");
+      return value.value;
+    };
+    if (boolean2(node) !== boolean2(ancestor))
+      fail2(
+        "EDIT_PROTECTED_CELL",
+        "Delegated master style protection cache disagrees with its ancestor."
+      );
+  } catch (error) {
+    fail2(
+      "EDIT_PROTECTED_CELL",
+      `Inherited master style protection cannot be proven: ${error instanceof Error ? error.message : "invalid cache"}`
     );
-    for (const cell of indexed.values())
-      if (charge(), cell.dependencies.some((dependency) => pins.has(dependency)))
-        fail2("EDIT_UNSUPPORTED_DEPENDENCY", "A page cache depends on a master rotation pin.");
   }
-  return result2;
 }
-
-// src/visio/edit-master-index.ts
 function masterCells(sheet, charge = () => {
 }) {
   const result2 = /* @__PURE__ */ new Map();
@@ -36208,7 +36297,7 @@ function assertMasterMarkup(root, known, check3) {
   }
 }
 function masterStyleCells(document, template, instance, check3, charge = () => {
-}) {
+}, verifyMovementProtection = false) {
   const styles = /* @__PURE__ */ new Map();
   for (const container of children4(document, "StyleSheets"))
     for (const style of children4(container, "StyleSheet")) {
@@ -36233,6 +36322,10 @@ function masterStyleCells(document, template, instance, check3, charge = () => {
     for (const [name, node] of own) {
       charge();
       if (attribute2(node, "F") !== "Inh") result3.set(name, node);
+      else if (verifyMovementProtection && /^lock(move[xy]|width|height|aspect|delete)$/.test(name)) {
+        charge();
+        inheritedProtection(node, result3.get(name));
+      }
     }
     return result3;
   };
@@ -36304,12 +36397,20 @@ async function assertVisioMasterIndependence(pkg, roots, commands, check3) {
   const instances = [...roots].flatMap(
     ([pageId, root]) => masterShapes(root).filter((shape2) => shape2.hasAttribute("Master")).map((instance) => ({ pageId, instance }))
   );
-  if (!instances.length) return /* @__PURE__ */ new Set();
+  if (!instances.length) return emptyMasterMoveProof();
   const documentPart = await related(pkg, "", "document");
   if (!documentPart) problem("Missing master document relationship.");
   const document = await visioXml(pkg, documentPart, "VisioDocument");
   const mastersPart = await related(pkg, documentPart, "masters", false);
-  if (!mastersPart) problem("Active master definitions are missing.");
+  if (!mastersPart) {
+    if (commands.some(
+      (command2) => instances.some(
+        (item) => item.pageId === command2.pageId && attribute2(item.instance, "ID") === command2.shapeId
+      )
+    ))
+      fail2("UNSUPPORTED_GEOMETRY_EDIT", "Active master definitions are missing.");
+    problem("Active master definitions are missing.");
+  }
   const definitions = /* @__PURE__ */ new Map();
   for (const node of children4(await visioXml(pkg, mastersPart, "Masters"), "Master")) {
     const id = attribute2(node, "ID");
@@ -36324,6 +36425,12 @@ async function assertVisioMasterIndependence(pkg, roots, commands, check3) {
     if (--buildWork < 0) problem("Master effective-cell construction budget exceeded.");
   };
   const pageBindings = /* @__PURE__ */ new Map();
+  const movingTargets = /* @__PURE__ */ new Set();
+  for (const command2 of commands) {
+    charge();
+    if (command2.type === "move-shape")
+      movingTargets.add(JSON.stringify([command2.pageId, command2.shapeId]));
+  }
   const pageShapes = /* @__PURE__ */ new Map();
   for (const [pageId, root] of roots)
     for (const shape2 of masterShapes(root)) {
@@ -36383,7 +36490,15 @@ async function assertVisioMasterIndependence(pkg, roots, commands, check3) {
       const templateId = attribute2(template, "ID");
       if (!templateId || context.has(templateId)) problem("Master-local sheet IDs are ambiguous.");
       const local = byTemplate.get(templateId), cells3 = /* @__PURE__ */ new Map();
-      for (const [name, node] of masterStyleCells(document, template, local, check3, charge))
+      const movedInstance = local === instance && movingTargets.has(JSON.stringify([pageId, attribute2(local, "ID")]));
+      for (const [name, node] of masterStyleCells(
+        document,
+        template,
+        local,
+        check3,
+        charge,
+        movedInstance
+      ))
         cells3.set(name, { node, kind: "style" });
       overlay(cells3, masterCells(template, charge), "template", charge);
       const inheritedCells = new Map(cells3);
@@ -36513,7 +36628,7 @@ async function assertVisioMasterIndependence(pkg, roots, commands, check3) {
   for (const binding of bindings)
     for (const name of binding.cells.keys()) {
       const source2 = binding.cells.get(name);
-      if (["pinx", "piny"].includes(name) && source2?.kind === "instance" && movePins.has(source2.node))
+      if (["pinx", "piny"].includes(name) && source2?.kind === "instance" && movePins.pins.has(source2.node))
         continue;
       inspect2(binding, name);
     }
@@ -36637,7 +36752,7 @@ async function assertGeometryPackageScope(pkg, pagePaths, commands, check3, root
           });
     }
   }
-  let movePins = /* @__PURE__ */ new Set();
+  let movePins = emptyMasterMoveProof();
   if (hasMasterInstances) {
     for (const command2 of commands) {
       const root = roots.get(command2.pageId);
@@ -36647,10 +36762,10 @@ async function assertGeometryPackageScope(pkg, pagePaths, commands, check3, root
       );
       if (target?.hasAttribute("MasterShape") && !target.hasAttribute("Master"))
         fail2("UNSUPPORTED_GEOMETRY_EDIT", "Editing master-linked shapes is unsupported.");
-      if (target?.hasAttribute("Master") && (command2.type !== "move-shape" || !["PinX", "PinY", "Width", "Height", "LocPinX", "LocPinY"].every(
+      if (target?.hasAttribute("Master") && (command2.type !== "move-shape" || !["PinX", "PinY"].every(
         (name) => children4(target, "Cell").some((node) => attribute2(node, "N") === name)
       )))
-        fail2("UNSUPPORTED_GEOMETRY_EDIT", "Master moves require complete local transform caches.");
+        fail2("UNSUPPORTED_GEOMETRY_EDIT", "Master moves require explicit local rotation pins.");
     }
     movePins = await assertVisioMasterIndependence(pkg, roots, commands, check3);
   }
@@ -36747,7 +36862,7 @@ async function editVsdx(input, edits, options = {}) {
   const roots = /* @__PURE__ */ new Map();
   const geometry = commands.some((command2) => command2.type !== "replace-plain-text");
   let document;
-  let masterMovePins = /* @__PURE__ */ new Set();
+  let masterMovePins = emptyMasterMoveProof();
   if (geometry) {
     for (const [pageId, path2] of pages) {
       const sourceRoot = await visioXml(pkg, path2, "PageContents");