@quario/pdf 0.2.0 → 0.3.0

package/lib/style.js

@@ -52,27 +52,18 @@ let col = (value) => {
 /** @type {(style: any, base: number) => number} */
 let sizeOf = (style, base) => (Number.isFinite(style.size) && style.size > 0 ? style.size : base);
 
-// Style blocks layer outward-in: row under cell.
+// Style blocks layer outward-in: row under cell, split under slot. Those are
+// the two innermost of the four layers; the outer two reach a node without
+// being merged into it -- the band-role default through `roled` below, and the
+// report default through the canvas, as `layout.js`'s `adoptDefault` explains.
 /** @type {(under: any, over: any) => any} */
 let merge = (under, over) => (under ? (over ? { ...under, ...over } : under) : over || {});
 
-// The whole stack a resolved style is composed of, outermost first: the report
-// default the canvas carries, the enclosing block's style (a table row's, a
-// split's), and the node's own. This target's reading of docs/adr/0033, in one
-// place, so a third resolution funnel cannot quietly omit the outer layer.
-//
-// Only `family` is load-bearing in the outer layer: `settle` has already put
-// the report default's `size` on `canvas.base`, which `sizeOf` falls back to
-// for every drawn atom, so the size reaches the page whether or not it is
-// merged here.
-/** @type {(canvas: { style?: any }, under: any, own: any) => any} */
-let stack = (canvas, under, own) => merge(canvas.style, merge(under, own));
-
-// Band-role omakase defaults — the outermost layer of that same stack, under
-// the author's own style, which therefore always wins. Only the headline
-// roles carry one; the XLSX target carries the same two, byte-identical, in
-// `packages/xlsx/lib/index.js`, and they move together (SCHEMA.md states the
-// pair for both). A target can only import public engine helpers, so there is
+// Band-role omakase defaults — the third of those four layers, over the report
+// default and under the author's own, which therefore always wins. Only the
+// headline roles carry one; the XLSX target carries the same two,
+// byte-identical, in `packages/xlsx/lib/index.js`, and they move together
+// (SCHEMA.md states the pair for both). A target can only import public engine helpers, so there is
 // nowhere to share this from and the two copies are synced by hand.
 //
 // `@quario/html` deliberately carries none of this, nor the leading, padding
@@ -103,4 +94,4 @@ let dressed = (style) => !!(style && (style.underline || style.strikethrough));
 /** @type {(style: any) => boolean} */
 let upper = (style) => !!(style && style.uppercase);
 
-export { BAND, BLACK, GUTTER, LEAD, PADX, PADY, col, dressed, roled, shift, sizeOf, stack, upper };
+export { BAND, BLACK, GUTTER, LEAD, PADX, PADY, col, dressed, merge, roled, shift, sizeOf, upper };

package/lib/text.js

@@ -3,14 +3,19 @@
  * their resolved typography, and a greedy breaker turns those into lines. Pure
  * measurement against the font registry — nothing here touches the page.
  */
-import { display } from "quario";
+import { display, format } from "quario";
 import { ascOf, face, printable, width } from "./fonts.js";
 import { LEAD, col, dressed, sizeOf, upper } from "./style.js";
 
-// What measuring needs and no more: the embedded faces to measure against
-// and the base size a style falls back to. A `Canvas` satisfies it, so
-// callers pass theirs straight in — but nothing here can touch a page.
-/** @typedef {{ fonts: import('./fonts.js').Fonts, base: number }} Metrics */
+// What measuring needs and no more: the embedded faces to measure against, and
+// the base size and family a style falls back to — the report default's two
+// declarations, which the canvas carries for the whole render. A `Canvas`
+// satisfies it, so callers pass theirs straight in — but nothing here can
+// touch a page.
+/**
+ * @typedef {{ fonts: import('./fonts.js').Fonts, base: number,
+ *   family: string | null, locale?: string, currency?: string, timeZone?: string }} Metrics
+ */
 
 /**
  * @typedef {{ text: string, font: any, size: number, color: any,
@@ -22,13 +27,13 @@ import { LEAD, col, dressed, sizeOf, upper } from "./style.js";
  *   underline?: boolean, strikethrough?: boolean }} Line
  */
 
-/**
- * @typedef {{ cur: Atom[], w: number, lines: Line[], base: number,
- *   fonts: import('./fonts.js').Fonts }} Wrap
- */
+/** @typedef {{ cur: Atom[], w: number, lines: Line[], base: number }} Wrap */
 
-/** @type {(token: any) => string} */
-let rawOf = (token) => ("literal" in token ? token.literal : display(token.value));
+/** @type {(token: any, style: any, metrics: Metrics) => string} */
+let rawOf = (token, style, metrics) => {
+  if ("literal" in token) return token.literal;
+  return format(token.value, style?.format, metrics) ?? display(token.value);
+};
 
 // This target has no text-transform to defer to, so `uppercase` is applied to
 // the string before it is measured -- the widths have to be the widths of what
@@ -57,20 +62,23 @@ let pushLine = (out, font, size, color, i, line) => {
 let look = (metrics, style) => {
   let resolved = style || {};
   return {
-    font: face(metrics.fonts, resolved),
+    font: face(metrics.fonts, resolved, metrics.family),
     size: sizeOf(resolved, metrics.base),
     color: col(resolved.color),
   };
 };
 
 // Flatten a cell's tokens to word/space atoms carrying the cell's resolved
-// typography — one face, size and colour for the whole cell.
+// typography — one face, size and colour for the whole cell. CR, LF, and
+// CRLF are one hard break each (SCHEMA.md, Cell values).
 /** @type {(metrics: Metrics, tokens: any[], style: any) => Atom[]} */
 let atoms = (metrics, tokens, style) => {
   let out = /** @type {Atom[]} */ ([]);
   let { font, size, color } = look(metrics, style);
   for (let token of tokens)
-    for (let [i, line] of cased(rawOf(token), style).split("\n").entries())
+    for (let [i, line] of cased(rawOf(token, style, metrics), style)
+      .split(/\r\n|\r|\n/)
+      .entries())
       pushLine(out, font, size, color, i, line);
   return out;
 };
@@ -112,7 +120,9 @@ let growPiece = (run, atom) => {
 /** @type {(state: Wrap, run: Run) => void} */
 let finish = (state, run) => {
   if (!run.size) run.size = state.base;
-  if (!run.asc) run.asc = ascOf(face(state.fonts, {}), run.size);
+  // No `asc` fallback: a run with no atoms is a blank line, and an ascender
+  // only places pieces. `drawLine` loops over none and `decorateLine` skips a
+  // line with no width, so a measured one would be a face lookup nothing reads.
   state.lines.push({
     pieces: run.pieces,
     w: run.w,
@@ -216,11 +226,12 @@ let placeAtom = (state, atom, avail) => {
 
 // Greedy wrap against `avail`: spaces never start a line, an over-wide word
 // breaks by character, hard breaks always break. A cell's atoms share one
-// typography, so a line's atoms merge into a single draw piece.
-/** @type {(metrics: Metrics, list: Atom[], avail: number) => Line[]} */
-let wrap = (metrics, list, avail) => {
+// typography, so a line's atoms merge into a single draw piece. `size` is the
+// empty-run height — a blank item, a hard-break hole.
+/** @type {(metrics: Metrics, list: Atom[], avail: number, size: number) => Line[]} */
+let wrap = (metrics, list, avail, size) => {
   /** @type {Wrap} */
-  let state = { cur: [], w: 0, lines: [], base: metrics.base, fonts: metrics.fonts };
+  let state = { cur: [], w: 0, lines: [], base: size };
   for (let atom of list) placeAtom(state, atom, avail);
   emit(state);
   return state.lines;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quario/pdf",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "The browserless, paginated PDF render target for quario — in the makings, not yet released",
   "homepage": "https://getquario.com",
   "license": "SEE LICENSE IN LICENSE",
@@ -42,13 +42,13 @@
     "@arethetypeswrong/cli": "^0.18.3",
     "@pdf-lib/fontkit": "^1.1.1",
     "@size-limit/preset-small-lib": "^13.0.3",
-    "quario": "^0.2.0",
+    "quario": "^0.3.0",
     "size-limit": "^13.0.3",
     "typescript": "^7.0.2"
   },
   "peerDependencies": {
     "@pdf-lib/fontkit": "^1.1.1",
-    "quario": "^0.2.0"
+    "quario": "^0.3.0"
   },
   "peerDependenciesMeta": {
     "@pdf-lib/fontkit": {
@@ -62,7 +62,7 @@
         "quario",
         "pdf-lib"
       ],
-      "limit": "9.2 kB"
+      "limit": "10.5 kB"
     }
   ],
   "engines": {