elegance-js 2.1.32 → 2.1.35

package/dist/client/runtime.js

@@ -412,8 +412,8 @@ const domParser = new DOMParser();
 const xmlSerializer = new XMLSerializer();
 const fetchPage = async (targetURL) => {
     const pathname = sanitizePathname(targetURL.pathname);
-    if (pageStringCache.has(pathname)) {
-        return domParser.parseFromString(pageStringCache.get(pathname), "text/html");
+    if (pageStringCache.has(targetURL.href)) {
+        return domParser.parseFromString(pageStringCache.get(targetURL.href), "text/html");
     }
     const res = await fetch(targetURL);
     const newDOM = domParser.parseFromString(await res.text(), "text/html");
@@ -444,7 +444,7 @@ const fetchPage = async (targetURL) => {
             newDOM.head.appendChild(script);
         }
     }
-    pageStringCache.set(pathname, xmlSerializer.serializeToString(newDOM));
+    pageStringCache.set(targetURL.href, xmlSerializer.serializeToString(newDOM));
     return newDOM;
 };
 let navigationCallbacks = [];

package/dist/compilation/compiler.d.ts

@@ -5,6 +5,7 @@ import { AnyElement, SpecialElementOption } from "../elements/element";
 import { PageInformation } from "../server/page";
 import { LayoutInformation, LayoutProps } from "../server/layout";
 import { AsyncLocalStorage } from "async_hooks";
