@trops/dash-core 0.1.264 → 0.1.266

package/dist/index.esm.js

@@ -45051,7 +45051,7 @@ var useInstalledWidgets = function useInstalledWidgets() {
     error = _useState6[0],
     setError = _useState6[1];
   var refresh = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-    var _window$mainApi, cMap, builtinWidgets, installedWidgets, list, installedNames, deduped, _t;
+    var _window$mainApi, cMap, builtinWidgets, registryByName, list, installedFromCM, cmSourcePackages, fallbackInstalled, _t;
     return _regeneratorRuntime.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -45062,6 +45062,8 @@ var useInstalledWidgets = function useInstalledWidgets() {
           cMap = ComponentManager.componentMap() || {};
           builtinWidgets = Object.keys(cMap).filter(function (key) {
             return cMap[key].type === "widget";
+          }).filter(function (key) {
+            return !cMap[key]._sourcePackage;
           }).map(function (key) {
             var config = cMap[key];
             return {
@@ -45078,11 +45080,11 @@ var useInstalledWidgets = function useInstalledWidgets() {
               workspace: config.workspace || null,
               componentNames: [key]
             };
-          }); // ── Installed widgets from WidgetRegistry ───────────────
-          // Registry entries now include .dash.js fields (icon, providers,
-          // workspace, etc.) persisted at install time. Also try enriching
-          // from ComponentManager as a fallback.
-          installedWidgets = [];
+          }); // ── Installed widgets from ComponentManager + Registry ───
+          // CM entries with _sourcePackage are registry-installed widgets.
+          // Show each as an individual "installed" entry, enriched with
+          // registry-level metadata (version, path, packageId).
+          registryByName = {};
           if (!((_window$mainApi = window.mainApi) !== null && _window$mainApi !== void 0 && _window$mainApi.widgets)) {
             _context.next = 3;
             break;
@@ -45091,50 +45093,57 @@ var useInstalledWidgets = function useInstalledWidgets() {
           return window.mainApi.widgets.list();
         case 2:
           list = _context.sent;
-          installedWidgets = (list || []).map(function (w) {
-            var _w$providers;
-            // Try to find a matching ComponentManager entry:
-            // 1) by componentNames stored in the registry entry
-            // 2) by _sourcePackage on the CM entry
-            var cmKey = (w.componentNames || []).find(function (cn) {
-              return cn in cMap;
-            }) || Object.keys(cMap).find(function (key) {
-              return cMap[key]._sourcePackage === w.name;
-            });
-            var cm = cmKey ? cMap[cmKey] : null;
+          (list || []).forEach(function (w) {
+            registryByName[w.name] = w;
+          });
+        case 3:
+          installedFromCM = Object.keys(cMap).filter(function (key) {
+            return cMap[key].type === "widget" && !!cMap[key]._sourcePackage;
+          }).map(function (key) {
+            var config = cMap[key];
+            var reg = registryByName[config._sourcePackage] || {};
+            return {
+              name: key,
+              displayName: config.name || key,
+              author: config.author || reg.author || null,
+              "package": config["package"] || null,
+              description: config.description || null,
+              icon: config.icon || null,
+              version: reg.version || null,
+              path: reg.path || null,
+              source: "installed",
+              providers: config.providers || [],
+              workspace: config.workspace || null,
+              componentNames: [key],
+              packageId: reg.packageId || config._sourcePackage
+            };
+          }); // Fallback: registry packages whose components never loaded
+          // into CM (e.g. compile failure). Show the package-level entry.
+          cmSourcePackages = new Set(Object.values(cMap).filter(function (c) {
+            return c._sourcePackage;
+          }).map(function (c) {
+            return c._sourcePackage;
+          }));
+          fallbackInstalled = Object.values(registryByName).filter(function (w) {
+            return !cmSourcePackages.has(w.name);
+          }).map(function (w) {
             return {
               name: w.name,
-              displayName: w.displayName || (cm === null || cm === void 0 ? void 0 : cm.name) || cmKey || w.name,
-              author: w.author || (cm === null || cm === void 0 ? void 0 : cm.author) || null,
-              "package": w["package"] || (cm === null || cm === void 0 ? void 0 : cm["package"]) || null,
-              description: w.description || (cm === null || cm === void 0 ? void 0 : cm.description) || null,
-              icon: w.icon || (cm === null || cm === void 0 ? void 0 : cm.icon) || null,
+              displayName: w.displayName || w.name,
+              author: w.author || null,
+              "package": w["package"] || null,
+              description: w.description || null,
+              icon: w.icon || null,
               version: w.version || null,
               path: w.path || null,
               source: "installed",
-              providers: (_w$providers = w.providers) !== null && _w$providers !== void 0 && _w$providers.length ? w.providers : (cm === null || cm === void 0 ? void 0 : cm.providers) || [],
-              workspace: w.workspace || (cm === null || cm === void 0 ? void 0 : cm.workspace) || null,
-              componentNames: w.componentNames || (cmKey ? [cmKey] : []),
+              providers: w.providers || [],
+              workspace: w.workspace || null,
+              componentNames: w.componentNames || [],
               packageId: w.packageId || w.name
             };
           });
-        case 3:
-          // ── Merge: installed wins on name collision ──────────────
-          // Also remove builtin entries whose _sourcePackage matches an
-          // installed widget name (e.g. builtin "WeatherWidget" with
-          // _sourcePackage "weather-widget" is the same as installed
-          // "weather-widget").
-          installedNames = new Set(installedWidgets.map(function (w) {
-            return w.name;
-          }));
-          deduped = builtinWidgets.filter(function (w) {
-            var _cMap$w$name;
-            if (installedNames.has(w.name)) return false;
-            var sp = (_cMap$w$name = cMap[w.name]) === null || _cMap$w$name === void 0 ? void 0 : _cMap$w$name._sourcePackage;
-            if (sp && installedNames.has(sp)) return false;
-            return true;
-          });
-          setWidgets([].concat(_toConsumableArray(deduped), _toConsumableArray(installedWidgets)));
+          setWidgets([].concat(_toConsumableArray(builtinWidgets), _toConsumableArray(installedFromCM), _toConsumableArray(fallbackInstalled)));
           _context.next = 5;
           break;
         case 4: