@effectstream/orchestrator 0.100.9 → 0.100.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effectstream/orchestrator",
-  "version": "0.100.9",
+  "version": "0.100.10",
   "license": "MIT",
   "homepage": "https://effectstream.github.io/docs/",
   "repository": {
@@ -31,7 +31,7 @@
     "start": "bun src/cli.ts start"
   },
   "dependencies": {
-    "@effectstream/db": "0.100.9"
+    "@effectstream/db": "0.100.10"
   },
   "description": "Multi-chain local development environment for EffectStream"
 }

package/scripts/launch-avail.ts

@@ -1,5 +1,5 @@
 import type { ProcessConfig } from "../src/config.ts";
-import { resolvePackageDir } from "./resolve-package.ts";
+import { resolvePackageDir, type ResolveLocation } from "./resolve-package.ts";
 
 export const AvailNames = {
   NODE: "avail-node",
@@ -17,10 +17,10 @@ const REQUIRED_SCRIPTS = {
 
 export function launchAvail(
   packageName: string,
-  resolveFrom: string,
+  location: ResolveLocation,
   opts?: { nodePorts?: number[]; clientPorts?: number[] },
 ): ProcessConfig[] {
-  const cwd = resolvePackageDir("launchAvail", packageName, resolveFrom, REQUIRED_SCRIPTS);
+  const cwd = resolvePackageDir("launchAvail", packageName, location, REQUIRED_SCRIPTS);
   const nodePorts = opts?.nodePorts ?? [9955, 30334];
   const clientPorts = opts?.clientPorts ?? [7007];
 

package/scripts/launch-bitcoin.ts

@@ -1,5 +1,5 @@
 import type { ProcessConfig } from "../src/config.ts";
-import { resolvePackageDir } from "./resolve-package.ts";
+import { resolvePackageDir, type ResolveLocation } from "./resolve-package.ts";
 
 export const BitcoinNames = {
   BITCOIN_CORE: "bitcoin-core",
@@ -17,10 +17,10 @@ const REQUIRED_SCRIPTS = {
 
 export function launchBitcoin(
   packageName: string,
-  resolveFrom: string,
+  location: ResolveLocation,
   opts?: { ports?: number[] },
 ): ProcessConfig[] {
-  const cwd = resolvePackageDir("launchBitcoin", packageName, resolveFrom, REQUIRED_SCRIPTS);
+  const cwd = resolvePackageDir("launchBitcoin", packageName, location, REQUIRED_SCRIPTS);
   const ports = opts?.ports ?? [18334, 18443];
 
   return [

package/scripts/launch-cardano.ts

@@ -1,5 +1,5 @@
 import type { ProcessConfig } from "../src/config.ts";
-import { resolvePackageDir } from "./resolve-package.ts";
+import { resolvePackageDir, type ResolveLocation } from "./resolve-package.ts";
 
 const waitHttpScript = new URL("./wait-http.ts", import.meta.url).pathname;
 
@@ -24,10 +24,10 @@ const REQUIRED_SCRIPTS = {
 
 export function launchCardano(
   packageName: string,
-  resolveFrom: string,
+  location: ResolveLocation,
   opts?: { ports?: number[] },
 ): ProcessConfig[] {
-  const cwd = resolvePackageDir("launchCardano", packageName, resolveFrom, REQUIRED_SCRIPTS);
+  const cwd = resolvePackageDir("launchCardano", packageName, location, REQUIRED_SCRIPTS);
   const ports = opts?.ports ?? [
     8090,  // CARDANO_SUBMIT_TX: cardano-submit-api
     10000, // YACI_DEVKIT: admin port

package/scripts/launch-evm.ts

@@ -1,5 +1,5 @@
 import type { ProcessConfig } from "../src/config.ts";
-import { resolvePackageDir } from "./resolve-package.ts";
+import { resolvePackageDir, type ResolveLocation } from "./resolve-package.ts";
 
 export const EvmNames = {
   HARDHAT: "hardhat",
@@ -18,10 +18,10 @@ const REQUIRED_SCRIPTS = {
 
 export function launchEvm(
   packageName: string,
-  resolveFrom: string,
+  location: ResolveLocation,
   opts?: { ports?: number[] },
 ): ProcessConfig[] {
-  const cwd = resolvePackageDir("launchEvm", packageName, resolveFrom, REQUIRED_SCRIPTS);
+  const cwd = resolvePackageDir("launchEvm", packageName, location, REQUIRED_SCRIPTS);
   const ports = opts?.ports ?? [8545, 8546];
 
   return [

package/scripts/launch-midnight.ts

@@ -1,5 +1,5 @@
 import type { ProcessConfig } from "../src/config.ts";
-import { resolvePackageDir } from "./resolve-package.ts";
+import { resolvePackageDir, type ResolveLocation } from "./resolve-package.ts";
 
 export const MidnightNames = {
   NODE: "midnight-node",
@@ -23,13 +23,13 @@ const REQUIRED_SCRIPTS = {
 
 export function launchMidnight(
   packageName: string,
-  resolveFrom: string,
+  location: ResolveLocation,
   opts?: {
     env?: { MIDNIGHT_STORAGE_PASSWORD?: string };
     dependsOn?: string[];
   },
 ): ProcessConfig[] {
-  const cwd = resolvePackageDir("launchMidnight", packageName, resolveFrom, REQUIRED_SCRIPTS);
+  const cwd = resolvePackageDir("launchMidnight", packageName, location, REQUIRED_SCRIPTS);
   const deployEnv: Record<string, string> = {};
   if (opts?.env?.MIDNIGHT_STORAGE_PASSWORD) {
     deployEnv.MIDNIGHT_STORAGE_PASSWORD = opts.env.MIDNIGHT_STORAGE_PASSWORD;

package/scripts/launch-near.ts

@@ -1,5 +1,5 @@
 import type { ProcessConfig } from "../src/config.ts";
-import { resolvePackageDir } from "./resolve-package.ts";
+import { resolvePackageDir, type ResolveLocation } from "./resolve-package.ts";
 
 export const NearNames = {
   SANDBOX: "near-sandbox",
@@ -13,10 +13,10 @@ const REQUIRED_SCRIPTS = {
 
 export function launchNear(
   packageName: string,
-  resolveFrom: string,
+  location: ResolveLocation,
   opts?: { ports?: number[] },
 ): ProcessConfig[] {
-  const cwd = resolvePackageDir("launchNear", packageName, resolveFrom, REQUIRED_SCRIPTS);
+  const cwd = resolvePackageDir("launchNear", packageName, location, REQUIRED_SCRIPTS);
   const ports = opts?.ports ?? [3030];
 
   return [

package/scripts/resolve-package.ts

@@ -1,6 +1,10 @@
 import fs from "fs";
 import path from "path";
 
+export type ResolveLocation =
+  | { cwd: string; resolveFrom?: never }
+  | { resolveFrom: string; cwd?: never };
+
 function resolveEntry(packageName: string, resolveFrom: string): string {
   try {
     return require.resolve(packageName, { paths: [resolveFrom] });
@@ -9,34 +13,62 @@ function resolveEntry(packageName: string, resolveFrom: string): string {
   }
 }
 
-export function resolvePackageDir(
+function resolveViaRequire(
   launcherName: string,
   packageName: string,
   resolveFrom: string,
-  requiredScripts: Record<string, string>,
 ): string {
   const resolved = resolveEntry(packageName, resolveFrom);
   let dir = path.dirname(resolved);
   while (dir !== path.dirname(dir)) {
     const pkgJsonPath = path.join(dir, "package.json");
     if (!fs.existsSync(pkgJsonPath)) { dir = path.dirname(dir); continue; }
-
     const pkg = JSON.parse(fs.readFileSync(pkgJsonPath, "utf8"));
-    if (pkg.name !== packageName) { dir = path.dirname(dir); continue; }
-
-    const scripts = pkg.scripts ?? {};
-    const required = Object.keys(requiredScripts);
-    const missing = required.filter((s) => !(s in scripts));
-    if (missing.length > 0) {
-      throw new Error(
-        `${launcherName}: package "${packageName}" is missing required scripts: ${missing.join(", ")}\n` +
-          `  This launcher expects the following scripts in package.json:\n` +
-          missing.map((s) => `    - ${s}: ${requiredScripts[s]}`).join("\n"),
-      );
-    }
-    return dir;
+    if (pkg.name === packageName) return dir;
+    dir = path.dirname(dir);
   }
   throw new Error(
     `${launcherName}: could not find package.json for "${packageName}" (resolved to "${resolved}")`,
   );
 }
+
+function validatePackageName(
+  launcherName: string,
+  packageName: string,
+  cwd: string,
+): void {
+  const pkgPath = path.join(cwd, "package.json");
+  if (!fs.existsSync(pkgPath)) {
+    throw new Error(`${launcherName}: no package.json found in "${cwd}"`);
+  }
+  const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
+  if (pkg.name !== packageName) {
+    throw new Error(
+      `${launcherName}: expected package "${packageName}" but found "${pkg.name}" in "${cwd}"`,
+    );
+  }
+}
+
+export function resolvePackageDir(
+  launcherName: string,
+  packageName: string,
+  location: ResolveLocation,
+  requiredScripts: Record<string, string>,
+): string {
+  const dir = location.cwd
+    ? (validatePackageName(launcherName, packageName, location.cwd), location.cwd)
+    : resolveViaRequire(launcherName, packageName, location.resolveFrom);
+
+  const pkgPath = path.join(dir, "package.json");
+  const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
+  const scripts = pkg.scripts ?? {};
+  const missing = Object.keys(requiredScripts).filter((s) => !(s in scripts));
+  if (missing.length > 0) {
+    throw new Error(
+      `${launcherName}: package "${packageName}" is missing required scripts: ${missing.join(", ")}\n` +
+        `  This launcher expects the following scripts in package.json:\n` +
+        missing.map((s) => `    - ${s}: ${requiredScripts[s]}`).join("\n"),
+    );
+  }
+  return dir;
+}