@gcoredev/fastedge-test 0.2.2 → 0.2.3

package/bin/fastedge-debug.js

@@ -34,8 +34,43 @@ function resolveAppRoot(startPath) {
   return dir;
 }
 
-process.env.WORKSPACE_PATH = resolveAppRoot(
-  process.argv[2] ? resolve(process.argv[2]) : process.cwd()
-);
+// Parse `--project-dir <path>` / `--project-dir=<path>` and strip it from argv
+// before the server import, so the server's own arg handling doesn't see it.
+// When set, it overrides the positional fallback for resolveAppRoot — useful
+// when running from a nested sandbox (e.g. `cd fastedge-test && npm run debug`
+// with the project root one directory up).
+function extractProjectDirFlag(argv) {
+  for (let i = 2; i < argv.length; i++) {
+    const a = argv[i];
+    if (a === "--project-dir" || a === "-C") {
+      const value = argv[i + 1];
+      if (!value) {
+        console.error(`Error: ${a} requires a path argument.`);
+        process.exit(2);
+      }
+      argv.splice(i, 2);
+      return value;
+    }
+    const eq = a.startsWith("--project-dir=")
+      ? a.slice("--project-dir=".length)
+      : a.startsWith("-C=")
+        ? a.slice("-C=".length)
+        : null;
+    if (eq !== null) {
+      argv.splice(i, 1);
+      return eq;
+    }
+  }
+  return null;
+}
+
+const projectDirFlag = extractProjectDirFlag(process.argv);
+const startPath = projectDirFlag
+  ? resolve(projectDirFlag)
+  : process.argv[2]
+    ? resolve(process.argv[2])
+    : process.cwd();
+
+process.env.WORKSPACE_PATH = resolveAppRoot(startPath);
 
 import("../dist/server.js");

package/dist/lib/index.cjs

@@ -2910,19 +2910,37 @@ function getCliBinaryName() {
       throw new Error(`Unsupported platform: ${import_os.default.platform()}`);
   }
 }
