elegance-js 2.1.6 → 2.1.7

package/dist/page_compiler.mjs

@@ -307,13 +307,16 @@ var MIME_TYPES = {
 };
 function startServer({
   root,
+  pagesDirectory,
   port = 3e3,
   host = "localhost",
   environment = "production",
   DIST_DIR: DIST_DIR2
 }) {
   if (!root) throw new Error("Root directory must be specified.");
+  if (!pagesDirectory) throw new Error("Pages directory must be specified.");
   root = normalize(root).replace(/[\\/]+$/, "");
+  pagesDirectory = normalize(pagesDirectory).replace(/[\\/]+$/, "");
   const requestHandler = async (req, res) => {
     try {
       if (!req.url) {
@@ -333,11 +336,11 @@ function startServer({
       }
       const url = new URL(req.url, `http://${req.headers.host}`);
       if (url.pathname.startsWith("/api/")) {
-        await handleApiRequest(root, url.pathname, req, res);
+        await handleApiRequest(pagesDirectory, url.pathname, req, res);
       } else if (PAGE_MAP.has(url.pathname)) {
-        await handlePageRequest(root, url.pathname, req, res, DIST_DIR2, PAGE_MAP.get(url.pathname));
+        await handlePageRequest(root, pagesDirectory, url.pathname, req, res, DIST_DIR2, PAGE_MAP.get(url.pathname));
       } else {
-        await handleStaticRequest(root, url.pathname, req, res, DIST_DIR2);
+        await handleStaticRequest(root, pagesDirectory, url.pathname, req, res, DIST_DIR2);
       }
       if (environment === "development") {
         log.info(req.method, "::", req.url, "-", res.statusCode);
@@ -395,7 +398,7 @@ function getMiddlewareDirs(base, parts) {
 async function collectMiddlewares(dirs) {
   const middlewares = [];
   for (const dir of dirs) {
-    const mwPath = join(dir, "middleware.mjs");
+    const mwPath = join(dir, "middleware.ts");
     let mwModule;
     try {
       await fs.access(mwPath);
@@ -414,12 +417,12 @@ async function collectMiddlewares(dirs) {
   }
   return middlewares;
 }
-async function handlePageRequest(root, pathname, req, res, DIST_DIR2, pageInfo) {
+async function handlePageRequest(root, pagesDirectory, pathname, req, res, DIST_DIR2, pageInfo) {
   try {
     const { filePath, targetDir, stats } = await getTargetInfo(root, pathname);
     const relDir = targetDir.slice(root.length).replace(/^[\/\\]+/, "");
     const parts = relDir.split(/[\\/]/).filter(Boolean);
-    const middlewareDirs = getMiddlewareDirs(root, parts);
+    const middlewareDirs = getMiddlewareDirs(pagesDirectory, parts);
     const middlewares = await collectMiddlewares(middlewareDirs);
     let isDynamic = pageInfo.isDynamic;
     const handlerPath = isDynamic ? pageInfo.filePath : join(filePath, "index.html");
@@ -471,12 +474,12 @@ async function handlePageRequest(root, pathname, req, res, DIST_DIR2, pageInfo)
     }
   }
 }
-async function handleStaticRequest(root, pathname, req, res, DIST_DIR2) {
+async function handleStaticRequest(root, pagesDirectory, pathname, req, res, DIST_DIR2) {
   try {
     const { filePath, targetDir, stats } = await getTargetInfo(root, pathname);
     const relDir = targetDir.slice(root.length).replace(/^[\/\\]+/, "");
     const parts = relDir.split(/[\\/]/).filter(Boolean);
-    const middlewareDirs = getMiddlewareDirs(root, parts);
+    const middlewareDirs = getMiddlewareDirs(pagesDirectory, parts);
     const middlewares = await collectMiddlewares(middlewareDirs);
     let handlerPath = filePath;
     if (stats && stats.isDirectory()) {
@@ -510,13 +513,13 @@ async function handleStaticRequest(root, pathname, req, res, DIST_DIR2) {
     }
   }
 }
-async function handleApiRequest(root, pathname, req, res) {
+async function handleApiRequest(pagesDirectory, pathname, req, res) {
   const apiSubPath = pathname.slice("/api/".length);
   const parts = apiSubPath.split("/").filter(Boolean);
-  const middlewareDirs = getMiddlewareDirs(join(root, "api"), parts);
+  const middlewareDirs = getMiddlewareDirs(join(pagesDirectory, "api"), parts);
   const middlewares = await collectMiddlewares(middlewareDirs);
   const routeDir = middlewareDirs[middlewareDirs.length - 1];
-  const routePath = join(routeDir, "route.mjs");
+  const routePath = join(routeDir, "route.ts");
   let hasRoute = false;
   try {
     await fs.access(routePath);
@@ -1521,7 +1524,8 @@ var build = async () => {
         environment: options.environment,
         port: options.server.port ?? 3e3,
         host: options.server.host ?? "localhost",
-        DIST_DIR
+        DIST_DIR,
+        pagesDirectory: options.pagesDirectory
       });
     }
     process.send?.({ event: "message", data: "compile-finish" });

package/dist/server/server.d.ts

@@ -1,10 +1,11 @@
 import { IncomingMessage, ServerResponse } from 'http';
 interface ServerOptions {
     root: string;
+    pagesDirectory: string;
     port?: number;
     host?: string;
     environment?: 'production' | 'development';
     DIST_DIR: string;
 }
-export declare function startServer({ root, port, host, environment, DIST_DIR }: ServerOptions): import("http").Server<typeof IncomingMessage, typeof ServerResponse>;
+export declare function startServer({ root, pagesDirectory, port, host, environment, DIST_DIR }: ServerOptions): import("http").Server<typeof IncomingMessage, typeof ServerResponse>;
 export {};

package/dist/server/server.mjs

@@ -1154,7 +1154,8 @@ var build = async () => {
         environment: options.environment,
         port: options.server.port ?? 3e3,
         host: options.server.host ?? "localhost",
-        DIST_DIR
+        DIST_DIR,
+        pagesDirectory: options.pagesDirectory
       });
     }
     process.send?.({ event: "message", data: "compile-finish" });
@@ -1192,13 +1193,16 @@ var MIME_TYPES = {
 };
 function startServer({
   root,
+  pagesDirectory,
   port = 3e3,
   host = "localhost",
   environment = "production",
   DIST_DIR: DIST_DIR2
 }) {
   if (!root) throw new Error("Root directory must be specified.");
+  if (!pagesDirectory) throw new Error("Pages directory must be specified.");
   root = normalize(root).replace(/[\\/]+$/, "");
+  pagesDirectory = normalize(pagesDirectory).replace(/[\\/]+$/, "");
   const requestHandler = async (req, res) => {
     try {
       if (!req.url) {
@@ -1218,11 +1222,11 @@ function startServer({
       }
       const url = new URL(req.url, `http://${req.headers.host}`);
       if (url.pathname.startsWith("/api/")) {
-        await handleApiRequest(root, url.pathname, req, res);
+        await handleApiRequest(pagesDirectory, url.pathname, req, res);
       } else if (PAGE_MAP.has(url.pathname)) {
-        await handlePageRequest(root, url.pathname, req, res, DIST_DIR2, PAGE_MAP.get(url.pathname));
+        await handlePageRequest(root, pagesDirectory, url.pathname, req, res, DIST_DIR2, PAGE_MAP.get(url.pathname));
       } else {
-        await handleStaticRequest(root, url.pathname, req, res, DIST_DIR2);
+        await handleStaticRequest(root, pagesDirectory, url.pathname, req, res, DIST_DIR2);
       }
       if (environment === "development") {
         log.info(req.method, "::", req.url, "-", res.statusCode);
@@ -1280,7 +1284,7 @@ function getMiddlewareDirs(base, parts) {
 async function collectMiddlewares(dirs) {
   const middlewares = [];
   for (const dir of dirs) {
-    const mwPath = join(dir, "middleware.mjs");
+    const mwPath = join(dir, "middleware.ts");
     let mwModule;
     try {
       await fs2.access(mwPath);
@@ -1299,12 +1303,12 @@ async function collectMiddlewares(dirs) {
   }
   return middlewares;
 }
-async function handlePageRequest(root, pathname, req, res, DIST_DIR2, pageInfo) {
+async function handlePageRequest(root, pagesDirectory, pathname, req, res, DIST_DIR2, pageInfo) {
   try {
     const { filePath, targetDir, stats } = await getTargetInfo(root, pathname);
     const relDir = targetDir.slice(root.length).replace(/^[\/\\]+/, "");
     const parts = relDir.split(/[\\/]/).filter(Boolean);
-    const middlewareDirs = getMiddlewareDirs(root, parts);
+    const middlewareDirs = getMiddlewareDirs(pagesDirectory, parts);
     const middlewares = await collectMiddlewares(middlewareDirs);
     let isDynamic = pageInfo.isDynamic;
     const handlerPath = isDynamic ? pageInfo.filePath : join(filePath, "index.html");
@@ -1356,12 +1360,12 @@ async function handlePageRequest(root, pathname, req, res, DIST_DIR2, pageInfo)
     }
   }
 }
-async function handleStaticRequest(root, pathname, req, res, DIST_DIR2) {
+async function handleStaticRequest(root, pagesDirectory, pathname, req, res, DIST_DIR2) {
   try {
     const { filePath, targetDir, stats } = await getTargetInfo(root, pathname);
     const relDir = targetDir.slice(root.length).replace(/^[\/\\]+/, "");
     const parts = relDir.split(/[\\/]/).filter(Boolean);
-    const middlewareDirs = getMiddlewareDirs(root, parts);
+    const middlewareDirs = getMiddlewareDirs(pagesDirectory, parts);
     const middlewares = await collectMiddlewares(middlewareDirs);
     let handlerPath = filePath;
     if (stats && stats.isDirectory()) {
@@ -1395,13 +1399,13 @@ async function handleStaticRequest(root, pathname, req, res, DIST_DIR2) {
     }
   }
 }
-async function handleApiRequest(root, pathname, req, res) {
+async function handleApiRequest(pagesDirectory, pathname, req, res) {
   const apiSubPath = pathname.slice("/api/".length);
   const parts = apiSubPath.split("/").filter(Boolean);
-  const middlewareDirs = getMiddlewareDirs(join(root, "api"), parts);
+  const middlewareDirs = getMiddlewareDirs(join(pagesDirectory, "api"), parts);
   const middlewares = await collectMiddlewares(middlewareDirs);
   const routeDir = middlewareDirs[middlewareDirs.length - 1];
-  const routePath = join(routeDir, "route.mjs");
+  const routePath = join(routeDir, "route.ts");
   let hasRoute = false;
   try {
     await fs2.access(routePath);

package/package.json

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