@trops/dash-core 0.1.365 → 0.1.367

package/dist/index.js

@@ -38836,8 +38836,29 @@ var BUMP_OPTIONS$1 = [{
   label: "Keep current version"
 }];
 
+// Parse "@scope/name" → { scope, packageName }. Returns empty strings
+// for unscoped names so callers can use the || fallback chain.
+function parseScopeAndName(sourcePackage) {
+  if (!sourcePackage) return {
+    scope: "",
+    packageName: ""
+  };
+  var m = sourcePackage.match(/^@([^/]+)\/(.+)$/);
+  if (m) return {
+    scope: m[1],
+    packageName: m[2]
+  };
+  return {
+    scope: "",
+    packageName: sourcePackage
+  };
+}
+
 // Pulled out as a small helper so the Dependencies loader and the
-// dashboard publish call share the same shape.
+// dashboard publish call share the same shape. Widgets registered from
+// a package (via `_sourcePackage`) inherit scope + packageName from that
+// package ID — otherwise the main-process resolver has no way to map a
+// bare component name to its owning package.
 function collectComponentConfigs() {
   var configMap = ComponentManager.componentMap();
   var componentConfigs = {};
@@ -38845,13 +38866,15 @@ function collectComponentConfigs() {
     var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
       key = _Object$entries$_i[0],
       config = _Object$entries$_i[1];
-    if (config && (config.id || config.scope || config.packageName)) {
-      componentConfigs[config.name || key] = {
-        id: config.id || null,
-        scope: config.scope || "",
-        packageName: config.packageName || ""
-      };
-    }
+    if (!config || config.type !== "widget") continue;
+    var hasExplicit = config.id || config.scope || config.packageName || config._sourcePackage;
+    if (!hasExplicit) continue;
+    var parsed = parseScopeAndName(config._sourcePackage);
+    componentConfigs[config.name || key] = {
+      id: config.id || null,
+      scope: config.scope || parsed.scope || "",
+      packageName: config.packageName || parsed.packageName || ""
+    };
   }
   return componentConfigs;
 }
