@peers-app/peers-ui 0.28.0 → 0.28.1

package/dist/ui-router/routes-loader.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadAllRoutes = exports.allPackages = void 0;
 const peers_sdk_1 = require("@peers-app/peers-sdk");
 require("../ui-defaults");
+const runnable_version_1 = require("./runnable-version");
 /** Packages with authorized navigation metadata available in the current context. */
 exports.allPackages = (0, peers_sdk_1.observable)([]);
 let allRoutesLoaded = false;
@@ -35,30 +36,8 @@ function subscribeToPrefs(packageId) {
  * Enrich an IPackage with appNavs from the device's active PackageVersion record.
  */
 async function enrichWithPvAppNavs(pkg) {
-    let pvId = pkg.activePackageVersionId;
-    try {
-        const pvar = (0, peers_sdk_1.packagePrefsVar)(pkg.packageId);
-        await pvar.loadingPromise;
-        pvId = pvar()?.activePackageVersionId ?? pvId;
-    }
-    catch {
-        /* use group default */
-    }
-    if (!pvId)
-        return pkg;
-    try {
-        const dataContext = await (0, peers_sdk_1.getDefaultDataContext)();
-        const pv = await (0, peers_sdk_1.PackageVersions)(dataContext).get(pvId);
-        if (pv)
-            await (0, peers_sdk_1.assertPackageVersionRunnable)(pkg, pv, dataContext);
-        if (pv?.appNavs) {
-            return { ...pkg, appNavs: pv.appNavs };
-        }
-    }
-    catch {
-        /* PV not found */
-    }
-    return pkg;
+    const appNavs = (await (0, runnable_version_1.resolveRunnableVersion)(pkg))?.pv.appNavs;
+    return appNavs ? { ...pkg, appNavs } : pkg;
 }
 /** Load package routes and subscribe to changes in the current context. */
 const loadAllRoutes = async () => {
@@ -120,31 +99,8 @@ function loadRoutesBundle(pkg, forceRefresh) {
                     console.log(`waiting for registerPeersUIRoute to be defined on the window object`);
                     await new Promise((resolve) => setTimeout(resolve, 20));
                 }
-                let pvId = pkg.activePackageVersionId;
-                try {
-                    const pvar = (0, peers_sdk_1.packagePrefsVar)(pkg.packageId);
-                    await pvar.loadingPromise;
-                    pvId = pvar()?.activePackageVersionId ?? pvId;
-                }
-                catch {
-                    /* use group default */
-                }
-                let routesBundleFileId;
-                let selected;
-                if (pvId) {
-                    try {
-                        const dataContext = await (0, peers_sdk_1.getDefaultDataContext)();
-                        const pv = await (0, peers_sdk_1.PackageVersions)(dataContext).get(pvId);
-                        if (pv) {
-                            await (0, peers_sdk_1.assertPackageVersionRunnable)(pkg, pv, dataContext);
-                            selected = { pv, dataContext };
-                        }
-                        routesBundleFileId = pv?.routesBundleFileId;
-                    }
-                    catch {
-                        /* no version record */
-                    }
-                }
+                const selected = await (0, runnable_version_1.resolveRunnableVersion)(pkg);
+                const routesBundleFileId = selected?.pv.routesBundleFileId;
                 let bundleCode = "";
                 if (routesBundleFileId) {
                     bundleCode = await peers_sdk_1.rpcServerCalls.getFileContents(routesBundleFileId);

package/dist/ui-router/runnable-version.d.ts

@@ -0,0 +1,12 @@
+import { type DataContext, type IPackage, type IPackageVersion } from "@peers-app/peers-sdk";
+/**
+ * The version of `pkg` this device runs, when it may run here: the device's own selection, else
+ * the group's, checked with `assertPackageVersionRunnable`. A refusal is logged and gives
+ * undefined, so the package's app links, routes and screens are left out rather than loaded.
+ *
+ * @param pkg - The package.
+ */
+export declare function resolveRunnableVersion(pkg: IPackage): Promise<{
+    pv: IPackageVersion;
+    dataContext: DataContext;
+} | undefined>;

package/dist/ui-router/runnable-version.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveRunnableVersion = resolveRunnableVersion;
+const peers_sdk_1 = require("@peers-app/peers-sdk");
+/**
+ * The version of `pkg` this device runs, when it may run here: the device's own selection, else
+ * the group's, checked with `assertPackageVersionRunnable`. A refusal is logged and gives
+ * undefined, so the package's app links, routes and screens are left out rather than loaded.
+ *
+ * @param pkg - The package.
+ */
+async function resolveRunnableVersion(pkg) {
+    let pvId = pkg.activePackageVersionId;
+    try {
+        const pvar = (0, peers_sdk_1.packagePrefsVar)(pkg.packageId);
+        await pvar.loadingPromise;
+        pvId = pvar()?.activePackageVersionId ?? pvId;
+    }
+    catch {
+        /* use group default */
+    }
+    if (!pvId)
+        return undefined;
+    try {
+        const dataContext = await (0, peers_sdk_1.getDefaultDataContext)();
+        const pv = await (0, peers_sdk_1.PackageVersions)(dataContext).get(pvId);
+        if (!pv)
+            return undefined;
+        await (0, peers_sdk_1.assertPackageVersionRunnable)(pkg, pv, dataContext);
+        return { pv, dataContext };
+    }
+    catch (error) {
+        console.warn(`Not showing ${pkg.name}: ${error instanceof Error ? error.message : String(error)}`);
+        return undefined;
+    }
+}

package/dist/ui-router/ui-loader.js

@@ -44,6 +44,7 @@ const globals_1 = require("../globals");
 const hooks_1 = require("../hooks");
 require("../ui-defaults");
 const routes_loader_1 = require("./routes-loader");
+const runnable_version_1 = require("./runnable-version");
 const peersUIs = {};
 class UIErrorBoundary extends react_1.Component {
     constructor(props) {
@@ -182,36 +183,13 @@ const UILoader = (args) => {
     return (0, jsx_runtime_1.jsx)(UIAsyncLoader, { peersUIId: peersUIId, props: props }, peersUIId);
 };
 const uiLoadingPromises = {};
-async function resolveUiBundleVersion(pkg) {
-    let pvId = pkg.activePackageVersionId;
-    try {
-        const pvar = (0, peers_sdk_1.packagePrefsVar)(pkg.packageId);
-        await pvar.loadingPromise;
-        pvId = pvar()?.activePackageVersionId ?? pvId;
-    }
-    catch {
-        /* use group default */
-    }
-    if (!pvId)
-        return undefined;
-    try {
-        const dataContext = await (0, peers_sdk_1.getDefaultDataContext)();
-        const pv = await (0, peers_sdk_1.PackageVersions)(dataContext).get(pvId);
-        if (pv)
-            await (0, peers_sdk_1.assertPackageVersionRunnable)(pkg, pv, dataContext);
-        return pv ? { pv, dataContext } : undefined;
-    }
-    catch {
-        return undefined;
-    }
-}
 function loadUIBundle(pkg, forceRefresh) {
     let importPromise = uiLoadingPromises[pkg.packageId];
     if (!importPromise || forceRefresh) {
         const sTime = Date.now();
         console.log(`loading ui bundle for ${pkg.name}`);
         importPromise = (async () => {
-            const selected = await resolveUiBundleVersion(pkg);
+            const selected = await (0, runnable_version_1.resolveRunnableVersion)(pkg);
             const uiBundleFileId = selected?.pv.uiBundleFileId;
             if (!selected || !uiBundleFileId) {
                 return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peers-app/peers-ui",
-  "version": "0.28.0",
+  "version": "0.28.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/peers-app/peers-ui.git"
@@ -36,7 +36,7 @@
     "lint:fix": "biome check --write ."
   },
   "peerDependencies": {
-    "@peers-app/peers-sdk": "^0.28.0",
+    "@peers-app/peers-sdk": "^0.28.1",
     "bootstrap": "^5.3.3",
     "react": "^18.0.0",
     "react-dom": "^18.0.0"
@@ -47,7 +47,7 @@
     "@babel/preset-react": "^7.24.1",
     "@babel/preset-typescript": "^7.27.1",
     "@biomejs/biome": "2.3.11",
-    "@peers-app/peers-sdk": "0.28.0",
+    "@peers-app/peers-sdk": "0.28.1",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",