openfig-cli 0.3.34 → 0.3.37

package/lib/rasterizer/svg-builder.mjs

@@ -21,6 +21,7 @@
 
 import { readFileSync } from 'fs';
 import { join } from 'path';
+import { extractRenderableGradientFill, resolveGradientGeometry } from 'openfig-core';
 import { hashToHex } from '../core/image-helpers.mjs';
 import { nid } from '../core/node-helpers.mjs';
 
@@ -56,49 +57,34 @@ function resolveFill(fillPaints) {
  *  w, h = element dimensions in pixels (needed for userSpaceOnUse coordinates).
  *  Returns { defs: string, fill: string } where fill is 'url(#grad-N)'. */
 function resolveGradientSvg(paint, w, h) {
+  const gradient = extractRenderableGradientFill([paint]);
+  if (!gradient) return null;
+  const geometry = resolveGradientGeometry(gradient, w, h);
+  if (!geometry) return null;
+
   const id = `grad-${++_svgIdSeq}`;
-  const stops = (paint.stops ?? []).map(s => {
+  const stops = gradient.stops.map(s => {
     const color = cssColor(s.color ?? {});
     return `<stop offset="${s.position}" stop-color="${color}"/>`;
   }).join('');
-  const opacityAttr = (paint.opacity ?? 1) !== 1 ? ` opacity="${paint.opacity}"` : '';
-
-  // Figma's paint.transform maps from NODE space to GRADIENT space.
-  // We need the inverse: gradient space → node normalized space → pixels.
-  const t = paint.transform ?? {};
-  const ga = t.m00 ?? 1, gc = t.m01 ?? 0, ge = t.m02 ?? 0;
-  const gb = t.m10 ?? 0, gd = t.m11 ?? 1, gf = t.m12 ?? 0;
-  const det = ga * gd - gb * gc;
-  // Inverse affine: paint.transform maps node→gradient; we need gradient→node
-  const ia = gd / det, ic = -gc / det, ie = (gc * gf - gd * ge) / det;
-  const ib = -gb / det, iid = ga / det, iif = (gb * ge - ga * gf) / det;
-  const tx = (gx, gy) => (ia * gx + ic * gy + ie) * w;
-  const ty = (gx, gy) => (ib * gx + iid * gy + iif) * h;
+  const opacityAttr = gradient.opacity !== 1 ? ` opacity="${gradient.opacity}"` : '';
   const f = v => +v.toFixed(2);
 
-  if (paint.type === 'GRADIENT_LINEAR') {
-    // Linear gradient line: (0, 0.5) → (1, 0.5) in gradient space
-    return {
-      defs: `<linearGradient id="${id}" x1="${f(tx(0,0.5))}" y1="${f(ty(0,0.5))}" x2="${f(tx(1,0.5))}" y2="${f(ty(1,0.5))}" gradientUnits="userSpaceOnUse">${stops}</linearGradient>`,
-      fill: `url(#${id})`,
-      opacityAttr,
-    };
-  }
-  if (paint.type === 'GRADIENT_RADIAL') {
-    // Radial gradient: center (0.5, 0.5), radius mapped through transform
-    const cx = f(tx(0.5, 0.5)), cy = f(ty(0.5, 0.5));
-    // Radius along the gradient's x-axis: distance from center to (1, 0.5)
-    const rx = f(Math.hypot(tx(1, 0.5) - tx(0.5, 0.5), ty(1, 0.5) - ty(0.5, 0.5)));
-    const ry = f(Math.hypot(tx(0.5, 1) - tx(0.5, 0.5), ty(0.5, 1) - ty(0.5, 0.5)));
-    // Rotation angle from the transform
-    const angle = f(Math.atan2(ty(1, 0.5) - ty(0.5, 0.5), tx(1, 0.5) - tx(0.5, 0.5)) * 180 / Math.PI);
+  if (geometry.type === 'linear') {
     return {
-      defs: `<radialGradient id="${id}" cx="${cx}" cy="${cy}" rx="${rx}" ry="${ry}" gradientUnits="userSpaceOnUse" gradientTransform="rotate(${angle},${cx},${cy})">${stops}</radialGradient>`,
+      defs: `<linearGradient id="${id}" x1="${f(geometry.start.x)}" y1="${f(geometry.start.y)}" x2="${f(geometry.end.x)}" y2="${f(geometry.end.y)}" gradientUnits="userSpaceOnUse">${stops}</linearGradient>`,
       fill: `url(#${id})`,
       opacityAttr,
     };
   }
-  return null;
+  const cx = f(geometry.center.x), cy = f(geometry.center.y);
+  const rx = f(geometry.radiusX), ry = f(geometry.radiusY);
+  const angle = f(geometry.angle * 180 / Math.PI);
+  return {
+    defs: `<radialGradient id="${id}" cx="${cx}" cy="${cy}" rx="${rx}" ry="${ry}" gradientUnits="userSpaceOnUse" gradientTransform="rotate(${angle},${cx},${cy})">${stops}</radialGradient>`,
+    fill: `url(#${id})`,
+    opacityAttr,
+  };
 }
 
 function appendDefs(defs, extra) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openfig-cli",
-  "version": "0.3.34",
+  "version": "0.3.37",
   "description": "OpenFig — Open-source tools for Figma file parsing and rendering",
   "type": "module",
   "bin": {
@@ -45,7 +45,7 @@
     "@modelcontextprotocol/sdk": "^1.27.1",
     "@resvg/resvg-wasm": "^2.6.2",
     "kiwi-schema": "^0.5.0",
-    "openfig-core": "^0.3.2",
+    "openfig-core": "^0.3.5",
     "pako": "^2.1.0",
     "pdf-lib": "^1.17.1",
     "sharp": "^0.34.5",