@madojs/mado 0.10.1 → 0.11.1

package/scripts/_config.mjs

@@ -1,20 +1,5 @@
-// Mado configuration loader.
-//
-// Single source of project configuration for `mado dev`, `mado build`,
-// `mado bundle`, `mado bake`, `mado preview`, `mado release`.
-//
-// Lookup order (first hit wins):
-//   1. `mado.config.json`  in PROJECT_ROOT (recommended)
-//   2. built-in defaults
-//
-// CLI flags always override file values, file values override defaults.
-//
-// Context detection:
-//   - "app"  : a user project that depends on `@madojs/mado`
-//   - "repo" : the framework repository itself (has src/index.ts and examples/)
-//
-// In app-mode, defaults assume the canonical layout from MADO_V1_PLAN.md:
-//   src/routes.ts  index.html  public/  dist/  out/
+// Small shared CLI helpers. Mado app configuration lives in vite.config.ts;
+// this file intentionally does not read any project config file.
 
 import { existsSync, readFileSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
@@ -22,177 +7,38 @@ import { fileURLToPath } from "node:url";
 
 const PACKAGE_ROOT = resolve(dirname(fileURLToPath(import.meta.url)), "..");
 
-/**
- * @typedef {Object} MadoDevConfig
- * @property {number} [port]
- * @property {Record<string,string>} [proxy]   // path → upstream base URL
- *
- * @typedef {Object} MadoBuildConfig
- * @property {string} [out]                    // deploy artifact dir (default: "out")
- * @property {string} [dist]                   // tsc output dir (default: "dist")
- * @property {string} [publicDir]              // static assets dir (default: "public")
- *
- * @typedef {Object} MadoBakeConfig
- * @property {string} [entry]                  // routes module (default: "src/routes.ts")
- * @property {string} [template]               // SPA shell html (default: "index.html")
- * @property {string} [baseUrl]                // canonical/sitemap base
- * @property {string} [outDir]                 // override (default: build.out + "/baked")
- *
- * @typedef {Object} MadoBundleConfig
- * @property {boolean} [splitting]
- * @property {Array<"gz"|"br">} [compress]
- *
- * @typedef {Object} MadoConfig
- * @property {"app"|"repo"} context
- * @property {string} projectRoot
- * @property {MadoDevConfig}    dev
- * @property {MadoBuildConfig}  build
- * @property {MadoBakeConfig}   bake
- * @property {MadoBundleConfig} bundle
- */
-
 /**
  * Detect whether we are inside the framework repository or inside a user app.
  *
- * Heuristic: the framework repo has both `src/index.ts` and an `examples/`
- * directory at PROJECT_ROOT. Anything else is treated as an app.
- *
  * @param {string} projectRoot
  * @returns {"app"|"repo"}
  */
 export function detectContext(projectRoot) {
   const looksLikeRepo =
     existsSync(join(projectRoot, "src/index.ts")) &&
-    existsSync(join(projectRoot, "examples")) &&
     existsSync(join(projectRoot, "package.json")) &&
     safeReadJson(join(projectRoot, "package.json"))?.name === "@madojs/mado";
   return looksLikeRepo ? "repo" : "app";
 }
 
 /**
- * Built-in defaults per context.
- *
- * @param {"app"|"repo"} context
- * @returns {MadoConfig}
- */
-function defaults(context) {
-  if (context === "repo") {
-    return {
-      context,
-      projectRoot: "",
-      dev:    { port: 5173, proxy: {} },
-      build:  { out: "out", dist: "dist", publicDir: "public" },
-      bake:   {
-        entry: "examples/basic/routes.ts",
-        template: "examples/index.html",
-        baseUrl: "https://example.com",
-      },
-      bundle: { splitting: true, compress: ["gz", "br"] },
-    };
-  }
-  return {
-    context,
-    projectRoot: "",
-    dev:    { port: 5173, proxy: {} },
-    build:  { out: "out", dist: "dist", publicDir: "public" },
-    bake:   {
-      entry: "src/routes.ts",
-      template: "index.html",
-      baseUrl: "https://example.com",
-    },
-    bundle: { splitting: true, compress: ["gz", "br"] },
-  };
-}
-
-/**
- * Load and merge configuration for the given project root.
- *
- * Precedence (low → high): defaults, mado.config.json, CLI overrides.
+ * Resolve a project-relative path against `projectRoot`.
  *
- * @param {Object} [opts]
- * @param {string} [opts.projectRoot=process.cwd()]
- * @param {Partial<MadoConfig>} [opts.overrides]
- * @returns {MadoConfig}
- */
-export function loadConfig(opts = {}) {
-  const projectRoot = resolve(opts.projectRoot ?? process.cwd());
-  const context = detectContext(projectRoot);
-  const base = defaults(context);
-  base.projectRoot = projectRoot;
-
-  const file = join(projectRoot, "mado.config.json");
-  const fromFile = existsSync(file) ? safeReadJson(file) ?? {} : {};
-
-  const merged = deepMerge(base, fromFile);
-  if (opts.overrides) deepMerge(merged, opts.overrides);
-
-  merged.context = context;
-  merged.projectRoot = projectRoot;
-  return merged;
-}
-
-/**
- * Resolve a project-relative path against `projectRoot`. Absolute paths are
- * returned unchanged.
- *
- * @param {MadoConfig} cfg
+ * @param {string} projectRoot
  * @param {string} p
  * @returns {string}
  */
-export function resolveProjectPath(cfg, p) {
-  if (!p) return cfg.projectRoot;
-  return resolve(cfg.projectRoot, p);
+export function resolveProjectPath(projectRoot, p) {
+  return resolve(projectRoot, p);
 }
 
-/**
- * @param {MadoConfig} cfg
- * @returns {string}
- */
 export function getPackageRoot() {
   return PACKAGE_ROOT;
 }
 
-// ---------- helpers ----------
-
-function safeReadJson(path) {
-  try {
-    return JSON.parse(readFileSync(path, "utf8"));
-  } catch (err) {
-    console.warn(`[mado] failed to parse ${path}: ${err.message}`);
-    return null;
-  }
-}
-
-/**
- * Shallow-deep merge: objects are merged recursively, arrays and primitives
- * are replaced. Mutates `target` and returns it.
- */
-function deepMerge(target, source) {
-  if (!source || typeof source !== "object") return target;
-  for (const [k, v] of Object.entries(source)) {
-    if (v === undefined) continue;
-    if (
-      v !== null &&
-      typeof v === "object" &&
-      !Array.isArray(v) &&
-      target[k] &&
-      typeof target[k] === "object" &&
-      !Array.isArray(target[k])
-    ) {
-      deepMerge(target[k], v);
-    } else {
-      target[k] = v;
-    }
-  }
-  return target;
-}
-
 /**
  * Tiny argv parser shared by CLI subcommands.
  *
- * Recognises `--key=value`, `--key value`, and `--flag` (boolean).
- * Unknown leading positionals are returned in `positional`.
- *
  * @param {string[]} argv
  * @returns {{ flags: Record<string, string|boolean>, positional: string[] }}
  */
@@ -221,4 +67,12 @@ export function parseFlags(argv) {
     }
   }
   return { flags, positional };
-}
+}
+
+function safeReadJson(path) {
+  try {
+    return JSON.parse(readFileSync(path, "utf8"));
+  } catch {
+    return null;
+  }
+}

