js.documents 1.65.0 → 1.67.0

package/dist/edit/docx/paragraph.d.ts

@@ -1,9 +1,9 @@
 import { r as MathMlNode$1 } from "../../nodes-pArN9ilm.js";
 import { t as OmmlWriteResult } from "../../write-THs7ipBq.js";
-import { n as MediaContext, t as ImageInit } from "../../image-BfRLAD9B.js";
-import { n as RunInit, t as DocxRun } from "../../run-D2rTWHbt.js";
+import { n as MediaContext, t as ImageInit } from "../../image-DRqXQmEg.js";
+import { n as RunInit, t as DocxRun } from "../../run-BhYv2wJf.js";
 import { Package, XmlElement, XmlNode } from "ooxml.js";
-import { ContentListMembership } from "document-schema.js";
+import { ContentListMembership, ContentVector } from "document-schema.js";
 //#region src/edit/docx/paragraph.d.ts
 interface ParagraphInit {
   readonly text?: string;
@@ -37,6 +37,7 @@ declare class DocxParagraph {
   appendOfficeMath(mathml: readonly MathMlNode$1[]): OmmlWriteResult & {
     readonly written: boolean;
   };
+  appendVectorAnchors(vectors: readonly ContentVector[]): void;
   insertImageAfter(image: ImageInit): void;
   remove(): void;
 }

package/dist/edit/docx/paragraph.js

@@ -1,10 +1,11 @@
 import { el } from "../../xml/fragment.js";
 import { buildOfficeMathParagraph } from "../../omml/write.js";
 import { getOrCreateChildElement, removeChild } from "../../xml/edit.js";
-import { insertImageMedia } from "./image.js";
+import { insertImageMedia, nextDrawingId } from "./image.js";
 import { PPR_ORDER, ensureFirstChild, getAlignment, getStyleId, setAlignment, setStyleId } from "./props.js";
-import { DocxRun, buildRun } from "./run.js";
-import { attr, textContent } from "ooxml.js";
+import { DocxRun, buildRun, wordprocessingText } from "./run.js";
+import { buildAnchoredVectorDrawing } from "./vector.js";
+import { attr } from "ooxml.js";
 //#region src/edit/docx/paragraph.ts
 function directChild(parent, tag) {
 	for (const child of parent.children) if (child.type === "element" && child.tag === tag) return child;
@@ -28,7 +29,7 @@ var DocxParagraph = class {
 		return create ? ensureFirstChild(node, "w:pPr") : directChild(node, "w:pPr");
 	}
 	get text() {
-		return textContent(this.live());
+		return wordprocessingText(this.live());
 	}
 	runs() {
 		const node = this.live();
@@ -117,6 +118,14 @@ var DocxParagraph = class {
 			written: true
 		};
 	}
+	appendVectorAnchors(vectors) {
+		const node = this.live();
+		if (this.imageContext === void 0) throw new Error("appendVectorAnchors requires a paragraph opened through a DocxEditor");
+		const { documentRoot } = this.imageContext;
+		vectors.forEach((vector, index) => {
+			node.children.push(el("w:r", {}, [buildAnchoredVectorDrawing(vector, nextDrawingId(documentRoot), index)]));
+		});
+	}
 	insertImageAfter(image) {
 		const node = this.live();
 		if (this.imageContext === void 0) throw new Error("insertImageAfter requires a paragraph opened through a DocxEditor");

package/dist/edit/docx/props.d.ts

@@ -1,4 +1,4 @@
-import { n as LayoutColor } from "../../color-Bo228AY2.js";
+import { n as LayoutColor } from "../../color-C98dn-pT.js";
 import { XmlElement } from "ooxml.js";
 //#region src/edit/docx/props.d.ts
 declare const RPR_ORDER: readonly string[];

package/dist/edit/docx/run.cjs

@@ -3,9 +3,15 @@ const require_xml_fragment = require("../../xml/fragment.cjs");
 const require_xml_entities = require("../../xml/entities.cjs");
 const require_xml_edit = require("../../xml/edit.cjs");
 const require_edit_docx_props = require("./props.cjs");
+const require_xml_query = require("../../xml/query.cjs");
 let ooxml_js = require("ooxml.js");
 let document_schema_js = require("document-schema.js");
 //#region src/edit/docx/run.ts
+function wordprocessingText(element) {
+	let out = "";
+	for (const cursor of require_xml_query.walkElements([element])) if (cursor.node.tag === "w:t") out += (0, ooxml_js.textContent)(cursor.node);
+	return out;
+}
 function directChild(parent, tag) {
 	for (const child of parent.children) if (child.type === "element" && child.tag === tag) return child;
 }
@@ -38,7 +44,7 @@ var DocxRun = class {
 		return create ? require_edit_docx_props.ensureFirstChild(node, "w:rPr") : directChild(node, "w:rPr");
 	}
 	get text() {
-		return (0, ooxml_js.textContent)(this.live());
+		return wordprocessingText(this.live());
 	}
 	set text(value) {
 		const tNode = findOrCreateT(this.live());
@@ -141,3 +147,4 @@ function buildRun(init = {}) {
 //#endregion
 exports.DocxRun = DocxRun;
 exports.buildRun = buildRun;
+exports.wordprocessingText = wordprocessingText;

package/dist/edit/docx/run.d.cts

@@ -1,2 +1,2 @@
-import { n as RunInit, r as buildRun, t as DocxRun } from "../../run-B3GNScJH.cjs";
-export { DocxRun, RunInit, buildRun };
+import { i as wordprocessingText, n as RunInit, r as buildRun, t as DocxRun } from "../../run-P0b2pDdX.cjs";
+export { DocxRun, RunInit, buildRun, wordprocessingText };

package/dist/edit/docx/run.d.ts

@@ -1,2 +1,2 @@
-import { n as RunInit, r as buildRun, t as DocxRun } from "../../run-D2rTWHbt.js";
-export { DocxRun, RunInit, buildRun };
+import { i as wordprocessingText, n as RunInit, r as buildRun, t as DocxRun } from "../../run-BhYv2wJf.js";
+export { DocxRun, RunInit, buildRun, wordprocessingText };

package/dist/edit/docx/run.js

@@ -3,8 +3,14 @@ import { el, txt } from "../../xml/fragment.js";
 import { encodeXmlText, needsSpacePreserve } from "../../xml/entities.js";
 import { removeChild, setAttr } from "../../xml/edit.js";
 import { RPR_ORDER, ensureFirstChild, getColor, getFontFamily, getSizePt, getToggle, setColor, setFontFamily, setSizePt, setToggle } from "./props.js";
+import { walkElements } from "../../xml/query.js";
 import { textContent } from "ooxml.js";
 //#region src/edit/docx/run.ts
+function wordprocessingText(element) {
+	let out = "";
+	for (const cursor of walkElements([element])) if (cursor.node.tag === "w:t") out += textContent(cursor.node);
+	return out;
+}
 function directChild(parent, tag) {
 	for (const child of parent.children) if (child.type === "element" && child.tag === tag) return child;
 }
@@ -37,7 +43,7 @@ var DocxRun = class {
 		return create ? ensureFirstChild(node, "w:rPr") : directChild(node, "w:rPr");
 	}
 	get text() {
-		return textContent(this.live());
+		return wordprocessingText(this.live());
 	}
 	set text(value) {
 		const tNode = findOrCreateT(this.live());
@@ -138,4 +144,4 @@ function buildRun(init = {}) {
 	return run;
 }
 //#endregion
-export { DocxRun, buildRun };
+export { DocxRun, buildRun, wordprocessingText };

package/dist/edit/docx/vector.cjs

@@ -0,0 +1,69 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_xml_fragment = require("../../xml/fragment.cjs");
+const require_model_units = require("../../model/units.cjs");
+const require_edit_drawingml_vector = require("../drawingml/vector.cjs");
+//#region src/edit/docx/vector.ts
+const DRAWING_NS = {
+	wp: "http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing",
+	a: "http://schemas.openxmlformats.org/drawingml/2006/main",
+	wps: "http://schemas.microsoft.com/office/word/2010/wordprocessingShape"
+};
+const ANCHOR_ATTRS = {
+	distT: "0",
+	distB: "0",
+	distL: "0",
+	distR: "0",
+	simplePos: "0",
+	locked: "0",
+	layoutInCell: "1",
+	allowOverlap: "1",
+	behindDoc: "1"
+};
+function position(tag, offsetPt) {
+	return require_xml_fragment.el(tag, { relativeFrom: "page" }, [require_xml_fragment.el("wp:posOffset", {}, [require_xml_fragment.txt(String(require_model_units.ptToEmu(offsetPt)))])]);
+}
+function buildAnchoredVectorDrawing(vector, drawingId, relativeHeight) {
+	const frame = require_edit_drawingml_vector.vectorPlacementBox(vector);
+	const cx = String(require_model_units.ptToEmu(frame.widthPt));
+	const cy = String(require_model_units.ptToEmu(frame.heightPt));
+	const name = require_edit_drawingml_vector.vectorShapeName(vector, drawingId);
+	const wsp = require_xml_fragment.el("wps:wsp", {}, [
+		require_xml_fragment.el("wps:cNvSpPr"),
+		require_xml_fragment.el("wps:spPr", {}, require_edit_drawingml_vector.buildVectorShapeProperties(vector)),
+		require_xml_fragment.el("wps:bodyPr")
+	]);
+	const anchor = require_xml_fragment.el("wp:anchor", {
+		...ANCHOR_ATTRS,
+		relativeHeight: String(relativeHeight)
+	}, [
+		require_xml_fragment.el("wp:simplePos", {
+			x: "0",
+			y: "0"
+		}),
+		position("wp:positionH", frame.xPt),
+		position("wp:positionV", frame.yPt),
+		require_xml_fragment.el("wp:extent", {
+			cx,
+			cy
+		}),
+		require_xml_fragment.el("wp:effectExtent", {
+			l: "0",
+			t: "0",
+			r: "0",
+			b: "0"
+		}),
+		require_xml_fragment.el("wp:wrapNone"),
+		require_xml_fragment.el("wp:docPr", {
+			id: String(drawingId),
+			name
+		}),
+		require_xml_fragment.el("a:graphic", {}, [require_xml_fragment.el("a:graphicData", { uri: DRAWING_NS.wps }, [wsp])])
+	]);
+	return require_xml_fragment.el("w:drawing", {
+		"xmlns:wp": DRAWING_NS.wp,
+		"xmlns:a": DRAWING_NS.a,
+		"xmlns:wps": DRAWING_NS.wps
+	}, [anchor]);
+}
+//#endregion
+exports.buildAnchoredVectorDrawing = buildAnchoredVectorDrawing;

package/dist/edit/docx/vector.d.cts

@@ -0,0 +1,6 @@
+import { ContentVector } from "document-schema.js";
+import { XmlElement } from "ooxml.js";
+//#region src/edit/docx/vector.d.ts
+declare function buildAnchoredVectorDrawing(vector: ContentVector, drawingId: number, relativeHeight: number): XmlElement;
+//#endregion
+export { buildAnchoredVectorDrawing };

package/dist/edit/docx/vector.d.ts

@@ -0,0 +1,6 @@
+import { XmlElement } from "ooxml.js";
+import { ContentVector } from "document-schema.js";
+//#region src/edit/docx/vector.d.ts
+declare function buildAnchoredVectorDrawing(vector: ContentVector, drawingId: number, relativeHeight: number): XmlElement;
+//#endregion
+export { buildAnchoredVectorDrawing };

package/dist/edit/docx/vector.js

@@ -0,0 +1,68 @@
+import { el, txt } from "../../xml/fragment.js";
+import { ptToEmu } from "../../model/units.js";
+import { buildVectorShapeProperties, vectorPlacementBox, vectorShapeName } from "../drawingml/vector.js";
+//#region src/edit/docx/vector.ts
+const DRAWING_NS = {
+	wp: "http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing",
+	a: "http://schemas.openxmlformats.org/drawingml/2006/main",
+	wps: "http://schemas.microsoft.com/office/word/2010/wordprocessingShape"
+};
+const ANCHOR_ATTRS = {
+	distT: "0",
+	distB: "0",
+	distL: "0",
+	distR: "0",
+	simplePos: "0",
+	locked: "0",
+	layoutInCell: "1",
+	allowOverlap: "1",
+	behindDoc: "1"
+};
+function position(tag, offsetPt) {
+	return el(tag, { relativeFrom: "page" }, [el("wp:posOffset", {}, [txt(String(ptToEmu(offsetPt)))])]);
+}
+function buildAnchoredVectorDrawing(vector, drawingId, relativeHeight) {
+	const frame = vectorPlacementBox(vector);
+	const cx = String(ptToEmu(frame.widthPt));
+	const cy = String(ptToEmu(frame.heightPt));
+	const name = vectorShapeName(vector, drawingId);
+	const wsp = el("wps:wsp", {}, [
+		el("wps:cNvSpPr"),
+		el("wps:spPr", {}, buildVectorShapeProperties(vector)),
+		el("wps:bodyPr")
+	]);
+	const anchor = el("wp:anchor", {
+		...ANCHOR_ATTRS,
+		relativeHeight: String(relativeHeight)
+	}, [
+		el("wp:simplePos", {
+			x: "0",
+			y: "0"
+		}),
+		position("wp:positionH", frame.xPt),
+		position("wp:positionV", frame.yPt),
+		el("wp:extent", {
+			cx,
+			cy
+		}),
+		el("wp:effectExtent", {
+			l: "0",
+			t: "0",
+			r: "0",
+			b: "0"
+		}),
+		el("wp:wrapNone"),
+		el("wp:docPr", {
+			id: String(drawingId),
+			name
+		}),
+		el("a:graphic", {}, [el("a:graphicData", { uri: DRAWING_NS.wps }, [wsp])])
+	]);
+	return el("w:drawing", {
+		"xmlns:wp": DRAWING_NS.wp,
+		"xmlns:a": DRAWING_NS.a,
+		"xmlns:wps": DRAWING_NS.wps
+	}, [anchor]);
+}
+//#endregion
+export { buildAnchoredVectorDrawing };

package/dist/edit/drawingml/vector.cjs

@@ -0,0 +1,113 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_xml_fragment = require("../../xml/fragment.cjs");
+const require_model_units = require("../../model/units.cjs");
+let document_schema_js = require("document-schema.js");
+//#region src/edit/drawingml/vector.ts
+function drawingMlColorHex(color) {
+	return (0, document_schema_js.colorToRgbHex)(color).toUpperCase();
+}
+function solidFillOrNone(fill) {
+	return fill === void 0 ? require_xml_fragment.el("a:noFill") : require_xml_fragment.el("a:solidFill", {}, [require_xml_fragment.el("a:srgbClr", { val: drawingMlColorHex(fill) })]);
+}
+function outline(stroke) {
+	if (stroke === void 0) return require_xml_fragment.el("a:ln", {}, [require_xml_fragment.el("a:noFill")]);
+	return require_xml_fragment.el("a:ln", { w: String(require_model_units.ptToEmu(stroke.widthPt)) }, [require_xml_fragment.el("a:solidFill", {}, [require_xml_fragment.el("a:srgbClr", { val: drawingMlColorHex(stroke.color) })])]);
+}
+function placementOf(vector) {
+	if (vector.kind !== "line") return {
+		frame: vector.frame,
+		flipH: false,
+		flipV: false
+	};
+	const { from, to } = vector;
+	return {
+		frame: {
+			xPt: Math.min(from.xPt, to.xPt),
+			yPt: Math.min(from.yPt, to.yPt),
+			widthPt: Math.abs(to.xPt - from.xPt),
+			heightPt: Math.abs(to.yPt - from.yPt)
+		},
+		flipH: to.xPt < from.xPt,
+		flipV: to.yPt < from.yPt
+	};
+}
+const ROTATION_UNITS_PER_DEGREE = 6e4;
+function transform(placement, rotationDeg) {
+	const attrs = {};
+	if (rotationDeg !== void 0 && rotationDeg !== 0) attrs.rot = String(Math.round(rotationDeg * ROTATION_UNITS_PER_DEGREE));
+	if (placement.flipH) attrs.flipH = "1";
+	if (placement.flipV) attrs.flipV = "1";
+	return require_xml_fragment.el("a:xfrm", attrs, [require_xml_fragment.el("a:off", {
+		x: String(require_model_units.ptToEmu(placement.frame.xPt)),
+		y: String(require_model_units.ptToEmu(placement.frame.yPt))
+	}), require_xml_fragment.el("a:ext", {
+		cx: String(require_model_units.ptToEmu(placement.frame.widthPt)),
+		cy: String(require_model_units.ptToEmu(placement.frame.heightPt))
+	})]);
+}
+function pt(xPt, yPt) {
+	return require_xml_fragment.el("a:pt", {
+		x: String(require_model_units.ptToEmu(xPt)),
+		y: String(require_model_units.ptToEmu(yPt))
+	});
+}
+function customGeometry(frame, subpaths) {
+	const paths = subpaths.map((subpath) => {
+		const commands = [require_xml_fragment.el("a:moveTo", {}, [pt(subpath.start.xPt, subpath.start.yPt)])];
+		for (const segment of subpath.segments) if (segment.kind === "line") commands.push(require_xml_fragment.el("a:lnTo", {}, [pt(segment.to.xPt, segment.to.yPt)]));
+		else commands.push(require_xml_fragment.el("a:cubicBezTo", {}, [
+			pt(segment.control1.xPt, segment.control1.yPt),
+			pt(segment.control2.xPt, segment.control2.yPt),
+			pt(segment.to.xPt, segment.to.yPt)
+		]));
+		if (subpath.closed) commands.push(require_xml_fragment.el("a:close"));
+		return require_xml_fragment.el("a:path", {
+			w: String(require_model_units.ptToEmu(frame.widthPt)),
+			h: String(require_model_units.ptToEmu(frame.heightPt))
+		}, commands);
+	});
+	return require_xml_fragment.el("a:custGeom", {}, [
+		require_xml_fragment.el("a:avLst"),
+		require_xml_fragment.el("a:gdLst"),
+		require_xml_fragment.el("a:ahLst"),
+		require_xml_fragment.el("a:cxnLst"),
+		require_xml_fragment.el("a:rect", {
+			l: "0",
+			t: "0",
+			r: "r",
+			b: "b"
+		}),
+		require_xml_fragment.el("a:pathLst", {}, paths)
+	]);
+}
+const PRESET_BY_KIND = {
+	rect: "rect",
+	ellipse: "ellipse",
+	line: "line"
+};
+function geometry(vector) {
+	if (vector.kind === "path") return customGeometry(vector.frame, vector.subpaths);
+	return require_xml_fragment.el("a:prstGeom", { prst: PRESET_BY_KIND[vector.kind] }, [require_xml_fragment.el("a:avLst")]);
+}
+function buildVectorShapeProperties(vector) {
+	const placement = placementOf(vector);
+	const fill = vector.kind === "line" ? void 0 : vector.fill;
+	const stroke = vector.stroke;
+	return [
+		transform(placement, vector.kind === "line" ? void 0 : vector.rotationDeg),
+		geometry(vector),
+		solidFillOrNone(fill),
+		outline(stroke)
+	];
+}
+function vectorPlacementBox(vector) {
+	return placementOf(vector).frame;
+}
+function vectorShapeName(vector, id) {
+	return `${vector.kind.charAt(0).toUpperCase()}${vector.kind.slice(1)} ${id}`;
+}
+//#endregion
+exports.buildVectorShapeProperties = buildVectorShapeProperties;
+exports.drawingMlColorHex = drawingMlColorHex;
+exports.vectorPlacementBox = vectorPlacementBox;
+exports.vectorShapeName = vectorShapeName;

package/dist/edit/drawingml/vector.d.cts

@@ -0,0 +1,9 @@
+import { Box, Color, ContentVector } from "document-schema.js";
+import { XmlNode } from "ooxml.js";
+//#region src/edit/drawingml/vector.d.ts
+declare function drawingMlColorHex(color: Color): string;
+declare function buildVectorShapeProperties(vector: ContentVector): XmlNode[];
+declare function vectorPlacementBox(vector: ContentVector): Box;
+declare function vectorShapeName(vector: ContentVector, id: number): string;
+//#endregion
+export { buildVectorShapeProperties, drawingMlColorHex, vectorPlacementBox, vectorShapeName };

package/dist/edit/drawingml/vector.d.ts

@@ -0,0 +1,9 @@
+import { XmlNode } from "ooxml.js";
+import { Box, Color, ContentVector } from "document-schema.js";
+//#region src/edit/drawingml/vector.d.ts
+declare function drawingMlColorHex(color: Color): string;
+declare function buildVectorShapeProperties(vector: ContentVector): XmlNode[];
+declare function vectorPlacementBox(vector: ContentVector): Box;
+declare function vectorShapeName(vector: ContentVector, id: number): string;
+//#endregion
+export { buildVectorShapeProperties, drawingMlColorHex, vectorPlacementBox, vectorShapeName };

package/dist/edit/drawingml/vector.js

@@ -0,0 +1,109 @@
+import { el } from "../../xml/fragment.js";
+import { ptToEmu } from "../../model/units.js";
+import { colorToRgbHex } from "document-schema.js";
+//#region src/edit/drawingml/vector.ts
+function drawingMlColorHex(color) {
+	return colorToRgbHex(color).toUpperCase();
+}
+function solidFillOrNone(fill) {
+	return fill === void 0 ? el("a:noFill") : el("a:solidFill", {}, [el("a:srgbClr", { val: drawingMlColorHex(fill) })]);
+}
+function outline(stroke) {
+	if (stroke === void 0) return el("a:ln", {}, [el("a:noFill")]);
+	return el("a:ln", { w: String(ptToEmu(stroke.widthPt)) }, [el("a:solidFill", {}, [el("a:srgbClr", { val: drawingMlColorHex(stroke.color) })])]);
+}
+function placementOf(vector) {
+	if (vector.kind !== "line") return {
+		frame: vector.frame,
+		flipH: false,
+		flipV: false
+	};
+	const { from, to } = vector;
+	return {
+		frame: {
+			xPt: Math.min(from.xPt, to.xPt),
+			yPt: Math.min(from.yPt, to.yPt),
+			widthPt: Math.abs(to.xPt - from.xPt),
+			heightPt: Math.abs(to.yPt - from.yPt)
+		},
+		flipH: to.xPt < from.xPt,
+		flipV: to.yPt < from.yPt
+	};
+}
+const ROTATION_UNITS_PER_DEGREE = 6e4;
+function transform(placement, rotationDeg) {
+	const attrs = {};
+	if (rotationDeg !== void 0 && rotationDeg !== 0) attrs.rot = String(Math.round(rotationDeg * ROTATION_UNITS_PER_DEGREE));
+	if (placement.flipH) attrs.flipH = "1";
+	if (placement.flipV) attrs.flipV = "1";
+	return el("a:xfrm", attrs, [el("a:off", {
+		x: String(ptToEmu(placement.frame.xPt)),
+		y: String(ptToEmu(placement.frame.yPt))
+	}), el("a:ext", {
+		cx: String(ptToEmu(placement.frame.widthPt)),
+		cy: String(ptToEmu(placement.frame.heightPt))
+	})]);
+}
+function pt(xPt, yPt) {
+	return el("a:pt", {
+		x: String(ptToEmu(xPt)),
+		y: String(ptToEmu(yPt))
+	});
+}
+function customGeometry(frame, subpaths) {
+	const paths = subpaths.map((subpath) => {
+		const commands = [el("a:moveTo", {}, [pt(subpath.start.xPt, subpath.start.yPt)])];
+		for (const segment of subpath.segments) if (segment.kind === "line") commands.push(el("a:lnTo", {}, [pt(segment.to.xPt, segment.to.yPt)]));
+		else commands.push(el("a:cubicBezTo", {}, [
+			pt(segment.control1.xPt, segment.control1.yPt),
+			pt(segment.control2.xPt, segment.control2.yPt),
+			pt(segment.to.xPt, segment.to.yPt)
+		]));
+		if (subpath.closed) commands.push(el("a:close"));
+		return el("a:path", {
+			w: String(ptToEmu(frame.widthPt)),
+			h: String(ptToEmu(frame.heightPt))
+		}, commands);
+	});
+	return el("a:custGeom", {}, [
+		el("a:avLst"),
+		el("a:gdLst"),
+		el("a:ahLst"),
+		el("a:cxnLst"),
+		el("a:rect", {
+			l: "0",
+			t: "0",
+			r: "r",
+			b: "b"
+		}),
+		el("a:pathLst", {}, paths)
+	]);
+}
+const PRESET_BY_KIND = {
+	rect: "rect",
+	ellipse: "ellipse",
+	line: "line"
+};
+function geometry(vector) {
+	if (vector.kind === "path") return customGeometry(vector.frame, vector.subpaths);
+	return el("a:prstGeom", { prst: PRESET_BY_KIND[vector.kind] }, [el("a:avLst")]);
+}
+function buildVectorShapeProperties(vector) {
+	const placement = placementOf(vector);
+	const fill = vector.kind === "line" ? void 0 : vector.fill;
+	const stroke = vector.stroke;
+	return [
+		transform(placement, vector.kind === "line" ? void 0 : vector.rotationDeg),
+		geometry(vector),
+		solidFillOrNone(fill),
+		outline(stroke)
+	];
+}
+function vectorPlacementBox(vector) {
+	return placementOf(vector).frame;
+}
+function vectorShapeName(vector, id) {
+	return `${vector.kind.charAt(0).toUpperCase()}${vector.kind.slice(1)} ${id}`;
+}
+//#endregion
+export { buildVectorShapeProperties, drawingMlColorHex, vectorPlacementBox, vectorShapeName };

package/dist/edit/odg/content.cjs

@@ -11,36 +11,11 @@ function buildOdgPackage(content) {
 	if (firstPage !== void 0) editor.pageSize = firstPage.size;
 	for (const page of content.pages) {
 		const odgPage = editor.addPage();
-		for (const entry of require_model_paint_order.mergeByPaintOrder(page.vectors, page.shapes)) if (entry.kind === "vector") appendVector(odgPage, entry.value);
+		for (const entry of require_model_paint_order.mergeByPaintOrder(page.vectors, page.shapes)) if (entry.kind === "vector") odgPage.addVector(entry.value);
 		else appendShape(odgPage, entry.value);
 	}
 	return editor.toPackage();
 }
-function appendVector(page, vector) {
-	if (vector.kind === "line") {
-		page.addLine({
-			from: vector.from,
-			to: vector.to,
-			stroke: vector.stroke
-		});
-		return;
-	}
-	const built = vector.kind === "rect" ? page.addRect({
-		frame: vector.frame,
-		fill: vector.fill,
-		stroke: vector.stroke
-	}) : vector.kind === "ellipse" ? page.addEllipse({
-		frame: vector.frame,
-		fill: vector.fill,
-		stroke: vector.stroke
-	}) : page.addPath({
-		frame: vector.frame,
-		subpaths: vector.subpaths,
-		fill: vector.fill,
-		stroke: vector.stroke
-	});
-	if (vector.rotationDeg !== void 0) built.rotationDeg = vector.rotationDeg;
-}
 function appendShape(page, shape) {
 	const [onlyBlock] = shape.blocks;
 	if (shape.blocks.length === 1 && onlyBlock?.kind === "image") {

package/dist/edit/odg/content.js

@@ -10,36 +10,11 @@ function buildOdgPackage(content) {
 	if (firstPage !== void 0) editor.pageSize = firstPage.size;
 	for (const page of content.pages) {
 		const odgPage = editor.addPage();
-		for (const entry of mergeByPaintOrder(page.vectors, page.shapes)) if (entry.kind === "vector") appendVector(odgPage, entry.value);
+		for (const entry of mergeByPaintOrder(page.vectors, page.shapes)) if (entry.kind === "vector") odgPage.addVector(entry.value);
 		else appendShape(odgPage, entry.value);
 	}
 	return editor.toPackage();
 }
-function appendVector(page, vector) {
-	if (vector.kind === "line") {
-		page.addLine({
-			from: vector.from,
-			to: vector.to,
-			stroke: vector.stroke
-		});
-		return;
-	}
-	const built = vector.kind === "rect" ? page.addRect({
-		frame: vector.frame,
-		fill: vector.fill,
-		stroke: vector.stroke
-	}) : vector.kind === "ellipse" ? page.addEllipse({
-		frame: vector.frame,
-		fill: vector.fill,
-		stroke: vector.stroke
-	}) : page.addPath({
-		frame: vector.frame,
-		subpaths: vector.subpaths,
-		fill: vector.fill,
-		stroke: vector.stroke
-	});
-	if (vector.rotationDeg !== void 0) built.rotationDeg = vector.rotationDeg;
-}
 function appendShape(page, shape) {
 	const [onlyBlock] = shape.blocks;
 	if (shape.blocks.length === 1 && onlyBlock?.kind === "image") {

package/dist/edit/odg/page.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_xml_edit = require("../../xml/edit.cjs");
+const require_edit_odg_vector = require("./vector.cjs");
 const require_edit_odp_shape = require("../odp/shape.cjs");
 const require_edit_odp_image = require("../odp/image.cjs");
-const require_edit_odg_vector = require("./vector.cjs");
 //#region src/edit/odg/page.ts
 var OdgPage = class {
 	container;
@@ -37,6 +37,16 @@ var OdgPage = class {
 		node.children.push(frameElement);
 		return new require_edit_odp_shape.OdpShape(node.children, frameElement, this.context.pkg);
 	}
+	vectors() {
+		const node = this.live();
+		const out = [];
+		for (const child of node.children) {
+			if (child.type !== "element") continue;
+			const vector = require_edit_odg_vector.wrapVectorElement(node.children, child, this.context.pkg);
+			if (vector !== void 0) out.push(vector);
+		}
+		return out;
+	}
 	addRect(init) {
 		const node = this.live();
 		const element = require_edit_odg_vector.buildRectElement(this.context.pkg, init);
@@ -61,6 +71,9 @@ var OdgPage = class {
 		node.children.push(element);
 		return new require_edit_odg_vector.OdgPathVector(node.children, element, this.context.pkg);
 	}
+	addVector(vector) {
+		return require_edit_odg_vector.appendVectorTo(this.live().children, this.context.pkg, vector);
+	}
 	remove() {
 		require_xml_edit.removeChild(this.container, this.live());
 		this.removed = true;