office-open 0.11.0 → 0.12.0

package/dist/convert/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","names":[],"sources":["../../src/convert/picture.ts","../../src/convert/shape.ts","../../src/convert/position.ts","../../src/convert/connector.ts","../../src/convert/group.ts","../../src/convert/table.ts","../../src/convert/smartart.ts","../../src/convert/text.ts"],"mappings":"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"}
+{"version":3,"file":"index.d.mts","names":[],"sources":["../../src/convert/picture.ts","../../src/convert/shape.ts","../../src/convert/position.ts","../../src/convert/connector.ts","../../src/convert/group.ts","../../src/convert/table.ts","../../src/convert/smartart.ts","../../src/convert/text.ts"],"mappings":";;;;;;iBAuHgB,cAAc,QAAQ,mBAAqB;iBAE3C,cAAc,QAAQ,mBAAqB;iBAuC3C,cAAc,QAAQ,iBAAqB;iBAE3C,cAAc,QAAQ,mBAAqB;iBAmC3C,cAAc,QAAQ,iBAAqB;iBAE3C,cAAc,QAAQ,mBAAqB;;;KClJ/C,mBAAmB;UAGd;EAEf,OAAO;EACP,UAAU;EACV,UAAU;EACV,YAAY;EACZ,UAAU;EACV,UAAU;;KAIP,gBAAgB,KAAK;EAA0B,OAAO;;iBAG3C,YAAY,UAAU,cAAc,QAAQ,IAAI;iBAehD,iBACd,GAAG,YAAY,oCACd;iBAQa,uBAAuB,UAAU,kBAAkB;iBAWnD,eACd,UAAU,iCACV,gBAAgB,oCACf;UAoCc;EACf,MAAM;EACN,gBAAgB;;iBA8BF,iBAAiB,QAAQ,iBAAmB,iBAAmB;iBA+C/D,YAAY,QAAQ,iBAAmB;iBAEvC,YAAY,QAAQ,iBAAmB;iBASvC,YAAY,QAAQ,mBAAmB;iBAEvC,YAAY,QAAQ,iBAAmB;iBA2CvC,YAAY,QAAQ,mBAAmB;iBAEvC,YAAY,QAAQ,iBAAmB;;;UCvPtC;EACf;EACA;EACA;EACA;EACA;EACA;EACA;;;;iBCdc,eACd,aAAa,8BACb,aAAa,8BACb,aAAa,8BACb,aAAa,+BACZ;iBAgBa,eAAe,KAAK;EAClC;EACA;EACA;EACA;;iBAiBc,gBAAgB,SAAS,mBAAuB;iBAQhD,gBAAgB,QAAQ,qBAAuB;iBA0B/C,gBAAgB,QAAQ,mBAAuB;;;iBCsG/C,YAAY,QAAQ,iBAAmB;iBAEvC,YAAY,QAAQ,iBAAmB;iBAsEvC,YAAY,QAAQ,eAAmB;iBAEvC,YAAY,QAAQ,iBAAmB;iBAgEvC,YAAY,QAAQ,eAAmB;iBAEvC,YAAY,QAAQ,iBAAmB;;;UCvRtC;EACf,MAAM;EACN,aAAa;EACb,UAAU;;iBAyMI,YAAY,QAAQ,iBAAmB;iBAEvC,YAAY,QAAQ,kBAAkB;iBAoEtC,YAAY,QAAQ,eAAmB;iBAEvC,YAAY,QAAQ,kBAAkB;iBA2DtC,YAAY,QAAQ,eAAmB;iBAEvC,YAAY,QAAQ,iBAAmB;;;iBCrVvC,eAAe,QAAQ,oBAAe;iBAqBtC,eAAe,QAAQ,kBAAe;;;iBC2BtC,qBAAqB,SAAS,6BAA6B;iBA2H3D,mBAAmB,MAAM,mBAAmB"}

package/dist/convert/index.mjs

@@ -1,4 +1,5 @@
 import { createTransformation } from "@office-open/docx";
