houdini 1.0.0-next.7 → 1.0.0-next.9

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

@@ -1,14 +1,15 @@
+import { flatten } from "../lib/flatten";
 import { DocumentStore } from "./documentStore";
 import {
-  fetchParamsPlugin,
-  fetchPlugin,
-  mutationPlugin,
-  queryPlugin,
-  throwOnErrorPlugin
+  fetchParams as fetchParamsPlugin,
+  fetch as fetchPlugin,
+  mutation as mutationPlugin,
+  query as queryPlugin,
+  throwOnError as throwOnErrorPlugin
 } from "./plugins";
 import pluginsFromPlugins from "./plugins/injectedPlugins";
 import { DocumentStore as DocumentStore2 } from "./documentStore";
-import { fetchPlugin as fetchPlugin2, mutationPlugin as mutationPlugin2, queryPlugin as queryPlugin2, subscriptionPlugin } from "./plugins";
+import { fetch, mutation, query, subscription } from "./plugins";
 class HoudiniClient {
   url;
   #plugins;
@@ -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,18 +44,40 @@ 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,
-  fetchPlugin2 as fetchPlugin,
-  mutationPlugin2 as mutationPlugin,
-  queryPlugin2 as queryPlugin,
-  subscriptionPlugin
+  createPluginHooks,
+  fetch,
+  mutation,
+  query,
+  subscription
 };

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

@@ -1,7 +1,7 @@
 import cache from '../../cache';
 import type { Cache } from '../../cache/cache';
 import type { ClientPlugin } from '../documentStore';
