houdini 1.0.6 → 1.0.8

package/build/test-esm/index.js

@@ -37672,14 +37672,18 @@ var require_lib3 = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/tslib@2.4.1/node_modules/tslib/tslib.js
+// ../../node_modules/.pnpm/tslib@2.5.0/node_modules/tslib/tslib.js
 var require_tslib = __commonJS({
-  "../../node_modules/.pnpm/tslib@2.4.1/node_modules/tslib/tslib.js"(exports, module) {
+  "../../node_modules/.pnpm/tslib@2.5.0/node_modules/tslib/tslib.js"(exports, module) {
     var __extends;
     var __assign;
     var __rest;
     var __decorate;
     var __param;
+    var __esDecorate;
+    var __runInitializers;
+    var __propKey;
+    var __setFunctionName;
     var __metadata;
     var __awaiter;
     var __generator;
@@ -37776,6 +37780,65 @@ var require_tslib = __commonJS({
           decorator(target, key, paramIndex);
         };
       };
+      __esDecorate = function(ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+        function accept(f) {
+          if (f !== void 0 && typeof f !== "function")
+            throw new TypeError("Function expected");
+          return f;
+        }
+        var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+        var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+        var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+        var _, done = false;
+        for (var i = decorators.length - 1; i >= 0; i--) {
+          var context = {};
+          for (var p in contextIn)
+            context[p] = p === "access" ? {} : contextIn[p];
+          for (var p in contextIn.access)
+            context.access[p] = contextIn.access[p];
+          context.addInitializer = function(f) {
+            if (done)
+              throw new TypeError("Cannot add initializers after decoration has completed");
+            extraInitializers.push(accept(f || null));
+          };
+          var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+          if (kind === "accessor") {
+            if (result === void 0)
+              continue;
+            if (result === null || typeof result !== "object")
+              throw new TypeError("Object expected");
+            if (_ = accept(result.get))
+              descriptor.get = _;
+            if (_ = accept(result.set))
+              descriptor.set = _;
+            if (_ = accept(result.init))
+              initializers.push(_);
+          } else if (_ = accept(result)) {
+            if (kind === "field")
+              initializers.push(_);
+            else
+              descriptor[key] = _;
+          }
+        }
+        if (target)
+          Object.defineProperty(target, contextIn.name, descriptor);
+        done = true;
+      };
+      __runInitializers = function(thisArg, initializers, value) {
+        var useValue = arguments.length > 2;
+        for (var i = 0; i < initializers.length; i++) {
+          value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+        }
+        return useValue ? value : void 0;
+      };
+      __propKey = function(x) {
+        return typeof x === "symbol" ? x : "".concat(x);
+      };
+      __setFunctionName = function(f, name, prefix) {
+        if (typeof name === "symbol")
+          name = name.description ? "[".concat(name.description, "]") : "";
+        return Object.defineProperty(f, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
+      };
       __metadata = function(metadataKey, metadataValue) {
         if (typeof Reflect === "object" && typeof Reflect.metadata === "function")
           return Reflect.metadata(metadataKey, metadataValue);
@@ -38010,7 +38073,7 @@ var require_tslib = __commonJS({
         }, i;
         function verb(n, f) {
           i[n] = o[n] ? function(v) {
-            return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v;
+            return (p = !p) ? { value: __await(o[n](v)), done: false } : f ? f(v) : v;
           } : f;
         }
       };
@@ -38088,6 +38151,10 @@ var require_tslib = __commonJS({
       exporter("__rest", __rest);
       exporter("__decorate", __decorate);
       exporter("__param", __param);
+      exporter("__esDecorate", __esDecorate);
+      exporter("__runInitializers", __runInitializers);
+      exporter("__propKey", __propKey);
+      exporter("__setFunctionName", __setFunctionName);
       exporter("__metadata", __metadata);
       exporter("__awaiter", __awaiter);
       exporter("__generator", __generator);
@@ -54203,6 +54270,10 @@ var CachePolicy = {
   NetworkOnly: "NetworkOnly",
   CacheAndNetwork: "CacheAndNetwork"
 };
+var PaginateMode = {
+  Infinite: "Infinite",
+  SinglePage: "SinglePage"
+};
 var ArtifactKind = {
   Query: "HoudiniQuery",
   Subscription: "HoudiniSubscription",
@@ -56556,6 +56627,7 @@ var Config = class {
   defaultPartial;
   internalListPosition;
   defaultListTarget = null;
+  defaultPaginateMode;
   definitionsFolder;
   newDocuments = "";
   defaultKeys = ["id"];
@@ -56592,6 +56664,7 @@ var Config = class {
       defaultPartial = false,
       defaultListPosition = "append",
       defaultListTarget = null,
+      defaultPaginateMode = PaginateMode.Infinite,
       defaultKeys,
       types: types14 = {},
       logLevel,
@@ -56625,6 +56698,7 @@ var Config = class {
     this.defaultPartial = defaultPartial;
     this.internalListPosition = defaultListPosition === "append" ? "last" : "first";
     this.defaultListTarget = defaultListTarget;
+    this.defaultPaginateMode = defaultPaginateMode;
     this.definitionsFolder = definitionsPath;
     this.logLevel = (logLevel || LogLevel.Summary).toLowerCase();
     this.defaultFragmentMasking = defaultFragmentMasking;
@@ -56888,7 +56962,7 @@ var Config = class {
   get listAllListsDirective() {
     return "allLists";
   }
-  get listNameArg() {
+  get listOrPaginateNameArg() {
     return "name";
   }
   get insertFragmentSuffix() {
@@ -56921,8 +56995,8 @@ var Config = class {
   get paginateDirective() {
     return "paginate";
   }
-  get paginateNameArg() {
-    return "name";
+  get paginateModeArg() {
+    return "mode";
   }
   get cacheDirective() {
     return "cache";
@@ -56964,7 +57038,7 @@ var Config = class {
     return name + this.removeFragmentSuffix;
   }
   isInternalEnum(node) {
-    return node.name.value === "CachePolicy";
+    return node.name.value === "CachePolicy" || node.name.value === "PaginateMode";
   }
   isInternalDirective(name) {
     const internalDirectives = this.#newSchemaInstance?.getDirectives().reduce((list, directive) => {
@@ -58324,6 +58398,7 @@ async function paginate(config2, documents) {
       let refetchQueryName = "";
       let nodeQuery = false;
       let fragment = "";
+      let paginateMode = config2.defaultPaginateMode;
       doc.document = graphql8.visit(doc.document, {
         OperationDefinition(node) {
           if (node.operation !== "query") {
@@ -58389,6 +58464,14 @@ async function paginate(config2, documents) {
           }
         },
         Directive(node) {
+          if (node.name.value === config2.paginateDirective) {
+            const paginateModeArg = node?.arguments?.find(
+              (arg) => arg.name.value === config2.paginateModeArg
+            );
+            if (paginateModeArg && paginateModeArg.value.kind === "EnumValue") {
+              paginateMode = paginateModeArg.value.value;
+            }
+          }
           if (node.name.value !== config2.argumentsDirective) {
             return;
           }
@@ -58433,7 +58516,8 @@ async function paginate(config2, documents) {
         targetType,
         paginated: true,
         direction,
-        start
+        start,
+        mode: paginateMode
       };
       if (!fragment) {
         continue;
@@ -58782,7 +58866,9 @@ async function addListFragments(config2, documents) {
     doc.document = graphql9.visit(doc.document, {
       Directive(node, key, parent, path2, ancestors) {
         if ([config2.listDirective, config2.paginateDirective].includes(node.name.value)) {
-          const nameArg = node.arguments?.find((arg) => arg.name.value === "name");
+          const nameArg = node.arguments?.find(
+            (arg) => arg.name.value === config2.listOrPaginateNameArg
+          );
           let error = {
             ...new graphql9.GraphQLError(
               "",
@@ -59082,14 +59168,23 @@ function fieldKey(config2, field) {
   const attributeName = field.alias?.value || field.name.value;
   const printed = graphql10.print(field);
   const secondParse = graphql10.parse(`{${printed}}`).definitions[0].selectionSet.selections[0];
-  const paginated = !!field.directives?.find(
+  let paginateMode = config2.defaultPaginateMode;
+  const paginatedDirective = field.directives?.find(
     (directive) => directive.name.value === config2.paginateDirective
   );
-  const paginationArgs = ["first", "after", "last", "before", "limit", "offset"];
+  if (paginatedDirective) {
+    const paginateModeArg = paginatedDirective?.arguments?.find(
+      (arg) => arg.name.value === config2.paginateModeArg
+    );
+    if (paginateModeArg && paginateModeArg.value.kind === "EnumValue") {
+      paginateMode = paginateModeArg.value.value;
+    }
+  }
+  const paginationArgs = paginateMode === "SinglePage" ? [] : ["first", "after", "last", "before", "limit", "offset"];
   const argObj = (secondParse.arguments || []).reduce((acc, arg) => {
     const start = arg.value.loc?.start;
     const end = arg.value.loc?.end;
-    if (paginated && paginationArgs.includes(arg.name.value)) {
+    if (paginatedDirective && paginationArgs.includes(arg.name.value)) {
       return acc;
     }
     if (!start || !end) {
@@ -59103,7 +59198,7 @@ function fieldKey(config2, field) {
   const args = Object.keys(argObj);
   args.sort();
   let key = Object.values(argObj).length > 0 ? `${attributeName}(${args.map((key2) => `${key2}: ${argObj[key2]}`).join(", ")})` : attributeName;
-  if (paginated) {
+  if (paginatedDirective) {
     key = key + "::paginated";
   }
   return key;
@@ -59243,7 +59338,9 @@ function selection({
       const listDirective = field.directives?.find(
         (directive) => [config2.listDirective, config2.paginateDirective].includes(directive.name.value)
       );
-      const nameArg = listDirective?.arguments?.find((arg) => arg.name.value === "name");
+      const nameArg = listDirective?.arguments?.find(
+        (arg) => arg.name.value === config2.listOrPaginateNameArg
+      );
       if (nameArg && nameArg.value.kind === "StringValue") {
         const { connection, type: connectionType } = connectionSelection(
           config2,
@@ -59362,7 +59459,7 @@ function artifactGenerator(stats) {
             return;
           }
           const nameArg = node.arguments?.find(
-            (arg) => arg.name.value === config2.listNameArg
+            (arg) => arg.name.value === config2.listOrPaginateNameArg
           );
           if (!nameArg || nameArg.value.kind !== "StringValue") {
             throw new HoudiniError({
@@ -60030,6 +60127,12 @@ function inlineType({
           includeFragments,
           allOptional
         });
+        const hasIncludeOrSkipDirective = selection2.directives && selection2.directives.filter(
+          (directive) => directive.name.value === "include" || directive.name.value === "skip"
+        ).length > 0;
+        if (hasIncludeOrSkipDirective) {
+          attributeType = AST10.tsUnionType([attributeType, AST10.tsUndefinedKeyword()]);
+        }
         const prop = readonlyProperty(
           AST10.tsPropertySignature(
             AST10.identifier(attributeName),
@@ -60726,7 +60829,9 @@ function listDefinitions(config2, body, docs) {
         if (![config2.listDirective, config2.paginateDirective].includes(node.name.value)) {
           return;
         }
-        const nameArg = node.arguments?.find((arg) => arg.name.value === "name");
+        const nameArg = node.arguments?.find(
+          (arg) => arg.name.value === config2.listOrPaginateNameArg
+        );
         const nameValue = nameArg?.value?.value || "";
         if (!nameValue || visitedLists.has(nameValue)) {
           return;
@@ -61051,17 +61156,22 @@ enum CachePolicy {
 	${CachePolicy.NetworkOnly}
 }
 
+enum PaginateMode {
+	${PaginateMode.Infinite}
+	${PaginateMode.SinglePage}
+}
+
 """
 	@${config2.listDirective} is used to mark a field for the runtime as a place to add or remove
 	entities in mutations
 """
-directive @${config2.listDirective}(${config2.listNameArg}: String!, connection: Boolean) on FIELD
+directive @${config2.listDirective}(${config2.listOrPaginateNameArg}: String!, connection: Boolean) on FIELD
 
 """
 	@${config2.paginateDirective} is used to to mark a field for pagination.
 	More info in the [doc](${siteURL}/guides/pagination).
 """
-directive @${config2.paginateDirective}(${config2.paginateNameArg}: String) on FIELD
+directive @${config2.paginateDirective}(${config2.listOrPaginateNameArg}: String, ${config2.paginateModeArg}: PaginateMode) on FIELD
 
 """
 	@${config2.listPrependDirective} is used to tell the runtime to add the result to the end of the list
@@ -61327,7 +61437,7 @@ async function typeCheck(config2, docs) {
         }
         needsParent = needsParent || definition.kind === "FragmentDefinition";
         const nameArg = directive.arguments?.find(
-          ({ name }) => name.value === config2.listNameArg
+          ({ name }) => name.value === config2.listOrPaginateNameArg
         );
         if (!nameArg) {
           if (directive.name.value === config2.listDirective) {
@@ -61807,7 +61917,14 @@ function paginateArgs(config2, filepath) {
               )
             );
           }
-          if (forward && backwards) {
+          const paginateModeArg = node?.arguments?.find(
+            (arg) => arg.name.value === config2.paginateModeArg
+          );
+          let paginateMode = config2.defaultPaginateMode;
+          if (paginateModeArg && paginateModeArg.value.kind === "EnumValue") {
+            paginateMode = paginateModeArg.value.value;
+          }
+          if (forward && backwards && paginateMode === "Infinite") {
             ctx.reportError(
               new graphql23.GraphQLError(
                 `A field with cursor pagination cannot go forwards an backwards simultaneously`

package/build/vite-cjs/index.js

@@ -45401,14 +45401,18 @@ var require_lib3 = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/tslib@2.4.1/node_modules/tslib/tslib.js
+// ../../node_modules/.pnpm/tslib@2.5.0/node_modules/tslib/tslib.js
 var require_tslib = __commonJS({
-  "../../node_modules/.pnpm/tslib@2.4.1/node_modules/tslib/tslib.js"(exports, module2) {
+  "../../node_modules/.pnpm/tslib@2.5.0/node_modules/tslib/tslib.js"(exports, module2) {
     var __extends;
     var __assign;
     var __rest;
     var __decorate;
     var __param;
+    var __esDecorate;
+    var __runInitializers;
+    var __propKey;
+    var __setFunctionName;
     var __metadata;
     var __awaiter;
     var __generator;
@@ -45505,6 +45509,65 @@ var require_tslib = __commonJS({
           decorator(target, key, paramIndex);
         };
       };
+      __esDecorate = function(ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+        function accept(f3) {
+          if (f3 !== void 0 && typeof f3 !== "function")
+            throw new TypeError("Function expected");
+          return f3;
+        }
+        var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+        var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+        var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+        var _, done = false;
+        for (var i2 = decorators.length - 1; i2 >= 0; i2--) {
+          var context = {};
+          for (var p in contextIn)
+            context[p] = p === "access" ? {} : contextIn[p];
+          for (var p in contextIn.access)
+            context.access[p] = contextIn.access[p];
+          context.addInitializer = function(f3) {
+            if (done)
+              throw new TypeError("Cannot add initializers after decoration has completed");
+            extraInitializers.push(accept(f3 || null));
+          };
+          var result = (0, decorators[i2])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+          if (kind === "accessor") {
+            if (result === void 0)
+              continue;
+            if (result === null || typeof result !== "object")
+              throw new TypeError("Object expected");
+            if (_ = accept(result.get))
+              descriptor.get = _;
+            if (_ = accept(result.set))
+              descriptor.set = _;
+            if (_ = accept(result.init))
+              initializers.push(_);
+          } else if (_ = accept(result)) {
+            if (kind === "field")
+              initializers.push(_);
+            else
+              descriptor[key] = _;
+          }
+        }
+        if (target)
+          Object.defineProperty(target, contextIn.name, descriptor);
+        done = true;
+      };
+      __runInitializers = function(thisArg, initializers, value) {
+        var useValue = arguments.length > 2;
+        for (var i2 = 0; i2 < initializers.length; i2++) {
+          value = useValue ? initializers[i2].call(thisArg, value) : initializers[i2].call(thisArg);
+        }
+        return useValue ? value : void 0;
+      };
+      __propKey = function(x2) {
+        return typeof x2 === "symbol" ? x2 : "".concat(x2);
+      };
+      __setFunctionName = function(f3, name, prefix) {
+        if (typeof name === "symbol")
+          name = name.description ? "[".concat(name.description, "]") : "";
+        return Object.defineProperty(f3, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
+      };
       __metadata = function(metadataKey, metadataValue) {
         if (typeof Reflect === "object" && typeof Reflect.metadata === "function")
           return Reflect.metadata(metadataKey, metadataValue);
@@ -45739,7 +45802,7 @@ var require_tslib = __commonJS({
         }, i2;
         function verb(n, f3) {
           i2[n] = o[n] ? function(v) {
-            return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f3 ? f3(v) : v;
+            return (p = !p) ? { value: __await(o[n](v)), done: false } : f3 ? f3(v) : v;
           } : f3;
         }
       };
@@ -45817,6 +45880,10 @@ var require_tslib = __commonJS({
       exporter("__rest", __rest);
       exporter("__decorate", __decorate);
       exporter("__param", __param);
+      exporter("__esDecorate", __esDecorate);
+      exporter("__runInitializers", __runInitializers);
+      exporter("__propKey", __propKey);
+      exporter("__setFunctionName", __setFunctionName);
       exporter("__metadata", __metadata);
       exporter("__awaiter", __awaiter);
       exporter("__generator", __generator);
@@ -65334,6 +65401,10 @@ var CachePolicy = {
   NetworkOnly: "NetworkOnly",
   CacheAndNetwork: "CacheAndNetwork"
 };
+var PaginateMode = {
+  Infinite: "Infinite",
+  SinglePage: "SinglePage"
+};
 var ArtifactKind = {
   Query: "HoudiniQuery",
   Subscription: "HoudiniSubscription",
@@ -68944,6 +69015,7 @@ var Config = class {
   defaultPartial;
   internalListPosition;
   defaultListTarget = null;
+  defaultPaginateMode;
   definitionsFolder;
   newDocuments = "";
   defaultKeys = ["id"];
@@ -68980,6 +69052,7 @@ var Config = class {
       defaultPartial = false,
       defaultListPosition = "append",
       defaultListTarget = null,
+      defaultPaginateMode = PaginateMode.Infinite,
       defaultKeys,
       types: types17 = {},
       logLevel,
@@ -69013,6 +69086,7 @@ var Config = class {
     this.defaultPartial = defaultPartial;
     this.internalListPosition = defaultListPosition === "append" ? "last" : "first";
     this.defaultListTarget = defaultListTarget;
+    this.defaultPaginateMode = defaultPaginateMode;
     this.definitionsFolder = definitionsPath;
     this.logLevel = (logLevel || LogLevel.Summary).toLowerCase();
     this.defaultFragmentMasking = defaultFragmentMasking;
@@ -69276,7 +69350,7 @@ var Config = class {
   get listAllListsDirective() {
     return "allLists";
   }
-  get listNameArg() {
+  get listOrPaginateNameArg() {
     return "name";
   }
   get insertFragmentSuffix() {
@@ -69309,8 +69383,8 @@ var Config = class {
   get paginateDirective() {
     return "paginate";
   }
-  get paginateNameArg() {
-    return "name";
+  get paginateModeArg() {
+    return "mode";
   }
   get cacheDirective() {
     return "cache";
@@ -69352,7 +69426,7 @@ var Config = class {
     return name + this.removeFragmentSuffix;
   }
   isInternalEnum(node) {
-    return node.name.value === "CachePolicy";
+    return node.name.value === "CachePolicy" || node.name.value === "PaginateMode";
   }
   isInternalDirective(name) {
     const internalDirectives = this.#newSchemaInstance?.getDirectives().reduce((list, directive) => {
@@ -71119,6 +71193,7 @@ async function paginate(config4, documents) {
       let refetchQueryName = "";
       let nodeQuery = false;
       let fragment = "";
+      let paginateMode = config4.defaultPaginateMode;
       doc.document = graphql10.visit(doc.document, {
         OperationDefinition(node) {
           if (node.operation !== "query") {
@@ -71184,6 +71259,14 @@ async function paginate(config4, documents) {
           }
         },
         Directive(node) {
+          if (node.name.value === config4.paginateDirective) {
+            const paginateModeArg = node?.arguments?.find(
+              (arg) => arg.name.value === config4.paginateModeArg
+            );
+            if (paginateModeArg && paginateModeArg.value.kind === "EnumValue") {
+              paginateMode = paginateModeArg.value.value;
+            }
+          }
           if (node.name.value !== config4.argumentsDirective) {
             return;
           }
@@ -71228,7 +71311,8 @@ async function paginate(config4, documents) {
         targetType,
         paginated: true,
         direction,
-        start
+        start,
+        mode: paginateMode
       };
       if (!fragment) {
         continue;
@@ -71577,7 +71661,9 @@ async function addListFragments(config4, documents) {
     doc.document = graphql11.visit(doc.document, {
       Directive(node, key, parent, path2, ancestors) {
         if ([config4.listDirective, config4.paginateDirective].includes(node.name.value)) {
-          const nameArg = node.arguments?.find((arg) => arg.name.value === "name");
+          const nameArg = node.arguments?.find(
+            (arg) => arg.name.value === config4.listOrPaginateNameArg
+          );
           let error = {
             ...new graphql11.GraphQLError(
               "",
@@ -71877,14 +71963,23 @@ function fieldKey(config4, field) {
   const attributeName = field.alias?.value || field.name.value;
   const printed = graphql12.print(field);
   const secondParse = graphql12.parse(`{${printed}}`).definitions[0].selectionSet.selections[0];
-  const paginated = !!field.directives?.find(
+  let paginateMode = config4.defaultPaginateMode;
+  const paginatedDirective = field.directives?.find(
     (directive) => directive.name.value === config4.paginateDirective
   );
-  const paginationArgs = ["first", "after", "last", "before", "limit", "offset"];
+  if (paginatedDirective) {
+    const paginateModeArg = paginatedDirective?.arguments?.find(
+      (arg) => arg.name.value === config4.paginateModeArg
+    );
+    if (paginateModeArg && paginateModeArg.value.kind === "EnumValue") {
+      paginateMode = paginateModeArg.value.value;
+    }
+  }
+  const paginationArgs = paginateMode === "SinglePage" ? [] : ["first", "after", "last", "before", "limit", "offset"];
   const argObj = (secondParse.arguments || []).reduce((acc, arg) => {
     const start = arg.value.loc?.start;
     const end = arg.value.loc?.end;
-    if (paginated && paginationArgs.includes(arg.name.value)) {
+    if (paginatedDirective && paginationArgs.includes(arg.name.value)) {
       return acc;
     }
     if (!start || !end) {
@@ -71898,7 +71993,7 @@ function fieldKey(config4, field) {
   const args = Object.keys(argObj);
   args.sort();
   let key = Object.values(argObj).length > 0 ? `${attributeName}(${args.map((key2) => `${key2}: ${argObj[key2]}`).join(", ")})` : attributeName;
-  if (paginated) {
+  if (paginatedDirective) {
     key = key + "::paginated";
   }
   return key;
@@ -72038,7 +72133,9 @@ function selection({
       const listDirective = field.directives?.find(
         (directive) => [config4.listDirective, config4.paginateDirective].includes(directive.name.value)
       );
-      const nameArg = listDirective?.arguments?.find((arg) => arg.name.value === "name");
+      const nameArg = listDirective?.arguments?.find(
+        (arg) => arg.name.value === config4.listOrPaginateNameArg
+      );
       if (nameArg && nameArg.value.kind === "StringValue") {
         const { connection, type: connectionType } = connectionSelection(
           config4,
@@ -72157,7 +72254,7 @@ function artifactGenerator(stats) {
             return;
           }
           const nameArg = node.arguments?.find(
-            (arg) => arg.name.value === config4.listNameArg
+            (arg) => arg.name.value === config4.listOrPaginateNameArg
           );
           if (!nameArg || nameArg.value.kind !== "StringValue") {
             throw new HoudiniError({
@@ -72825,6 +72922,12 @@ function inlineType({
           includeFragments,
           allOptional
         });
+        const hasIncludeOrSkipDirective = selection2.directives && selection2.directives.filter(
+          (directive) => directive.name.value === "include" || directive.name.value === "skip"
+        ).length > 0;
+        if (hasIncludeOrSkipDirective) {
+          attributeType = AST10.tsUnionType([attributeType, AST10.tsUndefinedKeyword()]);
+        }
         const prop = readonlyProperty(
           AST10.tsPropertySignature(
             AST10.identifier(attributeName),
@@ -73521,7 +73624,9 @@ function listDefinitions(config4, body, docs) {
         if (![config4.listDirective, config4.paginateDirective].includes(node.name.value)) {
           return;
         }
-        const nameArg = node.arguments?.find((arg) => arg.name.value === "name");
+        const nameArg = node.arguments?.find(
+          (arg) => arg.name.value === config4.listOrPaginateNameArg
+        );
         const nameValue = nameArg?.value?.value || "";
         if (!nameValue || visitedLists.has(nameValue)) {
           return;
@@ -73846,17 +73951,22 @@ enum CachePolicy {
 	${CachePolicy.NetworkOnly}
 }
 
+enum PaginateMode {
+	${PaginateMode.Infinite}
+	${PaginateMode.SinglePage}
+}
+
 """
 	@${config4.listDirective} is used to mark a field for the runtime as a place to add or remove
 	entities in mutations
 """
-directive @${config4.listDirective}(${config4.listNameArg}: String!, connection: Boolean) on FIELD
+directive @${config4.listDirective}(${config4.listOrPaginateNameArg}: String!, connection: Boolean) on FIELD
 
 """
 	@${config4.paginateDirective} is used to to mark a field for pagination.
 	More info in the [doc](${siteURL}/guides/pagination).
 """
-directive @${config4.paginateDirective}(${config4.paginateNameArg}: String) on FIELD
+directive @${config4.paginateDirective}(${config4.listOrPaginateNameArg}: String, ${config4.paginateModeArg}: PaginateMode) on FIELD
 
 """
 	@${config4.listPrependDirective} is used to tell the runtime to add the result to the end of the list
@@ -74122,7 +74232,7 @@ async function typeCheck(config4, docs) {
         }
         needsParent = needsParent || definition.kind === "FragmentDefinition";
         const nameArg = directive.arguments?.find(
-          ({ name }) => name.value === config4.listNameArg
+          ({ name }) => name.value === config4.listOrPaginateNameArg
         );
         if (!nameArg) {
           if (directive.name.value === config4.listDirective) {
@@ -74602,7 +74712,14 @@ function paginateArgs(config4, filepath) {
               )
             );
           }
-          if (forward && backwards) {
+          const paginateModeArg = node?.arguments?.find(
+            (arg) => arg.name.value === config4.paginateModeArg
+          );
+          let paginateMode = config4.defaultPaginateMode;
+          if (paginateModeArg && paginateModeArg.value.kind === "EnumValue") {
+            paginateMode = paginateModeArg.value.value;
+          }
+          if (forward && backwards && paginateMode === "Infinite") {
             ctx.reportError(
               new graphql25.GraphQLError(
                 `A field with cursor pagination cannot go forwards an backwards simultaneously`