takumi-pdf 0.4.1 → 0.5.0

package/dist/export.cjs

@@ -2,8 +2,10 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
+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.
@@ -496,28 +498,40 @@ async function __wbg_init(module_or_path) {
 }
 //#endregion
 //#region src/export.ts
+/** Every character a page counter can produce, so subsetting keeps the fonts a band needs. */
+const COUNTER_DIGITS = "0123456789";
 function isNode(value) {
 	return typeof value === "object" && value !== null && "type" in value && !("$$typeof" in value);
 }
 async function resolveNode(input) {
-	return isNode(input) ? {
+	if (isNode(input)) return {
 		node: input,
 		stylesheets: []
-	} : (0, _takumi_rs_helpers_jsx.fromJsx)(input);
+	};
+	if (typeof input === "string") return (0, _takumi_rs_helpers_html.fromHtml)(input);
+	return (0, _takumi_rs_helpers_jsx.fromJsx)(input);
 }
 /** A PDF renderer holding registered fonts. Reuse one instance across renders. */
 var PdfRenderer = class {
 	inner = new PdfRenderer$1();
 	fonts = new _takumi_rs_helpers_renderer.FontRegistry((font) => this.inner.registerFont(font));
-	/** Renders a node tree or JSX to PDF bytes. See {@link RenderOptions}. */
+	/** 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: bands.length > 0 ? [
+				main.node,
+				...bands,
+				COUNTER_DIGITS
+			] : main.node
+		}), images, fontFamilies);
 		const sheets = [
 			...stylesheets ?? [],
 			...main.stylesheets,
@@ -536,14 +550,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, COUNTER_DIGITS]
+		}), images, fontFamilies);
 		const sheets = [...stylesheets ?? [], ...main.stylesheets];
 		return this.inner.measure(main.node, {
 			...rest,

package/dist/export.d.cts

@@ -46,8 +46,8 @@ declare module "react" {
     tw?: string;
   }
 }
-/** A document input: a takumi node tree or JSX. */
-type NodeInput = Node | ReactNode | ReactElementLike;
+/** A document input: a takumi node tree, JSX, or an HTML string. */
+type NodeInput = Node | ReactNode | ReactElementLike | string;
 /** Explicit dimensions in CSS px (96 dpi). */
 type Dimensions = {
   width: number;
@@ -211,14 +211,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 +241,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 & {
@@ -270,15 +271,18 @@ type RenderOptions = (PagedOptions | ViewportOptions) & ConformanceOptions & {
 declare class PdfRenderer {
   private inner;
   private fonts;
-  /** Renders a node tree or JSX to PDF bytes. See {@link RenderOptions}. */
+  /** Renders a node tree, JSX, or an HTML string to PDF bytes. See {@link RenderOptions}. */
   render(node: NodeInput, options?: RenderOptions): Promise<Uint8Array>;
   /**
    * 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

@@ -46,8 +46,8 @@ declare module "react" {
     tw?: string;
   }
 }
-/** A document input: a takumi node tree or JSX. */
-type NodeInput = Node | ReactNode | ReactElementLike;
+/** A document input: a takumi node tree, JSX, or an HTML string. */
+type NodeInput = Node | ReactNode | ReactElementLike | string;
 /** Explicit dimensions in CSS px (96 dpi). */
 type Dimensions = {
   width: number;
@@ -211,14 +211,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 +241,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 & {
@@ -270,15 +271,18 @@ type RenderOptions = (PagedOptions | ViewportOptions) & ConformanceOptions & {
 declare class PdfRenderer {
   private inner;
   private fonts;
-  /** Renders a node tree or JSX to PDF bytes. See {@link RenderOptions}. */
+  /** Renders a node tree, JSX, or an HTML string to PDF bytes. See {@link RenderOptions}. */
   render(node: NodeInput, options?: RenderOptions): Promise<Uint8Array>;
   /**
    * 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,5 +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.
@@ -492,28 +494,40 @@ async function __wbg_init(module_or_path) {
 }
 //#endregion
 //#region src/export.ts
+/** Every character a page counter can produce, so subsetting keeps the fonts a band needs. */
+const COUNTER_DIGITS = "0123456789";
 function isNode(value) {
 	return typeof value === "object" && value !== null && "type" in value && !("$$typeof" in value);
 }
 async function resolveNode(input) {
-	return isNode(input) ? {
+	if (isNode(input)) return {
 		node: input,
 		stylesheets: []
-	} : fromJsx(input);
+	};
+	if (typeof input === "string") return fromHtml(input);
+	return fromJsx(input);
 }
 /** A PDF renderer holding registered fonts. Reuse one instance across renders. */
 var PdfRenderer = class {
 	inner = new PdfRenderer$1();
 	fonts = new FontRegistry((font) => this.inner.registerFont(font));
-	/** Renders a node tree or JSX to PDF bytes. See {@link RenderOptions}. */
+	/** 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: bands.length > 0 ? [
+				main.node,
+				...bands,
+				COUNTER_DIGITS
+			] : main.node
+		}), images, fontFamilies);
 		const sheets = [
 			...stylesheets ?? [],
 			...main.stylesheets,
@@ -532,14 +546,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, COUNTER_DIGITS]
+		}), images, fontFamilies);
 		const sheets = [...stylesheets ?? [], ...main.stylesheets];
 		return this.inner.measure(main.node, {
 			...rest,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "takumi-pdf",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "HTML/JSX to paged, selectable-text PDF, powered by takumi. WebAssembly, no Chromium.",
   "keywords": [
     "css",
@@ -83,7 +83,7 @@
     "publish-lint": "attw --pack . && publint --strict ."
   },
   "dependencies": {
-    "@takumi-rs/helpers": "2.5.11"
+    "@takumi-rs/helpers": "2.6.0"
   },
   "devDependencies": {
     "@types/bun": "^1.3.14",