@trops/dash-core 0.1.375 → 0.1.377

package/dist/electron/index.js

@@ -49804,9 +49804,15 @@ async function compileWidget(widgetPath) {
     );
 
     if (hasComponent) {
-      // Import the component and merge with config
+      // Import the component and merge with config.
+      // Use namespace import so both default and named exports work:
+      //   export default function Foo → _Mod.default
+      //   export const Foo = ...      → _Mod.Foo
       imports.push(
-        `import ${componentName}Comp from "${relWidgetsDir}/${componentFile}";`,
+        `import * as ${componentName}_Mod from "${relWidgetsDir}/${componentFile}";`,
+      );
+      imports.push(
+        `const ${componentName}Comp = ${componentName}_Mod.default || ${componentName}_Mod.${componentName} || Object.values(${componentName}_Mod).find(v => typeof v === 'function');`,
       );
       exportParts.push(
         `export const ${componentName} = { ...${componentName}Config, component: ${componentName}Comp };`,
@@ -49859,6 +49865,9 @@ async function compileWidget(widgetPath) {
       ],
       // Treat .js files as JSX (widget sources use JSX in .js files)
       loader: { ".js": "jsx" },
+      // Use automatic JSX runtime (React 17+) so sources don't need
+      // explicit `import React from "react"`.
+      jsx: "automatic",
       logLevel: "warning",
     });
 
@@ -51757,11 +51766,24 @@ var schedulerController_1 = schedulerController$2;
 	          };
 	        }
 
-	        // Find target component (use componentName or first .dash.js file)
+	        // Find target component (use componentName or first .dash.js file).
+	        // Strip scope prefix from scoped IDs like "trops.algolia.AlgoliaSearchWidget"
+	        // since the file on disk is just "AlgoliaSearchWidget.js".
 	        const files = fs.readdirSync(widgetsDir);
-	        const target =
-	          componentName ||
-	          files.find((f) => f.endsWith(".dash.js"))?.replace(".dash.js", "");
+	        let target = componentName;
+	        if (target && target.includes(".")) {
+	          const bare = target.split(".").pop();
+	          if (
+	            files.some((f) => f === `${bare}.js` || f === `${bare}.dash.js`)
+	          ) {
+	            target = bare;
+	          }
+	        }
+	        if (!target) {
+	          target = files
+	            .find((f) => f.endsWith(".dash.js"))
+	            ?.replace(".dash.js", "");
+	        }
 
 	        if (!target) {
 	          return {
@@ -62775,17 +62797,27 @@ function generateRegistryManifest(dashboardConfig, options = {}) {
     downloadUrl: `https://github.com/${githubUser}/dash-registry/releases/download/${githubUser}--${name}--v{version}/dashboard-${name}-v{version}.zip`,
     repository: options.repository || "",
     publishedAt: new Date().toISOString(),
-    widgets: (dashboardConfig.widgets || []).map((w) => ({
-      id: w.id,
-      scope: w.scope || "",
-      packageName: w.packageName || w.package || "",
-      widgetName: w.widgetName || (w.id ? w.id.split(".").pop() : w.package),
-      name: w.id ? w.id.split(".").pop() : w.package,
-      package: w.package,
-      version: w.version || "*",
-      required: w.required !== false,
-      author: w.author || "",
-    })),
+    widgets: (dashboardConfig.widgets || []).map((w) => {
+      // Remap local scopes (e.g. `@ai-built/…` for AI-generated widgets)
+      // to the caller's published scope. Local conventions are private to
+      // the publisher's machine — installers can only resolve packages
+      // under the scope they were actually published as.
+      const remappedScope =
+        options.callerScope && w.scope && w.scope !== options.callerScope
+          ? options.callerScope
+          : w.scope || "";
+      return {
+        id: w.id,
+        scope: remappedScope,
+        packageName: w.packageName || w.package || "",
+        widgetName: w.widgetName || (w.id ? w.id.split(".").pop() : w.package),
+        name: w.id ? w.id.split(".").pop() : w.package,
+        package: w.package,
+        version: w.version || "*",
+        required: w.required !== false,
+        author: w.author || "",
+      };
+    }),
     providers: dashboardConfig.providers || [],
     eventWiring: dashboardConfig.eventWiring || [],
   };
@@ -65317,9 +65349,12 @@ async function prepareDashboardForPublish$1(
       registryCheckFailed = true;
     }
 
-    // 8. Generate registry manifest
+    // 8. Generate registry manifest — pass callerScope so local-only
+    //    scopes (e.g. `@ai-built/…`) get rewritten to the publisher's
+    //    actual registry scope on the way out.
     const manifest = generateRegistryManifest(dashboardConfig, {
       githubUser: registryUsername,
+      callerScope: registryUsername,
       category: options.category || "general",
       repository: options.repository || "",
       appOrigin: appId,
@@ -72117,15 +72152,28 @@ async function prepareWidgetForPublish$1(appId, packageId, options = {}) {
       };
     }
 
-    // 3. Read package.json
+    // 3. Read package.json (or fall back to dash.json for registry-installed widgets)
     const pkgJsonPath = path.join(widget.path, "package.json");
-    if (!fs.existsSync(pkgJsonPath)) {
+    const dashJsonPath = path.join(widget.path, "dash.json");
+    let pkgJson;
+    if (fs.existsSync(pkgJsonPath)) {
+      pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, "utf8"));
+    } else if (fs.existsSync(dashJsonPath)) {
+      // Registry-installed widgets only have dash.json — synthesize
+      // the fields the publish flow needs from it.
+      const dashJson = JSON.parse(fs.readFileSync(dashJsonPath, "utf8"));
+      pkgJson = {
+        name: dashJson.name ? `@${callerScope}/${dashJson.name}` : packageId,
+        version: dashJson.version || "1.0.0",
+        description: dashJson.description || "",
+        author: dashJson.author || profile?.displayName || "",
+      };
+    } else {
       return {
         success: false,
-        error: `Widget package is missing package.json: ${widget.path}`,
+        error: `Widget package is missing package.json and dash.json: ${widget.path}`,
       };
     }
-    const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, "utf8"));
     // Scope resolution: the caller's registry username always wins. The
     // package.json may use a local naming convention (e.g. `@ai-built/…`
     // for AI-generated widgets) but the registry only allows publishing
@@ -72139,7 +72187,17 @@ async function prepareWidgetForPublish$1(appId, packageId, options = {}) {
     const newVersion = resolveNextVersion(previousVersion, options);
     if (newVersion !== previousVersion) {
       pkgJson.version = newVersion;
-      fs.writeFileSync(pkgJsonPath, JSON.stringify(pkgJson, null, 2) + "\n");
+      // Persist to whichever metadata file exists
+      if (fs.existsSync(pkgJsonPath)) {
+        fs.writeFileSync(pkgJsonPath, JSON.stringify(pkgJson, null, 2) + "\n");
+      } else if (fs.existsSync(dashJsonPath)) {
+        const dashJson = JSON.parse(fs.readFileSync(dashJsonPath, "utf8"));
+        dashJson.version = newVersion;
+        fs.writeFileSync(
+          dashJsonPath,
+          JSON.stringify(dashJson, null, 2) + "\n",
+        );
+      }
     }
 
     // 5. Build manifest using the widget's component configs. The