-export declare const cachePolicyPlugin: ({ enabled, setFetching, cache: localCache, }: {
+export declare const cachePolicy: ({ enabled, setFetching, cache: localCache, }: {
     enabled: boolean;
     setFetching: (val: boolean) => void;
     cache?: Cache | undefined;

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

@@ -1,6 +1,6 @@
 import cache from "../../cache";
 import { ArtifactKind, CachePolicy, DataSource } from "../../lib/types";
-const cachePolicyPlugin = ({
+const cachePolicy = ({
   enabled,
   setFetching,
   cache: localCache = cache
@@ -67,5 +67,5 @@ const cachePolicyPlugin = ({
   };
 };
 export {
-  cachePolicyPlugin
+  cachePolicy
 };

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

@@ -1,6 +1,6 @@
 import type { RequestPayload } from '../../lib/types';
 import type { ClientPlugin } from '../documentStore';
-export declare const fetchPlugin: (target?: RequestHandler | string) => ClientPlugin;
+export declare const fetch: (target?: RequestHandler | string) => ClientPlugin;
 export type FetchContext = {
     fetch: typeof globalThis.fetch;
     metadata?: App.Metadata | null;

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

@@ -1,9 +1,9 @@
 import { DataSource } from "../../lib/types";
-const fetchPlugin = (target) => {
+const fetch = (target) => {
   return () => {
     return {
       async network(ctx, { client, resolve, marshalVariables }) {
-        const fetch = ctx.fetch ?? globalThis.fetch;
+        const fetch2 = ctx.fetch ?? globalThis.fetch;
         const fetchParams = {
           text: ctx.text,
           hash: ctx.hash,
@@ -20,7 +20,7 @@ const fetchPlugin = (target) => {
         const result = await fetchFn({
           fetch: (url, args) => {
             const newArgs = handleMultipart(fetchParams, args) ?? args;
-            return fetch(url, newArgs);
+            return fetch2(url, newArgs);
           },
           metadata: ctx.metadata,
           session: ctx.session || {},
@@ -45,8 +45,8 @@ const defaultFetch = (url, params) => {
       "Could not find configured client url. Please specify one in your houdini.config.js file."
     );
   }
-  return async ({ fetch, text, variables }) => {
-    const result = await fetch(url, {
+  return async ({ fetch: fetch2, text, variables }) => {
+    const result = await fetch2(url, {
       method: "POST",
       body: JSON.stringify({ query: text, variables }),
       ...params,
@@ -147,6 +147,6 @@ function isPlainObject(value) {
 }
 export {
   extractFiles,
-  fetchPlugin,
+  fetch,
   isExtractableFile
 };

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

@@ -1,7 +1,7 @@
 import type { DocumentArtifact } from '../../lib/types';
 import type { ClientPlugin, ClientPluginContext } from '../documentStore';
 export type FetchParamFn = (ctx: FetchParamsInput) => Required<ClientPluginContext>['fetchParams'];
-export declare const fetchParamsPlugin: (fn?: FetchParamFn) => ClientPlugin;
+export declare const fetchParams: (fn?: FetchParamFn) => ClientPlugin;
 export type FetchParamsInput = Pick<ClientPluginContext, 'config' | 'policy' | 'variables' | 'metadata' | 'session' | 'stuff'> & {
     text: string;
     hash: string;

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

@@ -1,4 +1,4 @@
-const fetchParamsPlugin = (fn = () => ({})) => () => ({
+const fetchParams = (fn = () => ({})) => () => ({
   beforeNetwork(ctx, { next, marshalVariables }) {
     next({
       ...ctx,
@@ -17,5 +17,5 @@ const fetchParamsPlugin = (fn = () => ({})) => () => ({
   }
 });
 export {
-  fetchParamsPlugin
+  fetchParams
 };

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/plugins/mutation.d.ts

@@ -1 +1 @@
-export declare const mutationPlugin: import("..").ClientPlugin;
+export declare const mutation: import("..").ClientPlugin;

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

@@ -2,7 +2,7 @@ import cache from "../../cache";
 import { marshalSelection } from "../../lib/scalars";
 import { ArtifactKind } from "../../lib/types";
 import { documentPlugin } from "../utils";
-const mutationPlugin = documentPlugin(ArtifactKind.Mutation, () => {
+const mutation = documentPlugin(ArtifactKind.Mutation, () => {
   return {
     async start(ctx, { next, marshalVariables }) {
       const layer = cache._internal_unstable.storage.createLayer(true);
@@ -52,5 +52,5 @@ const mutationPlugin = documentPlugin(ArtifactKind.Mutation, () => {
   };
 });
 export {
-  mutationPlugin
+  mutation
 };

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

@@ -1,2 +1,2 @@
 import type { ClientPlugin } from '../documentStore';
-export declare const queryPlugin: ClientPlugin;
+export declare const query: ClientPlugin;

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

@@ -1,7 +1,7 @@
 import cache from "../../cache";
 import { ArtifactKind, DataSource } from "../../lib/types";
 import { documentPlugin } from "../utils";
-const queryPlugin = documentPlugin(ArtifactKind.Query, function() {
+const query = documentPlugin(ArtifactKind.Query, function() {
   let subscriptionSpec = null;
   let lastVariables = null;
   let artifactName = "";
@@ -49,5 +49,5 @@ const queryPlugin = documentPlugin(ArtifactKind.Query, function() {
   };
 });
 export {
-  queryPlugin
+  query
 };

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

@@ -1,5 +1,5 @@
 import type { ClientPluginContext } from '../documentStore';
-export declare function subscriptionPlugin(factory: SubscriptionHandler): import("../documentStore").ClientPlugin;
+export declare function subscription(factory: SubscriptionHandler): import("../documentStore").ClientPlugin;
 export type SubscriptionHandler = (ctx: ClientPluginContext) => {
     subscribe: (payload: {
         query: string;

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

@@ -1,7 +1,7 @@
 import { deepEquals } from "../../lib/deepEquals";
 import { ArtifactKind, DataSource } from "../../lib/types";
 import { documentPlugin } from "../utils";
-function subscriptionPlugin(factory) {
+function subscription(factory) {
   return documentPlugin(ArtifactKind.Subscription, () => {
     let clearSubscription = null;
     let socketClient = null;
@@ -72,5 +72,5 @@ function subscriptionPlugin(factory) {
   });
 }
 export {
-  subscriptionPlugin
+  subscription
 };

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

@@ -4,4 +4,4 @@ export type ThrowOnErrorParams = {
     operations: ('all' | 'query' | 'mutation' | 'subscription')[];
     error?: (errors: NonNullable<QueryResult<any, any>['errors']>) => unknown;
 };
-export declare const throwOnErrorPlugin: ({ operations, error }: ThrowOnErrorParams) => ClientPlugin;
+export declare const throwOnError: ({ operations, error }: ThrowOnErrorParams) => ClientPlugin;

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

@@ -1,5 +1,5 @@
 import { ArtifactKind } from "../../lib";
-const throwOnErrorPlugin = ({ operations, error }) => () => {
+const throwOnError = ({ operations, error }) => () => {
   const all = operations.includes("all");
   const throwOnKind = (kind) => all || {
     [ArtifactKind.Query]: operations.includes("query"),
@@ -19,5 +19,5 @@ const throwOnErrorPlugin = ({ operations, error }) => () => {
 };
 const defaultErrorFn = async (errors) => new Error(errors.map((error) => error.message).join(". ") + ".");
 export {
-  throwOnErrorPlugin
+  throwOnError
 };

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,6 @@ export type RequestPayload<GraphQLObject = any> = {
         message: string;
     }[] | null;
 };
+export type NestedList<_Result = string> = (_Result | null | NestedList<_Result>)[];
+export type ValueOf<Parent> = Parent[keyof Parent];
 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 });