@ai-ecoverse/slicc-kernel 1.13.0 → 1.14.0

package/dist/node.js

@@ -1168,9 +1168,28 @@ async function packages(fs, modules) {
   }
   return dirs;
 }
+async function pnpmGlobalRoots(fs, home) {
+  const roots = [];
+  const global = `${home}/global`;
+  for (const version of (await fs.readdir(global).catch(() => [])).sort()) {
+    for (const group of (await fs.readdir(`${global}/${version}`).catch(() => [])).sort()) {
+      const dir = `${global}/${version}/${group}`;
+      const st = await fs.lstat(dir).catch(() => void 0);
+      if (st?.isDirectory && await fs.exists(`${dir}/node_modules`))
+        roots.push(`${dir}/node_modules`);
+    }
+  }
+  return roots;
+}
+async function packagesIn(fs, roots) {
+  const dirs = [];
+  for (const root of typeof roots === "string" ? [roots] : roots)
+    dirs.push(...await packages(fs, root));
+  return dirs;
+}
 async function scanCommands(fs, modules) {
   const found = /* @__PURE__ */ new Map();
-  for (const pkg of await packages(fs, modules)) {
+  for (const pkg of await packagesIn(fs, modules)) {
     let manifest;
     try {
       manifest = JSON.parse(await fs.readFile(`${pkg}/package.json`));
@@ -1189,7 +1208,7 @@ async function scanCommands(fs, modules) {
 }
 async function scanFilesystems(fs, modules) {
   const found = /* @__PURE__ */ new Map();
-  for (const pkg of await packages(fs, modules)) {
+  for (const pkg of await packagesIn(fs, modules)) {
     let manifest;
     try {
       manifest = JSON.parse(await fs.readFile(`${pkg}/package.json`));
@@ -6749,6 +6768,7 @@ function foreignImports(bytes) {
 }
 
 // src/launcher.ts
+var PNPM_HOME = "/home/.local/share/pnpm";
 var COMMAND2 = /^\/(?:usr\/)?bin\/([^/]+)$/;
 var PACKAGE_ROOT = /^(.*\/node_modules\/(?:@[^/]+\/)?[^/]+)\//;
 var ENV_REFERENCE = /\$\{([A-Za-z_][A-Za-z0-9_]*)\}/g;
@@ -6838,6 +6858,7 @@ var Launcher = class {
   ca;
   transport;
   watchers = new FsWatchers();
+  pnpmHome;
   mounts;
   createDriverWorker;
   openFiles = /* @__PURE__ */ new Set();
@@ -6854,6 +6875,7 @@ var Launcher = class {
     this.base = this.watchers.wrap(this.mounts.wrap(options.fs));
     this.createWorker = options.createWorker;
     this.createDriverWorker = options.createDriverWorker;
+    this.pnpmHome = options.env?.PNPM_HOME ?? PNPM_HOME;
     this.modulesDir = options.modules ?? "/node_modules";
     this.env = { ...networkEnv(), ...options.env };
     this.ca = kernelCa(options.caStore ?? memoryCaStore());
@@ -6864,11 +6886,17 @@ var Launcher = class {
       ca: this.ca
     });
     this.fs = withCommandDirs(this.base, async () => new Set((await this.commands()).keys()));
+    this.watchers.watch([this.modulesDir, this.pnpmHome], { recursive: true }, () => {
+      this.catalog = void 0;
+    });
   }
   commands() {
-    this.catalog ??= scanCommands(this.base, this.modulesDir);
+    this.catalog ??= this.roots().then((roots) => scanCommands(this.base, roots));
     return this.catalog;
   }
+  async roots() {
+    return [this.modulesDir, ...await pnpmGlobalRoots(this.base, this.pnpmHome)];
+  }
   async resolve(file, argv0, cwd) {
     const name2 = COMMAND2.exec(file)?.[1] ?? (file.includes("/") ? void 0 : file);
     if (name2 !== void 0) {
@@ -7122,7 +7150,7 @@ var Launcher = class {
         }
       };
     }
-    const module = (await scanFilesystems(this.base, this.modulesDir)).get(type);
+    const module = (await scanFilesystems(this.base, await this.roots())).get(type);
     if (!module) throw fsError("ENODEV", `unknown file system type ${type}`);
     if (!this.createDriverWorker)
       throw fsError("ENODEV", `this kernel cannot start ${type} drivers`);
@@ -7162,7 +7190,14 @@ var Launcher = class {
     await writeCaFile(this.base, this.ca).catch(() => void 0);
   }
   environment(cwd, extra) {
-    return { PATH: "/usr/bin:/bin", HOME: "/home", ...this.env, PWD: cwd, ...extra };
+    return {
+      PATH: `/usr/bin:/bin:${this.pnpmHome}/bin`,
+      HOME: "/home",
+      PNPM_HOME: this.pnpmHome,
+      ...this.env,
+      PWD: cwd,
+      ...extra
+    };
   }
   async starting(argv, dir) {
     this.catalog = void 0;