arcanajs 2.1.0 → 2.1.1

package/package.json

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

package/framework/cli/index.d.ts

@@ -1 +0,0 @@
-export {};

package/framework/cli/index.js

@@ -1,107 +0,0 @@
-"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");
-const args = process.argv.slice(2);
-const command = args[0];
-if (!command) {
-    console.error("Please specify a command: dev, build, start");
-    process.exit(1);
-}
-const runCompiler = (compiler) => {
-    return new Promise((resolve, reject) => {
-        compiler.run((err, stats) => {
-            if (err) {
-                console.error(err);
-                return reject(err);
-            }
-            if (stats && stats.hasErrors()) {
-                console.error(stats.toString({ colors: true }));
-                return reject(new Error("Webpack build failed"));
-            }
-            console.log(stats?.toString({ colors: true }));
-            resolve();
-        });
-    });
-};
-let serverProcess = null;
-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" });
-    serverProcess.on("close", (code) => {
-        if (code !== 0 && code !== null) {
-            console.error(`Dev server exited with code ${code}`);
-        }
-    });
-};
-const watchCompiler = (compiler, onBuildComplete) => {
-    compiler.watch({}, (err, stats) => {
-        if (err) {
-            console.error(err);
-            return;
-        }
-        console.log(stats?.toString({ colors: true }));
-        if (stats && !stats.hasErrors() && onBuildComplete) {
-            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)();
-    try {
-        await runCompiler((0, webpack_1.default)(clientConfig));
-        await runCompiler((0, webpack_1.default)(serverConfig));
-        console.log("Build complete.");
-    }
-    catch (error) {
-        console.error("Build failed:", error);
-        process.exit(1);
-    }
-};
-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)();
-    // Watch client
-    watchCompiler((0, webpack_1.default)(clientConfig));
-    // Watch server and restart on build
-    watchCompiler((0, webpack_1.default)(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");
-    console.log(`Starting server at ${serverPath}...`);
-    const child = (0, child_process_1.spawn)("node", [serverPath], { stdio: "inherit" });
-    child.on("close", (code) => {
-        process.exit(code || 0);
-    });
-};
-switch (command) {
-    case "build":
-        build();
-        break;
-    case "dev":
-        dev();
-        break;
-    case "start":
-        start();
-        break;
-    default:
-        console.error(`Unknown command: ${command}`);
-        process.exit(1);
-}

package/framework/cli/webpack.config.d.ts

@@ -1,3 +0,0 @@
-import webpack from "webpack";
-export declare const createClientConfig: () => webpack.Configuration;
-export declare const createServerConfig: () => webpack.Configuration;

package/framework/cli/webpack.config.js

@@ -1,198 +0,0 @@
-"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"));
-const isProduction = process.env.NODE_ENV === "production";
-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"));
-// 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)) {
-                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)) {
-                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");
-    if (searchPaths.some((p) => p.includes("client")) &&
-        fs_1.default.existsSync(exampleClient))
-        return exampleClient;
-    if (searchPaths.some((p) => p.includes("server")) &&
-        fs_1.default.existsSync(exampleServer))
-        return exampleServer;
-    throw new Error(`Could not find entry point. Searched in: ${searchPaths.join(", ")}`);
-};
-const createClientConfig = () => {
-    const clientEntry = findEntry([
-        "src/client",
-        "src/client/index",
-        "src/index",
-        "src/main",
-    ]);
-    return {
-        mode: isProduction ? "production" : "development",
-        target: "web",
-        entry: {
-            client: clientEntry,
-        },
-        output: {
-            path: path_1.default.resolve(cwd, "dist/public"),
-            filename: isProduction
-                ? "[name].[contenthash].bundle.js"
-                : "[name].bundle.js",
-            publicPath: "/",
-            assetModuleFilename: "assets/[hash][ext][query]",
-        },
-        resolve: {
-            extensions: [".ts", ".tsx", ".js", ".jsx"],
-        },
-        resolveLoader: {
-            modules: ["node_modules", path_1.default.resolve(__dirname, "../../node_modules")],
-        },
-        module: {
-            rules: [
-                {
-                    test: /\.(ts|tsx|js|jsx)$/,
-                    exclude: /node_modules/,
-                    use: {
-                        loader: resolveLoader("babel-loader"),
-                        options: {
-                            presets: [
-                                resolveLoader("@babel/preset-env"),
-                                resolveLoader("@babel/preset-react"),
-                                resolveLoader("@babel/preset-typescript"),
-                            ],
-                        },
-                    },
-                },
-                {
-                    test: /\.css$/,
-                    use: [
-                        isProduction
-                            ? mini_css_extract_plugin_1.default.loader
-                            : resolveLoader("style-loader"),
-                        resolveLoader("css-loader"),
-                        resolveLoader("postcss-loader"),
-                    ],
-                },
-                {
-                    test: /\.(png|jpg|jpeg|gif|svg|woff|woff2|eot|ttf|otf)$/i,
-                    type: "asset/resource",
-                },
-            ],
-        },
-        plugins: [
-            new clean_webpack_plugin_1.CleanWebpackPlugin(),
-            new html_webpack_plugin_1.default({
-                template: path_1.default.resolve(cwd, "src/lib/server/default-index.html"),
-                filename: "index.html",
-                inject: "body",
-                minify: isProduction
-                    ? {
-                        removeComments: false,
-                        collapseWhitespace: true,
-                        removeRedundantAttributes: true,
-                        useShortDoctype: true,
-                        removeEmptyAttributes: true,
-                        removeStyleLinkTypeAttributes: true,
-                        keepClosingSlash: true,
-                        minifyJS: true,
-                        minifyCSS: true,
-                        minifyURLs: true,
-                    }
-                    : false,
-            }),
-            new mini_css_extract_plugin_1.default({
-                filename: isProduction ? "[name].[contenthash].css" : "[name].css",
-            }),
-        ],
-        optimization: {
-            splitChunks: {
-                chunks: "all",
-                cacheGroups: {
-                    vendor: {
-                        test: /[\\/]node_modules[\\/]/,
-                        name: "vendors",
-                        chunks: "all",
-                    },
-                },
-            },
-        },
-        devtool: isProduction ? "source-map" : "eval-source-map",
-    };
-};
-exports.createClientConfig = createClientConfig;
-const createServerConfig = () => {
-    const serverEntry = findEntry([
-        "src/server",
-        "src/server/index",
-        "src/server/main",
-    ]);
-    return {
-        mode: isProduction ? "production" : "development",
-        target: "node",
-        entry: serverEntry,
-        output: {
-            path: path_1.default.resolve(cwd, "dist"),
-            filename: "server.js",
-        },
-        externals: [(0, webpack_node_externals_1.default)()],
-        resolve: {
-            extensions: [".ts", ".tsx", ".js", ".jsx"],
-        },
-        resolveLoader: {
-            modules: ["node_modules", path_1.default.resolve(__dirname, "../../node_modules")],
-        },
-        module: {
-            rules: [
-                {
-                    test: /\.(ts|tsx|js|jsx)$/,
-                    exclude: /node_modules/,
-                    use: {
-                        loader: resolveLoader("babel-loader"),
-                        options: {
-                            presets: [
-                                resolveLoader("@babel/preset-env"),
-                                resolveLoader("@babel/preset-react"),
-                                resolveLoader("@babel/preset-typescript"),
-                            ],
-                        },
-                    },
-                },
-                {
-                    test: /\.css$/,
-                    use: resolveLoader("null-loader"), // Ignore CSS on server side
-                },
-                {
-                    test: /\.(png|jpg|jpeg|gif|svg|woff|woff2|eot|ttf|otf)$/i,
-                    type: "asset/resource",
-                    generator: {
-                        emit: false,
-                    },
-                },
-            ],
-        },
-        devtool: isProduction ? "source-map" : "eval-source-map",
-    };
-};
-exports.createServerConfig = createServerConfig;

