@absolutejs/absolute 0.19.0-beta.671 → 0.19.0-beta.673

package/dist/cli/index.js

@@ -210,7 +210,46 @@ var init_telemetryEvent = __esm(() => {
 
 // src/utils/loadConfig.ts
 import { resolve } from "path";
-var loadConfig = async (configPath2) => {
+var RESERVED_TOP_LEVEL_KEYS, isObject = (value) => typeof value === "object" && value !== null, isCommandService = (service) => service.kind === "command" || Array.isArray(service.command), isServiceCandidate = (value) => isObject(value) && (typeof value.entry === "string" || Array.isArray(value.command)), isWorkspaceConfig = (config) => {
+  if (!isObject(config)) {
+    return false;
+  }
+  const entries = Object.entries(config);
+  if (entries.length === 0) {
+    return false;
+  }
+  if (entries.some(([key]) => RESERVED_TOP_LEVEL_KEYS.has(key))) {
+    return false;
+  }
+  return entries.every(([, value]) => isServiceCandidate(value));
+}, getWorkspaceServices = (config) => {
+  if (!isWorkspaceConfig(config)) {
+    throw new Error("absolute.config.ts is not a multi-service config. Define top-level named services with `entry` or `command` before using `absolute workspace dev`.");
+  }
+  return config;
+}, projectServiceConfig = (config, serviceName) => {
+  const services = getWorkspaceServices(config);
+  const service = services[serviceName];
+  if (!service) {
+    throw new Error(`Config file does not define service "${serviceName}".`);
+  }
+  if (isCommandService(service)) {
+    throw new Error(`Service "${serviceName}" is a command service and cannot be loaded as an AbsoluteJS app config.`);
+  }
+  const {
+    command: _command,
+    config: _config,
+    cwd: _cwd,
+    dependsOn: _dependsOn,
+    env: _env,
+    healthcheck: _healthcheck,
+    kind: _kind,
+    port: _port,
+    visibility: _visibility,
+    ...serviceConfig
+  } = service;
+  return serviceConfig;
+}, loadRawConfig = 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,9 +257,54 @@ 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.`);
+  }
+  return config;
+}, loadConfig = async (configPath2) => {
+  const config = await loadRawConfig(configPath2);
+  const serviceName = process.env.ABSOLUTE_WORKSPACE_SERVICE_NAME;
+  if (typeof serviceName === "string" && serviceName.length > 0) {
+    return projectServiceConfig(config, serviceName);
+  }
+  if (isWorkspaceConfig(config)) {
+    throw new Error("absolute.config.ts defines multiple services. Use `absolute workspace dev` or set ABSOLUTE_WORKSPACE_SERVICE_NAME before loading a specific service config.");
+  }
   return config;
 };
-var init_loadConfig = () => {};
+var init_loadConfig = __esm(() => {
+  RESERVED_TOP_LEVEL_KEYS = new Set([
+    "assetsDirectory",
+    "astroDirectory",
+    "buildDirectory",
+    "command",
+    "config",
+    "cwd",
+    "dependsOn",
+    "dev",
+    "entry",
+    "env",
+    "healthcheck",
+    "htmlDirectory",
+    "htmxDirectory",
+    "images",
+    "incrementalFiles",
+    "islands",
+    "kind",
+    "mode",
+    "options",
+    "port",
+    "publicDirectory",
+    "reactDirectory",
+    "sitemap",
+    "static",
+    "stylesConfig",
+    "svelteDirectory",
+    "tailwind",
+    "visibility",
+    "vueDirectory"
+  ]);
+});
 
 // src/cli/utils.ts
 var {$ } = globalThis.Bun;
@@ -1041,7 +1125,13 @@ __export(exports_typecheck, {
 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) => {
+var isCommandService3 = (service) => service.kind === "command" || Array.isArray(service.command), getTypecheckTargets = async (configPath2) => {
+  const rawConfig = await loadRawConfig(configPath2);
+  if (!isWorkspaceConfig(rawConfig)) {
+    return [await loadConfig(configPath2)];
+  }
+  return Object.values(getWorkspaceServices(rawConfig)).filter((service) => !isCommandService3(service));
+}, run = async (name, command) => {
   const proc = Bun.spawn(command, {
     stderr: "pipe",
     stdout: "pipe"
@@ -1191,19 +1281,25 @@ Found ${errorCount} error${suffix}.`;
     "--color"
   ]);
 }, typecheck = async (configPath2) => {
-  const config = await loadConfig(configPath2);
-  const hasAngular = Boolean(config.angularDirectory);
-  const hasSvelte = Boolean(config.svelteDirectory);
-  const hasVue = Boolean(config.vueDirectory);
+  const targets = await getTypecheckTargets(configPath2);
+  const hasAngular = targets.some((config) => Boolean(config.angularDirectory));
+  const hasSvelte = targets.some((config) => Boolean(config.svelteDirectory));
+  const hasVue = targets.some((config) => Boolean(config.vueDirectory));
+  const svelteDirs = [...new Set(targets.map((config) => config.svelteDirectory).filter((dir) => typeof dir === "string" && dir.length > 0))];
+  const angularDirs = [...new Set(targets.map((config) => config.angularDirectory).filter((dir) => typeof dir === "string" && dir.length > 0))];
   const cacheDir = ".absolutejs";
   await mkdir2(cacheDir, { recursive: true });
   const checks = [];
   checks.push(hasVue ? buildVueTscCheck(cacheDir) : buildTscCheck(cacheDir));
   if (hasSvelte) {
-    checks.push(buildSvelteCheck(cacheDir, config.svelteDirectory ?? ""));
+    for (const svelteDir of svelteDirs) {
+      checks.push(buildSvelteCheck(cacheDir, svelteDir));
+    }
   }
   if (hasAngular) {
-    checks.push(buildAngularCheck(cacheDir, config.angularDirectory ?? ""));
+    for (const angularDir of angularDirs) {
+      checks.push(buildAngularCheck(cacheDir, angularDir));
+    }
   }
   const results = await Promise.all(checks);
   const failed = results.filter((res) => res.exitCode !== 0);
@@ -2948,6 +3044,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) {
@@ -2959,17 +3057,11 @@ 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`.");
-  }
-  return config.workspace;
-};
 var resolveHealthcheck = (healthcheck) => {
   if (!healthcheck) {
     return null;
@@ -3013,16 +3105,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);
     }
@@ -3083,7 +3175,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 +3209,9 @@ 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 config = await loadRawConfig(options.configPath);
+  const services = getWorkspaceServices(config);
+  const orderedNames = topologicallySortServices(services);
   const running = [];
   const serviceBootStartedAt = new Map;
   let shuttingDown = false;
@@ -3140,7 +3232,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,
@@ -3187,9 +3279,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;
@@ -3198,7 +3290,7 @@ 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());
@@ -3288,7 +3380,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,7 +181925,83 @@ import { Elysia as Elysia5 } from "elysia";
 
 // src/utils/loadConfig.ts
 import { resolve as resolve6 } from "path";
-var loadConfig = async (configPath) => {
+var RESERVED_TOP_LEVEL_KEYS = new Set([
+  "assetsDirectory",
+  "astroDirectory",
+  "buildDirectory",
+  "command",
+  "config",
+  "cwd",
+  "dependsOn",
+  "dev",
+  "entry",
+  "env",
+  "healthcheck",
+  "htmlDirectory",
+  "htmxDirectory",
+  "images",
+  "incrementalFiles",
+  "islands",
+  "kind",
+  "mode",
+  "options",
+  "port",
+  "publicDirectory",
+  "reactDirectory",
+  "sitemap",
+  "static",
+  "stylesConfig",
+  "svelteDirectory",
+  "tailwind",
+  "visibility",
+  "vueDirectory"
+]);
+var isObject = (value) => typeof value === "object" && value !== null;
+var isCommandService = (service) => service.kind === "command" || Array.isArray(service.command);
+var isServiceCandidate = (value) => isObject(value) && (typeof value.entry === "string" || Array.isArray(value.command));
+var isWorkspaceConfig = (config) => {
+  if (!isObject(config)) {
+    return false;
+  }
+  const entries = Object.entries(config);
+  if (entries.length === 0) {
+    return false;
+  }
+  if (entries.some(([key]) => RESERVED_TOP_LEVEL_KEYS.has(key))) {
+    return false;
+  }
+  return entries.every(([, value]) => isServiceCandidate(value));
+};
+var getWorkspaceServices = (config) => {
+  if (!isWorkspaceConfig(config)) {
+    throw new Error("absolute.config.ts is not a multi-service config. Define top-level named services with `entry` or `command` before using `absolute workspace dev`.");
+  }
+  return config;
+};
+var projectServiceConfig = (config, serviceName) => {
+  const services = getWorkspaceServices(config);
+  const service = services[serviceName];
+  if (!service) {
+    throw new Error(`Config file does not define service "${serviceName}".`);
+  }
+  if (isCommandService(service)) {
+    throw new Error(`Service "${serviceName}" is a command service and cannot be loaded as an AbsoluteJS app config.`);
+  }
+  const {
+    command: _command,
+    config: _config,
+    cwd: _cwd,
+    dependsOn: _dependsOn,
+    env: _env,
+    healthcheck: _healthcheck,
+    kind: _kind,
+    port: _port,
+    visibility: _visibility,
+    ...serviceConfig
+  } = service;
+  return serviceConfig;
+};
+var loadRawConfig = async (configPath) => {
   const resolved = resolve6(configPath ?? process.env.ABSOLUTE_CONFIG ?? "absolute.config.ts");
   const mod = await import(resolved);
   const config = mod.default ?? mod.config;
@@ -181933,6 +182009,20 @@ 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.`);
+  }
+  return config;
+};
+var loadConfig = async (configPath) => {
+  const config = await loadRawConfig(configPath);
+  const serviceName = process.env.ABSOLUTE_WORKSPACE_SERVICE_NAME;
+  if (typeof serviceName === "string" && serviceName.length > 0) {
+    return projectServiceConfig(config, serviceName);
+  }
+  if (isWorkspaceConfig(config)) {
+    throw new Error("absolute.config.ts defines multiple services. Use `absolute workspace dev` or set ABSOLUTE_WORKSPACE_SERVICE_NAME before loading a specific service config.");
+  }
   return config;
 };
 
@@ -182741,8 +182831,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 +188898,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=2F8EDE59772BBE0764756E2164756E21
+//# debugId=98967D2F4839D93264756E2164756E21
 //# sourceMappingURL=index.js.map