@trops/dash-core 0.1.429 → 0.1.432

package/dist/index.js

@@ -27686,6 +27686,16 @@ var LayoutModel = function LayoutModel(layoutItem, workspaceLayout, dashboardId)
       if (Array.isArray(widgetConfig.eventHandlers)) {
         layout.eventHandlers = widgetConfig.eventHandlers;
       }
+      // Migrate legacy bare `component` references to the canonical
+      // scoped form (`scope.package.Component`). ComponentManager.config
+      // returns the resolved scoped key on `widgetConfig.component`, so
+      // we just lift it. Idempotent: items already scoped pass through
+      // unchanged because resolveComponentKey returns the input verbatim
+      // when it's already in the map. Persisted on next save — no
+      // separate migration step needed.
+      if (typeof widgetConfig.component === "string" && widgetConfig.component && widgetConfig.component !== layout.component) {
+        layout.component = widgetConfig.component;
+      }
     }
 
     // Merge user-entered config values (from EnhancedWidgetDropdown) into userPrefs
@@ -28752,8 +28762,16 @@ var WorkspaceModel = function WorkspaceModel(workspaceItem) {
   // Skip items already produced by LayoutModel (idempotent: LayoutModel
   // is safe to call on its own output).
   var wsId = "id" in obj ? obj["id"] : workspace.id;
+  // LayoutModel returns null when an item can't be normalized (e.g.
+  // throw inside its catch). A null in the layout array crashes
+  // downstream forEach/map consumers with `Cannot read properties of
+  // null (reading 'type')`. Filter nulls so the renderer never sees
+  // them — the original raw item is already lost at that point, so
+  // dropping it is the only safe action.
   workspace.layout = rawLayout.map(function (item) {
     return LayoutModel(item, rawLayout, wsId);
+  }).filter(function (item) {
+    return item != null;
   });
   workspace.pages = "pages" in obj ? obj["pages"] : [];
   workspace.activePageId = "activePageId" in obj ? obj["activePageId"] : null;
@@ -31363,7 +31381,117 @@ var ContextModel = /*#__PURE__*/function () {
   }]);
 }();
 
