@zachacious/protoc-gen-connect-vue 1.0.11 → 1.0.13

package/dist/generator.js

@@ -336792,7 +336792,7 @@ mustache.Writer = Writer;
 var mustache_default = mustache;
 
 // src/generator.ts
-var METHOD_KIND_UNARY = 1;
+var METHOD_KIND_UNARY = 0;
 var KNOWN_WKT = [
   "google.protobuf.Empty",
   "google.protobuf.Timestamp",
@@ -336806,16 +336806,16 @@ 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 findPath(msg, targets, depth = 0) {
-  if (depth > 4)
+function findPaginationPath(msg, targets, depth = 0) {
+  if (depth > 3)
     return null;
   for (const f of msg.fields) {
-    if (targets.includes(f.name.toLowerCase()))
+    if (targets.includes(f.name.toLowerCase().replace(/_/g, "")))
       return [f.name];
   }
   for (const f of msg.fields) {
     if (f.fieldKind === "message") {
-      const p = findPath(f.message, targets, depth + 1);
+      const p = findPaginationPath(f.message, targets, depth + 1);
       if (p)
         return [f.name, ...p];
     }
@@ -336834,8 +336834,7 @@ function processService(service) {
     if (allMessages.has(msg.name))
       return;
     allMessages.add(msg.name);
-    const baseFileName = msg.file.name.replace(".proto", "");
-    const importPath = `./gen/${baseFileName}_pb`;
+    const importPath = `./gen/${msg.file.name.replace(".proto", "")}_pb`;
     if (!importMap.has(importPath))
       importMap.set(importPath, new Set);
     importMap.get(importPath).add(msg.name);
@@ -336844,8 +336843,9 @@ function processService(service) {
   const rpcs = service.methods.map((m) => {
     track(m.input);
     track(m.output);
+    const name = m.name;
     const isUnary = m.methodKind === METHOD_KIND_UNARY;
-    const verbs = [
+    const mutationVerbs = [
       "Create",
       "Update",
       "Delete",
@@ -336855,28 +336855,31 @@ function processService(service) {
       "Set",
       "Add"
     ];
-    const isMutation = verbs.some((v) => m.name.startsWith(v));
-    const reqPath = findPath(m.input, [
+    const isMutation = mutationVerbs.some((v) => name.startsWith(v));
+    const reqPath = findPaginationPath(m.input, [
+      "pagenumber",
       "page",
       "offset",
       "pagetoken",
-      "cursor",
-      "pagenumber"
+      "cursor"
     ]);
-    const resPath = findPath(m.output, [
+    const resPath = findPaginationPath(m.output, [
       "nextpagetoken",
       "nextpage",
       "hasmore",
-      "nextcursor"
+      "nextcursor",
+      "page"
     ]);
+    const isQuery = isUnary && !isMutation;
+    const isPaginated = isQuery && !!reqPath && !!resPath;
     return {
-      functionName: m.name.charAt(0).toLowerCase() + m.name.slice(1),
-      hookName: `use${m.name}`,
-      resource: m.name.replace(/^(Get|ListAll|List|Create|Update|Delete|Remove|Patch|Post|Set|Add)/, "") || "Global",
+      functionName: name.charAt(0).toLowerCase() + name.slice(1),
+      hookName: `use${name}`,
+      resource: name.replace(/^(Get|ListAll|List|Search|Create|Update|Delete|Remove|Patch|Post|Set|Add)/, "") || "Global",
       inputType: m.input.name,
       outputType: m.output.name,
-      isQuery: isUnary && !isMutation,
-      isPaginated: isUnary && !isMutation && !!reqPath && !!resPath,
+      isQuery,
+      isPaginated,
       reqPath: reqPath?.join("."),
       resPath: resPath?.join(".")
     };
@@ -336895,7 +336898,7 @@ function processService(service) {
 }
 var plugin = createEcmaScriptPlugin({
   name: "protoc-gen-connect-vue",
-  version: "v1.1.0",
+  version: "v1.1.2",
   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.11",
+  "version": "1.0.13",
   "description": "Smart TanStack Query & ConnectRPC SDK generator for Vue.js",
   "type": "module",
   "license": "MIT",

package/templates/rpc.ts.mustache

@@ -1,5 +1,5 @@
 /**
- * Async: {{functionName}}
+ * Async Wrapper: {{functionName}}
  */
 const {{functionName}} = async (req: {{inputType}}): Promise<APIResponse<{{outputType}}>> => {
   const res = await callConnect(client.value.{{functionName}}.bind(client.value), req, (res) => res);
@@ -25,25 +25,30 @@ const {{hookName}} = (
   return useInfiniteQuery({
     queryKey: queryKeys.{{functionName}}(input),
     queryFn: async ({ pageParam }) => {
-      // Deep clone to avoid mutating reactive state
       const req = JSON.parse(JSON.stringify(unref(input)));
-      
-      // Structural Injection: Navigate to the field found during generation
       const path = "{{reqPath}}".split('.');
-      let current = req;
+      
+      // Navigate and set the nested pagination field
+      let curr = req;
       for (let i = 0; i < path.length - 1; i++) {
-        if (!current[path[i]]) current[path[i]] = {};
-        current = current[path[i]];
+        curr[path[i]] = curr[path[i]] || {};
+        curr = curr[path[i]];
       }
-      current[path[path.length - 1]] = pageParam;
+      curr[path[path.length - 1]] = pageParam;
 
       return client.value.{{functionName}}(req);
     },
     initialPageParam: options.initialPageParam ?? 1,
     getNextPageParam: (lastPage: any) => {
-      // Structural Extraction: Navigate to the field found during generation
       const path = "{{resPath}}".split('.');
-      return path.reduce((o, i) => o?.[i], lastPage) || undefined;
+      // Traverse response to find next page/token (handles nested PageResponse)
+      const nextValue = path.reduce((o, i) => o?.[i], lastPage);
+      
+      // If the nextValue is an object (like PageResponse), we look deeper
+      if (typeof nextValue === 'object' && nextValue !== null) {
+        return nextValue.nextPageToken || nextValue.nextPage || nextValue.pageNumber + 1;
+      }
+      return nextValue || undefined;
     },
     ...options,
   });