xanix 1.0.15 → 1.0.16

package/dist/bin/bundler/buildServer.js

@@ -2,10 +2,10 @@ import { rollup } from "rollup";
 import path from "node:path";
 import bundlerOutput from "./config/output.js";
 import fs from "node:fs";
-import { createManifest } from "../include/manifest.js";
-import generateClientEntries from "./generateClientEntries.js";
+import external from "./config/external.js";
 import { xanixDefaultPlugins } from "./plugins/plugins.js";
 import outdirs from "../../outdirs.js";
+import { getEntries } from "../include/manifest.js";
 const root = process.cwd();
 const BuildServer = async ({ rootEntry, onBuildEnd }) => {
     fs.rmSync(outdirs.server, {
@@ -15,8 +15,6 @@ const BuildServer = async ({ rootEntry, onBuildEnd }) => {
     fs.mkdirSync(outdirs.server, {
         recursive: true,
     });
-    const entries = await generateClientEntries({ rootEntry });
-    await createManifest(entries);
     const input = {
         index: path.resolve(root, rootEntry),
     };
@@ -38,17 +36,13 @@ const BuildServer = async ({ rootEntry, onBuildEnd }) => {
             }),
         ],
         external(id) {
-            if (id.startsWith(".") ||
-                path.isAbsolute(id) ||
-                id === "@" ||
-                id.startsWith("@/") ||
-                id.startsWith("xanix") ||
-                id === "virtual:xanix-document") {
+            if (!external(id)) {
                 return false;
             }
             return true;
         },
     });
+    const entries = await getEntries();
     await build.write(bundlerOutput.server({ isDev: false }));
     await build.close();
     await onBuildEnd(entries);

package/dist/bin/bundler/cacheNpmModules.js

@@ -4,7 +4,10 @@ import { build } from "esbuild";
 import { createRequire } from "node:module";
 import { getClientRuntimeFile } from "../include/utils.js";
 import outdirs from "../../outdirs.js";
-import { xanixDefaultPlugins } from "./plugins/plugins.js";
+import { xanixCachePlugins } from "./plugins/plugins.js";
+import defines from "./config/defines.js";
+import { pathToFileURL } from "node:url";
+import external from "./config/external.js";
 const require = createRequire(import.meta.url);
 const GenerateGraph = async (entries) => {
     const collector = new Map();
@@ -15,19 +18,9 @@ const GenerateGraph = async (entries) => {
     input.push(getClientRuntimeFile());
     const bundle = await rollup({
         input,
-        plugins: [
-            ...xanixDefaultPlugins({
-                target: "client",
-                development: true,
-                assetExternal: true,
-            }),
-        ],
+        plugins: [...xanixCachePlugins()],
         external(id) {
-            if (id.startsWith(".") ||
-                path.isAbsolute(id) ||
-                id === "@" ||
-                id.startsWith("@/") ||
-                id === "virtual:xanix-document") {
+            if (!external(id)) {
                 return false;
             }
             collector.set(id, {
@@ -57,7 +50,7 @@ const makeCjsWrapperPlugin = (wrappers) => ({
         });
     },
 });
-const buildWrappers = (input) => {
+const buildWrappers = async (input) => {
     const wrappers = new Map();
     const wrappedInput = {};
     for (const [name, resolved] of Object.entries(input)) {
@@ -65,7 +58,8 @@ const buildWrappers = (input) => {
         let namedExports = [];
         let hasDefault = false;
         try {
-            const mod = require(resolved);
+            // Node: inspect the actual module
+            const mod = await import(pathToFileURL(resolved).href);
             hasDefault =
                 mod &&
                     (typeof mod === "object" || typeof mod === "function") &&
@@ -73,8 +67,9 @@ const buildWrappers = (input) => {
             namedExports = Object.keys(mod).filter((key) => key !== "__esModule" && key !== "default");
         }
         catch (err) {
-            // console.log(err);
+            console.log(`Failed to inspect ${name}:`, err);
         }
+        // esbuild: use a normal filesystem path
         const lines = [`import * as __mod from ${JSON.stringify(resolved)};`];
         if (hasDefault) {
             lines.push(`export default __mod.default;`);
@@ -82,7 +77,6 @@ const buildWrappers = (input) => {
         else {
             lines.push(`export default __mod;`);
         }
-        lines.push("");
         for (const exportName of namedExports) {
             if (/^[A-Za-z_$][A-Za-z0-9_$]*$/.test(exportName)) {
                 lines.push(`export const ${exportName} = __mod[${JSON.stringify(exportName)}];`);
@@ -97,7 +91,7 @@ const buildWrappers = (input) => {
     };
 };
 const bundleDeps = async (input, outdir) => {
-    const { wrappers, wrappedInput } = buildWrappers(input);
+    const { wrappers, wrappedInput } = await buildWrappers(input);
     await build({
         entryPoints: wrappedInput,
         bundle: true,
@@ -109,12 +103,7 @@ const bundleDeps = async (input, outdir) => {
         chunkNames: "chunks/[hash]",
         platform: "browser",
         sourcemap: true,
-        define: {
-            __XANIX_CLIENT__: "true",
-            __XANIX_SERVER__: "false",
-            __XANIX_DEV__: "true",
-            __XANIX_PROD__: "false",
-        },
+        define: defines({ mode: "development", isClient: true }),
         plugins: [makeCjsWrapperPlugin(wrappers)],
     });
 };

package/dist/bin/bundler/config/defines.d.ts

@@ -0,0 +1,20 @@
+declare const defines: ({ mode, isClient, }: {
+    mode: "development" | "production";
+    isClient: boolean;
+}) => {
+    "process.env.NODE_ENV": string;
+    __XANIX_PAGE_NAVIGATION_HEADER_VALUE__: string;
+    __XANIX_CLIENT_RUNTIME_FILE_NAME__: string;
+    __XANIX_CLIENT__: string;
+    __XANIX_SERVER__: string;
+    __XANIX_DEV__: string;
+    __XANIX_PROD__: string;
+    XANIX_NAVIGATE: string;
+    XANIX_NAVIGATE_START: string;
+    XANIX_NAVIGATE_END: string;
+    XANIX_NAVIGATE_RELOAD: string;
+    XANIX_PRELOAD: string;
+    XANIX_PRELOAD_START: string;
+    XANIX_PRELOAD_END: string;
+};
+export default defines;

package/dist/bin/bundler/config/defines.js

@@ -0,0 +1,21 @@
+import { getClientRuntimeFileName, uid } from "../../include/utils.js";
+const HEARDER_VALUE = uid(Math.random().toString(36), 32);
+const defines = ({ mode, isClient, }) => {
+    return {
+        "process.env.NODE_ENV": JSON.stringify(mode),
+        __XANIX_PAGE_NAVIGATION_HEADER_VALUE__: JSON.stringify(HEARDER_VALUE),
+        __XANIX_CLIENT_RUNTIME_FILE_NAME__: JSON.stringify(getClientRuntimeFileName(mode)),
+        __XANIX_CLIENT__: isClient ? "true" : "false",
+        __XANIX_SERVER__: isClient ? "false" : "true",
+        __XANIX_DEV__: mode === "development" ? "true" : "false",
+        __XANIX_PROD__: mode === "production" ? "true" : "false",
+        XANIX_NAVIGATE: JSON.stringify("xanix:navigate"),
+        XANIX_NAVIGATE_START: JSON.stringify("xanix:navigate:start"),
+        XANIX_NAVIGATE_END: JSON.stringify("xanix:navigate:end"),
+        XANIX_NAVIGATE_RELOAD: JSON.stringify("xanix:navigate:reload"),
+        XANIX_PRELOAD: JSON.stringify("xanix:preload"),
+        XANIX_PRELOAD_START: JSON.stringify("xanix:preload:start"),
+        XANIX_PRELOAD_END: JSON.stringify("xanix:preload:end"),
+    };
+};
+export default defines;

package/dist/bin/bundler/config/external.d.ts

@@ -0,0 +1 @@
+export default function external(id: string): boolean;

package/dist/bin/bundler/config/external.js

@@ -0,0 +1,12 @@
+import path from "node:path";
+import { tsconfigPathsMatcher } from "../plugins/XanixTsconfigAlias.js";
+export default function external(id) {
+    if (id.startsWith(".") ||
+        path.isAbsolute(id) ||
+        id.startsWith("xanix") ||
+        id === "virtual:xanix-document" ||
+        tsconfigPathsMatcher(id)) {
+        return false;
+    }
+    return true;
+}

package/dist/bin/bundler/config/output.js

@@ -1,5 +1,4 @@
 import outdirs from "../../../outdirs.js";
-const root = process.cwd();
 const client = (entries, { isDev }) => {
     const _entries = {};
     for (const entry of entries) {

package/dist/bin/bundler/dep-generateClientEntries.d.ts

@@ -0,0 +1,5 @@
+import { type XanixClientEntry } from "../types.js";
+declare const generateClientEntries: ({ rootEntry, }: {
+    rootEntry: string;
+}) => Promise<XanixClientEntry[]>;
+export default generateClientEntries;

package/dist/bin/bundler/dep-generateClientEntries.js

@@ -0,0 +1,25 @@
+import { rollup } from "rollup";
+import path from "node:path";
+import { xanixGenerateClientEntryPlugins } from "./plugins/plugins.js";
+import external from "./config/external.js";
+const root = process.cwd();
+const generateClientEntries = async ({ rootEntry, }) => {
+    const entries = new Map();
+    const bundle = await rollup({
+        input: path.resolve(root, rootEntry),
+        plugins: [
+            ...xanixGenerateClientEntryPlugins({
+                entries,
+            }),
+        ],
+        external(id) {
+            if (!external(id)) {
+                return false;
+            }
+            return true;
+        },
+    });
+    await bundle.close();
+    return Array.from(entries.values());
+};
+export default generateClientEntries;

package/dist/bin/bundler/generateClientEntries.js

@@ -1,27 +1,19 @@
 import { rollup } from "rollup";
 import path from "node:path";
-import { XanixEntryFinder } from "./plugins/XanixEntryFinder/index.js";
-import { xanixDefaultPlugins } from "./plugins/plugins.js";
+import { xanixGenerateClientEntryPlugins, } from "./plugins/plugins.js";
+import external from "./config/external.js";
 const root = process.cwd();
 const generateClientEntries = async ({ rootEntry, }) => {
     const entries = new Map();
     const bundle = await rollup({
         input: path.resolve(root, rootEntry),
         plugins: [
-            XanixEntryFinder({
+            ...xanixGenerateClientEntryPlugins({
                 entries,
             }),
-            ...xanixDefaultPlugins({
-                target: "server",
-                development: true,
-                assetExternal: true,
-            }),
         ],
         external(id) {
-            if (id.startsWith(".") ||
-                path.isAbsolute(id) ||
-                id === "@" ||
-                id.startsWith("@/")) {
+            if (!external(id)) {
                 return false;
             }
             return true;

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

@@ -23,11 +23,21 @@ export default function xanixDocument() {
             const document = fs.existsSync(userDocument)
                 ? userDocument
                 : baseDocument;
-            return `
-import Document from ${JSON.stringify(document)};
-
-export default Document;
-      `;
+            const source = fs.readFileSync(document, "utf8");
+            // Detect common metadata export forms.
+            const hasMetadata = /\bexport\s+(?:const|let|var|function|class)\s+metadata\b/.test(source) || /\bexport\s*\{\s*[^}]*\bmetadata\b[^}]*\}/.test(source);
+            if (hasMetadata) {
+                return `
+import Document, * as DocumentModule from ${JSON.stringify(document)};
+export const metadata = DocumentModule.metadata;
+export default Document;
+`;
+            }
+            return `
+import Document from ${JSON.stringify(document)};
+export const metadata = async () => ({});
+export default Document;
+`;
         },
     };
 }

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

@@ -5,10 +5,8 @@ import { parse } from "@babel/parser";
 import traverse from "@babel/traverse";
 import * as t from "@babel/types";
 import outdirs from "../../../../outdirs.js";
+import { normalizePath } from "../../../include/utils.js";
 const SOURCE_EXTENSIONS = [".tsx", ".ts", ".jsx", ".js", ".mjs", ".cjs"];
-function normalizeFilePath(file) {
-    return path.resolve(file).split(path.sep).join("/");
-}
 export function resolveFile(file) {
     const absolute = path.resolve(file);
     if (fs.existsSync(absolute)) {
@@ -136,18 +134,18 @@ export function entryFinder(code, id) {
             if (!path.isAbsolute(componentFile)) {
                 return;
             }
-            const normalizedFile = normalizeFilePath(componentFile);
+            const normalizedFile = normalizePath(componentFile);
             const clientId = createClientId(normalizedFile);
             const root = process.cwd();
             const relativeSource = path.relative(root, componentFile);
             const parsed = path.parse(relativeSource);
-            const buildPath = normalizeFilePath(path.resolve(root, outdirs.root, parsed.dir, `${parsed.name}.js`));
+            const buildPath = normalizePath(path.resolve(root, outdirs.root, parsed.dir, `${parsed.name}.js`));
             const entry = {
                 id: clientId,
                 name: componentName,
                 file: normalizedFile,
                 path: componentImportPath,
-                build: buildPath,
+                // build: buildPath,
                 export: componentImport.export,
             };
             entries.set(clientId, entry);

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

@@ -21,16 +21,17 @@ export function XanixEntryFinder({ entries }) {
             }
             return null;
         },
-        generateBundle() {
-            const manifest = {
-                version: 1,
-                entries: [...entries.values()],
-            };
-            this.emitFile({
-                type: "asset",
-                fileName: "client-manifest.json",
-                source: JSON.stringify(manifest, null, 2),
-            });
-        },
+        // generateBundle() {
+        //   const manifest = {
+        //     version: 1,
+        //     entries: [...entries.values()],
+        //   };
+        //   console.log(manifest);
+        //   this.emitFile({
+        //     type: "asset",
+        //     fileName: "client-manifest.json",
+        //     source: JSON.stringify(manifest, null, 2),
+        //   });
+        // },
     };
 }

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

@@ -2,7 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import dotenv from "dotenv";
 import replace from "@rollup/plugin-replace";
-import { getClientRuntimeFileName } from "../../include/utils.js";
+import defines from "../config/defines.js";
 export default function XanixEnvPlugin(options = {}) {
     const root = process.cwd();
     const mode = options.mode ?? "development";
@@ -31,20 +31,11 @@ export default function XanixEnvPlugin(options = {}) {
         }
     }
     const envs = {
-        "process.env.NODE_ENV": JSON.stringify(mode),
         ...(isClient ? clientEnv : serverEnv),
-        __XANIX_CLIENT_RUNTIME_FILE_NAME__: JSON.stringify(getClientRuntimeFileName(mode)),
-        __XANIX_CLIENT__: JSON.stringify(isClient),
-        __XANIX_SERVER__: JSON.stringify(!isClient),
-        __XANIX_DEV__: JSON.stringify(mode === "development"),
-        __XANIX_PROD__: JSON.stringify(mode === "production"),
-        XANIX_NAVIGATE: JSON.stringify("xanix:navigate"),
-        XANIX_NAVIGATE_START: JSON.stringify("xanix:navigate:start"),
-        XANIX_NAVIGATE_END: JSON.stringify("xanix:navigate:end"),
-        XANIX_NAVIGATE_RELOAD: JSON.stringify("xanix:navigate:reload"),
-        XANIX_PRELOAD: JSON.stringify("xanix:preload"),
-        XANIX_PRELOAD_START: JSON.stringify("xanix:preload:start"),
-        XANIX_PRELOAD_END: JSON.stringify("xanix:preload:end"),
+        ...defines({
+            mode,
+            isClient,
+        }),
     };
     return replace({
         preventAssignment: true,

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

@@ -1,7 +1,15 @@
 import { transformer } from "./transformer.js";
 export default function XanixPageTransform() {
+    const entries = new Map();
+    let pending = false;
     return {
         name: "xanix-page-transform",
+        watchChange() {
+            entries.clear();
+        },
+        buildStart() {
+            entries.clear();
+        },
         async transform(code, id) {
             if (id.includes("node_modules") || !/\.(tsx?|jsx?)$/.test(id)) {
                 return null;
@@ -10,10 +18,30 @@ export default function XanixPageTransform() {
             if (!result) {
                 return null;
             }
+            for (const entry of result.entries) {
+                entries.set(entry.id, entry);
+            }
+            if (result.entries.length) {
+                pending = true;
+            }
             return {
                 code: result.code,
                 map: result.map,
             };
         },
+        async generateBundle() {
+            if (pending) {
+                const manifest = {
+                    id: `id_`,
+                    entries: [...entries.values()],
+                };
+                this.emitFile({
+                    type: "asset",
+                    fileName: "client-manifest.json",
+                    source: JSON.stringify(manifest, null, 2),
+                });
+                pending = false;
+            }
+        },
     };
 }

package/dist/bin/bundler/plugins/XanixPageTransform/transformer.d.ts

@@ -1,16 +1,18 @@
 import * as t from "@babel/types";
+export interface XanixPageEntry {
+    id: string;
+    name: string;
+    file: string;
+    path: string;
+    export: string;
+}
 export interface XanixTransformResult {
     code: string;
     map: any;
+    entries: XanixPageEntry[];
 }
 export declare function resolveFile(file: string): string;
 export declare function resolveComponentFile(importer: string, importPath: string): string;
 export declare function createPageId(file: string): string;
 export declare function getJSXComponentName(node: t.JSXElement): string | null;
-export declare function findComponentImport(ast: t.File, componentName: string): {
-    file: string;
-    export: string;
-    declaration: t.ImportDeclaration;
-    specifier: t.ImportSpecifier | t.ImportDefaultSpecifier;
-} | null;
 export declare function transformer(code: string, id: string): XanixTransformResult | null;