+import { columnToLetter, letterToColumn } from "@office-open/xlsx";
 import { convertEmuToPoints, convertEmuToTwip, convertPointsToEmu, convertPointsToTwip, convertToEmu, convertToPt, convertToTwip, convertTwipToEmu, pickConnectorBase, pickGroupBase, pickNonVisualDrawingProperties, stripColorHashPrefix } from "@office-open/core";
 //#region src/convert/position.ts
 /**
@@ -159,12 +160,14 @@ function boxToDocx(box) {
 const baseFromPptx = (p) => ({
 	data: p.data,
 	type: p.type,
+	...p.sourceUrl !== void 0 ? { sourceUrl: p.sourceUrl } : {},
 	...pickNonVisualDrawingProperties(p)
 });
 /** Project an xlsx picture onto the shared base. */
 const baseFromXlsx = (x) => ({
 	data: x.data,
 	type: x.type,
+	...x.sourceUrl !== void 0 ? { sourceUrl: x.sourceUrl } : {},
 	...pickNonVisualDrawingProperties(x)
 });
 /**
@@ -183,6 +186,7 @@ const baseFromDocx = (d) => {
 	return {
 		data: d.data,
 		type: d.type,
+		...d.sourceUrl !== void 0 ? { sourceUrl: d.sourceUrl } : {},
 		...cNvPr
 	};
 };
@@ -231,6 +235,7 @@ function toDocxPicture(source) {
 		return {
 			type: docxType(base.type),
 			data: base.data,
+			...base.sourceUrl !== void 0 ? { sourceUrl: base.sourceUrl } : {},
 			transformation: {
 				width: p.width ?? 0,
 				height: p.height ?? 0,
@@ -247,6 +252,7 @@ function toDocxPicture(source) {
 	return {
 		type: docxType(base.type),
 		data: base.data,
+		...base.sourceUrl !== void 0 ? { sourceUrl: base.sourceUrl } : {},
 		transformation: {
 			width: 0,
 			height: 0,
@@ -266,6 +272,7 @@ function toPptxPicture(source) {
 		return {
 			type: pptxType(base.type),
 			data: base.data,
+			...base.sourceUrl !== void 0 ? { sourceUrl: base.sourceUrl } : {},
 			width: t.width,
 			height: t.height,
 			...t.offset ? {
@@ -280,6 +287,7 @@ function toPptxPicture(source) {
 	return {
 		type: pptxType(base.type),
 		data: base.data,
+		...base.sourceUrl !== void 0 ? { sourceUrl: base.sourceUrl } : {},
 		x: (x.col - 1) * DEFAULT_COL_EMU,
 		y: (x.row - 1) * DEFAULT_ROW_EMU,
 		width: 0,
@@ -296,6 +304,7 @@ function toXlsxPicture(source) {
 		return {
 			data: base.data,
 			type: xlsxType(base.type),
+			...base.sourceUrl !== void 0 ? { sourceUrl: base.sourceUrl } : {},
 			col: emuToCell(left, DEFAULT_COL_EMU),
 			row: emuToCell(top, DEFAULT_ROW_EMU),
 			...pickNonVisualDrawingProperties(base)
@@ -306,6 +315,7 @@ function toXlsxPicture(source) {
 	return {
 		data: base.data,
 		type: xlsxType(base.type),
+		...base.sourceUrl !== void 0 ? { sourceUrl: base.sourceUrl } : {},
 		col: emuToCell(toEmu(p.x), DEFAULT_COL_EMU),
 		row: emuToCell(toEmu(p.y), DEFAULT_ROW_EMU),
 		...pickNonVisualDrawingProperties(base)
@@ -349,7 +359,7 @@ function toXlsxPicture(source) {
 *   before/after   a:p spcPts (1/100 pt) ↔ w:p spacing (twips), ÷5 / ×5.
 *   line spacing   a:p lineSpacingPercent (percent, 100 = single) ↔ w:p line +
 *                  lineRule "auto" (240 = single); a:p lineSpacingPoints (pt)
-*                  ↔ line + lineRule "exactly" (×20).
+*                  ↔ line + lineRule "exact" (×20).
 *   indents/tabs   a:p marL/marR/pos (EMU) ↔ w:p (twips), ÷635 / ×635.
 *
 * @module
@@ -364,7 +374,7 @@ const AUTO_LINE_SINGLE = 240;
 const POINTS_PER_TWIP = 1 / 20;
 const round = Math.round;
 /** Discriminant keys of ParagraphChild variants that are NOT a text run. */
