houdini 1.0.0-next.2 → 1.0.0-next.4

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

@@ -18,15 +18,12 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var record_exports = {};
 __export(record_exports, {
-  Record: () => Record,
-  computeKey: () => computeKey,
-  marshalNestedList: () => marshalNestedList,
-  stringifyObjectWithNoQuotesOnKeys: () => stringifyObjectWithNoQuotesOnKeys
+  Record: () => Record
 });
 module.exports = __toCommonJS(record_exports);
 var import_cache = require("../cache/cache");
+var import_lib = require("../lib");
 var import_config = require("../lib/config");
-var import_cache2 = require("./cache");
 class Record {
   #id;
   #cache;
@@ -50,200 +47,37 @@ class Record {
       }
     }
   }
-  set({
-    field,
-    args,
-    value
+  read({
+    fragment,
+    variables
   }) {
-    this.#cache.validateInstabilityWarning();
-    const key = computeKey({ field, args });
-    const typeInfo = (0, import_cache2._typeInfo)(this.#cache, this.type, field);
-    let newValue;
-    if (typeInfo.link) {
-      const keys = (0, import_config.keyFieldsForType)(this.#cache.config, typeInfo.type);
-      typeInfo.selection = {
-        fields: keys.reduce(
-          (acc, key2) => {
-            const keyInfo = (0, import_cache2._typeInfo)(this.#cache, typeInfo.type, key2);
-            return {
-              ...acc,
-              [key2]: {
-                type: keyInfo.type,
-                keyRaw: key2
-              }
-            };
-          },
-          {
-            __typename: {
-              type: "String",
-              keyRaw: "__typename"
-            }
-          }
-        )
-      };
-    }
-    if (!typeInfo.link) {
-      const fnMarshal = this.#cache.config.scalars?.[typeInfo.type]?.marshal;
-      if (fnMarshal) {
-        newValue = fnMarshal(value);
-      } else {
-        newValue = value;
-      }
-    } else if (value instanceof Record) {
-      newValue = {
-        ...value.idFields,
-        __typename: value.type
-      };
-    } else if (Array.isArray(value)) {
-      newValue = marshalNestedList(value);
-    } else if (value !== null) {
-      throw new Error("Value must be a RecordProxy if the field is a link to another record");
-    }
-    this.#cache._internal_unstable._internal_unstable.lifetimes.resetLifetime(this.#id, key);
-    this.#cache._internal_unstable.write({
+    return this.#cache._internal_unstable.read({
+      selection: fragment.artifact.selection,
       parent: this.#id,
-      selection: {
-        fields: {
-          [field]: {
-            keyRaw: key,
-            ...typeInfo
-          }
-        }
-      },
-      data: {
-        [field]: newValue
-      }
+      variables: (0, import_lib.marshalInputs)({
+        config: this.#cache.config,
+        artifact: fragment.artifact,
+        input: variables
+      }) ?? void 0
     });
   }
-  get({
-    field,
-    args
-  }) {
-    this.#cache.validateInstabilityWarning();
-    const key = computeKey({ field, args });
-    const typeInfo = (0, import_cache2._typeInfo)(this.#cache, this.type, field);
-    if (typeInfo.link) {
-      const keys = (0, import_config.keyFieldsForType)(this.#cache.config, typeInfo.type);
-      typeInfo.selection = {
-        fields: keys.reduce(
-          (acc, key2) => {
-            const keyInfo = (0, import_cache2._typeInfo)(this.#cache, typeInfo.type, key2);
-            return {
-              ...acc,
-              [key2]: {
-                type: keyInfo.type,
-                keyRaw: key2
-              }
-            };
-          },
-          {
-            __typename: {
-              type: "String",
-              keyRaw: "__typename"
-            }
-          }
-        )
-      };
-    }
-    const result = this.#cache._internal_unstable.read({
+  write(args) {
+    this.#cache._internal_unstable.write({
+      data: args.data,
+      selection: args.fragment.artifact.selection,
       parent: this.#id,
-      selection: {
-        fields: {
-          [field]: {
-            keyRaw: key,
-            ...typeInfo
-          }
-        }
-      }
+      variables: (0, import_lib.marshalInputs)({
+        config: this.#cache.config,
+        artifact: args.fragment.artifact,
+        input: args.variables
+      }) ?? void 0
     });
-    if (!typeInfo.link) {
-      return result.data?.[field] ?? (typeInfo.nullable ? null : void 0);
-    }
-    const data = result.data?.[field] || {};
-    let finalResult = unmarshalNestedList(
-      this.#cache,
-      !Array.isArray(data) ? [data] : data
-    ).map((val) => {
-      if (typeInfo.nullable && (val === null || Object.keys(val).length === 0)) {
-        return null;
-      }
-      return val;
-    });
-    return Array.isArray(data) ? finalResult : finalResult[0];
   }
   delete() {
     this.#cache._internal_unstable.delete(this.#id);
   }
 }
-function computeKey({ field, args }) {
-  const keys = Object.keys(args ?? {});
-  keys.sort();
-  return args && keys.length > 0 ? `${field}(${keys.map((key) => `${key}: ${stringifyObjectWithNoQuotesOnKeys(args[key])}`).join(", ")})` : field;
-}
-const stringifyObjectWithNoQuotesOnKeys = (obj_from_json) => {
-  if (Array.isArray(obj_from_json)) {
-    return `[${obj_from_json.map((obj) => `${stringifyObjectWithNoQuotesOnKeys(obj)}`).join(", ")}]`;
-  }
-  if (typeof obj_from_json !== "object" || obj_from_json instanceof Date || obj_from_json === null) {
-    return JSON.stringify(obj_from_json).replace(/"([^"]+)":/g, "$1: ");
-  }
-  return `{${Object.keys(obj_from_json).map((key) => `${key}: ${stringifyObjectWithNoQuotesOnKeys(obj_from_json[key])}`).join(", ")}}`;
-};
-function marshalNestedList(list) {
-  const newValue = [];
-  for (const inner of list) {
-    if (Array.isArray(inner)) {
-      newValue.push(marshalNestedList(inner));
-    } else if (inner instanceof Record) {
-      newValue.push({ ...inner.idFields, __typename: inner.type });
-    } else {
-      newValue.push(inner);
-    }
-  }
-  return newValue;
-}
-function unmarshalNestedList(cache, list) {
-  const newValue = [];
-  for (const inner of list) {
-    if (Array.isArray(inner)) {
-      newValue.push(unmarshalNestedList(cache, inner));
-    } else if (inner === null) {
-      newValue.push(null);
-    } else if (inner.__typename) {
-      const type = inner.__typename;
-      let recordID = cache._internal_unstable._internal_unstable.id(type, inner);
-      if (!recordID) {
-        throw new Error("todo");
-      }
-      const typename = cache._internal_unstable.read({
-        selection: {
-          fields: {
-            __typename: {
-              keyRaw: "__typename",
-              type: "String"
-            }
-          }
-        },
-        parent: recordID
-      }).data?.__typename;
-      newValue.push(
-        new Record({
-          cache,
-          type: type || typename,
-          idFields: inner,
-          id: recordID
-        })
-      );
-    } else {
-      newValue.push(inner);
-    }
-  }
-  return newValue;
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  Record,
-  computeKey,
-  marshalNestedList,
-  stringifyObjectWithNoQuotesOnKeys
+  Record
 });

package/build/runtime-cjs/public/tests/test.d.ts

@@ -1,9 +1,11 @@
+import { type SubscriptionSelection, type FragmentArtifact, type QueryArtifact } from '../../lib';
 import { Cache } from '../cache';
 import type { Record } from '../record';
 type CacheTypeDef = {
     types: {
         __ROOT__: {
             idFields: {};
+            fragments: [];
             fields: {
                 test: {
                     type: number | null;
@@ -39,6 +41,19 @@ type CacheTypeDef = {
             idFields: {
                 id: string;
             };
+            fragments: [
+                [
+                    {
+                        artifact: FragmentArtifact;
+                    },
+                    {
+                        firstName: string;
+                    },
+                    {
+                        pattern: string;
+                    }
+                ]
+            ];
             fields: {
                 firstName: {
                     type: string;
@@ -62,6 +77,7 @@ type CacheTypeDef = {
             idFields: {
                 id: string;
             };
+            fragments: [];
             fields: {
                 name: {
                     type: string | null;
@@ -85,6 +101,7 @@ type CacheTypeDef = {
             idFields: {
                 id: string;
             };
+            fragments: [];
             fields: {
                 name: {
                     type: string | null;
@@ -97,6 +114,26 @@ type CacheTypeDef = {
             };
         };
     };
+    queries: [
+        [
+            {
+                artifact: QueryArtifact;
+            },
+            {
+                viewer: {
+                    id: string;
+                    firstName: string;
+                    __typename: string;
+                    parent: {
+                        id: string;
+                        firstName: string;
+                        __typename: string;
+                    };
+                };
+            },
+            any
+        ]
+    ];
     lists: {
         All_Pets: {
             types: 'User' | 'Cat';
@@ -111,4 +148,10 @@ type CacheTypeDef = {
     };
 };
 export declare const testCache: () => Cache<CacheTypeDef>;
+export declare const testFragment: (selection: SubscriptionSelection) => {
+    artifact: FragmentArtifact;
+};
+export declare const testQuery: (selection: SubscriptionSelection) => {
+    artifact: QueryArtifact;
+};
 export {};

package/build/runtime-cjs/public/tests/test.js

@@ -18,14 +18,39 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var test_exports = {};
 __export(test_exports, {
-  testCache: () => testCache
+  testCache: () => testCache,
+  testFragment: () => testFragment,
+  testQuery: () => testQuery
 });
 module.exports = __toCommonJS(test_exports);
 var import_test = require("../../../test");
 var import_cache = require("../../cache/cache");
+var import_lib = require("../../lib");
 var import_cache2 = require("../cache");
 const testCache = () => new import_cache2.Cache(new import_cache.Cache((0, import_test.testConfigFile)()));
+const testFragment = (selection) => ({
+  artifact: {
+    kind: import_lib.ArtifactKind.Fragment,
+    hash: "",
+    raw: "",
+    name: "",
+    rootType: "User",
+    selection
+  }
+});
+const testQuery = (selection) => ({
+  artifact: {
+    kind: import_lib.ArtifactKind.Query,
+    hash: "",
+    raw: "",
+    name: "",
+    rootType: "Query",
+    selection
+  }
+});
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  testCache
+  testCache,
+  testFragment,
+  testQuery
 });

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

@@ -11,6 +11,7 @@ export type CacheTypeDef = {
                     type: any;
                 };
             };
+            fragments: [any, any, any][];
         };
     };
     lists: {
@@ -19,11 +20,14 @@ export type CacheTypeDef = {
             filters: any;
         };
     };
+    queries: [any, any, any][];
 };
 export type ValidTypes<Def extends CacheTypeDef> = keyof Def['types'];
 export type TypeFields<Def extends CacheTypeDef, Type extends keyof Def['types']> = Def['types'][Type]['fields'];
 export type TypeFieldNames<Def extends CacheTypeDef, Type extends keyof Def['types']> = Extract<keyof TypeFields<Def, Type>, string>;
 export type TypeNames<Def extends CacheTypeDef> = Extract<Exclude<ValidTypes<Def>, '__ROOT__'>, string>;
+export type FragmentList<Def extends CacheTypeDef, Type extends ValidTypes<Def>> = Def['types'][Type]['fragments'];
+export type QueryList<Def extends CacheTypeDef> = Def['queries'];
 export type IDFields<Def extends CacheTypeDef, Type extends keyof Def['types']> = Def['types'][Type]['idFields'];
 export type ProxyUnion<Def extends CacheTypeDef, U> = U extends null ? null : U extends TypeNames<Def> ? Record<Def, U> : never;
 export type FieldType<Def extends CacheTypeDef, Type extends keyof Def['types'], Field extends keyof TypeFields<Def, Type>> = TypeFields<Def, Type>[Field]['type'];
@@ -34,3 +38,7 @@ export type ListFilters<Def extends CacheTypeDef, ListName extends ValidLists<De
     must_not?: Def['lists'][ListName]['filters'];
 } : never;
 export type ListType<Def extends CacheTypeDef, Name extends ValidLists<Def>> = ProxyUnion<Def, Def['lists'][Name]['types']>;
+export type FragmentVariables<_List, _Target> = _List extends [infer Head, ...infer Rest] ? Head extends [infer _Key, infer _Value, infer _Input] ? _Key extends _Target ? _Input : FragmentValue<Rest, _Target> : 'Encountered unknown fragment. Please make sure your runtime is up to date (ie, `vite dev` or `vite build`).' : 'Encountered unknown fragment. Please make sure your runtime is up to date (ie, `vite dev` or `vite build`).';
+export type FragmentValue<List, _Target> = List extends [infer Head, ...infer Rest] ? Head extends [infer _Key, infer _Value, infer _Input] ? _Key extends _Target ? _Value : FragmentValue<Rest, _Target> : 'Encountered unknown fragment. Please make sure your runtime is up to date (ie, `vite dev` or `vite build`).' : 'Encountered unknown fragment. Please make sure your runtime is up to date (ie, `vite dev` or `vite build`).';
+export type QueryValue<List, _Target> = List extends [infer Head, ...infer Rest] ? Head extends [infer _Key, infer _Value, infer _Input] ? _Key extends _Target ? _Value : QueryValue<Rest, _Target> : 'Encountered unknown query.Please make sure your runtime is up to date (ie, `vite dev` or `vite build`).' : 'Encountered unknown query.Please make sure your runtime is up to date (ie, `vite dev` or `vite build`).';
+export type QueryInput<List, _Target> = List extends [infer Head, ...infer Rest] ? Head extends [infer _Key, infer _Value, infer _Input] ? _Key extends _Target ? _Input : QueryValue<Rest, _Target> : 'Encountered unknown query.Please make sure your runtime is up to date (ie, `vite dev` or `vite build`).' : 'Encountered unknown query.Please make sure your runtime is up to date (ie, `vite dev` or `vite build`).';

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.d.ts

@@ -55,6 +55,7 @@ export declare class List {
 export declare class ListCollection {
     lists: List[];
     constructor(lists: List[]);
+    get selection(): SubscriptionSelection;
     append(...args: Parameters<List['append']>): void;
     prepend(...args: Parameters<List['prepend']>): void;
     addToList(...args: Parameters<List['addToList']>): void;

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 = {}) {
@@ -325,6 +325,9 @@ class ListCollection {
   constructor(lists) {
     this.lists = lists;
   }
+  get selection() {
+    return this.lists[0].selection;
+  }
   append(...args) {
     this.lists.forEach((list) => list.append(...args));
   }

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

@@ -1,4 +1,5 @@
 export type CacheTypeDef = {
     types: {};
     lists: {};
+    queries: [];
 };

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

@@ -3,6 +3,6 @@ import type { CacheTypeDef } from './generated';
 import { Cache } from './public';
 export * from './client';
 export * from './lib';
-export declare function graphql(str: string | TemplateStringsArray): any;
+export declare function graphql<_Payload>(str: TemplateStringsArray): _Payload;
 export declare const cache: Cache<CacheTypeDef>;
 export declare function getCache(): InternalCache;