@peers-app/peers-sdk 0.19.9 → 0.19.10

package/dist/package-installer/package-installer.js

@@ -136,7 +136,11 @@ async function installAllPackageBundles(dataContext, deps) {
         if (pkg.disabled)
             continue;
         try {
-            await installPackageFromBundles(dataContext, deps, pkg.packageId);
+            const localPath = await getPackageLocalPath(pkg.packageId, dataContext, deps);
+            if (!(await hasPackageJson(deps, localPath))) {
+                continue;
+            }
+            await installPackageFromBundles(dataContext, deps, pkg.packageId, { localPath });
         }
         catch (err) {
             console.error(`[package-installer] Failed to install bundles for ${pkg.name} (${pkg.packageId}):`, err);
@@ -210,18 +214,65 @@ async function getPackageInfo(deps, localPath) {
     }
     return info;
 }
-/**
- * Resolve the local filesystem path for a package based on device vars.
- * Awaits the loading promise to ensure the DB-stored value is available
- * before reading. Falls back to `{packagesRootDir}`.
- */
-async function getPackageLocalPath(packageId, dataContext, deps) {
+async function readPackageLocalPathPvar(packageId, dataContext, deps) {
     const pvar = (0, persistent_vars_1.groupDeviceVar)(`packageLocalPath_${packageId}`, {
         defaultValue: deps.packagesRootDir,
         dataContext,
     });
     await pvar.loadingPromise;
-    return deps.resolvePath(pvar() ?? deps.packagesRootDir);
+    const value = pvar();
+    if (!value || value === deps.packagesRootDir) {
+        return undefined;
+    }
+    return deps.resolvePath(value);
+}
+async function hasPackageJson(deps, localPath) {
+    return deps.fs.exists(deps.resolvePath(localPath, "package.json"));
+}
+function packageNameToFolderSlug(name) {
+    let slug = name.replace(/[^a-zA-Z0-9]/g, " ");
+    slug = slug.replace(/\s+/g, " ").trim();
+    return (0, utils_1.camelCaseToHyphens)(slug);
+}
+/**
+ * Resolve the local filesystem path for a package based on device vars.
+ * Awaits the loading promise to ensure the DB-stored value is available
+ * before reading. Falls back to paths from other data contexts on this device,
+ * then to `{packagesRootDir}/{name-slug}` when that directory exists.
+ */
+async function getPackageLocalPath(packageId, dataContext, deps) {
+    const candidates = [];
+    const currentPath = await readPackageLocalPathPvar(packageId, dataContext, deps);
+    if (currentPath) {
+        candidates.push(currentPath);
+    }
+    const userContext = dataContext.userContext;
+    if (userContext && dataContext.dataContextId !== userContext.userId) {
+        const personalPath = await readPackageLocalPathPvar(packageId, userContext.userDataContext, deps);
+        if (personalPath) {
+            candidates.push(personalPath);
+        }
+    }
+    if (userContext) {
+        for (const dc of userContext.groupDataContexts.values()) {
+            if (dc.dataContextId === dataContext.dataContextId)
+                continue;
+            const groupPath = await readPackageLocalPathPvar(packageId, dc, deps);
+            if (groupPath) {
+                candidates.push(groupPath);
+            }
+        }
+    }
+    const pkg = await (0, packages_1.Packages)(dataContext).get(packageId);
+    if (pkg) {
+        candidates.push(deps.resolvePath(deps.packagesRootDir, packageNameToFolderSlug(pkg.name)));
+    }
+    for (const path of candidates) {
+        if (await hasPackageJson(deps, path)) {
+            return path;
+        }
+    }
+    return candidates[0] ?? deps.packagesRootDir;
 }
 /** Extract the first non-heading paragraph from a README as a description. */
 function extractReadmeDescription(readme) {

package/dist/package-installer/package-installer.test.js

@@ -658,9 +658,46 @@ describe("getPackageLocalPath (via installPackageFromBundles)", () => {
         const deps = makeMockDeps({});
         const dc = mockDataContext();
         mockGroupDeviceVar.mockReturnValue(Object.assign(() => undefined, { loadingPromise: Promise.resolve() }));
+        mockGetPkg.mockResolvedValue(undefined);
         // Since resolvePath just joins, and packagesRootDir = "/packages",
         // the resolved path will be "/packages" — which won't have bundles.
         // This should throw "Package directory does not exist"
         await expect((0, package_installer_1.installPackageFromBundles)(dc, deps, packageId, { skipLoad: true, skipResolve: true })).rejects.toThrow("Package directory does not exist");
     });
+    it("falls back to personal context packageLocalPath in another group context", async () => {
+        const packageId = (0, utils_1.newid)();
+        const personalPath = `/packages/my-widget`;
+        const files = {
+            [`${personalPath}/package.json`]: JSON.stringify({ name: "My Widget", version: "1.0.0" }),
+            [`${personalPath}/dist/package.bundle.js`]: "code",
+        };
+        const deps = makeMockDeps(files);
+        const personalDc = { dataContextId: "user123" };
+        const groupDc = mockDataContext({
+            dataContextId: "group456",
+            userContext: {
+                userId: "user123",
+                userDataContext: personalDc,
+                groupDataContexts: new Map([["group456", { dataContextId: "group456" }]]),
+            },
+        });
+        mockGroupDeviceVar.mockImplementation((_name, opts) => {
+            const path = opts?.dataContext?.dataContextId === "user123" ? personalPath : deps.packagesRootDir;
+            return Object.assign(() => path, { loadingPromise: Promise.resolve() });
+        });
+        mockFindOnePV.mockResolvedValue(undefined);
+        mockFindOneFile.mockResolvedValue(undefined);
+        mockGetPkg.mockResolvedValue({
+            packageId,
+            name: "My Widget",
+            description: "",
+            signature: "",
+            createdBy: "u",
+        });
+        await (0, package_installer_1.installPackageFromBundles)(groupDc, deps, packageId, {
+            skipLoad: true,
+            skipResolve: true,
+        });
+        expect(mockSignAndSavePV).toHaveBeenCalled();
+    });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peers-app/peers-sdk",
-  "version": "0.19.9",
+  "version": "0.19.10",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/peers-app/peers-sdk.git"