@apex-stack/core 0.1.19 → 0.2.0

package/dist/{make-JAW22LQZ.js → make-VAYO5GWA.js}

@@ -79,32 +79,98 @@ export default defineApexRoute({
 })
 `;
 }
+function serviceTemplate(name) {
+  const cls = `${pascalCase(name)}Service`;
+  return `/**
+ * ${cls} \u2014 business logic as a plain, testable class. Keep routes and loaders
+ * thin and delegate to services like this one (the clean-code backbone).
+ */
+export class ${cls} {
+  // Replace with your methods.
+  run(input: string): string {
+    return input
+  }
+}
+`;
+}
+function middlewareTemplate() {
+  return `import { defineMiddleware } from '@apex-stack/core'
+
+// Runs on every request before the page/API handler. Attach request-scoped
+// state to ctx.locals (read in a page loader via \`loader({ locals })\` and in
+// route handlers via \`{ locals }\`), or return ctx.redirect('/path') to
+// short-circuit. Files run in filename order \u2014 prefix with 01. / 02. to order.
+export default defineMiddleware((ctx) => {
+  // ctx.locals.user = await getUser(ctx.headers)
+  // if (ctx.url.startsWith('/admin') && !ctx.locals.user) return ctx.redirect('/login')
+})
+`;
+}
+function testTemplate(name) {
+  return `import { describe, expect, it } from 'vitest'
+
+describe('${name}', () => {
+  it('works', () => {
+    expect(true).toBe(true)
+  })
+})
+`;
+}
 function plan(kind, name, root) {
   switch (kind) {
     case "page":
       return { path: join(root, "pages", `${name}.alpine`), contents: pageTemplate(name) };
     case "component":
-      return { path: join(root, "components", `${pascalCase(name)}.alpine`), contents: componentTemplate() };
+      return {
+        path: join(root, "components", `${pascalCase(name)}.alpine`),
+        contents: componentTemplate()
+      };
     case "api":
       return { path: join(root, "server", "api", `${name}.ts`), contents: apiTemplate(name) };
     case "store":
       return { path: join(root, "stores", `${name}.ts`), contents: storeTemplate(name) };
     case "layout":
       return { path: join(root, "layouts", `${name}.alpine`), contents: layoutTemplate() };
+    case "service":
+      return {
+        path: join(root, "services", `${pascalCase(name)}Service.ts`),
+        contents: serviceTemplate(name)
+      };
+    case "test":
+      return { path: join(root, "tests", `${name}.test.ts`), contents: testTemplate(name) };
+    case "middleware":
+      return { path: join(root, "middleware", `${name}.ts`), contents: middlewareTemplate() };
   }
 }
 var makeCommand = defineCommand({
-  meta: { name: "make", description: "Generate a page, component, API route, store, or layout" },
+  meta: {
+    name: "make",
+    description: "Generate a page, component, API route, store, layout, service, test, or middleware"
+  },
   args: {
-    kind: { type: "positional", required: true, description: "page | component | api | store | layout" },
+    kind: {
+      type: "positional",
+      required: true,
+      description: "page | component | api | store | layout | service | test | middleware"
+    },
     name: { type: "positional", required: true, description: "Name (about, Counter, todos, \u2026)" },
     root: { type: "string", description: "Project root", default: "." }
   },
   run({ args }) {
     const kind = args.kind;
-    if (kind !== "page" && kind !== "component" && kind !== "api" && kind !== "store" && kind !== "layout") {
+    const kinds = [
+      "page",
+      "component",
+      "api",
+      "store",
+      "layout",
+      "service",
+      "test",
+      "middleware"
+    ];
+    if (!kinds.includes(kind)) {
       console.error(`
