houdini 1.3.1 → 1.4.1

package/build/codegen-esm/index.js

@@ -53973,6 +53973,11 @@ var CachePolicy = {
   CacheAndNetwork: "CacheAndNetwork",
   NoCache: "NoCache"
 };
+var DedupeMatchMode = {
+  Variables: "Variables",
+  Operation: "Operation",
+  None: "None"
+};
 var PaginateMode = {
   Infinite: "Infinite",
   SinglePage: "SinglePage"
@@ -54552,7 +54557,18 @@ var ListManager = class {
   }
   lists = /* @__PURE__ */ new Map();
   listsByField = /* @__PURE__ */ new Map();
-  get(listName, id, allLists) {
+  get(listName, id, allLists, skipMatches) {
+    const lists = this.getLists(listName, id, allLists);
+    if (!lists) {
+      return null;
+    }
+    if (skipMatches) {
+      return new ListCollection(lists.lists.filter((list) => !skipMatches.has(list.fieldRef)));
+    } else {
+      return lists;
+    }
+  }
+  getLists(listName, id, allLists) {
     const matches = this.lists.get(listName);
     if (!matches || matches.size === 0) {
       return null;
@@ -54674,6 +54690,9 @@ var List = class {
     this.manager = manager;
     this.abstract = abstract;
   }
+  get fieldRef() {
+    return `${this.recordID}.${this.key}`;
+  }
   when(when) {
     return this.manager.lists.get(this.name).get(this.recordID).when(when);
   }
@@ -55826,8 +55845,8 @@ var Cache = class {
       variables
     );
   }
-  list(name, parentID, allLists) {
-    const handler = this._internal_unstable.lists.get(name, parentID, allLists);
+  list(name, parentID, allLists, skipMatches) {
+    const handler = this._internal_unstable.lists.get(name, parentID, allLists, skipMatches);
     if (!handler) {
       throw new Error(
         `Cannot find list with name: ${name}${parentID ? " under parent " + parentID : ""}. Is it possible that the query is not mounted?`
@@ -56242,6 +56261,7 @@ var CacheInternal = class {
           });
         }
       }
+      const processedOperations = /* @__PURE__ */ new Set();
       for (const operation of operations || []) {
         let parentID;
         if (operation.parentID) {
@@ -56261,7 +56281,12 @@ var CacheInternal = class {
         const targets = Array.isArray(value) ? value : [value];
         for (const target of targets) {
           if (operation.action === "insert" && target instanceof Object && fieldSelection && operation.list) {
-            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).addToList(
+            this.cache.list(
+              operation.list,
+              parentID,
+              operation.target === "all",
+              processedOperations
+            ).when(operation.when).addToList(
               fieldSelection,
               target,
               variables,
@@ -56269,7 +56294,12 @@ var CacheInternal = class {
               layer
             );
           } else if (operation.action === "toggle" && target instanceof Object && fieldSelection && operation.list) {
-            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).toggleElement({
+            this.cache.list(
+              operation.list,
+              parentID,
+              operation.target === "all",
+              processedOperations
+            ).when(operation.when).toggleElement({
               selection: fieldSelection,
               data: target,
               variables,
@@ -56277,7 +56307,12 @@ var CacheInternal = class {
               layer
             });
           } else if (operation.action === "remove" && target instanceof Object && fieldSelection && operation.list) {
-            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).remove(target, variables, layer);
+            this.cache.list(
+              operation.list,
+              parentID,
+              operation.target === "all",
+              processedOperations
+            ).when(operation.when).remove(target, variables, layer);
           } else if (operation.action === "delete" && operation.type && target) {
             const targetID = this.id(operation.type, target);
             if (!targetID) {
@@ -56289,6 +56324,16 @@ var CacheInternal = class {
             this.cache.delete(targetID, layer);
           }
         }
+        if (operation.list) {
+          const matchingLists = this.cache.list(
+            operation.list,
+            parentID,
+            operation.target === "all"
+          );
+          for (const list of matchingLists.lists) {
+            processedOperations.add(list.fieldRef);
+          }
+        }
       }
     }
     return toNotify;
@@ -58855,14 +58900,27 @@ async function paginate(config, documents) {
           return {
             ...node,
             variableDefinitions: finalVariables,
-            directives: [
+            directives: config.configFile.supressPaginationDeduplication ? node.directives : [
               ...node.directives || [],
               {
                 kind: graphql13.Kind.DIRECTIVE,
                 name: {
                   kind: graphql13.Kind.NAME,
                   value: config.dedupeDirective
-                }
+                },
+                arguments: [
+                  {
+                    kind: "Argument",
+                    name: {
+                      kind: "Name",
+                      value: "match"
+                    },
+                    value: {
+                      kind: "EnumValue",
+                      value: DedupeMatchMode.Variables
+                    }
+                  }
+                ]
               }
             ]
           };
@@ -59230,6 +59288,46 @@ function objectNode([type, defaultValue]) {
   return node;
 }
 var pageInfoSelection = [
+  {
+    kind: graphql13.Kind.FIELD,
+    name: {
+      kind: graphql13.Kind.NAME,
+      value: "pageInfo"
+    },
+    selectionSet: {
+      kind: graphql13.Kind.SELECTION_SET,
+      selections: [
+        {
+          kind: graphql13.Kind.FIELD,
+          name: {
+            kind: graphql13.Kind.NAME,
+            value: "hasPreviousPage"
+          }
+        },
+        {
+          kind: graphql13.Kind.FIELD,
+          name: {
+            kind: graphql13.Kind.NAME,
+            value: "hasNextPage"
+          }
+        },
+        {
+          kind: graphql13.Kind.FIELD,
+          name: {
+            kind: graphql13.Kind.NAME,
+            value: "startCursor"
+          }
+        },
+        {
+          kind: graphql13.Kind.FIELD,
+          name: {
+            kind: graphql13.Kind.NAME,
+            value: "endCursor"
+          }
+        }
+      ]
+    }
+  },
   {
     kind: graphql13.Kind.FIELD,
     name: {
@@ -60219,7 +60317,13 @@ function artifactGenerator(stats) {
               const cancelFirstArg = dedupeDirective.arguments?.find(
                 (arg) => arg.name.value === "cancelFirst"
               );
-              dedupe = cancelFirstArg && cancelFirstArg.value.kind === "BooleanValue" && cancelFirstArg.value ? "first" : "last";
+              const matchArg = dedupeDirective.arguments?.find(
+                (arg) => arg.name.value === "match"
+              );
+              dedupe = {
+                cancel: cancelFirstArg && cancelFirstArg.value.kind === "BooleanValue" && cancelFirstArg.value ? "first" : "last",
+                match: matchArg && matchArg.value.kind === "EnumValue" ? matchArg.value.value : DedupeMatchMode.Operation
+              };
             }
             selectionSet = operation.selectionSet;
             if (originalParsed.definitions[0].kind === "OperationDefinition") {
@@ -63886,11 +63990,20 @@ directive @${config.paginateDirective}(${config.listOrPaginateNameArg}: String,
 """
 directive @${config.listPrependDirective} on FRAGMENT_SPREAD
 
+enum DedupeMatchMode {
+	${DedupeMatchMode.Variables}
+	${DedupeMatchMode.Operation}
+	${DedupeMatchMode.None}
+}
+
 """
 	@${config.dedupeDirective} is used to prevent an operation from running more than once at the same time.
 	If the cancelFirst arg is set to true, the response already in flight will be canceled instead of the second one.
+	If match is set to Operation, then a request will be deduplicated any time there is a request with the same operation. 
+	If it's set to Variables then the request will only be deduplicated if the variables match. If match is set to None,
+	then the request will never be deduplicated.
 """
-directive @${config.dedupeDirective}(cancelFirst: Boolean) on QUERY | MUTATION
+directive @${config.dedupeDirective}(cancelFirst: Boolean, match: DedupeMatchMode) on QUERY | MUTATION
 
 """
 	@${config.optimisticKeyDirective} is used to identify a field as an optimistic key

package/build/lib/config.d.ts

@@ -13,6 +13,7 @@ export declare class Config {
     localSchema: boolean;
     projectRoot: string;
     schema: graphql.GraphQLSchema;
+    runtimeDir?: string;
     schemaPath?: string;
     persistedQueriesPath: string;
     exclude: string[];

package/build/lib/router/types.d.ts

@@ -9,7 +9,9 @@ export type Adapter = ((args: {
     manifest: ProjectManifest;
     adapterPath: string;
 }) => void | Promise<void>) & {
-    includePaths?: Record<string, string>;
+    includePaths?: Record<string, string> | ((args: {
+        config: Config;
+    }) => Record<string, string>);
     disableServer?: boolean;
     pre?: (args: {
         config: Config;

package/build/lib-cjs/index.js

@@ -58181,6 +58181,7 @@ __export(lib_exports, {
   CompiledSubscriptionKind: () => CompiledSubscriptionKind,
   Config: () => Config,
   DataSource: () => DataSource,
+  DedupeMatchMode: () => DedupeMatchMode,
   DocumentStore: () => DocumentStore,
   HoudiniClient: () => HoudiniClient,
   HoudiniError: () => HoudiniError,
@@ -61533,6 +61534,11 @@ var CachePolicy = {
   CacheAndNetwork: "CacheAndNetwork",
   NoCache: "NoCache"
 };
+var DedupeMatchMode = {
+  Variables: "Variables",
+  Operation: "Operation",
+  None: "None"
+};
 var PaginateMode = {
   Infinite: "Infinite",
   SinglePage: "SinglePage"
@@ -63979,7 +63985,18 @@ var ListManager = class {
   }
   lists = /* @__PURE__ */ new Map();
   listsByField = /* @__PURE__ */ new Map();
-  get(listName, id, allLists) {
+  get(listName, id, allLists, skipMatches) {
+    const lists = this.getLists(listName, id, allLists);
+    if (!lists) {
+      return null;
+    }
+    if (skipMatches) {
+      return new ListCollection(lists.lists.filter((list) => !skipMatches.has(list.fieldRef)));
+    } else {
+      return lists;
+    }
+  }
+  getLists(listName, id, allLists) {
     const matches = this.lists.get(listName);
     if (!matches || matches.size === 0) {
       return null;
@@ -64101,6 +64118,9 @@ var List = class {
     this.manager = manager;
     this.abstract = abstract;
   }
+  get fieldRef() {
+    return `${this.recordID}.${this.key}`;
+  }
   when(when) {
     return this.manager.lists.get(this.name).get(this.recordID).when(when);
   }
@@ -65253,8 +65273,8 @@ var Cache = class {
       variables
     );
   }
-  list(name, parentID, allLists) {
-    const handler = this._internal_unstable.lists.get(name, parentID, allLists);
+  list(name, parentID, allLists, skipMatches) {
+    const handler = this._internal_unstable.lists.get(name, parentID, allLists, skipMatches);
     if (!handler) {
       throw new Error(
         `Cannot find list with name: ${name}${parentID ? " under parent " + parentID : ""}. Is it possible that the query is not mounted?`
@@ -65669,6 +65689,7 @@ var CacheInternal = class {
           });
         }
       }
+      const processedOperations = /* @__PURE__ */ new Set();
       for (const operation of operations || []) {
         let parentID;
         if (operation.parentID) {
@@ -65688,7 +65709,12 @@ var CacheInternal = class {
         const targets = Array.isArray(value) ? value : [value];
         for (const target of targets) {
           if (operation.action === "insert" && target instanceof Object && fieldSelection && operation.list) {
-            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).addToList(
+            this.cache.list(
+              operation.list,
+              parentID,
+              operation.target === "all",
+              processedOperations
+            ).when(operation.when).addToList(
               fieldSelection,
               target,
               variables,
@@ -65696,7 +65722,12 @@ var CacheInternal = class {
               layer
             );
           } else if (operation.action === "toggle" && target instanceof Object && fieldSelection && operation.list) {
-            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).toggleElement({
+            this.cache.list(
+              operation.list,
+              parentID,
+              operation.target === "all",
+              processedOperations
+            ).when(operation.when).toggleElement({
               selection: fieldSelection,
               data: target,
               variables,
@@ -65704,7 +65735,12 @@ var CacheInternal = class {
               layer
             });
           } else if (operation.action === "remove" && target instanceof Object && fieldSelection && operation.list) {
-            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).remove(target, variables, layer);
+            this.cache.list(
+              operation.list,
+              parentID,
+              operation.target === "all",
+              processedOperations
+            ).when(operation.when).remove(target, variables, layer);
           } else if (operation.action === "delete" && operation.type && target) {
             const targetID = this.id(operation.type, target);
             if (!targetID) {
@@ -65716,6 +65752,16 @@ var CacheInternal = class {
             this.cache.delete(targetID, layer);
           }
         }
+        if (operation.list) {
+          const matchingLists = this.cache.list(
+            operation.list,
+            parentID,
+            operation.target === "all"
+          );
+          for (const list of matchingLists.lists) {
+            processedOperations.add(list.fieldRef);
+          }
+        }
       }
     }
     return toNotify;
@@ -66232,6 +66278,11 @@ var defaultFetch = (url, params) => {
         ...params?.headers
       }
     });
+    if (!result.ok && !result.headers.get("content-type")?.startsWith("application/json") && !result.headers.get("content-type")?.startsWith("application/graphql+json")) {
+      throw new Error(
+        `Failed to fetch: server returned invalid response with error ${result.status}: ${result.statusText}`
+      );
+    }
     return await result.json();
   };
 };
@@ -67052,7 +67103,8 @@ var DocumentStore = class extends Writable {
   pendingPromise = null;
   serverSideFallback;
   controllerKey(variables) {
-    return this.artifact.name;
+    const usedVariables = "dedupe" in this.artifact && this.artifact.dedupe?.match !== DedupeMatchMode.Variables ? {} : variables;
+    return `${this.artifact.name}@${stableStringify(usedVariables)}`;
   }
   constructor({
     artifact,
@@ -67114,16 +67166,20 @@ var DocumentStore = class extends Writable {
     silenceEcho = false,
     abortController = new AbortController()
   } = {}) {
-    if ("dedupe" in this.artifact) {
-      if (inflightRequests[this.controllerKey(variables)]) {
-        if (this.artifact.dedupe === "first") {
-          inflightRequests[this.controllerKey(variables)].abort();
-          inflightRequests[this.controllerKey(variables)] = abortController;
+    if ("dedupe" in this.artifact && this.artifact.dedupe && this.artifact.dedupe.match !== "None") {
+      const dedupeKey = this.controllerKey(variables);
+      if (inflightRequests[dedupeKey]) {
+        if (this.artifact.dedupe.cancel === "first") {
+          inflightRequests[dedupeKey].controller.abort();
+          inflightRequests[dedupeKey].controller = abortController;
         } else {
           abortController.abort();
         }
       } else {
-        inflightRequests[this.controllerKey(variables)] = abortController;
+        inflightRequests[dedupeKey] = {
+          variables,
+          controller: abortController
+        };
       }
     }
     let context = new ClientPluginContextWrapper({
@@ -67445,6 +67501,21 @@ function marshalVariables(ctx) {
 function variablesChanged(ctx) {
   return ctx.stuff.inputs?.changed;
 }
+function stableStringify(obj) {
+  return JSON.stringify(sortObject(obj));
+}
+function sortObject(obj) {
+  if (obj === null || typeof obj !== "object") {
+    return obj;
+  }
+  if (Array.isArray(obj)) {
+    return obj.map(sortObject);
+  }
+  return Object.keys(obj).sort().reduce((result, key) => {
+    result[key] = sortObject(obj[key]);
+    return result;
+  }, {});
+}
 
 // src/runtime/client/plugins/injectedPlugins.ts
 var plugins = [];
@@ -67882,8 +67953,9 @@ var Config = class {
   localSchema;
   projectRoot;
   schema;
+  runtimeDir;
   schemaPath;
-  persistedQueriesPath = "./$houdini/persisted_queries.json";
+  persistedQueriesPath;
   exclude;
   scalars;
   module = "esm";
@@ -67924,6 +67996,7 @@ var Config = class {
     let {
       schema,
       schemaPath = "./schema.graphql",
+      runtimeDir = "$houdini",
       exclude = [],
       module: module2 = "esm",
       scalars,
@@ -67962,6 +68035,7 @@ var Config = class {
     this.projectRoot = dirname(
       projectDir ? join2(process.cwd(), projectDir) : filepath
     );
+    this.runtimeDir = runtimeDir;
     this.scalars = scalars;
     this.cacheBufferSize = cacheBufferSize;
     this.defaultCachePolicy = defaultCachePolicy;
@@ -67976,11 +68050,9 @@ var Config = class {
     this.schemaPollInterval = watchSchema?.interval === void 0 ? 2e3 : watchSchema.interval;
     this.schemaPollTimeout = watchSchema?.timeout ?? 3e4;
     this.schemaPollHeaders = watchSchema?.headers ?? {};
-    this.rootDir = join2(this.projectRoot, "$houdini");
+    this.rootDir = join2(this.projectRoot, this.runtimeDir);
+    this.persistedQueriesPath = persistedQueriesPath ?? join2(this.rootDir, "persisted_queries.json");
     this.#fragmentVariableMaps = {};
-    if (persistedQueriesPath) {
-      this.persistedQueriesPath = persistedQueriesPath;
-    }
     if (defaultKeys) {
       this.defaultKeys = defaultKeys;
     }
@@ -69292,7 +69364,7 @@ function exec(match, params) {
       if (param.rest)
         result[param.name] = "";
     } else {
-      result[param.name] = value;
+      result[param.name] = decodeURIComponent(value);
     }
   }
   if (buffered)
@@ -69820,6 +69892,7 @@ function extractAnonymousQuery(config, raw, expr, propName) {
   CompiledSubscriptionKind,
   Config,
   DataSource,
+  DedupeMatchMode,
   DocumentStore,
   HoudiniClient,
   HoudiniError,