@formepdf/cli 0.6.2 → 0.7.1

package/dist/build.js

@@ -1,30 +1,14 @@
-import { readFile, writeFile } from 'node:fs/promises';
-import { resolve, join } from 'node:path';
-import { pathToFileURL } from 'node:url';
-import { isValidElement } from 'react';
-import { bundleFile, BUNDLE_DIR } from './bundle.js';
-import { renderDocumentWithLayout } from '@formepdf/core';
+import { writeFile } from 'node:fs/promises';
+import { resolve } from 'node:path';
+import { renderFromFile } from '@formepdf/renderer';
 export async function buildPdf(inputPath, options) {
     const absoluteInput = resolve(inputPath);
     console.log(`Building ${absoluteInput}...`);
     try {
-        const code = await bundleFile(absoluteInput);
-        // Write temp file inside CLI package dir so Node resolves @formepdf/* deps
-        const tmpFile = join(BUNDLE_DIR, `.forme-build-${Date.now()}.mjs`);
-        await writeFile(tmpFile, code);
-        try {
-            const mod = await import(pathToFileURL(tmpFile).href);
-            const element = await resolveElement(mod, options.dataPath);
-            const { pdf } = await renderDocumentWithLayout(element);
-            const outputPath = resolve(options.output);
-            await writeFile(outputPath, pdf);
-            console.log(`Written ${pdf.length} bytes to ${outputPath}`);
-        }
-        finally {
-            // Clean up temp file
-            const { unlink } = await import('node:fs/promises');
-            await unlink(tmpFile).catch(() => { });
-        }
+        const { pdf } = await renderFromFile(absoluteInput, { dataPath: options.dataPath });
+        const outputPath = resolve(options.output);
+        await writeFile(outputPath, pdf);
+        console.log(`Written ${pdf.length} bytes to ${outputPath}`);
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
@@ -32,50 +16,3 @@ export async function buildPdf(inputPath, options) {
         process.exit(1);
     }
 }
-async function resolveElement(mod, dataPath) {
-    const exported = mod.default;
-    if (exported === undefined) {
-        throw new Error(`No default export found.\n\n` +
-            `  Your file must export a Forme element or a function that returns one:\n\n` +
-            `    export default (\n` +
-            `      <Document>\n` +
-            `        <Text>Hello</Text>\n` +
-            `      </Document>\n` +
-            `    );\n\n` +
-            `  Or with data:\n\n` +
-            `    export default function Report(data) {\n` +
-            `      return <Document><Text>{data.title}</Text></Document>\n` +
-            `    }`);
-    }
-    if (typeof exported === 'function') {
-        const data = dataPath ? await loadJsonData(dataPath) : {};
-        const result = await exported(data);
-        if (!isValidElement(result)) {
-            throw new Error(`Default export function did not return a valid Forme element.\n` +
-                `  Got: ${typeof result}\n` +
-                `  Make sure your function returns a <Document> element.`);
-        }
-        return result;
-    }
-    if (isValidElement(exported)) {
-        if (dataPath) {
-            console.warn(`Warning: --data flag provided but default export is a static element, not a function.\n` +
-                `  The data file will be ignored. Export a function to use --data.`);
-        }
-        return exported;
-    }
-    throw new Error(`Default export is not a valid Forme element.\n` +
-        `  Got: ${typeof exported}\n` +
-        `  Expected: a <Document> element or a function that returns one.`);
-}
-async function loadJsonData(dataPath) {
-    const absolutePath = resolve(dataPath);
-    const raw = await readFile(absolutePath, 'utf-8');
-    try {
-        return JSON.parse(raw);
-    }
-    catch {
-        throw new Error(`Failed to parse data file as JSON: ${absolutePath}\n` +
-            `  Make sure the file contains valid JSON.`);
-    }
-}

package/dist/dev.js

@@ -1,13 +1,10 @@
 import { createServer } from 'node:http';
-import { readFile, writeFile, unlink } from 'node:fs/promises';
-import { resolve, basename, dirname, join } from 'node:path';
-import { pathToFileURL } from 'node:url';
+import { readFile, writeFile } from 'node:fs/promises';
+import { resolve, basename } from 'node:path';
 import { watch } from 'chokidar';
 import { WebSocketServer } from 'ws';
 import open from 'open';
-import { isValidElement } from 'react';
-import { bundleFile, BUNDLE_DIR } from './bundle.js';
-import { renderPdfWithLayout } from '@formepdf/core';
+import { renderFromFile } from '@formepdf/renderer';
 export function startDevServer(inputPath, options) {
     const absoluteInput = resolve(inputPath);
     const fileName = basename(absoluteInput);
@@ -124,66 +121,20 @@ export function startDevServer(inputPath, options) {
     let buildCounter = 0;
     async function rebuild() {
         const buildId = ++buildCounter;
-        const start = performance.now();
         try {
-            const code = await bundleFile(absoluteInput);
+            const result = await renderFromFile(absoluteInput, {
+                dataPath,
+                data: useInMemoryData ? inMemoryData : undefined,
+                pageSize: pageSizeOverride ?? undefined,
+            });
             // Skip if a newer build started
             if (buildId !== buildCounter)
                 return;
-            // Write temp file inside CLI package dir so Node resolves @formepdf/* deps
-            const tmpFile = join(BUNDLE_DIR, `.forme-dev-${Date.now()}.mjs`);
-            await writeFile(tmpFile, code);
-            let mod;
-            try {
-                mod = await import(pathToFileURL(tmpFile).href);
-            }
-            finally {
-                await unlink(tmpFile).catch(() => { });
-            }
-            const overrideData = useInMemoryData ? inMemoryData : undefined;
-            const element = await resolveElement(mod, dataPath, overrideData);
-            // Serialize JSX to document JSON, apply overrides, then render
-            const { serialize } = await import('@formepdf/react');
-            const doc = serialize(element);
-            // Apply page size override
-            if (pageSizeOverride) {
-                const { width, height } = pageSizeOverride;
-                const customSize = { Custom: { width, height } };
-                // Override defaultPage size
-                if (doc.defaultPage && typeof doc.defaultPage === 'object') {
-                    doc.defaultPage.size = customSize;
-                }
-                // Override each Page node's config size
-                if (Array.isArray(doc.children)) {
-                    for (const child of doc.children) {
-                        if (child && typeof child === 'object' && child.kind && typeof child.kind === 'object') {
-                            const kind = child.kind;
-                            if (kind.type === 'Page' && kind.config && typeof kind.config === 'object') {
-                                kind.config.size = customSize;
-                            }
-                        }
-                    }
-                }
-            }
-            // Resolve font file paths and image URLs before rendering
-            await Promise.all([
-                resolveFontPaths(doc, absoluteInput),
-                resolveImageUrls(doc),
-            ]);
-            const { pdf, layout } = await renderPdfWithLayout(JSON.stringify(doc));
-            // Skip if a newer build started
-            if (buildId !== buildCounter)
-                return;
-            currentPdf = pdf;
-            currentLayout = layout;
+            currentPdf = result.pdf;
+            currentLayout = result.layout;
             lastError = null;
-            lastRenderTime = Math.round(performance.now() - start);
-            const pageCount = layout?.pages?.length ?? 0;
-            // Warn once if no source locations found (click-to-inspect won't work)
-            if (firstRender && !hasAnySourceLocation(doc)) {
-                console.warn(`\n  Warning: No source locations found — click-to-inspect is disabled.\n` +
-                    `  Ensure your tsconfig.json has "jsx": "react-jsx" (not "react").\n`);
-            }
+            lastRenderTime = result.renderTimeMs;
+            const pageCount = result.layout?.pages?.length ?? 0;
             if (firstRender) {
                 firstRender = false;
                 const url = `http://localhost:${port}`;
@@ -239,52 +190,19 @@ export function startDevServer(inputPath, options) {
         rebuild();
     });
 }
-async function resolveElement(mod, dataPath, overrideData) {
-    const exported = mod.default;
-    if (exported === undefined) {
-        throw new Error(`No default export found.\n\n` +
-            `  Your file must export a Forme element or a function that returns one:\n\n` +
-            `    export default (\n` +
-            `      <Document>\n` +
-            `        <Text>Hello</Text>\n` +
-            `      </Document>\n` +
-            `    );`);
-    }
-    if (typeof exported === 'function') {
-        let data = {};
-        if (overrideData !== undefined) {
-            data = overrideData;
-        }
-        else if (dataPath) {
-            const raw = await readFile(dataPath, 'utf-8');
-            try {
-                data = JSON.parse(raw);
-            }
-            catch {
-                throw new Error(`Failed to parse data file as JSON: ${dataPath}\n` +
-                    `  Make sure the file contains valid JSON.`);
-            }
-        }
-        const result = await exported(data);
-        if (!isValidElement(result)) {
-            throw new Error(`Default export function did not return a valid Forme element.\n` +
-                `  Got: ${typeof result}`);
-        }
-        return result;
+async function getPreviewHtml() {
+    // Try to load preview HTML from @formepdf/renderer
+    try {
+        const { createRequire } = await import('node:module');
+        const require = createRequire(import.meta.url);
+        const previewPath = require.resolve('@formepdf/renderer/preview');
+        return await readFile(previewPath, 'utf-8');
     }
-    if (isValidElement(exported)) {
-        return exported;
+    catch {
+        // Fallback: try local paths
     }
-    throw new Error(`Default export is not a valid Forme element.\n` +
-        `  Got: ${typeof exported}\n` +
-        `  Expected: a <Document> element or a function that returns one.`);
-}
-async function getPreviewHtml() {
-    // Try to load the preview HTML from the package's own file tree
     const possiblePaths = [
-        // When running from dist/ (built)
         new URL('./preview/index.html', import.meta.url),
-        // When running from src/ (dev with ts-node)
         new URL('../src/preview/index.html', import.meta.url),
     ];
     for (const p of possiblePaths) {
@@ -295,61 +213,5 @@ async function getPreviewHtml() {
             continue;
         }
     }
-    // Inline fallback
     return `<!DOCTYPE html><html><body><h1>Preview HTML not found</h1></body></html>`;
 }
-function hasAnySourceLocation(doc) {
-    const children = doc.children;
-    if (!children)
-        return false;
-    function check(node) {
-        if (node.sourceLocation)
-            return true;
-        const kids = node.children;
-        return kids?.some(check) ?? false;
-    }
-    return children.some(check);
-}
-function uint8ArrayToBase64(bytes) {
-    return Buffer.from(bytes).toString('base64');
-}
-async function resolveImageUrls(doc) {
-    const children = doc.children;
-    if (!children?.length)
-        return;
-    await Promise.all(children.map(resolveImageUrlsInNode));
-}
-async function resolveImageUrlsInNode(node) {
-    const kind = node.kind;
-    if (kind?.type === 'Image' && typeof kind.src === 'string') {
-        const src = kind.src;
-        if (src.startsWith('http://') || src.startsWith('https://')) {
-            const res = await fetch(src);
-            if (!res.ok)
-                throw new Error(`Failed to fetch image: ${src} (${res.status})`);
-            const contentType = res.headers.get('content-type') || 'image/png';
-            const buf = new Uint8Array(await res.arrayBuffer());
-            kind.src = `data:${contentType};base64,${uint8ArrayToBase64(buf)}`;
-        }
-    }
-    const children = node.children;
-    if (children?.length) {
-        await Promise.all(children.map(resolveImageUrlsInNode));
-    }
-}
-async function resolveFontPaths(doc, templatePath) {
-    const fonts = doc.fonts;
-    if (!fonts?.length)
-        return;
-    const templateDir = dirname(templatePath);
-    for (const font of fonts) {
-        if (font.src instanceof Uint8Array) {
-            font.src = uint8ArrayToBase64(font.src);
-        }
-        else if (typeof font.src === 'string' && !font.src.startsWith('data:')) {
-            const fontPath = resolve(templateDir, font.src);
-            const bytes = await readFile(fontPath);
-            font.src = uint8ArrayToBase64(new Uint8Array(bytes));
-        }
-    }
-}

package/dist/template-build.js

@@ -1,14 +1,14 @@
 import { writeFile } from 'node:fs/promises';
-import { resolve, join, basename } from 'node:path';
+import { resolve, dirname, basename } from 'node:path';
 import { pathToFileURL } from 'node:url';
 import { isValidElement } from 'react';
-import { bundleFile, BUNDLE_DIR } from './bundle.js';
+import { bundleFile, resolveFontSources } from '@formepdf/renderer';
 export async function buildTemplate(inputPath, options) {
     const absoluteInput = resolve(inputPath);
     console.log(`Building template from ${absoluteInput}...`);
     try {
         const code = await bundleFile(absoluteInput);
-        const tmpFile = join(BUNDLE_DIR, `.forme-template-${Date.now()}.mjs`);
+        const tmpFile = resolve(dirname(absoluteInput), `.forme-template-${Date.now()}.mjs`);
         await writeFile(tmpFile, code);
         try {
             const mod = await import(pathToFileURL(tmpFile).href);
@@ -39,7 +39,7 @@ export async function buildTemplate(inputPath, options) {
             }
             const templateJson = serializeTemplate(element);
             // Resolve fonts to base64 for portability
-            await resolveFontPaths(templateJson, absoluteInput);
+            await resolveFontSources(templateJson, dirname(absoluteInput));
             const outputPath = resolve(options.output ?? defaultTemplateName(inputPath));
             const json = JSON.stringify(templateJson, null, 2);
             await writeFile(outputPath, json);
@@ -60,22 +60,3 @@ function defaultTemplateName(inputPath) {
     const base = basename(inputPath).replace(/\.(tsx|jsx|ts|js)$/, '');
     return `${base}.template.json`;
 }
-async function resolveFontPaths(doc, templatePath) {
-    const { dirname } = await import('node:path');
-    const { readFile } = await import('node:fs/promises');
-    const { resolve: resolvePath } = await import('node:path');
-    const templateDir = dirname(templatePath);
-    const fonts = doc.fonts;
-    if (!fonts?.length)
-        return;
-    for (const font of fonts) {
-        if (font.src instanceof Uint8Array) {
-            font.src = Buffer.from(font.src).toString('base64');
-        }
-        else if (typeof font.src === 'string' && !font.src.startsWith('data:')) {
-            const fontPath = resolvePath(templateDir, font.src);
-            const bytes = await readFile(fontPath);
-            font.src = Buffer.from(bytes).toString('base64');
-        }
-    }
-}

package/package.json

@@ -1,22 +1,20 @@
 {
   "name": "@formepdf/cli",
-  "version": "0.6.2",
+  "version": "0.7.1",
   "description": "CLI for Forme PDF rendering engine — dev server with live preview and build command",
   "type": "module",
   "bin": {
     "forme": "./dist/index.js"
   },
   "scripts": {
-    "build": "tsc && rm -rf dist/preview && cp -r src/preview dist/preview",
+    "build": "tsc",
     "test": "vitest run"
   },
   "files": [
     "dist"
   ],
   "dependencies": {
-    "@formepdf/core": "0.6.2",
-    "@formepdf/react": "0.6.2",
-    "esbuild": "^0.24.0",
+    "@formepdf/renderer": "0.7.0",
     "chokidar": "^4.0.0",
     "ws": "^8.18.0",
     "open": "^10.1.0"