@absolutejs/absolute 0.19.0-beta.667 → 0.19.0-beta.669

package/dist/cli/index.js

@@ -670,7 +670,7 @@ __export(exports_compile, {
   compile: () => compile
 });
 var {env: env3 } = globalThis.Bun;
-import { existsSync as existsSync9, readdirSync, readFileSync as readFileSync8, unlinkSync } from "fs";
+import { existsSync as existsSync9, readdirSync, readFileSync as readFileSync9, 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 = [];
@@ -686,9 +686,9 @@ var cliTag3 = (color, message) => `\x1B[2m${formatTimestamp()}\x1B[0m ${color}[c
       result.push(fullPath);
   }
   return result;
-}, readPackageVersion2 = (candidate) => {
+}, readPackageVersion3 = (candidate) => {
   try {
-    const pkg = JSON.parse(readFileSync8(candidate, "utf-8"));
+    const pkg = JSON.parse(readFileSync9(candidate, "utf-8"));
     if (pkg.name !== "@absolutejs/absolute")
       return null;
     const ver = pkg.version;
@@ -696,9 +696,9 @@ var cliTag3 = (color, message) => `\x1B[2m${formatTimestamp()}\x1B[0m ${color}[c
   } catch {
     return null;
   }
-}, resolvePackageVersion2 = (candidates) => {
+}, resolvePackageVersion3 = (candidates) => {
   for (const candidate of candidates) {
-    const version2 = readPackageVersion2(candidate);
+    const version2 = readPackageVersion3(candidate);
     if (version2)
       return version2;
   }
@@ -853,7 +853,7 @@ console.log(\`
   const entryName = basename2(serverEntry).replace(/\.[^.]+$/, "");
   const resolvedOutdir = resolve7(outdir ?? "dist");
   const resolvedOutfile = resolve7(outfile ?? "compiled-server");
-  const absoluteVersion = resolvePackageVersion2([
+  const absoluteVersion = resolvePackageVersion3([
     resolve7(import.meta.dir, "..", "..", "..", "package.json"),
     resolve7(import.meta.dir, "..", "..", "package.json")
   ]);
@@ -2379,11 +2379,12 @@ var start = async (serverEntry, outdir, configPath2) => {
 // src/cli/scripts/workspace.ts
 init_constants();
 init_loadConfig();
-import { existsSync as existsSync8 } from "fs";
+import { existsSync as existsSync8, readFileSync as readFileSync8 } from "fs";
 import { resolve as resolve6 } from "path";
 
 // src/cli/workspaceTui.ts
 init_constants();
+init_getDurationString();
 import { openSync as openSync2 } from "fs";
 import { ReadStream as ReadStream2 } from "tty";
 var MAX_LOG_ENTRIES = 400;
@@ -2570,21 +2571,10 @@ var getWorkspaceStatus = (services) => {
   }
   return "ready";
 };
-var getStatusSummary = (services) => {
-  const publicServices = services.filter((service) => service.visibility === "public" && service.url).map((service) => `${service.name} ${service.url}`);
-  const internalServices = services.filter((service) => service.visibility === "internal").map((service) => service.port ? `${service.name} localhost:${service.port}` : service.name);
-  const parts = [];
-  if (publicServices.length > 0) {
-    parts.push(`Public: ${publicServices.join(", ")}`);
-  }
-  if (internalServices.length > 0) {
-    parts.push(`Internal: ${internalServices.join(", ")}`);
-  }
-  return parts.join("  |  ");
-};
 var createWorkspaceTui = ({
   actions,
-  services
+  services,
+  version: version2
 }) => {
   let input = null;
   let disposed = false;
@@ -2594,6 +2584,7 @@ var createWorkspaceTui = ({
   let promptBuffer = "";
   let escapeTimer = null;
   let escapeBuffer = "";
+  let readyDurationMs = null;
   const shellHistory = [];
   let shellHistoryIndex = UNFOUND_INDEX;
   const serviceStates = new Map(services.map((service) => [
@@ -2660,16 +2651,15 @@ var createWorkspaceTui = ({
     const height = process.stdout.rows ?? 28;
     const servicesSnapshot = [...serviceStates.values()];
     const workspaceStatus = getWorkspaceStatus(servicesSnapshot);
-    const title = `${colors.bold}Absolute Workspace${colors.reset} ${colors.dim}\xB7 ${workspaceStatus}${colors.reset}`;
-    const summaryText = truncateText(getStatusSummary(servicesSnapshot), width);
-    const summary = `${colors.dim}${summaryText}${colors.reset}`;
+    const statusLabel = workspaceStatus === "ready" && readyDurationMs !== null ? `${colors.dim}ready in${colors.reset} ${colors.bold}${getDurationString(readyDurationMs)}${colors.reset}` : `${colors.dim}${workspaceStatus}${colors.reset}`;
+    const title = `${colors.cyan}${colors.bold}ABSOLUTEJS WORKSPACE${colors.reset} ${colors.dim}v${version2}${colors.reset}  ${statusLabel}`;
     const divider = `${colors.dim}${"\u2500".repeat(Math.max(width, 1))}${colors.reset}`;
     const serviceNameWidth = Math.max(7, ...servicesSnapshot.map((service) => service.name.length));
     const visibilityWidth = 8;
     const statusWidth = 10;
     const rows = [];
     rows.push(padLine(title, width));
-    rows.push(padLine(summary, width));
+    rows.push(padLine(`${colors.bold}Services${colors.reset}`, width));
     rows.push(divider);
     for (const service of servicesSnapshot) {
       const stateColor = getStatusColor(service.status);
@@ -2726,6 +2716,10 @@ var createWorkspaceTui = ({
     existing.detail = detail;
     scheduleRender();
   };
+  const setReadyDuration = (durationMs) => {
+    readyDurationMs = durationMs;
+    scheduleRender();
+  };
   const addLog = (source, message, level = "info") => {
     const cleanMessage = stripAnsi(message).trimEnd();
     if (!cleanMessage) {
@@ -2913,6 +2907,7 @@ var createWorkspaceTui = ({
     addLog,
     clearLogs,
     dispose,
+    setReadyDuration,
     setServiceStatus,
     start: start2
   };
@@ -2921,6 +2916,32 @@ var createWorkspaceTui = ({
 // src/cli/scripts/workspace.ts
 init_utils();
 var sleep = (ms) => new Promise((resolvePromise) => setTimeout(resolvePromise, ms));
+var readPackageVersion2 = (candidate) => {
+  try {
+    const pkg = JSON.parse(readFileSync8(candidate, "utf-8"));
+    if (pkg.name !== "@absolutejs/absolute") {
+      return null;
+    }
+    const version2 = pkg.version;
+    return version2;
+  } catch {
+    return null;
+  }
+};
+var resolvePackageVersion2 = () => {
+  const candidates = [
+    resolve6(import.meta.dir, "..", "..", "package.json"),
+    resolve6(import.meta.dir, "..", "..", "..", "package.json"),
+    resolve6(import.meta.dir, "..", "..", "..", "..", "package.json")
+  ];
+  for (const candidate of candidates) {
+    const version2 = readPackageVersion2(candidate);
+    if (version2) {
+      return version2;
+    }
+  }
+  return process.env.ABSOLUTE_VERSION || "unknown";
+};
 var getVisibility = (service) => service.visibility ?? "public";
 var getServiceUrl = (service) => {
   if (!service.port) {
@@ -3097,6 +3118,8 @@ var workspace = async (subcommand, options) => {
   let shuttingDown = false;
   let restarting = false;
   let paused = false;
+  let workspaceBootStartedAt = performance.now();
+  const absoluteVersion = resolvePackageVersion2();
   const tui = createWorkspaceTui({
     actions: {
       open: () => openInBrowser(),
@@ -3117,7 +3140,8 @@ var workspace = async (subcommand, options) => {
         url: service ? getServiceUrl(service) : null,
         visibility: service ? getVisibility(service) : "public"
       };
-    })
+    }),
+    version: absoluteVersion
   });
   const killProcesses = async () => {
     const snapshot = [...running];
@@ -3154,6 +3178,7 @@ var workspace = async (subcommand, options) => {
     process.exit(exitCode);
   };
   const startServices = async () => {
+    tui.setReadyDuration(null);
     for (const name of orderedNames) {
       const service = workspaceConfig.services[name];
       if (!service) {
@@ -3214,7 +3239,9 @@ var workspace = async (subcommand, options) => {
     }
     await killProcesses();
     restarting = false;
+    workspaceBootStartedAt = performance.now();
     await startServices();
+    tui.setReadyDuration(performance.now() - workspaceBootStartedAt);
     tui.addLog("workspace", "Workspace ready.", "success");
   };
   const togglePause = () => {
@@ -3287,6 +3314,7 @@ var workspace = async (subcommand, options) => {
   tui.start();
   tui.addLog("workspace", `Workspace booting ${orderedNames.length} services.`, "info");
   await startServices();
+  tui.setReadyDuration(performance.now() - workspaceBootStartedAt);
   tui.addLog("workspace", "Workspace ready.", "success");
   await new Promise(() => {});
 };

package/dist/index.js

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