arcanajs 2.1.5 → 2.1.6

package/framework/cli/index.js

@@ -1,12 +1,7 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const child_process_1 = require("child_process");
-const path_1 = __importDefault(require("path"));
-const webpack_1 = __importDefault(require("webpack"));
-const webpack_config_1 = require("./webpack.config");
+import { spawn } from "child_process";
+import path from "path";
+import webpack from "webpack";
+import { createClientConfig, createServerConfig } from "./webpack.config";
 const args = process.argv.slice(2);
 const command = args[0];
 if (!command) {
@@ -34,8 +29,8 @@ const startDevServer = () => {
     if (serverProcess) {
         serverProcess.kill();
     }
-    const serverPath = path_1.default.resolve(process.cwd(), "dist/server.js");
-    serverProcess = (0, child_process_1.spawn)("node", [serverPath], { stdio: "inherit" });
+    const serverPath = path.resolve(process.cwd(), "dist/server.js");
+    serverProcess = spawn("node", [serverPath], { stdio: "inherit" });
     serverProcess.on("close", (code) => {
         if (code !== 0 && code !== null) {
             console.error(`Dev server exited with code ${code}`);
@@ -57,11 +52,11 @@ const watchCompiler = (compiler, onBuildComplete) => {
 const build = async () => {
     process.env.NODE_ENV = "production";
     console.log("Building for production...");
-    const clientConfig = (0, webpack_config_1.createClientConfig)();
-    const serverConfig = (0, webpack_config_1.createServerConfig)();
+    const clientConfig = createClientConfig();
+    const serverConfig = createServerConfig();
     try {
-        await runCompiler((0, webpack_1.default)(clientConfig));
-        await runCompiler((0, webpack_1.default)(serverConfig));
+        await runCompiler(webpack(clientConfig));
+        await runCompiler(webpack(serverConfig));
         console.log("Build complete.");
     }
     catch (error) {
@@ -72,21 +67,21 @@ const build = async () => {
 const dev = async () => {
     process.env.NODE_ENV = "development";
     console.log("Starting development server...");
-    const clientConfig = (0, webpack_config_1.createClientConfig)();
-    const serverConfig = (0, webpack_config_1.createServerConfig)();
+    const clientConfig = createClientConfig();
+    const serverConfig = createServerConfig();
     // Watch client
-    watchCompiler((0, webpack_1.default)(clientConfig));
+    watchCompiler(webpack(clientConfig));
     // Watch server and restart on build
-    watchCompiler((0, webpack_1.default)(serverConfig), () => {
+    watchCompiler(webpack(serverConfig), () => {
         console.log("Server build complete. Restarting server...");
         startDevServer();
     });
 };
 const start = () => {
     process.env.NODE_ENV = "production";
-    const serverPath = path_1.default.resolve(process.cwd(), "dist/server.js");
+    const serverPath = path.resolve(process.cwd(), "dist/server.js");
     console.log(`Starting server at ${serverPath}...`);
-    const child = (0, child_process_1.spawn)("node", [serverPath], { stdio: "inherit" });
+    const child = spawn("node", [serverPath], { stdio: "inherit" });
     child.on("close", (code) => {
         process.exit(code || 0);
     });

package/framework/cli/webpack.config.js

@@ -1,47 +1,41 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createServerConfig = exports.createClientConfig = void 0;
-const clean_webpack_plugin_1 = require("clean-webpack-plugin");
-const html_webpack_plugin_1 = __importDefault(require("html-webpack-plugin"));
-const mini_css_extract_plugin_1 = __importDefault(require("mini-css-extract-plugin"));
-const path_1 = __importDefault(require("path"));
-const webpack_node_externals_1 = __importDefault(require("webpack-node-externals"));
+import { CleanWebpackPlugin } from "clean-webpack-plugin";
+import HtmlWebpackPlugin from "html-webpack-plugin";
+import MiniCssExtractPlugin from "mini-css-extract-plugin";
+import path from "path";
+import nodeExternals from "webpack-node-externals";
 const cwd = process.cwd();
 // Helper to resolve loaders from the framework's node_modules
 const resolveLoader = (loader) => require.resolve(loader);
-const fs_1 = __importDefault(require("fs"));
+import fs from "fs";
 // Helper to find entry file with supported extensions
 const findEntry = (searchPaths) => {
     const extensions = [".ts", ".tsx", ".js", ".jsx"];
     for (const basePath of searchPaths) {
         for (const ext of extensions) {
-            const fullPath = path_1.default.resolve(cwd, basePath + ext);
-            if (fs_1.default.existsSync(fullPath)) {
+            const fullPath = path.resolve(cwd, basePath + ext);
+            if (fs.existsSync(fullPath)) {
                 return fullPath;
             }
             // Also check for index files in directories
-            const indexPath = path_1.default.resolve(cwd, basePath, "index" + ext);
-            if (fs_1.default.existsSync(indexPath)) {
+            const indexPath = path.resolve(cwd, basePath, "index" + ext);
+            if (fs.existsSync(indexPath)) {
                 return indexPath;
             }
         }
     }
     // Fallback to example if not found (for internal framework dev) or throw error
     // For now, we'll try the example paths as a last resort before failing
-    const exampleClient = path_1.default.resolve(cwd, "src/example/client/index.tsx");
-    const exampleServer = path_1.default.resolve(cwd, "src/example/server/index.ts");
+    const exampleClient = path.resolve(cwd, "src/example/client/index.tsx");
+    const exampleServer = path.resolve(cwd, "src/example/server/index.ts");
     if (searchPaths.some((p) => p.includes("client")) &&
-        fs_1.default.existsSync(exampleClient))
+        fs.existsSync(exampleClient))
         return exampleClient;
     if (searchPaths.some((p) => p.includes("server")) &&
-        fs_1.default.existsSync(exampleServer))
+        fs.existsSync(exampleServer))
         return exampleServer;
     throw new Error(`Could not find entry point. Searched in: ${searchPaths.join(", ")}`);
 };
-const createClientConfig = () => {
+export const createClientConfig = () => {
     const isProduction = process.env.NODE_ENV === "production";
     const clientEntry = findEntry([
         "src/client",
@@ -56,7 +50,7 @@ const createClientConfig = () => {
             client: clientEntry,
         },
         output: {
-            path: path_1.default.resolve(cwd, "dist/public"),
+            path: path.resolve(cwd, "dist/public"),
             filename: isProduction
                 ? "[name].[contenthash].bundle.js"
                 : "[name].bundle.js",
@@ -67,7 +61,7 @@ const createClientConfig = () => {
             extensions: [".ts", ".tsx", ".js", ".jsx"],
         },
         resolveLoader: {
-            modules: ["node_modules", path_1.default.resolve(__dirname, "../../node_modules")],
+            modules: ["node_modules", path.resolve(__dirname, "../../node_modules")],
         },
         module: {
             rules: [
@@ -92,7 +86,7 @@ const createClientConfig = () => {
                     test: /\.css$/,
                     use: [
                         isProduction
-                            ? mini_css_extract_plugin_1.default.loader
+                            ? MiniCssExtractPlugin.loader
                             : resolveLoader("style-loader"),
                         resolveLoader("css-loader"),
                         resolveLoader("postcss-loader"),
@@ -105,9 +99,9 @@ const createClientConfig = () => {
             ],
         },
         plugins: [
-            new clean_webpack_plugin_1.CleanWebpackPlugin(),
-            new html_webpack_plugin_1.default({
-                template: path_1.default.resolve(__dirname, "../lib/server/default-index.html"),
+            new CleanWebpackPlugin(),
+            new HtmlWebpackPlugin({
+                template: path.resolve(__dirname, "../lib/server/default-index.html"),
                 filename: "index.html",
                 inject: "body",
                 minify: isProduction
@@ -125,7 +119,7 @@ const createClientConfig = () => {
                     }
                     : false,
             }),
-            new mini_css_extract_plugin_1.default({
+            new MiniCssExtractPlugin({
                 filename: isProduction ? "[name].[contenthash].css" : "[name].css",
             }),
         ],
@@ -144,8 +138,7 @@ const createClientConfig = () => {
         devtool: isProduction ? "source-map" : "eval-source-map",
     };
 };
-exports.createClientConfig = createClientConfig;
-const createServerConfig = () => {
+export const createServerConfig = () => {
     const isProduction = process.env.NODE_ENV === "production";
     const serverEntry = findEntry([
         "src/server",
@@ -153,29 +146,29 @@ const createServerConfig = () => {
         "src/server/main",
     ]);
     // View Injection Logic
-    const viewsDir = path_1.default.resolve(cwd, "src/views");
-    const hasViews = fs_1.default.existsSync(viewsDir);
-    const viewsLoaderPath = path_1.default.resolve(__dirname, "../../node_modules/.cache/arcanajs/views-loader.js");
+    const viewsDir = path.resolve(cwd, "src/views");
+    const hasViews = fs.existsSync(viewsDir);
+    const viewsLoaderPath = path.resolve(__dirname, "../../node_modules/.cache/arcanajs/views-loader.js");
     // Ensure cache directory exists
-    const cacheDir = path_1.default.dirname(viewsLoaderPath);
-    if (!fs_1.default.existsSync(cacheDir)) {
-        fs_1.default.mkdirSync(cacheDir, { recursive: true });
+    const cacheDir = path.dirname(viewsLoaderPath);
+    if (!fs.existsSync(cacheDir)) {
+        fs.mkdirSync(cacheDir, { recursive: true });
     }
     // Generate the loader file
     const loaderContent = hasViews
         ? `module.exports = require.context('${viewsDir}', true, /\\.(tsx|jsx)$/);`
         : `module.exports = null;`;
-    fs_1.default.writeFileSync(viewsLoaderPath, loaderContent);
+    fs.writeFileSync(viewsLoaderPath, loaderContent);
     return {
         mode: isProduction ? "production" : "development",
         target: "node",
         entry: serverEntry,
         output: {
-            path: path_1.default.resolve(cwd, "dist"),
+            path: path.resolve(cwd, "dist"),
             filename: "server.js",
         },
         externals: [
-            (0, webpack_node_externals_1.default)({
+            nodeExternals({
                 allowlist: [/^arcanajs/],
             }),
         ],
@@ -186,7 +179,7 @@ const createServerConfig = () => {
             },
         },
         resolveLoader: {
-            modules: ["node_modules", path_1.default.resolve(__dirname, "../../node_modules")],
+            modules: ["node_modules", path.resolve(__dirname, "../../node_modules")],
         },
         module: {
             rules: [
@@ -223,4 +216,3 @@ const createServerConfig = () => {
         // devtool: isProduction ? "source-map" : "eval-source-map",
     };
 };
-exports.createServerConfig = createServerConfig;

package/framework/lib/client/index.js

@@ -1,11 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.hydrateArcanaJS = void 0;
-const jsx_runtime_1 = require("react/jsx-runtime");
-const client_1 = require("react-dom/client");
-const HeadContext_1 = require("../shared/context/HeadContext");
-const ArcanaJSApp_1 = require("../shared/core/ArcanaJSApp");
-const hydrateArcanaJS = (viewsOrContext, layout) => {
+import { jsx as _jsx } from "react/jsx-runtime";
+import { hydrateRoot } from "react-dom/client";
+import { HeadContext } from "../shared/context/HeadContext";
+import { ArcanaJSApp } from "../shared/core/ArcanaJSApp";
+export const hydrateArcanaJS = (viewsOrContext, layout) => {
     let views = {};
     if (viewsOrContext.keys && typeof viewsOrContext.keys === "function") {
         viewsOrContext.keys().forEach((key) => {
@@ -26,11 +23,10 @@ const hydrateArcanaJS = (viewsOrContext, layout) => {
     if (container && dataScript) {
         try {
             const { page, data, params, csrfToken } = JSON.parse(dataScript.textContent || "{}");
-            (0, client_1.hydrateRoot)(container, (0, jsx_runtime_1.jsx)(HeadContext_1.HeadContext.Provider, { value: headManager, children: (0, jsx_runtime_1.jsx)(ArcanaJSApp_1.ArcanaJSApp, { initialPage: page, initialData: data, initialParams: params, csrfToken: csrfToken, views: views, layout: layout }) }));
+            hydrateRoot(container, _jsx(HeadContext.Provider, { value: headManager, children: _jsx(ArcanaJSApp, { initialPage: page, initialData: data, initialParams: params, csrfToken: csrfToken, views: views, layout: layout }) }));
         }
         catch (e) {
             console.error("Failed to parse initial data", e);
         }
     }
 };
-exports.hydrateArcanaJS = hydrateArcanaJS;

package/framework/lib/index.js

@@ -1,33 +1,17 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./client"), exports);
-__exportStar(require("./shared/components/Body"), exports);
-__exportStar(require("./shared/components/Head"), exports);
-__exportStar(require("./shared/components/Link"), exports);
-__exportStar(require("./shared/components/NavLink"), exports);
-__exportStar(require("./shared/components/Page"), exports);
-__exportStar(require("./shared/context/HeadContext"), exports);
-__exportStar(require("./shared/context/PageContext"), exports);
-__exportStar(require("./shared/context/RouterContext"), exports);
-__exportStar(require("./shared/core/ArcanaJSApp"), exports);
-__exportStar(require("./shared/hooks/useDynamicComponents"), exports);
-__exportStar(require("./shared/hooks/useHead"), exports);
-__exportStar(require("./shared/hooks/useLocation"), exports);
-__exportStar(require("./shared/hooks/usePage"), exports);
-__exportStar(require("./shared/hooks/useParams"), exports);
-__exportStar(require("./shared/hooks/useQuery"), exports);
-__exportStar(require("./shared/hooks/useRouter"), exports);
+export * from "./client";
+export * from "./shared/components/Body";
+export * from "./shared/components/Head";
+export * from "./shared/components/Link";
+export * from "./shared/components/NavLink";
+export * from "./shared/components/Page";
+export * from "./shared/context/HeadContext";
+export * from "./shared/context/PageContext";
+export * from "./shared/context/RouterContext";
+export * from "./shared/core/ArcanaJSApp";
+export * from "./shared/hooks/useDynamicComponents";
+export * from "./shared/hooks/useHead";
+export * from "./shared/hooks/useLocation";
+export * from "./shared/hooks/usePage";
+export * from "./shared/hooks/useParams";
+export * from "./shared/hooks/useQuery";
+export * from "./shared/hooks/useRouter";

package/framework/lib/server/ArcanaJSMiddleware.js

@@ -1,14 +1,8 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createArcanaJSMiddleware = void 0;
-const fs_1 = __importDefault(require("fs"));
-const react_1 = __importDefault(require("react"));
-const server_1 = require("react-dom/server");
-const HeadContext_1 = require("../shared/context/HeadContext");
-const ArcanaJSApp_1 = require("../shared/core/ArcanaJSApp");
+import fs from "fs";
+import React from "react";
+import { renderToString } from "react-dom/server";
+import { HeadContext } from "../shared/context/HeadContext";
+import { ArcanaJSApp } from "../shared/core/ArcanaJSApp";
 const DEFAULT_HTML_TEMPLATE = `<!DOCTYPE html>
 <html lang="en">
   <head>
@@ -25,15 +19,15 @@ const DEFAULT_HTML_TEMPLATE = `<!DOCTYPE html>
 const safeStringify = (obj) => {
     return JSON.stringify(obj).replace(/</g, "\\u003c");
 };
-const createArcanaJSMiddleware = (options) => {
+export const createArcanaJSMiddleware = (options) => {
     const { views, indexFile, layout } = options;
     let cachedIndexHtml = null;
     const getIndexHtml = (callback) => {
         if (process.env.NODE_ENV === "production" && cachedIndexHtml) {
             return callback(null, cachedIndexHtml);
         }
-        if (indexFile && fs_1.default.existsSync(indexFile)) {
-            fs_1.default.readFile(indexFile, "utf8", (err, htmlData) => {
+        if (indexFile && fs.existsSync(indexFile)) {
+            fs.readFile(indexFile, "utf8", (err, htmlData) => {
                 if (!err && process.env.NODE_ENV === "production") {
                     cachedIndexHtml = htmlData;
                 }
@@ -59,7 +53,7 @@ const createArcanaJSMiddleware = (options) => {
                     tags: headTags,
                     push: (nodes) => headTags.push(nodes),
                 };
-                const appHtml = (0, server_1.renderToString)(react_1.default.createElement(HeadContext_1.HeadContext.Provider, { value: headManager }, react_1.default.createElement(ArcanaJSApp_1.ArcanaJSApp, {
+                const appHtml = renderToString(React.createElement(HeadContext.Provider, { value: headManager }, React.createElement(ArcanaJSApp, {
                     initialPage: page,
                     initialData: data,
                     initialParams: params,
@@ -68,7 +62,7 @@ const createArcanaJSMiddleware = (options) => {
                     views: views,
                     layout: layout,
                 })));
-                const headHtml = (0, server_1.renderToString)(react_1.default.createElement(react_1.default.Fragment, null, ...headTags));
+                const headHtml = renderToString(React.createElement(React.Fragment, null, ...headTags));
                 getIndexHtml((err, htmlData) => {
                     if (err) {
                         console.error("Error reading index.html", err);
@@ -96,4 +90,3 @@ const createArcanaJSMiddleware = (options) => {
         next();
     };
 };
-exports.createArcanaJSMiddleware = createArcanaJSMiddleware;

package/framework/lib/server/ArcanaJSServer.js

@@ -1,23 +1,17 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ArcanaJSServer = void 0;
-const compression_1 = __importDefault(require("compression"));
-const cookie_parser_1 = __importDefault(require("cookie-parser"));
-const express_1 = __importDefault(require("express"));
-const fs_1 = __importDefault(require("fs"));
-const helmet_1 = __importDefault(require("helmet"));
-const path_1 = __importDefault(require("path"));
-const ArcanaJSMiddleware_1 = require("./ArcanaJSMiddleware");
-const CsrfMiddleware_1 = require("./CsrfMiddleware");
-const DynamicRouter_1 = require("./DynamicRouter");
-const ResponseHandlerMiddleware_1 = require("./ResponseHandlerMiddleware");
-class ArcanaJSServer {
+import compression from "compression";
+import cookieParser from "cookie-parser";
+import express from "express";
+import fs from "fs";
+import helmet from "helmet";
+import path from "path";
+import { createArcanaJSMiddleware } from "./ArcanaJSMiddleware";
+import { createCsrfMiddleware } from "./CsrfMiddleware";
+import { createDynamicRouter } from "./DynamicRouter";
+import { responseHandler } from "./ResponseHandlerMiddleware";
+export class ArcanaJSServer {
     constructor(config) {
         this.config = config;
-        this.app = (0, express_1.default)();
+        this.app = express();
         this.initialize();
     }
     initialize() {
@@ -52,26 +46,26 @@ class ArcanaJSServer {
             views = {};
         }
         // Security and Performance
-        this.app.use((0, helmet_1.default)({
+        this.app.use(helmet({
             contentSecurityPolicy: false,
         }));
-        this.app.use((0, compression_1.default)());
-        this.app.use((0, cookie_parser_1.default)());
-        this.app.use((0, CsrfMiddleware_1.createCsrfMiddleware)());
-        this.app.use(ResponseHandlerMiddleware_1.responseHandler);
+        this.app.use(compression());
+        this.app.use(cookieParser());
+        this.app.use(createCsrfMiddleware());
+        this.app.use(responseHandler);
         // Static files
-        this.app.use(express_1.default.static(path_1.default.resolve(process.cwd(), distDir), {
+        this.app.use(express.static(path.resolve(process.cwd(), distDir), {
             index: false,
             maxAge: "1y",
         }));
-        this.app.use(express_1.default.static(path_1.default.resolve(process.cwd(), staticDir), {
+        this.app.use(express.static(path.resolve(process.cwd(), staticDir), {
             index: false,
             maxAge: "1d",
         }));
         // ArcanaJS Middleware
-        this.app.use((0, ArcanaJSMiddleware_1.createArcanaJSMiddleware)({
+        this.app.use(createArcanaJSMiddleware({
             views,
-            indexFile: path_1.default.resolve(process.cwd(), indexFile),
+            indexFile: path.resolve(process.cwd(), indexFile),
             layout,
         }));
         // Custom Routes
@@ -84,7 +78,7 @@ class ArcanaJSServer {
             }
         }
         // Dynamic Router
-        this.app.use((0, DynamicRouter_1.createDynamicRouter)(views));
+        this.app.use(createDynamicRouter(views));
         // 404 Fallback
         this.app.use((req, res) => {
             res.status(404).renderPage("NotFoundPage");
@@ -101,20 +95,20 @@ class ArcanaJSServer {
     discoverViews() {
         const views = {};
         const viewsDir = this.config.viewsDir
-            ? path_1.default.resolve(process.cwd(), this.config.viewsDir)
-            : path_1.default.resolve(process.cwd(), "src/views");
+            ? path.resolve(process.cwd(), this.config.viewsDir)
+            : path.resolve(process.cwd(), "src/views");
         const traverse = (dir) => {
-            if (!fs_1.default.existsSync(dir))
+            if (!fs.existsSync(dir))
                 return;
-            const files = fs_1.default.readdirSync(dir);
+            const files = fs.readdirSync(dir);
             files.forEach((file) => {
-                const fullPath = path_1.default.join(dir, file);
-                const stat = fs_1.default.statSync(fullPath);
+                const fullPath = path.join(dir, file);
+                const stat = fs.statSync(fullPath);
                 if (stat.isDirectory()) {
                     traverse(fullPath);
                 }
                 else if (file.endsWith(".tsx") || file.endsWith(".jsx")) {
-                    const relativePath = path_1.default.relative(viewsDir, fullPath);
+                    const relativePath = path.relative(viewsDir, fullPath);
                     const viewName = relativePath.replace(/\.(tsx|jsx)$/, "");
                     try {
                         // Use __non_webpack_require__ if available to avoid Webpack bundling issues
@@ -151,4 +145,3 @@ class ArcanaJSServer {
         });
     }
 }
-exports.ArcanaJSServer = ArcanaJSServer;

package/framework/lib/server/ControllerBinder.js

@@ -1,6 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class ControllerBinder {
+export default class ControllerBinder {
     static handle(controller, method) {
         // Instantiate the controller once (Singleton pattern) for performance
         // This assumes controllers are stateless, which is best practice.
@@ -29,4 +27,3 @@ class ControllerBinder {
         };
     }
 }
-exports.default = ControllerBinder;

package/framework/lib/server/CsrfMiddleware.js

@@ -1,17 +1,11 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createCsrfMiddleware = void 0;
-const crypto_1 = __importDefault(require("crypto"));
+import crypto from "crypto";
 const CSRF_COOKIE_NAME = "_csrf";
-const createCsrfMiddleware = () => {
+export const createCsrfMiddleware = () => {
     return (req, res, next) => {
         // 1. Generate or retrieve token
         let token = req.cookies[CSRF_COOKIE_NAME];
         if (!token) {
-            token = crypto_1.default.randomBytes(32).toString("hex");
+            token = crypto.randomBytes(32).toString("hex");
             res.cookie(CSRF_COOKIE_NAME, token, {
                 httpOnly: true,
                 secure: process.env.NODE_ENV === "production",
@@ -31,4 +25,3 @@ const createCsrfMiddleware = () => {
         next();
     };
 };
-exports.createCsrfMiddleware = createCsrfMiddleware;

package/framework/lib/server/DynamicRouter.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDynamicRouter = void 0;
-const createDynamicRouter = (views) => {
+export const createDynamicRouter = (views) => {
     return (req, res, next) => {
         // Remove leading slash
         let path = req.path.substring(1);
@@ -47,4 +44,3 @@ const createDynamicRouter = (views) => {
         next();
     };
 };
-exports.createDynamicRouter = createDynamicRouter;

package/framework/lib/server/ResponseHandlerMiddleware.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.responseHandler = void 0;
-const responseHandler = (req, res, next) => {
+export const responseHandler = (req, res, next) => {
     res.success = (data = {}, message = "Success", status = 200) => {
         return res.status(status).json({
             success: true,
@@ -27,4 +24,3 @@ const responseHandler = (req, res, next) => {
     };
     next();
 };
-exports.responseHandler = responseHandler;

package/framework/lib/server/Router.js

@@ -1,17 +1,11 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Route = exports.Router = void 0;
-const express_1 = __importDefault(require("express"));
-const ControllerBinder_1 = __importDefault(require("./ControllerBinder"));
+import express from "express";
+import ControllerBinder from "./ControllerBinder";
 /**
  * Provides Routing syntax for defining routes with prefixes, middlewares, and groups
  */
-class Router {
+export class Router {
     constructor() {
-        this.router = express_1.default.Router();
+        this.router = express.Router();
         this.middlewareStack = [];
         this.prefixStack = [];
     }
@@ -148,16 +142,15 @@ class Router {
         }
         if (Array.isArray(action) && action.length === 2) {
             const [controller, method] = action;
-            return ControllerBinder_1.default.handle(controller, method);
+            return ControllerBinder.handle(controller, method);
         }
         throw new Error('Action must be a function or array [Controller, "method"]');
     }
 }
-exports.Router = Router;
 /**
  * Static Route class for Laravel-like syntax
  */
-class Route {
+export class Route {
     static create() {
         return Router.create();
     }
@@ -198,6 +191,5 @@ class Route {
         this._router = new Router();
     }
 }
-exports.Route = Route;
 Route._router = new Router();
-exports.default = Route;
+export default Route;

package/framework/lib/server.js

@@ -1,28 +1,6 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Route = exports.ControllerBinder = void 0;
-__exportStar(require("./server/ArcanaJSMiddleware"), exports);
-__exportStar(require("./server/ArcanaJSServer"), exports);
-var ControllerBinder_1 = require("./server/ControllerBinder");
-Object.defineProperty(exports, "ControllerBinder", { enumerable: true, get: function () { return __importDefault(ControllerBinder_1).default; } });
-__exportStar(require("./server/DynamicRouter"), exports);
-__exportStar(require("./server/Router"), exports);
-var Router_1 = require("./server/Router");
-Object.defineProperty(exports, "Route", { enumerable: true, get: function () { return __importDefault(Router_1).default; } });
+export * from "./server/ArcanaJSMiddleware";
+export * from "./server/ArcanaJSServer";
+export { default as ControllerBinder } from "./server/ControllerBinder";
+export * from "./server/DynamicRouter";
+export * from "./server/Router";
+export { default as Route } from "./server/Router";

package/framework/lib/shared/components/Body.js

@@ -1,8 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Body = void 0;
-const jsx_runtime_1 = require("react/jsx-runtime");
-const Body = ({ children }) => {
-    return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: children });
+import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
+export const Body = ({ children }) => {
+    return _jsx(_Fragment, { children: children });
 };
-exports.Body = Body;

package/framework/lib/shared/components/Head.js

@@ -1,58 +1,22 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Head = void 0;
-const react_1 = __importStar(require("react"));
-const useHead_1 = require("../hooks/useHead");
-const Head = ({ children }) => {
-    const headManager = (0, useHead_1.useHead)();
+import React, { useEffect } from "react";
+import { useHead } from "../hooks/useHead";
+export const Head = ({ children }) => {
+    const headManager = useHead();
     // Server-side: Push tags to context
     if (typeof window === "undefined" && headManager) {
-        react_1.default.Children.forEach(children, (child) => {
-            if (react_1.default.isValidElement(child)) {
-                headManager.push(react_1.default.cloneElement(child, {
+        React.Children.forEach(children, (child) => {
+            if (React.isValidElement(child)) {
+                headManager.push(React.cloneElement(child, {
                     "data-arcanajs-head": "true",
                 }));
             }
         });
     }
     // Client-side: Update DOM
-    (0, react_1.useEffect)(() => {
+    useEffect(() => {
         const managedElements = [];
-        react_1.default.Children.forEach(children, (child) => {
-            if (react_1.default.isValidElement(child)) {
+        React.Children.forEach(children, (child) => {
+            if (React.isValidElement(child)) {
                 const reactElement = child;
                 if (reactElement.type === "title") {
                     document.title = reactElement.props.children;
@@ -122,4 +86,3 @@ const Head = ({ children }) => {
     }, [children]);
     return null;
 };
-exports.Head = Head;

package/framework/lib/shared/components/Link.js

@@ -1,14 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Link = void 0;
-const jsx_runtime_1 = require("react/jsx-runtime");
-const useRouter_1 = require("../hooks/useRouter");
-const Link = ({ href, children, ...props }) => {
-    const { navigateTo } = (0, useRouter_1.useRouter)();
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useRouter } from "../hooks/useRouter";
+export const Link = ({ href, children, ...props }) => {
+    const { navigateTo } = useRouter();
     const handleClick = (e) => {
         e.preventDefault();
         navigateTo(href);
     };
-    return ((0, jsx_runtime_1.jsx)("a", { href: href, onClick: handleClick, ...props, children: children }));
+    return (_jsx("a", { href: href, onClick: handleClick, ...props, children: children }));
 };
-exports.Link = Link;

package/framework/lib/shared/components/NavLink.js

@@ -1,13 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NavLink = void 0;
-const jsx_runtime_1 = require("react/jsx-runtime");
-const Link_1 = require("./Link");
-const useRouter_1 = require("../hooks/useRouter");
-const NavLink = ({ href, activeClassName = "active", className = "", exact = false, children, ...props }) => {
-    const { currentUrl } = (0, useRouter_1.useRouter)();
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Link } from "./Link";
+import { useRouter } from "../hooks/useRouter";
+export const NavLink = ({ href, activeClassName = "active", className = "", exact = false, children, ...props }) => {
+    const { currentUrl } = useRouter();
     const isActive = exact ? currentUrl === href : currentUrl.startsWith(href);
     const combinedClassName = `${className} ${isActive ? activeClassName : ""}`.trim();
-    return ((0, jsx_runtime_1.jsx)(Link_1.Link, { href: href, className: combinedClassName, ...props, children: children }));
+    return (_jsx(Link, { href: href, className: combinedClassName, ...props, children: children }));
 };
-exports.NavLink = NavLink;

package/framework/lib/shared/components/Page.js

@@ -1,10 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Page = void 0;
-const jsx_runtime_1 = require("react/jsx-runtime");
-const PageContext_1 = require("../context/PageContext");
-const Head_1 = require("./Head");
-const Page = ({ data, title, children }) => {
-    return ((0, jsx_runtime_1.jsxs)(PageContext_1.PageContext.Provider, { value: data, children: [title && ((0, jsx_runtime_1.jsx)(Head_1.Head, { children: (0, jsx_runtime_1.jsx)("title", { children: title }) })), children] }));
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { PageContext } from "../context/PageContext";
+import { Head } from "./Head";
+export const Page = ({ data, title, children }) => {
+    return (_jsxs(PageContext.Provider, { value: data, children: [title && (_jsx(Head, { children: _jsx("title", { children: title }) })), children] }));
 };
-exports.Page = Page;

package/framework/lib/shared/context/HeadContext.js

@@ -1,5 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HeadContext = void 0;
-const createSingletonContext_1 = require("../utils/createSingletonContext");
-exports.HeadContext = (0, createSingletonContext_1.createSingletonContext)("HeadContext", null);
+import { createSingletonContext } from "../utils/createSingletonContext";
+export const HeadContext = createSingletonContext("HeadContext", null);

package/framework/lib/shared/context/PageContext.js

@@ -1,5 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PageContext = void 0;
-const createSingletonContext_1 = require("../utils/createSingletonContext");
-exports.PageContext = (0, createSingletonContext_1.createSingletonContext)("PageContext", null);
+import { createSingletonContext } from "../utils/createSingletonContext";
+export const PageContext = createSingletonContext("PageContext", null);

package/framework/lib/shared/context/RouterContext.js

@@ -1,10 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RouterProvider = exports.RouterContext = void 0;
-const jsx_runtime_1 = require("react/jsx-runtime");
-const createSingletonContext_1 = require("../utils/createSingletonContext");
-exports.RouterContext = (0, createSingletonContext_1.createSingletonContext)("RouterContext", null);
-const RouterProvider = ({ value, children }) => {
-    return ((0, jsx_runtime_1.jsx)(exports.RouterContext.Provider, { value: value, children: children }));
+import { jsx as _jsx } from "react/jsx-runtime";
+import { createSingletonContext } from "../utils/createSingletonContext";
+export const RouterContext = createSingletonContext("RouterContext", null);
+export const RouterProvider = ({ value, children }) => {
+    return (_jsx(RouterContext.Provider, { value: value, children: children }));
 };
-exports.RouterProvider = RouterProvider;

package/framework/lib/shared/core/ArcanaJSApp.js

@@ -1,17 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ArcanaJSApp = void 0;
-const jsx_runtime_1 = require("react/jsx-runtime");
-const react_1 = require("react");
-const Page_1 = require("../components/Page");
-const RouterContext_1 = require("../context/RouterContext");
-const ArcanaJSApp = ({ initialPage, initialData, initialParams = {}, initialUrl, csrfToken, views, layout: Layout, }) => {
-    const [page, setPage] = (0, react_1.useState)(initialPage);
-    const [data, setData] = (0, react_1.useState)(initialData);
-    const [params, setParams] = (0, react_1.useState)(initialParams);
-    const [url, setUrl] = (0, react_1.useState)(initialUrl ||
+import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import { useEffect, useState } from "react";
+import { Page } from "../components/Page";
+import { RouterProvider } from "../context/RouterContext";
+export const ArcanaJSApp = ({ initialPage, initialData, initialParams = {}, initialUrl, csrfToken, views, layout: Layout, }) => {
+    const [page, setPage] = useState(initialPage);
+    const [data, setData] = useState(initialData);
+    const [params, setParams] = useState(initialParams);
+    const [url, setUrl] = useState(initialUrl ||
         (typeof window !== "undefined" ? window.location.pathname : "/"));
-    (0, react_1.useEffect)(() => {
+    useEffect(() => {
         const handlePopState = (event) => {
             if (event.state) {
                 setPage(event.state.page);
@@ -50,16 +47,15 @@ const ArcanaJSApp = ({ initialPage, initialData, initialParams = {}, initialUrl,
         }
     };
     const renderPage = () => {
-        const Component = views[page] || views["NotFoundPage"] || (() => (0, jsx_runtime_1.jsx)("div", { children: "404 Not Found" }));
-        return ((0, jsx_runtime_1.jsx)(Page_1.Page, { data: data, children: (0, jsx_runtime_1.jsx)(Component, { data: data, navigateTo: navigateTo, params: params }) }));
+        const Component = views[page] || views["NotFoundPage"] || (() => _jsx("div", { children: "404 Not Found" }));
+        return (_jsx(Page, { data: data, children: _jsx(Component, { data: data, navigateTo: navigateTo, params: params }) }));
     };
     const content = renderPage();
-    return ((0, jsx_runtime_1.jsx)(RouterContext_1.RouterProvider, { value: {
+    return (_jsx(RouterProvider, { value: {
             navigateTo,
             currentPage: page,
             currentUrl: url,
             params,
             csrfToken,
-        }, children: Layout ? (0, jsx_runtime_1.jsx)(Layout, { children: content }) : (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: content }) }));
+        }, children: Layout ? _jsx(Layout, { children: content }) : _jsx(_Fragment, { children: content }) }));
 };
-exports.ArcanaJSApp = ArcanaJSApp;

package/framework/lib/shared/hooks/useDynamicComponents.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useDynamicComponents = void 0;
-const react_1 = require("react");
-const useDynamicComponents = (loader) => {
-    const [component, setComponent] = (0, react_1.useState)(null);
-    (0, react_1.useEffect)(() => {
+import { useState, useEffect } from "react";
+export const useDynamicComponents = (loader) => {
+    const [component, setComponent] = useState(null);
+    useEffect(() => {
         let mounted = true;
         loader().then((mod) => {
             if (mounted) {
@@ -17,4 +14,3 @@ const useDynamicComponents = (loader) => {
     }, []); // loader dependency omitted to avoid loops if loader is inline
     return component;
 };
-exports.useDynamicComponents = useDynamicComponents;

package/framework/lib/shared/hooks/useHead.d.ts

@@ -1 +1 @@
-export declare const useHead: () => import("../context/HeadContext").HeadManager | null;
+export declare const useHead: () => import("../..").HeadManager | null;

package/framework/lib/shared/hooks/useHead.js

@@ -1,7 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useHead = void 0;
-const react_1 = require("react");
-const HeadContext_1 = require("../context/HeadContext");
-const useHead = () => (0, react_1.useContext)(HeadContext_1.HeadContext);
-exports.useHead = useHead;
+import { useContext } from "react";
+import { HeadContext } from "../context/HeadContext";
+export const useHead = () => useContext(HeadContext);

package/framework/lib/shared/hooks/useLocation.js

@@ -1,13 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useLocation = void 0;
-const useRouter_1 = require("./useRouter");
-const useLocation = () => {
-    const { currentUrl } = (0, useRouter_1.useRouter)();
+import { useRouter } from "./useRouter";
+export const useLocation = () => {
+    const { currentUrl } = useRouter();
     return {
         pathname: currentUrl,
         search: typeof window !== "undefined" ? window.location.search : "",
         hash: typeof window !== "undefined" ? window.location.hash : "",
     };
 };
-exports.useLocation = useLocation;

package/framework/lib/shared/hooks/usePage.js

@@ -1,7 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.usePage = void 0;
-const react_1 = require("react");
-const PageContext_1 = require("../context/PageContext");
-const usePage = () => (0, react_1.useContext)(PageContext_1.PageContext);
-exports.usePage = usePage;
+import { useContext } from "react";
+import { PageContext } from "../context/PageContext";
+export const usePage = () => useContext(PageContext);

package/framework/lib/shared/hooks/useParams.js

@@ -1,13 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useParams = void 0;
-const react_1 = require("react");
-const RouterContext_1 = require("../context/RouterContext");
-const useParams = () => {
-    const context = (0, react_1.useContext)(RouterContext_1.RouterContext);
+import { useContext } from "react";
+import { RouterContext } from "../context/RouterContext";
+export const useParams = () => {
+    const context = useContext(RouterContext);
     if (!context) {
         throw new Error("useParams must be used within an ArcanaJSApp");
     }
     return context.params;
 };
-exports.useParams = useParams;

package/framework/lib/shared/hooks/useQuery.js

@@ -1,9 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useQuery = void 0;
-const useLocation_1 = require("./useLocation");
-const useQuery = () => {
-    const { search } = (0, useLocation_1.useLocation)();
+import { useLocation } from "./useLocation";
+export const useQuery = () => {
+    const { search } = useLocation();
     return new URLSearchParams(search);
 };
-exports.useQuery = useQuery;

package/framework/lib/shared/hooks/useRouter.d.ts

@@ -1 +1 @@
-export declare const useRouter: () => import("../context/RouterContext").RouterContextType;
+export declare const useRouter: () => import("../..").RouterContextType;

package/framework/lib/shared/hooks/useRouter.js

@@ -1,13 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useRouter = void 0;
-const react_1 = require("react");
-const RouterContext_1 = require("../context/RouterContext");
-const useRouter = () => {
-    const context = (0, react_1.useContext)(RouterContext_1.RouterContext);
+import { useContext } from "react";
+import { RouterContext } from "../context/RouterContext";
+export const useRouter = () => {
+    const context = useContext(RouterContext);
     if (!context) {
         throw new Error("useRouter must be used within an ArcanaJSApp");
     }
     return context;
 };
-exports.useRouter = useRouter;

package/framework/lib/shared/utils/createSingletonContext.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSingletonContext = createSingletonContext;
-const react_1 = require("react");
+import { createContext } from "react";
 /**
  * Creates a React Context that persists across multiple module loads (Webpack bundles vs Node require).
  * This is essential for SSR applications where the server bundle and dynamically loaded views
@@ -11,11 +8,11 @@ const react_1 = require("react");
  * @param defaultValue The default value for the context
  * @returns A React Context instance (singleton)
  */
-function createSingletonContext(key, defaultValue) {
+export function createSingletonContext(key, defaultValue) {
     const globalAny = global;
     const symbolKey = Symbol.for(`ARCANAJS_CONTEXT_${key}`);
     if (!globalAny[symbolKey]) {
-        globalAny[symbolKey] = (0, react_1.createContext)(defaultValue);
+        globalAny[symbolKey] = createContext(defaultValue);
     }
     return globalAny[symbolKey];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arcanajs",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "ArcanaJS Framework",
   "main": "framework/lib/index.js",
   "types": "framework/lib/index.d.ts",
@@ -16,7 +16,7 @@
     "bin"
   ],
   "scripts": {
-    "build": "tsc -p tsconfig.lib.json && cp src/lib/server/default-index.html framework/lib/server/ && cp src/lib/global.d.ts framework/lib/",
+    "build": "tsc -p tsconfig.json && cp src/lib/server/default-index.html framework/lib/server/ && cp src/lib/global.d.ts framework/lib/",
     "build:app": "node bin/arcanajs.js build",
     "dev:app": "node bin/arcanajs.js dev",
     "start:app": "node bin/arcanajs.js start",