takumi-pdf 0.4.2 → 0.6.0

package/README.md

@@ -3,9 +3,9 @@
 
 # takumi-pdf
 
-**Render JSX to paged, selectable-text PDF. WebAssembly, no Chromium.**
+**Render paged PDFs from JSX, HTML, and CSS. No headless browser.**
 
-Invoices, reports, and receipts from the Takumi renderer, with CSS layout and vector PDF output.
+Build invoices and reports with CSS or Tailwind. The renderer writes vector PDF with selectable text.
 
 [Documentation](https://takumi.kane.tw/docs/) · [Playground](https://takumi.kane.tw/playground)
 
@@ -13,9 +13,9 @@ Invoices, reports, and receipts from the Takumi renderer, with CSS layout and ve
 
 ## Why
 
-Browser-based PDF generation brings the Chromium serverless tax: browser cold starts, browser memory, a large browser binary, and headless-browser work before a document can render. It is a capable screenshot pipeline, but it is still a browser.
+Browser-based PDF generation starts a browser process and ships a Chrome installation. `takumi-pdf` compiles Takumi's layout and PDF code to WebAssembly.
 
-`takumi-pdf` uses Takumi's own layout and PDF rendering primitives, compiled to WebAssembly. There is no browser process. Render JSX or a Takumi node tree with CSS and Tailwind classes, then receive vector PDF bytes with selectable, searchable text and embedded subset fonts.
+Pass JSX or a Takumi node tree with CSS. The renderer returns vector PDF bytes with searchable text and embedded subset fonts.
 
 ## Install
 
@@ -168,7 +168,7 @@ const pdf = await render(
 
 ## Links, outline, and metadata
 
-Anchors with an `href` become clickable link annotations. `outline: true` builds PDF bookmarks from `h1`–`h6` headings. `metadata` fills the document properties:
+Anchors with an `href` become clickable link annotations. `outline: true` builds PDF bookmarks from `h1` through `h6` headings. `metadata` fills the document properties:
 
 ```tsx
 const pdf = await render(report, {
@@ -186,7 +186,7 @@ Omit `metadata` to keep output byte-identical across runs.
 
 ## Tagged output and PDF/A
 
-Output is **tagged by default**: HTML semantics (`h1`–`h6`, `p`, `img` with `alt`, `a`, lists) become a PDF structure tree, like Chromium's print-to-PDF. Set `tagged: "ua1"` to validate against PDF/UA-1, or `tagged: false` to drop the tree when file size matters more than accessibility.
+Output is **tagged by default**: HTML semantics (`h1` through `h6`, `p`, `img` with `alt`, `a`, lists) become a PDF structure tree, like Chromium's print-to-PDF. Set `tagged: "ua1"` to validate against PDF/UA-1, or `tagged: false` to drop the tree when file size matters more than accessibility.
 
 `<table>` markup is not supported, and a table built out of flex rows carries no `Table` structure elements.
 

package/dist/export.cjs

@@ -5,6 +5,7 @@ Object.defineProperties(exports, {
 let _takumi_rs_helpers_html = require("@takumi-rs/helpers/html");
 let _takumi_rs_helpers_jsx = require("@takumi-rs/helpers/jsx");
 let _takumi_rs_helpers_renderer = require("@takumi-rs/helpers/renderer");
+let _takumi_rs_helpers = require("@takumi-rs/helpers");
 //#region pkg/takumi_pdf_wasm.js
 /**
 * A PDF renderer holding registered fonts and a decoded-resource cache.
@@ -103,6 +104,32 @@ var PdfRenderer$1 = class {
 	}
 };
 if (Symbol.dispose) PdfRenderer$1.prototype[Symbol.dispose] = PdfRenderer$1.prototype.free;
+/**
+* The characters the page counters named by these class names can produce.
+*
+* A counter's characters appear nowhere in the document, so a caller choosing
+* which faces to load has no other way to learn it needs, say, Thai digits.
+* @param {string[]} classes
+* @returns {string}
+*/
+function counterCharacters(classes) {
+	let deferred2_0;
+	let deferred2_1;
+	try {
+		const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+		const ptr0 = passArrayJsValueToWasm0(classes, wasm.__wbindgen_export);
+		const len0 = WASM_VECTOR_LEN;
+		wasm.counterCharacters(retptr, ptr0, len0);
+		var r0 = getDataViewMemory0().getInt32(retptr + 0, true);
+		var r1 = getDataViewMemory0().getInt32(retptr + 4, true);
+		deferred2_0 = r0;
+		deferred2_1 = r1;
+		return getStringFromWasm0(r0, r1);
+	} finally {
+		wasm.__wbindgen_add_to_stack_pointer(16);
+		wasm.__wbindgen_export4(deferred2_0, deferred2_1, 1);
+	}
+}
 function __wbg_get_imports() {
 	return {
 		__proto__: null,
@@ -382,6 +409,13 @@ let heap_next = heap.length;
 function isLikeNone(x) {
 	return x === void 0 || x === null;
 }
+function passArrayJsValueToWasm0(array, malloc) {
+	const ptr = malloc(array.length * 4, 4) >>> 0;
+	const mem = getDataViewMemory0();
+	for (let i = 0; i < array.length; i++) mem.setUint32(ptr + 4 * i, addHeapObject(array[i]), true);
+	WASM_VECTOR_LEN = array.length;
+	return ptr;
+}
 function passStringToWasm0(arg, malloc, realloc) {
 	if (realloc === void 0) {
 		const buf = cachedTextEncoder.encode(arg);
@@ -497,6 +531,18 @@ async function __wbg_init(module_or_path) {
 }
 //#endregion
 //#region src/export.ts
+/** Every class name in a tree, so the renderer can say what its counters draw. */
+function classNames(node) {
+	const into = [];
+	collectClassNames(node, into);
+	return into;
+}
+function collectClassNames(node, into) {
+	if (typeof node !== "object" || node === null) return;
+	const { className, children } = node;
+	if (typeof className === "string") into.push(...className.split(/\s+/).filter(Boolean));
+	if (Array.isArray(children)) for (const child of children) collectClassNames(child, into);
+}
 function isNode(value) {
 	return typeof value === "object" && value !== null && "type" in value && !("$$typeof" in value);
 }
@@ -515,12 +561,20 @@ var PdfRenderer = class {
 	/** Renders a node tree, JSX, or an HTML string to PDF bytes. See {@link RenderOptions}. */
 	async render(node, options = {}) {
 		const { fonts, images, header, footer, stylesheets, fontFamilies, ...rest } = options;
-		const [main, headerResult, footerResult, resources] = await Promise.all([
+		const [main, headerResult, footerResult] = await Promise.all([
 			resolveNode(node),
 			header === void 0 ? void 0 : resolveNode(header),
-			footer === void 0 ? void 0 : resolveNode(footer),
-			this.fonts.resolveResources(fonts, images, fontFamilies)
+			footer === void 0 ? void 0 : resolveNode(footer)
 		]);
+		const bands = [headerResult?.node, footerResult?.node].filter((band) => band !== void 0);
+		const resources = await this.fonts.resolveResources(fonts && (0, _takumi_rs_helpers.subsetFonts)({
+			fonts,
+			source: [
+				main.node,
+				...bands,
+				counterCharacters([main.node, ...bands].flatMap((tree) => classNames(tree)))
+			]
+		}), images, fontFamilies);
 		const sheets = [
 			...stylesheets ?? [],
 			...main.stylesheets,
@@ -539,14 +593,21 @@ var PdfRenderer = class {
 	/**
 	* Lays out a node tree without rendering and returns its size in CSS px.
 	*
-	* With page options the tree lays out at the full page width with unbounded
-	* height, exactly how {@link render} measures a header or footer band
-	* (`pageNumber` / `totalPages` hooks are filled with three-digit counters),
-	* so the height tells you how much margin a band needs.
+	* With page options the tree lays out against the full page width with
+	* unbounded height, exactly how {@link render} measures a header or footer
+	* band (`pageNumber` / `totalPages` hooks are filled with three-digit
+	* counters), so the height tells you how much margin a band needs.
+	*
+	* The returned size is the tree's own, not the space it was laid out
+	* against: a box with `width: 100px` measures 100 wide on any page.
 	*/
 	async measure(node, options = {}) {
 		const { fonts, images, stylesheets, fontFamilies, ...rest } = options;
-		const [main, resources] = await Promise.all([resolveNode(node), this.fonts.resolveResources(fonts, images, fontFamilies)]);
+		const main = await resolveNode(node);
+		const resources = await this.fonts.resolveResources(fonts && (0, _takumi_rs_helpers.subsetFonts)({
+			fonts,
+			source: [main.node, counterCharacters(classNames(main.node))]
+		}), images, fontFamilies);
 		const sheets = [...stylesheets ?? [], ...main.stylesheets];
 		return this.inner.measure(main.node, {
 			...rest,

package/dist/export.d.cts

@@ -6,6 +6,7 @@ type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Modul
 interface InitOutput {
   readonly memory: WebAssembly.Memory;
   readonly __wbg_pdfrenderer_free: (a: number, b: number) => void;
+  readonly counterCharacters: (a: number, b: number, c: number) => void;
   readonly pdfrenderer_measure: (a: number, b: number, c: number, d: number) => void;
   readonly pdfrenderer_new: (a: number) => void;
   readonly pdfrenderer_registerFont: (a: number, b: number, c: number) => void;
@@ -211,14 +212,15 @@ type ArchivalAttachment = Attachment & {
 };
 /**
  * Standards conformance. Invalid combinations are type errors: the `a` levels
- * imply a structure tree so `tagged: false` is rejected, PDF/A-4 is PDF 2.0
- * while PDF/UA-1 is PDF 1.7-only so they cannot combine, and only the
- * PDF/A-3 levels, PDF/A-4f (or plain PDF) accept attachments.
+ * imply a structure tree so `tagged: false` is rejected, PDF/UA-1 is PDF
+ * 1.7-only and PDF/UA-2 is PDF 2.0-only so each pairs with its own PDF/A
+ * levels, and only the PDF/A-3 levels, PDF/A-4f (or plain PDF) accept
+ * attachments.
  */
 type ConformanceOptions = {
   pdfa?: never;
-  /** Structure tree: off, on (default), or validated against PDF/UA-1. */
-  tagged?: boolean | "ua1";
+  /** Structure tree: off, on (default), or validated against PDF/UA. */
+  tagged?: boolean | "ua1" | "ua2";
   /** Files attached to the document. */
   attachments?: Attachment[];
 } | {
@@ -240,11 +242,11 @@ type ConformanceOptions = {
   attachments?: ArchivalAttachment[];
 } | {
   pdfa: "4";
-  tagged?: boolean;
+  tagged?: boolean | "ua2";
   attachments?: never;
 } | {
   pdfa: "4f";
-  tagged?: boolean;
+  tagged?: boolean | "ua2";
   attachments?: ArchivalAttachment[];
 };
 type RenderOptions = (PagedOptions | ViewportOptions) & ConformanceOptions & {
@@ -275,10 +277,13 @@ declare class PdfRenderer {
   /**
    * Lays out a node tree without rendering and returns its size in CSS px.
    *
-   * With page options the tree lays out at the full page width with unbounded
-   * height, exactly how {@link render} measures a header or footer band
-   * (`pageNumber` / `totalPages` hooks are filled with three-digit counters),
-   * so the height tells you how much margin a band needs.
+   * With page options the tree lays out against the full page width with
+   * unbounded height, exactly how {@link render} measures a header or footer
+   * band (`pageNumber` / `totalPages` hooks are filled with three-digit
+   * counters), so the height tells you how much margin a band needs.
+   *
+   * The returned size is the tree's own, not the space it was laid out
+   * against: a box with `width: 100px` measures 100 wide on any page.
    */
   measure(node: NodeInput, options?: MeasureOptions): Promise<MeasuredSize>;
   /** Registers a font ahead of time, deduped against earlier registrations. */

package/dist/export.d.mts

@@ -6,6 +6,7 @@ type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Modul
 interface InitOutput {
   readonly memory: WebAssembly.Memory;
   readonly __wbg_pdfrenderer_free: (a: number, b: number) => void;
+  readonly counterCharacters: (a: number, b: number, c: number) => void;
   readonly pdfrenderer_measure: (a: number, b: number, c: number, d: number) => void;
   readonly pdfrenderer_new: (a: number) => void;
   readonly pdfrenderer_registerFont: (a: number, b: number, c: number) => void;
@@ -211,14 +212,15 @@ type ArchivalAttachment = Attachment & {
 };
 /**
  * Standards conformance. Invalid combinations are type errors: the `a` levels
- * imply a structure tree so `tagged: false` is rejected, PDF/A-4 is PDF 2.0
- * while PDF/UA-1 is PDF 1.7-only so they cannot combine, and only the
- * PDF/A-3 levels, PDF/A-4f (or plain PDF) accept attachments.
+ * imply a structure tree so `tagged: false` is rejected, PDF/UA-1 is PDF
+ * 1.7-only and PDF/UA-2 is PDF 2.0-only so each pairs with its own PDF/A
+ * levels, and only the PDF/A-3 levels, PDF/A-4f (or plain PDF) accept
+ * attachments.
  */
 type ConformanceOptions = {
   pdfa?: never;
-  /** Structure tree: off, on (default), or validated against PDF/UA-1. */
-  tagged?: boolean | "ua1";
+  /** Structure tree: off, on (default), or validated against PDF/UA. */
+  tagged?: boolean | "ua1" | "ua2";
   /** Files attached to the document. */
   attachments?: Attachment[];
 } | {
@@ -240,11 +242,11 @@ type ConformanceOptions = {
   attachments?: ArchivalAttachment[];
 } | {
   pdfa: "4";
-  tagged?: boolean;
+  tagged?: boolean | "ua2";
   attachments?: never;
 } | {
   pdfa: "4f";
-  tagged?: boolean;
+  tagged?: boolean | "ua2";
   attachments?: ArchivalAttachment[];
 };
 type RenderOptions = (PagedOptions | ViewportOptions) & ConformanceOptions & {
@@ -275,10 +277,13 @@ declare class PdfRenderer {
   /**
    * Lays out a node tree without rendering and returns its size in CSS px.
    *
-   * With page options the tree lays out at the full page width with unbounded
-   * height, exactly how {@link render} measures a header or footer band
-   * (`pageNumber` / `totalPages` hooks are filled with three-digit counters),
-   * so the height tells you how much margin a band needs.
+   * With page options the tree lays out against the full page width with
+   * unbounded height, exactly how {@link render} measures a header or footer
+   * band (`pageNumber` / `totalPages` hooks are filled with three-digit
+   * counters), so the height tells you how much margin a band needs.
+   *
+   * The returned size is the tree's own, not the space it was laid out
+   * against: a box with `width: 100px` measures 100 wide on any page.
    */
   measure(node: NodeInput, options?: MeasureOptions): Promise<MeasuredSize>;
   /** Registers a font ahead of time, deduped against earlier registrations. */

package/dist/export.mjs

@@ -1,6 +1,7 @@
 import { fromHtml } from "@takumi-rs/helpers/html";
 import { fromJsx } from "@takumi-rs/helpers/jsx";
 import { FontRegistry } from "@takumi-rs/helpers/renderer";
+import { subsetFonts } from "@takumi-rs/helpers";
 //#region pkg/takumi_pdf_wasm.js
 /**
 * A PDF renderer holding registered fonts and a decoded-resource cache.
@@ -99,6 +100,32 @@ var PdfRenderer$1 = class {
 	}
 };
 if (Symbol.dispose) PdfRenderer$1.prototype[Symbol.dispose] = PdfRenderer$1.prototype.free;
+/**
+* The characters the page counters named by these class names can produce.
+*
+* A counter's characters appear nowhere in the document, so a caller choosing
+* which faces to load has no other way to learn it needs, say, Thai digits.
+* @param {string[]} classes
+* @returns {string}
+*/
+function counterCharacters(classes) {
+	let deferred2_0;
+	let deferred2_1;
+	try {
+		const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+		const ptr0 = passArrayJsValueToWasm0(classes, wasm.__wbindgen_export);
+		const len0 = WASM_VECTOR_LEN;
+		wasm.counterCharacters(retptr, ptr0, len0);
+		var r0 = getDataViewMemory0().getInt32(retptr + 0, true);
+		var r1 = getDataViewMemory0().getInt32(retptr + 4, true);
+		deferred2_0 = r0;
+		deferred2_1 = r1;
+		return getStringFromWasm0(r0, r1);
+	} finally {
+		wasm.__wbindgen_add_to_stack_pointer(16);
+		wasm.__wbindgen_export4(deferred2_0, deferred2_1, 1);
+	}
+}
 function __wbg_get_imports() {
 	return {
 		__proto__: null,
@@ -378,6 +405,13 @@ let heap_next = heap.length;
 function isLikeNone(x) {
 	return x === void 0 || x === null;
 }
+function passArrayJsValueToWasm0(array, malloc) {
+	const ptr = malloc(array.length * 4, 4) >>> 0;
+	const mem = getDataViewMemory0();
+	for (let i = 0; i < array.length; i++) mem.setUint32(ptr + 4 * i, addHeapObject(array[i]), true);
+	WASM_VECTOR_LEN = array.length;
+	return ptr;
+}
 function passStringToWasm0(arg, malloc, realloc) {
 	if (realloc === void 0) {
 		const buf = cachedTextEncoder.encode(arg);
@@ -493,6 +527,18 @@ async function __wbg_init(module_or_path) {
 }
 //#endregion
 //#region src/export.ts
+/** Every class name in a tree, so the renderer can say what its counters draw. */
+function classNames(node) {
+	const into = [];
+	collectClassNames(node, into);
+	return into;
+}
+function collectClassNames(node, into) {
+	if (typeof node !== "object" || node === null) return;
+	const { className, children } = node;
+	if (typeof className === "string") into.push(...className.split(/\s+/).filter(Boolean));
+	if (Array.isArray(children)) for (const child of children) collectClassNames(child, into);
+}
 function isNode(value) {
 	return typeof value === "object" && value !== null && "type" in value && !("$$typeof" in value);
 }
@@ -511,12 +557,20 @@ var PdfRenderer = class {
 	/** Renders a node tree, JSX, or an HTML string to PDF bytes. See {@link RenderOptions}. */
 	async render(node, options = {}) {
 		const { fonts, images, header, footer, stylesheets, fontFamilies, ...rest } = options;
-		const [main, headerResult, footerResult, resources] = await Promise.all([
+		const [main, headerResult, footerResult] = await Promise.all([
 			resolveNode(node),
 			header === void 0 ? void 0 : resolveNode(header),
-			footer === void 0 ? void 0 : resolveNode(footer),
-			this.fonts.resolveResources(fonts, images, fontFamilies)
+			footer === void 0 ? void 0 : resolveNode(footer)
 		]);
+		const bands = [headerResult?.node, footerResult?.node].filter((band) => band !== void 0);
+		const resources = await this.fonts.resolveResources(fonts && subsetFonts({
+			fonts,
+			source: [
+				main.node,
+				...bands,
+				counterCharacters([main.node, ...bands].flatMap((tree) => classNames(tree)))
+			]
+		}), images, fontFamilies);
 		const sheets = [
 			...stylesheets ?? [],
 			...main.stylesheets,
@@ -535,14 +589,21 @@ var PdfRenderer = class {
 	/**
 	* Lays out a node tree without rendering and returns its size in CSS px.
 	*
-	* With page options the tree lays out at the full page width with unbounded
-	* height, exactly how {@link render} measures a header or footer band
-	* (`pageNumber` / `totalPages` hooks are filled with three-digit counters),
-	* so the height tells you how much margin a band needs.
+	* With page options the tree lays out against the full page width with
+	* unbounded height, exactly how {@link render} measures a header or footer
+	* band (`pageNumber` / `totalPages` hooks are filled with three-digit
+	* counters), so the height tells you how much margin a band needs.
+	*
+	* The returned size is the tree's own, not the space it was laid out
+	* against: a box with `width: 100px` measures 100 wide on any page.
 	*/
 	async measure(node, options = {}) {
 		const { fonts, images, stylesheets, fontFamilies, ...rest } = options;
-		const [main, resources] = await Promise.all([resolveNode(node), this.fonts.resolveResources(fonts, images, fontFamilies)]);
+		const main = await resolveNode(node);
+		const resources = await this.fonts.resolveResources(fonts && subsetFonts({
+			fonts,
+			source: [main.node, counterCharacters(classNames(main.node))]
+		}), images, fontFamilies);
 		const sheets = [...stylesheets ?? [], ...main.stylesheets];
 		return this.inner.measure(main.node, {
 			...rest,

package/package.json

@@ -1,14 +1,19 @@
 {
   "name": "takumi-pdf",
-  "version": "0.4.2",
-  "description": "HTML/JSX to paged, selectable-text PDF, powered by takumi. WebAssembly, no Chromium.",
+  "version": "0.6.0",
+  "description": "Render paged PDFs from JSX, HTML, and CSS. No headless browser.",
   "keywords": [
+    "chromium-free",
+    "cjk",
     "css",
+    "html-to-pdf",
     "invoice",
     "jsx",
     "pdf",
+    "pdf-generation",
     "react",
-    "rendering",
+    "receipt",
+    "tailwind",
     "webassembly"
   ],
   "homepage": "https://takumi.kane.tw/docs/",
@@ -83,7 +88,7 @@
     "publish-lint": "attw --pack . && publint --strict ."
   },
   "dependencies": {
-    "@takumi-rs/helpers": "2.5.11"
+    "@takumi-rs/helpers": "2.6.1"
   },
   "devDependencies": {
     "@types/bun": "^1.3.14",

package/pkg/takumi_pdf_wasm_bg.wasm.d.ts

@@ -2,6 +2,7 @@
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
 export const __wbg_pdfrenderer_free: (a: number, b: number) => void;
+export const counterCharacters: (a: number, b: number, c: number) => void;
 export const pdfrenderer_measure: (a: number, b: number, c: number, d: number) => void;
 export const pdfrenderer_new: (a: number) => void;
 export const pdfrenderer_registerFont: (a: number, b: number, c: number) => void;