houdini 1.2.45 → 1.2.47

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

@@ -45,4 +45,5 @@ export declare class InMemorySubscriptions {
     reset(): SubscriptionSpec[];
     private removeSubscribers;
     removeAllSubscribers(id: string, targets?: SubscriptionSpec[], visited?: string[]): void;
+    get size(): number;
 }

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

@@ -230,9 +230,12 @@ class InMemorySubscriptions {
   removeSubscribers(id, fieldName, specs) {
     let targets = [];
     const subscriber = this.subscribers.get(id);
-    const subscriberField = subscriber?.get(fieldName);
+    if (!subscriber) {
+      return;
+    }
+    const subscriberField = subscriber.get(fieldName);
     for (const spec of specs) {
-      const counts = subscriber?.get(fieldName)?.referenceCounts;
+      const counts = subscriber.get(fieldName)?.referenceCounts;
       if (!counts?.has(spec.set)) {
         continue;
       }
@@ -242,12 +245,18 @@ class InMemorySubscriptions {
         targets.push(spec.set);
         counts.delete(spec.set);
       }
+      if (counts.size === 0) {
+        subscriber.delete(fieldName);
+      }
     }
     if (subscriberField) {
       subscriberField.selections = this.get(id, fieldName).filter(
         ([{ set }]) => !targets.includes(set)
       );
     }
+    if (subscriber.size === 0) {
+      this.subscribers.delete(id);
+    }
   }
   removeAllSubscribers(id, targets, visited = []) {
     visited.push(id);
@@ -268,6 +277,15 @@ class InMemorySubscriptions {
       }
     }
   }
