houdini 0.17.13 → 0.18.0

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

@@ -1,5 +1,6 @@
 import { defaultConfigValues, computeID, keyFieldsForType } from "../lib/config";
 import { deepEquals } from "../lib/deepEquals";
+import { getFieldsForType } from "../lib/selection";
 import { GarbageCollector } from "./gc";
 import { ListManager } from "./lists";
 import { InMemoryStorage } from "./storage";
@@ -134,8 +135,9 @@ class CacheInternal {
     if (this._disabled) {
       return [];
     }
+    let targetSelection = getFieldsForType(selection, data["__typename"]);
     for (const [field, value] of Object.entries(data)) {
-      if (!selection || !selection[field]) {
+      if (!selection || !targetSelection[field]) {
         throw new Error(
           "Could not find field listing in selection for " + field + " @ " + JSON.stringify(selection)
         );
@@ -143,11 +145,11 @@ class CacheInternal {
       let {
         type: linkedType,
         keyRaw,
-        fields,
+        selection: fieldSelection,
         operations,
         abstract: isAbstract,
         update
-      } = selection[field];
+      } = targetSelection[field];
       const key = evaluateKey(keyRaw, variables);
       const currentSubscribers = this.subscriptions.get(parent, key);
       const { value: previousValue, displayLayers } = this.storage.get(parent, key);
@@ -155,7 +157,7 @@ class CacheInternal {
       if (displayLayer) {
         this.lifetimes.resetLifetime(parent, key);
       }
-      if (!fields) {
+      if (!fieldSelection) {
         let newValue = value;
         if (Array.isArray(value) && applyUpdates && update) {
           if (update === "append") {
@@ -175,7 +177,7 @@ class CacheInternal {
         }
         const previousLinks = flattenList([previousValue]);
         for (const link of previousLinks) {
-          this.subscriptions.remove(link, fields, currentSubscribers, variables);
+          this.subscriptions.remove(link, fieldSelection, currentSubscribers, variables);
         }
         layer.writeLink(parent, key, null);
         toNotify.push(...currentSubscribers);
@@ -201,14 +203,14 @@ class CacheInternal {
           if (previousValue && typeof previousValue === "string") {
             this.subscriptions.remove(
               previousValue,
-              fields,
+              fieldSelection,
               currentSubscribers,
               variables
             );
           }
           this.subscriptions.addMany({
             parent: linkedID,
-            selection: fields,
+            selection: fieldSelection,
             subscribers: currentSubscribers,
             variables,
             parentType: linkedType
@@ -218,14 +220,14 @@ class CacheInternal {
         if (linkedID) {
           this.writeSelection({
             root,
-            selection: fields,
+            selection: fieldSelection,
             parent: linkedID,
             data: value,
             variables,
             toNotify,
             applyUpdates,
             layer,
-            forceNotify: true
+            forceNotify
           });
         }
       } else if (Array.isArray(value) && (typeof previousValue === "undefined" || Array.isArray(previousValue))) {
@@ -254,7 +256,7 @@ class CacheInternal {
           key,
           linkedType,
           variables,
-          fields,
+          fields: fieldSelection,
           layer,
           forceNotify
         });
@@ -304,7 +306,7 @@ class CacheInternal {
           if (linkedIDs.includes(lostID) || !lostID) {
             continue;
           }
-          this.subscriptions.remove(lostID, fields, currentSubscribers, variables);
+          this.subscriptions.remove(lostID, fieldSelection, currentSubscribers, variables);
         }
         if (contentChanged || oldIDs.length === 0 && newIDs.length === 0) {
           layer.writeLink(parent, key, linkedIDs);
@@ -315,7 +317,7 @@ class CacheInternal {
           }
           this.subscriptions.addMany({
             parent: id,
-            selection: fields,
+            selection: fieldSelection,
             subscribers: currentSubscribers,
             variables,
             parentType: linkedType
@@ -340,9 +342,14 @@ class CacheInternal {
         }
         const targets = Array.isArray(value) ? value : [value];
         for (const target of targets) {
-          if (operation.action === "insert" && target instanceof Object && fields && operation.list) {
-            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).addToList(fields, target, variables, operation.position || "last");
-          } else if (operation.action === "remove" && target instanceof Object && fields && operation.list) {
+          if (operation.action === "insert" && target instanceof Object && fieldSelection && operation.list) {
+            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).addToList(
+              fieldSelection,
+              target,
+              variables,
+              operation.position || "last"
+            );
+          } else if (operation.action === "remove" && target instanceof Object && fieldSelection && operation.list) {
             this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).remove(target, variables);
           } else if (operation.action === "delete" && operation.type) {
             if (typeof target !== "string") {
@@ -353,8 +360,13 @@ class CacheInternal {
               continue;
             }
             this.cache.delete(targetID);
-          } else if (operation.action === "toggle" && target instanceof Object && fields && operation.list) {
-            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).toggleElement(fields, target, variables, operation.position || "last");
+          } else if (operation.action === "toggle" && target instanceof Object && fieldSelection && operation.list) {
+            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).toggleElement(
+              fieldSelection,
+              target,
+              variables,
+              operation.position || "last"
+            );
           }
         }
       }
@@ -374,9 +386,12 @@ class CacheInternal {
     let hasData = false;
     let partial = false;
     let cascadeNull = false;
-    for (const [attributeName, { type, keyRaw, fields, nullable, list }] of Object.entries(
-      selection
-    )) {
+    const typename = this.storage.get(parent, "__typename").value;
+    let targetSelection = getFieldsForType(selection, typename);
+    for (const [
+      attributeName,
+      { type, keyRaw, selection: fieldSelection, nullable, list }
+    ] of Object.entries(targetSelection)) {
       const key = evaluateKey(keyRaw, variables);
       const { value } = this.storage.get(parent, key);
       let nextStep = stepsFromConnection;
@@ -399,7 +414,7 @@ class CacheInternal {
         if (typeof value !== "undefined") {
           hasData = true;
         }
-      } else if (!fields) {
+      } else if (!fieldSelection) {
         const fnUnmarshal = this.config?.scalars?.[type]?.unmarshal;
         if (fnUnmarshal) {
           target[attributeName] = fnUnmarshal(value);
@@ -409,7 +424,7 @@ class CacheInternal {
         hasData = true;
       } else if (Array.isArray(value)) {
         const listValue = this.hydrateNestedList({
-          fields,
+          fields: fieldSelection,
           variables,
           linkedList: value,
           stepsFromConnection: nextStep
@@ -424,7 +439,7 @@ class CacheInternal {
       } else {
         const objectFields = this.getSelection({
           parent: value,
-          selection: fields,
+          selection: fieldSelection,
           variables,
           stepsFromConnection: nextStep
         });

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

@@ -142,23 +142,32 @@ class List {
     let insertData = data;
     if (this.connection) {
       insertSelection = {
-        newEntry: {
-          keyRaw: this.key,
-          type: "Connection",
-          fields: {
-            edges: {
-              keyRaw: "edges",
-              type: "ConnectionEdge",
-              update: where === "first" ? "prepend" : "append",
+        fields: {
+          newEntry: {
+            keyRaw: this.key,
+            type: "Connection",
+            selection: {
               fields: {
-                node: {
-                  type: listType,
-                  keyRaw: "node",
-                  fields: {
-                    ...selection,
-                    __typename: {
-                      keyRaw: "__typename",
-                      type: "String"
+                edges: {
+                  keyRaw: "edges",
+                  type: "ConnectionEdge",
+                  update: where === "first" ? "prepend" : "append",
+                  selection: {
+                    fields: {
+                      node: {
+                        type: listType,
+                        keyRaw: "node",
+                        selection: {
+                          ...selection,
+                          fields: {
+                            ...selection.fields,
+                            __typename: {
+                              keyRaw: "__typename",
+                              type: "String"
+                            }
+                          }
+                        }
+                      }
                     }
                   }
                 }
@@ -174,15 +183,20 @@ class List {
       };
     } else {
       insertSelection = {
-        newEntries: {
-          keyRaw: this.key,
-          type: listType,
-          update: where === "first" ? "prepend" : "append",
-          fields: {
-            ...selection,
-            __typename: {
-              keyRaw: "__typename",
-              type: "String"
+        fields: {
+          newEntries: {
+            keyRaw: this.key,
+            type: listType,
+            update: where === "first" ? "prepend" : "append",
+            selection: {
+              ...selection,
+              fields: {
+                ...selection.fields,
+                __typename: {
+                  keyRaw: "__typename",
+                  type: "String"
+                }
+              }
             }
           }
         }
@@ -242,7 +256,7 @@ class List {
     const subscribers = this.cache._internal_unstable.subscriptions.get(this.recordID, this.key);
     this.cache._internal_unstable.subscriptions.remove(
       targetID,
-      this.connection ? this.selection.edges.fields : this.selection,
+      this.connection ? this.selection.fields.edges.selection : this.selection,
       subscribers,
       variables
     );

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

@@ -16,10 +16,10 @@ export declare class InMemorySubscriptions {
             [key: string]: GraphQLValue;
         };
     }): void;
-    addFieldSubscription({ id, key, selection, spec, parentType, variables, }: {
+    addFieldSubscription({ id, key, field, spec, parentType, variables, }: {
         id: string;
         key: string;
-        selection: SubscriptionSelection[string];
+        field: Required<SubscriptionSelection>['fields'][string];
         spec: SubscriptionSpec;
         parentType: string;
         variables: GraphQLObject;
@@ -32,7 +32,7 @@ export declare class InMemorySubscriptions {
         parentType: string;
     }): void;
     get(id: string, field: string): SubscriptionSpec[];
-    remove(id: string, fields: SubscriptionSelection, targets: SubscriptionSpec[], variables: {}, visited?: string[]): void;
+    remove(id: string, selection: SubscriptionSelection, targets: SubscriptionSpec[], variables: {}, visited?: string[]): void;
     private removeSubscribers;
     removeAllSubscribers(id: string, targets?: SubscriptionSpec[], visited?: string[]): void;
 }

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

@@ -1,3 +1,4 @@
+import { getFieldsForType } from "../lib/selection";
 import { evaluateKey, flattenList } from "./stuff";
 class InMemorySubscriptions {
   cache;
@@ -14,18 +15,20 @@ class InMemorySubscriptions {
     variables,
     parentType
   }) {
-    for (const fieldSelection of Object.values(selection)) {
-      const { keyRaw, fields, type } = fieldSelection;
+    const __typename = this.cache._internal_unstable.storage.get(parent, "__typename").value;
+    let targetSelection = getFieldsForType(selection, __typename);
+    for (const fieldSelection of Object.values(targetSelection || {})) {
+      const { keyRaw, selection: innerSelection, type } = fieldSelection;
       const key = evaluateKey(keyRaw, variables);
       this.addFieldSubscription({
         id: parent,
         key,
-        selection: fieldSelection,
+        field: fieldSelection,
         spec,
         parentType: parentType || spec.rootType,
         variables
       });
-      if (fields) {
+      if (innerSelection) {
         const { value: linkedRecord } = this.cache._internal_unstable.storage.get(
           parent,
           key
@@ -38,7 +41,7 @@ class InMemorySubscriptions {
           this.add({
             parent: child,
             spec,
-            selection: fields,
+            selection: innerSelection,
             variables,
             parentType: type
           });
@@ -49,7 +52,7 @@ class InMemorySubscriptions {
   addFieldSubscription({
     id,
     key,
-    selection,
+    field,
     spec,
     parentType,
     variables
@@ -76,8 +79,8 @@ class InMemorySubscriptions {
     const counts = this.referenceCounts[id][key];
     counts.set(spec.set, (counts.get(spec.set) || 0) + 1);
     this.cache._internal_unstable.lifetimes.resetLifetime(id, key);
-    const { fields, list, filters } = selection;
-    if (fields && list) {
+    const { selection, list, filters } = field;
+    if (selection && list) {
       this.cache._internal_unstable.lists.add({
         name: list.name,
         connection: list.connection,
@@ -85,7 +88,7 @@ class InMemorySubscriptions {
         recordType: this.cache._internal_unstable.storage.get(id, "__typename")?.value || parentType,
         listType: list.type,
         key,
-        selection: fields,
+        selection,
         filters: Object.entries(filters || {}).reduce((acc, [key2, { kind, value }]) => {
           return {
             ...acc,
@@ -102,20 +105,21 @@ class InMemorySubscriptions {
     subscribers,
     parentType
   }) {
-    for (const fieldSelection of Object.values(selection)) {
-      const { type: linkedType, keyRaw, fields } = fieldSelection;
+    let targetSelection = getFieldsForType(selection, parentType);
+    for (const fieldSelection of Object.values(targetSelection)) {
+      const { type: linkedType, keyRaw, selection: innerSelection } = fieldSelection;
       const key = evaluateKey(keyRaw, variables);
       for (const spec of subscribers) {
         this.addFieldSubscription({
           id: parent,
           key,
-          selection: fieldSelection,
+          field: fieldSelection,
           spec,
           parentType,
           variables
         });
       }
-      if (fields) {
+      if (innerSelection) {
         const { value: link } = this.cache._internal_unstable.storage.get(parent, key);
         const children = !Array.isArray(link) ? [link] : flattenList(link);
         for (const linkedRecord of children) {
@@ -124,7 +128,7 @@ class InMemorySubscriptions {
           }
           this.addMany({
             parent: linkedRecord,
-            selection: fields,
+            selection: innerSelection,
             variables,
             subscribers,
             parentType: linkedType
@@ -136,22 +140,20 @@ class InMemorySubscriptions {
   get(id, field) {
     return this.subscribers[id]?.[field] || [];
   }
-  remove(id, fields, targets, variables, visited = []) {
+  remove(id, selection, targets, variables, visited = []) {
     visited.push(id);
     const linkedIDs = [];
-    for (const selection of Object.values(fields)) {
-      const key = evaluateKey(selection.keyRaw, variables);
+    for (const fieldSelection of Object.values(selection.fields || {})) {
+      const key = evaluateKey(fieldSelection.keyRaw, variables);
       this.removeSubscribers(id, key, targets);
-      if (!selection.fields) {
+      if (!fieldSelection.selection?.fields) {
         continue;
       }
-      if (selection.list) {
-      }
       const { value: previousValue } = this.cache._internal_unstable.storage.get(id, key);
       const links = !Array.isArray(previousValue) ? [previousValue] : flattenList(previousValue);
       for (const link of links) {
         if (link !== null) {
-          linkedIDs.push([link, selection.fields]);
+          linkedIDs.push([link, fieldSelection.selection || {}]);
         }
       }
     }

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

@@ -87,8 +87,9 @@ export declare type ConfigFile = {
     logLevel?: string;
     /**
      * A flag to specify the default fragment masking behavior.
+     * @default `enable`
      */
-    disableMasking?: boolean;
+    defaultFragmentMasking?: 'enable' | 'disable';
     /**
      * Configures the houdini plugin's schema polling behavior. By default, houdini will poll your APIs
      * during development in order to keep it's definition of your schema up to date. The schemaPollingInterval

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

@@ -2,12 +2,12 @@ import { ConfigFile } from './config';
 import { MutationArtifact, QueryArtifact, SubscriptionArtifact, SubscriptionSelection } from './types';
 export declare function marshalSelection({ selection, data, }: {
     selection: SubscriptionSelection;
-    data: unknown;
+    data: any;
 }): Promise<{} | null | undefined>;
 export declare function marshalInputs<T>({ artifact, input, rootType, }: {
     artifact: QueryArtifact | MutationArtifact | SubscriptionArtifact;
     input: unknown;
     rootType?: string;
 }): Promise<{} | null | undefined>;
-export declare function unmarshalSelection(config: ConfigFile, selection: SubscriptionSelection, data: unknown): {} | null | undefined;
+export declare function unmarshalSelection(config: ConfigFile, selection: SubscriptionSelection, data: any): {} | null | undefined;
 export declare function isScalar(config: ConfigFile, type: string): boolean;

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

@@ -1,4 +1,5 @@
 import { getCurrentConfig } from "./config";
+import { getFieldsForType } from "./selection";
 async function marshalSelection({
   selection,
   data
@@ -10,15 +11,16 @@ async function marshalSelection({
   if (Array.isArray(data)) {
     return await Promise.all(data.map((val) => marshalSelection({ selection, data: val })));
   }
+  const targetSelection = getFieldsForType(selection, data["__typename"]);
   return Object.fromEntries(
     await Promise.all(
       Object.entries(data).map(async ([fieldName, value]) => {
-        const { type, fields } = selection[fieldName];
+        const { type, selection: selection2 } = targetSelection[fieldName];
         if (!type) {
           return [fieldName, value];
         }
-        if (fields) {
-          return [fieldName, await marshalSelection({ selection: fields, data: value })];
+        if (selection2) {
+          return [fieldName, await marshalSelection({ selection: selection2, data: value })];
         }
         if (config.scalars?.[type]) {
           const marshalFn = config.scalars[type].marshal;
@@ -84,16 +86,17 @@ function unmarshalSelection(config, selection, data) {
   if (Array.isArray(data)) {
     return data.map((val) => unmarshalSelection(config, selection, val));
   }
+  const targetSelection = getFieldsForType(selection, data["__typename"]);
   return Object.fromEntries(
     Object.entries(data).map(([fieldName, value]) => {
-      const { type, fields } = selection[fieldName];
+      const { type, selection: selection2 } = targetSelection[fieldName];
       if (!type) {
         return [fieldName, value];
       }
-      if (fields) {
+      if (selection2) {
         return [
           fieldName,
-          unmarshalSelection(config, fields, value)
+          unmarshalSelection(config, selection2, value)
         ];
       }
       if (value === null) {

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

@@ -0,0 +1,2 @@
+import { SubscriptionSelection } from './types';
+export declare function getFieldsForType(selection: SubscriptionSelection, __typename: string | undefined | null): Required<SubscriptionSelection>['fields'];

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

@@ -0,0 +1,15 @@
+function getFieldsForType(selection, __typename) {
+  let targetSelection = selection.fields || {};
+  if (selection.abstractFields && __typename) {
+    const mappedType = selection.abstractFields.typeMap[__typename];
+    if (mappedType) {
+      targetSelection = selection.abstractFields.fields[mappedType];
+    } else if (selection.abstractFields.fields[__typename]) {
+      targetSelection = selection.abstractFields.fields[__typename];
+    }
+  }
+  return targetSelection;
+}
+export {
+  getFieldsForType
+};

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

@@ -107,25 +107,35 @@ export declare type GraphQLObject = {
 };
 export declare type GraphQLValue = number | string | boolean | null | GraphQLObject | GraphQLValue[] | undefined;
 export declare type SubscriptionSelection = {
-    [field: string]: {
-        type: string;
-        nullable?: boolean;
-        keyRaw: string;
-        operations?: MutationOperation[];
-        list?: {
-            name: string;
-            connection: boolean;
+    fields?: {
+        [fieldName: string]: {
             type: string;
-        };
-        update?: RefetchUpdateMode;
-        filters?: {
-            [key: string]: {
-                kind: 'Boolean' | 'String' | 'Float' | 'Int' | 'Variable';
-                value: string | number | boolean;
+            nullable?: boolean;
+            keyRaw: string;
+            operations?: MutationOperation[];
+            list?: {
+                name: string;
+                connection: boolean;
+                type: string;
+            };
+            update?: RefetchUpdateMode;
+            filters?: {
+                [key: string]: {
+                    kind: 'Boolean' | 'String' | 'Float' | 'Int' | 'Variable';
+                    value: string | number | boolean;
+                };
             };
+            selection?: SubscriptionSelection;
+            abstract?: boolean;
+        };
+    };
+    abstractFields?: {
+        fields: {
+            [typeName: string]: SubscriptionSelection['fields'];
+        };
+        typeMap: {
+            [typeName: string]: string;
         };
-        fields?: SubscriptionSelection;
-        abstract?: boolean;
     };
 };
 export declare type SubscriptionSpec = {

package/build/test/index.d.ts

@@ -2,10 +2,9 @@ import { Config, CollectedGraphQLDocument } from '../lib';
 import { ConfigFile } from '../runtime/lib/config';
 export declare function testConfigFile(config?: Partial<ConfigFile>): ConfigFile;
 export declare function testConfig(config?: Partial<ConfigFile>): Config;
-declare type Partial<T> = {
+export declare type Partial<T> = {
     [P in keyof T]?: T[P];
 };
 export declare function pipelineTest(config: Config, documents: string[], shouldPass: boolean, testBody?: ((result: Error | Error[]) => void) | ((docs: CollectedGraphQLDocument[]) => void)): () => Promise<void>;
 export declare function mockCollectedDoc(query: string): CollectedGraphQLDocument;
 export declare function clearMock(): void;
-export {};