@absolutejs/absolute 0.19.0-beta.702 → 0.19.0-beta.704

package/dist/cli/index.js

@@ -629,7 +629,7 @@ __export(exports_prerender, {
 });
 import { mkdirSync as mkdirSync3, readFileSync as readFileSync6 } from "fs";
 import { join as join5 } from "path";
-var MAX_STARTUP_ATTEMPTS = 50, STARTUP_POLL_INTERVAL_MS = 100, PRERENDER_BYPASS_HEADER = "X-Absolute-Prerender-Bypass", routeToFilename = (route) => route === "/" ? "index.html" : `${route.slice(1).replace(/\//g, "-")}.html`, writeTimestamp = async (htmlPath) => {
+var SERVER_OUTPUT_LIMIT = 4000, STARTUP_POLL_INTERVAL_MS = 100, DEFAULT_STARTUP_TIMEOUT_MS = 30000, PRERENDER_BYPASS_HEADER = "X-Absolute-Prerender-Bypass", routeToFilename = (route) => route === "/" ? "index.html" : `${route.slice(1).replace(/\//g, "-")}.html`, writeTimestamp = async (htmlPath) => {
   const metaPath = htmlPath.replace(/\.html$/, ".meta");
   await Bun.write(metaPath, String(Date.now()));
 }, readTimestamp = (htmlPath) => {
@@ -727,25 +727,66 @@ var MAX_STARTUP_ATTEMPTS = 50, STARTUP_POLL_INTERVAL_MS = 100, PRERENDER_BYPASS_
     await prerenderRoute(baseUrl, route, prerenderDir, result, log);
   }
   return result;
+}, getStartupTimeoutMs = () => {
+  const rawTimeout = Bun.env.ABSOLUTE_PRERENDER_STARTUP_TIMEOUT_MS;
+  const parsedTimeout = rawTimeout ? Number(rawTimeout) : NaN;
+  return Number.isFinite(parsedTimeout) && parsedTimeout > 0 ? parsedTimeout : DEFAULT_STARTUP_TIMEOUT_MS;
 }, waitForServerReady = async (port) => {
-  for (let attempt = 0;attempt < MAX_STARTUP_ATTEMPTS; attempt++) {
+  const deadline = performance.now() + getStartupTimeoutMs();
+  while (performance.now() < deadline) {
     const res = await fetch(`http://localhost:${port}/`).catch(() => null);
-    if (res?.ok)
+    if (res) {
+      await res.body?.cancel().catch(() => {
+        return;
+      });
       return true;
+    }
     await Bun.sleep(STARTUP_POLL_INTERVAL_MS);
   }
   return false;
+}, captureStreamOutput = (stream, output) => {
+  if (!stream)
+    return;
+  const reader = stream.getReader();
+  const decoder = new TextDecoder;
+  const read = () => {
+    reader.read().then(({ done, value }) => {
+      if (done)
+        return;
+      output.push(decoder.decode(value, { stream: true }));
+      read();
+    }).catch(() => {});
+  };
+  read();
+}, formatServerOutput = (output) => {
+  const text = output.join("").trim();
+  if (!text)
+    return "";
+  return text.length > SERVER_OUTPUT_LIMIT ? text.slice(-SERVER_OUTPUT_LIMIT) : text;
+}, createServerStartupError = (output) => {
+  const serverOutput = formatServerOutput(output);
+  const message = serverOutput ? `Server failed to start for pre-rendering.
+
+Server output:
+${serverOutput}` : "Server failed to start for pre-rendering";
+  return new Error(message);
 }, prerenderWithServer = async (serverBundlePath, port, outDir, staticConfig, env2, log) => {
+  const serverOutput = [];
   const serverProcess = Bun.spawn(["bun", "run", serverBundlePath], {
     cwd: process.cwd(),
     env: { ...process.env, ...env2, PORT: String(port) },
     stderr: "pipe",
     stdout: "pipe"
   });
+  captureStreamOutput(serverProcess.stdout, serverOutput);
+  captureStreamOutput(serverProcess.stderr, serverOutput);
   const ready = await waitForServerReady(port);
   if (!ready) {
     serverProcess.kill();
-    throw new Error("Server failed to start for pre-rendering");
+    await serverProcess.exited.catch(() => {
+      return;
+    });
+    throw createServerStartupError(serverOutput);
   }
   const result = await prerender(port, outDir, staticConfig, log);
   serverProcess.kill();
@@ -762,7 +803,12 @@ __export(exports_compile, {
 var {env: env3 } = globalThis.Bun;
 import { existsSync as existsSync9, readdirSync as readdirSync2, readFileSync as readFileSync9, unlinkSync as unlinkSync2 } 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) => {
+var cliTag3 = (color, message) => `\x1B[2m${formatTimestamp()}\x1B[0m ${color}[cli]\x1B[0m ${color}${message}\x1B[0m`, compileBanner = (version2) => {
+  const resolvedVersion = version2 || "unknown";
+  console.log("");
+  console.log(`  \x1B[36m\x1B[1mABSOLUTEJS\x1B[0m \x1B[2mv${resolvedVersion}\x1B[0m  \x1B[2mcompile\x1B[0m`);
+  console.log("");
+}, collectFiles2 = (dir) => {
   const result = [];
   let pending = readdirSync2(dir, { withFileTypes: true });
   while (pending.length > 0) {
@@ -951,6 +997,7 @@ console.log(\`
     resolve7(import.meta.dir, "..", "..", "..", "package.json"),
     resolve7(import.meta.dir, "..", "..", "package.json")
   ]);
+  compileBanner(absoluteVersion);
   const totalStart = performance.now();
   const buildStart = performance.now();
   process.stdout.write(cliTag3("\x1B[36m", "Building assets"));

package/dist/index.js

@@ -2372,6 +2372,22 @@ var frameworks, isRecord4 = (value) => typeof value === "object" && value !== nu
       source
     });
   }
+}, isIslandRegistryHelperImport = (source) => source === "@absolutejs/absolute/islands" || source.endsWith("/islands") || source.endsWith("/core/islands"), collectRegistryHelperImports = (importClause, source, registryFactoryNames, registryNamespaceNames) => {
+  if (!isIslandRegistryHelperImport(source))
+    return;
+  const bindings = importClause.namedBindings;
+  if (!bindings)
+    return;
+  if (ts.isNamespaceImport(bindings)) {
+    registryNamespaceNames.add(bindings.name.text);
+    return;
+  }
+  for (const element of bindings.elements) {
+    const importedName = element.propertyName?.text ?? element.name.text;
+    if (importedName === "defineIslandRegistry") {
+      registryFactoryNames.add(element.name.text);
+    }
+  }
 }, createRegistryEntryValue = (reference) => ({
   component: reference.source,
   export: reference.export,
@@ -2421,11 +2437,16 @@ var frameworks, isRecord4 = (value) => typeof value === "object" && value !== nu
       continue;
     addRegistryEntries(property.initializer, framework, imports, definitions, registry);
   }
-}, walkRegistryNode = (node, imports, definitions, registry) => {
-  if (ts.isCallExpression(node) && ts.isIdentifier(node.expression) && node.expression.text === "defineIslandRegistry") {
+}, walkRegistryNode = (node, imports, registryFactoryNames, registryNamespaceNames, definitions, registry) => {
+  if (ts.isCallExpression(node) && isDefineIslandRegistryCall(node.expression, registryFactoryNames, registryNamespaceNames)) {
     processDefineIslandRegistry(node, imports, definitions, registry);
   }
-  ts.forEachChild(node, (child) => walkRegistryNode(child, imports, definitions, registry));
+  ts.forEachChild(node, (child) => walkRegistryNode(child, imports, registryFactoryNames, registryNamespaceNames, definitions, registry));
+}, isDefineIslandRegistryCall = (expression, registryFactoryNames, registryNamespaceNames) => {
+  if (ts.isIdentifier(expression)) {
+    return registryFactoryNames.has(expression.text);
+  }
+  return ts.isPropertyAccessExpression(expression) && expression.name.text === "defineIslandRegistry" && ts.isIdentifier(expression.expression) && registryNamespaceNames.has(expression.expression.text);
 }, hasIslandRegistryNamedExport = (sourceFile) => {
   for (const statement of sourceFile.statements) {
     if (ts.isVariableStatement(statement) && statement.modifiers?.some((modifier) => modifier.kind === ts.SyntaxKind.ExportKeyword) && statement.declarationList.declarations.some((declaration) => ts.isIdentifier(declaration.name) && declaration.name.text === "islandRegistry")) {
@@ -2440,7 +2461,7 @@ var frameworks, isRecord4 = (value) => typeof value === "object" && value !== nu
     }
   }
   return false;
-}, collectImportDeclarations = (sourceFile, registryPath, imports) => {
+}, collectImportDeclarations = (sourceFile, registryPath, imports, registryFactoryNames, registryNamespaceNames) => {
   for (const statement of sourceFile.statements) {
     if (!ts.isImportDeclaration(statement) || !ts.isStringLiteral(statement.moduleSpecifier))
       continue;
@@ -2450,14 +2471,17 @@ var frameworks, isRecord4 = (value) => typeof value === "object" && value !== nu
     const source = resolveIslandSourcePath(registryPath, statement.moduleSpecifier.text);
     collectDefaultImport(imports, importClause, source);
     collectNamedImports(imports, importClause, source);
+    collectRegistryHelperImports(importClause, statement.moduleSpecifier.text, registryFactoryNames, registryNamespaceNames);
   }
 }, parseIslandRegistryBuildInfo = (registrySource, registryPath) => {
   const sourceFile = ts.createSourceFile(registryPath, registrySource, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
   const imports = new Map;
+  const registryFactoryNames = new Set(["defineIslandRegistry"]);
+  const registryNamespaceNames = new Set;
   const definitions = [];
   const registry = {};
-  collectImportDeclarations(sourceFile, registryPath, imports);
-  walkRegistryNode(sourceFile, imports, definitions, registry);
+  collectImportDeclarations(sourceFile, registryPath, imports, registryFactoryNames, registryNamespaceNames);
+  walkRegistryNode(sourceFile, imports, registryFactoryNames, registryNamespaceNames, definitions, registry);
   return {
     definitions,
     hasNamedExport: hasIslandRegistryNamedExport(sourceFile),
@@ -50066,7 +50090,7 @@ __export(exports_prerender, {
 });
 import { mkdirSync as mkdirSync13, readFileSync as readFileSync16 } from "fs";
 import { join as join24 } from "path";
-var MAX_STARTUP_ATTEMPTS = 50, STARTUP_POLL_INTERVAL_MS = 100, PRERENDER_BYPASS_HEADER = "X-Absolute-Prerender-Bypass", routeToFilename = (route) => route === "/" ? "index.html" : `${route.slice(1).replace(/\//g, "-")}.html`, writeTimestamp = async (htmlPath) => {
+var SERVER_OUTPUT_LIMIT = 4000, STARTUP_POLL_INTERVAL_MS = 100, DEFAULT_STARTUP_TIMEOUT_MS = 30000, PRERENDER_BYPASS_HEADER = "X-Absolute-Prerender-Bypass", routeToFilename = (route) => route === "/" ? "index.html" : `${route.slice(1).replace(/\//g, "-")}.html`, writeTimestamp = async (htmlPath) => {
   const metaPath = htmlPath.replace(/\.html$/, ".meta");
   await Bun.write(metaPath, String(Date.now()));
 }, readTimestamp = (htmlPath) => {
@@ -50164,25 +50188,66 @@ var MAX_STARTUP_ATTEMPTS = 50, STARTUP_POLL_INTERVAL_MS = 100, PRERENDER_BYPASS_
     await prerenderRoute(baseUrl, route, prerenderDir, result, log2);
   }
   return result;
+}, getStartupTimeoutMs = () => {
+  const rawTimeout = Bun.env.ABSOLUTE_PRERENDER_STARTUP_TIMEOUT_MS;
+  const parsedTimeout = rawTimeout ? Number(rawTimeout) : NaN;
+  return Number.isFinite(parsedTimeout) && parsedTimeout > 0 ? parsedTimeout : DEFAULT_STARTUP_TIMEOUT_MS;
 }, waitForServerReady = async (port) => {
-  for (let attempt = 0;attempt < MAX_STARTUP_ATTEMPTS; attempt++) {
+  const deadline = performance.now() + getStartupTimeoutMs();
+  while (performance.now() < deadline) {
     const res = await fetch(`http://localhost:${port}/`).catch(() => null);
-    if (res?.ok)
+    if (res) {
+      await res.body?.cancel().catch(() => {
+        return;
+      });
       return true;
+    }
     await Bun.sleep(STARTUP_POLL_INTERVAL_MS);
   }
   return false;
+}, captureStreamOutput = (stream, output) => {
+  if (!stream)
+    return;
+  const reader = stream.getReader();
+  const decoder2 = new TextDecoder;
+  const read = () => {
+    reader.read().then(({ done, value: value2 }) => {
+      if (done)
+        return;
+      output.push(decoder2.decode(value2, { stream: true }));
+      read();
+    }).catch(() => {});
+  };
+  read();
+}, formatServerOutput = (output) => {
+  const text = output.join("").trim();
+  if (!text)
+    return "";
+  return text.length > SERVER_OUTPUT_LIMIT ? text.slice(-SERVER_OUTPUT_LIMIT) : text;
+}, createServerStartupError = (output) => {
+  const serverOutput = formatServerOutput(output);
+  const message = serverOutput ? `Server failed to start for pre-rendering.
+
+Server output:
+${serverOutput}` : "Server failed to start for pre-rendering";
+  return new Error(message);
 }, prerenderWithServer = async (serverBundlePath, port, outDir, staticConfig, env4, log2) => {
+  const serverOutput = [];
   const serverProcess = Bun.spawn(["bun", "run", serverBundlePath], {
     cwd: process.cwd(),
     env: { ...process.env, ...env4, PORT: String(port) },
     stderr: "pipe",
     stdout: "pipe"
   });
+  captureStreamOutput(serverProcess.stdout, serverOutput);
+  captureStreamOutput(serverProcess.stderr, serverOutput);
   const ready = await waitForServerReady(port);
   if (!ready) {
     serverProcess.kill();
-    throw new Error("Server failed to start for pre-rendering");
+    await serverProcess.exited.catch(() => {
+      return;
+    });
+    throw createServerStartupError(serverOutput);
   }
   const result = await prerender(port, outDir, staticConfig, log2);
   serverProcess.kill();
@@ -57868,5 +57933,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=B174A989DC85D95764756E2164756E21
+//# debugId=86E5E86ED2B2842E64756E2164756E21
 //# sourceMappingURL=index.js.map