@jskit-ai/kernel 0.1.82 → 0.1.83

package/internal/node/installedPackageDescriptor.js

@@ -3,6 +3,26 @@ import { pathToFileURL } from "node:url";
 import { normalizeObject } from "../../shared/support/normalize.js";
 import { fileExists } from "./fileSystem.js";
 
+function resolveNodeModulesDescriptorCandidatePaths({ appRoot, packageId }) {
+  const packageDescriptorPath = path.join(packageId, "package.descriptor.mjs");
+  const candidatePaths = [];
+  let currentRoot = path.resolve(appRoot);
+
+  while (true) {
+    const nodeModulesRoot =
+      path.basename(currentRoot) === "node_modules" ? currentRoot : path.join(currentRoot, "node_modules");
+    candidatePaths.push(path.join(nodeModulesRoot, packageDescriptorPath));
+
+    const parentRoot = path.dirname(currentRoot);
+    if (parentRoot === currentRoot) {
+      break;
+    }
+    currentRoot = parentRoot;
+  }
+
+  return candidatePaths;
+}
+
 function resolveDescriptorCandidatePaths({ appRoot, packageId, installedPackageState }) {
   const normalizedAppRoot = String(appRoot || "").trim();
   if (!normalizedAppRoot) {
@@ -19,9 +39,10 @@ function resolveDescriptorCandidatePaths({ appRoot, packageId, installedPackageS
   const packagePathFromSource = String(source.packagePath || "").trim();
   const jskitRoot = path.join(normalizedAppRoot, "node_modules", "@jskit-ai", "jskit-cli");
 
-  const candidatePaths = [
-    path.resolve(normalizedAppRoot, "node_modules", normalizedPackageId, "package.descriptor.mjs")
-  ];
+  const candidatePaths = resolveNodeModulesDescriptorCandidatePaths({
+    appRoot: normalizedAppRoot,
+    packageId: normalizedPackageId
+  });
   if (packagePathFromSource) {
     candidatePaths.push(path.resolve(normalizedAppRoot, packagePathFromSource, "package.descriptor.mjs"));
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/kernel",
-  "version": "0.1.82",
+  "version": "0.1.83",
   "type": "module",
   "dependencies": {
     "json-rest-schema": "1.x.x"

package/shared/support/packageDescriptor.test.js

@@ -70,6 +70,32 @@ test("resolveDescriptorPathForInstalledPackage resolves descriptor using source.
   }
 });
 
+test("resolveDescriptorPathForInstalledPackage resolves descriptor from ancestor node_modules", async () => {
+  const installRoot = await createFixtureRoot("kernel-package-descriptor-hoisted-");
+  try {
+    const appRoot = path.join(installRoot, "node_modules", "@example", "app");
+    const descriptorPath = path.join(
+      installRoot,
+      "node_modules",
+      "@jskit-ai",
+      "shell-web",
+      "package.descriptor.mjs"
+    );
+    await mkdir(appRoot, { recursive: true });
+    await writeDescriptorFile(descriptorPath, "export default { packageId: \"@jskit-ai/shell-web\" };\n");
+
+    const resolvedDescriptorPath = await resolveDescriptorPathForInstalledPackage({
+      appRoot,
+      packageId: "@jskit-ai/shell-web",
+      installedPackageState: {},
+      required: true
+    });
+    assert.equal(resolvedDescriptorPath, descriptorPath);
+  } finally {
+    await rm(installRoot, { recursive: true, force: true });
+  }
+});
+
 test("resolveDescriptorPathForInstalledPackage resolves descriptor using jskit-cli descriptorPath fallback", async () => {
   const appRoot = await createFixtureRoot("kernel-package-descriptor-jskit-root-");
   try {