@decocms/start 1.2.1 → 1.2.2

package/package.json

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

package/scripts/generate-invoke.ts

@@ -281,12 +281,12 @@ for (const action of actions) {
 }
 
 // Count how many actually parsed vs. stubbed
-const parsed = actions.filter((a) => a.callBody && a.importedFn).length;
+const parsed = actions.filter((a) => a.importedFn).length;
 const stubbed = actions.length - parsed;
 if (stubbed > 0) {
   console.warn(`⚠ ${stubbed} action(s) could not be parsed — generated as stubs:`);
   for (const a of actions) {
-    if (!a.callBody || !a.importedFn) console.warn(`  - ${a.name}`);
+    if (!a.importedFn) console.warn(`  - ${a.name}`);
   }
 }
 
@@ -333,25 +333,22 @@ function unwrapResult<T>(result: unknown): T {
 for (const action of actions) {
   const varName = `$${action.name}`;
 
-  if (action.callBody && action.importedFn) {
-    // Replace "input" references with "data" in the call body.
-    // The handler receives `{ data }` destructured from the validated input.
-    let body = action.callBody;
-    body = body.replace(/\binput\./g, "data.");
-    body = body.replace(/\binput\b(?!\.)/g, "data");
-
+  if (action.importedFn) {
+    // All @decocms/apps action functions take a single props object.
+    // Pass the validated `data` object directly — never destructure into
+    // positional arguments, which breaks when function signatures change.
     if (action.unwrap) {
       out += `\nconst ${varName} = createServerFn({ method: "POST" })
   .inputValidator((data: ${action.inputType}) => data)
   .handler(async ({ data }): Promise<any> => {
-    const result = await ${body};
+    const result = await ${action.importedFn}(data);
     return unwrapResult(result);
   });\n`;
     } else {
       out += `\nconst ${varName} = createServerFn({ method: "POST" })
   .inputValidator((data: ${action.inputType}) => data)
   .handler(async ({ data }): Promise<any> => {
-    return ${body};
+    return ${action.importedFn}(data);
   });\n`;
     }
   } else {

package/src/routes/cmsRoute.ts

@@ -133,13 +133,15 @@ export const loadCmsPage = createServerFn({ method: "GET" })
   .inputValidator((data: unknown) => data as string)
   .handler(async (ctx) => {
     const fullPath = ctx.data;
-    const [basePath] = fullPath.split("?");
 
-    const existing = pageInflight.get(basePath);
+    // Use the full path (including query string) as the dedup key.
+    // Using basePath only caused /s?q=a and /s?q=b to share one promise,
+    // returning wrong/empty results for search and filtered PLPs.
+    const existing = pageInflight.get(fullPath);
     if (existing) return existing;
 
-    const promise = loadCmsPageInternal(fullPath).finally(() => pageInflight.delete(basePath));
-    pageInflight.set(basePath, promise);
+    const promise = loadCmsPageInternal(fullPath).finally(() => pageInflight.delete(fullPath));
+    pageInflight.set(fullPath, promise);
     return promise;
   });
 
@@ -519,6 +521,12 @@ export function cmsRouteConfig(options: CmsRouteOptions) {
   const ignoreSet = new Set(ignoreSearchParams);
 
   return {
+    // Catch-all search validation: preserve all URL search params so they
+    // reach loaderDeps. Without this, TanStack Router may strip unknown
+    // params (e.g. ?q=, filter.*, page, sort) during SPA navigation.
+    validateSearch: (search: Record<string, unknown>) =>
+      search as Record<string, string>,
+
     loaderDeps: ({ search }: { search: Record<string, string> }) => {
       const filtered = Object.fromEntries(
         Object.entries(search ?? {}).filter(([k]) => !ignoreSet.has(k)),