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

package/dist/cli/index.js

@@ -210,34 +210,46 @@ var init_telemetryEvent = __esm(() => {
 
 // src/utils/loadConfig.ts
 import { resolve } from "path";
-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];
+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 services.${serviceName}.`);
+    throw new Error(`Config file does not define service "${serviceName}".`);
   }
   if (isCommandService(service)) {
-    throw new Error(`services.${serviceName} is a command service and cannot be loaded as an AbsoluteJS app config.`);
+    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,
-    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) => {
+  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;
@@ -248,13 +260,51 @@ 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;
@@ -1075,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"
@@ -1225,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);
@@ -3000,12 +3062,6 @@ var getHealthcheckUrl = (service) => {
   }
   return;
 };
-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.services;
-};
 var resolveHealthcheck = (healthcheck) => {
   if (!healthcheck) {
     return null;
@@ -3153,8 +3209,8 @@ 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 services = ensureServicesConfig(config);
+  const config = await loadRawConfig(options.configPath);
+  const services = getWorkspaceServices(config);
   const orderedNames = topologicallySortServices(services);
   const running = [];
   const serviceBootStartedAt = new Map;

package/dist/index.js

@@ -181925,37 +181925,83 @@ import { Elysia as Elysia5 } from "elysia";
 
 // src/utils/loadConfig.ts
 import { resolve as resolve6 } from "path";
+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 service = config.services?.[serviceName];
+  const services = getWorkspaceServices(config);
+  const service = services[serviceName];
   if (!service) {
-    throw new Error(`Config file does not define services.${serviceName}.`);
+    throw new Error(`Config file does not define service "${serviceName}".`);
   }
   if (isCommandService(service)) {
-    throw new Error(`services.${serviceName} is a command service and cannot be loaded as an AbsoluteJS app config.`);
+    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,
-    entry: _entry,
     env: _env,
     healthcheck: _healthcheck,
     kind: _kind,
     port: _port,
-    services: _nestedServices,
     visibility: _visibility,
     ...serviceConfig
   } = service;
-  const { services: _services, ...sharedConfig } = config;
-  return {
-    ...sharedConfig,
-    ...serviceConfig
-  };
+  return serviceConfig;
 };
-var loadConfig = async (configPath) => {
+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;
@@ -181966,10 +182012,17 @@ 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;
 };
 
@@ -188845,5 +188898,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=4B9F0A17F5EB81CB64756E2164756E21
+//# debugId=98967D2F4839D93264756E2164756E21
 //# sourceMappingURL=index.js.map