@trops/dash-core 0.1.23 → 0.1.26

package/dist/electron/index.js

@@ -7567,6 +7567,12 @@ function findWidgetsDir$1(widgetPath) {
     return direct;
   }
 
+  // Check configs/ directory (used by packageZip.js for distributed widgets)
+  const configs = path$1.join(widgetPath, "configs");
+  if (fs$1.existsSync(configs)) {
+    return configs;
+  }
+
   // Check one level deeper for nested ZIP extraction
   try {
     const entries = fs$1.readdirSync(widgetPath, { withFileTypes: true });
@@ -7693,6 +7699,7 @@ async function compileWidget(widgetPath) {
         "react",
         "react-dom",
         "@trops/dash-react",
+        "@trops/dash-core",
         "react/jsx-runtime",
         "prop-types",
       ],
@@ -7803,10 +7810,13 @@ class DynamicWidgetLoader {
 
       if (autoRegister && this.componentManager) {
         try {
-          this.componentManager.registerWidget(config, componentName);
+          // Use scoped id as registration key if available,
+          // otherwise fall back to componentName
+          const registrationKey = config.id || componentName;
+          this.componentManager.registerWidget(config, registrationKey);
           registered = true;
           console.log(
-            `[DynamicWidgetLoader] ✓ Registered ${componentName} with ComponentManager`,
+            `[DynamicWidgetLoader] ✓ Registered ${registrationKey} with ComponentManager`,
           );
         } catch (regError) {
           console.warn(
@@ -7838,13 +7848,36 @@ class DynamicWidgetLoader {
     try {
       const source = fs.readFileSync(configPath, "utf8");
 
-      const exportMatch = source.match(/export\s+default\s+({[\s\S]*});?\s*$/);
+      let exportMatch = source.match(/export\s+default\s+({[\s\S]*});?\s*$/);
+
+      // Handle variable export pattern: const x = {...}; export default x;
+      if (!exportMatch) {
+        const varExportMatch = source.match(
+          /export\s+default\s+([a-zA-Z_$][a-zA-Z0-9_$]*)\s*;?\s*$/,
+        );
+        if (varExportMatch) {
+          const varName = varExportMatch[1];
+          const varDeclMatch = source.match(
+            new RegExp(
+              `(?:const|let|var)\\s+${varName}\\s*=\\s*({[\\s\\S]*?});\\s*(?:export\\s+default)`,
+            ),
+          );
+          if (varDeclMatch) {
+            exportMatch = varDeclMatch;
+          }
+        }
+      }
 
       if (!exportMatch) {
         throw new Error("Could not find default export in config file");
       }
 
-      const exportedObjectStr = exportMatch[1];
+      // Sanitize component references so vm.runInContext doesn't fail
+      // on unresolvable imports — replace component: SomeName with component: "SomeName"
+      const exportedObjectStr = exportMatch[1].replace(
+        /component\s*:\s*([A-Z][a-zA-Z0-9_$]*)/g,
+        'component: "$1"',
+      );
 
       const context = vm.createContext({ module: { exports: {} } });
       vm.runInContext(`module.exports = ${exportedObjectStr}`, context);
@@ -8714,6 +8747,8 @@ var dynamicWidgetLoaderExports = dynamicWidgetLoader$2.exports;
 	            configs.push({
 	              componentName,
 	              widgetPackage: widget.name,
+	              // Include scoped id if present in the config
+	              id: config.id || null,
 	              config,
 	            });
 	          } catch (err) {