@absolutejs/absolute 0.19.0-beta.945 → 0.19.0-beta.947

package/dist/cli/index.js

@@ -2905,6 +2905,53 @@ var dev = async (serverEntry, configPath2) => {
   };
   let serverProcess = spawnServer();
   const sessionStart = Date.now();
+  let serverRestartPending = false;
+  const scheduleServerRestart = (filePath) => {
+    if (serverRestartPending)
+      return;
+    serverRestartPending = true;
+    const relPath = filePath.startsWith(process.cwd()) ? filePath.slice(process.cwd().length + 1) : filePath;
+    console.log(cliTag("\x1B[36m", `Server file changed: ${relPath} \u2014 restarting...`));
+    setTimeout(() => {
+      serverRestartPending = false;
+      restartServer().catch((err) => {
+        console.error(cliTag("\x1B[31m", `Restart failed: ${err}`));
+      });
+    }, 80);
+  };
+  try {
+    const { watch, existsSync: existsSync6 } = await import("fs");
+    const { dirname: dirname3, basename } = await import("path");
+    const absServerEntry = resolve3(serverEntry);
+    const serverEntryDir = dirname3(absServerEntry);
+    const serverEntryBase = basename(absServerEntry);
+    const fsWatcher = watch(serverEntryDir, { persistent: false }, (eventType, filename) => {
+      if (eventType !== "change" && eventType !== "rename")
+        return;
+      if (filename !== serverEntryBase)
+        return;
+      scheduleServerRestart(absServerEntry);
+    });
+    fsWatcher.unref();
+    const configCandidates = ["absolute.config.ts", "absolute.config.js"];
+    const projectRoot = process.cwd();
+    for (const candidate of configCandidates) {
+      const absCandidate = resolve3(projectRoot, candidate);
+      if (!existsSync6(absCandidate))
+        continue;
+      const candidateBase = basename(absCandidate);
+      const configWatcher = watch(dirname3(absCandidate), { persistent: false }, (eventType, filename) => {
+        if (eventType !== "change" && eventType !== "rename")
+          return;
+        if (filename !== candidateBase)
+          return;
+        scheduleServerRestart(absCandidate);
+      });
+      configWatcher.unref();
+    }
+  } catch (err) {
+    console.error(cliTag("\x1B[33m", `Failed to set up server entry watcher: ${err}`));
+  }
   let frameworks = [];
   try {
     const cfg = await loadConfig(configPath2);

package/dist/index.js

@@ -8337,6 +8337,114 @@ var init_staticIslandPages = __esm(() => {
   HTMX_STREAM_SLOT_TAG_RE = /<abs-htmx-stream-slot\b([^>]*?)(?:\/>|>([\s\S]*?)<\/abs-htmx-stream-slot>)/gi;
 });
 
+// src/utils/loadConfig.ts
+var exports_loadConfig = {};
+__export(exports_loadConfig, {
+  loadRawConfig: () => loadRawConfig,
+  loadConfig: () => loadConfig,
+  isWorkspaceConfig: () => isWorkspaceConfig,
+  getWorkspaceServices: () => getWorkspaceServices
+});
+import { resolve as resolve8 } from "path";
+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));
+}, isConfigInput = (value) => isObject(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,
+    kind: _kind,
+    port: _port,
+    ready: _ready,
+    visibility: _visibility,
+    ...serviceConfig
+  } = service;
+  return serviceConfig;
+}, 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;
+}, loadRawConfig = async (configPath) => {
+  const resolved = resolve8(configPath ?? process.env.ABSOLUTE_CONFIG ?? "absolute.config.ts");
+  const mod = await import(resolved);
+  const config = mod.default ?? mod.config;
+  if (!config) {
+    throw new Error(`Config file "${resolved}" does not export a valid configuration.
+Expected: export default defineConfig({ ... })`);
+  }
+  if (!isConfigInput(config)) {
+    throw new Error(`Config file "${resolved}" must export an object configuration.`);
+  }
+  return config;
+};
+var init_loadConfig = __esm(() => {
+  RESERVED_TOP_LEVEL_KEYS = new Set([
+    "assetsDirectory",
+    "astroDirectory",
+    "buildDirectory",
+    "bunBuild",
+    "command",
+    "config",
+    "cwd",
+    "dependsOn",
+    "dev",
+    "emberDirectory",
+    "entry",
+    "env",
+    "htmlDirectory",
+    "htmxDirectory",
+    "images",
+    "incrementalFiles",
+    "islands",
+    "kind",
+    "mode",
+    "options",
+    "port",
+    "postcss",
+    "publicDirectory",
+    "reactDirectory",
+    "sitemap",
+    "static",
+    "stylesConfig",
+    "svelteDirectory",
+    "tailwind",
+    "ready",
+    "visibility",
+    "vueDirectory"
+  ]);
+});
+
 // src/build/scanEntryPoints.ts
 import { existsSync as existsSync6 } from "fs";
 var {Glob } = globalThis.Bun;
