xanix 1.0.20 → 1.0.21

package/dist/bin/modifier/pageFinder.js

@@ -1,135 +1,30 @@
+import findImports from "./findImports.js";
+const ID = "[A-Za-z_$][\\w$]*";
 function pageFinder(code) {
-    const results = [];
-    // Only store DEFAULT imports.
-    //
-    // import Home from "./Home";
-    // import Layout, { Header } from "./Layout";
-    // import Components, * as UI from "./components";
-    //
-    // Does NOT store:
-    // import { Layout } from "./Layout";
-    // import * as Pages from "./pages";
+    // default imports only:
+    //   import Home from "./Home";
+    //   import Layout, { Header } from "./Layout";
+    //   import Components, * as UI from "./components";
     const defaultImports = new Map();
-    const defaultImportRegex = /import\s+([A-Za-z_$][\w$]*)\s*(?:,\s*(?:\{[^}]*\}|\*\s+as\s+[A-Za-z_$][\w$]*))?\s+from\s*["']([^"']+)["']/g;
-    for (const match of code.matchAll(defaultImportRegex)) {
-        const local = match[1];
-        const file = match[2];
-        defaultImports.set(local, file);
+    for (const imp of findImports(code)) {
+        if (imp.default && !imp.typeOnly)
+            defaultImports.set(imp.default, imp.source);
     }
-    const sendRegex = /([A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*)*)\.send\s*\(/g;
-    let match;
-    while ((match = sendRegex.exec(code))) {
-        const identifier = `${match[1]}`;
-        const start = match.index;
-        const argsStart = sendRegex.lastIndex;
-        let depth = 1;
-        let i = argsStart;
-        let quote = null;
-        for (; i < code.length; i++) {
-            const char = code[i];
-            if (quote) {
-                if (char === "\\") {
-                    i++;
-                }
-                else if (char === quote) {
-                    quote = null;
-                }
-                continue;
-            }
-            if (char === "'" || char === '"' || char === "`") {
-                quote = char;
-                continue;
-            }
-            if (char === "(") {
-                depth++;
-            }
-            else if (char === ")") {
-                depth--;
-                if (depth === 0) {
-                    break;
-                }
-            }
-        }
-        if (depth !== 0) {
-            break;
-        }
-        const end = i + 1;
-        const content = code.slice(argsStart, i);
-        const args = splitArguments(content);
-        const firstArg = args[0]?.trim();
-        if (!firstArg?.startsWith("<")) {
-            continue;
-        }
-        // <Home />
-        // <Home>
-        const jsxMatch = firstArg.match(/^<([A-Z_$][\w$]*)/);
-        if (!jsxMatch) {
-            continue;
-        }
-        const component = jsxMatch[1];
-        const source = defaultImports.get(component);
-        if (!source) {
+    // only: <identifier>.send(<Component />)
+    const sendRe = new RegExp(`(${ID}(?:\\??\\.${ID})*)\\??\\.send\\s*\\(\\s*(<([A-Z_$][\\w$]*)\\s*/>)\\s*\\)`, "g");
+    const results = [];
+    for (const m of code.matchAll(sendRe)) {
+        const source = defaultImports.get(m[3]);
+        if (!source)
             continue;
-        }
         results.push({
             source,
-            identifier,
-            args,
-            start,
-            end,
+            identifier: m[1],
+            args: [m[2]],
+            start: m.index,
+            end: m.index + m[0].length,
         });
     }
     return results;
 }
-function splitArguments(code) {
-    const args = [];
-    let start = 0;
-    let paren = 0;
-    let brace = 0;
-    let bracket = 0;
-    let quote = null;
-    for (let i = 0; i < code.length; i++) {
-        const char = code[i];
-        if (quote) {
-            if (char === "\\") {
-                i++;
-            }
-            else if (char === quote) {
-                quote = null;
-            }
-            continue;
-        }
-        if (char === "'" || char === '"' || char === "`") {
-            quote = char;
-            continue;
-        }
-        if (char === "(") {
-            paren++;
-        }
-        else if (char === ")") {
-            paren--;
-        }
-        else if (char === "{") {
-            brace++;
-        }
-        else if (char === "}") {
-            brace--;
-        }
-        else if (char === "[") {
-            bracket++;
-        }
-        else if (char === "]") {
-            bracket--;
-        }
-        else if (char === "," && paren === 0 && brace === 0 && bracket === 0) {
-            args.push(code.slice(start, i).trim());
-            start = i + 1;
-        }
-    }
-    const last = code.slice(start).trim();
-    if (last) {
-        args.push(last);
-    }
-    return args;
-}
 export default pageFinder;

package/dist/bin/modifier/sendFinder.d.ts

@@ -0,0 +1,9 @@
+type SendFinderResult = {
+    file: string;
+    identifier: string;
+    args: string[];
+    start: number;
+    end: number;
+};
+export declare function sendFinder(code: string): SendFinderResult[];
+export default sendFinder;

package/dist/bin/modifier/sendFinder.js

@@ -0,0 +1,135 @@
+export function sendFinder(code) {
+    const results = [];
+    // Only store DEFAULT imports.
+    //
+    // import Home from "./Home";
+    // import Layout, { Header } from "./Layout";
+    // import Components, * as UI from "./components";
+    //
+    // Does NOT store:
+    // import { Layout } from "./Layout";
+    // import * as Pages from "./pages";
+    const defaultImports = new Map();
+    const defaultImportRegex = /import\s+([A-Za-z_$][\w$]*)\s*(?:,\s*(?:\{[^}]*\}|\*\s+as\s+[A-Za-z_$][\w$]*))?\s+from\s*["']([^"']+)["']/g;
+    for (const match of code.matchAll(defaultImportRegex)) {
+        const local = match[1];
+        const file = match[2];
+        defaultImports.set(local, file);
+    }
+    const sendRegex = /([A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*)*)\.send\s*\(/g;
+    let match;
+    while ((match = sendRegex.exec(code))) {
+        const identifier = `${match[1]}`;
+        const start = match.index;
+        const argsStart = sendRegex.lastIndex;
+        let depth = 1;
+        let i = argsStart;
+        let quote = null;
+        for (; i < code.length; i++) {
+            const char = code[i];
+            if (quote) {
+                if (char === "\\") {
+                    i++;
+                }
+                else if (char === quote) {
+                    quote = null;
+                }
+                continue;
+            }
+            if (char === "'" || char === '"' || char === "`") {
+                quote = char;
+                continue;
+            }
+            if (char === "(") {
+                depth++;
+            }
+            else if (char === ")") {
+                depth--;
+                if (depth === 0) {
+                    break;
+                }
+            }
+        }
+        if (depth !== 0) {
+            break;
+        }
+        const end = i + 1;
+        const content = code.slice(argsStart, i);
+        const args = splitArguments(content);
+        const firstArg = args[0]?.trim();
+        if (!firstArg?.startsWith("<")) {
+            continue;
+        }
+        // <Home />
+        // <Home>
+        const jsxMatch = firstArg.match(/^<([A-Z_$][\w$]*)/);
+        if (!jsxMatch) {
+            continue;
+        }
+        const component = jsxMatch[1];
+        const file = defaultImports.get(component);
+        if (!file) {
+            continue;
+        }
+        results.push({
+            file,
+            identifier,
+            args,
+            start,
+            end,
+        });
+    }
+    return results;
+}
+function splitArguments(code) {
+    const args = [];
+    let start = 0;
+    let paren = 0;
+    let brace = 0;
+    let bracket = 0;
+    let quote = null;
+    for (let i = 0; i < code.length; i++) {
+        const char = code[i];
+        if (quote) {
+            if (char === "\\") {
+                i++;
+            }
+            else if (char === quote) {
+                quote = null;
+            }
+            continue;
+        }
+        if (char === "'" || char === '"' || char === "`") {
+            quote = char;
+            continue;
+        }
+        if (char === "(") {
+            paren++;
+        }
+        else if (char === ")") {
+            paren--;
+        }
+        else if (char === "{") {
+            brace++;
+        }
+        else if (char === "}") {
+            brace--;
+        }
+        else if (char === "[") {
+            bracket++;
+        }
+        else if (char === "]") {
+            bracket--;
+        }
+        else if (char === "," && paren === 0 && brace === 0 && bracket === 0) {
+            args.push(code.slice(start, i).trim());
+            start = i + 1;
+        }
+    }
+    const last = code.slice(start).trim();
+    if (last) {
+        args.push(last);
+    }
+    return args;
+}
+export default sendFinder;

package/dist/bin/modifier/sriptCommnet.d.ts

@@ -1,2 +1,3 @@
+export declare const TOKENS: RegExp;
 declare function stripComments(code: string): string;
 export default stripComments;

package/dist/bin/modifier/sriptCommnet.js

@@ -1,8 +1,15 @@
+const STRING = /"(?:\\[\s\S]|[^"\\])*"|'(?:\\[\s\S]|[^'\\])*'/;
+// template literal: allows `${ ... }` with strings/templates inside (no nested braces),
+// falls back to a plain backtick string
+const TEMPLATE = /`(?:\\[\s\S]|\$\{(?:[^{}`]|`(?:\\[\s\S]|[^`\\])*`)*\}|[^`\\$]|\$(?!\{))*`|`(?:\\[\s\S]|[^`\\])*`/;
+// regex literal: only where a regex can legally start (after an operator,
+// opening bracket, keyword or start of file), and `/` allowed inside [...]
+const REGEX = /(?<=(?:^|[(,=:[!&|?{};<>~^%*]|\b(?:return|typeof|case|void|delete|throw|yield|await|in|of))\s*)\/(?![/*])(?:\\.|\[(?:\\.|[^\]\\\r\n])*\]|[^/\\\r\n[])+\/[dgimsuvy]*/;
+const COMMENT = /\/\*[\s\S]*?\*\/|\/\/[^\r\n]*/;
+export const TOKENS = new RegExp([STRING, TEMPLATE, REGEX, COMMENT].map((r) => r.source).join("|"), "g");
 function stripComments(code) {
-    return code.replace(/("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|`(?:\\.|[^`\\])*`)|(\/\/[^\r\n]*|\/\*[\s\S]*?\*\/)/g, (match, stringLiteral) => {
-        if (stringLiteral)
-            return match;
-        return match.replace(/[^\r\n]/g, " ");
-    });
+    return code.replace(TOKENS, (m) => m[0] === "/" && (m[1] === "/" || m[1] === "*")
+        ? m.replace(/[^\r\n]/g, " ")
+        : m);
 }
 export default stripComments;

package/dist/bin/modifier/stripComments.d.ts

@@ -0,0 +1,3 @@
+export declare const TOKENS: RegExp;
+declare function stripComments(code: string): string;
+export default stripComments;

package/dist/bin/modifier/stripComments.js

@@ -0,0 +1,15 @@
+const STRING = /"(?:\\[\s\S]|[^"\\])*"|'(?:\\[\s\S]|[^'\\])*'/;
+// template literal: allows `${ ... }` with strings/templates inside (no nested braces),
+// falls back to a plain backtick string
+const TEMPLATE = /`(?:\\[\s\S]|\$\{(?:[^{}`]|`(?:\\[\s\S]|[^`\\])*`)*\}|[^`\\$]|\$(?!\{))*`|`(?:\\[\s\S]|[^`\\])*`/;
+// regex literal: only where a regex can legally start (after an operator,
+// opening bracket, keyword or start of file), and `/` allowed inside [...]
+const REGEX = /(?<=(?:^|[(,=:[!&|?{};<>~^%*]|\b(?:return|typeof|case|void|delete|throw|yield|await|in|of))\s*)\/(?![/*])(?:\\.|\[(?:\\.|[^\]\\\r\n])*\]|[^/\\\r\n[])+\/[dgimsuvy]*/;
+const COMMENT = /\/\*[\s\S]*?\*\/|\/\/[^\r\n]*/;
+export const TOKENS = new RegExp([STRING, TEMPLATE, REGEX, COMMENT].map((r) => r.source).join("|"), "g");
+function stripComments(code) {
+    return code.replace(TOKENS, (m) => m[0] === "/" && (m[1] === "/" || m[1] === "*")
+        ? m.replace(/[^\r\n]/g, " ")
+        : m);
+}
+export default stripComments;

package/dist/bin/plugins/XanixAssets.js

@@ -32,8 +32,8 @@ export default function xanixAssets(assets) {
             };
             assets?.set(fileName, { ...asset, name: fileName });
             return {
-                code: `import {xanix} from "xanix"
-          const assetData = xanix.asset(${JSON.stringify(asset)});
+                code: `import {xanix} from "xanix"
+          const assetData = xanix.asset(${JSON.stringify(asset)});
           export default assetData;`,
                 moduleSideEffects: true,
                 moduleType: "js",

package/dist/bin/plugins/XanixCss.js

@@ -34,20 +34,20 @@ export default function xanixCSS(options = {}) {
                 return null;
             }
             this.addWatchFile(file);
-            const css = fs.readFileSync(file);
-            const basename = path.basename(file, ".css");
-            const fileName = `${basename}-${uuid(file, 8)}.css`;
-            if (emit) {
-                this.emitFile({
-                    type: "asset",
-                    name: fileName,
-                    source: css,
-                });
-            }
+            // this.emitFile({
+            //   type: "asset",
+            //   name: fileName,
+            //   source: css,
+            // });
+            const asset = {
+                type: "css",
+                path: file,
+                name: `${uuid(file, 20)}.css`,
+            };
             return {
-                code: `
-            import {xanix} from "xanix"
-            xanix.css(\`${file}\`, \`${fileName}\`);
+                code: `
+          import {xanix} from "xanix"
+          export default xanix.asset(${JSON.stringify(asset)});
         `,
                 moduleType: "js",
                 moduleSideEffects: true,

package/dist/bin/plugins/XanixDocument.js

@@ -27,10 +27,10 @@ export default function xanixDocument() {
             const hasMetadata = /\bexport\s+(?:const|let|var|function)\s+metadata\b/.test(source) ||
                 /\bexport\s*\{[^}]*\bmetadata\b[^}]*\}/.test(source);
             return {
-                code: `
-import Document, * as DocumentModule from ${JSON.stringify(documentFile)};
-export default Document;
-export const metadata = ${hasMetadata ? "DocumentModule.metadata" : "async () => ({})"};
+                code: `
+import Document, * as DocumentModule from ${JSON.stringify(documentFile)};
+export default Document;
+export const metadata = ${hasMetadata ? "DocumentModule.metadata" : "async () => ({})"};
         `,
                 map: null,
             };

package/dist/components/Head.js

@@ -33,7 +33,7 @@ const Head = ({ children, ...props }) => {
                             path,
                             metadata,
                             pagedata,
-                        })}; 
+                        })}; 
         `,
                     } })] }));
     }

package/dist/hooks/encript.d.ts

@@ -1,2 +1,4 @@
 export declare function encrypt(text: string, secret: string): string;
 export declare function decrypt(data: string, secret: string): string;
+export declare function encode(value: unknown): Uint8Array;
+export declare function decode(bytes: Uint8Array): any;

package/dist/hooks/encript.js

@@ -28,3 +28,16 @@ export function decrypt(data, secret) {
     ]);
     return decrypted.toString("utf8");
 }
+export function encode(value) {
+    const bytes = new TextEncoder().encode(JSON.stringify(value));
+    for (let i = 0; i < bytes.length; i++) {
+        bytes[i] ^= 0xa7;
+    }
+    return bytes;
+}
+export function decode(bytes) {
+    for (let i = 0; i < bytes.length; i++) {
+        bytes[i] ^= 0xa7;
+    }
+    return JSON.parse(new TextDecoder().decode(bytes));
+}

package/dist/hooks/server.js

@@ -1,6 +1,6 @@
-import { encode, decode } from "@msgpack/msgpack";
 import cache from "./cache.js";
 import xanix from "../server/index.js";
+import { decode, encode } from "../libs/encoder.js";
 export const register = new Map();
 export const CHUNK_SIZE = 256 * 1024; // 256 KB
 async function uploadFile(file) {
@@ -81,7 +81,7 @@ const server = (callback, options, id) => {
                 const res = await fetch(`/__xanix__/server/${id}`, {
                     method: "POST",
                     headers: {
-                        "Content-Type": "application/xanix",
+                        "Content-Type": "application/octet-stream",
                     },
                     body: binary,
                 });

package/dist/hooks/session.js

@@ -12,7 +12,7 @@ const login = server(async ({ id, info }, ctx) => {
     try {
         await session.verify(info);
         const user = await session.getUser(info);
-        const encryptModule = await import("./encript.js");
+        const encryptModule = await import("../libs/encript.js");
         const cookieData = {
             info,
             expires: new Date(Date.now() + 1000 * 60 * 60 * 24), // 1 day expiration
@@ -60,7 +60,7 @@ const getUser = server(async ({ id, token }, ctx) => {
     if (!token) {
         return null;
     }
-    const encryptModule = await import("./encript.js");
+    const encryptModule = await import("../libs/encript.js");
     const data = encryptModule.decrypt(token, session.secret);
     const parsed = JSON.parse(data);
     if (!parsed.info || new Date(parsed.expires) < new Date()) {

package/dist/libs/encoder.d.ts

@@ -0,0 +1,2 @@
+export declare function encode(value: unknown): Uint8Array;
+export declare function decode(bytes: Uint8Array): any;

package/dist/libs/encoder.js

@@ -0,0 +1,13 @@
+export function encode(value) {
+    const bytes = new TextEncoder().encode(JSON.stringify(value));
+    for (let i = 0; i < bytes.length; i++) {
+        bytes[i] ^= 0xa7;
+    }
+    return bytes;
+}
+export function decode(bytes) {
+    for (let i = 0; i < bytes.length; i++) {
+        bytes[i] ^= 0xa7;
+    }
+    return JSON.parse(new TextDecoder().decode(bytes));
+}

package/dist/libs/encript.d.ts

@@ -0,0 +1,2 @@
+export declare function encrypt(text: string, secret: string): string;
+export declare function decrypt(data: string, secret: string): string;

package/dist/libs/encript.js

@@ -0,0 +1,30 @@
+import { createCipheriv, createDecipheriv, randomBytes, scryptSync, } from "node:crypto";
+const ALGORITHM = "aes-256-gcm";
+function getKey(secret) {
+    return scryptSync(secret, "xanix-session", 32);
+}
+export function encrypt(text, secret) {
+    const key = getKey(secret);
+    const iv = randomBytes(12);
+    const cipher = createCipheriv(ALGORITHM, key, iv);
+    const encrypted = Buffer.concat([
+        cipher.update(text, "utf8"),
+        cipher.final(),
+    ]);
+    const authTag = cipher.getAuthTag();
+    return Buffer.concat([iv, authTag, encrypted]).toString("base64");
+}
+export function decrypt(data, secret) {
+    const key = getKey(secret);
+    const buffer = Buffer.from(data, "base64");
+    const iv = buffer.subarray(0, 12);
+    const authTag = buffer.subarray(12, 28);
+    const encrypted = buffer.subarray(28);
+    const decipher = createDecipheriv(ALGORITHM, key, iv);
+    decipher.setAuthTag(authTag);
+    const decrypted = Buffer.concat([
+        decipher.update(encrypted),
+        decipher.final(),
+    ]);
+    return decrypted.toString("utf8");
+}

package/dist/navigate.js

@@ -5,7 +5,7 @@ import { DocumentProvider, } from "./components/DocumentContext.js";
 import { createRoot } from "react-dom/client";
 import Document from "virtual:xanix-document";
 import { UseServerResult } from "./hooks/useServer.js";
-import { decode } from "@msgpack/msgpack";
+import { decode } from "./libs/encoder.js";
 const getPath = () => {
     const { pathname, search } = window.location;
     return search ? `${pathname}${search}` : pathname;

package/dist/server/express/Router.js

@@ -1,9 +1,9 @@
-import { decode, encode } from "@msgpack/msgpack";
 import express, { Router } from "express";
 import fs from "fs";
 import path from "path";
 import { register, CHUNK_SIZE } from "../../hooks/server.js";
 import xanix from "../index.js";
+import { decode, encode } from "../../libs/encoder.js";
 const router = Router();
 const TMP_DIR = path.resolve(".xanix/tmp");
 const readFile = async (uploadId, filename, fileType) => {
@@ -14,7 +14,7 @@ const readFile = async (uploadId, filename, fileType) => {
     const buffer = await fs.promises.readFile(filePath);
     return new File([buffer], filename, { type: fileType });
 };
-router.post("/server/:id", express.raw({ type: "application/xanix" }), async (req, res) => {
+router.post("/server/:id", express.raw({ type: "application/octet-stream" }), async (req, res) => {
     const callback = register.get(req.params.id);
     if (!callback) {
         xanix.emit("action:error", {
@@ -36,7 +36,7 @@ router.post("/server/:id", express.raw({ type: "application/xanix" }), async (re
         request: req,
         response: res,
     });
-    const args = req.body?.length ? decode(new Uint8Array(req.body)) : {};
+    const args = req.body?.length ? decode(req.body) : {};
     let fileIds = [];
     for (const key in args) {
         const value = args[key];
@@ -73,7 +73,7 @@ router.post("/server/:id", express.raw({ type: "application/xanix" }), async (re
         request: req,
         response: res,
     });
-    res.set("Content-Type", "application/xanix");
+    res.set("Content-Type", "application/octet-stream");
     res.send(Buffer.from(encode(data)));
 });
 router.post("/upload/:uploadId", async (req, res) => {

package/dist/server/express/page.d.ts

@@ -6,5 +6,5 @@ interface XPageProps {
     props: Record<string, any>;
     pageId: string;
 }
-declare const __xpage: ({ component, req, res, pageId }: XPageProps, isNavigation: boolean) => Promise<string | Uint8Array<ArrayBuffer> | undefined>;
+declare const __xpage: ({ component, req, res, pageId }: XPageProps, isNavigation: boolean) => Promise<string | Uint8Array<ArrayBufferLike> | undefined>;
 export default __xpage;

package/dist/server/express/page.js

@@ -6,7 +6,7 @@ import { DocumentProvider } from "../../components/DocumentContext";
 import { UseServerResource, UseServerResult } from "../../hooks/useServer";
 import XanixRedirect from "../../classes/XanixRedirect";
 import xanix from "..";
-import { encode } from "@msgpack/msgpack";
+import { encode } from "../../libs/encoder.js";
 function renderPage(element) {
     return new Promise((resolve, reject) => {
         let html = "";