houdini 1.3.1 → 1.4.1

package/build/runtime-esm/cache/cache.js

@@ -73,8 +73,8 @@ class Cache {
       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?`
@@ -489,6 +489,7 @@ class CacheInternal {
           });
         }
       }
+      const processedOperations = /* @__PURE__ */ new Set();
       for (const operation of operations || []) {
         let parentID;
         if (operation.parentID) {
@@ -508,7 +509,12 @@ class CacheInternal {
         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,
@@ -516,7 +522,12 @@ class CacheInternal {
               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,
@@ -524,7 +535,12 @@ class CacheInternal {
               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) {
@@ -536,6 +552,16 @@ class CacheInternal {
             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;

package/build/runtime-esm/cache/lists.d.ts

@@ -7,7 +7,8 @@ export declare class ListManager {
     constructor(cache: Cache, rootID: string);
     lists: Map<string, Map<string, ListCollection>>;
     private listsByField;
-    get(listName: string, id?: string, allLists?: boolean): ListCollection | null | undefined;
+    get(listName: string, id?: string, allLists?: boolean, skipMatches?: Set<string>): ListCollection | null;
+    getLists(listName: string, id?: string, allLists?: boolean): ListCollection | null | undefined;
     remove(listName: string, id: string): void;
     add(list: {
         name: string;
@@ -41,6 +42,7 @@ export declare class List {
     constructor({ name, recordID, recordType, key, listType, selection, when, filters, connection, manager, abstract, }: Parameters<ListManager['add']>[0] & {
         manager: ListManager;
     });
+    get fieldRef(): string;
     when(when?: ListWhen): ListCollection;
     append({ selection, data, variables, layer, }: {
         selection: SubscriptionSelection;

package/build/runtime-esm/cache/lists.js

@@ -9,7 +9,18 @@ class ListManager {
   }
   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;
@@ -131,6 +142,9 @@ class List {
     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);
   }

package/build/runtime-esm/client/documentStore.js

@@ -2,7 +2,7 @@ import { getCurrentConfig } from "../lib/config";
 import { deepEquals } from "../lib/deepEquals";
 import { marshalInputs } from "../lib/scalars";
 import { Writable } from "../lib/store";
-import { ArtifactKind } from "../lib/types";
+import { ArtifactKind, DedupeMatchMode } from "../lib/types";
 import { cachePolicy } from "./plugins";
 const steps = {
   forward: ["start", "beforeNetwork", "network"],
@@ -19,7 +19,8 @@ class DocumentStore 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,
@@ -81,16 +82,20 @@ class DocumentStore 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({
@@ -412,6 +417,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;
+  }, {});
+}
 export {
   DocumentStore
 };

package/build/runtime-esm/client/plugins/fetch.js

@@ -66,6 +66,11 @@ const 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();
   };
 };

package/build/runtime-esm/lib/config.d.ts

@@ -73,6 +73,10 @@ export type ConfigFile = {
      * Specifies whether the default paginate mode is Infinite or SinglePage. (default: `Infinite`)
      */
     defaultPaginateMode?: PaginateModes;
+    /**
+     * Prevents the runtime from deduplicating pagination requests
+     */
+    supressPaginationDeduplication?: boolean;
     /**
      * A list of fields to use when computing a record’s id. The default value is ['id']. For more information: https://www.houdinigraphql.com/guides/caching-data#custom-ids
      */
@@ -95,7 +99,7 @@ export type ConfigFile = {
      */
     watchSchema?: WatchSchemaConfig;
     /**
-     * Specifies the the persisted queries path and file. (default: `./$houdini/persisted_queries.json`)
+     * Specifies the the persisted queries path and file. (default: `<rootDir>/persisted_queries.json`)
      */
     persistedQueriesPath?: string;
     /**
@@ -107,6 +111,11 @@ export type ConfigFile = {
      * @default process.cwd()
      */
     projectDir?: string;
+    /**
+     * The relative path from your project directory pointing to your output directory.
+     * @default `$houdini`
+     */
+    runtimeDir?: string;
     /**
      * For now, the cache's imperative API is considered unstable. In order to suppress the warning,
      * you must enable this flag.

package/build/runtime-esm/lib/types.d.ts

@@ -7,6 +7,12 @@ export declare const CachePolicy: {
     readonly NoCache: "NoCache";
 };
 export type CachePolicies = ValuesOf<typeof CachePolicy>;
+export declare const DedupeMatchMode: {
+    readonly Variables: "Variables";
+    readonly Operation: "Operation";
+    readonly None: "None";
+};
+export type DedupeMatchModes = ValuesOf<typeof DedupeMatchMode>;
 export declare const PaginateMode: {
     readonly Infinite: "Infinite";
     readonly SinglePage: "SinglePage";
@@ -60,11 +66,17 @@ export type QueryArtifact = BaseCompiledDocument<'HoudiniQuery'> & {
     policy?: CachePolicies;
     partial?: boolean;
     enableLoadingState?: 'global' | 'local';
-    dedupe?: 'first' | 'last';
+    dedupe?: {
+        cancel: 'first' | 'last';
+        match: DedupeMatchModes;
+    };
 };
 export type MutationArtifact = BaseCompiledDocument<'HoudiniMutation'> & {
     optimisticKeys?: boolean;
-    dedupe?: 'first' | 'last';
+    dedupe?: {
+        cancel: 'first' | 'last';
+        match: DedupeMatchModes;
+    };
 };
 export type FragmentArtifact = BaseCompiledDocument<'HoudiniFragment'> & {
     enableLoadingState?: 'global' | 'local';

package/build/runtime-esm/lib/types.js

@@ -5,6 +5,11 @@ const CachePolicy = {
   CacheAndNetwork: "CacheAndNetwork",
   NoCache: "NoCache"
 };
+const DedupeMatchMode = {
+  Variables: "Variables",
+  Operation: "Operation",
+  None: "None"
+};
 const PaginateMode = {
   Infinite: "Infinite",
   SinglePage: "SinglePage"
@@ -43,6 +48,7 @@ export {
   CompiledQueryKind,
   CompiledSubscriptionKind,
   DataSource,
+  DedupeMatchMode,
   PaginateMode,
   PendingValue,
   RefetchUpdateMode,

package/build/runtime-esm/router/match.js

@@ -115,7 +115,7 @@ function exec(match, params) {
       if (param.rest)
         result[param.name] = "";
     } else {
-      result[param.name] = value;
+      result[param.name] = decodeURIComponent(value);
     }
   }
   if (buffered)

package/build/test-cjs/index.js

@@ -53983,6 +53983,11 @@ var CachePolicy = {
   CacheAndNetwork: "CacheAndNetwork",
   NoCache: "NoCache"
 };
+var DedupeMatchMode = {
+  Variables: "Variables",
+  Operation: "Operation",
+  None: "None"
+};
 var PaginateMode = {
   Infinite: "Infinite",
   SinglePage: "SinglePage"
@@ -54562,7 +54567,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;
@@ -54684,6 +54700,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);
   }
@@ -55836,8 +55855,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?`
@@ -56252,6 +56271,7 @@ var CacheInternal = class {
           });
         }
       }