-  Unknown type "${args.kind}". Use: page | component | api | store | layout
+  Unknown type "${args.kind}". Use: ${kinds.join(" | ")}
 `);
       process.exit(1);
     }

package/dist/{mcp-DL4J6JFJ.js → mcp-CH7L4GF3.js}

@@ -30,7 +30,7 @@ var mcpCommand = defineCommand({
       console.log(`
   \x1B[36m${args.call}\x1B[0m(${args.args}) \u2192`);
       for (const part of result.content) {
-        console.log("  " + (part.text ?? JSON.stringify(part)));
+        console.log(`  ${part.text ?? JSON.stringify(part)}`);
       }
       console.log();
     } else {

package/dist/{migrate-NOGFOFV2.js → migrate-X6LIHMIE.js}

@@ -19,7 +19,9 @@ var migrateCommand = defineCommand({
       const require2 = createRequire(join(root, "package.json"));
       data = await import(pathToFileURL(require2.resolve("@apex-stack/data")).href);
     } catch {
-      console.error("\n  @apex-stack/data is not installed in this project. Run: npm i @apex-stack/data\n");
+      console.error(
+        "\n  @apex-stack/data is not installed in this project. Run: npm i @apex-stack/data\n"
+      );
       process.exit(1);
     }
     const config = args.driver === "postgres" ? { driver: "postgres", url: args.url } : args.driver === "pglite" ? { driver: "pglite", dir: args.url } : resolve(root, args.db);

package/dist/{server-L3V34B5X.js → server-PTHGOE42.js}

@@ -4,17 +4,20 @@ import {
 import {
   createApiHandler,
   createMcpHandler,
-  loadApiRoutes
-} from "./chunk-JWYNLP4L.js";
-import "./chunk-HRJTOSYH.js";
+  loadApiRoutes,
+  loadMiddleware,
+  runMiddleware
+} from "./chunk-HCNNKT4A.js";
+import "./chunk-2C2HRLIY.js";
 import {
   loadStores,
   matchRoute,
   renderIslandsPage,
   renderPage,
+  resolveApexConfig,
   scanPages
-} from "./chunk-XSN6NDWP.js";
-import "./chunk-MZVLRU3R.js";
+} from "./chunk-XDKJO6ZC.js";
+import "./chunk-JLIAISWM.js";
 
 // src/dev/server.ts
 import { existsSync as existsSync2, readdirSync } from "fs";
@@ -27,6 +30,7 @@ import {
   createApp,
   defineEventHandler,
   fromNodeMiddleware,
+  getRequestHeaders,
   setResponseHeader,
   setResponseStatus,
   toNodeListener
@@ -36,20 +40,24 @@ import { createServer as createViteServer } from "vite";
 // src/dev/errorPage.ts
 import { existsSync, readFileSync } from "fs";
 function esc(s) {
-  return s.replace(/[&<>"]/g, (c) => c === "&" ? "&amp;" : c === "<" ? "&lt;" : c === ">" ? "&gt;" : "&quot;");
+  return s.replace(
+    /[&<>"]/g,
+    (c) => c === "&" ? "&amp;" : c === "<" ? "&lt;" : c === ">" ? "&gt;" : "&quot;"
+  );
 }
 function firstFileFrame(stack, root) {
   const re = /(?:file:\/\/\/?)?((?:[A-Za-z]:[\\/]|\/)[^\s():]+):(\d+):(\d+)/g;
-  let m;
   const frames = [];
-  while (m = re.exec(stack)) {
+  let m = re.exec(stack);
+  while (m) {
     const raw = m[1];
-    if (!raw) continue;
-    if (/^[A-Za-z]:[\\/]/.test(raw) === false && !raw.startsWith("/")) continue;
-    const file = raw.replace(/\//g, process.platform === "win32" ? "\\" : "/");
-    if (existsSync(file) && !file.includes("node_modules")) {
-      frames.push({ file, line: Number(m[2] ?? 0), col: Number(m[3] ?? 0) });
+    if (raw && (/^[A-Za-z]:[\\/]/.test(raw) || raw.startsWith("/"))) {
+      const file = raw.replace(/\//g, process.platform === "win32" ? "\\" : "/");
+      if (existsSync(file) && !file.includes("node_modules")) {
+        frames.push({ file, line: Number(m[2] ?? 0), col: Number(m[3] ?? 0) });
+      }
     }
+    m = re.exec(stack);
   }
   return frames.find((f) => f.file.startsWith(root)) ?? frames[0];
 }
@@ -174,7 +182,9 @@ async function startDevServer(options) {
     plugins.unshift(tw());
   } catch {
   }
-  const appCssRel = ["app.css", "styles/app.css", "src/app.css"].find((p) => existsSync2(join(options.root, p)));
+  const appCssRel = ["app.css", "styles/app.css", "src/app.css"].find(
+    (p) => existsSync2(join(options.root, p))
+  );
   const appCss = appCssRel ? `/${appCssRel}` : void 0;
   const vite = await createViteServer({
     root: options.root,
@@ -192,11 +202,43 @@ async function startDevServer(options) {
     const resolved = id[0] === "/" && !id.startsWith(options.root) ? join(options.root, id).replace(/\\/g, "/") : id;
     return vite.ssrLoadModule(resolved);
   };
+  const { runtimeConfig, publicConfig } = await resolveApexConfig(
+    options.root,
+    (id) => ssrLoad(id)
+  );
   const app = createApp();
   app.use(fromNodeMiddleware(vite.middlewares));
+  app.use(
+    defineEventHandler(async (event) => {
+      const mws = await loadMiddleware(options.root, (id) => ssrLoad(id));
+      if (!mws.length) return;
+      const { redirect, locals } = await runMiddleware(mws, {
+        url: event.path || "/",
+        method: event.method,
+        config: runtimeConfig,
+        headers: getRequestHeaders(event)
+      });
+      event.context.apexLocals = locals;
+      if (redirect) {
+        setResponseStatus(event, redirect.status);
+        setResponseHeader(event, "Location", redirect.to);
+        return "";
+      }
+    })
+  );
   const loadEntries = () => loadApiRoutes(options.root, (id) => ssrLoad(id));
-  app.use("/api", defineEventHandler((event) => loadEntries().then((e) => createApiHandler(e)(event))));
-  app.use("/mcp", defineEventHandler((event) => loadEntries().then((e) => createMcpHandler(e)(event))));
+  app.use(
+    "/api",
+    defineEventHandler(
+      (event) => loadEntries().then((e) => createApiHandler(e, runtimeConfig)(event))
+    )
+  );
+  app.use(
+    "/mcp",
+    defineEventHandler(
+      (event) => loadEntries().then((e) => createMcpHandler(e, runtimeConfig)(event))
+    )
+  );
   app.use(
     defineEventHandler(async (event) => {
       const url = event.path || "/";
@@ -226,6 +268,10 @@ async function startDevServer(options) {
           stores,
           appCss,
           layouts,
+          runtimeConfig,
+          publicConfig,
+          locals: event.context.apexLocals ?? {},
+          errorPageId: existsSync2(join(options.root, "pages", "error.alpine")) ? "/pages/error.alpine" : void 0,
           transformHtml: (u, doc) => vite.transformIndexHtml(u, doc)
         });
         setResponseHeader(event, "Content-Type", "text/html");
@@ -252,9 +298,7 @@ async function startDevServer(options) {
     port,
     close: async () => {
       await vite.close();
-      await new Promise(
-        (resolve, reject) => server.close((e) => e ? reject(e) : resolve())
-      );
+      await new Promise((resolve, reject) => server.close((e) => e ? reject(e) : resolve()));
     }
   };
 }

package/dist/{start-AUJJ7HAY.js → start-3O3E43PT.js}

@@ -2,15 +2,17 @@ import {
   createApiHandler,
   createMcpHandler,
   expandApiModule,
-  hasMcpRoutes
-} from "./chunk-JWYNLP4L.js";
-import "./chunk-HRJTOSYH.js";
+  hasMcpRoutes,
+  runMiddleware
+} from "./chunk-HCNNKT4A.js";
+import "./chunk-2C2HRLIY.js";
 import {
+  applyEnvToRuntimeConfig,
   matchRoute,
   renderIslandsPage,
   renderPage
-} from "./chunk-XSN6NDWP.js";
-import "./chunk-MZVLRU3R.js";
+} from "./chunk-XDKJO6ZC.js";
+import "./chunk-JLIAISWM.js";
 
 // src/commands/start.ts
 import { existsSync as existsSync2 } from "fs";
@@ -18,13 +20,14 @@ import { join as join2, resolve } from "path";
 import { defineCommand } from "citty";
 
 // src/prod/server.ts
-import { createServer as createHttpServer } from "http";
 import { existsSync, readFileSync, statSync } from "fs";
+import { createServer as createHttpServer } from "http";
 import { join } from "path";
 import { pathToFileURL } from "url";
 import {
   createApp,
   defineEventHandler,
+  getRequestHeaders,
   getRequestURL,
   setResponseHeader,
   setResponseStatus,
@@ -46,6 +49,11 @@ async function startProdServer(options) {
   const dir = options.dir;
   const port = options.port ?? 3e3;
   const manifest = JSON.parse(readFileSync(join(dir, "apex-manifest.json"), "utf8"));
+  const runtimeConfig = applyEnvToRuntimeConfig(
+    manifest.runtimeConfig ?? { public: {} },
+    process.cwd()
+  );
+  const publicConfig = runtimeConfig.public ?? {};
   const importServer = (relFile) => import(pathToFileURL(join(dir, "server", relFile)).href);
   const registry = {};
   let componentCss = "";
@@ -60,7 +68,13 @@ async function startProdServer(options) {
     const mod = await importServer(serverFile);
     apiEntries.push(...expandApiModule(name, mod.default));
   }
+  const middleware = [];
+  for (const { serverFile } of manifest.middleware ?? []) {
+    const mod = await importServer(serverFile);
+    if (typeof mod.default === "function") middleware.push(mod.default);
+  }
   const serverFileFor = new Map(manifest.routes.map((r) => [r.pageId, r.serverFile]));
+  const errorPageId = serverFileFor.has("/pages/error.alpine") ? "/pages/error.alpine" : void 0;
   const loadModule = (id) => importServer(serverFileFor.get(id));
   const app = createApp();
   app.use(
@@ -72,12 +86,31 @@ async function startProdServer(options) {
       if (!file.startsWith(dir) || !existsSync(file) || !statSync(file).isFile()) return;
       const ext = path.slice(path.lastIndexOf("."));
       setResponseHeader(event, "Content-Type", MIME[ext] ?? "application/octet-stream");
-      if (path.startsWith("/assets/")) setResponseHeader(event, "Cache-Control", "public, max-age=31536000, immutable");
+      if (path.startsWith("/assets/"))
+        setResponseHeader(event, "Cache-Control", "public, max-age=31536000, immutable");
       return readFileSync(file);
     })
   );
-  if (apiEntries.length) app.use("/api", createApiHandler(apiEntries));
-  if (hasMcpRoutes(apiEntries)) app.use("/mcp", createMcpHandler(apiEntries));
+  if (middleware.length) {
+    app.use(
+      defineEventHandler(async (event) => {
+        const { redirect, locals } = await runMiddleware(middleware, {
+          url: getRequestURL(event).pathname,
+          method: event.method,
+          config: runtimeConfig,
+          headers: getRequestHeaders(event)
+        });
+        event.context.apexLocals = locals;
+        if (redirect) {
+          setResponseStatus(event, redirect.status);
+          setResponseHeader(event, "Location", redirect.to);
+          return "";
+        }
+      })
+    );
+  }
+  if (apiEntries.length) app.use("/api", createApiHandler(apiEntries, runtimeConfig));
+  if (hasMcpRoutes(apiEntries)) app.use("/mcp", createMcpHandler(apiEntries, runtimeConfig));
   app.use(
     defineEventHandler(async (event) => {
       const url = getRequestURL(event).pathname;
@@ -96,7 +129,11 @@ async function startProdServer(options) {
         url,
         registry,
         componentCss,
-        clientHref: route?.clientHref
+        clientHref: route?.clientHref,
+        runtimeConfig,
+        publicConfig,
+        locals: event.context.apexLocals ?? {},
+        errorPageId
       });
       setResponseHeader(event, "Content-Type", "text/html");
       return html;

package/dist/upgrade-WC5F5FKY.js

@@ -0,0 +1,168 @@
+import {
+  offerExtension
+} from "./chunk-CHBSGOB3.js";
+import {
+  VERSION,
+  banner,
+  color
+} from "./chunk-QIXJSQLW.js";
+
+// src/commands/upgrade.ts
+import { spawnSync } from "child_process";
+import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "fs";
+import { basename, dirname, join, relative, resolve } from "path";
+import { fileURLToPath } from "url";
+import { defineCommand } from "citty";
+var TEMPLATE_DIR = fileURLToPath(new URL("../templates/default", import.meta.url));
+var PROTECTED = /* @__PURE__ */ new Set(["package.json"]);
+function projectName(root) {
+  try {
+    return JSON.parse(readFileSync(join(root, "package.json"), "utf8")).name || basename(root);
+  } catch {
+    return basename(root);
+  }
+}
+function bumpApexDeps(root) {
+  const pkgPath = join(root, "package.json");
+  const pkg = JSON.parse(readFileSync(pkgPath, "utf8"));
+  let bumped = 0;
+  for (const field of ["dependencies", "devDependencies"]) {
+    const deps = pkg[field];
+    if (!deps) continue;
+    for (const dep of Object.keys(deps)) {
+      if (dep.startsWith("@apex-stack/") && /^[\d^~]/.test(deps[dep] ?? "")) {
+        if (deps[dep] !== `^${VERSION}`) {
+          deps[dep] = `^${VERSION}`;
+          bumped++;
+        }
+      }
+    }
+  }
+  if (bumped) writeFileSync(pkgPath, `${JSON.stringify(pkg, null, 2)}
+`);
+  return bumped;
+}
+function detectPm() {
+  const ua = process.env.npm_config_user_agent || "";
+  if (ua.startsWith("pnpm")) return "pnpm";
+  if (ua.startsWith("yarn")) return "yarn";
+  if (ua.startsWith("bun")) return "bun";
+  return "npm";
+}
+function walk(dir, onFile) {
+  for (const entry of readdirSync(dir, { withFileTypes: true })) {
+    const p = join(dir, entry.name);
+    if (entry.isDirectory()) walk(p, onFile);
+    else onFile(p);
+  }
+}
+function targetRelPath(rel) {
+  return basename(rel) === "_gitignore" ? join(dirname(rel), ".gitignore") : rel;
+}
+var upgradeCommand = defineCommand({
+  meta: {
+    name: "upgrade",
+    description: "Adopt new scaffold defaults in an existing app (non-destructive)"
+  },
+  args: {
+    root: { type: "positional", required: false, description: "Project root", default: "." },
+    force: {
+      type: "boolean",
+      default: false,
+      description: "Re-sync files that differ from the template (package.json is always preserved)"
+    },
+    install: {
+      type: "boolean",
+      default: true,
+      description: "Run the package manager after bumping @apex-stack/* (use --no-install to skip)"
+    },
+    vscode: {
+      type: "boolean",
+      description: "Install the Apex VS Code extension (skip the prompt)"
+    }
+  },
+  async run({ args }) {
+    const root = resolve(process.cwd(), String(args.root));
+    const log = console.log;
+    if (!existsSync(join(root, "package.json"))) {
+      console.error(`
+  ${color.red("\u2717")} No package.json in ${root} \u2014 is this an Apex project?
+`);
+      process.exit(1);
+    }
+    const name = projectName(root);
+    process.stdout.write(banner());
+    const added = [];
+    const updated = [];
+    let unchanged = 0;
+    walk(TEMPLATE_DIR, (absFile) => {
+      const rel = targetRelPath(relative(TEMPLATE_DIR, absFile));
+      const target = join(root, rel);
+      let content = readFileSync(absFile, "utf8");
+      if (content.includes("{{name}}")) content = content.replaceAll("{{name}}", name);
+      if (!existsSync(target)) {
+        mkdirSync(dirname(target), { recursive: true });
+        writeFileSync(target, content);
+        added.push(rel);
+        return;
+      }
+      if (args.force && !PROTECTED.has(rel)) {
+        if (readFileSync(target, "utf8") !== content) {
+          writeFileSync(target, content);
+          updated.push(rel);
+          return;
+        }
+      }
+      unchanged++;
+    });
+    if (added.length) {
+      log(`
+  ${color.green("+")} Added ${added.length} new file(s):`);
+      for (const f of added.sort()) log(`      ${color.green(f)}`);
+    }
+    if (updated.length) {
+      log(`
+  ${color.cyan("~")} Re-synced ${updated.length} file(s):`);
+      for (const f of updated.sort()) log(`      ${color.cyan(f)}`);
+    }
+    if (added.length || updated.length) {
+      log(`
+  ${color.gray(`${unchanged} existing file(s) left untouched.`)}`);
+    }
+    const bumped = bumpApexDeps(root);
+    if (bumped)
+      log(`
+  ${color.cyan("\u2191")} Bumped ${bumped} @apex-stack/* dependency \u2192 ^${VERSION}`);
+    if (!added.length && !updated.length && !bumped) {
+      log(`
+  ${color.green("\u2713")} Already up to date.`);
+    }
+    if (bumped && args.install) {
+      const pm = detectPm();
+      log(`
+  ${color.gray(`Installing with ${pm}\u2026`)}`);
+      const ok = spawnSync(pm, ["install"], {
+        cwd: root,
+        stdio: "inherit",
+        shell: process.platform === "win32"
+      }).status === 0;
+      log(
+        ok ? `  ${color.green("\u2713")} Dependencies updated` : `  ${color.red("\u2717")} Install failed \u2014 run ${color.cyan(`${pm} install`)} yourself`
+      );
+    } else if (bumped) {
+      log(
+        `  ${color.gray("Run")} ${color.cyan(`${detectPm()} install`)} ${color.gray("to apply.")}`
+      );
+    }
+    const ext = await offerExtension(args.vscode);
+    if (ext) log(`  ${color.green("\u2713")} ${ext}`);
+    log(
+      `
+  ${color.gray("Non-destructive: your files are never overwritten")}${args.force ? color.gray(" except with --force") : color.gray(" (use --force to re-sync)")}${color.gray("; package.json entries are only version-bumped.")}
+`
+    );
+  }
+});
+export {
+  upgradeCommand
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apex-stack/core",
-  "version": "0.1.19",
+  "version": "0.2.0",
   "description": "The full-stack meta-framework for Alpine.js — CLI and runtime",
   "type": "module",
   "license": "MIT",
@@ -37,7 +37,8 @@
   },
   "files": [
     "dist",
-    "templates"
+    "templates",
+    "vscode"
   ],
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.29.0",
@@ -45,8 +46,8 @@
     "h3": "^1.13.0",
     "vite": "^6.0.7",
     "zod": "^4.4.3",
-    "@apex-stack/kit": "0.1.5",
-    "@apex-stack/vite": "0.1.5"
+    "@apex-stack/kit": "0.2.0",
+    "@apex-stack/vite": "0.1.6"
   },
   "peerDependencies": {
     "alpinejs": "^3.14.0"

package/templates/default/.env.example

@@ -0,0 +1,9 @@
+# Copy to `.env` and fill in. These override the defaults in apex.config.ts.
+# Private keys: APEX_<KEY>.  Public keys (sent to the browser): APEX_PUBLIC_<KEY>.
+
+# Private — server-only
+APEX_API_SECRET=
+
+# Public — readable in the browser
+APEX_PUBLIC_APP_NAME={{name}}
+APEX_PUBLIC_SITE_URL=http://localhost:3000