@@ -39173,7 +39196,7 @@ var PublishDashboardModal = function PublishDashboardModal(_ref) {
   }
   function _handlePublish() {
     _handlePublish = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-      var steps, _iterator2, _step2, w, _key2, _sel, key, sel, updateStep, i, _step3, _res$manifest, bump, options, res, _res, _options, _res2, _t2, _t3;
+      var steps, seenPackages, _iterator2, _step2, w, _key2, _sel, key, sel, updateStep, i, _step3, _res$manifest, bump, options, res, _res, _options, _res2, _t2, _t3;
       return _regeneratorRuntime.wrap(function (_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -39186,19 +39209,21 @@ var PublishDashboardModal = function PublishDashboardModal(_ref) {
             setIsPublishing(true);
             setResult(null);
 
-            // Build the ordered step list: each selected owned widget → theme → dashboard.
-            // Third-party deps aren't published (they're just referenced by the manifest).
+            // Build the ordered step list: one step per unique widget package,
+            // then theme, then the dashboard itself. Third-party deps aren't
+            // published — they're just referenced by the manifest.
             steps = [];
             if (!plan) {
-              _context2.next = 11;
+              _context2.next = 12;
               break;
             }
+            seenPackages = new Set();
             _iterator2 = _createForOfIteratorHelper$9(plan.widgets || []);
             _context2.prev = 2;
             _iterator2.s();
           case 3:
             if ((_step2 = _iterator2.n()).done) {
-              _context2.next = 7;
+              _context2.next = 8;
               break;
             }
             w = _step2.value;
@@ -39206,16 +39231,23 @@ var PublishDashboardModal = function PublishDashboardModal(_ref) {
               _context2.next = 4;
               break;
             }
-            return _context2.abrupt("continue", 6);
+            return _context2.abrupt("continue", 7);
           case 4:
             _key2 = "".concat(w.scope, "/").concat(w.packageName);
-            _sel = depSelections[_key2];
-            if (!(!_sel || !_sel.owned || !_sel.include)) {
+            if (!seenPackages.has(_key2)) {
               _context2.next = 5;
               break;
             }
-            return _context2.abrupt("continue", 6);
+            return _context2.abrupt("continue", 7);
           case 5:
+            _sel = depSelections[_key2];
+            if (!(!_sel || !_sel.owned || !_sel.include)) {
+              _context2.next = 6;
+              break;
+            }
+            return _context2.abrupt("continue", 7);
+          case 6:
+            seenPackages.add(_key2);
             steps.push({
               kind: "widget",
               key: _key2,
@@ -39223,21 +39255,21 @@ var PublishDashboardModal = function PublishDashboardModal(_ref) {
               packageId: w.packageId || "".concat(w.scope, "/").concat(w.packageName),
               selection: _sel
             });
-          case 6:
-            _context2.next = 3;
-            break;
           case 7:
-            _context2.next = 9;
+            _context2.next = 3;
             break;
           case 8:
-            _context2.prev = 8;
-            _t2 = _context2["catch"](2);
-            _iterator2.e(_t2);
+            _context2.next = 10;
+            break;
           case 9:
             _context2.prev = 9;
-            _iterator2.f();
-            return _context2.finish(9);
+            _t2 = _context2["catch"](2);
+            _iterator2.e(_t2);
           case 10:
+            _context2.prev = 10;
+            _iterator2.f();
+            return _context2.finish(10);
+          case 11:
             if (plan.theme && plan.theme.scope && plan.theme.name) {
               key = "".concat(plan.theme.scope, "/").concat(plan.theme.name);
               sel = depSelections[key];
@@ -39251,7 +39283,7 @@ var PublishDashboardModal = function PublishDashboardModal(_ref) {
                 });
               }
             }
-          case 11:
+          case 12:
             steps.push({
               kind: "dashboard",
               key: "dashboard",
@@ -39272,11 +39304,11 @@ var PublishDashboardModal = function PublishDashboardModal(_ref) {
                 return next;
               });
             };
-            _context2.prev = 12;
+            _context2.prev = 13;
             i = 0;
-          case 13:
+          case 14:
             if (!(i < steps.length)) {
-              _context2.next = 23;
+              _context2.next = 24;
               break;
             }
             _step3 = steps[i];
@@ -39284,7 +39316,7 @@ var PublishDashboardModal = function PublishDashboardModal(_ref) {
               status: "running"
             });
             if (!(_step3.kind === "widget")) {
-              _context2.next = 16;
+              _context2.next = 17;
               break;
             }
             bump = _step3.selection.bump;
@@ -39293,12 +39325,12 @@ var PublishDashboardModal = function PublishDashboardModal(_ref) {
             } : {}), {}, {
               visibility: _step3.selection.visibility
             });
-            _context2.next = 14;
+            _context2.next = 15;
             return window.mainApi.registry.publishWidget(appId, _step3.packageId, options);
-          case 14:
+          case 15:
             res = _context2.sent;
             if (res !== null && res !== void 0 && res.success) {
-              _context2.next = 15;
+              _context2.next = 16;
               break;
             }
             updateStep(i, {
@@ -39311,26 +39343,26 @@ var PublishDashboardModal = function PublishDashboardModal(_ref) {
             });
             setIsPublishing(false);
             return _context2.abrupt("return");
-          case 15:
+          case 16:
             updateStep(i, {
               status: "complete",
               message: "v".concat(res.newVersion || ((_res$manifest = res.manifest) === null || _res$manifest === void 0 ? void 0 : _res$manifest.version))
             });
-            _context2.next = 22;
+            _context2.next = 23;
             break;
-          case 16:
+          case 17:
             if (!(_step3.kind === "theme")) {
-              _context2.next = 19;
+              _context2.next = 20;
               break;
             }
-            _context2.next = 17;
+            _context2.next = 18;
             return window.mainApi.themes.publishTheme(appId, _step3.themeKey, {
               visibility: _step3.selection.visibility
             });
-          case 17:
+          case 18:
             _res = _context2.sent;
             if (_res !== null && _res !== void 0 && _res.success) {
-              _context2.next = 18;
+              _context2.next = 19;
               break;
             }
             updateStep(i, {
@@ -39343,16 +39375,16 @@ var PublishDashboardModal = function PublishDashboardModal(_ref) {
             });
             setIsPublishing(false);
             return _context2.abrupt("return");
-          case 18:
+          case 19:
             updateStep(i, {
               status: "complete",
               message: "published"
             });
-            _context2.next = 22;
+            _context2.next = 23;
             break;
-          case 19:
+          case 20:
             if (!(_step3.kind === "dashboard")) {
-              _context2.next = 22;
+              _context2.next = 23;
               break;
             }
             _options = {
@@ -39363,12 +39395,12 @@ var PublishDashboardModal = function PublishDashboardModal(_ref) {
               visibility: visibility,
               componentConfigs: collectComponentConfigs()
             };
-            _context2.next = 20;
+            _context2.next = 21;
             return window.mainApi.dashboardConfig.prepareDashboardForPublish(appId, workspaceId, _options);
-          case 20:
+          case 21:
             _res2 = _context2.sent;
             if (_res2 !== null && _res2 !== void 0 && _res2.success) {
-              _context2.next = 21;
+              _context2.next = 22;
               break;
             }
             updateStep(i, {
@@ -39381,35 +39413,35 @@ var PublishDashboardModal = function PublishDashboardModal(_ref) {
             });
             setIsPublishing(false);
             return _context2.abrupt("return");
-          case 21:
+          case 22:
             updateStep(i, {
               status: "complete",
               message: "published"
             });
             setResult(_res2);
-          case 22:
-            i++;
-            _context2.next = 13;
-            break;
           case 23:
-            _context2.next = 25;
+            i++;
+            _context2.next = 14;
             break;
           case 24:
-            _context2.prev = 24;
-            _t3 = _context2["catch"](12);
+            _context2.next = 26;
+            break;
+          case 25:
+            _context2.prev = 25;
+            _t3 = _context2["catch"](13);
             setResult({
               success: false,
               error: _t3.message || "Failed to prepare dashboard for publish."
             });
-          case 25:
-            _context2.prev = 25;
-            setIsPublishing(false);
-            return _context2.finish(25);
           case 26:
+            _context2.prev = 26;
+            setIsPublishing(false);
+            return _context2.finish(26);
+          case 27:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[2, 8, 9, 10], [12, 24, 25, 26]]);
+      }, _callee2, null, [[2, 9, 10, 11], [13, 25, 26, 27]]);
     }));
     return _handlePublish.apply(this, arguments);
   }
