@decocms/start 0.30.2 → 0.30.4

package/README.md

@@ -1,4 +1,4 @@
-# @decocms/start
+# @decocms/start 
 
 [![npm version](https://img.shields.io/npm/v/@decocms/start.svg)](https://www.npmjs.com/package/@decocms/start)
 [![license](https://img.shields.io/npm/l/@decocms/start.svg)](https://github.com/decocms/deco-start/blob/main/LICENSE)

package/package.json

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

package/src/cms/resolve.ts

@@ -228,10 +228,12 @@ if (!G.__deco._builtinMatchersRegistered) {
     "website/matchers/never.ts": () => false,
     "website/matchers/device.ts": (rule, ctx) => {
       const ua = (ctx.userAgent || "").toLowerCase();
-      const isMobile = /mobile|android|iphone|ipad|ipod|webos|blackberry|opera mini|iemobile/i.test(ua);
-      if (rule.mobile) return isMobile;
-      if (rule.desktop) return !isMobile;
-      return true;
+      const isTablet = /ipad|android(?!.*mobile)|tablet/i.test(ua);
+      const isMobile = !isTablet && /mobile|android|iphone|ipod|webos|blackberry|opera mini|iemobile/i.test(ua);
+      const isDesktop = !isMobile && !isTablet;
+      // If no flags are set, match everything (permissive default)
+      if (!rule.mobile && !rule.tablet && !rule.desktop) return true;
+      return !!(rule.mobile && isMobile) || !!(rule.tablet && isTablet) || !!(rule.desktop && isDesktop);
     },
     "website/matchers/random.ts": (rule) => {
       const traffic = typeof rule.traffic === "number" ? rule.traffic : 0.5;

package/src/matchers/builtins.ts

@@ -94,12 +94,29 @@ function isSafePattern(pattern: string): boolean {
 }
 
 function pathnameMatcher(rule: Record<string, unknown>, ctx: MatcherContext): boolean {
+  const path = ctx.path ?? "";
+
+  // CMS "case" format: { type: "Includes" | "Equals" | "Not Includes" | "Starts With", pathname: "/..." }
+  const caseObj = rule.case as { type?: string; pathname?: string } | undefined;
+  if (caseObj?.pathname) {
+    switch (caseObj.type) {
+      case "Equals":
+        return path === caseObj.pathname;
+      case "Not Includes":
+        return !path.includes(caseObj.pathname);
+      case "Starts With":
+        return path.startsWith(caseObj.pathname);
+      case "Includes":
+      default:
+        return path.includes(caseObj.pathname);
+    }
+  }
+
+  // Standard format: pattern (regex), includes (exact/glob), excludes (exact/glob)
   const pattern = rule.pattern as string | undefined;
   const includes = rule.includes as string[] | undefined;
   const excludes = rule.excludes as string[] | undefined;
 
-  const path = ctx.path ?? "";
-
   if (pattern) {
     if (!isSafePattern(pattern)) {
       console.warn(
@@ -137,6 +154,9 @@ function pathnameMatcher(rule: Record<string, unknown>, ctx: MatcherContext): bo
     if (excluded) return false;
   }
 
+  // No constraints specified — vacuously true
+  if (!pattern && !includes?.length && !excludes?.length) return false;
+
   return true;
 }