@trops/dash-core 0.1.369 → 0.1.371

package/dist/electron/index.js

@@ -64891,13 +64891,21 @@ async function collectDashboardDependencies$1(
     const installedWidgets = widgetRegistry ? widgetRegistry.getWidgets() : [];
 
     const widgets = deps.map((dep) => {
-      // Find the installed widget whose componentNames contains this dep's widgetName
+      // Match by componentName OR by any shape of the package id.
+      // Registry packages are stored as `@scope/name` but callers may
+      // synthesize `scope/name`; try both before giving up.
+      const candidateIds = new Set();
+      if (dep.scope && dep.packageName) {
+        candidateIds.add(`@${dep.scope}/${dep.packageName}`);
+        candidateIds.add(`${dep.scope}/${dep.packageName}`);
+      }
       const match = installedWidgets.find(
         (w) =>
           (w.componentNames && w.componentNames.includes(dep.widgetName)) ||
           (w.scope === dep.scope &&
             (w.name === dep.packageName ||
-              w.packageId === `${dep.scope}/${dep.packageName}`)),
+              candidateIds.has(w.packageId) ||
+              candidateIds.has(w.name))),
       );
 
       return {
@@ -64907,7 +64915,11 @@ async function collectDashboardDependencies$1(
         component: dep.widgetName,
         localVersion: dep.version,
         packageDir: match?.path || null,
-        packageId: match?.packageId || null,
+        packageId:
+          match?.packageId ||
+          (dep.scope && dep.packageName
+            ? `@${dep.scope}/${dep.packageName}`
+            : null),
         author: dep.author || "",
         hasLocalPackage: !!match?.path,
       };
@@ -65232,49 +65244,9 @@ async function prepareDashboardForPublish$1(
 
     // 6. Check which widgets exist in the registry (soft warning, not blocking)
     const { fetchRegistryIndex } = registryController$3;
-    let registryPackages = [];
-    let registryCheckFailed = false;
-    try {
-      const index = await fetchRegistryIndex();
-      registryPackages = index.packages || [];
-    } catch (err) {
-      console.warn(
-        `[DashboardConfigController] Unable to verify registry: ${err.message}`,
-      );
-      registryCheckFailed = true;
-    }
-
-    let missingFromRegistry = [];
-    if (!registryCheckFailed) {
-      const registryNames = new Set(registryPackages.map((p) => p.name));
-      const registryWidgetNames = new Set();
-      for (const pkg of registryPackages) {
-        if (pkg.widgets) {
-          for (const w of pkg.widgets) {
-            if (w.name) registryWidgetNames.add(w.name);
-          }
-        }
-      }
-      const missingWidgets = widgets.filter(
-        (w) =>
-          w.required !== false &&
-          !registryNames.has(w.package) &&
-          !registryWidgetNames.has(w.package),
-      );
-      const grouped = {};
-      for (const w of missingWidgets) {
-        if (!grouped[w.package]) grouped[w.package] = [];
-        const widgetName = w.id.includes(".") ? w.id.split(".")[1] : w.id;
-        if (!grouped[w.package].includes(widgetName)) {
-          grouped[w.package].push(widgetName);
-        }
-      }
-      missingFromRegistry = Object.entries(grouped).map(
-        ([pkg, widgetNames]) => ({ package: pkg, widgets: widgetNames }),
-      );
-    }
-
-    // 7. Resolve registry username for scope
+    // 7. Resolve registry username for scope (needed by the missing-widget
+    //    check so we look up each dep under the caller's actual scope,
+    //    not the local scope from the package.json).
     let registryUsername = options.githubUser || "";
     if (!registryUsername) {
       try {
@@ -65286,6 +65258,65 @@ async function prepareDashboardForPublish$1(
       }
     }
 
+    // Check each widget dep's existence in the registry via the dynamic
+    // resolve endpoint (static registry-index.json lags behind freshly-
+    // published packages). Auth-scoped so private packages owned by the
+    // caller surface as existing.
+    let missingFromRegistry = [];
+    let registryCheckFailed = false;
+    try {
+      const { resolvePackages } = registryApiController$3;
+      const seen = new Set();
+      const refs = [];
+      for (const w of widgets) {
+        if (w.required === false) continue;
+        const scope = w.scope || registryUsername;
+        const name = w.package || w.packageName;
+        if (!scope || !name) continue;
+        const key = `${scope}/${name}`;
+        if (seen.has(key)) continue;
+        seen.add(key);
+        // Resolve under the caller's scope — that's where the package
+        // would have been published regardless of the local scope on disk.
+        refs.push({ scope: registryUsername || scope, name });
+      }
+      if (refs.length > 0) {
+        const res = await resolvePackages(refs);
+        if (!res.success) {
+          registryCheckFailed = true;
+        } else {
+          const existsByKey = new Map();
+          for (const r of res.resolved || []) {
+            existsByKey.set(`${r.scope}/${r.name}`, r.exists);
+          }
+          const grouped = {};
+          for (const w of widgets) {
+            if (w.required === false) continue;
+            const name = w.package || w.packageName;
+            if (!name) continue;
+            const resolveKey = `${registryUsername || w.scope}/${name}`;
+            const exists = existsByKey.get(resolveKey);
+            if (exists) continue;
+            const widgetName = w.id?.includes(".")
+              ? w.id.split(".")[1]
+              : w.id || name;
+            if (!grouped[name]) grouped[name] = [];
+            if (!grouped[name].includes(widgetName)) {
+              grouped[name].push(widgetName);
+            }
+          }
+          missingFromRegistry = Object.entries(grouped).map(
+            ([pkg, widgetNames]) => ({ package: pkg, widgets: widgetNames }),
+          );
+        }
+      }
+    } catch (err) {
+      console.warn(
+        `[DashboardConfigController] Unable to verify registry: ${err.message}`,
+      );
+      registryCheckFailed = true;
+    }
+
     // 8. Generate registry manifest
     const manifest = generateRegistryManifest(dashboardConfig, {
       githubUser: registryUsername,
@@ -71949,6 +71980,29 @@ const {
   generateWidgetRegistryManifest,
 } = widgetPublishManifest;
 
+/**
+ * Resilient widget lookup. Callers pass identifiers in different shapes —
+ * `@scope/name`, `scope/name`, sometimes bare `name`. Try a few common
+ * variants so the batch-publish dialog (which synthesizes a fallback
+ * packageId from scope/packageName without the `@` prefix) still finds
+ * the registered package.
+ */
+function findWidget(registry, packageId) {
+  if (!packageId) return null;
+  const candidates = new Set();
+  candidates.add(packageId);
+  if (packageId.startsWith("@")) {
+    candidates.add(packageId.slice(1));
+  } else if (packageId.includes("/")) {
+    candidates.add(`@${packageId}`);
+  }
+  for (const id of candidates) {
+    const w = registry.getWidget(id);
+    if (w) return w;
+  }
+  return null;
+}
+
 /**
  * Scan a widget package directory for `.dash.js` component configs and
  * return the parsed configs. Used when the widget registry's cached
@@ -72055,7 +72109,7 @@ async function prepareWidgetForPublish$1(appId, packageId, options = {}) {
 
     // 2. Look up widget in local registry
     const registry = widgetRegistryModule.getWidgetRegistry();
-    const widget = registry.getWidget(packageId);
+    const widget = findWidget(registry, packageId);
     if (!widget || !widget.path) {
       return {
         success: false,
@@ -72181,7 +72235,7 @@ async function prepareWidgetForPublish$1(appId, packageId, options = {}) {
 async function inspectWidgetPackage$1(packageId) {
   try {
     const registry = widgetRegistryModule.getWidgetRegistry();
-    const widget = registry.getWidget(packageId);
+    const widget = findWidget(registry, packageId);
     if (!widget || !widget.path) {
       return {
         success: false,