+import { LogLevel } from "../server/log";
 import { IncomingMessage, ServerResponse } from "http";
 /** Context of a page that is currently being compiled. */
 type PageCompilationContext = {
@@ -44,6 +45,7 @@ type CompilerOptions = {
     publicDirectory: string;
     outputDirectory: string;
     doHotReload: boolean;
+    logLevel: LogLevel;
 };
 type CompiledLayout = {
     /** Compiled result of the layoutConstructor */
@@ -131,6 +133,7 @@ declare function compileLayout(layoutInformation: LayoutInformation, allLayouts:
     req?: IncomingMessage;
     res?: ServerResponse;
 }): Promise<CompiledLayout>;
+declare function createRecursiveWatcher(targetDir: string, callback: (path: string) => Promise<void>): void;
 /**
  * Run the general compilation process for the project.
  * This compiles all static-pages & static-layouts, as well as gathers a list of every page (dynamic and static) & layout (dynamic and static).
@@ -152,4 +155,4 @@ declare function compileEntireProject(): Promise<{
  */
 declare function compileEntireProjectToDisk(): Promise<void>;
 export type { CompilerOptions, CompiledLayout, CompiledPage, };
-export { setCompilerOptions, generatePageCompilationContext, generateLayoutCompilationContext, serializeElement, generatePageDataScript, compileEntireProject, compileEntireProjectToDisk, compilePageToDisk, compileLayoutToDisk, compilerStore, compilerOptions, compilePage, compileLayout, clientPackages, };
+export { setCompilerOptions, generatePageCompilationContext, generateLayoutCompilationContext, serializeElement, generatePageDataScript, compileEntireProject, createRecursiveWatcher, compileEntireProjectToDisk, compilePageToDisk, compileLayoutToDisk, compilerStore, compilerOptions, compilePage, compileLayout, clientPackages, };

package/dist/compilation/compiler.js

@@ -16,7 +16,7 @@ import { AsyncLocalStorage } from "async_hooks";
 import { ServerSubject } from "../client/state.js";
 import { EventListenerOption, EventListener } from "../client/eventListener.js";
 import { LoadHook } from "../client/loadHook.js";
-import { formattedLog, LogLevel } from "../server/log.js";
+import { formattedLog, LogLevel, setLogLevel } from "../server/log.js";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 import { raw, unwrapAllRaw, } from "../elements/raw.js";
@@ -47,6 +47,7 @@ function setCompilerOptions(newOptions) {
         mkdirSync(newOptions.outputDirectory, { recursive: true, });
     }
     compilerOptions = newOptions;
+    setLogLevel(compilerOptions.logLevel);
 }
 function invalidElementError(element, fullPath, reason) {
     const stacktrace = formatStacktrace(fullPath);
@@ -1117,12 +1118,18 @@ function createRecursiveWatcher(targetDir, callback) {
 async function compileEntireProject() {
     // make sure to hook every element builder into the global scope
     Object.assign(globalThis, allElements);
-    const gracefulErr = (err) => { console.error(err); };
+    const gracefulErr = (err) => {
+        console.error(err);
+        return;
+    };
+    formattedLog(LogLevel.DEBUG, "Compiling project..");
+    // This is used to restart us if we crash, via an FS watcher.
+    process.send?.(JSON.stringify({ message: "set-compiler-options", content: JSON.stringify(compilerOptions) }));
     process.on("uncaughtException", gracefulErr);
     process.on("unhandledRejection", gracefulErr);
     if (compilerOptions.doHotReload) {
         createRecursiveWatcher(compilerOptions.pagesDirectory, async (path) => {
-            process.send?.(`restart-me`);
+            process.send?.(JSON.stringify({ message: `restart-me` }));
         });
     }
     const allLayouts = await gatherAllLayouts();
@@ -1150,4 +1157,4 @@ async function compileEntireProject() {
 async function compileEntireProjectToDisk() {
     throw new Error("Not yet implemented.");
 }
-export { setCompilerOptions, generatePageCompilationContext, generateLayoutCompilationContext, serializeElement, generatePageDataScript, compileEntireProject, compileEntireProjectToDisk, compilePageToDisk, compileLayoutToDisk, compilerStore, compilerOptions, compilePage, compileLayout, clientPackages, };
+export { setCompilerOptions, generatePageCompilationContext, generateLayoutCompilationContext, serializeElement, generatePageDataScript, compileEntireProject, createRecursiveWatcher, compileEntireProjectToDisk, compilePageToDisk, compileLayoutToDisk, compilerStore, compilerOptions, compilePage, compileLayout, clientPackages, };

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+export { LogLevel } from "./server/log";
 export { observer, getSelf, } from "./client/observer";
 export { eventListener, } from "./client/eventListener";
 export { loadHook, } from "./client/loadHook";

package/dist/index.js

@@ -1,3 +1,4 @@
+export { LogLevel } from "./server/log.js";
 export { observer, getSelf, } from "./client/observer.js";
 export { eventListener, } from "./client/eventListener.js";
 export { loadHook, } from "./client/loadHook.js";

package/dist/server/runtime.js

@@ -2,11 +2,13 @@ import { spawn } from "child_process";
 import { resolve } from "path";
 import { formattedLog, LogLevel } from "./log.js";
 import { createServer } from "http";
+import { createRecursiveWatcher } from "../compilation/compiler.js";
 let child;
 let childPath;
 const clients = new Set();
 let server;
 let serverIsActive = false;
+let compilerOptions;
 /**
  * Run the elegance runtime, and if hot-reloading is enabled, will start the hot-reload server.
  * @param file The runtime file to execute.
@@ -43,12 +45,27 @@ function restartEleganceRuntime() {
         stdio: ['inherit', 'inherit', 'inherit', 'ipc'],
         env: { ...process.env }
     });
-    child.on("message", (content) => {
-        if (content === "restart-me") {
+    child.on("exit", (code) => {
+        if (code === 0)
+            return;
+        formattedLog(LogLevel.ERROR, "The Elegance runtime has crashed. Waiting for file changes..");
+        createRecursiveWatcher(compilerOptions.pagesDirectory, async (path) => {
+            formattedLog(LogLevel.INFO, "Change noticed after error, restarting Elegance Runtime..");
+            restartEleganceRuntime();
+        });
+    });
+    child.on("message", (raw) => {
+        const { message, content } = JSON.parse(raw);
+        if (message === "restart-me") {
             formattedLog(LogLevel.INFO, "Rebuilding..");
             restartEleganceRuntime();
         }
-        if (content === "hot-reload-finish") {
+        if (message === "set-compiler-options") {
+            compilerOptions = JSON.parse(content);
+            formattedLog(LogLevel.DEBUG, "Setting compiler options in parent..");
+            return;
+        }
+        if (message === "hot-reload-finish") {
             if (!serverIsActive) {
                 serverIsActive = true;
                 server.listen(4000, () => {
@@ -59,9 +76,7 @@ function restartEleganceRuntime() {
                 client.write("data: hot-reload\n\n");
             }
         }
-        if (content === "enable-hot-reload") {
-        }
-        if (content === "disable-hot-reload") {
+        if (message === "disable-hot-reload") {
             if (!serverIsActive)
                 return;
             serverIsActive = false;

package/dist/server/server.js

@@ -11,6 +11,7 @@ import { existsSync, readdirSync, statSync, createReadStream } from "fs";
 import * as zlib from "zlib";
 import { promisify } from "util";
 import { URLSearchParams } from "url";
+import { formattedLog, LogLevel } from "./log.js";
 const gzipAsync = promisify(zlib.gzip);
 function removePrefix(str, prefix) {
     return str.startsWith(prefix) ? str.slice(prefix.length) : str;
@@ -535,6 +536,7 @@ async function serveProject(startupServerOptions) {
     server.on("error", (error) => {
         if (error.code === "EADDRINUSE") {
             setTimeout(() => {
+                formattedLog(LogLevel.WARN, `${port} was not available, trying port ${port + 1}..`);
                 port += 1;
                 server.listen(port);
             }, 500);
@@ -542,8 +544,9 @@ async function serveProject(startupServerOptions) {
     });
     server.listen({ port: serverOptions.port, hostname: serverOptions.hostname, }, () => {
         if (compilerOptions.doHotReload) {
-            process.send?.("hot-reload-finish");
+            process.send?.(JSON.stringify({ message: "hot-reload-finish" }));
         }
+        formattedLog(LogLevel.INFO, `Server listening on port ${port}`);
     });
     return {
         port,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "elegance-js",
-  "version": "2.1.32",
+  "version": "2.1.35",
   "description": "Web-Framework",
   "type": "module",
   "main": "dist/index.mjs",

package/scripts/elegance_dev.ts

@@ -1,5 +1,5 @@
 import { execSync } from "child_process";
-import { serveProject, compileEntireProject, setCompilerOptions, } from "elegance-js";
+import { serveProject, compileEntireProject, setCompilerOptions, LogLevel, } from "elegance-js";
 import path from "path";
 
 async function runtime() {
@@ -14,6 +14,8 @@ async function runtime() {
         environment: "development",
 
         doHotReload: true,
+        
+        logLevel: LogLevel.INFO,
     });
 
     const { allLayouts, allPages, allStatusCodePages, compiledStaticLayouts, compiledStaticPages, } = await compileEntireProject();

package/scripts/elegance_prod.ts

@@ -1,5 +1,5 @@
 import { execSync } from "child_process";
-import { serveProject, compileEntireProject, setCompilerOptions, } from "elegance-js";
+import { serveProject, compileEntireProject, setCompilerOptions, LogLevel, } from "elegance-js";
 import path from "path";
 
 async function runtime() {
@@ -13,7 +13,9 @@ async function runtime() {
         outputDirectory: outputDirectory,
         environment: "production",
 
-        doHotReload: true,
+        doHotReload: false,
+
+        logLevel: LogLevel.INFO,
     });
 
     const { allLayouts, allPages, allStatusCodePages, compiledStaticLayouts, compiledStaticPages, } = await compileEntireProject();

package/scripts/elegance_static.ts

@@ -1,5 +1,5 @@
 import { execSync } from "child_process";
-import { serveProject, compileEntireProject, setCompilerOptions, } from "elegance-js";
+import { serveProject, compileEntireProject, setCompilerOptions, LogLevel, } from "elegance-js";
 import path from "path";
 
 async function runtime() {
@@ -14,6 +14,8 @@ async function runtime() {
         environment: "production",
 
         doHotReload: false,
+
+        logLevel: LogLevel.INFO,
     });
 
     await compileEntireProject();