xpine 0.0.29 → 0.0.31

package/dist/src/context.d.ts

@@ -4,7 +4,7 @@ export type State<StateProps> = {
     set: (id: string, callback: SetContext<StateProps>, defaultValue?: any) => void;
     clear: () => void;
     getAll: () => any;
-    addToArray: (id: string, value: any, position?: number) => void;
+    addToArray: (id: string, value: any, position?: number | Date) => void;
     getArrayQueue: () => any;
     runArrayQueue: () => void;
 };

package/dist/src/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/context.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,UAAU,CAAC,IAAI,IAAI,CAAC,cAAc,EAAE,IAAI,KAAK,IAAI,CAAC;AAE9D,MAAM,MAAM,KAAK,CAAC,UAAU,IAAI;IAC9B,GAAG,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,UAAU,CAAC;IAChC,GAAG,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,CAAC,UAAU,CAAC,EAAE,YAAY,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAChF,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,MAAM,EAAE,MAAM,GAAG,CAAC;IAClB,UAAU,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAChE,aAAa,EAAE,MAAM,GAAG,CAAC;IACzB,aAAa,EAAE,MAAM,IAAI,CAAC;CAC3B,CAAA;AAED,KAAK,WAAW,CAAC,IAAI,IAAI;IACvB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB,CAAA;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,WAAW,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CA8CjE;AAED,eAAO,MAAM,OAAO,YAAoB,CAAC;AAEzC,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM,kBACjC,GAAG,SAYnC"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/context.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,UAAU,CAAC,IAAI,IAAI,CAAC,cAAc,EAAE,IAAI,KAAK,IAAI,CAAC;AAE9D,MAAM,MAAM,KAAK,CAAC,UAAU,IAAI;IAC9B,GAAG,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,UAAU,CAAC;IAChC,GAAG,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,CAAC,UAAU,CAAC,EAAE,YAAY,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAChF,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,MAAM,EAAE,MAAM,GAAG,CAAC;IAClB,UAAU,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IACvE,aAAa,EAAE,MAAM,GAAG,CAAC;IACzB,aAAa,EAAE,MAAM,IAAI,CAAC;CAC3B,CAAA;AAED,KAAK,WAAW,CAAC,IAAI,IAAI;IACvB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB,CAAA;AAQD,wBAAgB,aAAa,CAAC,KAAK,EAAE,WAAW,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAmDjE;AAED,eAAO,MAAM,OAAO,YAAoB,CAAC;AAEzC,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM,kBACjC,GAAG,SAYnC"}

package/dist/src/express.d.ts

@@ -7,4 +7,5 @@ export declare function createXPineRouter(app: any, beforeErrorRoute?: (app: Exp
 export declare function routeHasStaticPath(route: string, params: {
     [key: string]: string;
 }): string | false;
+export declare function filePathToURLPath(pathName: string, isDist?: boolean): string;
 //# sourceMappingURL=express.d.ts.map

package/dist/src/express.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"express.d.ts","sourceRoot":"","sources":["../../src/express.ts"],"names":[],"mappings":"AAAA,OAAgB,EAAgB,OAAO,EAAqB,MAAM,SAAS,CAAC;AAyC5E,wBAAsB,YAAY;;;GA8GjC;AAiBD,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,iBA6B1F;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GAAG,MAAM,GAAG,KAAK,CAWnG"}
+{"version":3,"file":"express.d.ts","sourceRoot":"","sources":["../../src/express.ts"],"names":[],"mappings":"AAAA,OAAgB,EAAgB,OAAO,EAAqB,MAAM,SAAS,CAAC;AAyC5E,wBAAsB,YAAY;;;GA+GjC;AAiBD,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,iBA6B1F;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GAAG,MAAM,GAAG,KAAK,CAWnG;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAE,OAAc,UAQzE"}

package/dist/src/scripts/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/scripts/build.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,UAAU,EAA2B,aAAa,EAAE,MAAM,aAAa,CAAC;AAWjF,KAAK,YAAY,GAAG;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAA;AAED,wBAAsB,QAAQ,CAAC,IAAI,EAAE,YAAY,iBAsBhD;AA8ID,wBAAsB,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,iBAavD;AAGD,wBAAsB,yBAAyB,kBAgB9C;AAED,wBAAsB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,QAAQ,GAAG,KAAK,EAAE,eAAe,WAAkB,iBAahH;AAED,wBAAsB,qBAAqB,CAAC,aAAa,EAAE,aAAa,EAAE,iBAezE;AAED,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,eAAe,EAAE,GAAG,EAAE,kBAAkB,EAAE,MAAM,iBAgEpI;AAED,wBAAgB,wBAAwB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,EAAE,CAQxE;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,EAAE,EAAE,MAAM,CAAC;CACZ,CAAA;AAGD,wBAAsB,eAAe,CAAC,aAAa,EAAE,aAAa,EAAE,EAAE,KAAK,CAAC,EAAE,OAAO,iBAoDpF"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/scripts/build.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,UAAU,EAA2B,aAAa,EAAE,MAAM,aAAa,CAAC;AAYjF,KAAK,YAAY,GAAG;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAA;AAED,wBAAsB,QAAQ,CAAC,IAAI,EAAE,YAAY,iBAsBhD;AA8ID,wBAAsB,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,iBAavD;AAGD,wBAAsB,yBAAyB,kBAgB9C;AAED,wBAAsB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,QAAQ,GAAG,KAAK,EAAE,eAAe,WAAkB,iBAahH;AAED,wBAAsB,qBAAqB,CAAC,aAAa,EAAE,aAAa,EAAE,iBAezE;AAED,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,eAAe,EAAE,GAAG,EAAE,kBAAkB,EAAE,MAAM,iBAmEpI;AAED,wBAAgB,wBAAwB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,EAAE,CAQxE;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,EAAE,EAAE,MAAM,CAAC;CACZ,CAAA;AAGD,wBAAsB,eAAe,CAAC,aAAa,EAAE,aAAa,EAAE,EAAE,KAAK,CAAC,EAAE,OAAO,iBAoDpF"}

