@apex-stack/core 0.1.17 → 0.1.19

package/dist/{build-KJF4LJWP.js → build-J47A3B4Y.js}

@@ -5,7 +5,7 @@ import {
   renderIslandsPage,
   renderPage,
   scanPages
-} from "./chunk-7GPCNGGO.js";
+} from "./chunk-XSN6NDWP.js";
 import "./chunk-MZVLRU3R.js";
 
 // src/commands/build.ts

package/dist/{chunk-7GPCNGGO.js → chunk-XSN6NDWP.js}

@@ -89,14 +89,17 @@ function scanPages(root) {
     const parts = rel.replace(/\.alpine$/, "").split("/");
     if (parts[parts.length - 1] === "index") parts.pop();
     const segments = parts.map((p) => {
+      const catchAll = /^\[\.\.\.(.+)\]$/.exec(p);
+      if (catchAll) return { catchAll: catchAll[1] };
       const m = /^\[(.+)\]$/.exec(p);
       return m ? { param: m[1] } : { literal: p };
     });
-    const isDynamic = segments.some((s) => s.param !== void 0);
-    const pattern = `/${segments.map((s) => s.param ? `:${s.param}` : s.literal).join("/")}`;
+    const isDynamic = segments.some((s) => s.param !== void 0 || s.catchAll !== void 0);
+    const pattern = `/${segments.map((s) => s.catchAll ? `:${s.catchAll}*` : s.param ? `:${s.param}` : s.literal).join("/")}`;
     return { pageId, pattern, segments, isDynamic };
   });