+/**
+ * scopedComponentId.js
+ *
+ * Single source of truth for the canonical scoped component id used by
+ * ComponentManager registration, layout items, and publish-time scope
+ * remap. Format: `scope.packageName.ComponentName`.
+ *
+ * Why a 3-part dotted form (and not `@scope/pkg.Component`)?
+ * - Matches existing `config.id` shape that `.dash.js` files already
+ *   set when authored explicitly (see ComponentManager.registerWidget:
+ *   `const registrationKey = config.id || widgetKey;`).
+ * - Trivial to parse (`split(".")` — three parts, ordered).
+ * - Avoids slashes inside object keys, which some downstream serializers
+ *   (older dash-registry indexers) historically choked on.
+ *
+ * The upstream package id may arrive in either of two shapes:
+ *   - "@scope/pkg" (npm-style)
+ *   - "scope/pkg"  (bare scope)
+ * Both produce the same scoped id.
+ */
+
+/**
+ * Build the canonical scoped component id from a package name and a
+ * bare component name.
+ *
+ * @param {string} packageName e.g. "@ai-built/pipeline" or "ai-built/pipeline"
+ * @param {string} componentName e.g. "ProspectListColumn"
+ * @returns {string} e.g. "ai-built.pipeline.ProspectListColumn"
+ */
+function makeScopedComponentId(packageName, componentName) {
+  if (!componentName) return "";
+  if (!packageName) return componentName;
+  var cleaned = String(packageName).replace(/^@/, "").replace(/\//g, ".");
+  return "".concat(cleaned, ".").concat(componentName);
+}
+
+/**
+ * Parse a scoped component id into its three parts. Returns null when
+ * the input isn't a 3-part dotted id (e.g. legacy bare names).
+ *
+ * @param {string} scopedId
+ * @returns {{scope: string, packageName: string, componentName: string} | null}
+ */
+function parseScopedComponentId(scopedId) {
+  if (typeof scopedId !== "string") return null;
+  var parts = scopedId.split(".");
+  if (parts.length !== 3) return null;
+  return {
+    scope: parts[0],
+    packageName: parts[1],
+    componentName: parts[2]
+  };
+}
+
+/**
+ * Pull the bare component name from a scoped or unscoped id.
+ *
+ * @param {string} idOrName
+ * @returns {string}
+ */
+function bareComponentName(idOrName) {
+  if (typeof idOrName !== "string") return "";
+  var parts = idOrName.split(".");
+  return parts[parts.length - 1] || "";
+}
+
 var _componentMap = {};
+
+/**
+ * Resolve the registry key for a component lookup. Returns null if no
+ * match exists.
+ *
+ * Lookup order (the LAYOUT ITEM is the source of truth):
+ *   1. EXACT match on `component` — covers the new scoped form
+ *      (`scope.package.X`) and any legacy `.dash.js` that already set
+ *      `config.id` to a scoped value.
+ *   2. If `component` is bare (no dots) AND we have a packageId hint
+ *      on the layout item, build the scoped id and try that.
+ *   3. Bare-name fallback: scan the map for any key ending in
+ *      `.${component}`. If exactly one matches, use it. If multiple
+ *      match (the collision case), prefer the one matching the layout
+ *      item's `packageId` / `_sourcePackage`; otherwise fall through
+ *      to the first match (deterministic, but also logs a warning so
+ *      callers can spot the ambiguity).
+ *
+ * Step (3) is the back-compat path for layouts authored before scoped
+ * registration landed. New layouts ALWAYS resolve via step (1) — the
+ * `component` field is already scoped.
+ */
+function resolveComponentKey(componentMap, component, data) {
+  if (!component) return null;
+  if (component in componentMap) return component;
+  if (typeof component !== "string") return null;
+  if (component.includes(".")) return null;
+  var packageId = (data === null || data === void 0 ? void 0 : data.packageId) || (data === null || data === void 0 ? void 0 : data._sourcePackage) || (data === null || data === void 0 ? void 0 : data.packageName) || null;
+  if (packageId) {
+    var scoped = makeScopedComponentId(packageId, component);
+    if (scoped in componentMap) return scoped;
+  }
+  var suffix = ".".concat(component);
+  var matches = Object.keys(componentMap).filter(function (k) {
+    return k.endsWith(suffix);
+  });
+  if (matches.length === 0) return null;
+  if (matches.length === 1) return matches[0];
+  if (packageId) {
+    var target = makeScopedComponentId(packageId, component);
+    if (matches.includes(target)) return target;
+  }
+  return matches[0];
+}
 var _containerComponent = null;
 var _gridContainerComponent = null;
 var ComponentManager = {
@@ -31467,15 +31595,18 @@ var ComponentManager = {
    * @returns {Widget} the Widget in the component map
    */
   getComponent: function getComponent(component) {
+    var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     try {
       // console.log("get component");
       if (component && this.componentMap()) {
         if (ComponentManager.isLayoutContainer(component) === false) {
           var m = this.componentMap();
-          // Try exact match first (works for both scoped ids and legacy names)
-          var cmp = component in m ? m[component] : null;
-          if (cmp !== null) {
-            cmp["componentName"] = component;
+          // Resolve through the scoped/bare lookup pipeline so layouts
+          // authored under either format land at the same registry key.
+          var resolvedKey = resolveComponentKey(m, component, data);
+          var cmp = resolvedKey ? m[resolvedKey] : null;
+          if (cmp !== null && cmp !== undefined) {
+            cmp["componentName"] = resolvedKey;
             return cmp;
           }
         } else {
@@ -31653,17 +31784,20 @@ var ComponentManager = {
 
         // get the component configuration from the map
         var components = this.map();
-        if (component in components) {
+        var resolvedKey = resolveComponentKey(components, component, data);
+        if (resolvedKey && resolvedKey in components) {
           // let c = deepCopy(components['component']);
 
           // we have to make sure that we remove the component if this is a context
 
-          var tempComponent = components[component];
+          var tempComponent = components[resolvedKey];
           delete tempComponent["component"];
           var c = JSON.parse(JSON.stringify(tempComponent));
 
-          // tack on the component name
-          c["component"] = component;
+          // Carry the canonical scoped id forward so callers (LayoutModel,
+          // ComponentManager.getComponent) can rewrite layout items'
+          // `component` to the scoped form on first load.
+          c["component"] = resolvedKey;
 
           // if no userConfig key. let's add it for the next step
           if ("userConfig" in c === false) {
@@ -57424,26 +57558,36 @@ var DashboardStageInner = function DashboardStageInner(_ref3) {
     try {
       var _message$workspaces;
       var workspaces = DashReact.deepCopy(message["workspaces"]);
+      // LayoutModel returns null when normalization throws (e.g. a
+      // widget config that references a component the registry can't
+      // resolve yet — common right after a fresh dashboard install
+      // where some widgets are still downloading). Filter nulls so
+      // every renderer that walks the layout sees only well-formed
+      // items and never crashes on `Cannot read properties of null
+      // (reading 'type')` or similar.
       var workspacesTemp = workspaces.map(function (ws) {
-        var tempLayout = ws["layout"].map(function (layoutOG) {
+        ws["layout"] = (ws["layout"] || []).map(function (layoutOG) {
           return LayoutModel(layoutOG, workspaces, ws["id"]);
+        }).filter(function (item) {
+          return item != null;
         });
-        ws["layout"] = tempLayout;
-        // Normalize page layouts too
         if (ws.pages && Array.isArray(ws.pages)) {
           ws.pages = ws.pages.map(function (page) {
             if (page.layout && Array.isArray(page.layout)) {
               page.layout = page.layout.map(function (layoutOG) {
                 return LayoutModel(layoutOG, workspaces, ws["id"]);
+              }).filter(function (item) {
+                return item != null;
               });
             }
             return page;
           });
         }
-        // Normalize sidebar layout
         if (ws.sidebarLayout && Array.isArray(ws.sidebarLayout)) {
           ws.sidebarLayout = ws.sidebarLayout.map(function (layoutOG) {
             return LayoutModel(layoutOG, workspaces, ws["id"]);
+          }).filter(function (item) {
+            return item != null;
           });
         }
         return WorkspaceModel(ws);
@@ -58227,13 +58371,16 @@ var DashboardStageInner = function DashboardStageInner(_ref3) {
   }
   function handleSaveWorkspaceComplete(e, message) {
 
-    // Reconstruct workspaces through LayoutModel (same as load path)
+    // Reconstruct workspaces through LayoutModel (same as load path).
+    // Filter nulls so a partially-failed normalize doesn't poison the
+    // layout array — see handleLoadWorkspacesComplete for the rationale.
     var workspaces = DashReact.deepCopy(message["workspaces"]);
     var workspacesTemp = workspaces.map(function (ws) {
-      var tempLayout = ws["layout"].map(function (layoutOG) {
+      ws["layout"] = (ws["layout"] || []).map(function (layoutOG) {
         return LayoutModel(layoutOG, workspaces, ws["id"]);
+      }).filter(function (item) {
+        return item != null;
       });
-      ws["layout"] = tempLayout;
       return WorkspaceModel(ws);
     });
     pub.pub("dashboard.workspaceChange", {
@@ -62301,6 +62448,7 @@ exports.WorkspaceModel = WorkspaceModel;
 exports.WorkspaceScopeContext = WorkspaceScopeContext;
 exports.addChildToLayoutItem = addChildToLayoutItem;
 exports.addItemToItemLayout = addItemToItemLayout;
+exports.bareComponentName = bareComponentName;
 exports.buildMcpConfigFromOverrides = buildMcpConfigFromOverrides;
 exports.canHaveChildren = canHaveChildren;
 exports.changeDirectionForLayoutItem = changeDirectionForLayoutItem;
@@ -62346,10 +62494,12 @@ exports.isWidgetResolvable = isWidgetResolvable;
 exports.isWorkspace = isWorkspace;
 exports.layoutItemHasWorkspaceAsChild = layoutItemHasWorkspaceAsChild;
 exports.loadWidgetBundle = loadWidgetBundle;
+exports.makeScopedComponentId = makeScopedComponentId;
 exports.mcpJsonToFormState = mcpJsonToFormState;
 exports.moveWidgetAcrossContainers = moveWidgetAcrossContainers;
 exports.numChildrenForLayout = numChildrenForLayout;
 exports.parse = parse;
+exports.parseScopedComponentId = parseScopedComponentId;
 exports.removeItemFromLayout = removeItemFromLayout;
 exports.renderComponent = renderComponent;
 exports.renderGridLayout = renderGridLayout;