@absolutejs/absolute 0.19.0-beta.660 → 0.19.0-beta.661

package/dist/cli/index.js

@@ -669,8 +669,8 @@ __export(exports_compile, {
   compile: () => compile
 });
 var {env: env3 } = globalThis.Bun;
-import { existsSync as existsSync8, readdirSync, readFileSync as readFileSync8, unlinkSync } from "fs";
-import { basename as basename2, join as join6, relative, resolve as resolve6 } from "path";
+import { existsSync as existsSync9, readdirSync, readFileSync as readFileSync8, unlinkSync } from "fs";
+import { basename as basename2, join as join6, relative, resolve as resolve7 } from "path";
 var cliTag3 = (color, message) => `\x1B[2m${formatTimestamp()}\x1B[0m ${color}[cli]\x1B[0m ${color}${message}\x1B[0m`, collectFiles2 = (dir) => {
   const result = [];
   let pending = readdirSync(dir, { withFileTypes: true });
@@ -719,18 +719,18 @@ var cliTag3 = (color, message) => `\x1B[2m${formatTimestamp()}\x1B[0m ${color}[c
   return;
 }, resolveJsxDevRuntimeCompatPath2 = () => {
   const candidates = [
-    resolve6(import.meta.dir, "..", "..", "dist", "react", "jsxDevRuntimeCompat.js"),
-    resolve6(import.meta.dir, "..", "..", "react", "jsxDevRuntimeCompat.js"),
-    resolve6(import.meta.dir, "..", "..", "react", "jsxDevRuntimeCompat.ts"),
-    resolve6(import.meta.dir, "..", "..", "..", "dist", "react", "jsxDevRuntimeCompat.js"),
-    resolve6(import.meta.dir, "..", "..", "..", "react", "jsxDevRuntimeCompat.js"),
-    resolve6(import.meta.dir, "..", "..", "..", "src", "react", "jsxDevRuntimeCompat.ts")
+    resolve7(import.meta.dir, "..", "..", "dist", "react", "jsxDevRuntimeCompat.js"),
+    resolve7(import.meta.dir, "..", "..", "react", "jsxDevRuntimeCompat.js"),
+    resolve7(import.meta.dir, "..", "..", "react", "jsxDevRuntimeCompat.ts"),
+    resolve7(import.meta.dir, "..", "..", "..", "dist", "react", "jsxDevRuntimeCompat.js"),
+    resolve7(import.meta.dir, "..", "..", "..", "react", "jsxDevRuntimeCompat.js"),
+    resolve7(import.meta.dir, "..", "..", "..", "src", "react", "jsxDevRuntimeCompat.ts")
   ];
   for (const candidate of candidates) {
-    if (existsSync8(candidate))
+    if (existsSync9(candidate))
       return candidate;
   }
-  return resolve6(import.meta.dir, "..", "..", "react", "jsxDevRuntimeCompat.js");
+  return resolve7(import.meta.dir, "..", "..", "react", "jsxDevRuntimeCompat.js");
 }, jsxDevRuntimeCompatPath2, generateEntrypoint = (distDir, serverEntry, prerenderMap, version2) => {
   const allFiles = collectFiles2(distDir);
   const serverBundleName = `${basename2(serverEntry).replace(/\.[^.]+$/, "")}.js`;
@@ -850,11 +850,11 @@ console.log(\`
   const prerenderPort = Number(env3.COMPILE_PORT) || Number(env3.PORT) || DEFAULT_PORT + 1;
   killStaleProcesses(prerenderPort);
   const entryName = basename2(serverEntry).replace(/\.[^.]+$/, "");
-  const resolvedOutdir = resolve6(outdir ?? "dist");
-  const resolvedOutfile = resolve6(outfile ?? "compiled-server");
+  const resolvedOutdir = resolve7(outdir ?? "dist");
+  const resolvedOutfile = resolve7(outfile ?? "compiled-server");
   const absoluteVersion = resolvePackageVersion2([
-    resolve6(import.meta.dir, "..", "..", "..", "package.json"),
-    resolve6(import.meta.dir, "..", "..", "package.json")
+    resolve7(import.meta.dir, "..", "..", "..", "package.json"),
+    resolve7(import.meta.dir, "..", "..", "package.json")
   ]);
   const totalStart = performance.now();
   const buildStart = performance.now();
@@ -864,8 +864,8 @@ console.log(\`
   buildConfig.mode = "production";
   try {
     const build = await resolveBuildModule2([
-      resolve6(import.meta.dir, "..", "..", "core", "build"),
-      resolve6(import.meta.dir, "..", "build")
+      resolve7(import.meta.dir, "..", "..", "core", "build"),
+      resolve7(import.meta.dir, "..", "build")
     ]);
     if (!build)
       throw new Error("Could not locate build module");
@@ -880,7 +880,7 @@ console.log(\`
   process.stdout.write(cliTag3("\x1B[36m", "Bundling production server"));
   const serverBundle = await Bun.build({
     define: { "process.env.NODE_ENV": '"production"' },
-    entrypoints: [resolve6(serverEntry)],
+    entrypoints: [resolve7(serverEntry)],
     external: FRAMEWORK_EXTERNALS,
     outdir: resolvedOutdir,
     plugins: [stubPlugin],
@@ -891,8 +891,8 @@ console.log(\`
     console.error(cliTag3("\x1B[31m", "Server bundle failed."));
     process.exit(1);
   }
-  const outputPath = resolve6(resolvedOutdir, `${entryName}.js`);
-  if (!existsSync8(outputPath)) {
+  const outputPath = resolve7(resolvedOutdir, `${entryName}.js`);
+  if (!existsSync9(outputPath)) {
     console.error(cliTag3("\x1B[31m", `Expected output not found: ${outputPath}`));
     process.exit(1);
   }
@@ -1032,8 +1032,8 @@ var exports_typecheck = {};
 __export(exports_typecheck, {
   typecheck: () => typecheck
 });
-import { resolve as resolve7, join as join7 } from "path";
-import { existsSync as existsSync9 } from "fs";
+import { resolve as resolve8, join as join7 } from "path";
+import { existsSync as existsSync10 } from "fs";
 import { mkdir as mkdir2, writeFile } from "fs/promises";
 var run = async (name, command) => {
   const proc = Bun.spawn(command, {
@@ -1047,8 +1047,8 @@ var run = async (name, command) => {
   const exitCode = await proc.exited;
   return { exitCode, name, output: (stdout + stderr).trim() };
 }, shellEscape = (value) => `'${value.replaceAll("'", "'\\''")}'`, runShell = async (name, command) => run(name, ["/bin/bash", "-lc", command]), findBin = (name) => {
-  const local = resolve7("node_modules", ".bin", name);
-  return existsSync9(local) ? local : null;
+  const local = resolve8("node_modules", ".bin", name);
+  return existsSync10(local) ? local : null;
 }, stripAnsi = (str) => str.replace(/\x1b\[[0-9;]*m/g, ""), formatSvelteOutput = (output) => {
   const cwd = `${process.cwd()}/`;
   const summaryMatch = stripAnsi(output).match(/svelte-check found (\d+) error/);
@@ -1105,13 +1105,13 @@ Found ${errorCount} error${suffix}.`;
       rootDir: ".."
     },
     exclude: TYPECHECK_EXCLUDE,
