houdini 1.2.45 → 1.2.47

package/build/lib-cjs/index.js

@@ -61644,6 +61644,38 @@ function marshalInputs({
 function isScalar(config, type) {
   return ["String", "Boolean", "Float", "ID", "Int"].concat(Object.keys(config.scalars || {})).includes(type);
 }
+function parseScalar(config, type, value) {
+  if (typeof value === "undefined") {
+    return void 0;
+  }
+  if (type === "Boolean") {
+    return value === "true";
+  }
+  if (type === "ID") {
+    return value;
+  }
+  if (type === "String") {
+    return value;
+  }
+  if (type === "Int") {
+    const result = parseInt(value, 10);
+    if (Number.isNaN(result)) {
+      return void 0;
+    }
+    return result;
+  }
+  if (type === "Float") {
+    const result = parseFloat(value);
+    if (Number.isNaN(result)) {
+      return void 0;
+    }
+    return result;
+  }
+  if (config.scalars?.[type]?.marshal) {
+    return config.scalars[type]?.marshal(value);
+  }
+  return value;
+}
 
 // src/runtime/lib/store.ts
 var subscriber_queue = [];
@@ -64622,9 +64654,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;
       }
@@ -64634,12 +64669,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);
@@ -64660,6 +64701,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
@@ -64708,6 +64758,9 @@ var Cache = class {
     };
   }
   subscribe(spec, variables = {}) {
+    if (this._internal_unstable.disabled) {
+      return;
+    }
     return this._internal_unstable.subscriptions.add({
       parent: spec.parentID || rootID,
       spec,
@@ -64847,7 +64900,7 @@ var Cache = class {
   }
 };
 var CacheInternal = class {
-  _disabled = false;
+  disabled = false;
   _config;
   storage;
   subscriptions;
@@ -64878,10 +64931,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 {
     }
@@ -64903,7 +64956,7 @@ var CacheInternal = class {
     forceNotify,
     forceStale
   }) {
-    if (this._disabled) {
+    if (this.disabled) {
       return [];
     }
     let targetSelection = getFieldsForType(
@@ -65766,7 +65819,7 @@ var cachePolicy = ({
   serverSideFallback = true
 }) => () => {
   return {
-    network(ctx, { initialValue, next, resolve: resolve2, marshalVariables: marshalVariables2 }) {
+    beforeNetwork(ctx, { initialValue, next, resolve: resolve2, marshalVariables: marshalVariables2 }) {
       const { policy, artifact } = ctx;
       let useCache = false;
       if (enabled && (artifact.kind === ArtifactKind.Query || artifact.kind === ArtifactKind.Fragment) && !ctx.cacheParams?.disableRead) {
@@ -66160,7 +66213,7 @@ var defaultErrorFn = async (errors) => new Error(errors.map((error) => error.mes
 
 // src/runtime/client/plugins/fetchParams.ts
 var fetchParams = (fn = () => ({})) => () => ({
-  beforeNetwork(ctx, { next, marshalVariables: marshalVariables2 }) {
+  start(ctx, { next, marshalVariables: marshalVariables2 }) {
     next({
       ...ctx,
       fetchParams: fn({
@@ -67802,7 +67855,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;
@@ -67945,7 +68003,7 @@ async function detectTools(cwd = process.cwd()) {
 
 // src/runtime/router/match.ts
 var 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)) {
@@ -67960,7 +68018,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 = [];
@@ -68893,7 +68961,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

package/build/lib-esm/index.js

@@ -61560,6 +61560,38 @@ function marshalInputs({
 function isScalar(config, type) {
   return ["String", "Boolean", "Float", "ID", "Int"].concat(Object.keys(config.scalars || {})).includes(type);
 }
+function parseScalar(config, type, value) {
+  if (typeof value === "undefined") {
+    return void 0;
+  }
+  if (type === "Boolean") {
+    return value === "true";
+  }
+  if (type === "ID") {
+    return value;
+  }
+  if (type === "String") {
+    return value;
+  }
+  if (type === "Int") {
+    const result = parseInt(value, 10);
+    if (Number.isNaN(result)) {
+      return void 0;
+    }
+    return result;
+  }
+  if (type === "Float") {
+    const result = parseFloat(value);
+    if (Number.isNaN(result)) {
+      return void 0;
+    }
+    return result;
+  }
+  if (config.scalars?.[type]?.marshal) {
+    return config.scalars[type]?.marshal(value);
+  }
+  return value;
+}
 
 // src/runtime/lib/store.ts
 var subscriber_queue = [];
@@ -64538,9 +64570,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;
       }
@@ -64550,12 +64585,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);
@@ -64576,6 +64617,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
@@ -64624,6 +64674,9 @@ var Cache = class {
     };
   }
   subscribe(spec, variables = {}) {
+    if (this._internal_unstable.disabled) {
+      return;
+    }
     return this._internal_unstable.subscriptions.add({
       parent: spec.parentID || rootID,
       spec,
@@ -64763,7 +64816,7 @@ var Cache = class {
   }
 };
 var CacheInternal = class {
-  _disabled = false;
+  disabled = false;
   _config;
   storage;
   subscriptions;
@@ -64794,10 +64847,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 {
     }
@@ -64819,7 +64872,7 @@ var CacheInternal = class {
     forceNotify,
     forceStale
   }) {
-    if (this._disabled) {
+    if (this.disabled) {
       return [];
     }
     let targetSelection = getFieldsForType(
@@ -65682,7 +65735,7 @@ var cachePolicy = ({
   serverSideFallback = true
 }) => () => {
   return {
-    network(ctx, { initialValue, next, resolve: resolve2, marshalVariables: marshalVariables2 }) {
+    beforeNetwork(ctx, { initialValue, next, resolve: resolve2, marshalVariables: marshalVariables2 }) {
       const { policy, artifact } = ctx;
       let useCache = false;
       if (enabled && (artifact.kind === ArtifactKind.Query || artifact.kind === ArtifactKind.Fragment) && !ctx.cacheParams?.disableRead) {
@@ -66076,7 +66129,7 @@ var defaultErrorFn = async (errors) => new Error(errors.map((error) => error.mes
 
 // src/runtime/client/plugins/fetchParams.ts
 var fetchParams = (fn = () => ({})) => () => ({
-  beforeNetwork(ctx, { next, marshalVariables: marshalVariables2 }) {
+  start(ctx, { next, marshalVariables: marshalVariables2 }) {
     next({
       ...ctx,
       fetchParams: fn({
@@ -67717,7 +67770,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;
@@ -67860,7 +67918,7 @@ async function detectTools(cwd = process.cwd()) {
 
 // src/runtime/router/match.ts
 var 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)) {
@@ -67875,7 +67933,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 = [];
@@ -68808,7 +68876,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

package/build/runtime/cache/cache.d.ts

@@ -55,7 +55,7 @@ export declare class Cache {
     reset(): void;
 }
 declare class CacheInternal {
-    private _disabled;
+    disabled: boolean;
     _config?: ConfigFile;
     storage: InMemoryStorage;
     subscriptions: InMemorySubscriptions;

package/build/runtime/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/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-cjs/cache/cache.d.ts

@@ -55,7 +55,7 @@ export declare class Cache {
     reset(): void;
 }
 declare class CacheInternal {
-    private _disabled;
+    disabled: boolean;
     _config?: ConfigFile;
     storage: InMemoryStorage;
     subscriptions: InMemorySubscriptions;

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

@@ -83,6 +83,9 @@ class Cache {
     };
   }
   subscribe(spec, variables = {}) {
+    if (this._internal_unstable.disabled) {
+      return;
+    }
     return this._internal_unstable.subscriptions.add({
       parent: spec.parentID || rootID,
       spec,
@@ -222,7 +225,7 @@ class Cache {
   }
 }
 class CacheInternal {
-  _disabled = false;
+  disabled = false;
   _config;
   storage;
   subscriptions;
@@ -253,10 +256,10 @@ class CacheInternal {
     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 {
     }
@@ -278,7 +281,7 @@ class CacheInternal {
     forceNotify,
     forceStale
   }) {
-    if (this._disabled) {
+    if (this.disabled) {
       return [];
     }
     let targetSelection = (0, import_selection.getFieldsForType)(

package/build/runtime-cjs/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-cjs/cache/subscription.js

@@ -253,9 +253,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;
       }
@@ -265,12 +268,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);
@@ -291,6 +300,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;
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -38,7 +38,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 === import_types.ArtifactKind.Query || artifact.kind === import_types.ArtifactKind.Fragment) && !ctx.cacheParams?.disableRead) {

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

@@ -22,7 +22,7 @@ __export(fetchParams_exports, {
 });
 module.exports = __toCommonJS(fetchParams_exports);
 const fetchParams = (fn = () => ({})) => () => ({
-  beforeNetwork(ctx, { next, marshalVariables }) {
+  start(ctx, { next, marshalVariables }) {
     next({
       ...ctx,
       fetchParams: fn({

package/build/runtime-cjs/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-cjs/router/match.js

@@ -24,8 +24,9 @@ __export(match_exports, {
   parse_page_pattern: () => parse_page_pattern
 });
 module.exports = __toCommonJS(match_exports);
+var import_lib = require("../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)) {
@@ -40,7 +41,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] = (0, import_lib.parseScalar)(config, type, matchVariables[variable]);
+      }
+    }
+  }
+  return [match, variables];
 }
 function parse_page_pattern(id) {
   const params = [];

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

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

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

@@ -55,7 +55,7 @@ export declare class Cache {
     reset(): void;
 }
 declare class CacheInternal {
-    private _disabled;
+    disabled: boolean;
     _config?: ConfigFile;
     storage: InMemoryStorage;
     subscriptions: InMemorySubscriptions;

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

@@ -55,6 +55,9 @@ class Cache {
     };
   }
   subscribe(spec, variables = {}) {
+    if (this._internal_unstable.disabled) {
+      return;
+    }
     return this._internal_unstable.subscriptions.add({
       parent: spec.parentID || rootID,
       spec,
@@ -194,7 +197,7 @@ class Cache {
   }
 }
 class CacheInternal {
-  _disabled = false;
+  disabled = false;
   _config;
   storage;
   subscriptions;
@@ -225,10 +228,10 @@ class CacheInternal {
     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 {
     }
@@ -250,7 +253,7 @@ class CacheInternal {
     forceNotify,
     forceStale
   }) {
-    if (this._disabled) {
+    if (this.disabled) {
       return [];
     }
     let targetSelection = getFieldsForType(