package/scripts/bake.mjs

@@ -2,14 +2,16 @@
 //
 // Usage:
 //   mado bake
-//   mado bake --entry src/routes.ts --template index.html --out out/baked
+//   mado bake --entry src/routes.ts --template index.html --out out
 //   mado bake --base-url https://example.com
 //
-// Configuration precedence (low → high):
-//   built-in defaults  <  mado.config.json (bake.*)  <  CLI flags  <  env vars
+// Defaults:
+//   entry:    src/app.routes.ts, then src/routes.ts
+//   template: index.html
+//   out:      out/
 //
 // What it does:
-//   1. Bundles `entry` (routes module) with esbuild for Node consumption.
+//   1. Loads `entry` (routes module) through Vite SSR/module loading.
 //   2. For every route whose page has `bake`:
 //      a) gets params via `bake.paths()`,
 //      b) gets data per params via `bake.data(params)`,
@@ -25,36 +27,32 @@
 //   - In repo-mode (the framework repository itself) it aliases
 //     `@madojs/mado` → ./src/index.ts so the framework can dogfood itself.
 //
-// Required dev deps: linkedom, esbuild. We print a clear error if missing.
+// Required dev deps: linkedom, vite. We print a clear error if missing.
 
-import { readFile, writeFile, mkdir, rm } from "node:fs/promises";
+import { readFile, writeFile, mkdir } from "node:fs/promises";
 import { existsSync, writeSync } from "node:fs";
 import { join, dirname, resolve } from "node:path";
-import { pathToFileURL } from "node:url";
-import { tmpdir } from "node:os";
 
-import { loadConfig, parseFlags, resolveProjectPath } from "./_config.mjs";
+import { detectContext, parseFlags, resolveProjectPath } from "./_config.mjs";
 
 // ---------- Resolve options from config + flags + env ----------
 
 const { flags } = parseFlags(process.argv.slice(2));
