@decocms/start 6.4.2 → 6.4.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decocms/start",
-  "version": "6.4.2",
+  "version": "6.4.4",
   "type": "module",
   "description": "Deco framework for TanStack Start - CMS bridge, admin protocol, hooks, schema generation",
   "main": "./src/index.ts",

package/src/cms/loader.test.ts

@@ -139,6 +139,26 @@ describe("findPageByPath specificity", () => {
     expect(match?.blockKey).toBe("pages-bf");
   });
 
+  it("prefers the home page over an optional-group splat catch-all", () => {
+    // Regression: /{granado/}?* matches "/" and was out-ranking the home
+    // because the `{granado` segment counted as a param. The home block
+    // is a literal-only `/` path and must always win.
+    setBlocks({
+      "pages-home": {
+        name: "Home",
+        path: "/",
+        sections: [],
+      },
+      "pages-pdp-plp": {
+        name: "PDP & PLP",
+        path: "/{granado/}?*",
+        sections: [],
+      },
+    });
+    const match = findPageByPath("/");
+    expect(match?.blockKey).toBe("pages-home");
+  });
+
   it("falls back to the splat page for unknown URLs", () => {
     const match = findPageByPath("/perfumaria");
     expect(match?.blockKey).toBe("pages-pdp-plp");

package/src/cms/loader.ts

@@ -128,28 +128,39 @@ export function withBlocksOverride<T>(override: Record<string, unknown>, fn: ()
 }
 
 // Higher key wins. Compared lexicographically:
-//   [literalSegments, paramSegments, hasNoSplat]
-// So `/foo/bar` > `/foo/:x` > `/foo/*` > `/*`, and `/my-account/*` > `/*`.
+//   [hasNoWildcard, literalSegments, paramSegments]
 //
-// URLPattern syntax (`{group}?`, `:slug([\w-]+)`, trailing `*`) is supported:
-// any segment containing `{`, `}`, or `?` counts as a param, and a segment
-// containing `*` flips the splat bit. This keeps optional-group patterns
-// (e.g. `/{granado/}?*`) from out-ranking real literal pages.
+// `hasNoWildcard` is the top key so a literal-only path always beats any
+// pattern that contains `*` or `{group}?` — including the empty-parts case
+// `/` (literals=0) vs the catch-all `/{prefix/}?*` (literals=0, params=1).
+// Without this, the URLPattern fix (#213/#214) inadvertently lets a
+// `/{group/}?*` catch-all out-rank an exact `/` home page because the
+// `{group` segment counted as a param. See deco-sites/granadobr-tanstack
+// where `/` was being routed to the granado PDP/PLP block's NotFound
+// fallback.
+//
+// Order produced:
+//   /foo/bar (no wildcard, literals=2) > /foo/:x (no wildcard, lit=1, param=1)
+//   /foo (no wildcard) > /{granado/}?*  (has wildcard) > /*
 function pathSpecificityKey(path: string): [number, number, number] {
   const parts = path.split("/").filter(Boolean);
   let literals = 0;
   let params = 0;
-  let hasSplat = false;
+  let hasWildcard = false;
   for (const part of parts) {
-    if (part.includes("*")) hasSplat = true;
-    else if (
-      part.startsWith(":") ||
-      part.startsWith("$") ||
-      /[{}?]/.test(part)
-    ) params++;
-    else literals++;
+    // A wildcard is any `*`, optional group `{...}?`, or any segment
+    // bearing `?` — these all make the pattern match strictly more URLs
+    // than a plain literal/`:param`/`:slug([\w-]+)` segment, so they
+    // are demoted to "least specific" together regardless of count.
+    if (part.includes("*") || /[{}?]/.test(part)) {
+      hasWildcard = true;
+    } else if (part.startsWith(":") || part.startsWith("$")) {
+      params++;
+    } else {
+      literals++;
+    }
   }
-  return [literals, params, hasSplat ? 0 : 1];
+  return [hasWildcard ? 0 : 1, literals, params];
 }
 
 export function getAllPages(): Array<{ key: string; page: DecoPage }> {

package/src/vite/plugin.js

@@ -471,6 +471,28 @@ export function decoVitePlugin() {
         env.optimizeDeps.esbuildOptions.jsx = "automatic";
         env.optimizeDeps.esbuildOptions.jsxImportSource = "react";
       }
+
+      // Force @decocms/start through the SSR transform pipeline so TanStack
+      // Start's compiler can register the framework's createServerFn handlers
+      // (loadDeferredSection, etc.) in the per-environment serverFnsById
+      // manifest. Without this, Vite pre-bundles @decocms/start via
+      // optimizeDeps before plugins run, the handler never enters the
+      // manifest, and every POST /_serverFn/* call from the browser returns
+      // HTTP 500 ("Invalid server function ID"). See #197.
+      if (name === "ssr") {
+        env.resolve = env.resolve || {};
+        const existing = env.resolve.noExternal;
+        const additions = ["@decocms/start"];
+        if (existing === true) {
+          // Already noExternal everything — nothing to add.
+        } else if (Array.isArray(existing)) {
+          env.resolve.noExternal = [...new Set([...existing, ...additions])];
+        } else if (existing) {
+          env.resolve.noExternal = [existing, ...additions];
+        } else {
+          env.resolve.noExternal = additions;
+        }
+      }
     },
 
     generateBundle(_, bundle) {