@zachacious/protoc-gen-connect-vue 1.0.14 → 1.0.16

package/dist/generator.js

@@ -336805,23 +336805,47 @@ var templates = {
   rpc: fs.readFileSync(path.join(templateDir, "rpc.ts.mustache"), "utf-8"),
   index: fs.readFileSync(path.join(templateDir, "index.ts.mustache"), "utf-8")
 };
-function findPaginationPath(msg, targets, depth = 0) {
+function findBestPaginationCandidate(msg, isRequest, depth = 0) {
   if (depth > 3)
     return null;
-  const terminals = ["pagenumber", "offset", "pagetoken", "cursor", "page"];
-  for (const f of msg.fields) {
-    const normalized = f.name.toLowerCase().replace(/_/g, "");
-    if (terminals.includes(normalized))
-      return [f.name];
-  }
+  let best = null;
   for (const f of msg.fields) {
+    let currentScore = 0;
+    const name = f.name.toLowerCase().replace(/_/g, "");
+    const reqKeywords = ["token", "page", "offset", "cursor", "start", "skip"];
+    const resKeywords = ["next", "token", "more", "hasmore", "cursor", "total"];
+    const targets = isRequest ? reqKeywords : resKeywords;
+    if (targets.some((t) => name.includes(t)))
+      currentScore += 10;
+    if (name.includes("pagetoken") || name.includes("nextpage"))
+      currentScore += 15;
+    const isString = f.fieldKind === "scalar" && f.scalar === 9;
+    const isNumber = f.fieldKind === "scalar" && [3, 4, 5, 13, 17, 18].includes(f.scalar);
+    if (isString || isNumber) {
+      currentScore += 5;
+      if (!best || currentScore > best.score) {
+        best = {
+          path: [f.name],
+          type: isString ? "string" : "number",
+          score: currentScore
+        };
+      }
+    }
     if (f.fieldKind === "message") {
-      const subPath = findPaginationPath(f.message, targets, depth + 1);
-      if (subPath)
-        return [f.name, ...subPath];
+      const nested = findBestPaginationCandidate(f.message, isRequest, depth + 1);
+      if (nested) {
+        const nestedScore = nested.score + 12;
+        if (!best || nestedScore > best.score) {
+          best = {
+            path: [f.name, ...nested.path],
+            type: nested.type,
+            score: nestedScore
+          };
+        }
+      }
     }
   }
-  return null;
+  return best;
 }
 function processService(service) {
   const importMap = new Map;
@@ -336856,12 +336880,11 @@ function processService(service) {
       "Set",
       "Add"
     ];
-    const isMutationVerb = mutationVerbs.some((v) => name.startsWith(v));
-    const isQueryVerb = ["Get", "List", "Search"].some((v) => name.startsWith(v));
-    const isQuery = isUnary && (isQueryVerb || !isMutationVerb);
-    const reqPath = findPaginationPath(m.input, []);
-    const resPath = findPaginationPath(m.output, []);
-    const isPaginated = isQuery && !!reqPath && !!resPath;
+    const isMutation = mutationVerbs.some((v) => name.startsWith(v));
+    const isQuery = isUnary && !isMutation;
+    const reqCandidate = findBestPaginationCandidate(m.input, true);
+    const resCandidate = findBestPaginationCandidate(m.output, false);
+    const isPaginated = isQuery && reqCandidate && resCandidate && reqCandidate.score + resCandidate.score > 25;
     return {
       functionName: name.charAt(0).toLowerCase() + name.slice(1),
       hookName: `use${name}`,
@@ -336870,8 +336893,9 @@ function processService(service) {
       outputType: m.output.name,
       isQuery,
       isPaginated,
-      reqPath: reqPath?.join("."),
-      resPath: resPath?.join(".")
+      reqPath: reqCandidate?.path.join("."),
+      resPath: resCandidate?.path.join("."),
+      pageType: reqCandidate?.type || "string"
     };
   });
   return {
@@ -336888,7 +336912,7 @@ function processService(service) {
 }
 var plugin = createEcmaScriptPlugin({
   name: "protoc-gen-connect-vue",
-  version: "v1.1.6",
+  version: "v1.4.0",
   generateTs: (schema) => {
     const service = schema.files.flatMap((f) => f.services)[0];
     if (!service)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zachacious/protoc-gen-connect-vue",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "description": "Smart TanStack Query & ConnectRPC SDK generator for Vue.js",
   "type": "module",
   "license": "MIT",

package/templates/rpc.ts.mustache

@@ -3,9 +3,7 @@
  */
 const {{functionName}} = async (req: {{inputType}}): Promise<APIResponse<{{outputType}}>> => {
   const res = await callConnect(client.value.{{functionName}}.bind(client.value), req, (res) => res);
-  if (!res.error) {
-    queryClient.invalidateQueries({ queryKey: ["{{resource}}"] });
-  }
+  if (!res.error) queryClient.invalidateQueries({ queryKey: ["{{resource}}"] });
   return res;
 };
 
@@ -13,13 +11,8 @@ const {{functionName}} = async (req: {{inputType}}): Promise<APIResponse<{{outpu
  * Hook: {{hookName}}
  */
 const {{hookName}} = (
-  {{#isQuery}}
-  input: any, 
-  options: any = {}
-  {{/isQuery}}
-  {{^isQuery}}
-  options: any = {}
-  {{/isQuery}}
+  {{#isQuery}}input: any, options: any = {}{{/isQuery}}
+  {{^isQuery}}options: any = {}{{/isQuery}}
 ) => {
   {{#isPaginated}}
   return useInfiniteQuery({
@@ -34,17 +27,16 @@ const {{hookName}} = (
         curr = curr[path[i]];
       }
       curr[path[path.length - 1]] = pageParam;
-
       return client.value.{{functionName}}(req);
     },
-    initialPageParam: options.initialPageParam ?? 1,
+    initialPageParam: options.initialPageParam ?? ( "{{pageType}}" === "string" ? "" : 1 ),
     getNextPageParam: (lastPage: any) => {
       const path = "{{resPath}}".split('.');
       const val = path.reduce((o, i) => o?.[i], lastPage);
       
+      // If the discovered path is an object (like PageResponse), look for standard keys
       if (typeof val === 'object' && val !== null) {
-        // Fallback chain for common Protobuf pagination field names
-        return val.nextPageToken || val.nextPage || (val.pageNumber ? val.pageNumber + 1 : undefined);
+        return val.nextPageToken || val.nextPage || val.pageToken || undefined;
       }
       return val || undefined;
     },