@jskit-ai/kernel 0.1.153 → 0.1.155

package/client/vite/clientBootstrapPlugin.js

@@ -62,18 +62,33 @@ function isPathInsideRoot(rootPath, candidatePath) {
  * local package's root, shared entry, or exported subpath and accidentally re-enter node_modules caching.
  */
 async function resolveLocalPackageSources({ appRoot }) {
-  const installedPackages = await discoverInstalledPackages({ appRoot });
-  return Object.freeze(
-    installedPackages
-      .filter((entry) => LOCAL_PACKAGE_SOURCE_TYPES.has(entry.sourceType))
-      .map((entry) =>
-        Object.freeze({
-          packageId: entry.packageId,
-          installedPackageRoot: entry.installedPackageRoot,
-          sourcePackageRoot: entry.sourcePackageRoot
-        })
-      )
-  );
+  const appPackageJson = await readJsonFile(path.resolve(appRoot, "package.json"), {});
+  const dependencySpecifiers = collectRootDependencySpecifiers(appPackageJson);
+  const localPackages = [];
+
+  for (const packageId of sortStrings([...dependencySpecifiers.keys()])) {
+    const specifier = dependencySpecifiers.get(packageId);
+    if (!specifier.startsWith("file:")) {
+      continue;
+    }
+    const sourcePackageRoot = path.resolve(appRoot, specifier.slice("file:".length));
+    const sourcePackageJson = await readJsonFile(
+      path.join(sourcePackageRoot, "package.json"),
+      null
+    );
+    if (!sourcePackageJson) {
+      continue;
+    }
+    localPackages.push(
+      Object.freeze({
+        packageId,
+        installedPackageRoot: path.resolve(appRoot, "node_modules", ...packageId.split("/")),
+        sourcePackageRoot
+      })
+    );
+  }
+
+  return Object.freeze(localPackages);
 }
 
 function splitSpecifierSuffix(source) {

package/client/vite/clientBootstrapPlugin.test.js

@@ -86,6 +86,15 @@ test("resolveLocalPackageSources includes every file dependency regardless of sc
     "@example/local-utility": { packagePath: "packages/utility" },
     "@example/published": {}
   });
+  const utilityPackageJsonPath = path.join(
+    tempRoot,
+    "packages",
+    "utility",
+    "package.json"
+  );
+  const utilityPackageJson = JSON.parse(await readFile(utilityPackageJsonPath, "utf8"));
+  delete utilityPackageJson.jskit;
+  await writeJson(utilityPackageJsonPath, utilityPackageJson);
 
   const localPackages = await resolveLocalPackageSources({ appRoot: tempRoot });
   assert.deepEqual(localPackages.map((entry) => entry.packageId), [

package/internal/node/installedPackages.js

@@ -140,9 +140,11 @@ async function resolvePackageRoots({
     parentPackageRoot
   });
   const fileDependencyRoot = resolveFileDependencyRoot(appRoot, directSpecifier);
-  let sourcePackageRoot = fileDependencyRoot && (await fileExists(fileDependencyRoot))
-    ? fileDependencyRoot
-    : "";
+  let sourcePackageRoot =
+    fileDependencyRoot &&
+    (await fileExists(path.join(fileDependencyRoot, "package.json")))
+      ? fileDependencyRoot
+      : "";
 
   if (!sourcePackageRoot && (await fileExists(installedPackageRoot))) {
     try {

package/internal/node/installedPackages.test.js

@@ -1,7 +1,11 @@
 import assert from "node:assert/strict";
+import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
 import test from "node:test";
 import {
   createPackageMetadata,
+  discoverInstalledPackages,
   JSKIT_PACKAGE_CONFIG_KEYS
 } from "./installedPackages.js";
 
@@ -49,3 +53,43 @@ test("createPackageMetadata accepts only the canonical package.json.jskit fields
     /unknown field: packageId/
   );
 });
+
+test("discoverInstalledPackages resolves file tarballs from node_modules", async (context) => {
+  const appRoot = await mkdtemp(path.join(tmpdir(), "jskit-installed-package-tarball-"));
+  context.after(() => rm(appRoot, { recursive: true, force: true }));
+  const installedPackageRoot = path.join(
+    appRoot,
+    "node_modules",
+    "@jskit-ai",
+    "shell-web"
+  );
+
+  await mkdir(path.join(appRoot, "archives"), { recursive: true });
+  await mkdir(installedPackageRoot, { recursive: true });
+  await writeFile(
+    path.join(appRoot, "package.json"),
+    JSON.stringify({
+      dependencies: {
+        "@jskit-ai/shell-web": "file:archives/shell-web.tgz"
+      }
+    })
+  );
+  await writeFile(path.join(appRoot, "archives", "shell-web.tgz"), "fixture");
+  await writeFile(
+    path.join(installedPackageRoot, "package.json"),
+    JSON.stringify({
+      name: "@jskit-ai/shell-web",
+      version: "0.1.0",
+      jskit: {
+        kind: "runtime"
+      }
+    })
+  );
+
+  const packages = await discoverInstalledPackages({ appRoot });
+
+  assert.equal(packages.length, 1);
+  assert.equal(packages[0].packageId, "@jskit-ai/shell-web");
+  assert.equal(packages[0].packageRoot, installedPackageRoot);
+  assert.equal(packages[0].sourceType, "npm-package");
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/kernel",
-  "version": "0.1.153",
+  "version": "0.1.155",
   "type": "module",
   "dependencies": {
     "json-rest-schema": "^1.0.17"