@absolutejs/absolute 0.19.0-beta.670 → 0.19.0-beta.672

package/dist/cli/index.js

@@ -210,7 +210,34 @@ var init_telemetryEvent = __esm(() => {
 
 // src/utils/loadConfig.ts
 import { resolve } from "path";
-var loadConfig = async (configPath2) => {
+var isObject = (value) => typeof value === "object" && value !== null, isCommandService = (service) => service.kind === "command" || Array.isArray(service.command), projectServiceConfig = (config, serviceName) => {
+  const service = config.services?.[serviceName];
+  if (!service) {
+    throw new Error(`Config file does not define services.${serviceName}.`);
+  }
+  if (isCommandService(service)) {
+    throw new Error(`services.${serviceName} is a command service and cannot be loaded as an AbsoluteJS app config.`);
+  }
+  const {
+    command: _command,
+    config: _config,
+    cwd: _cwd,
+    dependsOn: _dependsOn,
+    entry: _entry,
+    env: _env,
+    healthcheck: _healthcheck,
+    kind: _kind,
+    port: _port,
+    services: _nestedServices,
+    visibility: _visibility,
+    ...serviceConfig
+  } = service;
+  const { services: _services, ...sharedConfig } = config;
+  return {
+    ...sharedConfig,
+    ...serviceConfig
+  };
+}, loadConfig = async (configPath2) => {
   const resolved = resolve(configPath2 ?? process.env.ABSOLUTE_CONFIG ?? "absolute.config.ts");
   const mod = await import(resolved);
   const config = mod.default ?? mod.config;
@@ -218,6 +245,13 @@ var loadConfig = async (configPath2) => {
     throw new Error(`Config file "${resolved}" does not export a valid configuration.
 Expected: export default defineConfig({ ... })`);
   }
+  if (!isObject(config)) {
+    throw new Error(`Config file "${resolved}" must export an object configuration.`);
+  }
+  const serviceName = process.env.ABSOLUTE_WORKSPACE_SERVICE_NAME;
+  if (typeof serviceName === "string" && serviceName.length > 0) {
+    return projectServiceConfig(config, serviceName);
+  }
   return config;
 };
 var init_loadConfig = () => {};
@@ -2384,6 +2418,7 @@ var start = async (serverEntry, outdir, configPath2) => {
 // src/cli/scripts/workspace.ts
 init_constants();
 init_loadConfig();
+init_getDurationString();
 import { existsSync as existsSync8, readFileSync as readFileSync8 } from "fs";
 import { resolve as resolve6 } from "path";
 
@@ -2664,8 +2699,8 @@ var createWorkspaceTui = ({
     const statusWidth = 10;
     const rows = [];
     rows.push(padLine(title, width));
-    rows.push(padLine(`${colors.bold}Services${colors.reset}`, width));
     rows.push(divider);
+    rows.push(padLine(`${colors.bold}Services${colors.reset}`, width));
     for (const service of servicesSnapshot) {
       const stateColor = getStatusColor(service.status);
       const detail = service.detail ? ` \xB7 ${service.detail}` : "";
@@ -2947,6 +2982,8 @@ var resolvePackageVersion2 = () => {
   }
   return process.env.ABSOLUTE_VERSION || "unknown";
 };
+var isCommandService2 = (service) => service.kind === "command" || Array.isArray(service.command);
+var isAbsoluteService = (service) => !isCommandService2(service);
 var getVisibility = (service) => service.visibility ?? "public";
 var getServiceUrl = (service) => {
   if (!service.port) {
@@ -2958,16 +2995,16 @@ var getHealthcheckUrl = (service) => {
   if (service.healthcheck) {
     return service.healthcheck;
   }
-  if (service.kind === "absolute" && service.port) {
+  if (isAbsoluteService(service) && service.port) {
     return `http://127.0.0.1:${service.port}/hmr-status`;
   }
   return;
 };
-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`.");
+var ensureServicesConfig = (config) => {
+  if (!config.services || Object.keys(config.services).length === 0) {
+    throw new Error("absolute.config.ts is missing services. Add a services section before using `absolute workspace dev`.");
   }
-  return config.workspace;
+  return config.services;
 };
 var resolveHealthcheck = (healthcheck) => {
   if (!healthcheck) {
@@ -3012,16 +3049,16 @@ var topologicallySortServices = (services) => {
       return;
     }
     if (visiting.has(name)) {
-      throw new Error(`workspace.services has a dependency cycle involving "${name}"`);
+      throw new Error(`services has a dependency cycle involving "${name}"`);
     }
     const service = services[name];
     if (!service) {
-      throw new Error(`workspace.services references unknown service "${name}"`);
+      throw new Error(`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}"`);
+        throw new Error(`services.${name} depends on missing service "${dependency}"`);
       }
       visit(dependency);
     }
@@ -3082,7 +3119,7 @@ var resolveService = (name, service, options) => {
   if (service.port && !envVars.PORT) {
     envVars.PORT = String(service.port);
   }
-  if (service.kind === "absolute") {
+  if (isAbsoluteService(service)) {
     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) {
       envVars.ABSOLUTE_CONFIG = configPath2;
@@ -3117,9 +3154,10 @@ var workspace = async (subcommand, options) => {
     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 services = ensureServicesConfig(config);
+  const orderedNames = topologicallySortServices(services);
   const running = [];
+  const serviceBootStartedAt = new Map;
   let shuttingDown = false;
   let restarting = false;
   let paused = false;
@@ -3138,7 +3176,7 @@ var workspace = async (subcommand, options) => {
       shell: (command) => runShellCommand2(command)
     },
     services: orderedNames.map((name) => {
-      const service = workspaceConfig.services[name];
+      const service = services[name];
       return {
         name,
         port: service?.port,
@@ -3185,9 +3223,9 @@ var workspace = async (subcommand, options) => {
   const startServices = async () => {
     tui.setReadyDuration(null);
     for (const name of orderedNames) {
-      const service = workspaceConfig.services[name];
+      const service = services[name];
       if (!service) {
-        throw new Error(`workspace.services is missing "${name}"`);
+        throw new Error(`services is missing "${name}"`);
       }
       const resolved = resolveService(name, service, options);
       const port = (resolved.service.port ?? Number(resolved.env.PORT ?? "")) || DEFAULT_PORT;
@@ -3196,9 +3234,10 @@ var workspace = async (subcommand, options) => {
           tui.addLog("workspace", message, "warn");
         });
       }
-      if (resolved.service.kind === "absolute" && resolved.configPath && !existsSync8(resolved.configPath)) {
+      if (isAbsoluteService(resolved.service) && resolved.configPath && !existsSync8(resolved.configPath)) {
         throw new Error(`${name} references missing config "${resolved.configPath}"`);
       }
+      serviceBootStartedAt.set(name, performance.now());
       tui.setServiceStatus(name, restarting ? "restarting" : "starting");
       const processHandle = Bun.spawn(resolved.command, {
         cwd: resolved.cwd,
@@ -3226,7 +3265,9 @@ var workspace = async (subcommand, options) => {
         shutdown(exitCode || 1);
       });
       await waitForHealthcheck(getHealthcheckUrl(resolved.service));
-      tui.setServiceStatus(name, "ready");
+      const startedAt = serviceBootStartedAt.get(name);
+      const readyDuration = typeof startedAt === "number" ? `ready in ${getDurationString(performance.now() - startedAt)}` : undefined;
+      tui.setServiceStatus(name, "ready", readyDuration);
     }
   };
   const restartWorkspace = async () => {
@@ -3283,7 +3324,7 @@ var workspace = async (subcommand, options) => {
     tui.addLog("workspace", `Shell command failed with exit code ${exitCode}: ${command}`, "error");
   };
   const openInBrowser = async () => {
-    const publicService = orderedNames.map((name) => workspaceConfig.services[name]).find((service) => service && getVisibility(service) === "public");
+    const publicService = orderedNames.map((name) => services[name]).find((service) => service && getVisibility(service) === "public");
     const url = publicService ? getServiceUrl(publicService) : null;
     if (!url) {
       tui.addLog("workspace", "No public service to open.", "warn");

package/dist/index.js

@@ -181925,6 +181925,36 @@ import { Elysia as Elysia5 } from "elysia";
 
 // src/utils/loadConfig.ts
 import { resolve as resolve6 } from "path";
+var isObject = (value) => typeof value === "object" && value !== null;
+var isCommandService = (service) => service.kind === "command" || Array.isArray(service.command);
+var projectServiceConfig = (config, serviceName) => {
+  const service = config.services?.[serviceName];
+  if (!service) {
+    throw new Error(`Config file does not define services.${serviceName}.`);
+  }
+  if (isCommandService(service)) {
+    throw new Error(`services.${serviceName} is a command service and cannot be loaded as an AbsoluteJS app config.`);
+  }
+  const {
+    command: _command,
+    config: _config,
+    cwd: _cwd,
+    dependsOn: _dependsOn,
+    entry: _entry,
+    env: _env,
+    healthcheck: _healthcheck,
+    kind: _kind,
+    port: _port,
+    services: _nestedServices,
+    visibility: _visibility,
+    ...serviceConfig
+  } = service;
+  const { services: _services, ...sharedConfig } = config;
+  return {
+    ...sharedConfig,
+    ...serviceConfig
+  };
+};
 var loadConfig = async (configPath) => {
   const resolved = resolve6(configPath ?? process.env.ABSOLUTE_CONFIG ?? "absolute.config.ts");
   const mod = await import(resolved);
@@ -181933,6 +181963,13 @@ var loadConfig = async (configPath) => {
     throw new Error(`Config file "${resolved}" does not export a valid configuration.
 Expected: export default defineConfig({ ... })`);
   }
+  if (!isObject(config)) {
+    throw new Error(`Config file "${resolved}" must export an object configuration.`);
+  }
+  const serviceName = process.env.ABSOLUTE_WORKSPACE_SERVICE_NAME;
+  if (typeof serviceName === "string" && serviceName.length > 0) {
+    return projectServiceConfig(config, serviceName);
+  }
   return config;
 };
 
@@ -182741,8 +182778,8 @@ var TypeSystemPolicy;
   }
   TypeSystemPolicy2.IsExactOptionalProperty = IsExactOptionalProperty;
   function IsObjectLike(value) {
-    const isObject = IsObject2(value);
-    return TypeSystemPolicy2.AllowArrayObject ? isObject : isObject && !IsArray2(value);
+    const isObject2 = IsObject2(value);
+    return TypeSystemPolicy2.AllowArrayObject ? isObject2 : isObject2 && !IsArray2(value);
   }
   TypeSystemPolicy2.IsObjectLike = IsObjectLike;
   function IsRecordLike(value) {
@@ -188808,5 +188845,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=2F8EDE59772BBE0764756E2164756E21
+//# debugId=4B9F0A17F5EB81CB64756E2164756E21
 //# sourceMappingURL=index.js.map