package/dist/src/scripts/xpine-build.js

@@ -2,7 +2,7 @@
 
 // src/scripts/build.ts
 import path5 from "path";
-import fs5 from "fs-extra";
+import fs6 from "fs-extra";
 import { build } from "esbuild";
 
 // src/build/typescript-builder.ts
@@ -116,10 +116,12 @@ function createContext(value) {
     },
     runArrayQueue() {
       Object.keys(arrayQueue).forEach((key) => {
-        arrayQueue[key].sort((a, b) => {
-          return (a?.position ?? Infinity) - (b.position ?? Infinity);
-        });
-        for (const item of arrayQueue[key]) {
+        const dates = arrayQueue[key].filter((item) => item?.position instanceof Date);
+        const numbers = arrayQueue[key].filter((item) => typeof item?.position === "number" || !item?.position);
+        const sortedDates = dates.toSorted((a, b) => b?.position.getTime() - a?.position.getTime());
+        const sortedNumbers = numbers.toSorted((a, b) => (a?.position ?? Infinity) - (b.position ?? Infinity));
+        const output = sortedNumbers.concat(sortedDates);
+        for (const item of output) {
           this.set(key, item.value, []);
         }
       });
@@ -278,7 +280,7 @@ async function triggerXPineOnLoad(noCache = false) {
 }
 
 // src/scripts/build.ts
-import { globSync } from "glob";
+import { globSync as globSync2 } from "glob";
 import postcss from "postcss";
 import tailwindPostcss from "@tailwindcss/postcss";
 
@@ -319,7 +321,9 @@ var regex_default = {
   dynamicRoutes: /(\[)(.*?)(\])/g,
   isDynamicRoute: /\[(.*)\]/g,
   endsWithTSX: /\.tsx$/,
-  endsWithJSX: /\.jsx$/
+  endsWithJSX: /\.jsx$/,
+  endsWithFileName: /\.(html|tsx|jsx|js|ts)$/,
+  indexFile: /index\.(html|tsx|jsx|js|ts)$/g
 };
 
 // src/util/config-file.ts
@@ -442,8 +446,41 @@ var staticComment = "<!-- static -->";
 
 // src/scripts/build.ts
 import ts3 from "typescript";
+
+// src/express.ts
+import express from "express";
+import { globSync } from "glob";
+
+// src/auth.ts
+import jsonwebtoken from "jsonwebtoken";
+var { verify, sign } = jsonwebtoken;
+
+// src/express.ts
+import requestIP from "request-ip";
+import fs5 from "fs-extra";
+import EventEmitter from "events";
+var OnInitEmitter = class extends EventEmitter {
+};
+var onInitEmitter = new OnInitEmitter();
+onInitEmitter.on("triggerOnInit", async (paths) => {
+  for (const routePath of paths) {
+    const pathImport = await import(routePath.path + `?cache=${Date.now()}`);
+    if (pathImport?.config?.onInit) await pathImport.config.onInit();
+  }
+});
+function filePathToURLPath(pathName, isDist = true) {
+  const result = pathName.split(isDist ? config.distPagesDir : config.pagesDir).pop().replace(regex_default.indexFile, "").replace(regex_default.endsWithFileName, "");
+  if (result.endsWith("/")) {
+    const cleanedResult = result.slice(0, -1);
+    if (!cleanedResult) return "/";
+    return cleanedResult;
+  }
+  return result;
+}
+
+// src/scripts/build.ts
 var extensions = [".ts", ".tsx"];
-var packageJson = JSON.parse(fs5.readFileSync(config.packageJsonPath, "utf-8"));
+var packageJson = JSON.parse(fs6.readFileSync(config.packageJsonPath, "utf-8"));
 var allPackages = Object.keys(packageJson.devDependencies).concat(Object.keys(packageJson.dependencies));
 var xpineDistDir = getXPineDistDir();
 async function buildApp(args) {
@@ -451,12 +488,12 @@ async function buildApp(args) {
   const removePreviousBuild2 = args?.removePreviousBuild || false;
   const disableTailwind2 = args?.disableTailwind || false;
   try {
-    if (removePreviousBuild2) fs5.removeSync(config.distDir);
-    const srcDirFiles = globSync(config.srcDir + "/**/*.{js,ts,tsx,jsx}");
+    if (removePreviousBuild2) fs6.removeSync(config.distDir);
+    const srcDirFiles = globSync2(config.srcDir + "/**/*.{js,ts,tsx,jsx}");
     const { componentData, dataFiles } = await buildAppFiles(srcDirFiles, isDev2);
     const alpineDataFile = await buildAlpineDataFile(componentData, dataFiles);
     await buildClientSideFiles([alpineDataFile], isDev2);
-    fs5.removeSync(config.distTempFolder);
+    fs6.removeSync(config.distTempFolder);
     await buildCSS(disableTailwind2);
     await buildPublicFolderSymlinks();
     await buildOnLoadFile(componentData, isDev2);
@@ -476,7 +513,7 @@ async function buildAppFiles(files, isDev2) {
     return fileName === "+config";
   });
   const backendFiles = files.filter((file) => extensions.find((ext) => file.endsWith(ext))).filter((file) => !file.startsWith(config.publicDir));
-  fs5.ensureDirSync(config.distDir);
+  fs6.ensureDirSync(config.distDir);
   await build({
     entryPoints: backendFiles,
     format: "esm",
@@ -501,9 +538,9 @@ async function buildAppFiles(files, isDev2) {
 }
 async function buildClientSideFiles(alpineDataFiles = [], isDev2) {
   const tempFilePath = path5.join(config.distTempFolder, "./app.ts");
-  fs5.ensureFileSync(tempFilePath);
+  fs6.ensureFileSync(tempFilePath);
   const pagesScriptsGlob = config.publicDir + "/scripts/pages/**/*.{js,ts}";
-  const clientFiles = globSync(
+  const clientFiles = globSync2(
     config.publicDir + "/**/*.{js,ts}",
     {
       ignore: pagesScriptsGlob
@@ -519,7 +556,7 @@ async function buildClientSideFiles(alpineDataFiles = [], isDev2) {
     minify: !isDev2,
     sourcemap: isDev2 ? "inline" : false
   });
-  const pagesFiles = globSync(pagesScriptsGlob);
+  const pagesFiles = globSync2(pagesScriptsGlob);
   await build({
     entryPoints: pagesFiles || [],
     bundle: true,
@@ -531,13 +568,13 @@ async function buildClientSideFiles(alpineDataFiles = [], isDev2) {
 }
 function writeDevServerClientSideCode(tempFilePath) {
   const devServerPath = path5.join(xpineDistDir, "./src/static/dev-server.js");
-  const content = fs5.readFileSync(devServerPath, "utf-8");
-  fs5.appendFileSync(tempFilePath, "\n" + content);
+  const content = fs6.readFileSync(devServerPath, "utf-8");
+  fs6.appendFileSync(tempFilePath, "\n" + content);
 }
 function writeSpaClientSideCode(tempFilePath) {
   const spaPath = path5.join(xpineDistDir, "./src/static/spa.js");
-  const content = fs5.readFileSync(spaPath, "utf-8");
-  fs5.appendFileSync(tempFilePath, "\n" + content);
+  const content = fs6.readFileSync(spaPath, "utf-8");
+  fs6.appendFileSync(tempFilePath, "\n" + content);
 }
 async function buildAlpineDataFile(componentData, dataFiles) {
   const output = {
@@ -583,23 +620,23 @@ async function buildAlpineDataFile(componentData, dataFiles) {
     output.code.push(`Alpine.data('${dataFunction.name}', ${dataFunction.name});`);
   }
   const result = output.imports.join("\n") + "\n" + output.code.join("\n") + "\n" + output.end.join("\n");
-  fs5.ensureFileSync(config.alpineDataPath);
-  fs5.writeFileSync(config.alpineDataPath, result);
+  fs6.ensureFileSync(config.alpineDataPath);
+  fs6.writeFileSync(config.alpineDataPath, result);
   return config.alpineDataPath;
 }
 async function buildCSS(disableTailwind2) {
-  const cssFiles = globSync(config.srcDir + "/**/*.css");
+  const cssFiles = globSync2(config.srcDir + "/**/*.css");
   for (const file of cssFiles) {
-    const fileContents = fs5.readFileSync(file, "utf-8");
+    const fileContents = fs6.readFileSync(file, "utf-8");
     const result = disableTailwind2 ? fileContents : await postcss([tailwindPostcss(), remove_layers_default()]).process(fileContents, { from: file });
     const newPath = file.replace(config.srcDir, config.distDir);
-    fs5.ensureFileSync(newPath);
-    fs5.writeFileSync(newPath, result.css);
+    fs6.ensureFileSync(newPath);
+    fs6.writeFileSync(newPath, result.css);
   }
   logSize(config.distPublicDir, "css");
 }
 async function buildPublicFolderSymlinks() {
-  const files = globSync(config.publicDir + "/**/*.*", {
+  const files = globSync2(config.publicDir + "/**/*.*", {
     ignore: "/**/*.{css,js,ts,tsx,jsx}"
   });
   for (const file of files) {
@@ -608,19 +645,19 @@ async function buildPublicFolderSymlinks() {
       const splitNewPath = newPath.split("/");
       splitNewPath.pop();
       const newDir = splitNewPath.join("/");
-      fs5.ensureDirSync(newDir);
-      fs5.symlinkSync(file, newPath);
+      fs6.ensureDirSync(newDir);
+      fs6.symlinkSync(file, newPath);
     } catch {
     }
   }
 }
 async function logSize(pathName, type, validExtensions = [".js", ".css"]) {
-  const files = globSync(pathName + "/**/*" + (type === "css" ? ".css" : ""));
+  const files = globSync2(pathName + "/**/*" + (type === "css" ? ".css" : ""));
   const fileSizes = files.map((file) => {
     if (!validExtensions.find((ext) => file.endsWith(ext))) return false;
     return {
       file,
-      size: fs5.statSync(file).size / (1024 * 1e3)
+      size: fs6.statSync(file).size / (1024 * 1e3)
     };
   }).filter(Boolean);
   const totalSize = fileSizes.reduce((total, current) => {
@@ -658,13 +695,14 @@ async function buildStaticFiles(config2, component, componentImport, builtCompon
     return total.replace(`/[${current}]`, "");
   }, path5.dirname(builtComponentPath)) : path5.dirname(builtComponentPath);
   if (typeof config2?.staticPaths === "boolean") {
+    const urlPath = filePathToURLPath(outputPath);
     try {
       const req = { params: {} };
       const data = config2?.data ? await config2.data(req) : null;
-      const staticComponentOutput = await componentFn({ data });
-      fs5.writeFileSync(
+      const staticComponentOutput = await componentFn({ data, path: urlPath });
+      fs6.writeFileSync(
         path5.join(outputPath, "./index.html"),
-        doctypeHTML + (config2?.wrapper ? await config2.wrapper({ req, children: staticComponentOutput, config: config2, data }) : staticComponentOutput) + staticComment
+        doctypeHTML + (config2?.wrapper ? await config2.wrapper({ req, children: staticComponentOutput, config: config2, data, path: urlPath }) : staticComponentOutput) + staticComment
       );
     } catch (err) {
       console.error(err);
@@ -679,13 +717,14 @@ async function buildStaticFiles(config2, component, componentImport, builtCompon
             ...componentDynamicPaths?.length ? dynamicPath : {}
           }
         };
-        const data = config2?.data ? await config2.data(req) : null;
-        const staticComponentOutput = await componentFn({ req, data });
         const updatedOutDir = path5.join(outputPath, `./${componentDynamicPaths.map((key) => dynamicPath[key]).join("/")}`);
-        fs5.ensureDirSync(updatedOutDir);
-        fs5.writeFileSync(
+        const urlPath = filePathToURLPath(updatedOutDir);
+        const data = config2?.data ? await config2.data(req) : null;
+        const staticComponentOutput = await componentFn({ req, data, path: urlPath });
+        fs6.ensureDirSync(updatedOutDir);
+        fs6.writeFileSync(
           path5.join(updatedOutDir, "./index.html"),
-          doctypeHTML + (config2?.wrapper ? await config2.wrapper({ req, children: staticComponentOutput, config: config2, data }) : staticComponentOutput) + staticComment
+          doctypeHTML + (config2?.wrapper ? await config2.wrapper({ req, children: staticComponentOutput, config: config2, data, path: urlPath }) : staticComponentOutput) + staticComment
         );
       } catch (err) {
         console.log("Could not build static component", component.path);
@@ -734,7 +773,7 @@ async function buildOnLoadFile(componentData, isDev2) {
     }
   `;
   const onLoadFilePath = path5.join(config.distDir, "./__xpineOnLoad.ts");
-  fs5.writeFileSync(onLoadFilePath, output);
+  fs6.writeFileSync(onLoadFilePath, output);
   await build({
     entryPoints: [onLoadFilePath],
     format: "esm",

package/dist/src/scripts/xpine-dev.js

@@ -3,13 +3,13 @@
 // src/runDevServer.ts
 import expressWs from "express-ws";
 import http from "http";
-import express from "express";
-import EventEmitter from "events";
+import express2 from "express";
+import EventEmitter2 from "events";
 import chokidar from "chokidar";
 
 // src/scripts/build.ts
 import path5 from "path";
-import fs5 from "fs-extra";
+import fs6 from "fs-extra";
 import { build } from "esbuild";
 
 // src/build/typescript-builder.ts
@@ -123,10 +123,12 @@ function createContext(value) {
     },
     runArrayQueue() {
       Object.keys(arrayQueue).forEach((key) => {
-        arrayQueue[key].sort((a, b) => {
-          return (a?.position ?? Infinity) - (b.position ?? Infinity);
-        });
-        for (const item of arrayQueue[key]) {
+        const dates = arrayQueue[key].filter((item) => item?.position instanceof Date);
+        const numbers = arrayQueue[key].filter((item) => typeof item?.position === "number" || !item?.position);
+        const sortedDates = dates.toSorted((a, b) => b?.position.getTime() - a?.position.getTime());
+        const sortedNumbers = numbers.toSorted((a, b) => (a?.position ?? Infinity) - (b.position ?? Infinity));
+        const output = sortedNumbers.concat(sortedDates);
+        for (const item of output) {
           this.set(key, item.value, []);
         }
       });
@@ -285,7 +287,7 @@ async function triggerXPineOnLoad(noCache = false) {
 }
 
 // src/scripts/build.ts
-import { globSync } from "glob";
+import { globSync as globSync2 } from "glob";
 import postcss from "postcss";
 import tailwindPostcss from "@tailwindcss/postcss";
 
@@ -326,7 +328,9 @@ var regex_default = {
   dynamicRoutes: /(\[)(.*?)(\])/g,
   isDynamicRoute: /\[(.*)\]/g,
   endsWithTSX: /\.tsx$/,
-  endsWithJSX: /\.jsx$/
+  endsWithJSX: /\.jsx$/,
+  endsWithFileName: /\.(html|tsx|jsx|js|ts)$/,
+  indexFile: /index\.(html|tsx|jsx|js|ts)$/g
 };
 
 // src/util/config-file.ts
@@ -449,8 +453,41 @@ var staticComment = "<!-- static -->";
 
 // src/scripts/build.ts
 import ts3 from "typescript";
+
+// src/express.ts
+import express from "express";
+import { globSync } from "glob";
+
+// src/auth.ts
+import jsonwebtoken from "jsonwebtoken";
+var { verify, sign } = jsonwebtoken;
+
+// src/express.ts
+import requestIP from "request-ip";
+import fs5 from "fs-extra";
+import EventEmitter from "events";
+var OnInitEmitter = class extends EventEmitter {
+};
+var onInitEmitter = new OnInitEmitter();
+onInitEmitter.on("triggerOnInit", async (paths) => {
+  for (const routePath of paths) {
+    const pathImport = await import(routePath.path + `?cache=${Date.now()}`);
+    if (pathImport?.config?.onInit) await pathImport.config.onInit();
+  }
+});
+function filePathToURLPath(pathName, isDist = true) {
+  const result = pathName.split(isDist ? config.distPagesDir : config.pagesDir).pop().replace(regex_default.indexFile, "").replace(regex_default.endsWithFileName, "");
+  if (result.endsWith("/")) {
+    const cleanedResult = result.slice(0, -1);
+    if (!cleanedResult) return "/";
+    return cleanedResult;
+  }
+  return result;
+}
+
+// src/scripts/build.ts
 var extensions = [".ts", ".tsx"];
-var packageJson = JSON.parse(fs5.readFileSync(config.packageJsonPath, "utf-8"));
+var packageJson = JSON.parse(fs6.readFileSync(config.packageJsonPath, "utf-8"));
 var allPackages = Object.keys(packageJson.devDependencies).concat(Object.keys(packageJson.dependencies));
 var xpineDistDir = getXPineDistDir();
 async function buildApp(args) {
@@ -458,12 +495,12 @@ async function buildApp(args) {
   const removePreviousBuild = args?.removePreviousBuild || false;
   const disableTailwind = args?.disableTailwind || false;
   try {
-    if (removePreviousBuild) fs5.removeSync(config.distDir);
-    const srcDirFiles = globSync(config.srcDir + "/**/*.{js,ts,tsx,jsx}");
+    if (removePreviousBuild) fs6.removeSync(config.distDir);
+    const srcDirFiles = globSync2(config.srcDir + "/**/*.{js,ts,tsx,jsx}");
     const { componentData, dataFiles } = await buildAppFiles(srcDirFiles, isDev);
     const alpineDataFile = await buildAlpineDataFile(componentData, dataFiles);
     await buildClientSideFiles([alpineDataFile], isDev);
-    fs5.removeSync(config.distTempFolder);
+    fs6.removeSync(config.distTempFolder);
     await buildCSS(disableTailwind);
     await buildPublicFolderSymlinks();
     await buildOnLoadFile(componentData, isDev);
@@ -483,7 +520,7 @@ async function buildAppFiles(files, isDev) {
     return fileName === "+config";
   });
   const backendFiles = files.filter((file) => extensions.find((ext) => file.endsWith(ext))).filter((file) => !file.startsWith(config.publicDir));
-  fs5.ensureDirSync(config.distDir);
+  fs6.ensureDirSync(config.distDir);
   await build({
     entryPoints: backendFiles,
     format: "esm",
@@ -508,9 +545,9 @@ async function buildAppFiles(files, isDev) {
 }
 async function buildClientSideFiles(alpineDataFiles = [], isDev) {
   const tempFilePath = path5.join(config.distTempFolder, "./app.ts");
-  fs5.ensureFileSync(tempFilePath);
+  fs6.ensureFileSync(tempFilePath);
   const pagesScriptsGlob = config.publicDir + "/scripts/pages/**/*.{js,ts}";
-  const clientFiles = globSync(
+  const clientFiles = globSync2(
     config.publicDir + "/**/*.{js,ts}",
     {
       ignore: pagesScriptsGlob
@@ -526,7 +563,7 @@ async function buildClientSideFiles(alpineDataFiles = [], isDev) {
     minify: !isDev,
     sourcemap: isDev ? "inline" : false
   });
-  const pagesFiles = globSync(pagesScriptsGlob);
+  const pagesFiles = globSync2(pagesScriptsGlob);
   await build({
     entryPoints: pagesFiles || [],
     bundle: true,
@@ -538,13 +575,13 @@ async function buildClientSideFiles(alpineDataFiles = [], isDev) {
 }
 function writeDevServerClientSideCode(tempFilePath) {
   const devServerPath = path5.join(xpineDistDir, "./src/static/dev-server.js");
-  const content = fs5.readFileSync(devServerPath, "utf-8");
-  fs5.appendFileSync(tempFilePath, "\n" + content);
+  const content = fs6.readFileSync(devServerPath, "utf-8");
+  fs6.appendFileSync(tempFilePath, "\n" + content);
 }
 function writeSpaClientSideCode(tempFilePath) {
   const spaPath = path5.join(xpineDistDir, "./src/static/spa.js");
-  const content = fs5.readFileSync(spaPath, "utf-8");
-  fs5.appendFileSync(tempFilePath, "\n" + content);
+  const content = fs6.readFileSync(spaPath, "utf-8");
+  fs6.appendFileSync(tempFilePath, "\n" + content);
 }
 async function buildAlpineDataFile(componentData, dataFiles) {
   const output = {
@@ -590,23 +627,23 @@ async function buildAlpineDataFile(componentData, dataFiles) {
     output.code.push(`Alpine.data('${dataFunction.name}', ${dataFunction.name});`);
   }
   const result = output.imports.join("\n") + "\n" + output.code.join("\n") + "\n" + output.end.join("\n");
-  fs5.ensureFileSync(config.alpineDataPath);
-  fs5.writeFileSync(config.alpineDataPath, result);
+  fs6.ensureFileSync(config.alpineDataPath);
+  fs6.writeFileSync(config.alpineDataPath, result);
   return config.alpineDataPath;
 }
 async function buildCSS(disableTailwind) {
-  const cssFiles = globSync(config.srcDir + "/**/*.css");
+  const cssFiles = globSync2(config.srcDir + "/**/*.css");
   for (const file of cssFiles) {
-    const fileContents = fs5.readFileSync(file, "utf-8");
+    const fileContents = fs6.readFileSync(file, "utf-8");
     const result = disableTailwind ? fileContents : await postcss([tailwindPostcss(), remove_layers_default()]).process(fileContents, { from: file });
     const newPath = file.replace(config.srcDir, config.distDir);
-    fs5.ensureFileSync(newPath);
-    fs5.writeFileSync(newPath, result.css);
+    fs6.ensureFileSync(newPath);
+    fs6.writeFileSync(newPath, result.css);
   }
   logSize(config.distPublicDir, "css");
 }
 async function buildPublicFolderSymlinks() {
-  const files = globSync(config.publicDir + "/**/*.*", {
+  const files = globSync2(config.publicDir + "/**/*.*", {
     ignore: "/**/*.{css,js,ts,tsx,jsx}"
   });
   for (const file of files) {
@@ -615,19 +652,19 @@ async function buildPublicFolderSymlinks() {
       const splitNewPath = newPath.split("/");
       splitNewPath.pop();
       const newDir = splitNewPath.join("/");
-      fs5.ensureDirSync(newDir);
-      fs5.symlinkSync(file, newPath);
+      fs6.ensureDirSync(newDir);
+      fs6.symlinkSync(file, newPath);
     } catch {
     }
   }
 }
 async function logSize(pathName, type, validExtensions = [".js", ".css"]) {
-  const files = globSync(pathName + "/**/*" + (type === "css" ? ".css" : ""));
+  const files = globSync2(pathName + "/**/*" + (type === "css" ? ".css" : ""));
   const fileSizes = files.map((file) => {
     if (!validExtensions.find((ext) => file.endsWith(ext))) return false;
     return {
       file,
-      size: fs5.statSync(file).size / (1024 * 1e3)
+      size: fs6.statSync(file).size / (1024 * 1e3)
     };
   }).filter(Boolean);
   const totalSize = fileSizes.reduce((total, current) => {
@@ -665,13 +702,14 @@ async function buildStaticFiles(config2, component, componentImport, builtCompon
     return total.replace(`/[${current}]`, "");
   }, path5.dirname(builtComponentPath)) : path5.dirname(builtComponentPath);
   if (typeof config2?.staticPaths === "boolean") {
+    const urlPath = filePathToURLPath(outputPath);
     try {
       const req = { params: {} };
       const data = config2?.data ? await config2.data(req) : null;
-      const staticComponentOutput = await componentFn({ data });
-      fs5.writeFileSync(
+      const staticComponentOutput = await componentFn({ data, path: urlPath });
+      fs6.writeFileSync(
         path5.join(outputPath, "./index.html"),
-        doctypeHTML + (config2?.wrapper ? await config2.wrapper({ req, children: staticComponentOutput, config: config2, data }) : staticComponentOutput) + staticComment
+        doctypeHTML + (config2?.wrapper ? await config2.wrapper({ req, children: staticComponentOutput, config: config2, data, path: urlPath }) : staticComponentOutput) + staticComment
       );
     } catch (err) {
       console.error(err);
@@ -686,13 +724,14 @@ async function buildStaticFiles(config2, component, componentImport, builtCompon
             ...componentDynamicPaths?.length ? dynamicPath : {}
           }
         };
-        const data = config2?.data ? await config2.data(req) : null;
-        const staticComponentOutput = await componentFn({ req, data });
         const updatedOutDir = path5.join(outputPath, `./${componentDynamicPaths.map((key) => dynamicPath[key]).join("/")}`);
-        fs5.ensureDirSync(updatedOutDir);
-        fs5.writeFileSync(
+        const urlPath = filePathToURLPath(updatedOutDir);
+        const data = config2?.data ? await config2.data(req) : null;
+        const staticComponentOutput = await componentFn({ req, data, path: urlPath });
+        fs6.ensureDirSync(updatedOutDir);
+        fs6.writeFileSync(
           path5.join(updatedOutDir, "./index.html"),
-          doctypeHTML + (config2?.wrapper ? await config2.wrapper({ req, children: staticComponentOutput, config: config2, data }) : staticComponentOutput) + staticComment
+          doctypeHTML + (config2?.wrapper ? await config2.wrapper({ req, children: staticComponentOutput, config: config2, data, path: urlPath }) : staticComponentOutput) + staticComment
         );
       } catch (err) {
         console.log("Could not build static component", component.path);
@@ -741,7 +780,7 @@ async function buildOnLoadFile(componentData, isDev) {
     }
   `;
   const onLoadFilePath = path5.join(config.distDir, "./__xpineOnLoad.ts");
-  fs5.writeFileSync(onLoadFilePath, output);
+  fs6.writeFileSync(onLoadFilePath, output);
   await build({
     entryPoints: [onLoadFilePath],
     format: "esm",
@@ -823,10 +862,10 @@ async function runDevServer() {
     const startServer2 = (await import(config.serverDistAppPath + `?cache=${Date.now()}`)).default;
     appServer = await startServer2();
   }
-  const wsApp = express();
+  const wsApp = express2();
   const wsServer = http.createServer(wsApp);
   expressWs(wsApp, wsServer);
-  class RefreshEmitter extends EventEmitter {
+  class RefreshEmitter extends EventEmitter2 {
   }
   ;
   const refreshEmitter = new RefreshEmitter();
@@ -849,7 +888,7 @@ function asyncServerClose(server) {
   });
 }
 function createRebuildEmitter(delay = 500) {
-  class RebuildEmitter extends EventEmitter {
+  class RebuildEmitter extends EventEmitter2 {
   }
   ;
   const rebuildEmitter = new RebuildEmitter();

package/dist/src/util/regex.d.ts

@@ -6,6 +6,8 @@ declare const _default: {
     isDynamicRoute: RegExp;
     endsWithTSX: RegExp;
     endsWithJSX: RegExp;
+    endsWithFileName: RegExp;
+    indexFile: RegExp;
 };
 export default _default;
 //# sourceMappingURL=regex.d.ts.map

package/dist/src/util/regex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"regex.d.ts","sourceRoot":"","sources":["../../../src/util/regex.ts"],"names":[],"mappings":";;;;;;;;;AAAA,wBAQE"}
+{"version":3,"file":"regex.d.ts","sourceRoot":"","sources":["../../../src/util/regex.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,wBAUE"}

package/dist/types.d.ts

@@ -16,6 +16,7 @@ export type WrapperProps = {
     children: any;
     config: ConfigFile;
     data?: any;
+    path?: string;
 };
 export type ConfigFile = {
     staticPaths?: boolean | (() => Promise<{
@@ -28,6 +29,7 @@ export type PageProps = {
     req: ServerRequest;
     res: Response;
     data: any;
+    path: string;
 };
 export type FileItem = {
     file: string;

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,MAAM,MAAM,WAAW,GAAG;IACxB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG;IACpC,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,EAAE,aAAa,CAAC;IACnB,QAAQ,EAAE,GAAG,CAAC;IACd,MAAM,EAAE,UAAU,CAAC;IACnB,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ,CAAA;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,WAAW,CAAC,EAAE,OAAO,GAAG,CAAC,MAAM,OAAO,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,CAAC,CAAC,CAAC;IACrE,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAChD,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;CAC7C,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,GAAG,EAAE,aAAa,CAAC;IACnB,GAAG,EAAE,QAAQ,CAAC;IACd,IAAI,EAAE,GAAG,CAAC;CACX,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC;CACvB,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,MAAM,MAAM,WAAW,GAAG;IACxB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG;IACpC,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,EAAE,aAAa,CAAC;IACnB,QAAQ,EAAE,GAAG,CAAC;IACd,MAAM,EAAE,UAAU,CAAC;IACnB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAA;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,WAAW,CAAC,EAAE,OAAO,GAAG,CAAC,MAAM,OAAO,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,CAAC,CAAC,CAAC;IACrE,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAChD,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;CAC7C,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,GAAG,EAAE,aAAa,CAAC;IACnB,GAAG,EAAE,QAAQ,CAAC;IACd,IAAI,EAAE,GAAG,CAAC;IACV,IAAI,EAAE,MAAM,CAAC;CACd,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC;CACvB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xpine",
-  "version": "0.0.29",
+  "version": "0.0.31",
   "main": "dist/index.js",
   "dependencies": {
     "@aws-sdk/client-secrets-manager": "^3.758.0",

package/test-results/.last-run.json

@@ -0,0 +1,4 @@
+{
+  "status": "failed",
+  "failedTests": []
+}

package/types.ts

@@ -20,6 +20,7 @@ export type WrapperProps = {
   children: any;
   config: ConfigFile;
   data?: any;
+  path?: string;
 }
 
 export type ConfigFile = {
@@ -32,6 +33,7 @@ export type PageProps = {
   req: ServerRequest;
   res: Response;
   data: any;
+  path: string;
 }
 
 export type FileItem = {