@lotics/cli 0.96.1 → 0.96.2

package/dist/src/cli.js

@@ -79374,8 +79374,9 @@ function parseImages(rels, zipEntries) {
     const drawingRelsPath = drawingPath.replace(/([^/]+)$/, "_rels/$1.rels");
     const drawingRelsEntry = findZipEntry(zipEntries, drawingRelsPath);
     const drawingRels = drawingRelsEntry ? parseDrawingRels(decodeUtf8(drawingRelsEntry)) : /* @__PURE__ */ new Map();
-    const anchors = wsDr["xdr:twoCellAnchor"];
-    if (anchors) {
+    for (const key of ["xdr:twoCellAnchor", "xdr:oneCellAnchor", "xdr:absoluteAnchor"]) {
+      const anchors = wsDr[key];
+      if (!anchors) continue;
       for (const anchor of anchors) {
         if (images.length >= MAX_IMAGES) break;
         const image = extractImageFromAnchor(anchor, drawingRels, zipEntries, drawingPath);
@@ -79401,18 +79402,42 @@ function parseDrawingRels(relsXml2) {
   }
   return map3;
 }
+var MEDIA_MIME_TYPES = {
+  png: "image/png",
+  jpg: "image/jpeg",
+  jpeg: "image/jpeg",
+  gif: "image/gif",
+  bmp: "image/bmp",
+  tiff: "image/tiff",
+  tif: "image/tiff",
+  svg: "image/svg+xml",
+  emf: "image/x-emf",
+  wmf: "image/x-wmf"
+};
+function isSupportedMediaMime(mime) {
+  return Object.values(MEDIA_MIME_TYPES).includes(mime);
+}
 function extractImageFromAnchor(anchor, drawingRels, zipEntries, drawingPath) {
-  const from = anchor["xdr:from"];
+  const from = anchor["xdr:from"] ?? { "xdr:row": "0", "xdr:col": "0" };
   const to = anchor["xdr:to"];
-  if (!from || !to) return void 0;
+  const posEl = anchor["xdr:pos"];
+  if (!anchor["xdr:from"] && !posEl) return void 0;
+  const extEl = anchor["xdr:ext"];
+  const extent = extEl ? { cx: parseInt(extEl["@_cx"] ?? "0", 10), cy: parseInt(extEl["@_cy"] ?? "0", 10) } : void 0;
+  const pos = posEl ? { x: parseInt(posEl["@_x"] ?? "0", 10), y: parseInt(posEl["@_y"] ?? "0", 10) } : void 0;
+  const anchorKind = to ? "twoCell" : posEl ? "absolute" : "oneCell";
   const tl = {
     row: parseInt(from["xdr:row"] ?? "0", 10),
-    col: parseInt(from["xdr:col"] ?? "0", 10)
+    col: parseInt(from["xdr:col"] ?? "0", 10),
+    rowOff: parseInt(from["xdr:rowOff"] ?? "0", 10),
+    colOff: parseInt(from["xdr:colOff"] ?? "0", 10)
   };
-  const br = {
+  const br = to ? {
     row: parseInt(to["xdr:row"] ?? "0", 10) + 1,
-    col: parseInt(to["xdr:col"] ?? "0", 10) + 1
-  };
+    col: parseInt(to["xdr:col"] ?? "0", 10) + 1,
+    rowOff: parseInt(to["xdr:rowOff"] ?? "0", 10),
+    colOff: parseInt(to["xdr:colOff"] ?? "0", 10)
+  } : { row: tl.row + 1, col: tl.col + 1, rowOff: 0, colOff: 0 };
   const pic = anchor["xdr:pic"];
   if (!pic) return void 0;
   const blipFill = pic["xdr:blipFill"];
@@ -79428,10 +79453,10 @@ function extractImageFromAnchor(anchor, drawingRels, zipEntries, drawingPath) {
   const imageEntry = findZipEntry(zipEntries, imagePath);
   if (!imageEntry) return void 0;
   const ext = imagePath.split(".").pop()?.toLowerCase() ?? "png";
-  const mimeType = ext === "jpeg" || ext === "jpg" ? "image/jpeg" : ext === "gif" ? "image/gif" : "image/png";
+  const mimeType = MEDIA_MIME_TYPES[ext] ?? "application/octet-stream";
   const base643 = uint8ToBase64(imageEntry);
   const dataUrl = `data:${mimeType};base64,${base643}`;
-  return { dataUrl, tl, br };
+  return { dataUrl, tl, br, ext, anchorKind, extent, pos };
 }
 function parseConditionalFormats(worksheet, theme, indexedColors) {
   const cfArr = worksheet["conditionalFormatting"];
@@ -81897,7 +81922,7 @@ function readWorkbookRels(originalZip) {
   const bytes = originalZip["xl/_rels/workbook.xml.rels"];
   if (!bytes) return out;
   const xml = decode3(bytes);
-  const re2 = /<Relationship\b([^/]*?)\/>/g;
+  const re2 = /<Relationship\b([^>]*?)\/>/g;
   let m;
   while ((m = re2.exec(xml)) !== null) {
     const attrs = m[1];
@@ -81931,7 +81956,7 @@ function readSheetPivotPaths(originalZip, sheetTarget) {
   const bytes = originalZip[relsPath];
   if (!bytes) return [];
   const xml = decode3(bytes);
-  const re2 = /<Relationship\b([^/]*?)\/>/g;
+  const re2 = /<Relationship\b([^>]*?)\/>/g;
   const out = [];
   let m;
   while ((m = re2.exec(xml)) !== null) {
@@ -81943,6 +81968,32 @@ function readSheetPivotPaths(originalZip, sheetTarget) {
   }
   return out;
 }
+function extractLegacyHeaderFooterArt(originalZip, sheetTarget) {
+  if (!originalZip || !sheetTarget) return null;
+  const sheetPath = `xl/${sheetTarget}`;
+  const sheetBytes = originalZip[sheetPath];
+  if (!sheetBytes || !/<legacyDrawingHF\b/.test(decode3(sheetBytes))) return null;
+  const relsPath = sheetPath.replace(/([^/]+)$/, "_rels/$1.rels");
+  const relsBytes = originalZip[relsPath];
+  if (!relsBytes) return null;
+  const relsXml2 = decode3(relsBytes);
+  const hfRel = [...relsXml2.matchAll(/<Relationship\b([^>]*?)\/>/g)].map((m) => m[1]).find((attrs) => (/\bType="([^"]+)"/.exec(attrs)?.[1] ?? "").includes("/vmlDrawing"));
+  const target = hfRel ? /\bTarget="([^"]+)"/.exec(hfRel)?.[1] : void 0;
+  if (!target) return null;
+  const vmlPath = `xl/${target.replace(/^\.\.\//, "")}`;
+  if (!originalZip[vmlPath]) return null;
+  const parts = [vmlPath];
+  const vmlRelsPath = vmlPath.replace(/([^/]+)$/, "_rels/$1.rels");
+  const vmlRels = originalZip[vmlRelsPath];
+  if (vmlRels) {
+    parts.push(vmlRelsPath);
+    for (const m of decode3(vmlRels).matchAll(/\bTarget="([^"]+)"/g)) {
+      const mediaPath = `xl/${m[1].replace(/^\.\.\//, "")}`;
+      if (originalZip[mediaPath]) parts.push(mediaPath);
+    }
+  }
+  return { target, parts };
+}
 function extractPivotRoundTripInfo(originalZip) {
   const empty = {
     cachesByWorkbook: /* @__PURE__ */ new Map(),
@@ -82056,6 +82107,7 @@ function exportWorkbook(workbook, originalZip) {
     regeneratedPaths.add("_rels/.rels");
     regeneratedPaths.add("docProps/core.xml");
     regeneratedPaths.add("docProps/app.xml");
+    regeneratedPaths.add("xl/calcChain.xml");
     for (let i2 = 0; i2 < workbook.sheets.length + 10; i2++) {
       regeneratedPaths.add(`xl/worksheets/sheet${i2 + 1}.xml`);
       regeneratedPaths.add(`xl/worksheets/_rels/sheet${i2 + 1}.xml.rels`);
@@ -82066,7 +82118,10 @@ function exportWorkbook(workbook, originalZip) {
       }
     }
     for (const [path8, data] of Object.entries(originalZip)) {
-      if (!regeneratedPaths.has(path8)) entries2[path8] = data;
+      if (regeneratedPaths.has(path8)) continue;
+      const ext = path8.slice(path8.lastIndexOf(".") + 1).toLowerCase();
+      if (!DECLARED_EXTENSIONS.includes(ext)) continue;
+      entries2[path8] = data;
     }
   }
   const sharedStrings = buildSharedStrings(workbook);
@@ -82074,6 +82129,7 @@ function exportWorkbook(workbook, originalZip) {
   const stylesResult = stylesPassthrough ? { xml: "", xfMap: /* @__PURE__ */ new Map(), numFmtMap: /* @__PURE__ */ new Map(), dxfMap: /* @__PURE__ */ new Map() } : buildStylesXml(workbook);
   if (!stylesPassthrough) entries2["xl/styles.xml"] = strToU8(stylesResult.xml);
   const roundTripInfo = extractPivotRoundTripInfo(originalZip);
+  const sheetTargets = originalZip ? readWorkbookSheetOrder(originalZip).map((rid) => readWorkbookRels(originalZip).get(rid)?.target) : [];
   const authoredStartIndex = roundTripInfo.pivotXmlPaths.filter((p) => p.startsWith("xl/pivotTables/")).length + 1;
   const pivotInfo = mergePivotInfo(roundTripInfo, emitAuthoredPivots(workbook, entries2, authoredStartIndex));
   entries2["xl/workbook.xml"] = strToU8(buildWorkbookXml(workbook, pivotInfo));
@@ -82106,6 +82162,15 @@ function exportWorkbook(workbook, originalZip) {
         sheetRels.push(`<Relationship Id="${rId}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink" Target="${escapeXml(url2)}" TargetMode="External"/>`);
       }
     }
+    let legacyHFRId = "";
+    if (originalZip) {
+      const hf = extractLegacyHeaderFooterArt(originalZip, sheetTargets[i2]);
+      if (hf) {
+        legacyHFRId = `rId${nextRId++}`;
+        sheetRels.push(`<Relationship Id="${legacyHFRId}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing" Target="${escapeXml(hf.target)}"/>`);
+        for (const part of hf.parts) entries2[part] = originalZip[part];
+      }
+    }
     let drawingRId = "";
     if (needsDrawing) {
       drawingRId = `rId${nextRId++}`;
@@ -82124,7 +82189,8 @@ function exportWorkbook(workbook, originalZip) {
       }
       for (const image of sheet.images) {
         const imgRId = `rId${drawingRelId++}`;
-        const ext = getImageExtension(image.dataUrl);
+        const ext = getImageExtension(image.dataUrl, image.ext);
+        while (entries2[`xl/media/image${globalImageIndex}.${ext}`]) globalImageIndex++;
         const imgPath = `xl/media/image${globalImageIndex}.${ext}`;
         const imgBytes = dataUrlToBytes(image.dataUrl);
         if (imgBytes) {
@@ -82183,7 +82249,7 @@ ${sheetRels.join("\n")}
       );
     }
     entries2[`xl/worksheets/sheet${i2 + 1}.xml`] = strToU8(
-      buildSheetXml(sheet, workbook.styles, sharedStrings.index, i2 === workbook.activeSheetIndex, stylesResult.xfMap, stylesResult.numFmtMap, stylesResult.dxfMap, drawingRId, tableRIds, hyperlinkRIds)
+      buildSheetXml(sheet, workbook.styles, sharedStrings.index, i2 === workbook.activeSheetIndex, stylesResult.xfMap, stylesResult.numFmtMap, stylesResult.dxfMap, drawingRId, tableRIds, hyperlinkRIds, legacyHFRId)
     );
   }
   entries2["docProps/core.xml"] = strToU8(buildCoreProps());
@@ -82518,7 +82584,7 @@ function extractFillColors(css) {
   }
   return { fg: void 0, bg: void 0 };
 }
-function buildSheetXml(sheet, styles, ssIndex, isActive, xfMap, numFmtMap, dxfMap, drawingRId, tableRIds, hyperlinkRIds) {
+function buildSheetXml(sheet, styles, ssIndex, isActive, xfMap, numFmtMap, dxfMap, drawingRId, tableRIds, hyperlinkRIds, legacyHFRId) {
   const rows = [];
   const rowMap = /* @__PURE__ */ new Map();
   for (const [ref, cell] of sheet.cells) {
@@ -82568,10 +82634,22 @@ function buildSheetXml(sheet, styles, ssIndex, isActive, xfMap, numFmtMap, dxfMa
   }
   const cols = [];
   const allCols = /* @__PURE__ */ new Set([...sheet.colWidths.keys(), ...sheet.hiddenCols]);
-  for (const c of Array.from(allCols).sort((a, b) => a - b)) {
+  const sortedCols = Array.from(allCols).sort((a, b) => a - b);
+  const colDef = (c) => {
     const w = sheet.colWidths.get(c) ?? sheet.defaultColWidth;
     const hidden = sheet.hiddenCols.has(c) ? ' hidden="1"' : "";
-    cols.push(`<col min="${c}" max="${c}" width="${w}" customWidth="1"${hidden}/>`);
+    return `width="${w}" customWidth="1"${hidden}`;
+  };
+  for (let i2 = 0; i2 < sortedCols.length; ) {
+    const start = sortedCols[i2];
+    const def = colDef(start);
+    let end = start;
+    while (i2 + 1 < sortedCols.length && sortedCols[i2 + 1] === end + 1 && colDef(sortedCols[i2 + 1]) === def) {
+      end = sortedCols[i2 + 1];
+      i2++;
+    }
+    cols.push(`<col min="${start}" max="${end}" ${def}/>`);
+    i2++;
   }
   let mergeXml = "";
   if (sheet.mergedCells.length > 0) {
@@ -82627,6 +82705,7 @@ function buildSheetXml(sheet, styles, ssIndex, isActive, xfMap, numFmtMap, dxfMa
     hyperlinksXml = `<hyperlinks>${hlEntries}</hyperlinks>`;
   }
   const drawingXml = drawingRId ? `<drawing r:id="${drawingRId}"/>` : "";
+  const legacyHFXml = legacyHFRId ? `<legacyDrawingHF r:id="${legacyHFRId}"/>` : "";
   let tablePartsXml = "";
   if (tableRIds && tableRIds.length > 0) {
     const parts = tableRIds.map((rId) => `<tablePart r:id="${rId}"/>`).join("");
@@ -82697,7 +82776,7 @@ ${cols.length > 0 ? `<cols>${cols.join("")}</cols>` : ""}
 <sheetData>
 ${rows.join("\n")}
 </sheetData>
-${autoFilterXml}${mergeXml}${cfXml}${dvXml}${hyperlinksXml}${marginsXml}${pageSetupXml}${headerFooterXml}${drawingXml}${tablePartsXml}
+${autoFilterXml}${mergeXml}${cfXml}${dvXml}${hyperlinksXml}${marginsXml}${pageSetupXml}${headerFooterXml}${drawingXml}${legacyHFXml}${tablePartsXml}
 </worksheet>`;
 }
 function getCellType(cell, ssIndex) {
@@ -82794,19 +82873,30 @@ function buildWorkbookRels(workbook, pivotInfo) {
 ${rels.join("\n")}
 </Relationships>`;
 }
+var DECLARED_EXTENSIONS = ["rels", "xml", "png", "jpeg", "jpg", "gif", "vml", "emf", "wmf", "bmp", "tiff", "tif", "svg"];
 function buildContentTypes(sheetCount, extraTypes = []) {
+  const DEFAULT_CONTENT_TYPES = [
+    `<Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>`,
+    `<Default Extension="xml" ContentType="application/xml"/>`,
+    `<Default Extension="png" ContentType="image/png"/>`,
+    `<Default Extension="jpeg" ContentType="image/jpeg"/>`,
+    `<Default Extension="jpg" ContentType="image/jpeg"/>`,
+    `<Default Extension="gif" ContentType="image/gif"/>`,
+    `<Default Extension="vml" ContentType="application/vnd.openxmlformats-officedocument.vmlDrawing"/>`,
+    `<Default Extension="emf" ContentType="image/x-emf"/>`,
+    `<Default Extension="wmf" ContentType="image/x-wmf"/>`,
+    `<Default Extension="bmp" ContentType="image/bmp"/>`,
+    `<Default Extension="tiff" ContentType="image/tiff"/>`,
+    `<Default Extension="tif" ContentType="image/tiff"/>`,
+    `<Default Extension="svg" ContentType="image/svg+xml"/>`
+  ].join("\n");
   const sheetTypes = Array.from(
     { length: sheetCount },
     (_, i2) => `<Override PartName="/xl/worksheets/sheet${i2 + 1}.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"/>`
   ).join("\n");
   return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">
-<Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>
-<Default Extension="xml" ContentType="application/xml"/>
-<Default Extension="png" ContentType="image/png"/>
-<Default Extension="jpeg" ContentType="image/jpeg"/>
-<Default Extension="jpg" ContentType="image/jpeg"/>
-<Default Extension="gif" ContentType="image/gif"/>
+${DEFAULT_CONTENT_TYPES}
 <Override PartName="/xl/workbook.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"/>
 ${sheetTypes}
 <Override PartName="/xl/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"/>
@@ -82981,15 +83071,37 @@ function buildChartAnchorXml(chart, rId) {
 </xdr:twoCellAnchor>`;
 }
 function buildImageAnchorXml(image, rId) {
-  return `<xdr:twoCellAnchor editAs="oneCell">
-<xdr:from>${buildAnchorPosition(image.tl)}</xdr:from>
-<xdr:to>${buildAnchorPosition(image.br)}</xdr:to>
-<xdr:pic>
+  const pic = `<xdr:pic>
 <xdr:nvPicPr><xdr:cNvPr id="0" name="Image"/><xdr:cNvPicPr/></xdr:nvPicPr>
 <xdr:blipFill><a:blip xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" r:embed="${rId}"/><a:stretch><a:fillRect/></a:stretch></xdr:blipFill>
 <xdr:spPr><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></xdr:spPr>
 </xdr:pic>
-<xdr:clientData/>
+<xdr:clientData/>`;
+  const from = `<xdr:from>${buildAnchorPosition({ row: image.tl.row, col: image.tl.col, rowOffset: image.tl.rowOff, colOffset: image.tl.colOff })}</xdr:from>`;
+  if (image.anchorKind === "oneCell" && image.extent) {
+    return `<xdr:oneCellAnchor>
+${from}
+<xdr:ext cx="${image.extent.cx}" cy="${image.extent.cy}"/>
+${pic}
+</xdr:oneCellAnchor>`;
+  }
+  if (image.anchorKind === "absolute" && image.extent && image.pos) {
+    return `<xdr:absoluteAnchor>
+<xdr:pos x="${image.pos.x}" y="${image.pos.y}"/>
+<xdr:ext cx="${image.extent.cx}" cy="${image.extent.cy}"/>
+${pic}
+</xdr:absoluteAnchor>`;
+  }
+  const to = {
+    row: Math.max(image.tl.row, image.br.row - 1),
+    col: Math.max(image.tl.col, image.br.col - 1),
+    rowOffset: image.br.rowOff,
+    colOffset: image.br.colOff
+  };
+  return `<xdr:twoCellAnchor editAs="oneCell">
+${from}
+<xdr:to>${buildAnchorPosition(to)}</xdr:to>
+${pic}
 </xdr:twoCellAnchor>`;
 }
 function buildShapeAnchorXml(drawing) {
@@ -83088,10 +83200,16 @@ function buildDxfXml(style) {
   }
   return `<dxf>${inner}</dxf>`;
 }
-function getImageExtension(dataUrl) {
+function getImageExtension(dataUrl, sourceExt) {
+  if (sourceExt) return sourceExt.toLowerCase();
   if (dataUrl.startsWith("data:image/png")) return "png";
   if (dataUrl.startsWith("data:image/jpeg") || dataUrl.startsWith("data:image/jpg")) return "jpeg";
   if (dataUrl.startsWith("data:image/gif")) return "gif";
+  if (dataUrl.startsWith("data:image/x-emf")) return "emf";
+  if (dataUrl.startsWith("data:image/x-wmf")) return "wmf";
+  if (dataUrl.startsWith("data:image/bmp")) return "bmp";
+  if (dataUrl.startsWith("data:image/tiff")) return "tiff";
+  if (dataUrl.startsWith("data:image/svg+xml")) return "svg";
   return "png";
 }
 function dataUrlToBytes(dataUrl) {
@@ -83306,6 +83424,46 @@ var SheetModel = class {
     if (!rc) throw new Error(`Invalid cell reference: ${topLeftRef}`);
     this.freeze = { row: rc.row - 1, col: rc.col - 1 };
   }
+  /**
+   * Place a picture on the sheet, anchored to a cell range.
+   *
+   * The authoring counterpart to the parser: without it, adding an image meant
+   * hand-constructing a ParsedImage (0-based anchors, an EXCLUSIVE `br`, a
+   * dataUrl, an anchor kind) — enough hidden convention that every caller would
+   * get one of them wrong. It lives on the model rather than in a tool so that
+   * every surface reaches it: a sandbox code run, a workflow tool, the editor.
+   *
+   * `range` is an ordinary A1 range ("B3:F11"); a single ref ("B3") anchors a
+   * one-cell box. The picture resizes with its cells (twoCell), which is what a
+   * logo in a letterhead should do.
+   *
+   * @param dataUrl `data:image/png;base64,…` — the bytes to embed.
+   * @param range   Where it sits, e.g. "B3:F11".
+   */
+  addImage(dataUrl, range2) {
+    const mime = /^data:([^;,]+)[;,]/.exec(dataUrl)?.[1];
+    if (!mime) throw new Error("addImage expects a data: URL, e.g. data:image/png;base64,\u2026");
+    if (!isSupportedMediaMime(mime)) {
+      throw new Error(`addImage cannot embed ${mime} \u2014 xl/media holds png, jpeg, gif, bmp, tiff, svg, emf or wmf`);
+    }
+    const [startRef, endRef] = range2.split(":");
+    const start = refToRowCol(startRef ?? "");
+    const end = endRef ? refToRowCol(endRef) : start;
+    if (!start || !end) throw new Error(`Invalid cell range: ${range2}`);
+    const image = {
+      dataUrl,
+      // refToRowCol is 1-based; anchors are 0-based, and `br` is EXCLUSIVE — one
+      // past the last covered cell — so the end ref converts straight across
+      // while the start ref loses one.
+      // rowOff/colOff are pinned to 0 (not left undefined) so an authored image
+      // is structurally identical to a parsed one — every reader handles one shape.
+      tl: { row: Math.min(start.row, end.row) - 1, col: Math.min(start.col, end.col) - 1, rowOff: 0, colOff: 0 },
+      br: { row: Math.max(start.row, end.row), col: Math.max(start.col, end.col), rowOff: 0, colOff: 0 },
+      anchorKind: "twoCell"
+    };
+    this.images.push(image);
+    return image;
+  }
   /** Get cell, returning undefined for empty cells. */
   getCell(ref) {
     return this.cells.get(ref);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lotics/cli",
-  "version": "0.96.1",
+  "version": "0.96.2",
   "description": "Lotics SDK and CLI for AI agents",
   "type": "module",
   "bin": {