@trops/dash-core 0.1.233 → 0.1.235

package/dist/electron/index.js

@@ -29114,9 +29114,14 @@ function extractEventWiring$1(layout) {
  *
  * @param {string[]} componentNames - Widget component names from layout
  * @param {Object} widgetRegistry - WidgetRegistry instance (optional, needs getWidgets())
+ * @param {Object} componentConfigs - Map of component name → .dash.js config (optional, for built-in widgets)
  * @returns {Array} Widget dependency objects for the dashboard config
  */
-function buildWidgetDependencies$1(componentNames, widgetRegistry = null) {
+function buildWidgetDependencies$1(
+  componentNames,
+  widgetRegistry = null,
+  componentConfigs = null,
+) {
   const widgets = [];
   const seen = new Set();
 
@@ -29124,16 +29129,27 @@ function buildWidgetDependencies$1(componentNames, widgetRegistry = null) {
     if (seen.has(name)) continue;
     seen.add(name);
 
+    let scope = "";
     let packageName = "";
+    let widgetName = name;
     let version = "*";
     let author = "";
 
+    // Check if name is already a scoped ID (scope.packageName.widgetName)
+    const parts = name.split(".");
+    if (parts.length === 3) {
+      scope = parts[0];
+      packageName = parts[1];
+      widgetName = parts[2];
+    }
+
     // Try to resolve from widget registry
     if (widgetRegistry) {
       const installedWidgets = widgetRegistry.getWidgets();
       for (const w of installedWidgets) {
         if (w.componentNames && w.componentNames.includes(name)) {
-          packageName = w.name || "";
+          if (!scope && w.scope) scope = w.scope;
+          if (!packageName || packageName === name) packageName = w.name || "";
           version = w.version || "*";
           author =
             typeof w.author === "string" ? w.author : w.author?.name || "";
@@ -29142,9 +29158,34 @@ function buildWidgetDependencies$1(componentNames, widgetRegistry = null) {
       }
     }
 
+    // Fallback: resolve from component configs (built-in widgets)
+    if (componentConfigs && componentConfigs[name]) {
+      const config = componentConfigs[name];
+      if (!scope && config.scope) scope = config.scope;
+      if ((!packageName || packageName === name) && config.packageName)
+        packageName = config.packageName;
+      if (config.id && !scope) {
+        const idParts = config.id.split(".");
+        if (idParts.length === 3) {
+          scope = idParts[0];
+          packageName = idParts[1];
+        }
+      }
+    }
+
+    const id =
+      scope && packageName && widgetName
+        ? `${scope}.${packageName}.${widgetName}`
+        : packageName
+          ? `${packageName}.${widgetName}`
+          : widgetName;
+
     widgets.push({
-      id: packageName ? `${packageName}.${name}` : name,
-      package: packageName || name,
+      id,
+      scope: scope || "",
+      packageName: packageName || widgetName,
+      widgetName,
+      package: packageName || widgetName,
       version,
       required: true,
       author: author || "",
@@ -29268,11 +29309,18 @@ function checkDashboardCompatibility(
   installedWidgets = [],
   registryPackages = [],
 ) {
+  // Build lookup maps using composite keys (scope.packageName.componentName)
+  const installedByKey = new Map();
   const installedByName = new Map();
   for (const w of installedWidgets) {
     if (w.name) {
       installedByName.set(w.name, w);
     }
+    if (w.scope && w.name && w.componentNames) {
+      for (const cn of w.componentNames) {
+        installedByKey.set(`${w.scope}.${w.name}.${cn}`, w);
+      }
+    }
   }
 
   const registryByName = new Map();
@@ -29289,19 +29337,31 @@ function checkDashboardCompatibility(
   let hasUnavailableRequired = false;
 
   for (const dep of dashboardWidgets) {
-    const packageName = dep.package;
+    // Build composite key for scoped matching
+    const key =
+      dep.scope && dep.packageName && dep.widgetName
+        ? `${dep.scope}.${dep.packageName}.${dep.widgetName}`
+        : null;
+    const packageName = dep.package || dep.packageName || "";
     const required = dep.required !== false;
-    const installed = installedByName.get(packageName);
+
+    // Try composite key first, then fall back to package name
+    const installed = key
+      ? installedByKey.get(key) || installedByName.get(packageName)
+      : installedByName.get(packageName);
+
+    // Use the dep's id or key for the status map
+    const statusKey = dep.id || key || packageName;
 
     if (installed) {
       installedCount++;
-      widgets[packageName] = "installed";
+      widgets[statusKey] = "installed";
     } else if (registryByName.has(packageName)) {
       toInstallCount++;
-      widgets[packageName] = "available";
+      widgets[statusKey] = "available";
     } else {
       unavailableCount++;
-      widgets[packageName] = "unavailable";
+      widgets[statusKey] = "unavailable";
       if (required) {
         hasUnavailableRequired = true;
       }
@@ -29360,6 +29420,9 @@ function generateRegistryManifest(dashboardConfig, options = {}) {
     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 || "*",
@@ -31364,6 +31427,11 @@ var schedulerController_1 = schedulerController$2;
 	      registeredAt: new Date().toISOString(),
 	    };
 
+	    // Persist scope from manifest/config if available
+	    if (config.scope) {
+	      widgetEntry.scope = config.scope;
+	    }
+
 	    this.widgets.set(widgetName, widgetEntry);
 	    this.saveRegistry();
 	    console.log(`[WidgetRegistry] Registered widget: ${widgetName}`);
@@ -31424,6 +31492,8 @@ var schedulerController_1 = schedulerController$2;
 	          // has full display data without needing ComponentManager.
 	          if (result?.config && existingEntry) {
 	            const cfg = result.config;
+	            if (cfg.scope && !existingEntry.scope)
+	              existingEntry.scope = cfg.scope;
 	            if (cfg.icon && !existingEntry.icon) existingEntry.icon = cfg.icon;
 	            if (cfg.providers?.length && !existingEntry.providers?.length)
 	              existingEntry.providers = cfg.providers;
@@ -33334,7 +33404,22 @@ async function prepareDashboardForPublish$1(
     // 3. Build the dashboard config (reuse export logic)
     const componentNames = collectComponentNames(layout);
     const eventWiring = extractEventWiring(layout);
-    const widgets = buildWidgetDependencies(componentNames, widgetRegistry);
+
+    // Build componentConfigs map from renderer-supplied data
+    // This resolves scope/packageName for built-in widgets that aren't in widgetRegistry
+    let componentConfigs = null;
+    if (options.componentConfigs) {
+      componentConfigs = {};
+      for (const [key, config] of Object.entries(options.componentConfigs)) {
+        componentConfigs[key] = config;
+      }
+    }
+
+    const widgets = buildWidgetDependencies(
+      componentNames,
+      widgetRegistry,
+      componentConfigs,
+    );
     const providers = buildProviderRequirements(componentNames, widgetRegistry);
 
     const dashboardConfig = applyDefaults({