@absolutejs/absolute 0.19.0-beta.1071 → 0.19.0-beta.1072

package/dist/cli/index.js

@@ -178649,6 +178649,7 @@ var resolveDevPort = async (requestedPort, options = {}) => {
 init_utils();
 var cliTag = (color, message) => `\x1B[2m${formatTimestamp()}\x1B[0m ${color}[cli]\x1B[0m ${color}${message}\x1B[0m`;
 var DEFAULT_PORT_RANGE = 10;
+var RESTART_PARK_POLL_MS = 20;
 var NODE_API_IMPORT_ERROR = "To load Node-API modules, use require() or process.dlopen instead of import.";
 var formatServerBootDiagnostic = (output, serverEntry) => {
   if (!output.includes(NODE_API_IMPORT_ERROR))
@@ -179000,17 +179001,30 @@ var dev = async (serverEntry, configPath2) => {
   let serverProcess = await spawnServer();
   const sessionStart = Date.now();
   let serverRestartPending = false;
+  let serverRestartQueued = false;
+  const runServerRestart = async () => {
+    serverRestartQueued = false;
+    try {
+      await restartServer();
+    } catch (err) {
+      console.error(cliTag("\x1B[31m", `Restart failed: ${err}`));
+    }
+    if (serverRestartQueued) {
+      await runServerRestart();
+      return;
+    }
+    serverRestartPending = false;
+  };
   const scheduleServerRestart = (filePath) => {
-    if (serverRestartPending)
+    if (serverRestartPending) {
+      serverRestartQueued = true;
       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}`));
-      });
+      runServerRestart();
     }, 80);
   };
   try {
@@ -179112,8 +179126,8 @@ var dev = async (serverEntry, configPath2) => {
   } catch {}
   updateInstance(instancePid, { frameworks });
   sendTelemetryEvent("dev:start", { entry: serverEntry, frameworks });
-  const killChildTree = (signal) => {
-    const childPid = serverProcess.pid;
+  const signalChildTree = (proc, signal) => {
+    const childPid = proc.pid;
     if (typeof childPid !== "number")
       return;
     try {
@@ -179124,6 +179138,28 @@ var dev = async (serverEntry, configPath2) => {
       process.kill(childPid, signal);
     } catch {}
   };
+  const killChildTree = (signal) => signalChildTree(serverProcess, signal);
+  const FORCE_KILL_GRACE_MS = 2 * MILLISECONDS_IN_A_SECOND;
+  const terminateChild = (proc) => new Promise((res) => {
+    if (proc.exitCode !== null || typeof proc.pid !== "number") {
+      res();
+      return;
+    }
+    let settled = false;
+    const finish = () => {
+      if (settled)
+        return;
+      settled = true;
+      clearTimeout(killTimer);
+      res();
+    };
+    proc.once("exit", finish);
+    signalChildTree(proc, "SIGTERM");
+    const killTimer = setTimeout(() => {
+      signalChildTree(proc, "SIGKILL");
+    }, FORCE_KILL_GRACE_MS);
+    killTimer.unref();
+  });
   const cleanup = async (exitCode = 0) => {
     if (cleaning)
       return;
@@ -179157,6 +179193,7 @@ var dev = async (serverEntry, configPath2) => {
     removeHeapPreload();
     process.exit(exitCode);
   };
+  let intentionalRestart = false;
   const restartServer = async () => {
     serverReady = false;
     console.log(cliTag("\x1B[36m", "Restarting server..."));
@@ -179166,17 +179203,10 @@ var dev = async (serverEntry, configPath2) => {
       sendSignal("SIGCONT");
       paused = false;
     }
-    try {
-      old.kill("SIGTERM");
-    } catch {}
+    intentionalRestart = true;
+    await terminateChild(old);
     serverProcess = await spawnServer();
-    await new Promise((res) => {
-      if (old.exitCode !== null) {
-        res();
-        return;
-      }
-      old.once("exit", () => res());
-    });
+    intentionalRestart = false;
     console.log(cliTag("\x1B[32m", "Server restarted."));
   };
   const sendSignalToGroup = (signal) => {
@@ -179325,6 +179355,12 @@ var dev = async (serverEntry, configPath2) => {
     serverProcess = await spawnServer();
     return true;
   };
+  const waitForIntentionalRestart = async () => {
+    if (!intentionalRestart)
+      return;
+    await Bun.sleep(RESTART_PARK_POLL_MS);
+    await waitForIntentionalRestart();
+  };
   const monitorServer = async () => {
     if (cleaning) {
       return;
@@ -179337,6 +179373,11 @@ var dev = async (serverEntry, configPath2) => {
       }
       current.once("exit", (code) => res(code));
     });
+    if (intentionalRestart) {
+      await waitForIntentionalRestart();
+      await monitorServer();
+      return;
+    }
     if (cleaning || serverProcess !== current) {
       await monitorServer();
       return;

package/dist/index.js

@@ -25255,6 +25255,59 @@ ${fields}
     deferSlots: inlinedTemplate.deferSlots,
     source: result
   };
+}, CLASS_KEYWORD = "class", isIdentifierChar = (char) => char !== undefined && /[A-Za-z0-9_$]/.test(char), skipStringLiteral = (source, start) => {
+  const quote = source[start];
+  let index = start + 1;
+  while (index < source.length) {
+    if (source[index] === "\\") {
+      index += 2;
+      continue;
+    }
+    if (source[index] === quote)
+      return index + 1;
+    index += 1;
+  }
+  return index;
+}, findDecoratedClassKeyword = (source, start) => {
+  let index = start;
+  let depth = 0;
+  while (index < source.length) {
+    const char = source[index];
+    if (char === '"' || char === "'" || char === "`") {
+      index = skipStringLiteral(source, index);
+      continue;
+    }
+    const isOpen = char === "(" || char === "[" || char === "{";
+    const isClose = char === ")" || char === "]" || char === "}";
+    const atClass = depth === 0 && source.startsWith(CLASS_KEYWORD, index) && !isIdentifierChar(source[index - 1]) && !isIdentifierChar(source[index + CLASS_KEYWORD.length]);
+    if (atClass)
+      return index;
+    if (isOpen)
+      depth += 1;
+    else if (isClose)
+      depth -= 1;
+    index += 1;
+  }
+  return -1;
+}, hoistExportPastDecorators = (source) => {
+  const exportBeforeDecorator = /\bexport\s+(?=@)/g;
+  let result = "";
+  let lastIndex = 0;
+  let match = exportBeforeDecorator.exec(source);
+  while (match !== null) {
+    const decoratorStart = match.index + match[0].length;
+    const classIndex = findDecoratedClassKeyword(source, decoratorStart);
+    if (classIndex !== -1) {
+      result += source.slice(lastIndex, match.index);
+      result += source.slice(decoratorStart, classIndex);
+      result += `export ${CLASS_KEYWORD}`;
+      lastIndex = classIndex + CLASS_KEYWORD.length;
+      exportBeforeDecorator.lastIndex = lastIndex;
+    }
+    match = exportBeforeDecorator.exec(source);
+  }
+  result += source.slice(lastIndex);
+  return result;
 }, compileAngularFileJIT = async (inputPath, outDir, rootDir, stylePreprocessors, cacheBuster) => {
   const entryPath = resolve24(inputPath);
   const allOutputs = [];
@@ -25319,7 +25372,7 @@ ${fields}
     return specifier.includes("?") ? `${specifier}&t=${cacheBuster}` : `${specifier}?t=${cacheBuster}`;
   };
   const transpileAndRewrite = (sourceCode, relativeDir, actualPath, importRewrites) => {
-    let processedContent = angularTranspiler.transformSync(sourceCode);
+    let processedContent = angularTranspiler.transformSync(hoistExportPastDecorators(sourceCode));
     const outputPath = toOutputPath(actualPath);
     const rewriteBareImport = (prefix, specifier, suffix) => {
       const rewritten = importRewrites.get(specifier);
@@ -46608,5 +46661,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=119C10E5B5088D9764756E2164756E21
+//# debugId=8A2CABA7603DDD1464756E2164756E21
 //# sourceMappingURL=index.js.map