houdini 1.0.0-next.6 → 1.0.0-next.8

package/build/runtime-cjs/lib/flatten.js

@@ -0,0 +1,41 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var flatten_exports = {};
+__export(flatten_exports, {
+  flatten: () => flatten
+});
+module.exports = __toCommonJS(flatten_exports);
+function flatten(source) {
+  if (!source) {
+    return [];
+  }
+  return source.reduce((acc, element) => {
+    if (!element) {
+      return acc;
+    }
+    if (Array.isArray(element)) {
+      return acc.concat(flatten(element));
+    }
+    return acc.concat(element);
+  }, []);
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  flatten
+});

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

@@ -182,4 +182,5 @@ export type RequestPayload<GraphQLObject = any> = {
         message: string;
     }[] | null;
 };
+export type NestedList<_Result = string> = (_Result | null | NestedList<_Result>)[];
 export {};

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

@@ -87,8 +87,8 @@ Please acknowledge this by setting acceptImperativeInstability to true in your c
     });
     return;
   }
-  markStale(type, options = {}) {
-    return this._internal_unstable.markTypeStale(type, options);
+  markStale(type, options) {
+    return this._internal_unstable.markTypeStale(type ? { ...options, type } : void 0);
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/build/runtime-cjs/public/record.d.ts

@@ -34,8 +34,7 @@ export declare class Record<Def extends CacheTypeDef, Type extends ValidTypes<De
      * @param field
      * @param when
      */
-    markStale<Field extends TypeFieldNames<Def, Type>>({ field, when, }?: {
-        field?: Field;
+    markStale<Field extends TypeFieldNames<Def, Type>>(field?: Field, { when, }?: {
         when?: ArgType<Def, Type, Field>;
     }): void;
 }

package/build/runtime-cjs/public/record.js

@@ -77,8 +77,7 @@ class Record {
   delete() {
     this.#cache._internal_unstable.delete(this.#id);
   }
-  markStale({
-    field,
+  markStale(field, {
     when
   } = {}) {
     this.#cache._internal_unstable.markRecordStale(this.#id, { field, when });

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

@@ -1,5 +1,5 @@
 import type { ConfigFile } from '../lib/config';
-import type { GraphQLObject, GraphQLValue, SubscriptionSelection, SubscriptionSpec } from '../lib/types';
+import type { GraphQLObject, GraphQLValue, NestedList, SubscriptionSelection, SubscriptionSpec } from '../lib/types';
 import { GarbageCollector } from './gc';
 import type { ListCollection } from './lists';
 import { ListManager } from './lists';
@@ -34,7 +34,8 @@ export declare class Cache {
     list(name: string, parentID?: string, allLists?: boolean): ListCollection;
     delete(id: string): void;
     setConfig(config: ConfigFile): void;
-    markTypeStale(type?: string, options?: {
+    markTypeStale(options?: {
+        type: string;
         field?: string;
         when?: {};
     }): void;
@@ -98,10 +99,10 @@ declare class CacheInternal {
     hydrateNestedList({ fields, variables, linkedList, stepsFromConnection, }: {
         fields: SubscriptionSelection;
         variables?: {};
-        linkedList: LinkedList;
+        linkedList: NestedList;
         stepsFromConnection: number | null;
     }): {
-        data: LinkedList<GraphQLValue>;
+        data: NestedList<GraphQLValue>;
         partial: boolean;
         stale: boolean;
         hasData: boolean;
@@ -119,11 +120,10 @@ declare class CacheInternal {
         layer: Layer;
         forceNotify?: boolean;
     }): {
-        nestedIDs: LinkedList;
+        nestedIDs: NestedList;
         newIDs: (string | null)[];
     };
     collectGarbage(): void;
 }
 export declare const rootID = "_ROOT_";
-export type LinkedList<_Result = string> = (_Result | null | LinkedList<_Result>)[];
 export {};

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

@@ -1,13 +1,14 @@
 import { computeKey } from "../lib";
 import { computeID, defaultConfigValues, keyFieldsForType } from "../lib/config";
 import { deepEquals } from "../lib/deepEquals";
+import { flatten } from "../lib/flatten";
 import { getFieldsForType } from "../lib/selection";
 import { GarbageCollector } from "./gc";
 import { ListManager } from "./lists";
 import { SchemaManager } from "./schema";
 import { StaleManager } from "./staleManager";
 import { InMemoryStorage } from "./storage";
-import { evaluateKey, flattenList } from "./stuff";
+import { evaluateKey } from "./stuff";
 import { InMemorySubscriptions } from "./subscription";
 class Cache {
   _internal_unstable;
@@ -91,14 +92,14 @@ class Cache {
   setConfig(config) {
     this._internal_unstable.setConfig(config);
   }
-  markTypeStale(type, options = {}) {
-    if (!type) {
+  markTypeStale(options) {
+    if (!options) {
       this._internal_unstable.staleManager.markAllStale();
     } else if (!options.field) {
-      this._internal_unstable.staleManager.markTypeStale(type);
+      this._internal_unstable.staleManager.markTypeStale(options.type);
     } else {
       this._internal_unstable.staleManager.markTypeFieldStale(
-        type,
+        options.type,
         options.field,
         options.when
       );
@@ -237,7 +238,7 @@ class CacheInternal {
         if (previousValue === null) {
           continue;
         }
-        const previousLinks = flattenList([previousValue]);
+        const previousLinks = flatten([previousValue]);
         for (const link of previousLinks) {
           this.subscriptions.remove(link, fieldSelection, specs, variables);
         }

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

@@ -1,5 +1,5 @@
+import { flatten } from "../lib/flatten";
 import { rootID } from "./cache";
-import { flattenList } from "./stuff";
 class ListManager {
   rootID;
   cache;
@@ -233,7 +233,7 @@ class List {
         embeddedConnectionID,
         "edges"
       );
-      for (const edge of flattenList(edges) || []) {
+      for (const edge of flatten(edges) || []) {
         if (!edge) {
           continue;
         }
@@ -311,7 +311,7 @@ class List {
     let entries = [];
     let value = this.cache._internal_unstable.storage.get(this.recordID, this.key).value;
     if (!this.connection) {
-      entries = flattenList(value);
+      entries = flatten(value);
     } else {
       entries = this.cache._internal_unstable.storage.get(value, "edges").value;
     }

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

@@ -21,7 +21,7 @@ export declare class InMemoryStorage {
         kind: 'link' | 'scalar' | 'unknown';
         displayLayers: number[];
     };
-    writeLink(id: string, field: string, value: string | LinkedList): number;
+    writeLink(id: string, field: string, value: string | NestedList): number;
     writeField(id: string, field: string, value: GraphQLValue): number;
     resolveLayer(id: number): void;
     get topLayer(): Layer;
@@ -37,7 +37,7 @@ export declare class Layer {
     get(id: string, field: string): [GraphQLField, 'link' | 'scalar'];
     getOperations(id: string, field: string): Operation[] | undefined;
     writeField(id: string, field: string, value: GraphQLField): LayerID;
-    writeLink(id: string, field: string, value: null | string | LinkedList): LayerID;
+    writeLink(id: string, field: string, value: null | string | NestedList): LayerID;
     isDisplayLayer(displayLayers: number[]): boolean;
     clear(): void;
     replaceID({ from, to }: {
@@ -52,14 +52,14 @@ export declare class Layer {
     writeLayer(layer: Layer): void;
     private addFieldOperation;
 }
-type GraphQLField = GraphQLValue | LinkedList;
+type GraphQLField = GraphQLValue | NestedList;
 type EntityMap<_Value> = {
     [id: string]: {
         [field: string]: _Value;
     };
 };
 type EntityFieldMap = EntityMap<GraphQLField>;
-type LinkMap = EntityMap<string | null | LinkedList>;
+type LinkMap = EntityMap<string | null | NestedList>;
 type OperationMap = {
     [id: string]: {
         deleted?: boolean;
@@ -69,7 +69,7 @@ type OperationMap = {
         };
     };
 };
-type LinkedList<_Result = string> = (_Result | null | LinkedList<_Result>)[];
+type NestedList<_Result = string> = (_Result | null | NestedList<_Result>)[];
 type InsertOperation = {
     kind: OperationKind.insert;
     location: OperationLocation;

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

@@ -1,4 +1,4 @@
-import { flattenList } from "./stuff";
+import { flatten } from "../lib/flatten";
 class InMemoryStorage {
   data;
   idCount = 0;
@@ -198,7 +198,7 @@ class Layer {
   }
   writeLink(id, field, value) {
     const valueList = Array.isArray(value) ? value : [value];
-    for (const value2 of flattenList(valueList)) {
+    for (const value2 of flatten(valueList)) {
       if (!value2) {
         continue;
       }

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

@@ -1,6 +1,4 @@
 import type { GraphQLValue } from '../lib/types';
-import type { LinkedList } from './cache';
-export declare function flattenList<T>(source: LinkedList<T>): T[];
 export declare function evaluateKey(key: string, variables?: {
     [key: string]: GraphQLValue;
 }): string;

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

@@ -1,18 +1,3 @@
-function flattenList(source) {
-  const flat = [];
-  const unvisited = [source || []];
-  while (unvisited.length > 0) {
-    const target = unvisited.shift();
-    for (const id of target) {
-      if (Array.isArray(id)) {
-        unvisited.push(id);
-        continue;
-      }
-      flat.push(id);
-    }
-  }
-  return flat;
-}
 function evaluateKey(key, variables = {}) {
   let evaluated = "";
   let varName = "";
@@ -40,6 +25,5 @@ function evaluateKey(key, variables = {}) {
 }
 const varChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789";
 export {
-  evaluateKey,
-  flattenList
+  evaluateKey
 };

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

@@ -1,5 +1,6 @@
+import { flatten } from "../lib/flatten";
 import { getFieldsForType } from "../lib/selection";
-import { evaluateKey, flattenList } from "./stuff";
+import { evaluateKey } from "./stuff";
 class InMemorySubscriptions {
   cache;
   constructor(cache) {
@@ -47,7 +48,7 @@ class InMemorySubscriptions {
           parent,
           key
         );
-        let children = !Array.isArray(linkedRecord) ? [linkedRecord] : flattenList(linkedRecord) || [];
+        let children = !Array.isArray(linkedRecord) ? [linkedRecord] : flatten(linkedRecord) || [];
         for (const child of children) {
           if (!child) {
             continue;
@@ -156,7 +157,7 @@ class InMemorySubscriptions {
         const childSelection = selection.selection;
         if (childSelection) {
           const { value: link } = this.cache._internal_unstable.storage.get(parent, key);
-          const children = !Array.isArray(link) ? [link] : flattenList(link);
+          const children = !Array.isArray(link) ? [link] : flatten(link);
           for (const linkedRecord of children) {
             if (!linkedRecord) {
               continue;
@@ -192,7 +193,7 @@ class InMemorySubscriptions {
         continue;
       }
       const { value: previousValue } = this.cache._internal_unstable.storage.get(id, key);
-      const links = !Array.isArray(previousValue) ? [previousValue] : flattenList(previousValue);
+      const links = !Array.isArray(previousValue) ? [previousValue] : flatten(previousValue);
       for (const link of links) {
         if (link !== null) {
           linkedIDs.push([link, fieldSelection.selection || {}]);
@@ -232,7 +233,7 @@ class InMemorySubscriptions {
       if (kind === "scalar") {
         continue;
       }
-      const nextTargets = Array.isArray(value) ? flattenList(value) : [value];
+      const nextTargets = Array.isArray(value) ? flatten(value) : [value];
       for (const id2 of nextTargets) {
         if (visited.includes(id2)) {
           continue;

package/build/runtime-esm/client/documentStore.d.ts

@@ -7,9 +7,9 @@ export declare class DocumentStore<_Data extends GraphQLObject, _Input extends R
     #private;
     constructor({ artifact, plugins, pipeline, client, cache, initialValue, fetching, }: {
         artifact: DocumentArtifact;
-        plugins?: ClientPlugin[];
-        pipeline?: ClientPlugin[];
-        client: HoudiniClient;
+        plugins?: ClientHooks[];
+        pipeline?: ClientHooks[];
+        client: HoudiniClient | null;
         cache?: boolean;
         initialValue?: _Data | null;
         fetching?: boolean;
@@ -26,7 +26,8 @@ export declare class DocumentStore<_Data extends GraphQLObject, _Input extends R
     }): Promise<QueryResult<_Data, _Input>>;
 }
 declare function marshalVariables<_Data extends GraphQLObject, _Input extends {}>(ctx: ClientPluginContext): Record<string, any>;
-export type ClientPlugin = () => {
+export type ClientPlugin = () => ClientHooks | null | (ClientHooks | ClientPlugin | null)[];
+export type ClientHooks = {
     start?: ClientPluginEnterPhase;
     beforeNetwork?: ClientPluginEnterPhase;
     network?: ClientPluginEnterPhase;

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

@@ -48,13 +48,13 @@ class DocumentStore extends Writable {
     this.#client = client;
     this.#lastVariables = null;
     this.#configFile = getCurrentConfig();
-    this.#plugins = (pipeline ?? [
+    this.#plugins = pipeline ?? [
       cachePolicyPlugin({
         enabled: cache,
         setFetching: (fetching2) => this.update((state) => ({ ...state, fetching: fetching2 }))
-      }),
+      })(),
       ...plugins ?? []
-    ]).map((factory) => factory());
+    ];
   }
   async send({
     metadata,

package/build/runtime-esm/client/index.d.ts

@@ -1,6 +1,6 @@
 /// <reference path="../../../../../houdini.d.ts" />
-import type { DocumentArtifact, GraphQLObject } from '../lib/types';
-import type { ClientPlugin } from './documentStore';
+import type { DocumentArtifact, GraphQLObject, NestedList } from '../lib/types';
+import type { ClientPlugin, ClientHooks } from './documentStore';
 import { DocumentStore } from './documentStore';
 import { type FetchParamFn, type ThrowOnErrorParams } from './plugins';
 export { DocumentStore, type ClientPlugin } from './documentStore';
@@ -8,18 +8,20 @@ export { fetchPlugin, mutationPlugin, queryPlugin, subscriptionPlugin } from './
 type ConstructorArgs = {
     url: string;
     fetchParams?: FetchParamFn;
-    plugins?: ClientPlugin[];
-    pipeline?: ClientPlugin[];
+    plugins?: NestedList<ClientPlugin>;
+    pipeline?: NestedList<ClientPlugin>;
     throwOnError?: ThrowOnErrorParams;
 };
+export type ObserveParams<_Data extends GraphQLObject, _Artifact extends DocumentArtifact = DocumentArtifact> = {
+    artifact: _Artifact;
+    cache?: boolean;
+    initialValue?: _Data | null;
+    fetching?: boolean;
+};
 export declare class HoudiniClient {
     #private;
     url: string;
     constructor({ url, fetchParams, plugins, pipeline, throwOnError }: ConstructorArgs);
-    observe<_Data extends GraphQLObject, _Input extends Record<string, any>>({ artifact, cache, initialValue, fetching, }: {
-        artifact: DocumentArtifact;
-        cache?: boolean;
-        initialValue?: _Data | null;
-        fetching?: boolean;
-    }): DocumentStore<_Data, _Input>;
+    observe<_Data extends GraphQLObject, _Input extends Record<string, any>>({ artifact, cache, initialValue, fetching, }: ObserveParams<_Data>): DocumentStore<_Data, _Input>;
 }
+export declare function createPluginHooks(plugins: ClientPlugin[]): ClientHooks[];

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

@@ -1,3 +1,4 @@
+import { flatten } from "../lib/flatten";
 import { DocumentStore } from "./documentStore";
 import {
   fetchParamsPlugin,
@@ -18,16 +19,18 @@ class HoudiniClient {
         "A client cannot be given a pipeline and a list of plugins at the same time."
       );
     }
-    this.#plugins = [].concat(
-      throwOnError ? [throwOnErrorPlugin(throwOnError)] : [],
-      fetchParamsPlugin(fetchParams),
-      pipeline ?? [
-        queryPlugin,
-        mutationPlugin
-      ].concat(
-        plugins ?? [],
-        pluginsFromPlugins,
-        fetchPlugin()
+    this.#plugins = flatten(
+      [].concat(
+        throwOnError ? [throwOnErrorPlugin(throwOnError)] : [],
+        fetchParamsPlugin(fetchParams),
+        pipeline ?? [
+          queryPlugin,
+          mutationPlugin
+        ].concat(
+          plugins ?? [],
+          pluginsFromPlugins,
+          fetchPlugin()
+        )
       )
     );
     this.url = url;
@@ -41,16 +44,38 @@ class HoudiniClient {
     return new DocumentStore({
       client: this,
       artifact,
-      plugins: this.#plugins,
+      plugins: createPluginHooks(this.#plugins),
       cache,
       initialValue,
       fetching
     });
   }
 }
+function createPluginHooks(plugins) {
+  return plugins.reduce((hooks, plugin) => {
+    const result = plugin();
+    if (!result) {
+      return hooks;
+    }
+    if (!Array.isArray(result)) {
+      return hooks.concat(result);
+    }
+    for (const value of result) {
+      if (!value) {
+        continue;
+      }
+      if (typeof value === "function") {
+        return hooks.concat(createPluginHooks([value]));
+      }
+      hooks.push(value);
+    }
+    return hooks;
+  }, []);
+}
 export {
   DocumentStore2 as DocumentStore,
   HoudiniClient,
+  createPluginHooks,
   fetchPlugin2 as fetchPlugin,
   mutationPlugin2 as mutationPlugin,
   queryPlugin2 as queryPlugin,

package/build/runtime-esm/client/plugins/injectedPlugins.d.ts

@@ -1,3 +1,4 @@
+import type { NestedList } from '../../lib/types';
 import type { ClientPlugin } from '../documentStore';
-declare const plugins: ClientPlugin[];
+declare const plugins: NestedList<ClientPlugin>;
 export default plugins;

package/build/runtime-esm/client/utils/documentPlugins.d.ts

@@ -1,3 +1,3 @@
 import type { ArtifactKind } from '../../lib/types';
-import type { ClientPlugin } from '../documentStore';
-export declare const documentPlugin: (kind: ArtifactKind, source: ClientPlugin) => ClientPlugin;
+import type { ClientPlugin, ClientHooks } from '../documentStore';
+export declare const documentPlugin: (kind: ArtifactKind, source: () => ClientHooks) => ClientPlugin;

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

@@ -0,0 +1,2 @@
+import type { NestedList } from './types';
+export declare function flatten<T>(source?: NestedList<T>): T[];

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

@@ -0,0 +1,17 @@
+function flatten(source) {
+  if (!source) {
+    return [];
+  }
+  return source.reduce((acc, element) => {
+    if (!element) {
+      return acc;
+    }
+    if (Array.isArray(element)) {
+      return acc.concat(flatten(element));
+    }
+    return acc.concat(element);
+  }, []);
+}
+export {
+  flatten
+};

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

@@ -182,4 +182,5 @@ export type RequestPayload<GraphQLObject = any> = {
         message: string;
     }[] | null;
 };
+export type NestedList<_Result = string> = (_Result | null | NestedList<_Result>)[];
 export {};

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

@@ -64,8 +64,8 @@ Please acknowledge this by setting acceptImperativeInstability to true in your c
     });
     return;
   }
-  markStale(type, options = {}) {
-    return this._internal_unstable.markTypeStale(type, options);
+  markStale(type, options) {
+    return this._internal_unstable.markTypeStale(type ? { ...options, type } : void 0);
   }
 }
 export {

package/build/runtime-esm/public/record.d.ts

@@ -34,8 +34,7 @@ export declare class Record<Def extends CacheTypeDef, Type extends ValidTypes<De
      * @param field
      * @param when
      */
-    markStale<Field extends TypeFieldNames<Def, Type>>({ field, when, }?: {
-        field?: Field;
+    markStale<Field extends TypeFieldNames<Def, Type>>(field?: Field, { when, }?: {
         when?: ArgType<Def, Type, Field>;
     }): void;
 }

package/build/runtime-esm/public/record.js

@@ -54,8 +54,7 @@ class Record {
   delete() {
     this.#cache._internal_unstable.delete(this.#id);
   }
-  markStale({
-    field,
+  markStale(field, {
     when
   } = {}) {
     this.#cache._internal_unstable.markRecordStale(this.#id, { field, when });