@lightspeed/crane 3.1.0 → 3.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightspeed/crane",
-  "version": "3.1.0",
+  "version": "3.2.1",
   "type": "module",
   "bin": "bin/crane.js",
   "main": "./dist/app.mjs",
@@ -65,7 +65,7 @@
   },
   "dependencies": {
     "@jridgewell/sourcemap-codec": "^1.5.4",
-    "@lightspeed/crane-api": "2.1.0",
+    "@lightspeed/crane-api": "2.2.1",
     "@lightspeed/eslint-config-crane": "1.1.3",
     "@types/micromatch": "^4.0.8",
     "@types/prompts": "^2.4.2",

package/template/preview/shared/api-routes.ts

@@ -435,7 +435,7 @@ async function handleGetBlockConfigFull(
  */
 function getAvailableShowcases(blockType: BlockType, blockName: string, distPath: string): string[] {
   try {
-    const showcasesPath = path.join(distPath, blockType, blockName, 'js', 'showcases');
+    const showcasesPath = path.resolve(distPath, blockType, blockName, 'js', 'showcases');
 
     if (!fs.existsSync(showcasesPath)) {
       console.warn(`[API Routes] Showcases directory not found for ${blockType}/"${blockName}": ${showcasesPath}`);

package/template/preview/shared/preview.ts

@@ -239,11 +239,38 @@ export function mergeDesign(
   return result;
 }
 
+function parseAccordionDesign(comp: any): Record<string, any> {
+  const items: Record<string, any> = {};
+  Object.entries(comp.items || {}).forEach(([itemName, item]: [string, any]) => {
+    const editors: Record<string, any> = {};
+    Object.entries(item.editors || {}).forEach(([editorName, editor]: [string, any]) => {
+      editors[editorName] = editor.defaults || {};
+    });
+    items[itemName] = { label: item.label, editors };
+  });
+  return { sortable: comp.sortable, items };
+}
+
+function mergeAccordionShowcase(baseAccordion: Record<string, any>, showcaseAccordion: Record<string, any>): Record<string, any> {
+  const mergedItems: Record<string, any> = { ...baseAccordion.items };
+  Object.entries(showcaseAccordion.items || {}).forEach(([itemName, showcaseItem]: [string, any]) => {
+    const baseItem = mergedItems[itemName];
+    if (!baseItem) return;
+    mergedItems[itemName] = {
+      ...baseItem,
+      editors: { ...baseItem.editors, ...(showcaseItem.editors || {}) },
+    };
+  });
+  return { sortable: baseAccordion.sortable, items: mergedItems };
+}
+
 export function designTransformer(design: Record<string, any>, showCaseDesign: Record<string, any>, isApiRender: boolean = false): Record<string, any> {
   const parsedDesign: Record<string, any> = {};
   const parsedShowcaseDesign: Record<string, any> = {};
+  const accordionKeys: Set<string> = new Set();
+
   Object.entries(design || {}).forEach(([key, comp]) => {
-    // Skip DIVIDER and INFO elements - they're UI-only and don't have runtime data
+    // Skip DIVIDER elements - they're UI-only and don't have runtime data
     if (comp?.type === 'DIVIDER' || comp?.type === 'INFO') {
       return;
     }
@@ -251,15 +278,23 @@ export function designTransformer(design: Record<string, any>, showCaseDesign: R
     if (comp?.type === 'BACKGROUND') {
       return;
     }
-    // Use defaults if available, otherwise use empty object
+    if (comp?.type === 'ACCORDION') {
+      accordionKeys.add(key);
+      parsedDesign[key] = parseAccordionDesign(comp);
+      return;
+    }
     parsedDesign[key] = comp?.defaults || {};
   });
 
   Object.entries(showCaseDesign || {}).forEach(([key, comp]) => {
-    // Skip DIVIDER and INFO elements - they're UI-only and don't have runtime data
+    // Skip DIVIDER elements - they're UI-only and don't have runtime data
     if (comp?.type === 'DIVIDER' || comp?.type === 'INFO') {
       return;
     }
+    if (comp?.type === 'ACCORDION') {
+      parsedShowcaseDesign[key] = comp;
+      return;
+    }
     // Skip BACKGROUND - it's handled separately by createBackgroundDesign
     if (comp?.type === 'BACKGROUND') {
       return;
@@ -268,7 +303,24 @@ export function designTransformer(design: Record<string, any>, showCaseDesign: R
     parsedShowcaseDesign[key] = type == 'TEXT' ? { ...withoutType, visible: true } : withoutType;
   });
 
-  let overridenDesign = mergeDesign(parsedDesign, parsedShowcaseDesign);
+  // Merge non-ACCORDION entries via shallow merge, then handle ACCORDION separately
+  const nonAccordionDesign: Record<string, any> = {};
+  const nonAccordionShowcase: Record<string, any> = {};
+  Object.entries(parsedDesign).forEach(([k, v]) => {
+    if (!accordionKeys.has(k)) nonAccordionDesign[k] = v;
+  });
+  Object.entries(parsedShowcaseDesign).forEach(([k, v]) => {
+    if (!accordionKeys.has(k)) nonAccordionShowcase[k] = v;
+  });
+
+  let overridenDesign = mergeDesign(nonAccordionDesign, nonAccordionShowcase);
+
+  accordionKeys.forEach(key => {
+    const showcase = parsedShowcaseDesign[key];
+    overridenDesign[key] = showcase
+      ? mergeAccordionShowcase(parsedDesign[key], showcase)
+      : parsedDesign[key];
+  });
 
   try {
     overridenDesign = updateHexColors(overridenDesign);

package/template/preview/shared/utils.ts

@@ -1,6 +1,7 @@
 /* eslint-disable  @typescript-eslint/no-explicit-any */
 import * as fs from 'fs';
 import * as path from 'path';
+import * as urlFromNode from 'url';
 
 import { getShowcaseState, BlockType, BLOCK_TYPES } from './preview';
 
@@ -50,7 +51,11 @@ function addCacheBust(url: string): string {
  * Note: server.js modules are NOT loaded here - they are rendered via renderServerModule
  */
 export async function loadModule(modulePath: string): Promise<unknown> {
-  return import(/* @vite-ignore */ addCacheBust(modulePath));
+  const isWindows = typeof process !== 'undefined' && process.platform === 'win32';
+  const importPath = isWindows && path.isAbsolute(modulePath)
+    ? urlFromNode.pathToFileURL(modulePath).href
+    : modulePath;
+  return import(/* @vite-ignore */ addCacheBust(importPath));
 }
 
 /**