-const cfg = loadConfig({
-  overrides: {
-    bake: {
-      entry: typeof flags.entry === "string" ? flags.entry : undefined,
-      template: typeof flags.template === "string" ? flags.template : undefined,
-      baseUrl: typeof flags["base-url"] === "string" ? flags["base-url"] : undefined,
-      outDir: typeof flags.out === "string" ? flags.out : undefined,
-    },
-  },
-});
-
-// Env vars are legacy escape hatches (kept so old CI keeps working).
-const ENTRY = process.env.ENTRY ?? resolveProjectPath(cfg, cfg.bake.entry);
-const TEMPLATE = process.env.TEMPLATE ?? resolveProjectPath(cfg, cfg.bake.template);
-const BASE_URL = process.env.BASE_URL ?? cfg.bake.baseUrl;
-const OUT_DIR = process.env.OUT_DIR
-  ?? resolveProjectPath(cfg, cfg.bake.outDir ?? join(cfg.build.out, "baked"));
+const PROJECT_ROOT = resolve(process.cwd());
+const CONTEXT = detectContext(PROJECT_ROOT);
+const ENTRY = resolveProjectPath(
+  PROJECT_ROOT,
+  typeof flags.entry === "string" ? flags.entry : pickDefaultEntry(PROJECT_ROOT),
+);
+const TEMPLATE = resolveProjectPath(
+  PROJECT_ROOT,
+  typeof flags.template === "string" ? flags.template : "index.html",
+);
+const BASE_URL = typeof flags["base-url"] === "string" ? flags["base-url"] : "https://example.com";
+const OUT_DIR = resolveProjectPath(
+  PROJECT_ROOT,
+  typeof flags.out === "string" ? flags.out : "out",
+);
 
 /** Write message to stderr and exit. Sync write keeps CI/execFile output reliable. */
 function fatal(...msgs) {
@@ -69,13 +67,13 @@ function error(...msgs) {
 if (!existsSync(ENTRY)) {
   fatal(
     `[bake] entry not found: ${ENTRY}`,
-    `[bake] set bake.entry in mado.config.json or pass --entry <file>`,
+    `[bake] expected src/app.routes.ts or src/routes.ts; pass --entry <file> to override`,
   );
 }
 if (!existsSync(TEMPLATE)) {
   fatal(
     `[bake] template not found: ${TEMPLATE}`,
-    `[bake] set bake.template in mado.config.json or pass --template <file>`,
+    `[bake] expected index.html; pass --template <file> to override`,
   );
 }
 
@@ -88,22 +86,22 @@ try {
   fatal(
     "[bake] package 'linkedom' is required.",
     "[bake] Install it as a dev dependency in this project:",
-    "[bake]   npm i -D linkedom esbuild",
-    "[bake] (esbuild is also required, see next check).",
+    "[bake]   npm i -D linkedom vite",
+    "[bake] (vite is also required, see next check).",
     "[bake] These are not bundled into @madojs/mado on purpose: bake is an",
     "[bake] optional build step and we don't want to add transitive deps to",
     "[bake] every Mado install.",
   );
 }
 
-let esbuild;
+let createViteServer;
 try {
-  esbuild = await import("esbuild");
+  ({ createServer: createViteServer } = await import("vite"));
 } catch {
   fatal(
-    "[bake] package 'esbuild' is required.",
+    "[bake] package 'vite' is required.",
     "[bake] Install it as a dev dependency in this project:",
-    "[bake]   npm i -D esbuild linkedom",
+    "[bake]   npm i -D vite linkedom",
   );
 }
 
@@ -139,46 +137,40 @@ if (!globalThis.queueMicrotask) {
   globalThis.queueMicrotask = (fn) => Promise.resolve().then(fn);
 }
 
-// ---------- Bundle the routes module for Node ----------
+// ---------- Load the routes module through Vite ----------
 //
 // In repo-mode the framework dogfoods its own source; alias `@madojs/mado`
 // to ./src/index.ts. In app-mode the package is resolved from node_modules.
 
-const tmpFile = join(tmpdir(), `mado-bake-${Date.now()}.mjs`);
-const aliases = cfg.context === "repo"
-  ? { "@madojs/mado": resolve(cfg.projectRoot, "src/index.ts") }
+const aliases = CONTEXT === "repo"
+  ? { "@madojs/mado": resolve(PROJECT_ROOT, "src/index.ts") }
   : {};
 
-const tsconfigCandidate = join(cfg.projectRoot, "tsconfig.json");
-const tsconfig = existsSync(tsconfigCandidate) ? tsconfigCandidate : undefined;
-
-await esbuild.build({
-  entryPoints: [ENTRY],
-  bundle: true,
-  format: "esm",
-  platform: "node",
-  target: "es2022",
-  outfile: tmpFile,
-  absWorkingDir: cfg.projectRoot,
-  tsconfig,
-  alias: aliases,
+const viteServer = await createViteServer({
+  root: PROJECT_ROOT,
   logLevel: "error",
+  server: { middlewareMode: true },
+  appType: "custom",
+  resolve: { alias: aliases },
 });
 
-const routesUrl = pathToFileURL(tmpFile).href;
-const routesModule = await import(routesUrl);
-await rm(tmpFile).catch(() => { });
+let routesModule;
+try {
+  routesModule = await viteServer.ssrLoadModule(toViteId(ENTRY));
+} catch (err) {
+  await closeAndFatal(`[bake] failed to load ${ENTRY}: ${err.message}`);
+}
 const routeApi = routesModule.default;
 
 if (!routeApi) {
-  fatal(`[bake] ${ENTRY} must default-export routes({...})`);
+  await closeAndFatal(`[bake] ${ENTRY} must default-export routes({...})`);
 }
 
 // Bake needs the source manifest (not the runtime RouterApi).
 // routes.ts must therefore also `export const manifest = {...}`.
 const manifest = routesModule.manifest;
 if (!manifest) {
-  fatal(
+  await closeAndFatal(
     `[bake] ${ENTRY} must also \`export const manifest = {...}\` ` +
     "(the same object passed to routes()).",
   );
@@ -290,7 +282,7 @@ await writeFile(join(OUT_DIR, "sitemap.xml"), sitemap);
 
 console.log(`[bake] done: ${total} pages + sitemap.xml → ${OUT_DIR}`);
 if (bakedErrors > 0) {
-  fatal(`[bake] ${bakedErrors} route(s) failed; see errors above.`);
+  await closeAndFatal(`[bake] ${bakedErrors} route(s) failed; see errors above.`);
 }
 // Loud diagnostic when the manifest exists but no page declares `bake`.
 // Previously bake silently produced 0 pages + an empty sitemap and exited
@@ -319,10 +311,13 @@ if (bakeablePages === 0) {
   // it. If you intentionally have an SPA-only deploy, drop `mado bake` from
   // the release pipeline (or set MADO_BAKE_ALLOW_EMPTY=1).
   if (process.env.MADO_BAKE_ALLOW_EMPTY !== "1") {
+    await viteServer.close();
     process.exit(1);
   }
 }
 
+await viteServer.close();
+
 // ---------- Helpers ----------
 
 async function resolvePage(entry) {
@@ -339,6 +334,21 @@ async function resolvePage(entry) {
   return null;
 }
 
+function toViteId(path) {
+  return path.split("\\").join("/");
+}
+
+function pickDefaultEntry(projectRoot) {
+  const appRoutes = "src/app.routes.ts";
+  if (existsSync(resolve(projectRoot, appRoutes))) return appRoutes;
+  return "src/routes.ts";
+}
+
+async function closeAndFatal(...msgs) {
+  await viteServer.close().catch(() => { });
+  fatal(...msgs);
+}
+
 function applyParams(pattern, params) {
   return pattern.replace(/:([\w]+)/g, (_, k) => {
     const v = params[k];
@@ -358,13 +368,14 @@ function renderTemplate(tpl, ctx) {
   if (typeof tpl === "string") return escapeHtml(tpl);
   if (typeof tpl === "number") return String(tpl);
   if (Array.isArray(tpl)) return tpl.map((x) => renderTemplate(x, ctx)).join("");
-  if (tpl && tpl._mado === true) return renderMadoTemplate(tpl, ctx);
-  // Unknown shapes (e.g. each() directive results) must NOT silently render
-  // as "[object Object]". Either each() unwraps to an array here, or we
-  // throw with a meaningful location.
-  if (tpl && typeof tpl === "object") {
+  if (typeof tpl === "object") {
+    if (tpl._mado === true) return renderMadoTemplate(tpl, ctx);
+
+    // Unknown shapes (e.g. each() directive results) must NOT silently render
+    // as "[object Object]". Either each() unwraps to an array here, or we
+    // throw with a meaningful location.
     throw new Error(
-      `bake cannot render value of type "${tpl?._type ?? tpl?.constructor?.name ?? "object"}" ` +
+      `bake cannot render value of type "${tpl._type ?? tpl.constructor?.name ?? "object"}" ` +
       `in route ${ctx?.route ?? "?"}. ` +
       "Hint: each() and other directives are not yet supported in bake. " +
       "Use a plain array (items.map(render)) in baked views, or render this " +