elegance-js 1.5.0 → 1.6.1

package/dist/build.d.ts

@@ -4,6 +4,7 @@ type CompilationOptions = {
     environment: "production" | "development";
     pagesDirectory: string;
     outputDirectory: string;
+    quiet?: boolean;
     publicDirectory?: {
         path: string;
         method: "symlink" | "recursive-copy";

package/dist/build.mjs

@@ -103,7 +103,7 @@ async function handleApiRequest(root, pathname, req, res) {
   const apiSubPath = pathname.slice("/api/".length);
   const parts = apiSubPath.split("/").filter(Boolean);
   const routeDir = join(root, pathname);
-  const routePath = join(routeDir, "route.js");
+  const routePath = join(routeDir, "route.mjs");
   let hasRoute = false;
   try {
     await fs.access(routePath);
@@ -131,7 +131,7 @@ async function handleApiRequest(root, pathname, req, res) {
   }
   const middlewares = [];
   for (const dir of middlewareDirs) {
-    const mwPath = join(dir, "middleware.js");
+    const mwPath = join(dir, "middleware.mjs");
     let mwModule;
     try {
       await fs.access(mwPath);
@@ -143,7 +143,7 @@ async function handleApiRequest(root, pathname, req, res) {
     const mwKeys = Object.keys(mwModule).sort();
     for (const key of mwKeys) {
       const f = mwModule[key];
-      if (typeof f === "function") {
+      if (typeof f === "function" && !middlewares.some((existing) => existing === f)) {
         middlewares.push(f);
       }
     }
@@ -163,7 +163,7 @@ async function handleApiRequest(root, pathname, req, res) {
 function composeMiddlewares(mws, final) {
   return async function(req, res) {
     let index = 0;
-    const dispatch = async (err) => {
+    async function dispatch(err) {
       if (err) {
         return respondWithJsonError(res, 500, err.message || "Internal Server Error");
       }
@@ -171,12 +171,24 @@ function composeMiddlewares(mws, final) {
         return await final(req, res);
       }
       const thisMw = mws[index++];
+      const next = (e) => dispatch(e);
+      const onceNext = (nextFn) => {
+        let called = false;
+        return async (e) => {
+          if (called) {
+            console.warn("next() called more than once");
+            return;
+          }
+          called = true;
+          await nextFn(e);
+        };
+      };
       try {
-        await thisMw(req, res, dispatch);
+        await thisMw(req, res, onceNext(next));
       } catch (error) {
         await dispatch(error);
       }
-    };
+    }
     await dispatch();
   };
 }
@@ -244,6 +256,7 @@ var green = (text) => {
   return `\x1B[38;2;65;224;108m${text}`;
 };
 var log = (...text) => {
+  if (options.quiet === true) return;
   return console.log(text.map((text2) => `${text2}\x1B[0m`).join(""));
 };
 var options = process.env.OPTIONS;

package/dist/compile_docs.mjs

@@ -106,7 +106,7 @@ async function handleApiRequest(root, pathname, req, res) {
   const apiSubPath = pathname.slice("/api/".length);
   const parts = apiSubPath.split("/").filter(Boolean);
   const routeDir = join(root, pathname);
-  const routePath = join(routeDir, "route.js");
+  const routePath = join(routeDir, "route.mjs");
   let hasRoute = false;
   try {
     await fs.access(routePath);
@@ -134,7 +134,7 @@ async function handleApiRequest(root, pathname, req, res) {
   }
   const middlewares = [];
   for (const dir of middlewareDirs) {
-    const mwPath = join(dir, "middleware.js");
+    const mwPath = join(dir, "middleware.mjs");
     let mwModule;
     try {
       await fs.access(mwPath);
@@ -146,7 +146,7 @@ async function handleApiRequest(root, pathname, req, res) {
     const mwKeys = Object.keys(mwModule).sort();
     for (const key of mwKeys) {
       const f = mwModule[key];
-      if (typeof f === "function") {
+      if (typeof f === "function" && !middlewares.some((existing) => existing === f)) {
         middlewares.push(f);
       }
     }
@@ -166,7 +166,7 @@ async function handleApiRequest(root, pathname, req, res) {
 function composeMiddlewares(mws, final) {
   return async function(req, res) {
     let index = 0;
-    const dispatch = async (err) => {
+    async function dispatch(err) {
       if (err) {
         return respondWithJsonError(res, 500, err.message || "Internal Server Error");
       }
@@ -174,12 +174,24 @@ function composeMiddlewares(mws, final) {
         return await final(req, res);
       }
       const thisMw = mws[index++];
+      const next = (e) => dispatch(e);
+      const onceNext = (nextFn) => {
+        let called = false;
+        return async (e) => {
+          if (called) {
+            console.warn("next() called more than once");
+            return;
+          }
+          called = true;
+          await nextFn(e);
+        };
+      };
       try {
-        await thisMw(req, res, dispatch);
+        await thisMw(req, res, onceNext(next));
       } catch (error) {
         await dispatch(error);
       }
-    };
+    }
     await dispatch();
   };
 }
@@ -247,6 +259,7 @@ var green = (text) => {
   return `\x1B[38;2;65;224;108m${text}`;
 };
 var log = (...text) => {
+  if (options.quiet === true) return;
   return console.log(text.map((text2) => `${text2}\x1B[0m`).join(""));
 };
 var options = process.env.OPTIONS;

package/dist/page_compiler.mjs

@@ -741,6 +741,7 @@ var build = async () => {
         bundle: false,
         outbase: path.join(options.pagesDirectory, "/api"),
         outdir: path.join(DIST_DIR, "/api"),
+        outExtension: { ".js": ".mjs" },
         loader: {
           ".js": "js",
           ".ts": "ts"
@@ -762,6 +763,7 @@ var build = async () => {
         bundle: false,
         outbase: path.join(options.pagesDirectory, "/api"),
         outdir: path.join(DIST_DIR, "/api"),
+        outExtension: { ".js": ".mjs" },
         loader: {
           ".js": "js",
           ".ts": "ts"

package/dist/server/server.mjs

@@ -96,7 +96,7 @@ async function handleApiRequest(root, pathname, req, res) {
   const apiSubPath = pathname.slice("/api/".length);
   const parts = apiSubPath.split("/").filter(Boolean);
   const routeDir = join(root, pathname);
-  const routePath = join(routeDir, "route.js");
+  const routePath = join(routeDir, "route.mjs");
   let hasRoute = false;
   try {
     await fs.access(routePath);
@@ -124,7 +124,7 @@ async function handleApiRequest(root, pathname, req, res) {
   }
   const middlewares = [];
   for (const dir of middlewareDirs) {
-    const mwPath = join(dir, "middleware.js");
+    const mwPath = join(dir, "middleware.mjs");
     let mwModule;
     try {
       await fs.access(mwPath);
@@ -136,7 +136,7 @@ async function handleApiRequest(root, pathname, req, res) {
     const mwKeys = Object.keys(mwModule).sort();
     for (const key of mwKeys) {
       const f = mwModule[key];
-      if (typeof f === "function") {
+      if (typeof f === "function" && !middlewares.some((existing) => existing === f)) {
         middlewares.push(f);
       }
     }
@@ -156,7 +156,7 @@ async function handleApiRequest(root, pathname, req, res) {
 function composeMiddlewares(mws, final) {
   return async function(req, res) {
     let index = 0;
-    const dispatch = async (err) => {
+    async function dispatch(err) {
       if (err) {
         return respondWithJsonError(res, 500, err.message || "Internal Server Error");
       }
@@ -164,12 +164,24 @@ function composeMiddlewares(mws, final) {
         return await final(req, res);
       }
       const thisMw = mws[index++];
+      const next = (e) => dispatch(e);
+      const onceNext = (nextFn) => {
+        let called = false;
+        return async (e) => {
+          if (called) {
+            console.warn("next() called more than once");
+            return;
+          }
+          called = true;
+          await nextFn(e);
+        };
+      };
       try {
-        await thisMw(req, res, dispatch);
+        await thisMw(req, res, onceNext(next));
       } catch (error) {
         await dispatch(error);
       }
-    };
+    }
     await dispatch();
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "elegance-js",
-  "version": "1.5.0",
+  "version": "1.6.1",
   "description": "Web-Framework",
   "type": "module",
   "bin": {