-const NON_RUN_KEYS = new Set([
+const NON_RUN_KEYS = /* @__PURE__ */ new Set([
 	"hyperlink",
 	"pageBreak",
 	"columnBreak",
@@ -473,8 +483,7 @@ function drawingRunPropertiesToDocx(run) {
 	if (run.underline && run.underline !== "none") out.underline = { type: run.underline };
 	if (run.strike === "singleStrike") out.strike = true;
 	else if (run.strike === "doubleStrike") out.doubleStrike = true;
-	if (run.baseline !== void 0 && run.baseline !== 0) if (run.baseline > 0) out.superScript = true;
-	else out.subScript = true;
+	if (run.baseline !== void 0 && run.baseline !== 0) out.verticalAlign = run.baseline > 0 ? "superscript" : "subscript";
 	if (run.spacing !== void 0) out.characterSpacing = round(run.spacing * TWIPS_PER_HUNDREDTH);
 	if (run.capitalization === "all") out.allCaps = true;
 	else if (run.capitalization === "small") out.smallCaps = true;
@@ -523,6 +532,7 @@ function docxToDrawingChildren(children) {
 			};
 			const subs = hl.children && hl.children.length ? hl.children : child.text !== void 0 ? [child.text] : [];
 			for (const sub of subs) {
+				if (typeof sub !== "string" && !isRunChild(sub)) continue;
 				const run = typeof sub === "string" ? { text: sub } : docxRunToDrawing(sub);
 				out.push({
 					...run,
@@ -551,8 +561,8 @@ function docxRunPropertiesToDrawing(run) {
 	if (run.underline?.type) out.underline = run.underline.type === "double" ? "double" : "single";
 	if (run.doubleStrike) out.strike = "doubleStrike";
 	else if (run.strike) out.strike = "singleStrike";
-	if (run.superScript) out.baseline = 3e4;
-	else if (run.subScript) out.baseline = -25e3;
+	if (run.verticalAlign === "superscript") out.baseline = 3e4;
+	else if (run.verticalAlign === "subscript") out.baseline = -25e3;
 	if (run.characterSpacing !== void 0) out.spacing = round(convertToTwip(run.characterSpacing) * HUNDREDTHS_PER_TWIP);
 	if (run.allCaps) out.capitalization = "all";
 	else if (run.smallCaps) out.capitalization = "small";
@@ -618,7 +628,7 @@ function spacingToDocx(props) {
 		sp.lineRule = "auto";
 	} else if (props.lineSpacingPoints !== void 0) {
 		sp.line = round(props.lineSpacingPoints / POINTS_PER_TWIP);
-		sp.lineRule = "exactly";
+		sp.lineRule = "exact";
 	}
 	return Object.keys(sp).length ? sp : void 0;
 }
@@ -663,9 +673,9 @@ function alignToDrawing(a) {
 }
 function fontAlignToDocx(f) {
 	switch (f) {
-		case "t": return "top";
-		case "ctr": return "center";
-		case "b": return "bottom";
+		case "top": return "top";
+		case "center": return "center";
+		case "bottom": return "bottom";
 		case "base": return "baseline";
 		case "auto": return "auto";
 		default: return;
@@ -673,9 +683,9 @@ function fontAlignToDocx(f) {
 }
 function fontAlignToDrawing(t) {
 	switch (t) {
-		case "top": return "t";
-		case "center": return "ctr";
-		case "bottom": return "b";
+		case "top": return "top";
+		case "center": return "center";
+		case "bottom": return "bottom";
 		case "baseline": return "base";
 		case "auto": return "auto";
 		default: return;
@@ -683,19 +693,19 @@ function fontAlignToDrawing(t) {
 }
 function tabAlignToDocx(a) {
 	switch (a) {
-		case "l": return "left";
-		case "ctr": return "center";
-		case "r": return "right";
-		case "dec": return "decimal";
+		case "left": return "left";
+		case "center": return "center";
+		case "right": return "right";
+		case "decimal": return "decimal";
 		default: return "left";
 	}
 }
 function tabAlignToDrawing(t) {
 	switch (t) {
-		case "left": return "l";
-		case "center": return "ctr";
-		case "right": return "r";
-		case "decimal": return "dec";
+		case "left": return "left";
+		case "center": return "center";
+		case "right": return "right";
+		case "decimal": return "decimal";
 		default: return;
 	}
 }
@@ -764,7 +774,7 @@ function isRunChild(child) {
 /** Copy the shared shape-content fields that are present on the source. */
 function pickContent(source) {
 	const out = {};
-	if (source.fill !== void 0) out.fill = source.fill;
+	if (source.fill !== void 0 && source.fill !== null) out.fill = source.fill;
 	if (source.outline !== void 0) out.outline = source.outline;
 	if (source.effects !== void 0) out.effects = source.effects;
 	if (source.effectDag !== void 0) out.effectDag = source.effectDag;
@@ -772,7 +782,7 @@ function pickContent(source) {
 	if (source.shape3d !== void 0) out.shape3d = source.shape3d;
 	return out;
 }
-/** pptx/xlsx geometry shorthand (string | PresetGeometryOptions) → docx preset. */
+/** pptx/xlsx geometry shorthand (ShapeType | PresetGeometryOptions) → docx preset. */
 function toPresetGeometry(g) {
 	if (g === void 0) return void 0;
 	return typeof g === "string" ? { preset: g } : g;
@@ -788,8 +798,9 @@ function textBodyToDocxChildren(textBody) {
 /** docx w:p children + bodyProperties → DrawingML text body (a:p), or undefined when empty. */
 function docxToTextBody(children, bodyProperties) {
 	const paragraphs = [];
-	for (const c of children ?? []) if (typeof c === "string") paragraphs.push(c);
-	else paragraphs.push(toDrawingParagraph(c));
+	for (const child of children ?? []) if (typeof child === "string") paragraphs.push(child);
+	else if ("paragraph" in child) paragraphs.push(typeof child.paragraph === "string" ? child.paragraph : toDrawingParagraph(child.paragraph));
+	else if (!("table" in child || "toc" in child || "textbox" in child || "sdt" in child || "altChunk" in child || "subDoc" in child || "customXml" in child || "bookmarkStart" in child || "bookmarkEnd" in child || "rawXml" in child)) paragraphs.push(toDrawingParagraph(child));
 	if (paragraphs.length === 0 && bodyProperties === void 0) return void 0;
 	const out = {};
 	if (paragraphs.length > 0) out.paragraphs = paragraphs;
@@ -1340,6 +1351,19 @@ function docxGroupChildrenToXlsx(children) {
 */
 /** Heuristic EMU per character of column width (8.43 chars ≈ DEFAULT_COL_EMU). */
 const EMU_PER_CHAR = DEFAULT_COL_EMU / 8.43;
+/** Parse a merge ref ("A1:D1") into 0-based row/col corners. */
+function parseMergeRef(ref) {
+	const [from = "", to = from] = ref.split(":");
+	const fa = from.match(/^([A-Z]+)(\d+)$/);
+	const fb = to.match(/^([A-Z]+)(\d+)$/);
+	if (!fa || !fb) return void 0;
+	return {
+		row: Number(fa[2]) - 1,
+		col: letterToColumn(fa[1]) - 1,
+		rowEnd: Number(fb[2]) - 1,
+		colEnd: letterToColumn(fb[1]) - 1
+	};
+}
 const emuToCharWidth = (emu) => emu / EMU_PER_CHAR;
 const charWidthToEmu = (chars) => chars * EMU_PER_CHAR;
 /** docx height value (twip number or UM) → EMU. */
@@ -1432,7 +1456,7 @@ const SCHEME_TO_THEME = {
 	folHlink: "followedHyperlink"
 };
 /** pptx FillOptions (a:fill) → docx ShadingProperties (w:shd). RGB hex and
-*  RgbColorOptions → @fill; SchemeColorOptions → @themeColor (token mapped);
+*  RgbColorOptions → `@fill`; SchemeColorOptions → `@themeColor` (token mapped);
 *  hsl/system/preset/scRgb/phClr and color transforms → dropped (docx shading
 *  is RGB-hex or theme-color only). */
 function pptxFillToDocxShading(fill) {
@@ -1478,14 +1502,14 @@ function pptxToDocx(src) {
 	};
 }
 function xlsxToDocx(src) {
-	const merges = src.mergeCells ?? [];
+	const merges = (src.mergeCells ?? []).map((m) => parseMergeRef(m.ref)).filter((m) => m !== void 0);
 	return {
 		rows: src.rows.map((row, ri) => ({
 			...row.height !== void 0 ? { height: { value: convertPointsToTwip(convertToPt(row.height)) } } : {},
 			cells: (row.cells ?? []).map((cell, ci) => {
-				const merge = merges.find((m) => m.from.row === ri && m.from.col === ci);
-				const columnSpan = merge ? merge.to.col - merge.from.col + 1 : void 0;
-				const rowSpan = merge ? merge.to.row - merge.from.row + 1 : void 0;
+				const merge = merges.find((m) => m.row === ri && m.col === ci);
+				const columnSpan = merge ? merge.colEnd - merge.col + 1 : void 0;
+				const rowSpan = merge ? merge.rowEnd - merge.row + 1 : void 0;
 				const text = cellValueToText(cell.value);
 				return {
 					children: text !== void 0 ? [{ paragraph: { children: [{ text }] } }] : [],
@@ -1522,14 +1546,14 @@ function docxToPptx(src) {
 	};
 }
 function xlsxToPptx(src) {
-	const merges = src.mergeCells ?? [];
+	const merges = (src.mergeCells ?? []).map((m) => parseMergeRef(m.ref)).filter((m) => m !== void 0);
 	return {
 		rows: src.rows.map((row, ri) => ({
 			...row.height !== void 0 ? { height: convertPointsToEmu(convertToPt(row.height)) } : {},
 			cells: (row.cells ?? []).map((cell, ci) => {
-				const merge = merges.find((m) => m.from.row === ri && m.from.col === ci);
-				const columnSpan = merge ? merge.to.col - merge.from.col + 1 : void 0;
-				const rowSpan = merge ? merge.to.row - merge.from.row + 1 : void 0;
+				const merge = merges.find((m) => m.row === ri && m.col === ci);
+				const columnSpan = merge ? merge.colEnd - merge.col + 1 : void 0;
+				const rowSpan = merge ? merge.rowEnd - merge.row + 1 : void 0;
 				const text = cellValueToText(cell.value);
 				return {
 					...text !== void 0 ? { text } : {},
@@ -1580,16 +1604,7 @@ function docxToXlsx(src) {
 			}
 			const span = cell.columnSpan ?? 1;
 			const rspan = cell.rowSpan ?? 1;
-			if (span > 1 || rspan > 1) mergeCells.push({
-				from: {
-					row: ri,
-					col: ci
-				},
-				to: {
-					row: ri + rspan - 1,
-					col: ci + span - 1
-				}
-			});
+			if (span > 1 || rspan > 1) mergeCells.push({ ref: `${columnToLetter(ci + 1)}${ri + 1}:${columnToLetter(ci + span)}${ri + rspan}` });
 			const value = docxCellText(cell);
 			ci += span;
 			return value !== void 0 ? { value } : {};
@@ -1615,16 +1630,7 @@ function pptxToXlsx(src) {
 		const xrow = { cells: row.cells.map((cell) => {
 			const span = cell.columnSpan ?? 1;
 			const rspan = cell.rowSpan ?? 1;
-			if (span > 1 || rspan > 1) mergeCells.push({
-				from: {
-					row: ri,
-					col: ci
-				},
-				to: {
-					row: ri + rspan - 1,
-					col: ci + span - 1
-				}
-			});
+			if (span > 1 || rspan > 1) mergeCells.push({ ref: `${columnToLetter(ci + 1)}${ri + 1}:${columnToLetter(ci + span)}${ri + rspan}` });
 			const value = pptxCellText(cell);
 			ci += span;
 			return value !== void 0 ? { value } : {};
@@ -1688,7 +1694,7 @@ const altTextFromCnvPr = (cNvPr) => {
 function toDocxSmartArt(source) {
 	const box = boxFromPptx(source.x, source.y, source.width, source.height);
 	return {
-		data: { nodes: toDocxNodes(source.nodes) },
+		nodes: toDocxNodes(source.nodes),
 		transformation: {
 			width: box.width,
 			height: box.height,
@@ -1707,7 +1713,7 @@ function toDocxSmartArt(source) {
 function toPptxSmartArt(source) {
 	const pos = boxToPptx(boxFromDocx(source.transformation));
 	return {
-		nodes: toTreeNodes(source.data.nodes),
+		nodes: toTreeNodes(source.nodes),
 		x: pos.x,
 		y: pos.y,
 		width: pos.width,