-  return routes.sort((a, b) => Number(a.isDynamic) - Number(b.isDynamic));
+  const rank = (r) => r.segments.some((s) => s.catchAll) ? 2 : r.isDynamic ? 1 : 0;
+  return routes.sort((a, b) => rank(a) - rank(b));
 }
 function pathSegments(url) {
   const path = url.split("?")[0] ?? "/";
@@ -105,6 +108,26 @@ function pathSegments(url) {
 function matchRoute(routes, url) {
   const segs = pathSegments(url);
   for (const route of routes) {
+    const last = route.segments[route.segments.length - 1];
+    const isCatchAll = Boolean(last?.catchAll);
+    if (isCatchAll) {
+      const lead = route.segments.slice(0, -1);
+      if (segs.length < lead.length + 1) continue;
+      const params2 = {};
+      let ok2 = true;
+      for (let i = 0; i < lead.length; i++) {
+        const rs = lead[i];
+        const value = segs[i];
+        if (rs.param) params2[rs.param] = decodeURIComponent(value);
+        else if (rs.literal !== value) {
+          ok2 = false;
+          break;
+        }
+      }
+      if (!ok2) continue;
+      params2[last?.catchAll] = segs.slice(lead.length).map(decodeURIComponent).join("/");
+      return { pageId: route.pageId, params: params2 };
+    }
     if (route.segments.length !== segs.length) continue;
     const params = {};
     let ok = true;
@@ -153,7 +176,7 @@ function storesInitialState(stores) {
 }
 
 // src/dev/renderPage.ts
-import { renderComponent, stateIsland } from "@apex-stack/kit";
+import { renderComponent, renderFragment, stateIsland } from "@apex-stack/kit";
 function escAttr(s) {
   return String(s).replace(
     /[&<>"]/g,
@@ -185,10 +208,20 @@ async function renderPage(opts) {
     stores: storesInitialState(stores),
     authoredDefaults: mod.rootData ? mod.rootData() : void 0
   });
+  const available = opts.layouts ?? [];
+  const layoutName = mod.layout === false ? null : typeof mod.layout === "string" ? mod.layout : available.includes("default") ? "default" : null;
+  let body = html;
+  let layoutCss = "";
+  if (layoutName && available.includes(layoutName)) {
+    const layoutMod = await opts.loadModule(`/layouts/${layoutName}.alpine`);
+    const chrome = renderFragment(layoutMod.template, {}, layoutMod.scopeId, opts.registry);
+    body = /<slot\b[^>]*>[\s\S]*?<\/slot>/.test(chrome) ? chrome.replace(/<slot\b[^>]*>[\s\S]*?<\/slot>/, () => html) : chrome + html;
+    layoutCss = layoutMod.css;
+  }
   const doc = shell({
-    body: html,
+    body,
     island: stateIsland(mod.componentId, loaderData),
-    css: mod.css + (opts.componentCss ?? ""),
+    css: mod.css + layoutCss + (opts.componentCss ?? ""),
     pageId: opts.pageId,
     clientHref: opts.clientHref,
     storeIds: stores.map((s) => s.id),

package/dist/cli.js

@@ -109,10 +109,10 @@ var main = defineCommand2({
   },
   subCommands: {
     new: newCommand,
-    dev: () => import("./dev-WS52CGSE.js").then((m) => m.devCommand),
-    build: () => import("./build-KJF4LJWP.js").then((m) => m.buildCommand),
-    start: () => import("./start-XYVCDMPJ.js").then((m) => m.startCommand),
-    make: () => import("./make-62PPHZQY.js").then((m) => m.makeCommand),
+    dev: () => import("./dev-OCVQRCCE.js").then((m) => m.devCommand),
+    build: () => import("./build-J47A3B4Y.js").then((m) => m.buildCommand),
+    start: () => import("./start-AUJJ7HAY.js").then((m) => m.startCommand),
+    make: () => import("./make-JAW22LQZ.js").then((m) => m.makeCommand),
     migrate: () => import("./migrate-NOGFOFV2.js").then((m) => m.migrateCommand),
     mcp: () => import("./mcp-DL4J6JFJ.js").then((m) => m.mcpCommand)
   },

package/dist/{dev-WS52CGSE.js → dev-OCVQRCCE.js}

@@ -20,7 +20,7 @@ var devCommand = defineCommand({
     process.stdout.write(banner());
     const sp = spinner(`Starting dev server${args.islands ? " (islands mode)" : ""}\u2026`);
     try {
-      const { startDevServer } = await import("./server-5QQGUF3R.js");
+      const { startDevServer } = await import("./server-L3V34B5X.js");
       const { port: actual } = await startDevServer({ root, port, islands: Boolean(args.islands) });
       sp.succeed("Dev server ready");
       ready([

package/dist/{make-62PPHZQY.js → make-JAW22LQZ.js}

@@ -33,6 +33,26 @@ function componentTemplate() {
 </style>
 `;
 }
+function layoutTemplate() {
+  return `<template>
+  <header class="site-header">
+    <nav><a href="/">Home</a></nav>
+  </header>
+  <main>
+    <slot></slot>
+  </main>
+  <footer class="site-footer">
+    <p>Built with Apex JS</p>
+  </footer>
+</template>
+
+<style scoped>
+  .site-header { padding: 1rem 1.5rem; border-bottom: 1px solid #e5e7eb; }
+  main { max-width: 60rem; margin: 0 auto; padding: 2rem 1.5rem; }
+  .site-footer { padding: 1.5rem; border-top: 1px solid #e5e7eb; color: #6b7280; }
+</style>
+`;
+}
 function storeTemplate(name) {
   return `import { defineStore } from '@apex-stack/core'
 
@@ -69,20 +89,22 @@ function plan(kind, name, root) {
       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() };
   }
 }
 var makeCommand = defineCommand({
-  meta: { name: "make", description: "Generate a page, component, API route, or store" },
+  meta: { name: "make", description: "Generate a page, component, API route, store, or layout" },
   args: {
-    kind: { type: "positional", required: true, description: "page | component | api | store" },
+    kind: { type: "positional", required: true, description: "page | component | api | store | layout" },
     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") {
+    if (kind !== "page" && kind !== "component" && kind !== "api" && kind !== "store" && kind !== "layout") {
       console.error(`
-  Unknown type "${args.kind}". Use: page | component | api | store
+  Unknown type "${args.kind}". Use: page | component | api | store | layout
 `);
       process.exit(1);
     }

package/dist/{server-5QQGUF3R.js → server-L3V34B5X.js}

@@ -13,11 +13,11 @@ import {
   renderIslandsPage,
   renderPage,
   scanPages
-} from "./chunk-7GPCNGGO.js";
+} from "./chunk-XSN6NDWP.js";
 import "./chunk-MZVLRU3R.js";
 
 // src/dev/server.ts
-import { existsSync as existsSync2 } from "fs";
+import { existsSync as existsSync2, readdirSync } from "fs";
 import { createServer as createHttpServer } from "http";
 import { createRequire } from "module";
 import { join } from "path";
@@ -213,6 +213,8 @@ async function startDevServer(options) {
           (id) => ssrLoad(id)
         );
         const stores = await loadStores(options.root, (id) => ssrLoad(id));
+        const layoutsDir = join(options.root, "layouts");
+        const layouts = existsSync2(layoutsDir) ? readdirSync(layoutsDir).filter((f) => f.endsWith(".alpine")).map((f) => f.replace(/\.alpine$/, "")) : [];
         const render = options.islands ? renderIslandsPage : renderPage;
         const html = await render({
           loadModule: (id) => ssrLoad(id),
@@ -223,6 +225,7 @@ async function startDevServer(options) {
           componentCss,
           stores,
           appCss,
+          layouts,
           transformHtml: (u, doc) => vite.transformIndexHtml(u, doc)
         });
         setResponseHeader(event, "Content-Type", "text/html");

package/dist/{start-XYVCDMPJ.js → start-AUJJ7HAY.js}

@@ -9,7 +9,7 @@ import {
   matchRoute,
   renderIslandsPage,
   renderPage
-} from "./chunk-7GPCNGGO.js";
+} from "./chunk-XSN6NDWP.js";
 import "./chunk-MZVLRU3R.js";
 
 // src/commands/start.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apex-stack/core",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "description": "The full-stack meta-framework for Alpine.js — CLI and runtime",
   "type": "module",
   "license": "MIT",
@@ -45,7 +45,7 @@
     "h3": "^1.13.0",
     "vite": "^6.0.7",
     "zod": "^4.4.3",
-    "@apex-stack/kit": "0.1.4",
+    "@apex-stack/kit": "0.1.5",
     "@apex-stack/vite": "0.1.5"
   },
   "peerDependencies": {