houdini 1.0.0-next.3 → 1.0.0-next.4

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

@@ -18,7 +18,7 @@ export declare class Cache {
         variables?: {};
         parent?: string;
         layer?: LayerID | null;
-        applyUpdates?: boolean;
+        applyUpdates?: string[];
         notifySubscribers?: SubscriptionSpec[];
         forceNotify?: boolean;
     }): SubscriptionSpec[];
@@ -62,7 +62,7 @@ declare class CacheInternal {
         root?: string;
         layer: Layer;
         toNotify?: FieldSelection[];
-        applyUpdates?: boolean;
+        applyUpdates?: string[];
         forceNotify?: boolean;
     }): FieldSelection[];
     getSelection({ selection, parent, variables, stepsFromConnection, }: {
@@ -97,7 +97,7 @@ declare class CacheInternal {
         abstract: boolean;
         variables: {};
         specs: FieldSelection[];
-        applyUpdates: boolean;
+        applyUpdates?: string[];
         fields: SubscriptionSelection;
         layer: Layer;
         forceNotify?: boolean;

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

@@ -157,7 +157,7 @@ class CacheInternal {
     selection,
     variables = {},
     parent = rootID,
-    applyUpdates = false,
+    applyUpdates,
     layer,
     toNotify = [],
     forceNotify
@@ -178,7 +178,7 @@ class CacheInternal {
         selection: fieldSelection,
         operations,
         abstract: isAbstract,
-        update,
+        updates,
         nullable
       } = targetSelection[field];
       const key = (0, import_stuff.evaluateKey)(keyRaw, variables);
@@ -198,13 +198,23 @@ class CacheInternal {
       }
       if (!fieldSelection) {
         let newValue = value;
-        if (Array.isArray(value) && applyUpdates && update) {
-          if (update === "append") {
-            newValue = (previousValue || []).concat(value);
-          } else if (update === "prepend") {
-            newValue = value.concat(previousValue || []);
+        if (updates && applyUpdates && Array.isArray(value)) {
+          for (const update of applyUpdates) {
+            if (!updates.includes(update)) {
+              continue;
+            }
+            if (update === "append") {
+              newValue = (previousValue || []).concat(value);
+            } else if (update === "prepend") {
+              newValue = value.concat(previousValue || []);
+            }
           }
         }
+        if (updates && applyUpdates?.includes("prepend") && ["endCursor", "hasNextPage"].includes(key)) {
+          newValue = previousValue;
+        } else if (updates && applyUpdates?.includes("append") && ["startCursor", "hasPreviousPage"].includes(key)) {
+          newValue = previousValue;
+        }
         const valueChanged = !(0, import_deepEquals.deepEquals)(newValue, previousValue);
         if (displayLayer && (valueChanged || forceNotify)) {
           toNotify.push(...currentSubscribers);
@@ -264,7 +274,7 @@ class CacheInternal {
         }
       } else if (Array.isArray(value) && (typeof previousValue === "undefined" || Array.isArray(previousValue))) {
         let oldIDs = [...previousValue || []];
-        const emptyEdges = !update ? [] : oldIDs.map((id) => {
+        const emptyEdges = !updates ? [] : oldIDs.map((id) => {
           if (!id) {
             return "";
           }
@@ -292,7 +302,7 @@ class CacheInternal {
           layer,
           forceNotify
         });
-        if (applyUpdates && update) {
+        if (applyUpdates && updates) {
           if (key === "edges") {
             const newNodeIDs = [];
             for (const id of newIDs) {
@@ -320,12 +330,17 @@ class CacheInternal {
               return true;
             });
           }
-          if (update === "prepend") {
-            linkedIDs = newIDs.concat(oldIDs);
-          } else if (update === "append") {
-            linkedIDs = oldIDs.concat(newIDs);
-          } else if (update === "replace") {
-            linkedIDs = newIDs;
+          for (const update of applyUpdates) {
+            if (update !== "replace" && !updates.includes(update)) {
+              continue;
+            }
+            if (update === "prepend") {
+              linkedIDs = newIDs.concat(oldIDs);
+            } else if (update === "append") {
+              linkedIDs = oldIDs.concat(newIDs);
+            } else if (update === "replace") {
+              linkedIDs = newIDs;
+            }
           }
         } else {
           linkedIDs = nestedIDs;

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

@@ -176,7 +176,7 @@ class List {
                 edges: {
                   keyRaw: "edges",
                   type: "ConnectionEdge",
-                  update: where === "first" ? "prepend" : "append",
+                  updates: ["append", "prepend"],
                   selection: {
                     fields: {
                       node: {
@@ -212,7 +212,7 @@ class List {
           newEntries: {
             keyRaw: this.key,
             type: listType,
-            update: where === "first" ? "prepend" : "append",
+            updates: ["append", "prepend"],
             selection: {
               ...selection,
               fields: {
@@ -235,7 +235,7 @@ class List {
       data: insertData,
       variables,
       parent: this.recordID,
-      applyUpdates: true
+      applyUpdates: [where === "first" ? "prepend" : "append"]
     });
   }
   removeID(id, variables = {}) {

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

@@ -53,7 +53,7 @@ export type ClientPluginContext = {
         forceNotify?: boolean;
         disableWrite?: boolean;
         disableRead?: boolean;
-        applyUpdates?: boolean;
+        applyUpdates?: string[];
     };
     stuff: App.Stuff;
 };

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

@@ -5,5 +5,5 @@ export declare const fetchParamsPlugin: (fn?: FetchParamFn) => ClientPlugin;
 export type FetchParamsInput = Pick<ClientPluginContext, 'config' | 'policy' | 'variables' | 'metadata' | 'session' | 'stuff'> & {
     text: string;
     hash: string;
-    artifact: DocumentArtifact;
+    document: DocumentArtifact;
 };

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

@@ -26,7 +26,12 @@ const fetchParamsPlugin = (fn = () => ({})) => () => ({
     next({
       ...ctx,
       fetchParams: fn({
-        ...ctx,
+        config: ctx.config,
+        policy: ctx.policy,
+        metadata: ctx.metadata,
+        session: ctx.session,
+        stuff: ctx.stuff,
+        document: ctx.artifact,
         variables: marshalVariables(ctx),
         text: ctx.artifact.raw,
         hash: ctx.artifact.hash

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

@@ -54,7 +54,6 @@ const queryPlugin = (0, import_utils.documentPlugin)(import_types.ArtifactKind.Q
           selection: ctx.artifact.selection,
           variables: () => lastVariables,
           set: (newValue) => {
-            console.log("setting from cache update");
             resolve(ctx, {
               data: newValue,
               errors: null,

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

@@ -71,7 +71,6 @@ export type BaseCompiledDocument = {
     rootType: string;
     input?: InputObject;
     refetch?: {
-        update: RefetchUpdateMode;
         path: string[];
         method: 'cursor' | 'offset';
         pageSize: number;
@@ -79,7 +78,7 @@ export type BaseCompiledDocument = {
         embedded: boolean;
         targetType: string;
         paginated: boolean;
-        direction?: 'forward' | 'backwards';
+        direction: 'forward' | 'backward' | 'both';
     };
     pluginsData?: Record<string, any>;
 };
@@ -135,7 +134,7 @@ export type SubscriptionSelection = {
                 connection: boolean;
                 type: string;
             };
-            update?: RefetchUpdateMode;
+            updates?: string[];
             filters?: {
                 [key: string]: {
                     kind: 'Boolean' | 'String' | 'Float' | 'Int' | 'Variable';

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

@@ -18,7 +18,7 @@ export declare class Cache {
         variables?: {};
         parent?: string;
         layer?: LayerID | null;
-        applyUpdates?: boolean;
+        applyUpdates?: string[];
         notifySubscribers?: SubscriptionSpec[];
         forceNotify?: boolean;
     }): SubscriptionSpec[];
@@ -62,7 +62,7 @@ declare class CacheInternal {
         root?: string;
         layer: Layer;
         toNotify?: FieldSelection[];
-        applyUpdates?: boolean;
+        applyUpdates?: string[];
         forceNotify?: boolean;
     }): FieldSelection[];
     getSelection({ selection, parent, variables, stepsFromConnection, }: {
@@ -97,7 +97,7 @@ declare class CacheInternal {
         abstract: boolean;
         variables: {};
         specs: FieldSelection[];
-        applyUpdates: boolean;
+        applyUpdates?: string[];
         fields: SubscriptionSelection;
         layer: Layer;
         forceNotify?: boolean;

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

@@ -133,7 +133,7 @@ class CacheInternal {
     selection,
     variables = {},
     parent = rootID,
-    applyUpdates = false,
+    applyUpdates,
     layer,
     toNotify = [],
     forceNotify
@@ -154,7 +154,7 @@ class CacheInternal {
         selection: fieldSelection,
         operations,
         abstract: isAbstract,
-        update,
+        updates,
         nullable
       } = targetSelection[field];
       const key = evaluateKey(keyRaw, variables);
@@ -174,13 +174,23 @@ class CacheInternal {
       }
       if (!fieldSelection) {
         let newValue = value;
-        if (Array.isArray(value) && applyUpdates && update) {
-          if (update === "append") {
-            newValue = (previousValue || []).concat(value);
-          } else if (update === "prepend") {
-            newValue = value.concat(previousValue || []);
+        if (updates && applyUpdates && Array.isArray(value)) {
+          for (const update of applyUpdates) {
+            if (!updates.includes(update)) {
+              continue;
+            }
+            if (update === "append") {
+              newValue = (previousValue || []).concat(value);
+            } else if (update === "prepend") {
+              newValue = value.concat(previousValue || []);
+            }
           }
         }
+        if (updates && applyUpdates?.includes("prepend") && ["endCursor", "hasNextPage"].includes(key)) {
+          newValue = previousValue;
+        } else if (updates && applyUpdates?.includes("append") && ["startCursor", "hasPreviousPage"].includes(key)) {
+          newValue = previousValue;
+        }
         const valueChanged = !deepEquals(newValue, previousValue);
         if (displayLayer && (valueChanged || forceNotify)) {
           toNotify.push(...currentSubscribers);
@@ -240,7 +250,7 @@ class CacheInternal {
         }
       } else if (Array.isArray(value) && (typeof previousValue === "undefined" || Array.isArray(previousValue))) {
         let oldIDs = [...previousValue || []];
-        const emptyEdges = !update ? [] : oldIDs.map((id) => {
+        const emptyEdges = !updates ? [] : oldIDs.map((id) => {
           if (!id) {
             return "";
           }
@@ -268,7 +278,7 @@ class CacheInternal {
           layer,
           forceNotify
         });
-        if (applyUpdates && update) {
+        if (applyUpdates && updates) {
           if (key === "edges") {
             const newNodeIDs = [];
             for (const id of newIDs) {
@@ -296,12 +306,17 @@ class CacheInternal {
               return true;
             });
           }
-          if (update === "prepend") {
-            linkedIDs = newIDs.concat(oldIDs);
-          } else if (update === "append") {
-            linkedIDs = oldIDs.concat(newIDs);
-          } else if (update === "replace") {
-            linkedIDs = newIDs;
+          for (const update of applyUpdates) {
+            if (update !== "replace" && !updates.includes(update)) {
+              continue;
+            }
+            if (update === "prepend") {
+              linkedIDs = newIDs.concat(oldIDs);
+            } else if (update === "append") {
+              linkedIDs = oldIDs.concat(newIDs);
+            } else if (update === "replace") {
+              linkedIDs = newIDs;
+            }
           }
         } else {
           linkedIDs = nestedIDs;

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

@@ -151,7 +151,7 @@ class List {
                 edges: {
                   keyRaw: "edges",
                   type: "ConnectionEdge",
-                  update: where === "first" ? "prepend" : "append",
+                  updates: ["append", "prepend"],
                   selection: {
                     fields: {
                       node: {
@@ -187,7 +187,7 @@ class List {
           newEntries: {
             keyRaw: this.key,
             type: listType,
-            update: where === "first" ? "prepend" : "append",
+            updates: ["append", "prepend"],
             selection: {
               ...selection,
               fields: {
@@ -210,7 +210,7 @@ class List {
       data: insertData,
       variables,
       parent: this.recordID,
-      applyUpdates: true
+      applyUpdates: [where === "first" ? "prepend" : "append"]
     });
   }
   removeID(id, variables = {}) {

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

@@ -53,7 +53,7 @@ export type ClientPluginContext = {
         forceNotify?: boolean;
         disableWrite?: boolean;
         disableRead?: boolean;
-        applyUpdates?: boolean;
+        applyUpdates?: string[];
     };
     stuff: App.Stuff;
 };

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

@@ -5,5 +5,5 @@ export declare const fetchParamsPlugin: (fn?: FetchParamFn) => ClientPlugin;
 export type FetchParamsInput = Pick<ClientPluginContext, 'config' | 'policy' | 'variables' | 'metadata' | 'session' | 'stuff'> & {
     text: string;
     hash: string;
-    artifact: DocumentArtifact;
+    document: DocumentArtifact;
 };

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

@@ -3,7 +3,12 @@ const fetchParamsPlugin = (fn = () => ({})) => () => ({
     next({
       ...ctx,
       fetchParams: fn({
-        ...ctx,
+        config: ctx.config,
+        policy: ctx.policy,
+        metadata: ctx.metadata,
+        session: ctx.session,
+        stuff: ctx.stuff,
+        document: ctx.artifact,
         variables: marshalVariables(ctx),
         text: ctx.artifact.raw,
         hash: ctx.artifact.hash

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

@@ -25,7 +25,6 @@ const queryPlugin = documentPlugin(ArtifactKind.Query, function() {
           selection: ctx.artifact.selection,
           variables: () => lastVariables,
           set: (newValue) => {
-            console.log("setting from cache update");
             resolve(ctx, {
               data: newValue,
               errors: null,

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

@@ -71,7 +71,6 @@ export type BaseCompiledDocument = {
     rootType: string;
     input?: InputObject;
     refetch?: {
-        update: RefetchUpdateMode;
         path: string[];
         method: 'cursor' | 'offset';
         pageSize: number;
@@ -79,7 +78,7 @@ export type BaseCompiledDocument = {
         embedded: boolean;
         targetType: string;
         paginated: boolean;
-        direction?: 'forward' | 'backwards';
+        direction: 'forward' | 'backward' | 'both';
     };
     pluginsData?: Record<string, any>;
 };
@@ -135,7 +134,7 @@ export type SubscriptionSelection = {
                 connection: boolean;
                 type: string;
             };
-            update?: RefetchUpdateMode;
+            updates?: string[];
             filters?: {
                 [key: string]: {
                     kind: 'Boolean' | 'String' | 'Float' | 'Int' | 'Variable';

package/build/test-cjs/index.js

@@ -56029,19 +56029,18 @@ async function paginate(config2, documents) {
         paginated = true;
         const fieldTypeFields = parentTypeFromAncestors(config2.schema, doc.filename, ancestors).getFields()[node.name.value];
         const args = new Set(fieldTypeFields.args.map((arg) => arg.name));
-        const passedArgs = new Set(node.arguments?.map((arg) => arg.name.value));
-        const specifiedForwards = passedArgs.has("first");
-        const specifiedBackwards = passedArgs.has("last");
         cursorType = fieldTypeFields.args?.find((arg) => ["before", "after"].includes(arg.name))?.type?.name || "String";
         flags.after.type = cursorType;
         flags.before.type = cursorType;
-        const forwardPagination = !specifiedBackwards && args.has("first") && args.has("after");
-        const backwardsPagination = !specifiedForwards && args.has("last") && args.has("before");
-        const offsetPagination = !forwardPagination && !backwardsPagination && args.has("offset") && args.has("limit");
-        flags.first.enabled = forwardPagination;
-        flags.after.enabled = forwardPagination;
-        flags.last.enabled = backwardsPagination;
-        flags.before.enabled = backwardsPagination;
+        const passedArgs = new Set(node.arguments?.map((arg) => arg.name.value));
+        const forwards = args.has("first") && args.has("after");
+        const backwards = args.has("last") && args.has("after");
+        const cursorPagination = passedArgs.has("last") || passedArgs.has("first");
+        const offsetPagination = !cursorPagination && args.has("offset") && args.has("limit");
+        flags.first.enabled = forwards;
+        flags.after.enabled = forwards;
+        flags.last.enabled = backwards;
+        flags.before.enabled = backwards;
         flags.offset.enabled = offsetPagination;
         flags.limit.enabled = offsetPagination;
         paginationPath = ancestors.filter(
@@ -56061,10 +56060,6 @@ async function paginate(config2, documents) {
       let fragmentName = "";
       let refetchQueryName = "";
       let nodeQuery = false;
-      let refetchUpdate = "append" /* append */;
-      if (flags.last.enabled) {
-        refetchUpdate = "prepend" /* prepend */;
-      }
       let fragment = "";
       doc.document = graphql8.visit(doc.document, {
         OperationDefinition(node) {
@@ -56159,26 +56154,24 @@ async function paginate(config2, documents) {
           targetType = fragment;
         }
       }
+      const pageSize = flags.first.defaultValue ?? flags.last.defaultValue ?? flags.limit.defaultValue;
+      const start = flags.after.defaultValue ?? flags.before.defaultValue ?? flags.offset.defaultValue;
+      let direction = "forward";
+      if (flags.before.enabled && flags.after.enabled) {
+        direction = "both";
+      } else if (flags.before.enabled) {
+        direction = "backward";
+      }
       doc.refetch = {
-        update: refetchUpdate,
         path: paginationPath,
         method: flags.first.enabled || flags.last.enabled ? "cursor" : "offset",
-        pageSize: 0,
+        pageSize,
         embedded: nodeQuery,
         targetType,
         paginated: true,
-        direction: flags.last.enabled ? "backwards" : "forward"
-      };
-      if (flags.first.enabled) {
-        doc.refetch.pageSize = flags.first.defaultValue;
-        doc.refetch.start = flags.after.defaultValue;
-      } else if (flags.last.enabled) {
-        doc.refetch.pageSize = flags.last.defaultValue;
-        doc.refetch.start = flags.before.defaultValue;
-      } else if (flags.limit.enabled) {
-        doc.refetch.pageSize = flags.limit.defaultValue;
-        doc.refetch.start = flags.offset.defaultValue;
-      }
+        direction,
+        start
+      };
       if (!fragment) {
         continue;
       }
@@ -56354,12 +56347,6 @@ function replaceArgumentsWithVariables(args, flags) {
     if (flags[name2].defaultValue || !spec.enabled || seenArgs[name2]) {
       continue;
     }
-    if (["first", "after"].includes(name2) && flags["before"].enabled) {
-      continue;
-    }
-    if (["last", "before"].includes(name2) && flags["first"].enabled) {
-      continue;
-    }
     newArgs.push(variableAsArgument(name2));
   }
   return newArgs;
@@ -56867,7 +56854,7 @@ function selection({
   path: path2 = [],
   includeFragments,
   document,
-  markEdges
+  inConnection
 }) {
   let object = {};
   const typeMap = {};
@@ -57009,14 +56996,23 @@ function selection({
         (directive) => directive.name.value === config2.paginateDirective
       );
       if (paginated && document.refetch && document.refetch.method === "offset") {
-        fieldObj.update = document.refetch.update;
+        fieldObj.updates = ["append" /* append */];
+      }
+      let continueConnection = inConnection;
+      if ([
+        "edges",
+        "endCursor",
+        "startCursor",
+        "hasNextPage",
+        "hasPreviousPage"
+      ].includes(attributeName) && inConnection && document.refetch) {
+        fieldObj.updates = ["append" /* append */, "prepend" /* prepend */];
       }
-      if (attributeName === "edges" && markEdges && document.refetch) {
-        fieldObj.update = document.refetch.update;
-        markEdges = "";
+      if (attributeName === "node" && inConnection) {
+        continueConnection = false;
       }
       if (field.selectionSet) {
-        const edgesMark = paginated && document.refetch?.method === "cursor" ? document.refetch.update : markEdges;
+        const connectionState = paginated && document.refetch?.method === "cursor" || continueConnection;
         fieldObj.selection = selection({
           config: config2,
           filepath,
@@ -57026,7 +57022,7 @@ function selection({
           path: pathSoFar,
           includeFragments,
           document,
-          markEdges: edgesMark
+          inConnection: connectionState
         });
       }
       if (field.arguments?.length && fieldObj.list) {