h17-sspdf 1.1.0 → 1.3.0

package/DOCUMENTATION.md

@@ -675,9 +675,9 @@ Renders two independent operation lists side by side. Each column gets half the
 
 **Column width:** `(contentWidth - gutterMm) / 2`. Both columns are always equal width.
 
-**Cursor after:** `max(col1EndY, col2EndY)` — the bottom of the taller column.
+**Cursor after:** `max(col1EndY, col2EndY)` - the bottom of the taller column.
 
-Any operation type that works at the top level works inside columns. Tables, images, bullets, nested blocks — all work. Columns inside columns are supported (the margin stack is re-entrant).
+Any operation type that works at the top level works inside columns. Tables, images, bullets, nested blocks all work. Columns inside columns are supported (the margin stack is re-entrant).
 
 ### Inferred text operations
 

package/README.md

@@ -20,7 +20,7 @@ Source JSON  +  Theme  =  PDF
 npm install h17-sspdf
 ```
 
-Requires **Node.js 18 or newer**. The engine vendors a single self-contained UMD build of jsPDF (which bundles fflate, fast-png, iobuffer internally) plus Chart.js and chartjs-node-canvas. The only install-time dependency is [`canvas`](https://www.npmjs.com/package/canvas) (native C++ addon, used by the chart plugin) — no transitive dependency tree beyond that.
+Requires **Node.js 18 or newer**. The engine vendors a single self-contained UMD build of jsPDF (which bundles fflate, fast-png, iobuffer internally) plus Chart.js and chartjs-node-canvas. The base install has no runtime dependencies. The optional chart plugin uses [`canvas`](https://www.npmjs.com/package/canvas) as an optional peer dependency.
 
 ## The problem it solves
 
@@ -199,7 +199,7 @@ A repeating pattern of `row` + `text` pairs. The row carries the label/value, th
   "type": "quote",
   "label": "news.pullquote",
   "text": "When the format becomes a system instead of a template, agencies stop re-solving the same layout problem every week.",
-  "attribution": "— Elena Ward, public records modernization lead",
+  "attribution": "- Elena Ward, public records modernization lead",
   "xMm": 22,
   "maxWidthMm": 166
 }
@@ -474,7 +474,7 @@ Claude Code skills for generating PDFs and themes are available in the `skills/`
 - Single-line `row` cells, no multi-line column pairs
 - `{{page}}` gives the current page number; `{{pages}}` (total page count) is not supported because keep-together rules make the final page count unpredictable until the last operation is laid out
 - Charts require the `canvas` npm package (native C++ addon) for server-side rendering; everything else is zero native dependencies
-- A `jspdf.umd.js` build is vendored for client-side/browser use. It bundles all dependencies internally but requires wiring up your own entry point — `pdf-core.js` uses the Node build by default
+- A `jspdf.umd.js` build is vendored for client-side/browser use. It bundles all dependencies internally but requires wiring up your own entry point; `pdf-core.js` uses the Node build by default
 
 ---
 

package/cli.js

@@ -155,7 +155,7 @@ function collectChartOps(obj) {
     obj.forEach((item) => charts.push(...collectChartOps(item)));
   } else {
     if (obj.type === "chart") charts.push(obj);
-    for (const key of ["operations", "sections", "content", "items", "children"]) {
+    for (const key of ["operations", "sections", "content", "items", "children", "column1", "column2"]) {
       if (Array.isArray(obj[key])) charts.push(...collectChartOps(obj[key]));
     }
     if (obj.pageTemplates) {

package/core/plugin-chart.js

@@ -50,6 +50,10 @@
  */
 
 let _ChartJSNodeCanvas = null;
+const _rendererCache = new Map();
+const MAX_RENDERER_CACHE_SIZE = 8;
+const DEFAULT_CANVAS_WIDTH = 1600;
+const DEFAULT_CANVAS_HEIGHT = 800;
 
 function getCanvas() {
   if (!_ChartJSNodeCanvas) {
@@ -64,6 +68,46 @@ function getCanvas() {
   return _ChartJSNodeCanvas;
 }
 
+function getRenderer(width, height) {
+  const ChartJSNodeCanvas = getCanvas();
+  const key = `${width}x${height}`;
+  if (_rendererCache.has(key)) {
+    return _rendererCache.get(key);
+  }
+  if (_rendererCache.size >= MAX_RENDERER_CACHE_SIZE) {
+    const oldestKey = _rendererCache.keys().next().value;
+    _rendererCache.delete(oldestKey);
+  }
+  const renderer = new ChartJSNodeCanvas({
+    width,
+    height,
+    backgroundColour: 'transparent',
+  });
+  _rendererCache.set(key, renderer);
+  return renderer;
+}
+
+function resolvePositiveNumber(value, fallback, name) {
+  if (value === undefined || value === null || value === '') {
+    return fallback;
+  }
+  const numberValue = Number(value);
+  if (!Number.isFinite(numberValue) || numberValue <= 0) {
+    throw new Error(`chart plugin: ${name} must be a positive number`);
+  }
+  return numberValue;
+}
+
+function cloneChartValue(value) {
+  if (!value || typeof value !== 'object') return value;
+  if (Array.isArray(value)) return value.map(cloneChartValue);
+  const out = {};
+  for (const key of Object.keys(value)) {
+    out[key] = cloneChartValue(value[key]);
+  }
+  return out;
+}
+
 /**
  * Pre-render the chart to a PNG buffer and cache it on the operation.
  * Call this before renderDocument() for any source containing chart operations.
@@ -77,35 +121,28 @@ function getCanvas() {
  *
  * Supported token: {{v}} - replaced with the callback's first argument (value).
  */
-function resolveCallbackTemplates(obj) {
-  if (!obj || typeof obj !== 'object') return obj;
-  if (Array.isArray(obj)) {
-    for (let i = 0; i < obj.length; i++) {
-      obj[i] = resolveCallbackTemplates(obj[i]);
-    }
-    return obj;
-  }
-  for (const key of Object.keys(obj)) {
-    if (key === 'callback' && typeof obj[key] === 'string' && obj[key].includes('{{v}}')) {
-      const template = obj[key];
-      obj[key] = function (value) { return template.replace(/\{\{v\}\}/g, String(value)); };
+function resolveCallbackTemplates(value) {
+  if (!value || typeof value !== 'object') return value;
+  if (Array.isArray(value)) return value.map(resolveCallbackTemplates);
+
+  const out = {};
+  for (const key of Object.keys(value)) {
+    if (key === 'callback' && typeof value[key] === 'string' && value[key].includes('{{v}}')) {
+      const template = value[key];
+      out[key] = function (callbackValue) {
+        return template.replace(/\{\{v\}\}/g, String(callbackValue));
+      };
     } else {
-      obj[key] = resolveCallbackTemplates(obj[key]);
+      out[key] = resolveCallbackTemplates(value[key]);
     }
   }
-  return obj;
+  return out;
 }
 
 async function preRender(operation) {
-  const ChartJSNodeCanvas = getCanvas();
-  const canvasW = operation.canvasWidth  || 1600;
-  const canvasH = operation.canvasHeight || 800;
-
-  const canvas = new ChartJSNodeCanvas({
-    width: canvasW,
-    height: canvasH,
-    backgroundColour: 'transparent',
-  });
+  const canvasW = resolvePositiveNumber(operation.canvasWidth, DEFAULT_CANVAS_WIDTH, 'canvasWidth');
+  const canvasH = resolvePositiveNumber(operation.canvasHeight, DEFAULT_CANVAS_HEIGHT, 'canvasHeight');
+  const canvas = getRenderer(canvasW, canvasH);
 
   const options = resolveCallbackTemplates({
     ...(operation.options || {}),
@@ -115,7 +152,7 @@ async function preRender(operation) {
 
   operation._buf = await canvas.renderToBuffer({
     type:    operation.chartType || 'bar',
-    data:    operation.data    || { labels: [], datasets: [] },
+    data:    cloneChartValue(operation.data || { labels: [], datasets: [] }),
     options,
   });
 }

package/core/plugin-registry.js

@@ -3,6 +3,7 @@ const _plugins = new Map();
 const BUILT_IN_TYPES = new Set([
   "text", "row", "bullet", "divider", "spacer", "hiddenText",
   "block", "section", "group", "quote", "table", "image",
+  "columns", "pageBreak",
 ]);
 
 function registerPlugin(type, handler) {