houdini 1.0.0-next.3 → 1.0.0-next.4

package/build/test-esm/index.js

@@ -56024,19 +56024,18 @@ async function paginate(config2, documents) {
         paginated = true;
         const fieldTypeFields = parentTypeFromAncestors(config2.schema, doc.filename, ancestors).getFields()[node.name.value];
         const args = new Set(fieldTypeFields.args.map((arg) => arg.name));
-        const passedArgs = new Set(node.arguments?.map((arg) => arg.name.value));
-        const specifiedForwards = passedArgs.has("first");
-        const specifiedBackwards = passedArgs.has("last");
         cursorType = fieldTypeFields.args?.find((arg) => ["before", "after"].includes(arg.name))?.type?.name || "String";
         flags.after.type = cursorType;
         flags.before.type = cursorType;
-        const forwardPagination = !specifiedBackwards && args.has("first") && args.has("after");
-        const backwardsPagination = !specifiedForwards && args.has("last") && args.has("before");
-        const offsetPagination = !forwardPagination && !backwardsPagination && args.has("offset") && args.has("limit");
-        flags.first.enabled = forwardPagination;
-        flags.after.enabled = forwardPagination;
-        flags.last.enabled = backwardsPagination;
-        flags.before.enabled = backwardsPagination;
+        const passedArgs = new Set(node.arguments?.map((arg) => arg.name.value));
+        const forwards = args.has("first") && args.has("after");
+        const backwards = args.has("last") && args.has("after");
+        const cursorPagination = passedArgs.has("last") || passedArgs.has("first");
+        const offsetPagination = !cursorPagination && args.has("offset") && args.has("limit");
+        flags.first.enabled = forwards;
+        flags.after.enabled = forwards;
+        flags.last.enabled = backwards;
+        flags.before.enabled = backwards;
         flags.offset.enabled = offsetPagination;
         flags.limit.enabled = offsetPagination;
         paginationPath = ancestors.filter(
@@ -56056,10 +56055,6 @@ async function paginate(config2, documents) {
       let fragmentName = "";
       let refetchQueryName = "";
       let nodeQuery = false;
-      let refetchUpdate = "append" /* append */;
-      if (flags.last.enabled) {
-        refetchUpdate = "prepend" /* prepend */;
-      }
       let fragment = "";
       doc.document = graphql8.visit(doc.document, {
         OperationDefinition(node) {
@@ -56154,26 +56149,24 @@ async function paginate(config2, documents) {
           targetType = fragment;
         }
       }
+      const pageSize = flags.first.defaultValue ?? flags.last.defaultValue ?? flags.limit.defaultValue;
+      const start = flags.after.defaultValue ?? flags.before.defaultValue ?? flags.offset.defaultValue;
+      let direction = "forward";
+      if (flags.before.enabled && flags.after.enabled) {
+        direction = "both";
+      } else if (flags.before.enabled) {
+        direction = "backward";
+      }
       doc.refetch = {
-        update: refetchUpdate,
         path: paginationPath,
         method: flags.first.enabled || flags.last.enabled ? "cursor" : "offset",
-        pageSize: 0,
+        pageSize,
         embedded: nodeQuery,
         targetType,
         paginated: true,
-        direction: flags.last.enabled ? "backwards" : "forward"
-      };
-      if (flags.first.enabled) {
-        doc.refetch.pageSize = flags.first.defaultValue;
-        doc.refetch.start = flags.after.defaultValue;
-      } else if (flags.last.enabled) {
-        doc.refetch.pageSize = flags.last.defaultValue;
-        doc.refetch.start = flags.before.defaultValue;
-      } else if (flags.limit.enabled) {
-        doc.refetch.pageSize = flags.limit.defaultValue;
-        doc.refetch.start = flags.offset.defaultValue;
-      }
+        direction,
+        start
+      };
       if (!fragment) {
         continue;
       }
@@ -56349,12 +56342,6 @@ function replaceArgumentsWithVariables(args, flags) {
     if (flags[name2].defaultValue || !spec.enabled || seenArgs[name2]) {
       continue;
     }
-    if (["first", "after"].includes(name2) && flags["before"].enabled) {
-      continue;
-    }
-    if (["last", "before"].includes(name2) && flags["first"].enabled) {
-      continue;
-    }
     newArgs.push(variableAsArgument(name2));
   }
   return newArgs;
@@ -56862,7 +56849,7 @@ function selection({
   path: path2 = [],
   includeFragments,
   document,
-  markEdges
+  inConnection
 }) {
   let object = {};
   const typeMap = {};
@@ -57004,14 +56991,23 @@ function selection({
         (directive) => directive.name.value === config2.paginateDirective
       );
       if (paginated && document.refetch && document.refetch.method === "offset") {
-        fieldObj.update = document.refetch.update;
+        fieldObj.updates = ["append" /* append */];
+      }
+      let continueConnection = inConnection;
+      if ([
+        "edges",
+        "endCursor",
+        "startCursor",
+        "hasNextPage",
+        "hasPreviousPage"
+      ].includes(attributeName) && inConnection && document.refetch) {
+        fieldObj.updates = ["append" /* append */, "prepend" /* prepend */];
       }
-      if (attributeName === "edges" && markEdges && document.refetch) {
-        fieldObj.update = document.refetch.update;
-        markEdges = "";
+      if (attributeName === "node" && inConnection) {
+        continueConnection = false;
       }
       if (field.selectionSet) {
-        const edgesMark = paginated && document.refetch?.method === "cursor" ? document.refetch.update : markEdges;
+        const connectionState = paginated && document.refetch?.method === "cursor" || continueConnection;
         fieldObj.selection = selection({
           config: config2,
           filepath,
@@ -57021,7 +57017,7 @@ function selection({
           path: pathSoFar,
           includeFragments,
           document,
-          markEdges: edgesMark
+          inConnection: connectionState
         });
       }
       if (field.arguments?.length && fieldObj.list) {

package/build/vite-cjs/index.js

@@ -68763,19 +68763,18 @@ async function paginate(config4, documents) {
         paginated = true;
         const fieldTypeFields = parentTypeFromAncestors(config4.schema, doc.filename, ancestors).getFields()[node.name.value];
         const args = new Set(fieldTypeFields.args.map((arg) => arg.name));
-        const passedArgs = new Set(node.arguments?.map((arg) => arg.name.value));
-        const specifiedForwards = passedArgs.has("first");
-        const specifiedBackwards = passedArgs.has("last");
         cursorType = fieldTypeFields.args?.find((arg) => ["before", "after"].includes(arg.name))?.type?.name || "String";
         flags.after.type = cursorType;
         flags.before.type = cursorType;
-        const forwardPagination = !specifiedBackwards && args.has("first") && args.has("after");
-        const backwardsPagination = !specifiedForwards && args.has("last") && args.has("before");
-        const offsetPagination = !forwardPagination && !backwardsPagination && args.has("offset") && args.has("limit");
-        flags.first.enabled = forwardPagination;
-        flags.after.enabled = forwardPagination;
-        flags.last.enabled = backwardsPagination;
-        flags.before.enabled = backwardsPagination;
+        const passedArgs = new Set(node.arguments?.map((arg) => arg.name.value));
+        const forwards = args.has("first") && args.has("after");
+        const backwards = args.has("last") && args.has("after");
+        const cursorPagination = passedArgs.has("last") || passedArgs.has("first");
+        const offsetPagination = !cursorPagination && args.has("offset") && args.has("limit");
+        flags.first.enabled = forwards;
+        flags.after.enabled = forwards;
+        flags.last.enabled = backwards;
+        flags.before.enabled = backwards;
         flags.offset.enabled = offsetPagination;
         flags.limit.enabled = offsetPagination;
         paginationPath = ancestors.filter(
@@ -68795,10 +68794,6 @@ async function paginate(config4, documents) {
       let fragmentName = "";
       let refetchQueryName = "";
       let nodeQuery = false;
-      let refetchUpdate = "append" /* append */;
-      if (flags.last.enabled) {
-        refetchUpdate = "prepend" /* prepend */;
-      }
       let fragment = "";
       doc.document = graphql10.visit(doc.document, {
         OperationDefinition(node) {
@@ -68893,26 +68888,24 @@ async function paginate(config4, documents) {
           targetType = fragment;
         }
       }
+      const pageSize = flags.first.defaultValue ?? flags.last.defaultValue ?? flags.limit.defaultValue;
+      const start = flags.after.defaultValue ?? flags.before.defaultValue ?? flags.offset.defaultValue;
+      let direction = "forward";
+      if (flags.before.enabled && flags.after.enabled) {
+        direction = "both";
+      } else if (flags.before.enabled) {
+        direction = "backward";
+      }
       doc.refetch = {
-        update: refetchUpdate,
         path: paginationPath,
         method: flags.first.enabled || flags.last.enabled ? "cursor" : "offset",
-        pageSize: 0,
+        pageSize,
         embedded: nodeQuery,
         targetType,
         paginated: true,
-        direction: flags.last.enabled ? "backwards" : "forward"
-      };
-      if (flags.first.enabled) {
-        doc.refetch.pageSize = flags.first.defaultValue;
-        doc.refetch.start = flags.after.defaultValue;
-      } else if (flags.last.enabled) {
-        doc.refetch.pageSize = flags.last.defaultValue;
-        doc.refetch.start = flags.before.defaultValue;
-      } else if (flags.limit.enabled) {
-        doc.refetch.pageSize = flags.limit.defaultValue;
-        doc.refetch.start = flags.offset.defaultValue;
-      }
+        direction,
+        start
+      };
       if (!fragment) {
         continue;
       }
@@ -69088,12 +69081,6 @@ function replaceArgumentsWithVariables(args, flags) {
     if (flags[name2].defaultValue || !spec.enabled || seenArgs[name2]) {
       continue;
     }
-    if (["first", "after"].includes(name2) && flags["before"].enabled) {
-      continue;
-    }
-    if (["last", "before"].includes(name2) && flags["first"].enabled) {
-      continue;
-    }
     newArgs.push(variableAsArgument(name2));
   }
   return newArgs;
@@ -69601,7 +69588,7 @@ function selection({
   path: path2 = [],
   includeFragments,
   document,
-  markEdges
+  inConnection
 }) {
   let object = {};
   const typeMap = {};
@@ -69743,14 +69730,23 @@ function selection({
         (directive) => directive.name.value === config4.paginateDirective
       );
       if (paginated && document.refetch && document.refetch.method === "offset") {
-        fieldObj.update = document.refetch.update;
+        fieldObj.updates = ["append" /* append */];
+      }
+      let continueConnection = inConnection;
+      if ([
+        "edges",
+        "endCursor",
+        "startCursor",
+        "hasNextPage",
+        "hasPreviousPage"
+      ].includes(attributeName) && inConnection && document.refetch) {
+        fieldObj.updates = ["append" /* append */, "prepend" /* prepend */];
       }
-      if (attributeName === "edges" && markEdges && document.refetch) {
-        fieldObj.update = document.refetch.update;
-        markEdges = "";
+      if (attributeName === "node" && inConnection) {
+        continueConnection = false;
       }
       if (field.selectionSet) {
-        const edgesMark = paginated && document.refetch?.method === "cursor" ? document.refetch.update : markEdges;
+        const connectionState = paginated && document.refetch?.method === "cursor" || continueConnection;
         fieldObj.selection = selection({
           config: config4,
           filepath,
@@ -69760,7 +69756,7 @@ function selection({
           path: pathSoFar,
           includeFragments,
           document,
-          markEdges: edgesMark
+          inConnection: connectionState
         });
       }
       if (field.arguments?.length && fieldObj.list) {

package/build/vite-esm/index.js

@@ -68757,19 +68757,18 @@ async function paginate(config4, documents) {
         paginated = true;
         const fieldTypeFields = parentTypeFromAncestors(config4.schema, doc.filename, ancestors).getFields()[node.name.value];
         const args = new Set(fieldTypeFields.args.map((arg) => arg.name));
-        const passedArgs = new Set(node.arguments?.map((arg) => arg.name.value));
-        const specifiedForwards = passedArgs.has("first");
-        const specifiedBackwards = passedArgs.has("last");
         cursorType = fieldTypeFields.args?.find((arg) => ["before", "after"].includes(arg.name))?.type?.name || "String";
         flags.after.type = cursorType;
         flags.before.type = cursorType;
-        const forwardPagination = !specifiedBackwards && args.has("first") && args.has("after");
-        const backwardsPagination = !specifiedForwards && args.has("last") && args.has("before");
-        const offsetPagination = !forwardPagination && !backwardsPagination && args.has("offset") && args.has("limit");
-        flags.first.enabled = forwardPagination;
-        flags.after.enabled = forwardPagination;
-        flags.last.enabled = backwardsPagination;
-        flags.before.enabled = backwardsPagination;
+        const passedArgs = new Set(node.arguments?.map((arg) => arg.name.value));
+        const forwards = args.has("first") && args.has("after");
+        const backwards = args.has("last") && args.has("after");
+        const cursorPagination = passedArgs.has("last") || passedArgs.has("first");
+        const offsetPagination = !cursorPagination && args.has("offset") && args.has("limit");
+        flags.first.enabled = forwards;
+        flags.after.enabled = forwards;
+        flags.last.enabled = backwards;
+        flags.before.enabled = backwards;
         flags.offset.enabled = offsetPagination;
         flags.limit.enabled = offsetPagination;
         paginationPath = ancestors.filter(
@@ -68789,10 +68788,6 @@ async function paginate(config4, documents) {
       let fragmentName = "";
       let refetchQueryName = "";
       let nodeQuery = false;
-      let refetchUpdate = "append" /* append */;
-      if (flags.last.enabled) {
-        refetchUpdate = "prepend" /* prepend */;
-      }
       let fragment = "";
       doc.document = graphql10.visit(doc.document, {
         OperationDefinition(node) {
@@ -68887,26 +68882,24 @@ async function paginate(config4, documents) {
           targetType = fragment;
         }
       }
+      const pageSize = flags.first.defaultValue ?? flags.last.defaultValue ?? flags.limit.defaultValue;
+      const start = flags.after.defaultValue ?? flags.before.defaultValue ?? flags.offset.defaultValue;
+      let direction = "forward";
+      if (flags.before.enabled && flags.after.enabled) {
+        direction = "both";
+      } else if (flags.before.enabled) {
+        direction = "backward";
+      }
       doc.refetch = {
-        update: refetchUpdate,
         path: paginationPath,
         method: flags.first.enabled || flags.last.enabled ? "cursor" : "offset",
-        pageSize: 0,
+        pageSize,
         embedded: nodeQuery,
         targetType,
         paginated: true,
-        direction: flags.last.enabled ? "backwards" : "forward"
-      };
-      if (flags.first.enabled) {
-        doc.refetch.pageSize = flags.first.defaultValue;
-        doc.refetch.start = flags.after.defaultValue;
-      } else if (flags.last.enabled) {
-        doc.refetch.pageSize = flags.last.defaultValue;
-        doc.refetch.start = flags.before.defaultValue;
-      } else if (flags.limit.enabled) {
-        doc.refetch.pageSize = flags.limit.defaultValue;
-        doc.refetch.start = flags.offset.defaultValue;
-      }
+        direction,
+        start
+      };
       if (!fragment) {
         continue;
       }
@@ -69082,12 +69075,6 @@ function replaceArgumentsWithVariables(args, flags) {
     if (flags[name2].defaultValue || !spec.enabled || seenArgs[name2]) {
       continue;
     }
-    if (["first", "after"].includes(name2) && flags["before"].enabled) {
-      continue;
-    }
-    if (["last", "before"].includes(name2) && flags["first"].enabled) {
-      continue;
-    }
     newArgs.push(variableAsArgument(name2));
   }
   return newArgs;
@@ -69595,7 +69582,7 @@ function selection({
   path: path2 = [],
   includeFragments,
   document,
-  markEdges
+  inConnection
 }) {
   let object = {};
   const typeMap = {};
@@ -69737,14 +69724,23 @@ function selection({
         (directive) => directive.name.value === config4.paginateDirective
       );
       if (paginated && document.refetch && document.refetch.method === "offset") {
-        fieldObj.update = document.refetch.update;
+        fieldObj.updates = ["append" /* append */];
+      }
+      let continueConnection = inConnection;
+      if ([
+        "edges",
+        "endCursor",
+        "startCursor",
+        "hasNextPage",
+        "hasPreviousPage"
+      ].includes(attributeName) && inConnection && document.refetch) {
+        fieldObj.updates = ["append" /* append */, "prepend" /* prepend */];
       }
-      if (attributeName === "edges" && markEdges && document.refetch) {
-        fieldObj.update = document.refetch.update;
-        markEdges = "";
+      if (attributeName === "node" && inConnection) {
+        continueConnection = false;
       }
       if (field.selectionSet) {
-        const edgesMark = paginated && document.refetch?.method === "cursor" ? document.refetch.update : markEdges;
+        const connectionState = paginated && document.refetch?.method === "cursor" || continueConnection;
         fieldObj.selection = selection({
           config: config4,
           filepath,
@@ -69754,7 +69750,7 @@ function selection({
           path: pathSoFar,
           includeFragments,
           document,
-          markEdges: edgesMark
+          inConnection: connectionState
         });
       }
       if (field.arguments?.length && fieldObj.list) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "houdini",
-  "version": "1.0.0-next.3",
+  "version": "1.0.0-next.4",
   "description": "The disappearing GraphQL clients",
   "keywords": [
     "typescript",