takumi-pdf 0.11.2 → 0.12.0

package/dist/export.cjs

@@ -522,16 +522,20 @@ async function __wbg_load(module, imports) {
 }
 function initSync(module) {
 	if (wasm !== void 0) return wasm;
-	if (module !== void 0) if (Object.getPrototypeOf(module) === Object.prototype) ({module} = module);
-	else console.warn("using deprecated parameters for `initSync()`; pass a single object instead");
+	if (module !== void 0) {
+		if (Object.getPrototypeOf(module) === Object.prototype) ({module} = module);
+		else console.warn("using deprecated parameters for `initSync()`; pass a single object instead");
+	}
 	const imports = __wbg_get_imports();
 	if (!(module instanceof WebAssembly.Module)) module = new WebAssembly.Module(module);
 	return __wbg_finalize_init(new WebAssembly.Instance(module, imports), module);
 }
 async function __wbg_init(module_or_path) {
 	if (wasm !== void 0) return wasm;
-	if (module_or_path !== void 0) if (Object.getPrototypeOf(module_or_path) === Object.prototype) ({module_or_path} = module_or_path);
-	else console.warn("using deprecated parameters for the initialization function; pass a single object instead");
+	if (module_or_path !== void 0) {
+		if (Object.getPrototypeOf(module_or_path) === Object.prototype) ({module_or_path} = module_or_path);
+		else console.warn("using deprecated parameters for the initialization function; pass a single object instead");
+	}
 		const imports = __wbg_get_imports();
 	if (typeof module_or_path === "string" || typeof Request === "function" && module_or_path instanceof Request || typeof URL === "function" && module_or_path instanceof URL) module_or_path = fetch(module_or_path);
 	const { instance, module } = await __wbg_load(await module_or_path, imports);
@@ -554,10 +558,26 @@ function collectClassNames(node, into) {
 function isNode(value) {
 	return typeof value === "object" && value !== null && "type" in value && !("$$typeof" in value);
 }
+let warnedStylesheets = false;
+function warnStylesheetsDeprecated() {
+	if (warnedStylesheets) return;
+	warnedStylesheets = true;
+	console.warn("takumi: the `stylesheets` option is deprecated, use `css` instead.");
+}
+/** Narrows the `css` option, which takes one entry or a list of them. */
+function isCssList(css) {
+	return Array.isArray(css);
+}
+function ownCss(css, stylesheets) {
+	if (css !== void 0 && stylesheets !== void 0) throw new Error("pass either `css` or `stylesheets`, not both");
+	if (css !== void 0) return isCssList(css) ? [...css] : [css];
+	if (stylesheets !== void 0) warnStylesheetsDeprecated();
+	return stylesheets ?? [];
+}
 async function resolveNode(input) {
 	if (isNode(input)) return {
 		node: input,
-		stylesheets: []
+		css: []
 	};
 	if (typeof input === "string") return (0, _takumi_rs_helpers_html.fromHtml)(input);
 	return (0, _takumi_rs_helpers_jsx.fromJsx)(input);
@@ -568,7 +588,7 @@ var PdfRenderer = class {
 	fonts = new _takumi_rs_helpers_renderer.FontRegistry((font) => this.inner.registerFont(font));
 	/** 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 { fonts, images, header, footer, css, stylesheets, fontFamilies, ...rest } = options;
 		const [main, headerResult, footerResult] = await Promise.all([
 			resolveNode(node),
 			header === void 0 ? void 0 : resolveNode(header),
@@ -585,16 +605,16 @@ var PdfRenderer = class {
 			]
 		}), images, fontFamilies);
 		const sheets = [
-			...stylesheets ?? [],
-			...main.stylesheets,
-			...headerResult?.stylesheets ?? [],
-			...footerResult?.stylesheets ?? []
+			...ownCss(css, stylesheets),
+			...main.css,
+			...headerResult?.css ?? [],
+			...footerResult?.css ?? []
 		];
 		return this.inner.render(main.node, {
 			...rest,
 			header: headerResult?.node,
 			footer: footerResult?.node,
-			stylesheets: sheets.length > 0 ? sheets : void 0,
+			css: sheets.length > 0 ? sheets : void 0,
 			images: resources.images,
 			fontFamilies: resources.fontFamilies
 		});
@@ -611,7 +631,7 @@ var PdfRenderer = class {
 	* against: a box with `width: 100px` measures 100 wide on any page.
 	*/
 	async measure(node, options = {}) {
-		const { fonts, images, stylesheets, fontFamilies, ...rest } = options;
+		const { fonts, images, css, stylesheets, fontFamilies, ...rest } = options;
 		const main = await resolveNode(node);
 		const resources = await this.fonts.resolveResources(fonts && (0, _takumi_rs_helpers.subsetFonts)({
 			fonts,
@@ -621,10 +641,10 @@ var PdfRenderer = class {
 				counterCharacters(classNames(main.node))
 			]
 		}), images, fontFamilies);
-		const sheets = [...stylesheets ?? [], ...main.stylesheets];
+		const sheets = [...ownCss(css, stylesheets), ...main.css];
 		return this.inner.measure(main.node, {
 			...rest,
-			stylesheets: sheets.length > 0 ? sheets : void 0,
+			css: sheets.length > 0 ? sheets : void 0,
 			images: resources.images,
 			fontFamilies: resources.fontFamilies
 		});

package/dist/export.d.cts

@@ -1,6 +1,6 @@
 import { CounterProps, CounterStyle, PageNumber, TargetPageNumber, TotalPages } from "./primitives.cjs";
+import { CssInput, Node, ReactElementLike } from "@takumi-rs/helpers";
 import { FontLoader, FontLoader as FontLoader$1, ImagesInput, ImagesInput as ImagesInput$1, RegisteredFamilyLike } from "@takumi-rs/helpers/renderer";
-import { Node, ReactElementLike } from "@takumi-rs/helpers";
 import { ReactNode } from "react";
 //#region pkg/takumi_pdf_wasm.d.ts
 type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
@@ -75,7 +75,7 @@ type PageMargin = PageMarginSide | {
 /**
  * Paged output (the default): content flows across pages of `size`, like
  * Puppeteer's `page.pdf()`. The layout canvas has unbounded height, so
- * percentage heights do not resolve. CSS `@page` rules in `stylesheets` are
+ * percentage heights do not resolve. CSS `@page` rules in `css` are
  * not supported — page geometry comes from these options.
  */
 type PagedOptions = {
@@ -127,7 +127,12 @@ type MeasureOptions = ({
   fonts?: FontLoader$1[];
   /** Pre-fetched images for `src` URLs in the tree. */
   images?: ImagesInput$1;
-  /** CSS stylesheets to apply before layout. */
+  /** CSS to apply before layout, one string or a list cascading in order. */
+  css?: CssInput | readonly CssInput[];
+  /**
+   * CSS stylesheets to apply before layout.
+   * @deprecated Use `css` instead. Will be removed in v3.
+   */
   stylesheets?: string[];
   /** Per-render font stack: ordered family names used as the fallback chain. */
   fontFamilies?: string[];
@@ -261,8 +266,14 @@ type RenderOptions = (PagedOptions | ViewportOptions) & ConformanceOptions & {
    * `[{ src: "https://…/logo.png", data: bytes }]`.
    */
   images?: ImagesInput$1;
-  /** CSS stylesheets to apply before layout. */
+  /** CSS to apply before layout, one string or a list cascading in order. */
+  css?: CssInput | readonly CssInput[];
+  /**
+   * CSS stylesheets to apply before layout.
+   * @deprecated Use `css` instead. Will be removed in v3.
+   */
   stylesheets?: string[];
+  /** CSS custom properties for `:root`; the `--` prefix is optional. */
   /** Per-render font stack: ordered family names used as the fallback chain. */
   fontFamilies?: string[];
   /** Default BCP-47 language tag applied to the root. */

package/dist/export.d.mts

@@ -1,6 +1,6 @@
 import { CounterProps, CounterStyle, PageNumber, TargetPageNumber, TotalPages } from "./primitives.mjs";
 import { FontLoader, FontLoader as FontLoader$1, ImagesInput, ImagesInput as ImagesInput$1, RegisteredFamilyLike } from "@takumi-rs/helpers/renderer";
-import { Node, ReactElementLike } from "@takumi-rs/helpers";
+import { CssInput, Node, ReactElementLike } from "@takumi-rs/helpers";
 import { ReactNode } from "react";
 //#region pkg/takumi_pdf_wasm.d.ts
 type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
@@ -75,7 +75,7 @@ type PageMargin = PageMarginSide | {
 /**
  * Paged output (the default): content flows across pages of `size`, like
  * Puppeteer's `page.pdf()`. The layout canvas has unbounded height, so
- * percentage heights do not resolve. CSS `@page` rules in `stylesheets` are
+ * percentage heights do not resolve. CSS `@page` rules in `css` are
  * not supported — page geometry comes from these options.
  */
 type PagedOptions = {
@@ -127,7 +127,12 @@ type MeasureOptions = ({
   fonts?: FontLoader$1[];
   /** Pre-fetched images for `src` URLs in the tree. */
   images?: ImagesInput$1;
-  /** CSS stylesheets to apply before layout. */
+  /** CSS to apply before layout, one string or a list cascading in order. */
+  css?: CssInput | readonly CssInput[];
+  /**
+   * CSS stylesheets to apply before layout.
+   * @deprecated Use `css` instead. Will be removed in v3.
+   */
   stylesheets?: string[];
   /** Per-render font stack: ordered family names used as the fallback chain. */
   fontFamilies?: string[];
@@ -261,8 +266,14 @@ type RenderOptions = (PagedOptions | ViewportOptions) & ConformanceOptions & {
    * `[{ src: "https://…/logo.png", data: bytes }]`.
    */
   images?: ImagesInput$1;
-  /** CSS stylesheets to apply before layout. */
+  /** CSS to apply before layout, one string or a list cascading in order. */
+  css?: CssInput | readonly CssInput[];
+  /**
+   * CSS stylesheets to apply before layout.
+   * @deprecated Use `css` instead. Will be removed in v3.
+   */
   stylesheets?: string[];
+  /** CSS custom properties for `:root`; the `--` prefix is optional. */
   /** Per-render font stack: ordered family names used as the fallback chain. */
   fontFamilies?: string[];
   /** Default BCP-47 language tag applied to the root. */

package/dist/export.mjs

@@ -518,16 +518,20 @@ async function __wbg_load(module, imports) {
 }
 function initSync(module) {
 	if (wasm !== void 0) return wasm;
-	if (module !== void 0) if (Object.getPrototypeOf(module) === Object.prototype) ({module} = module);
-	else console.warn("using deprecated parameters for `initSync()`; pass a single object instead");
+	if (module !== void 0) {
+		if (Object.getPrototypeOf(module) === Object.prototype) ({module} = module);
+		else console.warn("using deprecated parameters for `initSync()`; pass a single object instead");
+	}
 	const imports = __wbg_get_imports();
 	if (!(module instanceof WebAssembly.Module)) module = new WebAssembly.Module(module);
 	return __wbg_finalize_init(new WebAssembly.Instance(module, imports), module);
 }
 async function __wbg_init(module_or_path) {
 	if (wasm !== void 0) return wasm;
-	if (module_or_path !== void 0) if (Object.getPrototypeOf(module_or_path) === Object.prototype) ({module_or_path} = module_or_path);
-	else console.warn("using deprecated parameters for the initialization function; pass a single object instead");
+	if (module_or_path !== void 0) {
+		if (Object.getPrototypeOf(module_or_path) === Object.prototype) ({module_or_path} = module_or_path);
+		else console.warn("using deprecated parameters for the initialization function; pass a single object instead");
+	}
 		const imports = __wbg_get_imports();
 	if (typeof module_or_path === "string" || typeof Request === "function" && module_or_path instanceof Request || typeof URL === "function" && module_or_path instanceof URL) module_or_path = fetch(module_or_path);
 	const { instance, module } = await __wbg_load(await module_or_path, imports);
@@ -550,10 +554,26 @@ function collectClassNames(node, into) {
 function isNode(value) {
 	return typeof value === "object" && value !== null && "type" in value && !("$$typeof" in value);
 }
+let warnedStylesheets = false;
+function warnStylesheetsDeprecated() {
+	if (warnedStylesheets) return;
+	warnedStylesheets = true;
+	console.warn("takumi: the `stylesheets` option is deprecated, use `css` instead.");
+}
+/** Narrows the `css` option, which takes one entry or a list of them. */
+function isCssList(css) {
+	return Array.isArray(css);
+}
+function ownCss(css, stylesheets) {
+	if (css !== void 0 && stylesheets !== void 0) throw new Error("pass either `css` or `stylesheets`, not both");
+	if (css !== void 0) return isCssList(css) ? [...css] : [css];
+	if (stylesheets !== void 0) warnStylesheetsDeprecated();
+	return stylesheets ?? [];
+}
 async function resolveNode(input) {
 	if (isNode(input)) return {
 		node: input,
-		stylesheets: []
+		css: []
 	};
 	if (typeof input === "string") return fromHtml(input);
 	return fromJsx(input);
@@ -564,7 +584,7 @@ var PdfRenderer = class {
 	fonts = new FontRegistry((font) => this.inner.registerFont(font));
 	/** 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 { fonts, images, header, footer, css, stylesheets, fontFamilies, ...rest } = options;
 		const [main, headerResult, footerResult] = await Promise.all([
 			resolveNode(node),
 			header === void 0 ? void 0 : resolveNode(header),
@@ -581,16 +601,16 @@ var PdfRenderer = class {
 			]
 		}), images, fontFamilies);
 		const sheets = [
-			...stylesheets ?? [],
-			...main.stylesheets,
-			...headerResult?.stylesheets ?? [],
-			...footerResult?.stylesheets ?? []
+			...ownCss(css, stylesheets),
+			...main.css,
+			...headerResult?.css ?? [],
+			...footerResult?.css ?? []
 		];
 		return this.inner.render(main.node, {
 			...rest,
 			header: headerResult?.node,
 			footer: footerResult?.node,
-			stylesheets: sheets.length > 0 ? sheets : void 0,
+			css: sheets.length > 0 ? sheets : void 0,
 			images: resources.images,
 			fontFamilies: resources.fontFamilies
 		});
@@ -607,7 +627,7 @@ var PdfRenderer = class {
 	* against: a box with `width: 100px` measures 100 wide on any page.
 	*/
 	async measure(node, options = {}) {
-		const { fonts, images, stylesheets, fontFamilies, ...rest } = options;
+		const { fonts, images, css, stylesheets, fontFamilies, ...rest } = options;
 		const main = await resolveNode(node);
 		const resources = await this.fonts.resolveResources(fonts && subsetFonts({
 			fonts,
@@ -617,10 +637,10 @@ var PdfRenderer = class {
 				counterCharacters(classNames(main.node))
 			]
 		}), images, fontFamilies);
-		const sheets = [...stylesheets ?? [], ...main.stylesheets];
+		const sheets = [...ownCss(css, stylesheets), ...main.css];
 		return this.inner.measure(main.node, {
 			...rest,
-			stylesheets: sheets.length > 0 ? sheets : void 0,
+			css: sheets.length > 0 ? sheets : void 0,
 			images: resources.images,
 			fontFamilies: resources.fontFamilies
 		});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "takumi-pdf",
-  "version": "0.11.2",
+  "version": "0.12.0",
   "description": "Render paged PDFs from JSX, HTML, and CSS. No headless browser.",
   "keywords": [
     "chromium-free",
@@ -134,15 +134,15 @@
     }
   },
   "scripts": {
-    "build": "wasm-pack build ../takumi-pdf-wasm --no-pack --release --out-dir ../takumi-pdf-js/pkg --target web && bun build:js",
+    "build": "wasm-pack build ../takumi-pdf-wasm --no-pack --release --out-dir ../takumi-pdf-js/pkg --target web -- --locked && bun build:js",
     "build:js": "tsdown",
     "publish-lint": "attw --pack . && publint --strict ."
   },
   "dependencies": {
-    "@takumi-rs/helpers": "2.11.0"
+    "@takumi-rs/helpers": "2.13.0"
   },
   "devDependencies": {
-    "@types/bun": "^1.3.14",
+    "@types/bun": "^1.4.0",
     "@types/react": "19.2.18",
     "tsdown": "0.22.14"
   },