houdini 1.0.6 → 1.0.8

package/build/cmd-esm/index.js

@@ -43775,14 +43775,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;
@@ -43879,6 +43883,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);
@@ -44113,7 +44176,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;
         }
       };
@@ -44191,6 +44254,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);
@@ -68475,6 +68542,10 @@ var CachePolicy = {
   NetworkOnly: "NetworkOnly",
   CacheAndNetwork: "CacheAndNetwork"
 };
+var PaginateMode = {
+  Infinite: "Infinite",
+  SinglePage: "SinglePage"
+};
 var ArtifactKind = {
   Query: "HoudiniQuery",
   Subscription: "HoudiniSubscription",
@@ -72084,6 +72155,7 @@ var Config = class {
   defaultPartial;
   internalListPosition;
   defaultListTarget = null;
+  defaultPaginateMode;
   definitionsFolder;
   newDocuments = "";
   defaultKeys = ["id"];
@@ -72120,6 +72192,7 @@ var Config = class {
       defaultPartial = false,
       defaultListPosition = "append",
       defaultListTarget = null,
+      defaultPaginateMode = PaginateMode.Infinite,
       defaultKeys,
       types: types16 = {},
       logLevel,
@@ -72153,6 +72226,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;
@@ -72416,7 +72490,7 @@ var Config = class {
   get listAllListsDirective() {
     return "allLists";
   }
-  get listNameArg() {
+  get listOrPaginateNameArg() {
     return "name";
   }
   get insertFragmentSuffix() {
@@ -72449,8 +72523,8 @@ var Config = class {
   get paginateDirective() {
     return "paginate";
   }
-  get paginateNameArg() {
-    return "name";
+  get paginateModeArg() {
+    return "mode";
   }
   get cacheDirective() {
     return "cache";
@@ -72492,7 +72566,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) => {
@@ -73013,6 +73087,57 @@ function deepMerge(filepath, ...targets) {
   }
 }
 
+// src/lib/detectTools.ts
+async function detectFromPackageJSON(cwd) {
+  try {
+    const packageJSONFile = await fs_exports.readFile(path_exports.join(cwd, "package.json"));
+    if (packageJSONFile) {
+      var packageJSON = JSON.parse(packageJSONFile);
+    } else {
+      throw new Error("not found");
+    }
+  } catch {
+    throw new Error(
+      "\u274C houdini init must target an existing node project (with a package.json)"
+    );
+  }
+  const { devDependencies, dependencies } = packageJSON;
+  const hasDependency = (dep) => Boolean(devDependencies?.[dep] || dependencies?.[dep]);
+  let framework = "svelte";
+  if (hasDependency("@sveltejs/kit")) {
+    framework = "kit";
+  }
+  return {
+    framework,
+    module: packageJSON["type"] === "module" ? "esm" : "commonjs"
+  };
+}
+async function detectTools(cwd) {
+  let typescript = false;
+  try {
+    await fs_exports.stat(path_exports.join(cwd, "tsconfig.json"));
+    typescript = true;
+  } catch {
+  }
+  let package_manager = "npm";
+  let dir = cwd;
+  do {
+    if (fs_exports.existsSync(path_exports.join(dir, "pnpm-lock.yaml"))) {
+      package_manager = "pnpm";
+      break;
+    }
+    if (fs_exports.existsSync(path_exports.join(dir, "yarn.lock"))) {
+      package_manager = "yarn";
+      break;
+    }
+  } while (dir !== (dir = path_exports.dirname(dir)));
+  return {
+    typescript,
+    package_manager,
+    ...await detectFromPackageJSON(cwd)
+  };
+}
+
 // ../../node_modules/.pnpm/estree-walker@3.0.1/node_modules/estree-walker/src/walker.js
 var WalkerBase = class {
   constructor() {
@@ -74260,6 +74385,7 @@ async function paginate(config2, documents) {
       let refetchQueryName = "";
       let nodeQuery = false;
       let fragment = "";
+      let paginateMode = config2.defaultPaginateMode;
       doc.document = graphql10.visit(doc.document, {
         OperationDefinition(node) {
           if (node.operation !== "query") {
@@ -74325,6 +74451,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;
           }
@@ -74369,7 +74503,8 @@ async function paginate(config2, documents) {
         targetType,
         paginated: true,
         direction,
-        start
+        start,
+        mode: paginateMode
       };
       if (!fragment) {
         continue;
@@ -74718,7 +74853,9 @@ async function addListFragments(config2, documents) {
     doc.document = graphql11.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 graphql11.GraphQLError(
               "",
@@ -75018,14 +75155,23 @@ function fieldKey(config2, 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 = 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) {
@@ -75039,7 +75185,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;
@@ -75179,7 +75325,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,
@@ -75298,7 +75446,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({
@@ -75966,6 +76114,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),
@@ -76662,7 +76816,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;
@@ -76987,17 +77143,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
@@ -77263,7 +77424,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) {
@@ -77743,7 +77904,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 graphql25.GraphQLError(
                 `A field with cursor pagination cannot go forwards an backwards simultaneously`
@@ -78521,15 +78689,15 @@ async function init(_path, args) {
     module,
     url: is_remote_endpoint ? url : null
   });
-  await fs_exports.writeFile(houdiniClientPath, networkFile(url, typescript));
+  await fs_exports.writeFile(houdiniClientPath, networkFile(url));
   await graphqlRCFile(targetPath);
   await gitIgnore(targetPath);
   if (framework === "kit") {
     await updateSvelteConfig(targetPath, typescript);
   } else if (framework === "svelte") {
-    await updateSvelteMainJs(targetPath);
+    await updateSvelteMainJs(targetPath, typescript);
   }
-  await updateViteConfig(targetPath, framework);
+  await updateViteConfig(targetPath, framework, typescript);
   await tjsConfig(targetPath, framework);
   console.log();
   console.log("\u{1F3A9} Welcome to Houdini!");
@@ -78548,16 +78716,16 @@ async function init(_path, args) {
 2\uFE0F\u20E3  Start your application:     ${logGreen(cmd_run)}
 `);
 }
-var networkFile = (url, typescript) => `import { HoudiniClient${typescript ? ", type RequestHandler" : ""} } from '$houdini';
+var networkFile = (url) => `import { HoudiniClient } from '$houdini';
 
 export default new HoudiniClient({
     url: '${url}'
-	
+
     // uncomment this to configure the network call (for things like authentication)
-	// for more information, please visit here: https://www.houdinigraphql.com/guides/authentication
+    // for more information, please visit here: https://www.houdinigraphql.com/guides/authentication
     // fetchParams({ session }) { 
     //     return { 
-	//         headers: {
+    //         headers: {
     //             Authentication: \`Bearer \${session.token}\`,
     //         }
     //     }
@@ -78636,27 +78804,30 @@ async function tjsConfig(targetPath, framework) {
   }
   return false;
 }
-async function updateViteConfig(targetPath, framework) {
-  const viteConfigPath = path_exports.join(targetPath, "vite.config.js");
-  const viteConfigKit = `import { sveltekit } from '@sveltejs/kit/vite';
-import houdini from 'houdini/vite';
-
-/** @type {import('vite').UserConfig} */
-const config = {
-	plugins: [houdini(), sveltekit()],
-}
-
-export default config;
+async function updateViteConfig(targetPath, framework, typescript) {
+  const viteConfigPath = path_exports.join(targetPath, typescript ? "vite.config.ts" : "vite.config.js");
+  const viteConfigKit = `import { sveltekit } from '@sveltejs/kit/vite'
+import houdini from 'houdini/vite'
+import { defineConfig } from 'vite'
+
+export default defineConfig({
+	plugins: [houdini(), sveltekit()]
+});
 `;
-  const viteConfigSvelte = `import { svelte } from '@sveltejs/vite-plugin-svelte';
-import houdini from 'houdini/vite';
+  const viteConfigSvelte = `import { svelte } from '@sveltejs/vite-plugin-svelte'
+import houdini from 'houdini/vite'
+import * as path from 'path'
+import { defineConfig } from 'vite'
 
-/** @type {import('vite').UserConfig} */
-const config = {
+export default defineConfig({
 	plugins: [houdini(), svelte()],
-}
 
-export default config;
+	resolve: {
+		alias: {
+			$houdini: path.resolve('$houdini'),
+		},
+	},
+})	
 `;
   let content;
   if (framework === "kit") {
@@ -78711,12 +78882,11 @@ export default config;
     content: typescript ? newContentTs : newContentJs
   });
 }
-async function updateSvelteMainJs(targetPath) {
-  const svelteMainJsPath = path_exports.join(targetPath, "main.js");
-  const newContent = `import client from "../client";
+async function updateSvelteMainJs(targetPath, typescript) {
+  const svelteMainJsPath = path_exports.join(targetPath, "src", typescript ? "main.ts" : "main.js");
+  const newContent = `import client from "./client";
 import './app.css'
 import App from './App.svelte'
-import { logGreen } from '@kitql/helper'
 
 client.init();
 
@@ -78740,8 +78910,8 @@ async function updatePackageJSON(targetPath) {
   }
   packageJSON.devDependencies = {
     ...packageJSON.devDependencies,
-    houdini: "^1.0.6",
-    "houdini-svelte": "^1.0.6"
+    houdini: "^1.0.8",
+    "houdini-svelte": "^1.0.8"
   };
   await fs_exports.writeFile(packagePath, JSON.stringify(packageJSON, null, 4));
 }
@@ -78769,50 +78939,6 @@ async function gitIgnore(targetPath) {
     await fs_exports.writeFile(filepath, existing + "\n$houdini\n");
   }
 }
-async function detectTools(cwd) {
-  try {
-    const packageJSONFile = await fs_exports.readFile(path_exports.join(cwd, "package.json"));
-    if (packageJSONFile) {
-      var packageJSON = JSON.parse(packageJSONFile);
-    } else {
-      throw new Error("not found");
-    }
-  } catch {
-    throw new Error(
-      "\u274C houdini init must target an existing node project (with a package.json)"
-    );
-  }
-  const { devDependencies, dependencies } = packageJSON;
-  const hasDependency = (dep) => Boolean(devDependencies?.[dep] || dependencies?.[dep]);
-  let framework = "svelte";
-  if (hasDependency("@sveltejs/kit")) {
-    framework = "kit";
-  }
-  let typescript = false;
-  try {
-    await fs_exports.stat(path_exports.join(cwd, "tsconfig.json"));
-    typescript = true;
-  } catch {
-  }
-  let package_manager = "npm";
-  let dir = cwd;
-  do {
-    if (fs_exports.existsSync(path_exports.join(dir, "pnpm-lock.yaml"))) {
-      package_manager = "pnpm";
-      break;
-    }
-    if (fs_exports.existsSync(path_exports.join(dir, "yarn.lock"))) {
-      package_manager = "yarn";
-      break;
-    }
-  } while (dir !== (dir = path_exports.dirname(dir)));
-  return {
-    typescript,
-    framework,
-    module: packageJSON["type"] === "module" ? "esm" : "commonjs",
-    package_manager
-  };
-}
 async function updateFile({ filepath, content }) {
   await fs_exports.writeFile(filepath, content);
 }