@@ -40047,7 +40079,10 @@ function DependencyTable(_ref4) {
   var plan = _ref4.plan,
     selections = _ref4.selections,
     _onChange = _ref4.onChange;
-  var rows = [];
+  // Dedupe: multiple widgets from the same package collapse into a single
+  // row. Each row shows the list of component widgets that live inside it
+  // so the user knows what's getting published.
+  var byKey = new Map();
   var _iterator3 = _createForOfIteratorHelper$9(plan.widgets || []),
     _step4;
   try {
@@ -40055,23 +40090,32 @@ function DependencyTable(_ref4) {
       var w = _step4.value;
       if (!w.scope || !w.packageName) continue;
       var _key3 = "".concat(w.scope, "/").concat(w.packageName);
-      rows.push({
+      var entry = byKey.get(_key3) || {
         key: _key3,
         kind: "widget",
-        data: w
-      });
+        data: w,
+        widgetNames: new Set()
+      };
+      if (w.component) entry.widgetNames.add(w.component);
+      byKey.set(_key3, entry);
     }
   } catch (err) {
     _iterator3.e(err);
   } finally {
     _iterator3.f();
   }
+  var rows = Array.from(byKey.values()).map(function (e) {
+    return _objectSpread$o(_objectSpread$o({}, e), {}, {
+      widgetNames: Array.from(e.widgetNames).sort()
+    });
+  });
   if (plan.theme && plan.theme.scope && plan.theme.name) {
     var key = "".concat(plan.theme.scope, "/").concat(plan.theme.name);
     rows.push({
       key: key,
       kind: "theme",
-      data: plan.theme
+      data: plan.theme,
+      widgetNames: []
     });
   }
   if (rows.length === 0) {
@@ -40085,7 +40129,8 @@ function DependencyTable(_ref4) {
     children: rows.map(function (_ref5) {
       var key = _ref5.key,
         kind = _ref5.kind,
-        data = _ref5.data;
+        data = _ref5.data,
+        widgetNames = _ref5.widgetNames;
       var sel = selections[key];
       if (!sel) return null;
       var reg = data.registry;
@@ -40130,6 +40175,12 @@ function DependencyTable(_ref4) {
               }) : /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {
                 children: " \xB7 Not yet in registry"
               })]
+            }), kind === "widget" && widgetNames && widgetNames.length > 0 && /*#__PURE__*/jsxRuntime.jsxs("div", {
+              className: "text-[11px] opacity-60 mt-1",
+              children: ["Bundles ", widgetNames.length, " widget", widgetNames.length === 1 ? "" : "s", ":", " ", /*#__PURE__*/jsxRuntime.jsx("span", {
+                className: "opacity-80",
+                children: widgetNames.join(", ")
+              })]
             }), sel.owned && sel.include && /*#__PURE__*/jsxRuntime.jsxs("div", {
               className: "mt-2 flex items-center gap-3 flex-wrap",
               children: [/*#__PURE__*/jsxRuntime.jsxs("label", {