openfig-cli 0.3.23 → 0.3.25

package/lib/core/fig-deck.mjs

@@ -20,6 +20,7 @@ import { join, resolve } from 'path';
 import { tmpdir } from 'os';
 import { nid } from './node-helpers.mjs';
 import { deepClone } from './deep-clone.mjs';
+import { hashToHex } from './image-helpers.mjs';
 
 export class FigDeck {
   constructor() {
@@ -366,6 +367,39 @@ export class FigDeck {
           }
         }
 
+        // Remap blob indices (commandsBlob, vectorNetworkBlob, fillGeometry etc.)
+        // Blobs in source deck reference positions in sourceDeck.message.blobs.
+        // Copy each referenced blob to target and update the index.
+        const remapBlobIndex = (idx) => {
+          if (idx == null || idx < 0) return idx;
+          if (!sourceDeck.message.blobs || idx >= sourceDeck.message.blobs.length) return idx;
+          if (!this._blobRemap) this._blobRemap = new Map();
+          if (this._blobRemap.has(idx)) return this._blobRemap.get(idx);
+          const blob = sourceDeck.message.blobs[idx];
+          if (!this.message.blobs) this.message.blobs = [];
+          const newIdx = this.message.blobs.length;
+          this.message.blobs.push(deepClone(blob));
+          this._blobRemap.set(idx, newIdx);
+          return newIdx;
+        };
+
+        // fillGeometry[].commandsBlob
+        if (clone.fillGeometry) {
+          for (const fg of clone.fillGeometry) {
+            if (fg.commandsBlob != null) fg.commandsBlob = remapBlobIndex(fg.commandsBlob);
+          }
+        }
+        // strokeGeometry[].commandsBlob
+        if (clone.strokeGeometry) {
+          for (const sg of clone.strokeGeometry) {
+            if (sg.commandsBlob != null) sg.commandsBlob = remapBlobIndex(sg.commandsBlob);
+          }
+        }
+        // vectorNetworkBlob (VECTOR nodes)
+        if (clone.vectorNetworkBlob != null) {
+          clone.vectorNetworkBlob = remapBlobIndex(clone.vectorNetworkBlob);
+        }
+
         clone.phase = 'CREATED';
         delete clone.slideThumbnailHash;
         delete clone.editInfo;
@@ -374,6 +408,9 @@ export class FigDeck {
         return clone;
       });
 
+      // Clear blob remap cache after processing this symbol's subtree
+      delete this._blobRemap;
+
       // Copy referenced images from source deck
       if (sourceDeck.imagesDir) {
         if (!this.imagesDir) {
@@ -384,15 +421,28 @@ export class FigDeck {
           mkdirSync(this.imagesDir, { recursive: true });
         }
 
+        const copyImagePaint = (paint) => {
+          if (!paint) return;
+          if (paint.type === 'IMAGE' || paint.image) {
+            const name = paint.image?.name || (paint.image?.hash?.length ? hashToHex(paint.image.hash) : null);
+            if (name) this._copyImageAsset(sourceDeck.imagesDir, name);
+          }
+          if (paint.imageThumbnail) {
+            const tName = paint.imageThumbnail.name || (paint.imageThumbnail.hash?.length ? hashToHex(paint.imageThumbnail.hash) : null);
+            if (tName) this._copyImageAsset(sourceDeck.imagesDir, tName);
+          }
+        };
+
         for (const clone of clonedNodes) {
-          // Copy IMAGE fills
+          // Copy IMAGE fills from node fillPaints
           if (clone.fillPaints) {
-            for (const paint of clone.fillPaints) {
-              if (paint.type === 'IMAGE' && paint.image?.name) {
-                this._copyImageAsset(sourceDeck.imagesDir, paint.image.name);
-              }
-              if (paint.imageThumbnail?.name) {
-                this._copyImageAsset(sourceDeck.imagesDir, paint.imageThumbnail.name);
+            for (const paint of clone.fillPaints) copyImagePaint(paint);
+          }
+          // Copy images from symbolOverrides (INSTANCE nodes)
+          if (clone.symbolData?.symbolOverrides) {
+            for (const ov of clone.symbolData.symbolOverrides) {
+              if (ov.fillPaints) {
+                for (const paint of ov.fillPaints) copyImagePaint(paint);
               }
             }
           }
@@ -555,25 +605,36 @@ export class FigDeck {
       const bgColor = extractColor(bgPaints) || { r: 1, g: 1, b: 1 };
       const bgLum = luminance(bgColor.r, bgColor.g, bgColor.b);
 
-      // Walk all descendants looking for TEXT nodes
-      this.walkTree(slideId, (node) => {
-        if (node.type !== 'TEXT') return;
-        const textPaints = node.fillPaints;
-        const textColor = extractColor(textPaints);
-        if (!textColor) return;
-
-        const textLum = luminance(textColor.r, textColor.g, textColor.b);
-        const ratio = contrastRatio(bgLum, textLum);
-
-        if (ratio < 2) {
-          const nodeId = nid(node);
-          let msg = `TEXT ${nodeId} "${node.name || ''}": contrast ratio ${ratio.toFixed(2)}:1 against slide background is below 2:1`;
-          if (node.colorVar) {
-            msg += ` (uses colorVar "${node.colorVar}" — may resolve differently in Figma)`;
+      // Walk all descendants looking for TEXT nodes — follow INSTANCE → SYMBOL
+      // links so we reach TEXT inside components (walkTree alone stops at INSTANCE).
+      const walkIntoSymbols = (rootId, visited = new Set()) => {
+        this.walkTree(rootId, (node) => {
+          if (node.type === 'TEXT') {
+            const textPaints = node.fillPaints;
+            const textColor = extractColor(textPaints);
+            if (!textColor) return;
+            const textLum = luminance(textColor.r, textColor.g, textColor.b);
+            const ratio = contrastRatio(bgLum, textLum);
+            if (ratio < 2) {
+              const nodeId = nid(node);
+              let msg = `TEXT ${nodeId} "${node.name || ''}": contrast ratio ${ratio.toFixed(2)}:1 against slide background is below 2:1`;
+              if (node.colorVar) {
+                msg += ` (uses colorVar "${node.colorVar}" — may resolve differently in Figma)`;
+              }
+              warnings.push(msg);
+            }
           }
-          warnings.push(msg);
-        }
-      });
+          if (node.type === 'INSTANCE' && node.symbolData?.symbolID) {
+            const sid = node.symbolData.symbolID;
+            const symNid = `${sid.sessionID}:${sid.localID}`;
+            if (!visited.has(symNid)) {
+              visited.add(symNid);
+              walkIntoSymbols(symNid, visited);
+            }
+          }
+        });
+      };
+      walkIntoSymbols(slideId);
     }
 
     for (const w of warnings) console.warn(`⚠️  ${w}`);

package/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": "0.2",
   "name": "openfig",
-  "version": "0.3.23",
+  "version": "0.3.25",
   "description": "Open-source tools for Figma file parsing and rendering",
   "author": {
     "name": "OpenFig Contributors"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openfig-cli",
-  "version": "0.3.23",
+  "version": "0.3.25",
   "description": "OpenFig — Open-source tools for Figma file parsing and rendering",
   "type": "module",
   "bin": {