takumi-paint 0.1.0 → 0.1.2

package/dist/export.cjs

@@ -60,7 +60,7 @@ var Painter$1 = class {
 };
 if (Symbol.dispose) Painter$1.prototype[Symbol.dispose] = Painter$1.prototype.free;
 /**
-* A painted tree and the font files its runs use.
+* A serialized tree, and the font files and run outlines it keeps in wasm memory.
 */
 var RenderedPaint = class RenderedPaint {
 	static __wrap(ptr) {
@@ -94,13 +94,26 @@ var RenderedPaint = class RenderedPaint {
 		return v1;
 	}
 	/**
+	* The SVG path data of run `run` of text node `node`.
+	* @param {number} node
+	* @param {number} run
+	* @returns {string | undefined}
+	*/
+	runOutline(node, run) {
+		const ret = wasm.renderedpaint_runOutline(this.__wbg_ptr, node, run);
+		let v1;
+		if (ret[0] !== 0) {
+			v1 = getStringFromWasm0(ret[0], ret[1]);
+			wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
+		}
+		return v1;
+	}
+	/**
 	* The serialized tree.
 	* @returns {RawPaintTree}
 	*/
 	tree() {
-		const ret = wasm.renderedpaint_tree(this.__wbg_ptr);
-		if (ret[2]) throw takeFromExternrefTable0(ret[1]);
-		return takeFromExternrefTable0(ret[0]);
+		return wasm.renderedpaint_tree(this.__wbg_ptr);
 	}
 };
 if (Symbol.dispose) RenderedPaint.prototype[Symbol.dispose] = RenderedPaint.prototype.free;
@@ -514,16 +527,16 @@ var PaintTreeView = class {
 	#raw;
 	#listing;
 	#steps;
-	/** Wraps the serialized tree `raw`, reading font files through `fontData`. */
-	constructor(raw, fontData) {
+	/** Wraps the serialized tree `raw`, reading font files and run outlines from `files`. */
+	constructor(raw, files) {
 		this.#raw = raw;
 		this.width = raw.width;
 		this.height = raw.height;
 		this.fonts = raw.fonts.map((font, index) => ({
 			...font,
-			data: () => fontData(index) ?? /* @__PURE__ */ new Uint8Array()
+			data: () => files.fontData(index) ?? /* @__PURE__ */ new Uint8Array()
 		}));
-		this.#listing = new Listing(raw.nodes, this.fonts);
+		this.#listing = new Listing(raw.nodes, this.fonts, files);
 		const root = this.#listing.at(0);
 		if (root.type !== "box") throw new Error("The tree's root is not a box");
 		this.root = root;
@@ -574,9 +587,11 @@ function inDocumentOrder(root) {
 /** The nodes as the serialized tree lists them, which is how nodes and steps name each other. */
 var Listing = class {
 	fonts;
+	files;
 	#nodes;
-	constructor(raw, fonts) {
+	constructor(raw, fonts, files) {
 		this.fonts = fonts;
+		this.files = files;
 		this.#nodes = raw.map((node) => {
 			switch (node.type) {
 				case "box": return new BoxView(node, this);
@@ -681,7 +696,7 @@ var TextView = class extends NodeView {
 		return this.raw.textAlign;
 	}
 	get runs() {
-		this.#runs ??= this.raw.runs.map((run) => this.wrap(run));
+		this.#runs ??= this.raw.runs.map((run, index) => this.wrap(run, index));
 		return this.#runs;
 	}
 	resolveRun(drawable) {
@@ -692,14 +707,14 @@ var TextView = class extends NodeView {
 			run
 		};
 	}
-	wrap(raw) {
-		const { outline, font, ...fields } = raw;
+	wrap(raw, index) {
+		const { font, ...fields } = raw;
 		const resolved = this.listing.fonts[font];
 		if (!resolved) throw new Error(`The tree lists no font ${font}`);
 		return {
 			...fields,
 			font: resolved,
-			outline: () => outline
+			outline: () => this.listing.files.runOutline(this.raw.id, index) ?? ""
 		};
 	}
 };
@@ -751,7 +766,7 @@ var Painter = class {
 			images: resources.images,
 			fontFamilies: resources.fontFamilies
 		});
-		return new PaintTreeView(painted.tree(), (index) => painted.fontData(index));
+		return new PaintTreeView(painted.tree(), painted);
 	}
 	/** Registers a font ahead of time, deduped against earlier registrations. */
 	registerFont(font) {

package/dist/export.mjs

@@ -56,7 +56,7 @@ var Painter$1 = class {
 };
 if (Symbol.dispose) Painter$1.prototype[Symbol.dispose] = Painter$1.prototype.free;
 /**
-* A painted tree and the font files its runs use.
+* A serialized tree, and the font files and run outlines it keeps in wasm memory.
 */
 var RenderedPaint = class RenderedPaint {
 	static __wrap(ptr) {
@@ -90,13 +90,26 @@ var RenderedPaint = class RenderedPaint {
 		return v1;
 	}
 	/**
+	* The SVG path data of run `run` of text node `node`.
+	* @param {number} node
+	* @param {number} run
+	* @returns {string | undefined}
+	*/
+	runOutline(node, run) {
+		const ret = wasm.renderedpaint_runOutline(this.__wbg_ptr, node, run);
+		let v1;
+		if (ret[0] !== 0) {
+			v1 = getStringFromWasm0(ret[0], ret[1]);
+			wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
+		}
+		return v1;
+	}
+	/**
 	* The serialized tree.
 	* @returns {RawPaintTree}
 	*/
 	tree() {
-		const ret = wasm.renderedpaint_tree(this.__wbg_ptr);
-		if (ret[2]) throw takeFromExternrefTable0(ret[1]);
-		return takeFromExternrefTable0(ret[0]);
+		return wasm.renderedpaint_tree(this.__wbg_ptr);
 	}
 };
 if (Symbol.dispose) RenderedPaint.prototype[Symbol.dispose] = RenderedPaint.prototype.free;
@@ -510,16 +523,16 @@ var PaintTreeView = class {
 	#raw;
 	#listing;
 	#steps;
-	/** Wraps the serialized tree `raw`, reading font files through `fontData`. */
-	constructor(raw, fontData) {
+	/** Wraps the serialized tree `raw`, reading font files and run outlines from `files`. */
+	constructor(raw, files) {
 		this.#raw = raw;
 		this.width = raw.width;
 		this.height = raw.height;
 		this.fonts = raw.fonts.map((font, index) => ({
 			...font,
-			data: () => fontData(index) ?? /* @__PURE__ */ new Uint8Array()
+			data: () => files.fontData(index) ?? /* @__PURE__ */ new Uint8Array()
 		}));
-		this.#listing = new Listing(raw.nodes, this.fonts);
+		this.#listing = new Listing(raw.nodes, this.fonts, files);
 		const root = this.#listing.at(0);
 		if (root.type !== "box") throw new Error("The tree's root is not a box");
 		this.root = root;
@@ -570,9 +583,11 @@ function inDocumentOrder(root) {
 /** The nodes as the serialized tree lists them, which is how nodes and steps name each other. */
 var Listing = class {
 	fonts;
+	files;
 	#nodes;
-	constructor(raw, fonts) {
+	constructor(raw, fonts, files) {
 		this.fonts = fonts;
+		this.files = files;
 		this.#nodes = raw.map((node) => {
 			switch (node.type) {
 				case "box": return new BoxView(node, this);
@@ -677,7 +692,7 @@ var TextView = class extends NodeView {
 		return this.raw.textAlign;
 	}
 	get runs() {
-		this.#runs ??= this.raw.runs.map((run) => this.wrap(run));
+		this.#runs ??= this.raw.runs.map((run, index) => this.wrap(run, index));
 		return this.#runs;
 	}
 	resolveRun(drawable) {
@@ -688,14 +703,14 @@ var TextView = class extends NodeView {
 			run
 		};
 	}
-	wrap(raw) {
-		const { outline, font, ...fields } = raw;
+	wrap(raw, index) {
+		const { font, ...fields } = raw;
 		const resolved = this.listing.fonts[font];
 		if (!resolved) throw new Error(`The tree lists no font ${font}`);
 		return {
 			...fields,
 			font: resolved,
-			outline: () => outline
+			outline: () => this.listing.files.runOutline(this.raw.id, index) ?? ""
 		};
 	}
 };
@@ -747,7 +762,7 @@ var Painter = class {
 			images: resources.images,
 			fontFamilies: resources.fontFamilies
 		});
-		return new PaintTreeView(painted.tree(), (index) => painted.fontData(index));
+		return new PaintTreeView(painted.tree(), painted);
 	}
 	/** Registers a font ahead of time, deduped against earlier registrations. */
 	registerFont(font) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "takumi-paint",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Turn JSX, HTML, and CSS into a paint tree: shapes, paints, text runs, and images with every CSS value resolved.",
   "keywords": [
     "css",
@@ -131,7 +131,7 @@
     "publish-lint": "attw --pack . && publint --strict ."
   },
   "dependencies": {
-    "@takumi-rs/helpers": "2.15.0"
+    "@takumi-rs/helpers": "2.15.2"
   },
   "devDependencies": {
     "@types/bun": "^1.4.1",

package/pkg/takumi_paint_wasm_bg.wasm.d.ts

@@ -7,7 +7,8 @@ export const painter_new: () => [number, number, number];
 export const painter_paint: (a: number, b: any, c: number) => [number, number, number];
 export const painter_registerFont: (a: number, b: any) => [number, number, number];
 export const renderedpaint_fontData: (a: number, b: number) => [number, number];
-export const renderedpaint_tree: (a: number) => [number, number, number];
+export const renderedpaint_runOutline: (a: number, b: number, c: number) => [number, number];
+export const renderedpaint_tree: (a: number) => any;
 export const __wbindgen_malloc: (a: number, b: number) => number;
 export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
 export const __wbindgen_exn_store: (a: number) => void;