-    extends: resolve7("tsconfig.json"),
+    extends: resolve8("tsconfig.json"),
     include: TYPECHECK_INCLUDE
   }, null, "\t")).then(() => run("vue-tsc", [
     vueTscBin,
     "--noEmit",
     "--project",
-    resolve7(vueTsconfigPath),
+    resolve8(vueTsconfigPath),
     "--incremental",
     "--tsBuildInfoFile",
     join7(cacheDir, "vue-tsc.tsbuildinfo"),
@@ -1133,10 +1133,10 @@ Found ${errorCount} error${suffix}.`;
       rootDir: ".."
     },
     exclude: TYPECHECK_EXCLUDE,
-    extends: resolve7("tsconfig.json"),
+    extends: resolve8("tsconfig.json"),
     include: [`../${angularDir}/**/*`]
   }, null, "\t"));
-  return runShell("ngc", `${shellEscape(ngcBin)} -p ${shellEscape(resolve7(angularTsconfigPath))}`);
+  return runShell("ngc", `${shellEscape(ngcBin)} -p ${shellEscape(resolve8(angularTsconfigPath))}`);
 }, buildTscCheck = (cacheDir) => {
   const tscBin = findBin("tsc");
   if (!tscBin) {
@@ -1149,13 +1149,13 @@ Found ${errorCount} error${suffix}.`;
       rootDir: ".."
     },
     exclude: TYPECHECK_EXCLUDE,
-    extends: resolve7("tsconfig.json"),
+    extends: resolve8("tsconfig.json"),
     include: TYPECHECK_INCLUDE
   }, null, "\t")).then(() => run("tsc", [
     tscBin,
     "--noEmit",
     "--project",
-    resolve7(tscConfigPath),
+    resolve8(tscConfigPath),
     "--incremental",
     "--tsBuildInfoFile",
     join7(cacheDir, "tsc.tsbuildinfo"),
@@ -1169,13 +1169,13 @@ Found ${errorCount} error${suffix}.`;
   }
   const svelteTsconfigPath = join7(cacheDir, "tsconfig.svelte-check.json");
   await writeFile(svelteTsconfigPath, JSON.stringify({
-    extends: resolve7("tsconfig.json"),
+    extends: resolve8("tsconfig.json"),
     include: [`../${svelteDir}/**/*`]
   }, null, "\t"));
   return run("svelte-check", [
     svelteBin,
     "--tsconfig",
-    resolve7(svelteTsconfigPath),
+    resolve8(svelteTsconfigPath),
     "--threshold",
     "error",
     "--compiler-warnings",
@@ -2375,12 +2375,245 @@ var start = async (serverEntry, outdir, configPath2) => {
   process.exit(exitCode);
 };
 
+// src/cli/scripts/workspace.ts
+init_constants();
+init_loadConfig();
+init_startupBanner();
+init_utils();
+import { existsSync as existsSync8 } from "fs";
+import { resolve as resolve6 } from "path";
+var serviceTag = (name, color) => `\x1B[2m${formatTimestamp()}\x1B[0m ${color}[${name}]\x1B[0m`;
+var workspaceTag = (color, message) => `${serviceTag("workspace", color)} ${color}${message}\x1B[0m`;
+var sleep = (ms) => new Promise((resolvePromise) => setTimeout(resolvePromise, ms));
+var ensureWorkspaceConfig = (config) => {
+  if (!config.workspace?.services || Object.keys(config.workspace.services).length === 0) {
+    throw new Error("absolute.config.ts is missing workspace.services. Add a workspace section before using `absolute workspace dev`.");
+  }
+  return config.workspace;
+};
+var resolveHealthcheck = (healthcheck) => {
+  if (!healthcheck) {
+    return null;
+  }
+  if (typeof healthcheck === "string") {
+    return {
+      intervalMs: 250,
+      timeoutMs: 30000,
+      url: healthcheck
+    };
+  }
+  return {
+    intervalMs: healthcheck.intervalMs ?? 250,
+    timeoutMs: healthcheck.timeoutMs ?? 30000,
+    url: healthcheck.url
+  };
+};
+var waitForHealthcheck = async (name, healthcheck) => {
+  const resolved = resolveHealthcheck(healthcheck);
+  if (!resolved) {
+    return;
+  }
+  const startedAt = Date.now();
+  while (Date.now() - startedAt < resolved.timeoutMs) {
+    try {
+      const response = await fetch(resolved.url);
+      if (response.ok) {
+        console.log(workspaceTag("\x1B[32m", `${name} passed healthcheck ${resolved.url}`));
+        return;
+      }
+    } catch {}
+    await sleep(resolved.intervalMs);
+  }
+  throw new Error(`${name} did not become healthy within ${resolved.timeoutMs}ms (${resolved.url})`);
+};
+var topologicallySortServices = (services) => {
+  const ordered = [];
+  const visiting = new Set;
+  const visited = new Set;
+  const visit = (name) => {
+    if (visited.has(name)) {
+      return;
+    }
+    if (visiting.has(name)) {
+      throw new Error(`workspace.services has a dependency cycle involving "${name}"`);
+    }
+    const service = services[name];
+    if (!service) {
+      throw new Error(`workspace.services references unknown service "${name}"`);
+    }
+    visiting.add(name);
+    for (const dependency of service.dependsOn ?? []) {
+      if (!services[dependency]) {
+        throw new Error(`workspace.services.${name} depends on missing service "${dependency}"`);
+      }
+      visit(dependency);
+    }
+    visiting.delete(name);
+    visited.add(name);
+    ordered.push(name);
+  };
+  for (const name of Object.keys(services)) {
+    visit(name);
+  }
+  return ordered;
+};
+var createLineForwarder = (name, color, dest) => {
+  let buffer = "";
+  return {
+    push: (chunk) => {
+      buffer += Buffer.from(chunk).toString();
+      const lines = buffer.split(`
+`);
+      buffer = lines.pop() ?? "";
+      for (const line of lines) {
+        dest.write(`${serviceTag(name, color)} ${line}
+`);
+      }
+    },
+    flush: () => {
+      if (!buffer) {
+        return;
+      }
+      dest.write(`${serviceTag(name, color)} ${buffer}
+`);
+      buffer = "";
+    }
+  };
+};
+var pipeProcessLogs = (name, processHandle) => {
+  const stdoutForwarder = createLineForwarder(name, "\x1B[36m", process.stdout);
+  const stderrForwarder = createLineForwarder(name, "\x1B[31m", process.stderr);
+  const forward = async (stream, forwarder) => {
+    const reader = stream.getReader();
+    try {
+      while (true) {
+        const { done, value } = await reader.read();
+        if (done) {
+          break;
+        }
+        if (value) {
+          forwarder.push(value);
+        }
+      }
+    } finally {
+      forwarder.flush();
+      reader.releaseLock();
+    }
+  };
+  forward(processHandle.stdout, stdoutForwarder);
+  forward(processHandle.stderr, stderrForwarder);
+};
+var resolveService = (name, service, options) => {
+  const cwd = resolve6(service.cwd ?? ".");
+  const env3 = {
+    ...process.env,
+    ...service.env,
+    FORCE_COLOR: "1",
+    NODE_ENV: "development"
+  };
+  if (service.port && !env3.PORT) {
+    env3.PORT = String(service.port);
+  }
+  if (service.kind === "absolute") {
+    const configPath2 = service.config ? resolve6(cwd, service.config) : options.configPath ? resolve6(options.configPath) : process.env.ABSOLUTE_CONFIG ? resolve6(process.env.ABSOLUTE_CONFIG) : undefined;
+    if (configPath2) {
+      env3.ABSOLUTE_CONFIG = configPath2;
+    }
+    const command = [
+      process.execPath,
+      "--hot",
+      "--no-clear-screen",
+      service.entry ?? DEFAULT_SERVER_ENTRY
+    ];
+    return {
+      command,
+      configPath: configPath2,
+      cwd,
+      env: env3,
+      name,
+      service
+    };
+  }
+  return {
+    command: service.command,
+    cwd,
+    env: env3,
+    name,
+    service
+  };
+};
+var workspace = async (subcommand, options) => {
+  if (subcommand !== "dev") {
+    throw new Error(subcommand ? `Unknown workspace command: ${subcommand}` : "No workspace subcommand specified. Use `absolute workspace dev`.");
+  }
+  const config = await loadConfig(options.configPath);
+  const workspaceConfig = ensureWorkspaceConfig(config);
+  const orderedNames = topologicallySortServices(workspaceConfig.services);
+  const running = [];
+  let shuttingDown = false;
+  const shutdown = async (exitCode = 0) => {
+    if (shuttingDown) {
+      return;
+    }
+    shuttingDown = true;
+    for (const service of running) {
+      try {
+        service.process.kill();
+      } catch {}
+    }
+    await Promise.all(running.map((service) => service.process.exited));
+    process.exit(exitCode);
+  };
+  process.on("SIGINT", () => {
+    shutdown(0);
+  });
+  process.on("SIGTERM", () => {
+    shutdown(0);
+  });
+  console.log(workspaceTag("\x1B[36m", `Starting workspace services: ${orderedNames.join(", ")}`));
+  for (const name of orderedNames) {
+    const service = workspaceConfig.services[name];
+    if (!service) {
+      throw new Error(`workspace.services is missing "${name}"`);
+    }
+    const resolved = resolveService(name, service, options);
+    const port = (resolved.service.port ?? Number(resolved.env.PORT ?? "")) || DEFAULT_PORT;
+    if (port > 0) {
+      killStaleProcesses(port);
+    }
+    if (resolved.service.kind === "absolute" && resolved.configPath && !existsSync8(resolved.configPath)) {
+      throw new Error(`${name} references missing config "${resolved.configPath}"`);
+    }
+    console.log(workspaceTag("\x1B[36m", `Starting ${name}: ${resolved.command.join(" ")}`));
+    const processHandle = Bun.spawn(resolved.command, {
+      cwd: resolved.cwd,
+      env: resolved.env,
+      stderr: "pipe",
+      stdin: "ignore",
+      stdout: "pipe"
+    });
+    running.push({ name, process: processHandle });
+    pipeProcessLogs(name, processHandle);
+    processHandle.exited.then((exitCode) => {
+      if (shuttingDown) {
+        return;
+      }
+      console.error(workspaceTag("\x1B[31m", `${name} exited with code ${exitCode}. Shutting down workspace.`));
+      shutdown(exitCode || 1);
+    });
+    await waitForHealthcheck(name, resolved.service.healthcheck);
+  }
+  console.log(workspaceTag("\x1B[32m", `Workspace ready with ${running.length} services.`));
+  await Promise.all(running.map((service) => service.process.exited));
+};
+
 // src/cli/index.ts
 init_telemetry();
 init_telemetryEvent();
 init_constants();
 init_utils();
 var [command] = process.argv.slice(2);
+var [workspaceCommand] = process.argv.slice(3);
 var args = process.argv.slice(CLI_ARGS_OFFSET);
 var parseNamedArg = (flag) => {
   const idx = args.indexOf(flag);
@@ -2407,6 +2640,12 @@ if (command === "dev") {
   const positionalArgs = stripNamedArgs("--outdir", "--config");
   const serverEntry = positionalArgs[0] ?? DEFAULT_SERVER_ENTRY;
   await start(serverEntry, outdir, configPath2);
+} else if (command === "workspace") {
+  sendTelemetryEvent("cli:command", {
+    command: `workspace:${workspaceCommand ?? "unknown"}`
+  });
+  const configPath2 = parseNamedArg("--config");
+  await workspace(workspaceCommand, { configPath: configPath2 });
 } else if (command === "eslint") {
   sendTelemetryEvent("cli:command", { command });
   await eslint(args);
@@ -2443,6 +2682,7 @@ if (command === "dev") {
   console.error("Usage: absolute <command>");
   console.error("Commands:");
   console.error("  dev [entry]   Start development server");
+  console.error("  workspace dev Start multi-service workspace dev");
   console.error("  start [entry] [--outdir dir] Start production server");
   console.error("  compile [entry] [--outdir dir] [--outfile path] Compile standalone executable");
   console.error("  eslint        Run ESLint (cached)");

package/dist/index.js

@@ -174803,7 +174803,7 @@ ${registrations}
     ({ tsLibDir } = cached);
     cached.lastUsed = Date.now();
   } else {
-    const tsPath = __require.resolve("typescript");
+    const tsPath = __require.resolve("/home/alexkahn/abs/absolutejs/node_modules/typescript/lib/typescript.js");
     const tsRootDir = dirname9(tsPath);
     tsLibDir = tsRootDir.endsWith("lib") ? tsRootDir : resolve18(tsRootDir, "lib");
     const config = readConfiguration("./tsconfig.json");
@@ -188795,5 +188795,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=3CA14FD87FDA4FFC64756E2164756E21
+//# debugId=3C96D67450CFBA3764756E2164756E21
 //# sourceMappingURL=index.js.map