xanix 1.0.1 → 1.0.3

package/dist/BaseDocument.d.ts

@@ -1,3 +1,3 @@
-import { DocumentProps } from "./document/Document.js";
+import { DocumentProps } from "./components/Document/index.js";
 declare const BaseDocument: ({ document, children }: DocumentProps) => import("react").JSX.Element;
 export default BaseDocument;

package/dist/BaseDocument.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import Head from "./document/Head.js";
-import Body from "./document/Body.js";
-import Document from "./document/Document.js";
+import Head from "./components/Head.js";
+import Body from "./components/Body.js";
+import Document from "./components/Document/index.js";
 const BaseDocument = ({ document, children }) => {
     return (_jsxs(Document, { document: document, children: [_jsxs(Head, { children: [_jsx("meta", { charSet: "UTF-8" }), _jsx("meta", { name: "viewport", content: "width=device-width, initial-scale=1.0" })] }), _jsx(Body, { children: children })] }));
 };

package/dist/bin/bundler/buildCache.js

@@ -2,9 +2,9 @@ import path from "node:path";
 import { rollup } from "rollup";
 import { build } from "esbuild";
 import { createRequire } from "node:module";
+import xanixAssets from "./plugins/XanixAssets/index.js";
+import rollupEsbuild from "./plugins/rollupEsbuild.js";
 import { getDocumentFile } from "../include/utils.js";
