@open-pencil/cli 0.9.0 → 0.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-pencil/cli",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "license": "MIT",
   "type": "module",
   "bin": {
@@ -19,7 +19,7 @@
     "provenance": true
   },
   "dependencies": {
-    "@open-pencil/core": "^0.9.0",
+    "@open-pencil/core": "^0.10.0",
     "agentfmt": "^0.1.3",
     "canvaskit-wasm": "^0.40.0",
     "citty": "^0.1.6"

package/src/commands/export.ts

@@ -3,7 +3,7 @@ import { basename, extname, resolve } from 'node:path'
 
 import { renderNodesToSVG, sceneNodeToJSX, selectionToJSX } from '@open-pencil/core'
 
-import { loadDocument, loadFonts, exportNodes, exportThumbnail } from '../headless'
+import { loadDocument, exportNodes, exportThumbnail } from '../headless'
 import { isAppMode, requireFile, rpc } from '../app-client'
 import { ok, printError } from '../format'
 import type { ExportFormat, JSXFormat } from '@open-pencil/core'
@@ -60,7 +60,6 @@ async function exportViaApp(format: string, args: ExportArgs) {
 async function exportFromFile(format: string, args: ExportArgs) {
   const file = requireFile(args.file)
   const graph = await loadDocument(file)
-  await loadFonts(graph)
 
   const pages = graph.getPages()
   const page = args.page ? pages.find((p) => p.name === args.page) : pages[0]

package/src/headless.ts

@@ -1,27 +1,14 @@
-import CanvasKitInit from 'canvaskit-wasm/full'
-import type { CanvasKit } from 'canvaskit-wasm'
 import {
   parseFigFile,
+  initCanvasKit,
   type SceneGraph,
   type ExportFormat,
-  SkiaRenderer,
   computeAllLayouts,
-  loadFont,
-  renderNodesToImage,
-  renderThumbnail
+  headlessRenderNodes,
+  headlessRenderThumbnail
 } from '@open-pencil/core'
 
-let ck: CanvasKit | null = null
-
-export async function initCanvasKit(): Promise<CanvasKit> {
-  if (ck) return ck
-  const ckPath = import.meta.resolve('canvaskit-wasm/full')
-  const binDir = new URL('.', ckPath).pathname
-  ck = await CanvasKitInit({
-    locateFile: (file) => binDir + file
-  })
-  return ck
-}
+export { initCanvasKit }
 
 export async function loadDocument(filePath: string): Promise<SceneGraph> {
   const data = await Bun.file(filePath).arrayBuffer()
@@ -30,38 +17,13 @@ export async function loadDocument(filePath: string): Promise<SceneGraph> {
   return graph
 }
 
-export async function loadFonts(graph: SceneGraph): Promise<void> {
-  const families = new Set<string>()
-  for (const node of graph.getAllNodes()) {
-    if (node.fontFamily) families.add(node.fontFamily)
-  }
-  for (const family of families) {
-    await loadFont(family)
-  }
-}
-
-function createRenderer(ckInstance: CanvasKit, width: number, height: number): SkiaRenderer {
-  const surface = ckInstance.MakeSurface(width, height)!
-  const renderer = new SkiaRenderer(ckInstance, surface)
-  renderer.viewportWidth = width
-  renderer.viewportHeight = height
-  renderer.dpr = 1
-  return renderer
-}
-
 export async function exportNodes(
   graph: SceneGraph,
   pageId: string,
   nodeIds: string[],
   options: { scale?: number; format?: ExportFormat; quality?: number }
 ): Promise<Uint8Array | null> {
-  const ckInstance = await initCanvasKit()
-  const renderer = createRenderer(ckInstance, 1, 1)
-  return renderNodesToImage(ckInstance, renderer, graph, pageId, nodeIds, {
-    scale: options.scale ?? 1,
-    format: options.format ?? 'PNG',
-    quality: options.quality
-  })
+  return headlessRenderNodes(graph, pageId, nodeIds, options)
 }
 
 export async function exportThumbnail(
@@ -70,7 +32,5 @@ export async function exportThumbnail(
   width: number,
   height: number
 ): Promise<Uint8Array | null> {
-  const ckInstance = await initCanvasKit()
-  const renderer = createRenderer(ckInstance, width, height)
-  return renderThumbnail(ckInstance, renderer, graph, pageId, width, height)
+  return headlessRenderThumbnail(graph, pageId, width, height)
 }