+      const processedOperations = /* @__PURE__ */ new Set();
       for (const operation of operations || []) {
         let parentID;
         if (operation.parentID) {
@@ -56271,7 +56291,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,
@@ -56279,7 +56304,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,
@@ -56287,7 +56317,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) {
@@ -56299,6 +56334,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;
@@ -56767,8 +56812,9 @@ var Config = class {
   localSchema;
   projectRoot;
   schema;
+  runtimeDir;
   schemaPath;
-  persistedQueriesPath = "./$houdini/persisted_queries.json";
+  persistedQueriesPath;
   exclude;
   scalars;
   module = "esm";
@@ -56809,6 +56855,7 @@ var Config = class {
     let {
       schema,
       schemaPath = "./schema.graphql",
+      runtimeDir = "$houdini",
       exclude = [],
       module: module2 = "esm",
       scalars,
@@ -56847,6 +56894,7 @@ var Config = class {
     this.projectRoot = dirname(
       projectDir ? join(process.cwd(), projectDir) : filepath
     );
+    this.runtimeDir = runtimeDir;
     this.scalars = scalars;
     this.cacheBufferSize = cacheBufferSize;
     this.defaultCachePolicy = defaultCachePolicy;
@@ -56861,11 +56909,9 @@ var Config = class {
     this.schemaPollInterval = watchSchema?.interval === void 0 ? 2e3 : watchSchema.interval;
     this.schemaPollTimeout = watchSchema?.timeout ?? 3e4;
     this.schemaPollHeaders = watchSchema?.headers ?? {};
-    this.rootDir = join(this.projectRoot, "$houdini");
+    this.rootDir = join(this.projectRoot, this.runtimeDir);
+    this.persistedQueriesPath = persistedQueriesPath ?? join(this.rootDir, "persisted_queries.json");
     this.#fragmentVariableMaps = {};
-    if (persistedQueriesPath) {
-      this.persistedQueriesPath = persistedQueriesPath;
-    }
     if (defaultKeys) {
       this.defaultKeys = defaultKeys;
     }
@@ -59225,14 +59271,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
+                    }
+                  }
+                ]
               }
             ]
           };
@@ -59600,6 +59659,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: {
@@ -60589,7 +60688,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") {
@@ -64256,11 +64361,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