-import esbuild from "rollup-plugin-esbuild";
-import url from "@rollup/plugin-url";
 const require = createRequire(import.meta.url);
 const GenerateGraph = async (entries) => {
     const collector = new Map();
@@ -17,28 +17,11 @@ const GenerateGraph = async (entries) => {
     const bundle = await rollup({
         input,
         plugins: [
-            url({
-                include: [
-                    "**/*.jpg",
-                    "**/*.jpeg",
-                    "**/*.png",
-                    "**/*.gif",
-                    "**/*.webp",
-                    "**/*.svg",
-                    "**/*.ico",
-                    "**/*.woff",
-                    "**/*.woff2",
-                    "**/*.ttf",
-                    "**/*.eot",
-                ],
-                limit: 0,
-                fileName: "assets/[name]-[hash][extname]",
-                emitFiles: true,
+            xanixAssets({
+                external: true,
             }),
-            esbuild({
-                target: "es2022",
-                jsx: "automatic",
-                tsconfig: false,
+            rollupEsbuild({
+                sourceMap: true,
             }),
         ],
         external(id) {

package/dist/bin/bundler/plugins/XanixReactRefresh.js

@@ -16,39 +16,39 @@ export default function xanixReactRefresh() {
                 return null;
             }
             const code = fs.readFileSync(id, "utf8");
-            const refreshCode = `
-import * as RefreshRuntime from "react-refresh/runtime";
-
-${code}
-
-if (typeof window !== "undefined") {
-  RefreshRuntime.injectIntoGlobalHook(window);
-
-  window.$RefreshReg$ = RefreshRuntime.register;
-  window.$RefreshSig$ = () => (type) => type;
-
-  const ws = new WebSocket("ws://localhost:8080");
-
-  ws.onmessage = async (event) => {
-    const files = JSON.parse(event.data);
-
-    for (const file of files) {
-      if (!file.endsWith(".js")) {
-        continue;
-      }
-
-      const url =
-        getImportUrl(file.replace(/\\.js$/, "")) +
-        "?t=" +
-        Date.now();
-
-      await import(url);
-    }
-
-    RefreshRuntime.performReactRefresh();
-    ws.send("reload")
-  };
-}
+            const refreshCode = `
+import * as RefreshRuntime from "react-refresh/runtime";
+
+${code}
+
+if (typeof window !== "undefined") {
+  RefreshRuntime.injectIntoGlobalHook(window);
+
+  window.$RefreshReg$ = RefreshRuntime.register;
+  window.$RefreshSig$ = () => (type) => type;
+
+  const ws = new WebSocket("ws://localhost:8080");
+
+  ws.onmessage = async (event) => {
+    const files = JSON.parse(event.data);
+
+    for (const file of files) {
+      if (!file.endsWith(".js")) {
+        continue;
+      }
+
+      const url =
+        getImportUrl(file.replace(/\\.js$/, "")) +
+        "?t=" +
+        Date.now();
+
+      await import(url);
+    }
+
+    RefreshRuntime.performReactRefresh();
+    ws.send("reload")
+  };
+}
 `;
             return {
                 code: refreshCode,

package/dist/bin/bundler/plugins/XanixResolveCacheDeps/index.js

@@ -1,6 +1,11 @@
 import path from "node:path";
 import BuildCache from "../../cacheNpmModules.js";
 function XanixResolveCacheDeps(metadata, entries) {
+    if (!entries.length) {
+        return {
+            name: "xanix:cached-deps",
+        };
+    }
     return {
         name: "xanix:cached-deps",
         async resolveId(source) {

package/dist/bin/bundler/plugins/XanixTsconfigAlias.d.ts

@@ -0,0 +1,2 @@
+import type { Plugin } from "rollup";
+export default function xanixTsconfigAlias(): Plugin;

package/dist/bin/bundler/plugins/{xanixTsconfigAlias.js → XanixTsconfigAlias.js}

@@ -2,11 +2,9 @@ import fs from "node:fs";
 import path from "node:path";
 import ts from "typescript";
 import alias from "@rollup/plugin-alias";
-export default function xanixTsconfigAlias(options = {}) {
-    const root = options.root ?? process.cwd();
-    const tsconfigPath = options.tsconfigPath
-        ? path.resolve(root, options.tsconfigPath)
-        : path.resolve(root, "tsconfig.json");
+export default function xanixTsconfigAlias() {
+    const root = process.cwd();
+    const tsconfigPath = path.resolve(root, "tsconfig.json");
     if (!fs.existsSync(tsconfigPath)) {
         return {
             name: "xanix-tsconfig-alias",

package/dist/bin/bundler/plugins/plugins.js

@@ -70,6 +70,12 @@ export function xanixDefaultPlugins(options = {}) {
             jsx: "automatic",
             tsconfig: false,
             minify: !development,
+            define: {
+                __XANIX_CLIENT__: JSON.stringify(isClient),
+                __XANIX_SERVER__: JSON.stringify(isServer),
+                __XANIX_DEV__: JSON.stringify(development),
+                __XANIX_PROD__: JSON.stringify(!development),
+            },
         }),
     ];
 }

package/dist/bin/bundler/watchClient.js

@@ -19,7 +19,13 @@ const WatchClient = async (entries, options) => {
     fs.mkdirSync(outDir.client, {
         recursive: true,
     });
-    const buildCache = await BuildCache(entries);
+    let buildCache;
+    if (entries.length > 0) {
+        buildCache = await BuildCache(entries);
+    }
+    else {
+        buildCache = new Map();
+    }
     const watcher = watch({
         input,
         treeshake: true,

package/dist/bin/cli/build.js

@@ -10,7 +10,9 @@ const build = async (rootEntry) => {
         onBuildEnd: async (entries) => {
             logger.info(pc.green("Building client..."), "client");
             const duration = Date.now() - st;
-            await buildClient(entries);
+            if (entries.length) {
+                await buildClient(entries);
+            }
             logger.info(pc.green(`Build completed in ${duration}ms`), "complete");
         },
     });

package/dist/bin/cli/dev.js

@@ -45,6 +45,9 @@ const dev = async (rootEntry) => {
     let firstBuild = true;
     let _clientWatcher = null;
     const clientWatcher = async (entries) => {
+        if (!entries.length) {
+            return;
+        }
         let changedFiles = new Set();
         _clientWatcher?.close();
         _clientWatcher = await watchClient(entries, {

package/dist/bin/cli/start copy.d.ts

@@ -0,0 +1,2 @@
+declare const build: (rootEntry: string) => Promise<void>;
+export default build;

package/dist/bin/cli/start copy.js

@@ -0,0 +1,34 @@
+import buildServer from "../bundler/buildServer.js";
+import buildClient from "../bundler/buildClient.js";
+import pc from "picocolors";
+import path from "node:path";
+import logger from "../include/logger.js";
+import { spawn } from "child_process";
+import { outDir } from "../bundler/config/output.js";
+let child;
+const build = async (rootEntry) => {
+    logger.info(pc.green("Building server..."), "server");
+    const st = Date.now();
+    await buildServer({
+        rootEntry,
+        onBuildEnd: async (entries) => {
+            logger.info(pc.green("Building client..."), "client");
+            const duration = Date.now() - st;
+            await buildClient(entries);
+            logger.info(pc.green(`Build completed in ${duration}ms`), "complete");
+        },
+    });
+    const filePath = path.join(outDir.server, "index.js");
+    child = spawn(process.execPath, [filePath], {
+        stdio: "inherit",
+    });
+    process.on("SIGINT", () => {
+        child?.kill();
+        process.exit(0);
+    });
+    process.on("SIGTERM", () => {
+        child?.kill();
+        process.exit(0);
+    });
+};
+export default build;

package/dist/client/client-runtime.d.ts

@@ -0,0 +1,10 @@
+import type { DocumentContextData } from "../components/DocumentContext.js";
+import type { ComponentType } from "react";
+type DocumentInfo = DocumentContextData & {
+    component: ComponentType<any>;
+};
+export declare const getPath: () => string;
+export declare const getImportUrl: (pageId: string) => string;
+export declare const getPage: (path: string) => Promise<any>;
+export declare function mount(path: string, Component: ComponentType<any>, doc: DocumentInfo): Promise<void>;
+export {};

package/dist/client/client-runtime.js

@@ -0,0 +1,98 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { createRoot } from "react-dom/client";
+const pages = new Map();
+const ROOT_KEY = "__xanix_root__";
+export const getPath = () => {
+    const { pathname, search } = window.location;
+    return search ? `${pathname}${search}` : pathname;
+};
+export const getImportUrl = (pageId) => `/.xanix/client/${pageId}.js`;
+function getRoot() {
+    let ele = document.body;
+    if (!ele) {
+        throw new Error("Root element not found");
+    }
+    ele[ROOT_KEY] = ele[ROOT_KEY] ?? createRoot(ele);
+    return ele[ROOT_KEY];
+}
+export const getPage = async (path) => {
+    let page = pages.get(path);
+    if (page)
+        return page;
+    const response = await fetch(path, {
+        headers: {
+            "X-Navigation": "true",
+        },
+    });
+    if (!response.ok) {
+        return null;
+    }
+    return await response.json();
+};
+export async function mount(path, Component, doc) {
+    const root = getRoot();
+    pages.set(path, doc);
+    const Document = (await import(getImportUrl("xanix-document"))).default;
+    root.render(_jsx(Document, { document: doc, children: _jsx(Component, { ...doc.props }) }));
+}
+if (typeof window !== "undefined") {
+    const dispatch = (name, path) => {
+        window.dispatchEvent(new CustomEvent(`xanix:${name}`, { detail: { path } }));
+    };
+    window.addEventListener("load", async () => {
+        const path = getPath();
+        dispatch("navigate:start", path);
+        const doc = window.XANIX_DOCUMENT;
+        const mod = await import(getImportUrl(doc.pageId));
+        mount(path, mod.default, doc);
+        const scriptTag = document.getElementById(doc.pageId);
+        if (scriptTag) {
+            scriptTag.remove();
+        }
+        dispatch("navigate:end", path);
+    });
+    window.addEventListener("xanix:navigate", async (event) => {
+        const path = event.detail.path;
+        const replace = event.detail.replace;
+        dispatch("navigate:start", path);
+        let page = await getPage(path);
+        if (!page)
+            return;
+        const mod = await import(getImportUrl(page.pageId));
+        mount(path, mod.default, page);
+        if (replace) {
+            history.replaceState(null, "", path);
+        }
+        else {
+            history.pushState(null, "", path);
+        }
+        dispatch("navigate:end", path);
+    });
+    window.addEventListener("xanix:preload", async (event) => {
+        const path = event.detail.path;
+        if (!path)
+            return;
+        dispatch("preload:start", path);
+        const page = await getPage(path);
+        if (!page)
+            return;
+        await import(getImportUrl(page.pageId));
+        pages.set(path, page);
+        dispatch("preload:end", path);
+    });
+    window.addEventListener("xanix:reload", async (event) => {
+        const path = getPath();
+        dispatch("navigate:start", path);
+        let page = await getPage(path);
+        if (!page)
+            return;
+        const mod = await import(getImportUrl(page.pageId) + "?t=" + Date.now());
+        mount(path, mod.default, page);
+        history.pushState(null, "", path);
+        dispatch("navigate:end", path);
+    });
+    window.addEventListener("popstate", async () => {
+        const path = getPath();
+        dispatch("navigate", path);
+    });
+}

package/dist/client/index.d.ts

@@ -1,2 +1,2 @@
-import { navigate, back, forward, preload } from "../navigation/navigation.js";
-export { navigate, back, forward, preload };
+import { navigate, back, forward } from "./navigation.js";
+export { navigate, back, forward };

package/dist/client/index.js

@@ -1,2 +1,2 @@
-import { navigate, back, forward, preload } from "../navigation/navigation.js";
-export { navigate, back, forward, preload };
+import { navigate, back, forward } from "./navigation.js";
+export { navigate, back, forward };

package/dist/client/navigation.d.ts

@@ -1,4 +1,3 @@
-export declare const navigate: (path: string) => void;
-export declare const back: () => void;
-export declare const forward: () => void;
-export declare const preload: (path: string) => Promise<void>;
+export declare const navigate: (path: string) => Promise<void>;
+export declare const back: () => Promise<void>;
+export declare const forward: () => Promise<void>;

package/dist/client/navigation.js

@@ -1,14 +1,27 @@
-export const navigate = (path) => {
-    window.dispatchEvent(new CustomEvent("xanix:navigate", {
-        detail: { path },
-    }));
+let history = [];
+let currentIndex = -1;
+const fire = (path) => {
+    window.history.pushState({}, "", path);
+    const popStateEvent = new PopStateEvent("popstate", { state: {} });
+    dispatchEvent(popStateEvent);
 };
-export const back = () => {
-    window.history.back();
+export const navigate = async (path) => {
+    history = history.slice(0, currentIndex + 1);
+    history.push(path);
+    currentIndex++;
+    fire(path);
 };
-export const forward = () => {
-    window.history.forward();
+export const back = async () => {
+    if (currentIndex > 0) {
+        currentIndex--;
+        const path = history[currentIndex];
+        fire(path);
+    }
 };
-export const preload = async (path) => {
-    window.dispatchEvent(new CustomEvent("xanix:preload", { detail: { path } }));
+export const forward = async () => {
+    if (currentIndex < history.length - 1) {
+        currentIndex++;
+        const path = history[currentIndex];
+        fire(path);
+    }
 };

package/dist/client/runtime.d.ts

@@ -1,4 +1,4 @@
-import { DocumentContextData } from "../document/DocumentContext";
+import type { DocumentContextData } from "../components/DocumentContext.js";
 import type { ComponentType } from "react";
 type DocumentInfo = DocumentContextData & {
     component: ComponentType<any>;

package/dist/components/Document/context.d.ts

@@ -1,17 +1,11 @@
-export type DocumentContextData = {
-    pageId: string;
+export type XanixDocumentData = {
+    pageId?: string;
     props: Record<string, any>;
     title: string;
     meta: Array<{
         name: string;
         content: string;
     }>;
-    request?: Express.Request;
 };
-export declare const DocumentContext: import("react").Context<DocumentContextData | null>;
-export declare const useDocument: () => DocumentContextData;
-export type DocumentProviderProps = {
-    children: React.ReactNode;
-    value: DocumentContextData;
-};
-export declare const DocumentProvider: ({ children, value, }: DocumentProviderProps) => import("react").JSX.Element;
+export declare const DocumentContext: import("react").Context<XanixDocumentData>;
+export declare const useDocument: () => XanixDocumentData;

package/dist/components/Document/context.js

@@ -1,6 +1,10 @@
-import { jsx as _jsx } from "react/jsx-runtime";
 import { createContext, useContext } from "react";
-export const DocumentContext = createContext(null);
+export const DocumentContext = createContext({
+    pageId: "",
+    props: {},
+    title: "",
+    meta: [],
+});
 export const useDocument = () => {
     const context = useContext(DocumentContext);
     if (!context) {
@@ -8,6 +12,3 @@ export const useDocument = () => {
     }
     return context;
 };
-export const DocumentProvider = ({ children, value, }) => {
-    return (_jsx(DocumentContext.Provider, { value: value, children: children }));
-};

package/dist/components/Document/index.d.ts

@@ -1,7 +1,8 @@
-import { DocumentContextData } from "./context.js";
-export type DocumentProps = {
-    children?: React.ReactNode;
-    document: DocumentContextData;
+import { type XanixDocumentData } from "./context.js";
+import { HTMLProps } from "react";
+export type DocumentProps = HTMLProps<HTMLHtmlElement> & {
+    document: XanixDocumentData;
+    children: React.ReactNode;
 };
-declare const Document: ({ children, document }: DocumentProps) => import("react").JSX.Element;
+declare const Document: ({ document, children, ...props }: DocumentProps) => import("react").JSX.Element;
 export default Document;

package/dist/components/Document/index.js

@@ -1,10 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { DocumentProvider } from "./context.js";
-const Document = ({ children, document }) => {
-    const isClient = typeof window !== "undefined";
-    if (isClient) {
-        return _jsx(DocumentProvider, { value: document, children: children });
-    }
-    return (_jsx(DocumentProvider, { value: document, children: _jsx("html", { children: children }) }));
+import { DocumentContext } from "./context.js";
+const Document = ({ document, children, ...props }) => {
+    return (_jsx(DocumentContext.Provider, { value: document, children: _jsx("html", { ...props, children: children }) }));
 };
 export default Document;

package/dist/components/Head.js

@@ -35,7 +35,7 @@ const Head = ({ children }) => {
                         params,
                         pageData,
                         request: null,
-                    })};
+                    })};
         `,
                 } }), _jsx("script", { type: "module", src: `/.xanix/client/xanix-runtime.js` })] }));
 };

package/dist/document/Body.js

@@ -1,7 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 const Body = ({ children }) => {
-    const isClient = typeof window !== "undefined";
-    if (isClient) {
+    if (__XANIX_CLIENT__) {
         return children;
     }
     return _jsx("body", { children: children });

package/dist/document/Document.js

@@ -1,8 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { DocumentProvider } from "./DocumentContext.js";
 const Document = ({ children, document }) => {
-    const isClient = typeof window !== "undefined";
-    if (isClient) {
+    if (__XANIX_CLIENT__) {
         return _jsx(DocumentProvider, { value: document, children: children });
     }
     return (_jsx(DocumentProvider, { value: document, children: _jsx("html", { children: children }) }));

package/dist/document/DocumentContext.d.ts

@@ -7,6 +7,7 @@ export type DocumentContextData = {
         name: string;
         content: string;
     }>;
+    params: Record<string, string>;
     request?: Request;
 };
 export declare const DocumentContext: import("react").Context<DocumentContextData | null>;

package/dist/document/Head.js

@@ -2,7 +2,7 @@ import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-run
 import { useEffect } from "react";
 import useDocument from "./useDocument.js";
 const Head = ({ children }) => {
-    const { title, meta, pageId, props } = useDocument();
+    const { title, meta, pageId, props, params } = useDocument();
     useEffect(() => {
         document.title = title || "";
         meta?.forEach(({ name, content }) => {
@@ -24,7 +24,7 @@ const Head = ({ children }) => {
             });
         }
     }, [children]);
-    if (typeof window !== "undefined")
+    if (__XANIX_CLIENT__)
         return _jsx(_Fragment, {});
     return (_jsxs("head", { children: [_jsx("title", { children: title }), meta?.map(({ name, content }) => (_jsx("meta", { name: name, content: content }, name))), children, _jsx("script", { id: pageId, dangerouslySetInnerHTML: {
                     __html: `window.XANIX_DOCUMENT = ${JSON.stringify({
@@ -32,8 +32,9 @@ const Head = ({ children }) => {
                         props,
                         meta,
                         title,
+                        params,
                         request: null,
-                    })};
+                    })};
         `,
                 } }), _jsx("script", { type: "module", src: "/.xanix/client/xanix-runtime.js" })] }));
 };

package/dist/document/index.d.ts

@@ -1,5 +1,5 @@
 import Document, { DocumentProps } from "./Document.js";
-import useDocument from "./useDocument.js";
+import useDocument from "../hooks/useDocument.js";
 import Head from "./Head.js";
 import Body from "./Body.js";
 import Link from "./Link.js";

package/dist/document/index.js

@@ -1,5 +1,5 @@
 import Document from "./Document.js";
-import useDocument from "./useDocument.js";
+import useDocument from "../hooks/useDocument.js";
 import Head from "./Head.js";
 import Body from "./Body.js";
 import Link from "./Link.js";

package/dist/document/useDocument.d.ts

@@ -1,2 +1,2 @@
-declare const useDocument: () => import("./DocumentContext").DocumentContextData;
+declare const useDocument: () => {};
 export default useDocument;

package/dist/hooks/useCookie.d.ts

@@ -0,0 +1,2 @@
+declare const useCookie: () => any;
+export default useCookie;

package/dist/hooks/useCookie.js

@@ -0,0 +1,13 @@
+import useRequest from "./useRequest";
+const useCookie = () => {
+    const request = useRequest();
+    if (__XANIX_SERVER__) {
+        return request?.cookies;
+    }
+    return document.cookie.split(";").reduce((cookies, cookie) => {
+        const [name, value] = cookie.split("=");
+        cookies[name.trim()] = value;
+        return cookies;
+    }, {});
+};
+export default useCookie;

package/dist/hooks/useData.js

@@ -6,10 +6,8 @@ const useData = (_callback, _args) => {
     return {};
 };
 useData.register = (xanixId, callback) => {
-    if (__XANIX_SERVER__) {
+    if (typeof __XANIX_SERVER__ !== "undefined" && __XANIX_SERVER__) {
         loader.register(xanixId, callback);
-    }
-    if (__XANIX_SERVER__) {
         return async (args) => {
             const page = usePage();
             const doc = useDocument();

package/dist/hooks/useRequest copy.d.ts

@@ -0,0 +1,2 @@
+declare const useRequest: () => import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>> | undefined;
+export default useRequest;