+  get size() {
+    let size = 0;
+    for (const [, nodeCounts] of this.subscribers) {
+      for (const [, { referenceCounts }] of nodeCounts) {
+        size += [...referenceCounts.values()].reduce((size2, count) => size2 + count, 0);
+      }
+    }
+    return size;
+  }
 }
 export {
   InMemorySubscriptions

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

@@ -9,7 +9,7 @@ const cachePolicy = ({
   serverSideFallback = true
 }) => () => {
   return {
-    network(ctx, { initialValue, next, resolve, marshalVariables }) {
+    beforeNetwork(ctx, { initialValue, next, resolve, marshalVariables }) {
       const { policy, artifact } = ctx;
       let useCache = false;
       if (enabled && (artifact.kind === ArtifactKind.Query || artifact.kind === ArtifactKind.Fragment) && !ctx.cacheParams?.disableRead) {

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

@@ -1,5 +1,5 @@
 const fetchParams = (fn = () => ({})) => () => ({
-  beforeNetwork(ctx, { next, marshalVariables }) {
+  start(ctx, { next, marshalVariables }) {
     next({
       ...ctx,
       fetchParams: fn({

package/build/runtime-esm/router/match.d.ts

@@ -1,4 +1,5 @@
 import type { GraphQLVariables } from '$houdini/runtime/lib/types';
+import { type ConfigFile } from '../lib';
 import type { RouterManifest, RouterPageManifest } from './types';
 export type RouteParam = {
     name: string;
@@ -10,8 +11,8 @@ export type RouteParam = {
 export interface ParamMatcher {
     (param: string): boolean;
 }
-export declare function find_match<_ComponentType>(manifest: RouterManifest<_ComponentType>, current: string, allowNull: true): [RouterPageManifest<_ComponentType> | null, GraphQLVariables];
-export declare function find_match<_ComponentType>(manifest: RouterManifest<_ComponentType>, current: string, allowNull?: false): [RouterPageManifest<_ComponentType>, GraphQLVariables];
+export declare function find_match<_ComponentType>(config: ConfigFile, manifest: RouterManifest<_ComponentType>, current: string, allowNull: true): [RouterPageManifest<_ComponentType> | null, GraphQLVariables];
+export declare function find_match<_ComponentType>(config: ConfigFile, manifest: RouterManifest<_ComponentType>, current: string, allowNull?: false): [RouterPageManifest<_ComponentType>, GraphQLVariables];
 /**
  * Creates the regex pattern, extracts parameter names, and generates types for a route
  */

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

@@ -1,5 +1,6 @@
+import { parseScalar } from "../lib";
 const param_pattern = /^(\[)?(\.\.\.)?(\w+)(?:=(\w+))?(\])?$/;
-function find_match(manifest, current, allowNull = true) {
+function find_match(config, manifest, current, allowNull = true) {
   let match = null;
   let matchVariables = null;
   for (const page of Object.values(manifest.pages)) {
@@ -14,7 +15,17 @@ function find_match(manifest, current, allowNull = true) {
   if (!match && !allowNull) {
     throw new Error("404");
   }
-  return [match, matchVariables];
+  let variables = {
+    ...matchVariables
+  };
+  for (const document of Object.values(match?.documents ?? {})) {
+    for (const [variable, { type }] of Object.entries(document.variables)) {
+      if (matchVariables?.[variable]) {
+        variables[variable] = parseScalar(config, type, matchVariables[variable]);
+      }
+    }
+  }
+  return [match, variables];
 }
 function parse_page_pattern(id) {
   const params = [];

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

@@ -49,7 +49,7 @@ function _serverHandler({
     if (authResponse) {
       return authResponse;
     }
-    const [match] = find_match(manifest, url);
+    const [match] = find_match(config_file, manifest, url);
     const rendered = await on_render({
       url,
       match,

package/build/test-cjs/index.js

@@ -55646,9 +55646,12 @@ var InMemorySubscriptions = class {
   removeSubscribers(id, fieldName, specs) {
     let targets = [];
     const subscriber = this.subscribers.get(id);
-    const subscriberField = subscriber?.get(fieldName);
+    if (!subscriber) {
+      return;
+    }
+    const subscriberField = subscriber.get(fieldName);
     for (const spec of specs) {
-      const counts = subscriber?.get(fieldName)?.referenceCounts;
+      const counts = subscriber.get(fieldName)?.referenceCounts;
       if (!counts?.has(spec.set)) {
         continue;
       }
@@ -55658,12 +55661,18 @@ var InMemorySubscriptions = class {
         targets.push(spec.set);
         counts.delete(spec.set);
       }
+      if (counts.size === 0) {
+        subscriber.delete(fieldName);
+      }
     }
     if (subscriberField) {
       subscriberField.selections = this.get(id, fieldName).filter(
         ([{ set }]) => !targets.includes(set)
       );
     }
+    if (subscriber.size === 0) {
+      this.subscribers.delete(id);
+    }
   }
   removeAllSubscribers(id, targets, visited = []) {
     visited.push(id);
@@ -55684,6 +55693,15 @@ var InMemorySubscriptions = class {
       }
     }
   }
+  get size() {
+    let size = 0;
+    for (const [, nodeCounts] of this.subscribers) {
+      for (const [, { referenceCounts }] of nodeCounts) {
+        size += [...referenceCounts.values()].reduce((size2, count) => size2 + count, 0);
+      }
+    }
+    return size;
+  }
 };
 
 // src/runtime/cache/cache.ts
@@ -55732,6 +55750,9 @@ var Cache = class {
     };
   }
   subscribe(spec, variables = {}) {
+    if (this._internal_unstable.disabled) {
+      return;
+    }
     return this._internal_unstable.subscriptions.add({
       parent: spec.parentID || rootID,
       spec,
@@ -55871,7 +55892,7 @@ var Cache = class {
   }
 };
 var CacheInternal = class {
-  _disabled = false;
+  disabled = false;
   _config;
   storage;
   subscriptions;
@@ -55902,10 +55923,10 @@ var CacheInternal = class {
     this._config = config;
     this.componentCache = componentCache ?? {};
     this.createComponent = createComponent ?? (() => ({}));
-    this._disabled = disabled;
+    this.disabled = disabled;
     try {
       if (process.env.HOUDINI_TEST === "true") {
-        this._disabled = false;
+        this.disabled = false;
       }
     } catch {
     }
@@ -55927,7 +55948,7 @@ var CacheInternal = class {
     forceNotify,
     forceStale
   }) {
-    if (this._disabled) {
+    if (this.disabled) {
       return [];
     }
     let targetSelection = getFieldsForType(
@@ -57486,7 +57507,12 @@ function deepMerge2(filepath, ...targets) {
 // src/lib/parse.ts
 function parseJS(str, config) {
   const defaultConfig = {
-    plugins: ["typescript", "importAssertions", "decorators-legacy"],
+    plugins: [
+      "typescript",
+      "importAssertions",
+      "decorators-legacy",
+      "explicitResourceManagement"
+    ],
     sourceType: "module"
   };
   return (0, import_parser.parse)(str || "", config ? deepMerge2("", defaultConfig, config) : defaultConfig).program;
@@ -58788,7 +58814,11 @@ function operationsByPath(config, filepath, definition, filterTypes) {
   const pathOperations = {};
   graphql11.visit(definition, {
     FragmentSpread(node, _, __, ___, ancestors) {
-      if (!config.isListFragment(node.name.value)) {
+      let nameWithoutHash = node.name.value;
+      if (node.directives && node.directives.find((directive) => directive.name.value === "with")) {
+        nameWithoutHash = nameWithoutHash.substring(0, nameWithoutHash.lastIndexOf("_"));
+      }
+      if (!config.isListFragment(nameWithoutHash)) {
         return;
       }
       const path2 = ancestorKey(ancestors);
@@ -58799,8 +58829,8 @@ function operationsByPath(config, filepath, definition, filterTypes) {
         operationObject({
           config,
           filepath,
-          listName: config.listNameFromFragment(node.name.value),
-          operationKind: config.listOperationFromFragment(node.name.value),
+          listName: config.listNameFromFragment(nameWithoutHash),
+          operationKind: config.listOperationFromFragment(nameWithoutHash),
           type: parentTypeFromAncestors(config.schema, filepath, ancestors).name,
           selection: node
         })

package/build/test-esm/index.js

@@ -55643,9 +55643,12 @@ var InMemorySubscriptions = class {
   removeSubscribers(id, fieldName, specs) {
     let targets = [];
     const subscriber = this.subscribers.get(id);
-    const subscriberField = subscriber?.get(fieldName);
+    if (!subscriber) {
+      return;
+    }
+    const subscriberField = subscriber.get(fieldName);
     for (const spec of specs) {
-      const counts = subscriber?.get(fieldName)?.referenceCounts;
+      const counts = subscriber.get(fieldName)?.referenceCounts;
       if (!counts?.has(spec.set)) {
         continue;
       }
@@ -55655,12 +55658,18 @@ var InMemorySubscriptions = class {
         targets.push(spec.set);
         counts.delete(spec.set);
       }
+      if (counts.size === 0) {
+        subscriber.delete(fieldName);
+      }
     }
     if (subscriberField) {
       subscriberField.selections = this.get(id, fieldName).filter(
         ([{ set }]) => !targets.includes(set)
       );
     }
+    if (subscriber.size === 0) {
+      this.subscribers.delete(id);
+    }
   }
   removeAllSubscribers(id, targets, visited = []) {
     visited.push(id);
@@ -55681,6 +55690,15 @@ var InMemorySubscriptions = class {
       }
     }
   }
+  get size() {
+    let size = 0;
+    for (const [, nodeCounts] of this.subscribers) {
+      for (const [, { referenceCounts }] of nodeCounts) {
+        size += [...referenceCounts.values()].reduce((size2, count) => size2 + count, 0);
+      }
+    }
+    return size;
+  }
 };
 
 // src/runtime/cache/cache.ts
@@ -55729,6 +55747,9 @@ var Cache = class {
     };
   }
   subscribe(spec, variables = {}) {
+    if (this._internal_unstable.disabled) {
+      return;
+    }
     return this._internal_unstable.subscriptions.add({
       parent: spec.parentID || rootID,
       spec,
@@ -55868,7 +55889,7 @@ var Cache = class {
   }
 };
 var CacheInternal = class {
-  _disabled = false;
+  disabled = false;
   _config;
   storage;
   subscriptions;
@@ -55899,10 +55920,10 @@ var CacheInternal = class {
     this._config = config;
     this.componentCache = componentCache ?? {};
     this.createComponent = createComponent ?? (() => ({}));
-    this._disabled = disabled;
+    this.disabled = disabled;
     try {
       if (process.env.HOUDINI_TEST === "true") {
-        this._disabled = false;
+        this.disabled = false;
       }
     } catch {
     }
@@ -55924,7 +55945,7 @@ var CacheInternal = class {
     forceNotify,
     forceStale
   }) {
-    if (this._disabled) {
+    if (this.disabled) {
       return [];
     }
     let targetSelection = getFieldsForType(
@@ -57482,7 +57503,12 @@ function deepMerge2(filepath, ...targets) {
 // src/lib/parse.ts
 function parseJS(str, config) {
   const defaultConfig = {
-    plugins: ["typescript", "importAssertions", "decorators-legacy"],
+    plugins: [
+      "typescript",
+      "importAssertions",
+      "decorators-legacy",
+      "explicitResourceManagement"
+    ],
     sourceType: "module"
   };
   return (0, import_parser.parse)(str || "", config ? deepMerge2("", defaultConfig, config) : defaultConfig).program;
@@ -58784,7 +58810,11 @@ function operationsByPath(config, filepath, definition, filterTypes) {
   const pathOperations = {};
   graphql11.visit(definition, {
     FragmentSpread(node, _, __, ___, ancestors) {
-      if (!config.isListFragment(node.name.value)) {
+      let nameWithoutHash = node.name.value;
+      if (node.directives && node.directives.find((directive) => directive.name.value === "with")) {
+        nameWithoutHash = nameWithoutHash.substring(0, nameWithoutHash.lastIndexOf("_"));
+      }
+      if (!config.isListFragment(nameWithoutHash)) {
         return;
       }
       const path2 = ancestorKey(ancestors);
@@ -58795,8 +58825,8 @@ function operationsByPath(config, filepath, definition, filterTypes) {
         operationObject({
           config,
           filepath,
-          listName: config.listNameFromFragment(node.name.value),
-          operationKind: config.listOperationFromFragment(node.name.value),
+          listName: config.listNameFromFragment(nameWithoutHash),
+          operationKind: config.listOperationFromFragment(nameWithoutHash),
           type: parentTypeFromAncestors(config.schema, filepath, ancestors).name,
           selection: node
         })

package/build/vite-cjs/index.js

@@ -67402,9 +67402,12 @@ var InMemorySubscriptions = class {
   removeSubscribers(id, fieldName, specs) {
     let targets = [];
     const subscriber = this.subscribers.get(id);
-    const subscriberField = subscriber?.get(fieldName);
+    if (!subscriber) {
+      return;
+    }
+    const subscriberField = subscriber.get(fieldName);
     for (const spec of specs) {
-      const counts = subscriber?.get(fieldName)?.referenceCounts;
+      const counts = subscriber.get(fieldName)?.referenceCounts;
       if (!counts?.has(spec.set)) {
         continue;
       }
@@ -67414,12 +67417,18 @@ var InMemorySubscriptions = class {
         targets.push(spec.set);
         counts.delete(spec.set);
       }
+      if (counts.size === 0) {
+        subscriber.delete(fieldName);
+      }
     }
     if (subscriberField) {
       subscriberField.selections = this.get(id, fieldName).filter(
         ([{ set }]) => !targets.includes(set)
       );
     }
+    if (subscriber.size === 0) {
+      this.subscribers.delete(id);
+    }
   }
   removeAllSubscribers(id, targets, visited = []) {
     visited.push(id);
@@ -67440,6 +67449,15 @@ var InMemorySubscriptions = class {
       }
     }
   }
+  get size() {
+    let size = 0;
+    for (const [, nodeCounts] of this.subscribers) {
+      for (const [, { referenceCounts }] of nodeCounts) {
+        size += [...referenceCounts.values()].reduce((size2, count) => size2 + count, 0);
+      }
+    }
+    return size;
+  }
 };
 
 // src/runtime/cache/cache.ts
@@ -67488,6 +67506,9 @@ var Cache = class {
     };
   }
   subscribe(spec, variables = {}) {
+    if (this._internal_unstable.disabled) {
+      return;
+    }
     return this._internal_unstable.subscriptions.add({
       parent: spec.parentID || rootID,
       spec,
@@ -67627,7 +67648,7 @@ var Cache = class {
   }
 };
 var CacheInternal = class {
-  _disabled = false;
+  disabled = false;
   _config;
   storage;
   subscriptions;
@@ -67658,10 +67679,10 @@ var CacheInternal = class {
     this._config = config2;
     this.componentCache = componentCache ?? {};
     this.createComponent = createComponent ?? (() => ({}));
-    this._disabled = disabled;
+    this.disabled = disabled;
     try {
       if (process.env.HOUDINI_TEST === "true") {
-        this._disabled = false;
+        this.disabled = false;
       }
     } catch {
     }
@@ -67683,7 +67704,7 @@ var CacheInternal = class {
     forceNotify,
     forceStale
   }) {
-    if (this._disabled) {
+    if (this.disabled) {
       return [];
     }
     let targetSelection = getFieldsForType(
@@ -69480,7 +69501,12 @@ function deepMerge2(filepath, ...targets) {
 // src/lib/parse.ts
 function parseJS(str, config2) {
   const defaultConfig = {
-    plugins: ["typescript", "importAssertions", "decorators-legacy"],
+    plugins: [
+      "typescript",
+      "importAssertions",
+      "decorators-legacy",
+      "explicitResourceManagement"
+    ],
     sourceType: "module"
   };
   return (0, import_parser.parse)(str || "", config2 ? deepMerge2("", defaultConfig, config2) : defaultConfig).program;
@@ -70463,7 +70489,18 @@ async function extractQueries(source) {
   } else {
     return [];
   }
-  return props.filter((p) => p !== "children");
+  return props.reduce((queries, query2) => {
+    if (query2 === "children") {
+      return queries;
+    }
+    if (query2.endsWith("$handle")) {
+      query2 = query2.substring(0, query2.length - "$handle".length);
+    }
+    if (queries.includes(query2)) {
+      return queries;
+    }
+    return queries.concat([query2]);
+  }, []);
 }
 
 // src/lib/router/server.ts
@@ -71581,7 +71618,11 @@ function operationsByPath(config2, filepath, definition, filterTypes) {
   const pathOperations = {};
   graphql11.visit(definition, {
     FragmentSpread(node, _, __, ___, ancestors) {
-      if (!config2.isListFragment(node.name.value)) {
+      let nameWithoutHash = node.name.value;
+      if (node.directives && node.directives.find((directive) => directive.name.value === "with")) {
+        nameWithoutHash = nameWithoutHash.substring(0, nameWithoutHash.lastIndexOf("_"));
+      }
+      if (!config2.isListFragment(nameWithoutHash)) {
         return;
       }
       const path3 = ancestorKey(ancestors);
@@ -71592,8 +71633,8 @@ function operationsByPath(config2, filepath, definition, filterTypes) {
         operationObject({
           config: config2,
           filepath,
-          listName: config2.listNameFromFragment(node.name.value),
-          operationKind: config2.listOperationFromFragment(node.name.value),
+          listName: config2.listNameFromFragment(nameWithoutHash),
+          operationKind: config2.listOperationFromFragment(nameWithoutHash),
           type: parentTypeFromAncestors(config2.schema, filepath, ancestors).name,
           selection: node
         })

package/build/vite-esm/index.js

@@ -67396,9 +67396,12 @@ var InMemorySubscriptions = class {
   removeSubscribers(id, fieldName, specs) {
     let targets = [];
     const subscriber = this.subscribers.get(id);
-    const subscriberField = subscriber?.get(fieldName);
+    if (!subscriber) {
+      return;
+    }
+    const subscriberField = subscriber.get(fieldName);
     for (const spec of specs) {
-      const counts = subscriber?.get(fieldName)?.referenceCounts;
+      const counts = subscriber.get(fieldName)?.referenceCounts;
       if (!counts?.has(spec.set)) {
         continue;
       }
@@ -67408,12 +67411,18 @@ var InMemorySubscriptions = class {
         targets.push(spec.set);
         counts.delete(spec.set);
       }
+      if (counts.size === 0) {
+        subscriber.delete(fieldName);
+      }
     }
     if (subscriberField) {
       subscriberField.selections = this.get(id, fieldName).filter(
         ([{ set }]) => !targets.includes(set)
       );
     }
+    if (subscriber.size === 0) {
+      this.subscribers.delete(id);
+    }
   }
   removeAllSubscribers(id, targets, visited = []) {
     visited.push(id);
@@ -67434,6 +67443,15 @@ var InMemorySubscriptions = class {
       }
     }
   }
+  get size() {
+    let size = 0;
+    for (const [, nodeCounts] of this.subscribers) {
+      for (const [, { referenceCounts }] of nodeCounts) {
+        size += [...referenceCounts.values()].reduce((size2, count) => size2 + count, 0);
+      }
+    }
+    return size;
+  }
 };
 
 // src/runtime/cache/cache.ts
@@ -67482,6 +67500,9 @@ var Cache = class {
     };
   }
   subscribe(spec, variables = {}) {
+    if (this._internal_unstable.disabled) {
+      return;
+    }
     return this._internal_unstable.subscriptions.add({
       parent: spec.parentID || rootID,
       spec,
@@ -67621,7 +67642,7 @@ var Cache = class {
   }
 };
 var CacheInternal = class {
-  _disabled = false;
+  disabled = false;
   _config;
   storage;
   subscriptions;
@@ -67652,10 +67673,10 @@ var CacheInternal = class {
     this._config = config2;
     this.componentCache = componentCache ?? {};
     this.createComponent = createComponent ?? (() => ({}));
-    this._disabled = disabled;
+    this.disabled = disabled;
     try {
       if (process.env.HOUDINI_TEST === "true") {
-        this._disabled = false;
+        this.disabled = false;
       }
     } catch {
     }
@@ -67677,7 +67698,7 @@ var CacheInternal = class {
     forceNotify,
     forceStale
   }) {
-    if (this._disabled) {
+    if (this.disabled) {
       return [];
     }
     let targetSelection = getFieldsForType(
@@ -69473,7 +69494,12 @@ function deepMerge2(filepath, ...targets) {
 // src/lib/parse.ts
 function parseJS(str, config2) {
   const defaultConfig = {
-    plugins: ["typescript", "importAssertions", "decorators-legacy"],
+    plugins: [
+      "typescript",
+      "importAssertions",
+      "decorators-legacy",
+      "explicitResourceManagement"
+    ],
     sourceType: "module"
   };
   return (0, import_parser.parse)(str || "", config2 ? deepMerge2("", defaultConfig, config2) : defaultConfig).program;
@@ -70456,7 +70482,18 @@ async function extractQueries(source) {
   } else {
     return [];
   }
-  return props.filter((p) => p !== "children");
+  return props.reduce((queries, query2) => {
+    if (query2 === "children") {
+      return queries;
+    }
+    if (query2.endsWith("$handle")) {
+      query2 = query2.substring(0, query2.length - "$handle".length);
+    }
+    if (queries.includes(query2)) {
+      return queries;
+    }
+    return queries.concat([query2]);
+  }, []);
 }
 
 // src/lib/router/server.ts
@@ -71574,7 +71611,11 @@ function operationsByPath(config2, filepath, definition, filterTypes) {
   const pathOperations = {};
   graphql11.visit(definition, {
     FragmentSpread(node, _, __, ___, ancestors) {
-      if (!config2.isListFragment(node.name.value)) {
+      let nameWithoutHash = node.name.value;
+      if (node.directives && node.directives.find((directive) => directive.name.value === "with")) {
+        nameWithoutHash = nameWithoutHash.substring(0, nameWithoutHash.lastIndexOf("_"));
+      }
+      if (!config2.isListFragment(nameWithoutHash)) {
         return;
       }
       const path3 = ancestorKey(ancestors);
@@ -71585,8 +71626,8 @@ function operationsByPath(config2, filepath, definition, filterTypes) {
         operationObject({
           config: config2,
           filepath,
-          listName: config2.listNameFromFragment(node.name.value),
-          operationKind: config2.listOperationFromFragment(node.name.value),
+          listName: config2.listNameFromFragment(nameWithoutHash),
+          operationKind: config2.listOperationFromFragment(nameWithoutHash),
           type: parentTypeFromAncestors(config2.schema, filepath, ancestors).name,
           selection: node
         })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "houdini",
-  "version": "1.2.45",
+  "version": "1.2.47",
   "description": "The disappearing GraphQL clients",
   "keywords": [
     "typescript",