ooxml-core 1.23.0 → 1.24.0

package/dist/visio/collab/index.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
 var Y = require('yjs');
-var JSZip = require('jszip');
 var xmldom = require('@xmldom/xmldom');
+var JSZip = require('jszip');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -619,7 +619,7 @@ var entryContent = (e) => e.xml !== void 0 ? pieceContent("leaf", e.xml) : piece
 var masterContent = (e) => JSON.stringify([e.id, canon(e.xml), e.rels ?? null, e.print]);
 
 // visio/collab/schema.ts
-var SCHEMA_VERSION = 3;
+var SCHEMA_VERSION = 4;
 var SchemaVersionError = class extends Error {
   constructor(found) {
     super(
@@ -723,7 +723,13 @@ function cellEntry(value) {
   const xml = str(value.xml);
   const open = str(value.open);
   if (pos === void 0 || xml === void 0 && open === void 0) return void 0;
-  return { pos, ...opt("xml", xml), ...opt("open", xml === void 0 ? open : void 0) };
+  const r = Array.isArray(value.r) && value.r.length % 2 === 0 && value.r.every((v) => typeof v === "string") ? value.r : void 0;
+  return {
+    pos,
+    ...opt("xml", xml),
+    ...opt("open", xml === void 0 ? open : void 0),
+    ...r && r.length ? { r } : {}
+  };
 }
 function masterEntry(value) {
   if (!isRecord(value)) return void 0;
@@ -777,6 +783,20 @@ function splitList(text, name, mark, child) {
   }
   return { text: text.slice(0, box.openEnd) + mark + text.slice(box.closeStart), items };
 }
+function formulaRefs(text, owner) {
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const f of text.matchAll(/\sF\s*=\s*("[^"]*"|'[^']*')/g))
+    for (const m of f[1].matchAll(/Sheet\.(\d+)(?!\d)/g)) {
+      const id = m[1];
+      const key = owner.get(id);
+      if (key !== void 0 && !seen.has(id)) {
+        seen.add(id);
+        out.push(id, key);
+      }
+    }
+  return out;
+}
 function flatten(xml, parent, page, keys, out) {
   const split2 = splitShape(xml);
   const id = split2 ? attrOf(split2.open, "ID") : void 0;
@@ -797,6 +817,12 @@ function splitContents(content, scope, keys) {
   const shapes = [];
   for (const text of shapesSplit.items) flatten(text, void 0, scope, keys, shapes);
   const owner = new Map(shapes.map((s) => [s.id, s.key]));
+  for (const shape of shapes)
+    for (const piece of shape.pieces)
+      if (piece.kind === "leaf") {
+        const refs = formulaRefs(piece.text, owner);
+        if (refs.length) piece.refs = refs;
+      }
   const connects = [];
   for (const text of connectsSplit.items) {
     const a = (name) => attrOf(text, name) ?? "";
@@ -1042,6 +1068,80 @@ async function placeList(options) {
   );
   return paths;
 }
+new TextDecoder("utf-8", { fatal: true });
+var crcTable = Uint32Array.from({ length: 256 }, (_, value) => {
+  for (let i = 0; i < 8; i++) value = value & 1 ? 3988292384 ^ value >>> 1 : value >>> 1;
+  return value >>> 0;
+});
+function crc32(bytes, crc = 4294967295) {
+  for (const byte of bytes) crc = (crcTable[(crc ^ byte) & 255] ?? 0) ^ crc >>> 8;
+  return crc >>> 0;
+}
+
+// visio/collab/zip-store.ts
+var encoder2 = new TextEncoder();
+var DOS_TIME = 0;
+var DOS_DATE = 33;
+function writeStoredZip(files, crcs) {
+  const prepared = files.map(([name, data]) => {
+    let crc = crcs.get(data);
+    if (crc === void 0) {
+      crc = (crc32(data) ^ 4294967295) >>> 0;
+      crcs.set(data, crc);
+    }
+    return { name: encoder2.encode(name), data, crc };
+  });
+  let local = 0;
+  let central = 0;
+  for (const f of prepared) {
+    local += 30 + f.name.length + f.data.length;
+    central += 46 + f.name.length;
+  }
+  const out = new Uint8Array(local + central + 22);
+  const view = new DataView(out.buffer);
+  let at = 0;
+  const offsets = [];
+  for (const f of prepared) {
+    offsets.push(at);
+    view.setUint32(at, 67324752, true);
+    view.setUint16(at + 4, 20, true);
+    view.setUint16(at + 6, 2048, true);
+    view.setUint16(at + 8, 0, true);
+    view.setUint16(at + 10, DOS_TIME, true);
+    view.setUint16(at + 12, DOS_DATE, true);
+    view.setUint32(at + 14, f.crc, true);
+    view.setUint32(at + 18, f.data.length, true);
+    view.setUint32(at + 22, f.data.length, true);
+    view.setUint16(at + 26, f.name.length, true);
+    view.setUint16(at + 28, 0, true);
+    out.set(f.name, at + 30);
+    out.set(f.data, at + 30 + f.name.length);
+    at += 30 + f.name.length + f.data.length;
+  }
+  const centralStart = at;
+  prepared.forEach((f, i) => {
+    view.setUint32(at, 33639248, true);
+    view.setUint16(at + 4, 20, true);
+    view.setUint16(at + 6, 20, true);
+    view.setUint16(at + 8, 2048, true);
+    view.setUint16(at + 10, 0, true);
+    view.setUint16(at + 12, DOS_TIME, true);
+    view.setUint16(at + 14, DOS_DATE, true);
+    view.setUint32(at + 16, f.crc, true);
+    view.setUint32(at + 20, f.data.length, true);
+    view.setUint32(at + 24, f.data.length, true);
+    view.setUint16(at + 28, f.name.length, true);
+    view.setUint32(at + 42, offsets[i], true);
+    out.set(f.name, at + 46);
+    at += 46 + f.name.length;
+  });
+  view.setUint32(at, 101010256, true);
+  view.setUint16(at + 8, prepared.length, true);
+  view.setUint16(at + 10, prepared.length, true);
+  view.setUint32(at + 12, at - centralStart, true);
+  view.setUint32(at + 16, centralStart, true);
+  return out;
+}
 
 // visio/collab/compose.ts
 var DEFAULT_CONTENT_TYPES = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types"></Types>';
@@ -1180,12 +1280,16 @@ async function composeDrawing(drawing, local, keys, options = {}) {
     contentTypes = withOverrides(contentTypes, MASTER_CONTENT_TYPE, [...masterPaths.values()]);
   }
   files.set(CONTENT_TYPES, encoder.encode(contentTypes));
-  const zip = new JSZip__default.default();
   const names = [...files.keys()].sort(
     (a, b) => a === CONTENT_TYPES ? -1 : b === CONTENT_TYPES ? 1 : 0
   );
-  for (const name of names) zip.file(name, files.get(name), { createFolders: false });
-  const bytes = await zip.generateAsync({ type: "uint8array", compression: "STORE" });
+  const bytes = writeStoredZip(
+    names.map((name) => {
+      const data = files.get(name);
+      return [name, typeof data === "string" ? encoder.encode(data) : data];
+    }),
+    keys.cache.crcs
+  );
   const commit = () => {
     const pageIds = /* @__PURE__ */ new Map();
     const shapeIds = /* @__PURE__ */ new Map();
@@ -1236,8 +1340,7 @@ async function composeDrawing(drawing, local, keys, options = {}) {
 function applyFixups(shared, fixups) {
   let changed = 0;
   for (const fixup of fixups) {
-    const map = fixup.map === "renum" ? shared.renum : shared.cells;
-    if (setIfChanged(map, fixup.key, fixup.value)) changed++;
+    if (setIfChanged(shared.renum, fixup.key, fixup.value)) changed++;
   }
   return changed;
 }
@@ -1267,7 +1370,9 @@ var DrawingKeys = class {
   /** Serialised page parts and decoded shared parts of the last rebuild, to skip unchanged work. */
   cache = {
     pageParts: /* @__PURE__ */ new Map(),
-    parts: /* @__PURE__ */ new Map()
+    parts: /* @__PURE__ */ new Map(),
+    /** CRC-32 of the bytes of each stored part, by identity (see zip-store.ts). */
+    crcs: /* @__PURE__ */ new WeakMap()
   };
   /**
    * What was last applied to the editor: the drawing signature, the editor version it produced,
@@ -1386,19 +1491,22 @@ function assignIds(items) {
   const order = [...items].sort(
     (a, b) => Number(b.fixed !== void 0) - Number(a.fixed !== void 0) || compare(a.key, b.key)
   );
-  const used = /* @__PURE__ */ new Set();
   const ids = /* @__PURE__ */ new Map();
   const fresh = /* @__PURE__ */ new Map();
+  const holder = /* @__PURE__ */ new Map();
+  const claims = /* @__PURE__ */ new Set();
   for (const item of order) {
     let id = effective(item);
-    if (used.has(id)) {
+    const taken = holder.get(id);
+    if (taken) {
+      if (taken.fixed === void 0) claims.add(taken.key);
       id = String(++max);
       fresh.set(item.key, { from: item.id, to: id });
     }
-    used.add(id);
+    holder.set(id, item);
     ids.set(item.key, id);
   }
-  return { ids, fresh };
+  return { ids, fresh, claims };
 }
 var fixedId = (renum, key, id) => {
   const pair = renum.get(key)?.i;
@@ -1412,6 +1520,11 @@ function readRenum(shared) {
   }
   return out;
 }
+function renumRecord(renum, recordKey, item, change, claimed) {
+  if (change) return { ...renum.get(recordKey), i: [change.from, change.to] };
+  if (claimed) return { ...renum.get(recordKey), i: [item.id, item.id] };
+  return void 0;
+}
 
 // visio/collab/read-util.ts
 function hashTexts(texts) {
@@ -1471,6 +1584,14 @@ function renumberFormulas(xml, remap) {
     return `${head}${value[0]}${body}${value[0]}`;
   });
 }
+function referenced(r, finalId) {
+  const out = /* @__PURE__ */ new Map();
+  for (let i = 0; i + 1 < r.length; i += 2) {
+    const next = finalId.get(r[i + 1]);
+    if (next !== void 0) out.set(r[i], next);
+  }
+  return out;
+}
 function resolveShapes(input) {
   const raw = /* @__PURE__ */ new Map();
   for (const [key, entry] of input.shapes) {
@@ -1489,31 +1610,16 @@ function resolveShapes(input) {
     return ok;
   };
   const live = [...raw.keys()].filter((k) => valid(k)).sort(compare);
-  const { ids: finalId, fresh: renumbered } = assignIds(
+  const {
+    ids: finalId,
+    fresh: renumbered,
+    claims
+  } = assignIds(
     live.map((key) => {
       const { id } = raw.get(key);
       return { key, id, fixed: fixedId(input.renum, key, id) };
     })
   );
-  const batchRemap = /* @__PURE__ */ new Map();
-  for (const [key, change] of renumbered) {
-    const b = raw.get(key).entry.b;
-    if (b === void 0) continue;
-    const map = batchRemap.get(b) ?? /* @__PURE__ */ new Map();
-    map.set(change.from, change.to);
-    batchRemap.set(b, map);
-  }
-  const remapFor = (key) => {
-    const out = new Map(batchRemap.get(raw.get(key).entry.b ?? "") ?? []);
-    const chain = [];
-    for (let k = key; k !== void 0; k = raw.get(k)?.entry.parent)
-      chain.unshift(k);
-    for (const k of chain) {
-      const change = renumbered.get(k);
-      if (change) out.set(change.from, change.to);
-    }
-    return out;
-  };
   const children = /* @__PURE__ */ new Map();
   for (const key of live) {
     const parent = raw.get(key).entry.parent ?? "";
@@ -1525,15 +1631,16 @@ function resolveShapes(input) {
   const render = (key) => {
     const { entry } = raw.get(key);
     const id = finalId.get(key);
-    const remap = remapFor(key);
     let open = setAttr(entry.open, "ID", id);
-    const record = { ...input.renum.get(key) };
-    let dirty = false;
-    const change = renumbered.get(key);
-    if (change) {
-      record.i = [change.from, change.to];
-      dirty = true;
-    }
+    const idRecord = renumRecord(
+      input.renum,
+      `${input.scope}/${key}`,
+      { id: raw.get(key).id },
+      renumbered.get(key),
+      claims.has(key)
+    );
+    const record = { ...idRecord ?? input.renum.get(key) };
+    let dirty = idRecord !== void 0;
     const master = attrOf(open, "Master");
     const persisted = record.m && record.m[0] === master ? record.m[1] : void 0;
     const batched = master !== void 0 ? input.masterRemap.get(entry.b ?? "")?.get(master) : void 0;
@@ -1546,13 +1653,9 @@ function resolveShapes(input) {
     if (dirty) fixups.push({ map: "renum", key: `${input.scope}/${key}`, value: record });
     const entries = /* @__PURE__ */ new Map();
     for (const [path, piece] of input.cells.get(key) ?? []) {
-      const leaf = piece.xml !== void 0 && /(^|\/)c\/[^/]*$/.test(path);
-      const xml2 = leaf ? renumberFormulas(piece.xml, remap) : void 0;
-      if (xml2 !== void 0 && xml2 !== piece.xml) {
-        const value = { ...piece, xml: xml2 };
-        entries.set(path, value);
-        fixups.push({ map: "cells", key: `${input.scope}/${key}/${path}`, value });
-      } else entries.set(path, piece);
+      const leaf = piece.xml !== void 0 && piece.r !== void 0;
+      const xml2 = leaf ? renumberFormulas(piece.xml, referenced(piece.r, finalId)) : void 0;
+      entries.set(path, xml2 !== void 0 && xml2 !== piece.xml ? { ...piece, xml: xml2 } : piece);
     }
     shapes.push({
       key,
@@ -1576,7 +1679,7 @@ function resolveMasters(shared, renum) {
     const entry = masterEntry(value);
     if (entry) alive.push({ key, entry });
   }
-  const { ids, fresh } = assignIds(
+  const { ids, fresh, claims } = assignIds(
     alive.map(({ key, entry }) => ({
       key,
       id: entry.id,
@@ -1592,11 +1695,10 @@ function resolveMasters(shared, renum) {
       map.set(change.from, change.to);
       remap.set(b, map);
     }
-    fixups.push({
-      map: "renum",
-      key: masterScope(key),
-      value: { ...renum.get(masterScope(key)), i: [change.from, change.to] }
-    });
+  }
+  for (const { key, entry } of [...alive].sort((a, b) => compare2(a.key, b.key))) {
+    const value = renumRecord(renum, masterScope(key), entry, fresh.get(key), claims.has(key));
+    if (value) fixups.push({ map: "renum", key: masterScope(key), value });
   }
   alive.sort((a, b) => a.entry.pos - b.entry.pos || compare2(a.key, b.key));
   return {
@@ -1682,19 +1784,21 @@ function readSharedDrawing(shared) {
   });
   const renum = readRenum(shared);
   const fixups = [];
-  const { ids: pageIds, fresh: freshPages } = assignIds(
+  const {
+    ids: pageIds,
+    fresh: freshPages,
+    claims: pageClaims
+  } = assignIds(
     alive.map((p) => ({
       key: p.key,
       id: p.entry.id,
       fixed: fixedId(renum, p.key, p.entry.id)
     }))
   );
-  for (const [key, change] of [...freshPages].sort((a, b) => compare(a[0], b[0])))
-    fixups.push({
-      map: "renum",
-      key,
-      value: { ...renum.get(key), i: [change.from, change.to] }
-    });
+  for (const p of [...alive].sort((a, b) => compare(a.key, b.key))) {
+    const value = renumRecord(renum, p.key, p.entry, freshPages.get(p.key), pageClaims.has(p.key));
+    if (value) fixups.push({ map: "renum", key: p.key, value });
+  }
   const shapesByPage = /* @__PURE__ */ new Map();
   for (const [full, value] of shared.shapes) {
     const parts2 = split(full, 1);
@@ -1906,7 +2010,8 @@ function syncShapes(ctx, page) {
       const roomCell = cellEntry(shared.cells.get(cellKey));
       const local = () => ({
         pos: piecePos.get(piece.path),
-        ...piece.kind === "leaf" ? { xml: piece.text } : { open: piece.text }
+        ...piece.kind === "leaf" ? { xml: piece.text } : { open: piece.text },
+        ...piece.refs ? { r: piece.refs } : {}
       });
       syncEntry(
         ctx,