-function getBundledCliPaths() {
+function getPackageRoot(startDir = _currentDir) {
+  let dir = startDir;
+  while (true) {
+    const pkgPath = (0, import_path2.join)(dir, "package.json");
+    if ((0, import_fs.existsSync)(pkgPath)) {
+      try {
+        const pkg = JSON.parse((0, import_fs.readFileSync)(pkgPath, "utf8"));
+        if (pkg.name === "@gcoredev/fastedge-test") return dir;
+      } catch {
+      }
+    }
+    const parent = (0, import_path2.dirname)(dir);
+    if (parent === dir) return null;
+    dir = parent;
+  }
+}
+function getBundledCliPaths(startDir = _currentDir) {
   const binaryName = getCliBinaryName();
-  return [
-    // Installed npm package: dist/lib/index.js → dist/fastedge-cli/
-    (0, import_path2.join)(_currentDir, "..", "fastedge-cli", binaryName),
-    // Production: bundled server at dist/server.js → dist/fastedge-cli/
-    (0, import_path2.join)(_currentDir, "fastedge-cli", binaryName),
-    // Development/Tests: running from source
-    // _currentDir might be server/utils/, so go up to project root
-    (0, import_path2.join)(_currentDir, "..", "..", "fastedge-run", binaryName),
-    // Alternative: if _currentDir is already at project root
-    (0, import_path2.join)(_currentDir, "fastedge-run", binaryName)
-  ];
+  const candidates = [];
+  const root = getPackageRoot(startDir);
+  if (root) {
+    candidates.push(
+      (0, import_path2.join)(root, "dist", "fastedge-cli", binaryName),
+      (0, import_path2.join)(root, "fastedge-run", binaryName)
+    );
+  }
+  candidates.push(
+    (0, import_path2.join)(startDir, "fastedge-cli", binaryName),
+    (0, import_path2.join)(startDir, "..", "fastedge-cli", binaryName)
+  );
+  return candidates;
 }
 function ensureExecutable(binaryPath) {
   if (process.platform !== "win32") {
@@ -2960,7 +2978,7 @@ async function findFastEdgeRunCli() {
   } catch (error) {
   }
   throw new Error(
-    "fastedge-run CLI not found in any of these locations:\n  1. FASTEDGE_RUN_PATH environment variable\n  2. Bundled binary in fastedge-cli/ (project root)\n  3. System PATH\n\nTo fix this:\n  - Set FASTEDGE_RUN_PATH environment variable, or\n  - Install fastedge-run in PATH: cargo install fastedge-run, or\n  - Place the binary in fastedge-cli/ at project root (platform-specific filename)"
+    "fastedge-run CLI not found in any of these locations:\n  1. FASTEDGE_RUN_PATH environment variable\n  2. Bundled inside the @gcoredev/fastedge-test package (dist/fastedge-cli/<binary> when installed, fastedge-run/<binary> in the source tree)\n  3. System PATH (which/where fastedge-run)\n\nTo fix this:\n  - Set FASTEDGE_RUN_PATH to a fastedge-run binary you have locally, or\n  - Install fastedge-run in PATH: cargo install fastedge-run, or\n  - Reinstall @gcoredev/fastedge-test to restore the bundled binary (or, when developing this repo, place the platform binary in fastedge-run/)"
   );
 }
 

package/dist/lib/index.js

@@ -1,3 +1,5 @@
+import { createRequire as __cr } from 'node:module'; const require = __cr(import.meta.url);
+
 // server/runner/ProxyWasmRunner.ts
 import { WASI } from "node:wasi";
 
@@ -2849,7 +2851,7 @@ import { spawn, execSync as execSync2 } from "child_process";
 
 // server/utils/fastedge-cli.ts
 import { execSync } from "child_process";
-import { existsSync, chmodSync } from "fs";
+import { existsSync, chmodSync, readFileSync } from "fs";
 import { join, dirname } from "path";
 import { fileURLToPath } from "url";
 import os from "os";
@@ -2866,19 +2868,37 @@ function getCliBinaryName() {
       throw new Error(`Unsupported platform: ${os.platform()}`);
   }
 }
-function getBundledCliPaths() {
+function getPackageRoot(startDir = _currentDir) {
+  let dir = startDir;
+  while (true) {
+    const pkgPath = join(dir, "package.json");
+    if (existsSync(pkgPath)) {
+      try {
+        const pkg = JSON.parse(readFileSync(pkgPath, "utf8"));
+        if (pkg.name === "@gcoredev/fastedge-test") return dir;
+      } catch {
+      }
+    }
+    const parent = dirname(dir);
+    if (parent === dir) return null;
+    dir = parent;
+  }
+}
+function getBundledCliPaths(startDir = _currentDir) {
   const binaryName = getCliBinaryName();
-  return [
-    // Installed npm package: dist/lib/index.js → dist/fastedge-cli/
-    join(_currentDir, "..", "fastedge-cli", binaryName),
-    // Production: bundled server at dist/server.js → dist/fastedge-cli/
-    join(_currentDir, "fastedge-cli", binaryName),
-    // Development/Tests: running from source
-    // _currentDir might be server/utils/, so go up to project root
-    join(_currentDir, "..", "..", "fastedge-run", binaryName),
-    // Alternative: if _currentDir is already at project root
-    join(_currentDir, "fastedge-run", binaryName)
-  ];
+  const candidates = [];
+  const root = getPackageRoot(startDir);
+  if (root) {
+    candidates.push(
+      join(root, "dist", "fastedge-cli", binaryName),
+      join(root, "fastedge-run", binaryName)
+    );
+  }
+  candidates.push(
+    join(startDir, "fastedge-cli", binaryName),
+    join(startDir, "..", "fastedge-cli", binaryName)
+  );
+  return candidates;
 }
 function ensureExecutable(binaryPath) {
   if (process.platform !== "win32") {
@@ -2916,7 +2936,7 @@ async function findFastEdgeRunCli() {
   } catch (error) {
   }
   throw new Error(
-    "fastedge-run CLI not found in any of these locations:\n  1. FASTEDGE_RUN_PATH environment variable\n  2. Bundled binary in fastedge-cli/ (project root)\n  3. System PATH\n\nTo fix this:\n  - Set FASTEDGE_RUN_PATH environment variable, or\n  - Install fastedge-run in PATH: cargo install fastedge-run, or\n  - Place the binary in fastedge-cli/ at project root (platform-specific filename)"
+    "fastedge-run CLI not found in any of these locations:\n  1. FASTEDGE_RUN_PATH environment variable\n  2. Bundled inside the @gcoredev/fastedge-test package (dist/fastedge-cli/<binary> when installed, fastedge-run/<binary> in the source tree)\n  3. System PATH (which/where fastedge-run)\n\nTo fix this:\n  - Set FASTEDGE_RUN_PATH to a fastedge-run binary you have locally, or\n  - Install fastedge-run in PATH: cargo install fastedge-run, or\n  - Reinstall @gcoredev/fastedge-test to restore the bundled binary (or, when developing this repo, place the platform binary in fastedge-run/)"
   );
 }
 

package/dist/lib/test-framework/index.cjs

@@ -21307,19 +21307,37 @@ function getCliBinaryName() {
       throw new Error(`Unsupported platform: ${import_os.default.platform()}`);
   }
 }
-function getBundledCliPaths() {
+function getPackageRoot(startDir = _currentDir) {
+  let dir = startDir;
+  while (true) {
+    const pkgPath = (0, import_path2.join)(dir, "package.json");
+    if ((0, import_fs.existsSync)(pkgPath)) {
+      try {
+        const pkg = JSON.parse((0, import_fs.readFileSync)(pkgPath, "utf8"));
+        if (pkg.name === "@gcoredev/fastedge-test") return dir;
+      } catch {
+      }
+    }
+    const parent = (0, import_path2.dirname)(dir);
+    if (parent === dir) return null;
+    dir = parent;
+  }
+}
+function getBundledCliPaths(startDir = _currentDir) {
   const binaryName = getCliBinaryName();
-  return [
-    // Installed npm package: dist/lib/index.js → dist/fastedge-cli/
-    (0, import_path2.join)(_currentDir, "..", "fastedge-cli", binaryName),
-    // Production: bundled server at dist/server.js → dist/fastedge-cli/
-    (0, import_path2.join)(_currentDir, "fastedge-cli", binaryName),
-    // Development/Tests: running from source
-    // _currentDir might be server/utils/, so go up to project root
-    (0, import_path2.join)(_currentDir, "..", "..", "fastedge-run", binaryName),
-    // Alternative: if _currentDir is already at project root
-    (0, import_path2.join)(_currentDir, "fastedge-run", binaryName)
-  ];
+  const candidates = [];
+  const root = getPackageRoot(startDir);
+  if (root) {
+    candidates.push(
+      (0, import_path2.join)(root, "dist", "fastedge-cli", binaryName),
+      (0, import_path2.join)(root, "fastedge-run", binaryName)
+    );
+  }
+  candidates.push(
+    (0, import_path2.join)(startDir, "fastedge-cli", binaryName),
+    (0, import_path2.join)(startDir, "..", "fastedge-cli", binaryName)
+  );
+  return candidates;
 }
 function ensureExecutable(binaryPath) {
   if (process.platform !== "win32") {
@@ -21357,7 +21375,7 @@ async function findFastEdgeRunCli() {
   } catch (error) {
   }
   throw new Error(
-    "fastedge-run CLI not found in any of these locations:\n  1. FASTEDGE_RUN_PATH environment variable\n  2. Bundled binary in fastedge-cli/ (project root)\n  3. System PATH\n\nTo fix this:\n  - Set FASTEDGE_RUN_PATH environment variable, or\n  - Install fastedge-run in PATH: cargo install fastedge-run, or\n  - Place the binary in fastedge-cli/ at project root (platform-specific filename)"
+    "fastedge-run CLI not found in any of these locations:\n  1. FASTEDGE_RUN_PATH environment variable\n  2. Bundled inside the @gcoredev/fastedge-test package (dist/fastedge-cli/<binary> when installed, fastedge-run/<binary> in the source tree)\n  3. System PATH (which/where fastedge-run)\n\nTo fix this:\n  - Set FASTEDGE_RUN_PATH to a fastedge-run binary you have locally, or\n  - Install fastedge-run in PATH: cargo install fastedge-run, or\n  - Reinstall @gcoredev/fastedge-test to restore the bundled binary (or, when developing this repo, place the platform binary in fastedge-run/)"
   );
 }
 

package/dist/lib/test-framework/index.js

@@ -1,3 +1,4 @@
+import { createRequire as __cr } from 'node:module'; const require = __cr(import.meta.url);
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -21254,7 +21255,7 @@ import { spawn, execSync as execSync2 } from "child_process";
 
 // server/utils/fastedge-cli.ts
 import { execSync } from "child_process";
-import { existsSync, chmodSync } from "fs";
+import { existsSync, chmodSync, readFileSync } from "fs";
 import { join, dirname } from "path";
 import { fileURLToPath } from "url";
 import os from "os";
@@ -21271,19 +21272,37 @@ function getCliBinaryName() {
       throw new Error(`Unsupported platform: ${os.platform()}`);
   }
 }
-function getBundledCliPaths() {
+function getPackageRoot(startDir = _currentDir) {
+  let dir = startDir;
+  while (true) {
+    const pkgPath = join(dir, "package.json");
+    if (existsSync(pkgPath)) {
+      try {
+        const pkg = JSON.parse(readFileSync(pkgPath, "utf8"));
+        if (pkg.name === "@gcoredev/fastedge-test") return dir;
+      } catch {
+      }
+    }
+    const parent = dirname(dir);
+    if (parent === dir) return null;
+    dir = parent;
+  }
+}
+function getBundledCliPaths(startDir = _currentDir) {
   const binaryName = getCliBinaryName();
-  return [
-    // Installed npm package: dist/lib/index.js → dist/fastedge-cli/
-    join(_currentDir, "..", "fastedge-cli", binaryName),
-    // Production: bundled server at dist/server.js → dist/fastedge-cli/
-    join(_currentDir, "fastedge-cli", binaryName),
-    // Development/Tests: running from source
-    // _currentDir might be server/utils/, so go up to project root
-    join(_currentDir, "..", "..", "fastedge-run", binaryName),
-    // Alternative: if _currentDir is already at project root
-    join(_currentDir, "fastedge-run", binaryName)
-  ];
+  const candidates = [];
+  const root = getPackageRoot(startDir);
+  if (root) {
+    candidates.push(
+      join(root, "dist", "fastedge-cli", binaryName),
+      join(root, "fastedge-run", binaryName)
+    );
+  }
+  candidates.push(
+    join(startDir, "fastedge-cli", binaryName),
+    join(startDir, "..", "fastedge-cli", binaryName)
+  );
+  return candidates;
 }
 function ensureExecutable(binaryPath) {
   if (process.platform !== "win32") {
@@ -21321,7 +21340,7 @@ async function findFastEdgeRunCli() {
   } catch (error) {
   }
   throw new Error(
-    "fastedge-run CLI not found in any of these locations:\n  1. FASTEDGE_RUN_PATH environment variable\n  2. Bundled binary in fastedge-cli/ (project root)\n  3. System PATH\n\nTo fix this:\n  - Set FASTEDGE_RUN_PATH environment variable, or\n  - Install fastedge-run in PATH: cargo install fastedge-run, or\n  - Place the binary in fastedge-cli/ at project root (platform-specific filename)"
+    "fastedge-run CLI not found in any of these locations:\n  1. FASTEDGE_RUN_PATH environment variable\n  2. Bundled inside the @gcoredev/fastedge-test package (dist/fastedge-cli/<binary> when installed, fastedge-run/<binary> in the source tree)\n  3. System PATH (which/where fastedge-run)\n\nTo fix this:\n  - Set FASTEDGE_RUN_PATH to a fastedge-run binary you have locally, or\n  - Install fastedge-run in PATH: cargo install fastedge-run, or\n  - Reinstall @gcoredev/fastedge-test to restore the bundled binary (or, when developing this repo, place the platform binary in fastedge-run/)"
   );
 }
 

package/dist/lib/utils/fastedge-cli.d.ts

@@ -3,9 +3,44 @@
  *
  * Discovers the FastEdge-run CLI binary in the following order:
  * 1. FASTEDGE_RUN_PATH environment variable
- * 2. Bundled binary in server/fastedge-cli/ (platform-specific)
+ * 2. Bundled binary inside the @gcoredev/fastedge-test package, anchored on
+ *    the package root (see getPackageRoot):
+ *      • dist/fastedge-cli/<binary>   — published npm layout
+ *      • fastedge-run/<binary>        — in-repo source/dev layout
  * 3. PATH (using 'which' or 'where' command)
  */
+/**
+ * Walk up from `startDir` until a package.json with name "@gcoredev/fastedge-test"
+ * is found. Anchoring on the package name (rather than hardcoded depths or an
+ * unbounded walk) keeps the search robust across bundle layouts and avoids
+ * climbing into a sibling package in workspace/monorepo installs.
+ *
+ * `startDir` defaults to the directory of this file (resolved at module load).
+ * It is overridable for tests so the resolver can be exercised against
+ * synthetic package layouts.
+ */
+export declare function getPackageRoot(startDir?: string): string | null;
+/**
+ * Get possible bundled CLI paths.
+ *
+ * Two resolution modes, both contribute candidates:
+ *
+ *  1. **Package-root anchored** (primary) — when a `@gcoredev/fastedge-test`
+ *     package.json can be located via `getPackageRoot`, candidates resolve
+ *     against it: the published npm layout (`dist/fastedge-cli/`) and the
+ *     in-repo source layout (`fastedge-run/`).
+ *
+ *  2. **startDir-relative fallback** — covers bundle layouts that ship
+ *     without our package.json available nearby. Notably the VSCode extension
+ *     copies `dist/server.js` and `dist/fastedge-cli/` into its own tree, so
+ *     the walker can't anchor on our package root. The fallback lets the
+ *     server bundle locate the sibling `fastedge-cli/` directory directly.
+ *
+ * `findFastEdgeRunCli` filters by existence, so listing extra candidates is
+ * safe — the first one that actually exists wins. `startDir` is overridable
+ * for tests.
+ */
+export declare function getBundledCliPaths(startDir?: string): string[];
 /**
  * Find the FastEdge-run CLI binary
  * @returns The absolute path to the fastedge-run binary