package/framework/lib/client/index.d.ts

@@ -1,2 +0,0 @@
-import React from "react";
-export declare const hydrateArcanaJS: (viewsOrContext: Record<string, React.FC<any>> | any, layout?: React.FC<any>) => void;

package/framework/lib/client/index.js

@@ -1,40 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.hydrateArcanaJS = void 0;
-const react_1 = __importDefault(require("react"));
-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) => {
-    let views = {};
-    if (viewsOrContext.keys && typeof viewsOrContext.keys === "function") {
-        viewsOrContext.keys().forEach((key) => {
-            const viewName = key.replace(/^\.\/(.*)\.tsx$/, "$1");
-            views[viewName] = viewsOrContext(key).default;
-        });
-    }
-    else {
-        views = viewsOrContext;
-    }
-    const container = document.getElementById("root");
-    const dataScript = document.getElementById("__ArcanaJS_DATA__");
-    // Client-side HeadManager (noop for push, as Head handles client updates via useEffect)
-    const headManager = {
-        tags: [],
-        push: () => { },
-    };
-    if (container && dataScript) {
-        try {
-            const { page, data, params, csrfToken } = JSON.parse(dataScript.textContent || "{}");
-            (0, client_1.hydrateRoot)(container, react_1.default.createElement(HeadContext_1.HeadContext.Provider, { value: headManager },
-                react_1.default.createElement(ArcanaJSApp_1.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.d.ts

@@ -1,17 +0,0 @@
-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/index.js

@@ -1,33 +0,0 @@
-"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);

package/framework/lib/server/ArcanaJSMiddleware.d.ts

@@ -1,16 +0,0 @@
-import { NextFunction, Request, Response } from "express";
-import React from "react";
-declare global {
-    namespace Express {
-        interface Response {
-            renderPage(page: string, data?: any, params?: Record<string, string>): void;
-        }
-    }
-}
-interface ArcanaJSOptions {
-    views: Record<string, React.FC<any>>;
-    indexFile?: string;
-    layout?: React.FC<any>;
-}
-export declare const createArcanaJSMiddleware: (options: ArcanaJSOptions) => (req: Request, res: Response, next: NextFunction) => void;
-export {};

package/framework/lib/server/ArcanaJSMiddleware.js

@@ -1,99 +0,0 @@
-"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");
-const DEFAULT_HTML_TEMPLATE = `<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <!--HEAD_CONTENT-->
-  </head>
-  <body>
-    <div id="root"><!--APP_CONTENT--></div>
-    <!--ARCANAJS_DATA_SCRIPT-->
-  </body>
-</html>`;
-// Helper to prevent XSS in initial data
-const safeStringify = (obj) => {
-    return JSON.stringify(obj).replace(/</g, "\\u003c");
-};
-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 (!err && process.env.NODE_ENV === "production") {
-                    cachedIndexHtml = htmlData;
-                }
-                callback(err, htmlData);
-            });
-        }
-        else {
-            if (process.env.NODE_ENV === "production") {
-                cachedIndexHtml = DEFAULT_HTML_TEMPLATE;
-            }
-            callback(null, DEFAULT_HTML_TEMPLATE);
-        }
-    };
-    return (req, res, next) => {
-        res.renderPage = (page, data = {}, params = {}) => {
-            const csrfToken = res.locals.csrfToken;
-            if (req.headers["x-arcanajs-request"] || req.query.format === "json") {
-                return res.json({ page, data, params, csrfToken });
-            }
-            try {
-                const headTags = [];
-                const headManager = {
-                    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, {
-                    initialPage: page,
-                    initialData: data,
-                    initialParams: params,
-                    initialUrl: req.path,
-                    csrfToken: csrfToken,
-                    views: views,
-                    layout: layout,
-                })));
-                const headHtml = (0, server_1.renderToString)(react_1.default.createElement(react_1.default.Fragment, null, ...headTags));
-                getIndexHtml((err, htmlData) => {
-                    if (err) {
-                        console.error("Error reading index.html", err);
-                        return res.status(500).send("Server Error");
-                    }
-                    const scriptContent = safeStringify({
-                        page,
-                        data,
-                        params,
-                        csrfToken,
-                    });
-                    const scriptTag = `<script id="__ArcanaJS_DATA__" type="application/json">${scriptContent}</script>`;
-                    const html = htmlData
-                        .replace("<!--HEAD_CONTENT-->", headHtml)
-                        .replace("<!--APP_CONTENT-->", appHtml)
-                        .replace("<!--ARCANAJS_DATA_SCRIPT-->", scriptTag);
-                    res.send(html);
-                });
-            }
-            catch (error) {
-                console.error("SSR Error:", error);
-                res.status(500).send("Internal Server Error");
-            }
-        };
-        next();
-    };
-};
-exports.createArcanaJSMiddleware = createArcanaJSMiddleware;

package/framework/lib/server/ArcanaJSServer.d.ts

@@ -1,21 +0,0 @@
-import { Express, RequestHandler } from "express";
-import React from "react";
-export interface ArcanaJSConfig {
-    port?: number | string;
-    views?: Record<string, React.FC<any>>;
-    viewsDir?: string;
-    viewsContext?: any;
-    routes?: RequestHandler | RequestHandler[];
-    staticDir?: string;
-    distDir?: string;
-    indexFile?: string;
-    layout?: React.FC<any>;
-}
-export declare class ArcanaJSServer {
-    app: Express;
-    private config;
-    constructor(config: ArcanaJSConfig);
-    private initialize;
-    private discoverViews;
-    start(): void;
-}