@apollo/client 3.9.0-alpha.5 → 3.9.0-beta.0

package/link/remove-typename/remove-typename.cjs

@@ -6,11 +6,12 @@ var optimism = require('optimism');
 var graphql = require('graphql');
 var core = require('../core');
 var utilities = require('../../utilities');
+var caches = require('@wry/caches');
 
 var KEEP = "__KEEP";
 function removeTypenameFromVariables(options) {
     if (options === void 0) { options = Object.create(null); }
-    return new core.ApolloLink(function (operation, forward) {
+    return Object.assign(new core.ApolloLink(function (operation, forward) {
         var except = options.except;
         var query = operation.query, variables = operation.variables;
         if (variables) {
@@ -20,7 +21,18 @@ function removeTypenameFromVariables(options) {
                     : utilities.stripTypename(variables);
         }
         return forward(operation);
-    });
+    }), globalThis.__DEV__ !== false ?
+        {
+            getMemoryInternals: function () {
+                var _a;
+                return {
+                    removeTypenameFromVariables: {
+                        getVariableDefinitions: (_a = getVariableDefinitions === null || getVariableDefinitions === void 0 ? void 0 : getVariableDefinitions.size) !== null && _a !== void 0 ? _a : 0,
+                    },
+                };
+            },
+        }
+        : {});
 }
 function maybeStripTypenameUsingConfig(query, variables, config) {
     var variableDefinitions = getVariableDefinitions(query);
@@ -67,6 +79,10 @@ var getVariableDefinitions = optimism.wrap(function (document) {
         },
     });
     return definitions;
+}, {
+    max: utilities.cacheSizes["removeTypenameFromVariables.getVariableDefinitions"] ||
+        2000 ,
+    cache: caches.WeakCache,
 });
 function unwrapType(node) {
     switch (node.kind) {

package/link/remove-typename/remove-typename.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"remove-typename.cjs","sources":["removeTypenameFromVariables.js"],"sourcesContent":["import { wrap } from \"optimism\";\nimport { Kind, visit } from \"graphql\";\nimport { ApolloLink } from \"../core/index.js\";\nimport { stripTypename, isPlainObject } from \"../../utilities/index.js\";\nexport var KEEP = \"__KEEP\";\nexport function removeTypenameFromVariables(options) {\n    if (options === void 0) { options = Object.create(null); }\n    return new ApolloLink(function (operation, forward) {\n        var except = options.except;\n        var query = operation.query, variables = operation.variables;\n        if (variables) {\n            operation.variables =\n                except ?\n                    maybeStripTypenameUsingConfig(query, variables, except)\n                    : stripTypename(variables);\n        }\n        return forward(operation);\n    });\n}\nfunction maybeStripTypenameUsingConfig(query, variables, config) {\n    var variableDefinitions = getVariableDefinitions(query);\n    return Object.fromEntries(Object.entries(variables).map(function (keyVal) {\n        var key = keyVal[0], value = keyVal[1];\n        var typename = variableDefinitions[key];\n        var typenameConfig = config[typename];\n        keyVal[1] =\n            typenameConfig ?\n                maybeStripTypename(value, typenameConfig)\n                : stripTypename(value);\n        return keyVal;\n    }));\n}\nfunction maybeStripTypename(value, config) {\n    if (config === KEEP) {\n        return value;\n    }\n    if (Array.isArray(value)) {\n        return value.map(function (item) { return maybeStripTypename(item, config); });\n    }\n    if (isPlainObject(value)) {\n        var modified_1 = {};\n        Object.keys(value).forEach(function (key) {\n            var child = value[key];\n            if (key === \"__typename\") {\n                return;\n            }\n            var fieldConfig = config[key];\n            modified_1[key] =\n                fieldConfig ?\n                    maybeStripTypename(child, fieldConfig)\n                    : stripTypename(child);\n        });\n        return modified_1;\n    }\n    return value;\n}\nvar getVariableDefinitions = wrap(function (document) {\n    var definitions = {};\n    visit(document, {\n        VariableDefinition: function (node) {\n            definitions[node.variable.name.value] = unwrapType(node.type);\n        },\n    });\n    return definitions;\n});\nfunction unwrapType(node) {\n    switch (node.kind) {\n        case Kind.NON_NULL_TYPE:\n            return unwrapType(node.type);\n        case Kind.LIST_TYPE:\n            return unwrapType(node.type);\n        case Kind.NAMED_TYPE:\n            return node.name.value;\n    }\n}\n//# sourceMappingURL=removeTypenameFromVariables.js.map"],"names":["ApolloLink","stripTypename","isPlainObject","wrap","visit","Kind"],"mappings":"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"}
+{"version":3,"file":"remove-typename.cjs","sources":["removeTypenameFromVariables.js"],"sourcesContent":["import { wrap } from \"optimism\";\nimport { Kind, visit } from \"graphql\";\nimport { ApolloLink } from \"../core/index.js\";\nimport { stripTypename, isPlainObject, cacheSizes, } from \"../../utilities/index.js\";\nimport { WeakCache } from \"@wry/caches\";\nexport var KEEP = \"__KEEP\";\nexport function removeTypenameFromVariables(options) {\n    if (options === void 0) { options = Object.create(null); }\n    return Object.assign(new ApolloLink(function (operation, forward) {\n        var except = options.except;\n        var query = operation.query, variables = operation.variables;\n        if (variables) {\n            operation.variables =\n                except ?\n                    maybeStripTypenameUsingConfig(query, variables, except)\n                    : stripTypename(variables);\n        }\n        return forward(operation);\n    }), globalThis.__DEV__ !== false ?\n        {\n            getMemoryInternals: function () {\n                var _a;\n                return {\n                    removeTypenameFromVariables: {\n                        getVariableDefinitions: (_a = getVariableDefinitions === null || getVariableDefinitions === void 0 ? void 0 : getVariableDefinitions.size) !== null && _a !== void 0 ? _a : 0,\n                    },\n                };\n            },\n        }\n        : {});\n}\nfunction maybeStripTypenameUsingConfig(query, variables, config) {\n    var variableDefinitions = getVariableDefinitions(query);\n    return Object.fromEntries(Object.entries(variables).map(function (keyVal) {\n        var key = keyVal[0], value = keyVal[1];\n        var typename = variableDefinitions[key];\n        var typenameConfig = config[typename];\n        keyVal[1] =\n            typenameConfig ?\n                maybeStripTypename(value, typenameConfig)\n                : stripTypename(value);\n        return keyVal;\n    }));\n}\nfunction maybeStripTypename(value, config) {\n    if (config === KEEP) {\n        return value;\n    }\n    if (Array.isArray(value)) {\n        return value.map(function (item) { return maybeStripTypename(item, config); });\n    }\n    if (isPlainObject(value)) {\n        var modified_1 = {};\n        Object.keys(value).forEach(function (key) {\n            var child = value[key];\n            if (key === \"__typename\") {\n                return;\n            }\n            var fieldConfig = config[key];\n            modified_1[key] =\n                fieldConfig ?\n                    maybeStripTypename(child, fieldConfig)\n                    : stripTypename(child);\n        });\n        return modified_1;\n    }\n    return value;\n}\nvar getVariableDefinitions = wrap(function (document) {\n    var definitions = {};\n    visit(document, {\n        VariableDefinition: function (node) {\n            definitions[node.variable.name.value] = unwrapType(node.type);\n        },\n    });\n    return definitions;\n}, {\n    max: cacheSizes[\"removeTypenameFromVariables.getVariableDefinitions\"] ||\n        2000 /* defaultCacheSizes[\"removeTypenameFromVariables.getVariableDefinitions\"] */,\n    cache: WeakCache,\n});\nfunction unwrapType(node) {\n    switch (node.kind) {\n        case Kind.NON_NULL_TYPE:\n            return unwrapType(node.type);\n        case Kind.LIST_TYPE:\n            return unwrapType(node.type);\n        case Kind.NAMED_TYPE:\n            return node.name.value;\n    }\n}\n//# sourceMappingURL=removeTypenameFromVariables.js.map"],"names":["ApolloLink","stripTypename","isPlainObject","wrap","visit","cacheSizes","WeakCache","Kind"],"mappings":"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"}

package/link/remove-typename/remove-typename.cjs.native.js

@@ -6,11 +6,12 @@ var optimism = require('optimism');
 var graphql = require('graphql');
 var core = require('../core');
 var utilities = require('../../utilities');
+var caches = require('@wry/caches');
 
 var KEEP = "__KEEP";
 function removeTypenameFromVariables(options) {
     if (options === void 0) { options = Object.create(null); }
-    return new core.ApolloLink(function (operation, forward) {
+    return Object.assign(new core.ApolloLink(function (operation, forward) {
         var except = options.except;
         var query = operation.query, variables = operation.variables;
         if (variables) {
@@ -20,7 +21,18 @@ function removeTypenameFromVariables(options) {
                     : utilities.stripTypename(variables);
         }
         return forward(operation);
-    });
+    }), globalThis.__DEV__ !== false ?
+        {
+            getMemoryInternals: function () {
+                var _a;
+                return {
+                    removeTypenameFromVariables: {
+                        getVariableDefinitions: (_a = getVariableDefinitions === null || getVariableDefinitions === void 0 ? void 0 : getVariableDefinitions.size) !== null && _a !== void 0 ? _a : 0,
+                    },
+                };
+            },
+        }
+        : {});
 }
 function maybeStripTypenameUsingConfig(query, variables, config) {
     var variableDefinitions = getVariableDefinitions(query);
@@ -67,6 +79,10 @@ var getVariableDefinitions = optimism.wrap(function (document) {
         },
     });
     return definitions;
+}, {
+    max: utilities.cacheSizes["removeTypenameFromVariables.getVariableDefinitions"] ||
+        2000 ,
+    cache: caches.WeakCache,
 });
 function unwrapType(node) {
     switch (node.kind) {

package/link/remove-typename/removeTypenameFromVariables.d.ts

@@ -6,6 +6,14 @@ interface KeepTypenameConfig {
 export interface RemoveTypenameFromVariablesOptions {
     except?: KeepTypenameConfig;
 }
-export declare function removeTypenameFromVariables(options?: RemoveTypenameFromVariablesOptions): ApolloLink;
+export declare function removeTypenameFromVariables(options?: RemoveTypenameFromVariablesOptions): ApolloLink & ({
+    getMemoryInternals(): {
+        removeTypenameFromVariables: {
+            getVariableDefinitions: number;
+        };
+    };
+} | {
+    getMemoryInternals?: undefined;
+});
 export {};
 //# sourceMappingURL=removeTypenameFromVariables.d.ts.map

package/link/remove-typename/removeTypenameFromVariables.js

@@ -1,11 +1,12 @@
 import { wrap } from "optimism";
 import { Kind, visit } from "graphql";
 import { ApolloLink } from "../core/index.js";
-import { stripTypename, isPlainObject } from "../../utilities/index.js";
+import { stripTypename, isPlainObject, cacheSizes, } from "../../utilities/index.js";
+import { WeakCache } from "@wry/caches";
 export var KEEP = "__KEEP";
 export function removeTypenameFromVariables(options) {
     if (options === void 0) { options = Object.create(null); }
-    return new ApolloLink(function (operation, forward) {
+    return Object.assign(new ApolloLink(function (operation, forward) {
         var except = options.except;
         var query = operation.query, variables = operation.variables;
         if (variables) {
@@ -15,7 +16,18 @@ export function removeTypenameFromVariables(options) {
                     : stripTypename(variables);
         }
         return forward(operation);
-    });
+    }), globalThis.__DEV__ !== false ?
+        {
+            getMemoryInternals: function () {
+                var _a;
+                return {
+                    removeTypenameFromVariables: {
+                        getVariableDefinitions: (_a = getVariableDefinitions === null || getVariableDefinitions === void 0 ? void 0 : getVariableDefinitions.size) !== null && _a !== void 0 ? _a : 0,
+                    },
+                };
+            },
+        }
+        : {});
 }
 function maybeStripTypenameUsingConfig(query, variables, config) {
     var variableDefinitions = getVariableDefinitions(query);
@@ -62,6 +74,10 @@ var getVariableDefinitions = wrap(function (document) {
         },
     });
     return definitions;
+}, {
+    max: cacheSizes["removeTypenameFromVariables.getVariableDefinitions"] ||
+        2000 /* defaultCacheSizes["removeTypenameFromVariables.getVariableDefinitions"] */,
+    cache: WeakCache,
 });
 function unwrapType(node) {
     switch (node.kind) {

package/link/remove-typename/removeTypenameFromVariables.js.map

@@ -1 +1 @@
-{"version":3,"file":"removeTypenameFromVariables.js","sourceRoot":"","sources":["../../../src/link/remove-typename/removeTypenameFromVariables.ts"],"names":[],"mappings":"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","sourcesContent":["import { wrap } from \"optimism\";\nimport type { DocumentNode, TypeNode } from \"graphql\";\nimport { Kind, visit } from \"graphql\";\nimport { ApolloLink } from \"../core/index.js\";\nimport { stripTypename, isPlainObject } from \"../../utilities/index.js\";\nimport type { OperationVariables } from \"../../core/index.js\";\n\nexport const KEEP = \"__KEEP\";\n\ninterface KeepTypenameConfig {\n  [key: string]: typeof KEEP | KeepTypenameConfig;\n}\n\nexport interface RemoveTypenameFromVariablesOptions {\n  except?: KeepTypenameConfig;\n}\n\nexport function removeTypenameFromVariables(\n  options: RemoveTypenameFromVariablesOptions = Object.create(null)\n) {\n  return new ApolloLink((operation, forward) => {\n    const { except } = options;\n    const { query, variables } = operation;\n\n    if (variables) {\n      operation.variables =\n        except ?\n          maybeStripTypenameUsingConfig(query, variables, except)\n        : stripTypename(variables);\n    }\n\n    return forward(operation);\n  });\n}\n\nfunction maybeStripTypenameUsingConfig(\n  query: DocumentNode,\n  variables: OperationVariables,\n  config: KeepTypenameConfig\n) {\n  const variableDefinitions = getVariableDefinitions(query);\n\n  return Object.fromEntries(\n    Object.entries(variables).map((keyVal) => {\n      const [key, value] = keyVal;\n      const typename = variableDefinitions[key];\n      const typenameConfig = config[typename];\n\n      keyVal[1] =\n        typenameConfig ?\n          maybeStripTypename(value, typenameConfig)\n        : stripTypename(value);\n\n      return keyVal;\n    })\n  );\n}\n\ntype JSONPrimitive = string | number | null | boolean;\ntype JSONValue = JSONPrimitive | JSONValue[] | { [key: string]: JSONValue };\n\nfunction maybeStripTypename(\n  value: JSONValue,\n  config: KeepTypenameConfig[string]\n): JSONValue {\n  if (config === KEEP) {\n    return value;\n  }\n\n  if (Array.isArray(value)) {\n    return value.map((item) => maybeStripTypename(item, config));\n  }\n\n  if (isPlainObject(value)) {\n    const modified: Record<string, any> = {};\n\n    Object.keys(value).forEach((key) => {\n      const child = value[key];\n\n      if (key === \"__typename\") {\n        return;\n      }\n\n      const fieldConfig = config[key];\n\n      modified[key] =\n        fieldConfig ?\n          maybeStripTypename(child, fieldConfig)\n        : stripTypename(child);\n    });\n\n    return modified;\n  }\n\n  return value;\n}\n\nconst getVariableDefinitions = wrap((document: DocumentNode) => {\n  const definitions: Record<string, string> = {};\n\n  visit(document, {\n    VariableDefinition(node) {\n      definitions[node.variable.name.value] = unwrapType(node.type);\n    },\n  });\n\n  return definitions;\n});\n\nfunction unwrapType(node: TypeNode): string {\n  switch (node.kind) {\n    case Kind.NON_NULL_TYPE:\n      return unwrapType(node.type);\n    case Kind.LIST_TYPE:\n      return unwrapType(node.type);\n    case Kind.NAMED_TYPE:\n      return node.name.value;\n  }\n}\n"]}
+{"version":3,"file":"removeTypenameFromVariables.js","sourceRoot":"","sources":["../../../src/link/remove-typename/removeTypenameFromVariables.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAEhC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EACL,aAAa,EACb,aAAa,EACb,UAAU,GAEX,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,CAAC,IAAM,IAAI,GAAG,QAAQ,CAAC;AAU7B,MAAM,UAAU,2BAA2B,CACzC,OAAiE;IAAjE,wBAAA,EAAA,UAA8C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;IAEjE,OAAO,MAAM,CAAC,MAAM,CAClB,IAAI,UAAU,CAAC,UAAC,SAAS,EAAE,OAAO;QACxB,IAAA,MAAM,GAAK,OAAO,OAAZ,CAAa;QACnB,IAAA,KAAK,GAAgB,SAAS,MAAzB,EAAE,SAAS,GAAK,SAAS,UAAd,CAAe;QAEvC,IAAI,SAAS,EAAE,CAAC;YACd,SAAS,CAAC,SAAS;gBACjB,MAAM,CAAC,CAAC;oBACN,6BAA6B,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC;oBACzD,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAC/B,CAAC;QAED,OAAO,OAAO,CAAC,SAAS,CAAC,CAAC;IAC5B,CAAC,CAAC,EACF,OAAO,CAAC,CAAC;QACP;YACE,kBAAkB;;gBAChB,OAAO;oBACL,2BAA2B,EAAE;wBAC3B,sBAAsB,EAAE,MAAA,sBAAsB,aAAtB,sBAAsB,uBAAtB,sBAAsB,CAAE,IAAI,mCAAI,CAAC;qBAC1D;iBACF,CAAC;YACJ,CAAC;SACF;QACH,CAAC,CAAC,EAAE,CACL,CAAC;AACJ,CAAC;AAED,SAAS,6BAA6B,CACpC,KAAmB,EACnB,SAA6B,EAC7B,MAA0B;IAE1B,IAAM,mBAAmB,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAE1D,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,UAAC,MAAM;QAC5B,IAAA,GAAG,GAAW,MAAM,GAAjB,EAAE,KAAK,GAAI,MAAM,GAAV,CAAW;QAC5B,IAAM,QAAQ,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;QAC1C,IAAM,cAAc,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;QAExC,MAAM,CAAC,CAAC,CAAC;YACP,cAAc,CAAC,CAAC;gBACd,kBAAkB,CAAC,KAAK,EAAE,cAAc,CAAC;gBAC3C,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAEzB,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CACH,CAAC;AACJ,CAAC;AAKD,SAAS,kBAAkB,CACzB,KAAgB,EAChB,MAAkC;IAElC,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QACpB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC,GAAG,CAAC,UAAC,IAAI,IAAK,OAAA,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,EAAhC,CAAgC,CAAC,CAAC;IAC/D,CAAC;IAED,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,IAAM,UAAQ,GAAwB,EAAE,CAAC;QAEzC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,UAAC,GAAG;YAC7B,IAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;YAEzB,IAAI,GAAG,KAAK,YAAY,EAAE,CAAC;gBACzB,OAAO;YACT,CAAC;YAED,IAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YAEhC,UAAQ,CAAC,GAAG,CAAC;gBACX,WAAW,CAAC,CAAC;oBACX,kBAAkB,CAAC,KAAK,EAAE,WAAW,CAAC;oBACxC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;QAEH,OAAO,UAAQ,CAAC;IAClB,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,IAAM,sBAAsB,GAAG,IAAI,CACjC,UAAC,QAAsB;IACrB,IAAM,WAAW,GAA2B,EAAE,CAAC;IAE/C,KAAK,CAAC,QAAQ,EAAE;QACd,kBAAkB,YAAC,IAAI;YACrB,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChE,CAAC;KACF,CAAC,CAAC;IAEH,OAAO,WAAW,CAAC;AACrB,CAAC,EACD;IACE,GAAG,EACD,UAAU,CAAC,oDAAoD,CAAC;0FACO;IACzE,KAAK,EAAE,SAAS;CACjB,CACF,CAAC;AAEF,SAAS,UAAU,CAAC,IAAc;IAChC,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,IAAI,CAAC,aAAa;YACrB,OAAO,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/B,KAAK,IAAI,CAAC,SAAS;YACjB,OAAO,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/B,KAAK,IAAI,CAAC,UAAU;YAClB,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;IAC3B,CAAC;AACH,CAAC","sourcesContent":["import { wrap } from \"optimism\";\nimport type { DocumentNode, TypeNode } from \"graphql\";\nimport { Kind, visit } from \"graphql\";\nimport { ApolloLink } from \"../core/index.js\";\nimport {\n  stripTypename,\n  isPlainObject,\n  cacheSizes,\n  defaultCacheSizes,\n} from \"../../utilities/index.js\";\nimport type { OperationVariables } from \"../../core/index.js\";\nimport { WeakCache } from \"@wry/caches\";\n\nexport const KEEP = \"__KEEP\";\n\ninterface KeepTypenameConfig {\n  [key: string]: typeof KEEP | KeepTypenameConfig;\n}\n\nexport interface RemoveTypenameFromVariablesOptions {\n  except?: KeepTypenameConfig;\n}\n\nexport function removeTypenameFromVariables(\n  options: RemoveTypenameFromVariablesOptions = Object.create(null)\n) {\n  return Object.assign(\n    new ApolloLink((operation, forward) => {\n      const { except } = options;\n      const { query, variables } = operation;\n\n      if (variables) {\n        operation.variables =\n          except ?\n            maybeStripTypenameUsingConfig(query, variables, except)\n          : stripTypename(variables);\n      }\n\n      return forward(operation);\n    }),\n    __DEV__ ?\n      {\n        getMemoryInternals() {\n          return {\n            removeTypenameFromVariables: {\n              getVariableDefinitions: getVariableDefinitions?.size ?? 0,\n            },\n          };\n        },\n      }\n    : {}\n  );\n}\n\nfunction maybeStripTypenameUsingConfig(\n  query: DocumentNode,\n  variables: OperationVariables,\n  config: KeepTypenameConfig\n) {\n  const variableDefinitions = getVariableDefinitions(query);\n\n  return Object.fromEntries(\n    Object.entries(variables).map((keyVal) => {\n      const [key, value] = keyVal;\n      const typename = variableDefinitions[key];\n      const typenameConfig = config[typename];\n\n      keyVal[1] =\n        typenameConfig ?\n          maybeStripTypename(value, typenameConfig)\n        : stripTypename(value);\n\n      return keyVal;\n    })\n  );\n}\n\ntype JSONPrimitive = string | number | null | boolean;\ntype JSONValue = JSONPrimitive | JSONValue[] | { [key: string]: JSONValue };\n\nfunction maybeStripTypename(\n  value: JSONValue,\n  config: KeepTypenameConfig[string]\n): JSONValue {\n  if (config === KEEP) {\n    return value;\n  }\n\n  if (Array.isArray(value)) {\n    return value.map((item) => maybeStripTypename(item, config));\n  }\n\n  if (isPlainObject(value)) {\n    const modified: Record<string, any> = {};\n\n    Object.keys(value).forEach((key) => {\n      const child = value[key];\n\n      if (key === \"__typename\") {\n        return;\n      }\n\n      const fieldConfig = config[key];\n\n      modified[key] =\n        fieldConfig ?\n          maybeStripTypename(child, fieldConfig)\n        : stripTypename(child);\n    });\n\n    return modified;\n  }\n\n  return value;\n}\n\nconst getVariableDefinitions = wrap(\n  (document: DocumentNode) => {\n    const definitions: Record<string, string> = {};\n\n    visit(document, {\n      VariableDefinition(node) {\n        definitions[node.variable.name.value] = unwrapType(node.type);\n      },\n    });\n\n    return definitions;\n  },\n  {\n    max:\n      cacheSizes[\"removeTypenameFromVariables.getVariableDefinitions\"] ||\n      defaultCacheSizes[\"removeTypenameFromVariables.getVariableDefinitions\"],\n    cache: WeakCache,\n  }\n);\n\nfunction unwrapType(node: TypeNode): string {\n  switch (node.kind) {\n    case Kind.NON_NULL_TYPE:\n      return unwrapType(node.type);\n    case Kind.LIST_TYPE:\n      return unwrapType(node.type);\n    case Kind.NAMED_TYPE:\n      return node.name.value;\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apollo/client",
-  "version": "3.9.0-alpha.5",
+  "version": "3.9.0-beta.0",
   "description": "A fully-featured caching GraphQL client.",
   "private": false,
   "keywords": [
@@ -67,15 +67,15 @@
     "zen-observable-ts": "^1.2.5"
   },
   "devDependencies": {
-    "@arethetypeswrong/cli": "0.13.2",
+    "@arethetypeswrong/cli": "0.13.3",
     "@babel/parser": "7.23.5",
-    "@changesets/changelog-github": "0.4.8",
-    "@changesets/cli": "2.26.2",
+    "@changesets/changelog-github": "0.5.0",
+    "@changesets/cli": "2.27.1",
     "@graphql-tools/schema": "10.0.2",
-    "@microsoft/api-extractor": "7.38.3",
+    "@microsoft/api-extractor": "7.38.5",
     "@rollup/plugin-node-resolve": "11.2.1",
-    "@size-limit/esbuild-why": "11.0.0",
-    "@size-limit/preset-small-lib": "11.0.0",
+    "@size-limit/esbuild-why": "11.0.1",
+    "@size-limit/preset-small-lib": "11.0.1",
     "@testing-library/jest-dom": "6.1.5",
     "@testing-library/react": "14.1.2",
     "@testing-library/react-12": "npm:@testing-library/react@^12",
@@ -85,24 +85,24 @@
     "@types/fetch-mock": "7.3.8",
     "@types/glob": "8.1.0",
     "@types/hoist-non-react-statics": "3.3.5",
-    "@types/jest": "29.5.10",
+    "@types/jest": "29.5.11",
     "@types/lodash": "4.14.202",
-    "@types/node": "20.10.3",
+    "@types/node": "20.10.4",
     "@types/node-fetch": "2.6.9",
-    "@types/react": "18.2.41",
+    "@types/react": "18.2.43",
     "@types/react-dom": "18.2.17",
     "@types/relay-runtime": "14.1.14",
     "@types/use-sync-external-store": "0.0.6",
-    "@typescript-eslint/eslint-plugin": "6.12.0",
-    "@typescript-eslint/parser": "6.12.0",
-    "@typescript-eslint/rule-tester": "6.12.0",
-    "@typescript-eslint/types": "6.12.0",
-    "@typescript-eslint/utils": "6.12.0",
+    "@typescript-eslint/eslint-plugin": "6.14.0",
+    "@typescript-eslint/parser": "6.14.0",
+    "@typescript-eslint/rule-tester": "6.14.0",
+    "@typescript-eslint/types": "6.14.0",
+    "@typescript-eslint/utils": "6.14.0",
     "acorn": "8.11.2",
     "blob-polyfill": "7.0.20220408",
     "bytes": "3.1.2",
     "cross-fetch": "4.0.0",
-    "eslint": "8.54.0",
+    "eslint": "8.56.0",
     "eslint-import-resolver-typescript": "3.6.1",
     "eslint-plugin-import": "npm:@phryneas/eslint-plugin-import@2.27.5-pr.2813.2817.199971c",
     "eslint-plugin-local-rules": "2.0.1",
@@ -117,7 +117,7 @@
     "jest-junit": "16.0.0",
     "lodash": "4.17.21",
     "patch-package": "8.0.0",
-    "prettier": "3.1.0",
+    "prettier": "3.1.1",
     "react": "18.2.0",
     "react-17": "npm:react@^17",
     "react-dom": "18.2.0",
@@ -130,16 +130,16 @@
     "rollup-plugin-cleanup": "3.2.1",
     "rollup-plugin-terser": "7.0.2",
     "rxjs": "7.8.1",
-    "size-limit": "11.0.0",
+    "size-limit": "11.0.1",
     "subscriptions-transport-ws": "0.11.0",
-    "terser": "5.24.0",
+    "terser": "5.26.0",
     "ts-api-utils": "1.0.3",
     "ts-jest": "29.1.1",
     "ts-jest-resolver": "2.0.1",
     "ts-morph": "20.0.0",
-    "ts-node": "10.9.1",
+    "ts-node": "10.9.2",
     "typedoc": "0.25.0",
-    "typescript": "5.3.2",
+    "typescript": "5.3.3",
     "wait-for-observables": "1.0.3",
     "web-streams-polyfill": "3.2.1",
     "whatwg-fetch": "3.6.19"

package/react/cache/QueryReference.d.ts

@@ -11,16 +11,18 @@ declare const PROMISE_SYMBOL: unique symbol;
  * A child component reading the `QueryReference` via {@link useReadQuery} will
  * suspend until the promise resolves.
  */
-export interface QueryReference<TData = unknown> {
+export interface QueryReference<TData = unknown, TVariables = unknown> {
     readonly [QUERY_REFERENCE_SYMBOL]: InternalQueryReference<TData>;
     [PROMISE_SYMBOL]: QueryRefPromise<TData>;
+    toPromise(): Promise<QueryReference<TData, TVariables>>;
 }
 interface InternalQueryReferenceOptions {
     onDispose?: () => void;
     autoDisposeTimeoutMs?: number;
 }
-export declare function wrapQueryRef<TData>(internalQueryRef: InternalQueryReference<TData>): QueryReference<TData>;
-export declare function unwrapQueryRef<TData>(queryRef: QueryReference<TData>): [InternalQueryReference<TData>, () => QueryRefPromise<TData>];
+export declare function wrapQueryRef<TData, TVariables extends OperationVariables>(internalQueryRef: InternalQueryReference<TData>): QueryReference<TData, TVariables>;
+export declare function getWrappedPromise<TData>(queryRef: QueryReference<TData, any>): QueryRefPromise<TData>;
+export declare function unwrapQueryRef<TData>(queryRef: QueryReference<TData>): InternalQueryReference<TData>;
 export declare function updateWrappedQueryRef<TData>(queryRef: QueryReference<TData>, promise: QueryRefPromise<TData>): void;
 declare const OBSERVED_CHANGED_OPTIONS: readonly ["canonizeResults", "context", "errorPolicy", "fetchPolicy", "refetchWritePolicy", "returnPartialData"];
 type ObservedOptions = Pick<WatchQueryOptions, (typeof OBSERVED_CHANGED_OPTIONS)[number]>;
@@ -32,12 +34,13 @@ export declare class InternalQueryReference<TData = unknown> {
     private subscription;
     private listeners;
     private autoDisposeTimeoutId?;
-    private status;
     private resolve;
     private reject;
     private references;
-    constructor(observable: ObservableQuery<TData>, options: InternalQueryReferenceOptions);
+    constructor(observable: ObservableQuery<TData, any>, options: InternalQueryReferenceOptions);
+    get disposed(): boolean;
     get watchQueryOptions(): WatchQueryOptions<OperationVariables, TData>;
+    reinitialize(): void;
     retain(): () => void;
     didChangeOptions(watchQueryOptions: ObservedOptions): boolean;
     applyOptions(watchQueryOptions: ObservedOptions): QueryRefPromise<TData>;
@@ -50,6 +53,9 @@ export declare class InternalQueryReference<TData = unknown> {
     private handleError;
     private deliver;
     private initiateFetch;
+    private subscribeToQuery;
+    private setResult;
+    private createPendingPromise;
 }
 export {};
 //# sourceMappingURL=QueryReference.d.ts.map

package/react/cache/QueryReference.js

@@ -1,30 +1,40 @@
 import { __assign } from "tslib";
 import { equal } from "@wry/equality";
-import { isNetworkRequestSettled } from "../../core/index.js";
 import { createFulfilledPromise, createRejectedPromise, } from "../../utilities/index.js";
 import { wrapPromiseWithState } from "../../utilities/index.js";
 var QUERY_REFERENCE_SYMBOL = Symbol();
 var PROMISE_SYMBOL = Symbol();
 export function wrapQueryRef(internalQueryRef) {
     var _a;
-    return _a = {},
+    var ref = (_a = {
+            toPromise: function () {
+                // We avoid resolving this promise with the query data because we want to
+                // discourage using the server data directly from the queryRef. Instead,
+                // the data should be accessed through `useReadQuery`. When the server
+                // data is needed, its better to use `client.query()` directly.
+                //
+                // Here we resolve with the ref itself to make using this in React Router
+                // or TanStack Router `loader` functions a bit more ergonomic e.g.
+                //
+                // function loader() {
+                //   return { queryRef: await preloadQuery(query).toPromise() }
+                // }
+                return getWrappedPromise(ref).then(function () { return ref; });
+            }
+        },
         _a[QUERY_REFERENCE_SYMBOL] = internalQueryRef,
         _a[PROMISE_SYMBOL] = internalQueryRef.promise,
-        _a;
+        _a);
+    return ref;
+}
+export function getWrappedPromise(queryRef) {
+    var internalQueryRef = unwrapQueryRef(queryRef);
+    return internalQueryRef.promise.status === "fulfilled" ?
+        internalQueryRef.promise
+        : queryRef[PROMISE_SYMBOL];
 }
 export function unwrapQueryRef(queryRef) {
-    var internalQueryRef = queryRef[QUERY_REFERENCE_SYMBOL];
-    return [
-        internalQueryRef,
-        function () {
-            // There is a chance the query ref's promise has been updated in the time
-            // the original promise had been suspended. In that case, we want to use
-            // it instead of the older promise which may contain outdated data.
-            return internalQueryRef.promise.status === "fulfilled" ?
-                internalQueryRef.promise
-                : queryRef[PROMISE_SYMBOL];
-        },
-    ];
+    return queryRef[QUERY_REFERENCE_SYMBOL];
 }
 export function updateWrappedQueryRef(queryRef, promise) {
     queryRef[PROMISE_SYMBOL] = promise;
@@ -42,39 +52,16 @@ var InternalQueryReference = /** @class */ (function () {
         var _this = this;
         this.key = {};
         this.listeners = new Set();
-        this.status = "loading";
         this.references = 0;
         this.handleNext = this.handleNext.bind(this);
         this.handleError = this.handleError.bind(this);
         this.dispose = this.dispose.bind(this);
         this.observable = observable;
-        // Don't save this result as last result to prevent delivery of last result
-        // when first subscribing
-        this.result = observable.getCurrentResult(false);
         if (options.onDispose) {
             this.onDispose = options.onDispose;
         }
-        if (isNetworkRequestSettled(this.result.networkStatus) ||
-            (this.result.data &&
-                (!this.result.partial || this.watchQueryOptions.returnPartialData))) {
-            this.promise = createFulfilledPromise(this.result);
-            this.status = "idle";
-        }
-        else {
-            this.promise = wrapPromiseWithState(new Promise(function (resolve, reject) {
-                _this.resolve = resolve;
-                _this.reject = reject;
-            }));
-        }
-        this.subscription = observable
-            .filter(function (_a) {
-            var data = _a.data;
-            return !equal(data, {});
-        })
-            .subscribe({
-            next: this.handleNext,
-            error: this.handleError,
-        });
+        this.setResult();
+        this.subscribeToQuery();
         // Start a timer that will automatically dispose of the query if the
         // suspended resource does not use this queryRef in the given time. This
         // helps prevent memory leaks when a component has unmounted before the
@@ -90,6 +77,13 @@ var InternalQueryReference = /** @class */ (function () {
         // promise in a pending state rendering the suspense boundary indefinitely.
         this.promise.then(startDisposeTimer, startDisposeTimer);
     }
+    Object.defineProperty(InternalQueryReference.prototype, "disposed", {
+        get: function () {
+            return this.subscription.closed;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(InternalQueryReference.prototype, "watchQueryOptions", {
         get: function () {
             return this.observable.options;
@@ -97,6 +91,28 @@ var InternalQueryReference = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    InternalQueryReference.prototype.reinitialize = function () {
+        var observable = this.observable;
+        var originalFetchPolicy = this.watchQueryOptions.fetchPolicy;
+        try {
+            if (originalFetchPolicy !== "no-cache") {
+                observable.resetLastResults();
+                observable.silentSetOptions({ fetchPolicy: "cache-first" });
+            }
+            else {
+                observable.silentSetOptions({ fetchPolicy: "standby" });
+            }
+            this.subscribeToQuery();
+            if (originalFetchPolicy === "no-cache") {
+                return;
+            }
+            observable.resetDiff();
+            this.setResult();
+        }
+        finally {
+            observable.silentSetOptions({ fetchPolicy: originalFetchPolicy });
+        }
+    };
     InternalQueryReference.prototype.retain = function () {
         var _this = this;
         this.references++;
@@ -161,19 +177,18 @@ var InternalQueryReference = /** @class */ (function () {
     };
     InternalQueryReference.prototype.handleNext = function (result) {
         var _a;
-        switch (this.status) {
-            case "loading": {
+        switch (this.promise.status) {
+            case "pending": {
                 // Maintain the last successful `data` value if the next result does not
                 // have one.
                 if (result.data === void 0) {
                     result.data = this.result.data;
                 }
-                this.status = "idle";
                 this.result = result;
                 (_a = this.resolve) === null || _a === void 0 ? void 0 : _a.call(this, result);
                 break;
             }
-            case "idle": {
+            default: {
                 // This occurs when switching to a result that is fully cached when this
                 // class is instantiated. ObservableQuery will run reobserve when
                 // subscribing, which delivers a result from the cache.
@@ -196,13 +211,12 @@ var InternalQueryReference = /** @class */ (function () {
         var _a;
         this.subscription.unsubscribe();
         this.subscription = this.observable.resubscribeAfterError(this.handleNext, this.handleError);
-        switch (this.status) {
-            case "loading": {
-                this.status = "idle";
+        switch (this.promise.status) {
+            case "pending": {
                 (_a = this.reject) === null || _a === void 0 ? void 0 : _a.call(this, error);
                 break;
             }
-            case "idle": {
+            default: {
                 this.promise = createRejectedPromise(error);
                 this.deliver(this.promise);
             }
@@ -213,11 +227,7 @@ var InternalQueryReference = /** @class */ (function () {
     };
     InternalQueryReference.prototype.initiateFetch = function (returnedPromise) {
         var _this = this;
-        this.status = "loading";
-        this.promise = wrapPromiseWithState(new Promise(function (resolve, reject) {
-            _this.resolve = resolve;
-            _this.reject = reject;
-        }));
+        this.promise = this.createPendingPromise();
         this.promise.catch(function () { });
         // If the data returned from the fetch is deeply equal to the data already
         // in the cache, `handleNext` will not be triggered leaving the promise we
@@ -227,8 +237,7 @@ var InternalQueryReference = /** @class */ (function () {
         returnedPromise
             .then(function (result) {
             var _a;
-            if (_this.status === "loading") {
-                _this.status = "idle";
+            if (_this.promise.status === "pending") {
                 _this.result = result;
                 (_a = _this.resolve) === null || _a === void 0 ? void 0 : _a.call(_this, result);
             }
@@ -236,6 +245,33 @@ var InternalQueryReference = /** @class */ (function () {
             .catch(function () { });
         return returnedPromise;
     };
+    InternalQueryReference.prototype.subscribeToQuery = function () {
+        var _this = this;
+        this.subscription = this.observable
+            .filter(function (result) { return !equal(result.data, {}) && !equal(result, _this.result); })
+            .subscribe(this.handleNext, this.handleError);
+    };
+    InternalQueryReference.prototype.setResult = function () {
+        // Don't save this result as last result to prevent delivery of last result
+        // when first subscribing
+        var result = this.observable.getCurrentResult(false);
+        if (equal(result, this.result)) {
+            return;
+        }
+        this.result = result;
+        this.promise =
+            (result.data &&
+                (!result.partial || this.watchQueryOptions.returnPartialData)) ?
+                createFulfilledPromise(result)
+                : this.createPendingPromise();
+    };
+    InternalQueryReference.prototype.createPendingPromise = function () {
+        var _this = this;
+        return wrapPromiseWithState(new Promise(function (resolve, reject) {
+            _this.resolve = resolve;
+            _this.reject = reject;
+        }));
+    };
     return InternalQueryReference;
 }());
 export { InternalQueryReference };