@@ -12076,7 +12184,7 @@ var traceAngularPhase = async (name, fn2, metadata2) => {
   if (fileName.startsWith(outDir))
     return fileName.substring(outDir.length + 1);
   return fileName;
-}, hasJsLikeExtension = (path) => /\.(js|ts|mjs|cjs)$/.test(path), splitSpecifierAndQuery = (specifier) => {
+}, hasJsLikeExtension = (path) => /\.(js|ts|mjs|cjs|json)$/.test(path), splitSpecifierAndQuery = (specifier) => {
   const separator = specifier.indexOf("?");
   if (separator === -1) {
     return {
@@ -12636,11 +12744,12 @@ ${fields}
   });
   const tsconfigAliases = readTsconfigPathAliases();
   const resolveSourceFile2 = (candidate) => {
-    const candidates = candidate.match(/\.[cm]?[tj]sx?$/) ? [candidate] : [
+    const candidates = candidate.match(/\.(?:[cm]?[tj]sx?|json)$/) ? [candidate] : [
       `${candidate}.ts`,
       `${candidate}.tsx`,
       `${candidate}.js`,
       `${candidate}.jsx`,
+      `${candidate}.json`,
       join19(candidate, "index.ts"),
       join19(candidate, "index.tsx"),
       join19(candidate, "index.js"),
@@ -12718,6 +12827,16 @@ ${fields}
     if (visited.has(resolved))
       return;
     visited.add(resolved);
+    if (resolved.endsWith(".json") && existsSync17(resolved)) {
+      const inputDir2 = dirname14(resolved);
+      const relativeDir2 = inputDir2.startsWith(baseDir) ? inputDir2.substring(baseDir.length + 1) : inputDir2;
+      const targetDir2 = join19(outDir, relativeDir2);
+      const targetPath2 = join19(targetDir2, basename7(resolved));
+      await fs.mkdir(targetDir2, { recursive: true });
+      await fs.copyFile(resolved, targetPath2);
+      allOutputs.push(targetPath2);
+      return;
+    }
     let actualPath = resolved;
     if (!actualPath.endsWith(".ts"))
       actualPath += ".ts";
@@ -19144,6 +19263,7 @@ var resolveBuildPaths = (config) => {
     emberDir: optional(config.emberDirectory),
     htmlDir: optional(config.htmlDirectory),
     htmxDir: optional(config.htmxDirectory),
+    publicDir: optional(config.publicDirectory),
     reactDir: optional(config.reactDirectory),
     stylesDir: optional(typeof config.stylesConfig === "string" ? config.stylesConfig : config.stylesConfig?.path),
     svelteDir: optional(config.svelteDirectory),
@@ -20852,6 +20972,54 @@ export default {};
 }, transformAndCache = async (filePath, ext, projectRoot, rewriter, vueDir, stylePreprocessors) => {
   if (ext === ".css")
     return jsResponse(handleCssRequest(filePath));
+  if (ext === ".json") {
+    try {
+      const { readFile: readFile6, stat: stat4 } = await import("fs/promises");
+      const fileExists = async (p2) => {
+        try {
+          await stat4(p2);
+          return true;
+        } catch {
+          return false;
+        }
+      };
+      let sourcePath = filePath;
+      if (!await fileExists(sourcePath)) {
+        const { getFrameworkGeneratedDir: getFrameworkGeneratedDir2 } = await Promise.resolve().then(() => (init_generatedDir(), exports_generatedDir));
+        const generatedAngularRoot = getFrameworkGeneratedDir2("angular").replace(/\\/g, "/");
+        const normalized = filePath.replace(/\\/g, "/");
+        if (normalized.startsWith(generatedAngularRoot + "/") || normalized.startsWith(generatedAngularRoot)) {
+          const tail = normalized.slice(generatedAngularRoot.length + 1);
+          const absoluteCandidate = "/" + tail.replace(/^\/+/, "");
+          const candidates = [
+            absoluteCandidate,
+            resolve35(projectRoot, tail)
+          ];
+          try {
+            const { loadConfig: loadConfig2 } = await Promise.resolve().then(() => (init_loadConfig(), exports_loadConfig));
+            const cfg = await loadConfig2();
+            const angularDir = cfg.angularDirectory && resolve35(projectRoot, cfg.angularDirectory);
+            if (angularDir)
+              candidates.push(resolve35(angularDir, tail));
+          } catch {}
+          for (const candidate of candidates) {
+            if (await fileExists(candidate)) {
+              sourcePath = candidate;
+              break;
+            }
+          }
+        }
+      }
+      const text = await readFile6(sourcePath, "utf-8");
+      JSON.parse(text);
+      return jsResponse(`export default ${text};`);
+    } catch (err) {
+      return new Response(`console.error('[ModuleServer] JSON load error in ${filePath}:', ${JSON.stringify(String(err))});`, {
+        headers: { "Content-Type": "application/javascript" },
+        status: 500
+      });
+    }
+  }
   const isSvelte = ext === ".svelte" || filePath.endsWith(".svelte.ts") || filePath.endsWith(".svelte.js");
   const cached = getTransformed(filePath);
   if (cached)
@@ -21589,6 +21757,42 @@ var moduleServerPromise, getModuleServer = () => moduleServerPromise, runSequent
   if (!hasFileChanged(filePath, currentHash, state.fileHashes)) {
     return;
   }
+  const publicDir = state.resolvedPaths.publicDir;
+  const assetsDir = state.resolvedPaths.assetsDir;
+  const handleStaticMirror = async (sourceDir, urlPrefix) => {
+    const absSource = resolve39(filePath);
+    const normalizedSource = absSource.replace(/\\/g, "/");
+    const normalizedDir = sourceDir.replace(/\\/g, "/");
+    if (!normalizedSource.startsWith(normalizedDir + "/"))
+      return false;
+    try {
+      const relFromDir = normalizedSource.slice(normalizedDir.length + 1);
+      const buildDir = state.resolvedPaths.buildDir;
+      const destPath = resolve39(buildDir, urlPrefix ? `${urlPrefix}/${relFromDir}` : relFromDir);
+      const { mkdir: mkdir7, copyFile, readFile: readFile6 } = await import("fs/promises");
+      const { dirname: dirname23 } = await import("path");
+      await mkdir7(dirname23(destPath), { recursive: true });
+      await copyFile(absSource, destPath);
+      const bytes = await readFile6(destPath);
+      const webPath = urlPrefix ? `/${urlPrefix}/${relFromDir}` : `/${relFromDir}`;
+      state.assetStore.set(webPath, new Uint8Array(bytes));
+      state.fileHashes.set(absSource, currentHash);
+      logHmrUpdate(relative16(process.cwd(), filePath));
+      broadcastToClients(state, {
+        data: {
+          framework: urlPrefix || "public",
+          manifest: state.manifest
+        },
+        message: `${urlPrefix || "Public"} asset updated`,
+        type: "style-update"
+      });
+    } catch {}
+    return true;
+  };
+  if (publicDir && await handleStaticMirror(publicDir, ""))
+    return;
+  if (assetsDir && await handleStaticMirror(assetsDir, "assets"))
+    return;
   if (framework === "unknown") {
     invalidate(resolve39(filePath));
     const relPath = relative16(process.cwd(), filePath);
@@ -21873,7 +22077,7 @@ var moduleServerPromise, getModuleServer = () => moduleServerPromise, runSequent
         tier: 1
       };
     }
-    if (owners.length === 0 && editedFile.endsWith(".ts") && !editedFile.endsWith(".d.ts")) {
+    if (owners.length === 0 && (editedFile.endsWith(".ts") || editedFile.endsWith(".json")) && !editedFile.endsWith(".d.ts")) {
       const normalized = editedFile.replace(/\\/g, "/");
       const angularDirAbs = resolve39(angularDir).replace(/\\/g, "/");
       if (normalized.startsWith(angularDirAbs + "/")) {
@@ -25171,117 +25375,11 @@ var handleHTMXPageRequest = async (pagePath) => {
   });
 };
 // src/core/prepare.ts
+init_loadConfig();
 import { existsSync as existsSync30, readdirSync as readdirSync3, readFileSync as readFileSync23 } from "fs";
 import { basename as basename13, join as join34, relative as relative17, resolve as resolve43 } from "path";
 import { Elysia as Elysia5 } from "elysia";
 
-// src/utils/loadConfig.ts
-import { resolve as resolve8 } from "path";
-var RESERVED_TOP_LEVEL_KEYS = new Set([
-  "assetsDirectory",
-  "astroDirectory",
-  "buildDirectory",
-  "bunBuild",
-  "command",
-  "config",
-  "cwd",
-  "dependsOn",
-  "dev",
-  "emberDirectory",
-  "entry",
-  "env",
-  "htmlDirectory",
-  "htmxDirectory",
-  "images",
-  "incrementalFiles",
-  "islands",
-  "kind",
-  "mode",
-  "options",
-  "port",
-  "postcss",
-  "publicDirectory",
-  "reactDirectory",
-  "sitemap",
-  "static",
-  "stylesConfig",
-  "svelteDirectory",
-  "tailwind",
-  "ready",
-  "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 isConfigInput = (value) => isObject(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,
-    kind: _kind,
-    port: _port,
-    ready: _ready,
-    visibility: _visibility,
-    ...serviceConfig
-  } = service;
-  return serviceConfig;
-};
-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;
-};
-var loadRawConfig = async (configPath) => {
-  const resolved = resolve8(configPath ?? process.env.ABSOLUTE_CONFIG ?? "absolute.config.ts");
-  const mod = await import(resolved);
-  const config = mod.default ?? mod.config;
-  if (!config) {
-    throw new Error(`Config file "${resolved}" does not export a valid configuration.
-Expected: export default defineConfig({ ... })`);
-  }
-  if (!isConfigInput(config)) {
-    throw new Error(`Config file "${resolved}" must export an object configuration.`);
-  }
-  return config;
-};
-
 // src/core/loadIslandRegistry.ts
 init_islandEntries();
 import { resolve as resolve9 } from "path";
@@ -32549,5 +32647,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=0AB756D9EEFF95BC64756E2164756E21
+//# debugId=20AB647BED125D3764756E2164756E21
 //# sourceMappingURL=index.js.map