@apollo/client 3.11.10 → 3.11.11-rc.0

package/core/core.cjs.native.js

@@ -12,6 +12,7 @@ var cache = require('../cache');
 var errors = require('../errors');
 var trie = require('@wry/trie');
 var graphql = require('graphql');
+var optimism = require('optimism');
 var utils = require('../link/utils');
 var tsInvariant = require('ts-invariant');
 var graphqlTag = require('graphql-tag');
@@ -20,7 +21,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var equal__default = /*#__PURE__*/_interopDefaultLegacy(equal);
 
-var version = "3.11.10";
+var version = "3.11.11-rc.0";
 
 function isNonNullObject(obj) {
     return obj !== null && typeof obj === "object";
@@ -213,7 +214,7 @@ var ObservableQuery =  (function (_super) {
                 observer.error && observer.error(last.error);
             }
             else if (last && last.result) {
-                observer.next && observer.next(last.result);
+                observer.next && observer.next(_this.maskResult(last.result));
             }
             if (first) {
                 _this.reobserve().catch(function () { });
@@ -231,6 +232,7 @@ var ObservableQuery =  (function (_super) {
         _this.waitForOwnResult = skipCacheDataFor(options.fetchPolicy);
         _this.isTornDown = false;
         _this.subscribeToMore = _this.subscribeToMore.bind(_this);
+        _this.maskResult = _this.maskResult.bind(_this);
         var _b = queryManager.defaultOptions.watchQuery, _c = _b === void 0 ? {} : _b, _d = _c.fetchPolicy, defaultFetchPolicy = _d === void 0 ? "cache-first" : _d;
         var _e = options.fetchPolicy, fetchPolicy = _e === void 0 ? defaultFetchPolicy : _e,
         _f = options.initialFetchPolicy,
@@ -279,7 +281,7 @@ var ObservableQuery =  (function (_super) {
     ObservableQuery.prototype.resetDiff = function () {
         this.queryInfo.resetDiff();
     };
-    ObservableQuery.prototype.getCurrentResult = function (saveAsLastResult) {
+    ObservableQuery.prototype.getCurrentFullResult = function (saveAsLastResult) {
         if (saveAsLastResult === void 0) { saveAsLastResult = true; }
         var lastResult = this.getLastResult(true);
         var networkStatus = this.queryInfo.networkStatus ||
@@ -327,12 +329,19 @@ var ObservableQuery =  (function (_super) {
         }
         return result;
     };
+    ObservableQuery.prototype.getCurrentResult = function (saveAsLastResult) {
+        if (saveAsLastResult === void 0) { saveAsLastResult = true; }
+        return this.maskResult(this.getCurrentFullResult(saveAsLastResult));
+    };
     ObservableQuery.prototype.isDifferentFromLastResult = function (newResult, variables) {
         if (!this.last) {
             return true;
         }
-        var resultIsDifferent = this.queryManager.getDocumentInfo(this.query).hasNonreactiveDirective ?
-            !equalByQuery(this.query, this.last.result, newResult, this.variables)
+        var documentInfo = this.queryManager.getDocumentInfo(this.query);
+        var dataMasking = this.queryManager.dataMasking;
+        var query = dataMasking ? documentInfo.nonReactiveQuery : this.query;
+        var resultIsDifferent = dataMasking || documentInfo.hasNonreactiveDirective ?
+            !equalByQuery(query, this.last.result, newResult, this.variables)
             : !equal.equal(this.last.result, newResult);
         return (resultIsDifferent || (variables && !equal.equal(this.last.variables, variables)));
     };
@@ -377,7 +386,7 @@ var ObservableQuery =  (function (_super) {
             var vars = queryDef.variableDefinitions;
             if (!vars || !vars.some(function (v) { return v.variable.name.value === "variables"; })) {
                 globalThis.__DEV__ !== false && globals.invariant.warn(
-                    20,
+                    21,
                     variables,
                     ((_a = queryDef.name) === null || _a === void 0 ? void 0 : _a.value) || queryDef
                 );
@@ -409,7 +418,7 @@ var ObservableQuery =  (function (_super) {
         var updateQuery = fetchMoreOptions === null || fetchMoreOptions === void 0 ? void 0 : fetchMoreOptions.updateQuery;
         var isCached = this.options.fetchPolicy !== "no-cache";
         if (!isCached) {
-            globals.invariant(updateQuery, 21);
+            globals.invariant(updateQuery, 22);
         }
         return this.queryManager
             .fetchQuery(qid, combinedOptions, exports.NetworkStatus.fetchMore)
@@ -456,7 +465,7 @@ var ObservableQuery =  (function (_super) {
                 });
                 _this.reportResult(tslib.__assign(tslib.__assign({}, lastResult), { data: data }), _this.variables);
             }
-            return fetchMoreResult;
+            return _this.maskResult(fetchMoreResult);
         })
             .finally(function () {
             if (isCached && !updatedQuerySet.has(_this.query)) {
@@ -490,7 +499,7 @@ var ObservableQuery =  (function (_super) {
                     options.onError(err);
                     return;
                 }
-                globalThis.__DEV__ !== false && globals.invariant.error(22, err);
+                globalThis.__DEV__ !== false && globals.invariant.error(23, err);
             },
         });
         this.subscriptions.add(subscription);
@@ -590,7 +599,7 @@ var ObservableQuery =  (function (_super) {
         if (pollingInfo && pollingInfo.interval === pollInterval) {
             return;
         }
-        globals.invariant(pollInterval, 23);
+        globals.invariant(pollInterval, 24);
         var info = pollingInfo || (this.pollingInfo = {});
         info.interval = pollInterval;
         var maybeFetch = function () {
@@ -693,8 +702,7 @@ var ObservableQuery =  (function (_super) {
         return concast;
     };
     ObservableQuery.prototype.reobserve = function (newOptions, newNetworkStatus) {
-        return this.reobserveAsConcast(newOptions, newNetworkStatus)
-            .promise;
+        return utilities.preventUnhandledRejection(this.reobserveAsConcast(newOptions, newNetworkStatus).promise.then(this.maskResult));
     };
     ObservableQuery.prototype.resubscribeAfterError = function () {
         var args = [];
@@ -709,7 +717,7 @@ var ObservableQuery =  (function (_super) {
     };
     ObservableQuery.prototype.observe = function () {
         this.reportResult(
-        this.getCurrentResult(false), this.variables);
+        this.getCurrentFullResult(false), this.variables);
     };
     ObservableQuery.prototype.reportResult = function (result, variables) {
         var lastError = this.getLastError();
@@ -718,7 +726,7 @@ var ObservableQuery =  (function (_super) {
             this.updateLastResult(result, variables);
         }
         if (lastError || isDifferent) {
-            utilities.iterateObserversSafely(this.observers, "next", result);
+            utilities.iterateObserversSafely(this.observers, "next", this.maskResult(result));
         }
     };
     ObservableQuery.prototype.reportError = function (error, variables) {
@@ -747,6 +755,14 @@ var ObservableQuery =  (function (_super) {
     ObservableQuery.prototype.transformDocument = function (document) {
         return this.queryManager.transform(document);
     };
+    ObservableQuery.prototype.maskResult = function (result) {
+        return result && "data" in result ? tslib.__assign(tslib.__assign({}, result), { data: this.queryManager.maskOperation({
+                document: this.query,
+                data: result.data,
+                fetchPolicy: this.options.fetchPolicy,
+                id: this.queryId,
+            }) }) : result;
+    };
     return ObservableQuery;
 }(utilities.Observable));
 utilities.fixObservableSubclass(ObservableQuery);
@@ -767,11 +783,11 @@ function reobserveCacheFirst(obsQuery) {
     return obsQuery.reobserve();
 }
 function defaultSubscriptionObserverErrorCallback(error) {
-    globalThis.__DEV__ !== false && globals.invariant.error(24, error.message, error.stack);
+    globalThis.__DEV__ !== false && globals.invariant.error(25, error.message, error.stack);
 }
 function logMissingFieldErrors(missing) {
     if (globalThis.__DEV__ !== false && missing) {
-        globalThis.__DEV__ !== false && globals.invariant.debug(25, missing);
+        globalThis.__DEV__ !== false && globals.invariant.debug(26, missing);
     }
 }
 function skipCacheDataFor(fetchPolicy ) {
@@ -1058,6 +1074,215 @@ function shouldWriteResult(result, errorPolicy) {
     return writeWithErrors;
 }
 
+var disableWarningsSlot = new optimism.Slot();
+function maskOperation(data, document, cache) {
+    var _a;
+    if (!cache.fragmentMatches) {
+        if (globalThis.__DEV__ !== false) {
+            warnOnImproperCacheImplementation();
+        }
+        return data;
+    }
+    var definition = utilities.getOperationDefinition(document);
+    globals.invariant(definition, 38);
+    if (data == null) {
+        return data;
+    }
+    var context = {
+        operationType: definition.operation,
+        operationName: (_a = definition.name) === null || _a === void 0 ? void 0 : _a.value,
+        fragmentMap: utilities.createFragmentMap(utilities.getFragmentDefinitions(document)),
+        cache: cache,
+    };
+    var _b = maskSelectionSet(data, definition.selectionSet, context), masked = _b[0], changed = _b[1];
+    if (Object.isFrozen(data)) {
+        disableWarningsSlot.withValue(true, utilities.maybeDeepFreeze, [masked]);
+    }
+    return changed ? masked : data;
+}
+function maskFragment(data, document, cache, fragmentName) {
+    if (!cache.fragmentMatches) {
+        if (globalThis.__DEV__ !== false) {
+            warnOnImproperCacheImplementation();
+        }
+        return data;
+    }
+    var fragments = document.definitions.filter(function (node) {
+        return node.kind === graphql.Kind.FRAGMENT_DEFINITION;
+    });
+    if (typeof fragmentName === "undefined") {
+        globals.invariant(fragments.length === 1, 39, fragments.length);
+        fragmentName = fragments[0].name.value;
+    }
+    var fragment = fragments.find(function (fragment) { return fragment.name.value === fragmentName; });
+    globals.invariant(!!fragment, 40, fragmentName);
+    if (data == null) {
+        return data;
+    }
+    if (equal.equal(data, {})) {
+        return data;
+    }
+    var context = {
+        operationType: "fragment",
+        operationName: fragment.name.value,
+        fragmentMap: utilities.createFragmentMap(utilities.getFragmentDefinitions(document)),
+        cache: cache,
+    };
+    var _a = maskSelectionSet(data, fragment.selectionSet, context), masked = _a[0], changed = _a[1];
+    if (Object.isFrozen(data)) {
+        disableWarningsSlot.withValue(true, utilities.maybeDeepFreeze, [masked]);
+    }
+    return changed ? masked : data;
+}
+function maskSelectionSet(data, selectionSet, context, path) {
+    if (Array.isArray(data)) {
+        var changed_1 = false;
+        var masked = data.map(function (item, index) {
+            if (item === null) {
+                return null;
+            }
+            var _a = maskSelectionSet(item, selectionSet, context, globalThis.__DEV__ !== false ? "".concat(path || "", "[").concat(index, "]") : void 0), masked = _a[0], itemChanged = _a[1];
+            changed_1 || (changed_1 = itemChanged);
+            return itemChanged ? masked : item;
+        });
+        return [changed_1 ? masked : data, changed_1];
+    }
+    var result = selectionSet.selections.reduce(function (_a, selection) {
+        var memo = _a[0], changed = _a[1];
+        switch (selection.kind) {
+            case graphql.Kind.FIELD: {
+                var keyName = utilities.resultKeyNameFromField(selection);
+                var childSelectionSet = selection.selectionSet;
+                memo[keyName] = data[keyName];
+                if (memo[keyName] === void 0) {
+                    delete memo[keyName];
+                }
+                if (keyName in memo && childSelectionSet && data[keyName] !== null) {
+                    var _b = maskSelectionSet(data[keyName], childSelectionSet, context, globalThis.__DEV__ !== false ? "".concat(path || "", ".").concat(keyName) : void 0), masked = _b[0], childChanged = _b[1];
+                    if (childChanged ||
+                        Object.keys(masked).length !== Object.keys(data[keyName]).length) {
+                        memo[keyName] = masked;
+                        changed = true;
+                    }
+                }
+                return [memo, changed];
+            }
+            case graphql.Kind.INLINE_FRAGMENT: {
+                if (selection.typeCondition &&
+                    !context.cache.fragmentMatches(selection, data.__typename)) {
+                    return [memo, changed];
+                }
+                var _c = maskSelectionSet(data, selection.selectionSet, context, path), fragmentData = _c[0], childChanged = _c[1];
+                return [
+                    tslib.__assign(tslib.__assign({}, memo), fragmentData),
+                    changed || childChanged,
+                ];
+            }
+            case graphql.Kind.FRAGMENT_SPREAD: {
+                var fragmentName = selection.name.value;
+                var fragment = context.fragmentMap[fragmentName] ||
+                    (context.fragmentMap[fragmentName] =
+                        context.cache.lookupFragment(fragmentName));
+                globals.invariant(fragment, 41, fragmentName);
+                var mode = utilities.getFragmentMaskMode(selection);
+                if (mode === "mask") {
+                    return [memo, true];
+                }
+                if (globalThis.__DEV__ !== false) {
+                    if (mode === "migrate") {
+                        return [
+                            addFieldAccessorWarnings(memo, data, fragment.selectionSet, path || "", context),
+                            true,
+                        ];
+                    }
+                }
+                var _d = maskSelectionSet(data, fragment.selectionSet, context, path), fragmentData = _d[0], changed_2 = _d[1];
+                return [tslib.__assign(tslib.__assign({}, memo), fragmentData), changed_2];
+            }
+        }
+    }, [Object.create(null), false]);
+    if (data && "__typename" in data && !("__typename" in result[0])) {
+        result[0].__typename = data.__typename;
+    }
+    return result;
+}
+function addFieldAccessorWarnings(memo, data, selectionSetNode, path, context) {
+    if (Array.isArray(data)) {
+        return data.map(function (item, index) {
+            return addFieldAccessorWarnings(memo[index] || Object.create(null), item, selectionSetNode, "".concat(path, "[").concat(index, "]"), context);
+        });
+    }
+    return selectionSetNode.selections.reduce(function (memo, selection) {
+        switch (selection.kind) {
+            case graphql.Kind.FIELD: {
+                var keyName = utilities.resultKeyNameFromField(selection);
+                var childSelectionSet = selection.selectionSet;
+                if (keyName in memo) {
+                    return memo;
+                }
+                var value = data[keyName];
+                if (childSelectionSet) {
+                    value = addFieldAccessorWarnings(memo[keyName] || Object.create(null), data[keyName], childSelectionSet, "".concat(path, ".").concat(keyName), context);
+                }
+                if (globalThis.__DEV__ !== false) {
+                    addAccessorWarning(memo, value, keyName, path, context);
+                }
+                if (!(globalThis.__DEV__ !== false)) {
+                    memo[keyName] = data[keyName];
+                }
+                return memo;
+            }
+            case graphql.Kind.INLINE_FRAGMENT: {
+                return addFieldAccessorWarnings(memo, data, selection.selectionSet, path, context);
+            }
+            case graphql.Kind.FRAGMENT_SPREAD: {
+                var fragment = context.fragmentMap[selection.name.value];
+                var mode = utilities.getFragmentMaskMode(selection);
+                if (mode === "mask") {
+                    return memo;
+                }
+                if (mode === "unmask") {
+                    var fragmentData = maskSelectionSet(data, fragment.selectionSet, context, path)[0];
+                    return Object.assign(memo, fragmentData);
+                }
+                return addFieldAccessorWarnings(memo, data, fragment.selectionSet, path, context);
+            }
+        }
+    }, memo);
+}
+function addAccessorWarning(data, value, fieldName, path, context) {
+    if (value === void 0) {
+        return;
+    }
+    var getValue = function () {
+        if (disableWarningsSlot.getValue()) {
+            return value;
+        }
+        globalThis.__DEV__ !== false && globals.invariant.warn(42, context.operationName ?
+            "".concat(context.operationType, " '").concat(context.operationName, "'")
+            : "anonymous ".concat(context.operationType), "".concat(path, ".").concat(fieldName).replace(/^\./, ""));
+        getValue = function () { return value; };
+        return value;
+    };
+    Object.defineProperty(data, fieldName, {
+        get: function () {
+            return getValue();
+        },
+        set: function (value) {
+            getValue = function () { return value; };
+        },
+        enumerable: true,
+        configurable: true,
+    });
+}
+var issuedWarning = false;
+function warnOnImproperCacheImplementation() {
+    if (!issuedWarning) {
+        issuedWarning = true;
+        globalThis.__DEV__ !== false && globals.invariant.warn(43);
+    }
+}
+
 var hasOwnProperty = Object.prototype.hasOwnProperty;
 var IGNORE = Object.create(null);
 var QueryManager =  (function () {
@@ -1072,6 +1297,7 @@ var QueryManager =  (function () {
         this.requestIdCounter = 1;
         this.mutationIdCounter = 1;
         this.inFlightLinkObservables = new trie.Trie(false);
+        this.noCacheWarningsByQueryId = new Set();
         var defaultDocumentTransform = new utilities.DocumentTransform(function (document) { return _this.cache.transformDocument(document); },
         { cache: false });
         this.cache = options.cache;
@@ -1082,6 +1308,7 @@ var QueryManager =  (function () {
         this.localState = options.localState;
         this.ssrMode = options.ssrMode;
         this.assumeImmutableResults = options.assumeImmutableResults;
+        this.dataMasking = options.dataMasking;
         var documentTransform = options.documentTransform;
         this.documentTransform =
             documentTransform ?
@@ -1099,7 +1326,7 @@ var QueryManager =  (function () {
         this.queries.forEach(function (_info, queryId) {
             _this.stopQueryNoBroadcast(queryId);
         });
-        this.cancelPendingFetches(globals.newInvariantError(26));
+        this.cancelPendingFetches(globals.newInvariantError(27));
     };
     QueryManager.prototype.cancelPendingFetches = function (error) {
         this.fetchCancelFns.forEach(function (cancel) { return cancel(error); });
@@ -1113,8 +1340,8 @@ var QueryManager =  (function () {
             return tslib.__generator(this, function (_j) {
                 switch (_j.label) {
                     case 0:
-                        globals.invariant(mutation, 27);
-                        globals.invariant(fetchPolicy === "network-only" || fetchPolicy === "no-cache", 28);
+                        globals.invariant(mutation, 28);
+                        globals.invariant(fetchPolicy === "network-only" || fetchPolicy === "no-cache", 29);
                         mutationId = this.generateMutationId();
                         mutation = this.cache.transformForLink(this.transform(mutation));
                         hasClientExports = this.getDocumentInfo(mutation).hasClientExports;
@@ -1184,7 +1411,12 @@ var QueryManager =  (function () {
                                     next: function (storeResult) {
                                         self.broadcastQueries();
                                         if (!("hasNext" in storeResult) || storeResult.hasNext === false) {
-                                            resolve(storeResult);
+                                            resolve(tslib.__assign(tslib.__assign({}, storeResult), { data: self.maskOperation({
+                                                    document: mutation,
+                                                    data: storeResult.data,
+                                                    fetchPolicy: fetchPolicy,
+                                                    id: mutationId,
+                                                }) }));
                                         }
                                     },
                                     error: function (err) {
@@ -1390,11 +1622,13 @@ var QueryManager =  (function () {
                 hasClientExports: utilities.hasClientExports(document),
                 hasForcedResolvers: this.localState.shouldForceResolvers(document),
                 hasNonreactiveDirective: utilities.hasDirectives(["nonreactive"], document),
+                nonReactiveQuery: utilities.addNonReactiveToNamedFragments(document),
                 clientQuery: this.localState.clientQuery(document),
                 serverQuery: utilities.removeDirectivesFromDocument([
                     { name: "client", remove: true },
                     { name: "connection" },
                     { name: "nonreactive" },
+                    { name: "unmask" },
                 ], document),
                 defaultVars: utilities.getDefaultValues(utilities.getOperationDefinition(document)),
                 asQuery: tslib.__assign(tslib.__assign({}, document), { definitions: document.definitions.map(function (def) {
@@ -1436,11 +1670,21 @@ var QueryManager =  (function () {
     QueryManager.prototype.query = function (options, queryId) {
         var _this = this;
         if (queryId === void 0) { queryId = this.generateQueryId(); }
-        globals.invariant(options.query, 29);
-        globals.invariant(options.query.kind === "Document", 30);
-        globals.invariant(!options.returnPartialData, 31);
-        globals.invariant(!options.pollInterval, 32);
-        return this.fetchQuery(queryId, tslib.__assign(tslib.__assign({}, options), { query: this.transform(options.query) })).finally(function () { return _this.stopQuery(queryId); });
+        globals.invariant(options.query, 30);
+        globals.invariant(options.query.kind === "Document", 31);
+        globals.invariant(!options.returnPartialData, 32);
+        globals.invariant(!options.pollInterval, 33);
+        var query = this.transform(options.query);
+        return this.fetchQuery(queryId, tslib.__assign(tslib.__assign({}, options), { query: query }))
+            .then(function (result) {
+            return result && tslib.__assign(tslib.__assign({}, result), { data: _this.maskOperation({
+                    document: query,
+                    data: result.data,
+                    fetchPolicy: options.fetchPolicy,
+                    id: queryId,
+                }) });
+        })
+            .finally(function () { return _this.stopQuery(queryId); });
     };
     QueryManager.prototype.generateQueryId = function () {
         return String(this.queryIdCounter++);
@@ -1464,7 +1708,7 @@ var QueryManager =  (function () {
         if (options === void 0) { options = {
             discardWatches: true,
         }; }
-        this.cancelPendingFetches(globals.newInvariantError(33));
+        this.cancelPendingFetches(globals.newInvariantError(34));
         this.queries.forEach(function (queryInfo) {
             if (queryInfo.observableQuery) {
                 queryInfo.networkStatus = exports.NetworkStatus.loading;
@@ -1540,7 +1784,7 @@ var QueryManager =  (function () {
         if (globalThis.__DEV__ !== false && queryNamesAndDocs.size) {
             queryNamesAndDocs.forEach(function (included, nameOrDoc) {
                 if (!included) {
-                    globalThis.__DEV__ !== false && globals.invariant.warn(typeof nameOrDoc === "string" ? 34 : 35, nameOrDoc);
+                    globalThis.__DEV__ !== false && globals.invariant.warn(typeof nameOrDoc === "string" ? 35 : 36, nameOrDoc);
                 }
             });
         }
@@ -1565,9 +1809,10 @@ var QueryManager =  (function () {
     QueryManager.prototype.setObservableQuery = function (observableQuery) {
         this.getQuery(observableQuery.queryId).setObservableQuery(observableQuery);
     };
-    QueryManager.prototype.startGraphQLSubscription = function (_a) {
+    QueryManager.prototype.startGraphQLSubscription = function (options) {
         var _this = this;
-        var query = _a.query, fetchPolicy = _a.fetchPolicy, _b = _a.errorPolicy, errorPolicy = _b === void 0 ? "none" : _b, variables = _a.variables, _c = _a.context, context = _c === void 0 ? {} : _c, _d = _a.extensions, extensions = _d === void 0 ? {} : _d;
+        var query = options.query, variables = options.variables;
+        var fetchPolicy = options.fetchPolicy, _a = options.errorPolicy, errorPolicy = _a === void 0 ? "none" : _a, _b = options.context, context = _b === void 0 ? {} : _b, _c = options.extensions, extensions = _c === void 0 ? {} : _c;
         query = this.transform(query);
         variables = this.getVariables(query, variables);
         var makeObservable = function (variables) {
@@ -1849,6 +2094,34 @@ var QueryManager =  (function () {
         }
         return results;
     };
+    QueryManager.prototype.maskOperation = function (options) {
+        var _a, _b, _c;
+        var document = options.document, data = options.data;
+        if (globalThis.__DEV__ !== false) {
+            var fetchPolicy = options.fetchPolicy, id = options.id;
+            var operationType = (_a = utilities.getOperationDefinition(document)) === null || _a === void 0 ? void 0 : _a.operation;
+            var operationId = ((_b = operationType === null || operationType === void 0 ? void 0 : operationType[0]) !== null && _b !== void 0 ? _b : "o") + id;
+            if (this.dataMasking &&
+                fetchPolicy === "no-cache" &&
+                !utilities.isFullyUnmaskedOperation(document) &&
+                !this.noCacheWarningsByQueryId.has(operationId)) {
+                this.noCacheWarningsByQueryId.add(operationId);
+                globalThis.__DEV__ !== false && globals.invariant.warn(
+                    37,
+                    (_c = utilities.getOperationName(document)) !== null && _c !== void 0 ? _c : "Unnamed ".concat(operationType !== null && operationType !== void 0 ? operationType : "operation")
+                );
+            }
+        }
+        return (this.dataMasking ?
+            maskOperation(data, document, this.cache)
+            : data);
+    };
+    QueryManager.prototype.maskFragment = function (options) {
+        var data = options.data, fragment = options.fragment, fragmentName = options.fragmentName;
+        return this.dataMasking ?
+            maskFragment(data, fragment, this.cache, fragmentName)
+            : data;
+    };
     QueryManager.prototype.fetchQueryByPolicy = function (queryInfo, _a,
     networkStatus) {
         var _this = this;
@@ -2149,7 +2422,7 @@ var LocalState =  (function () {
                         }
                         else {
                             fragment = fragmentMap[selection.name.value];
-                            globals.invariant(fragment, 18, selection.name.value);
+                            globals.invariant(fragment, 19, selection.name.value);
                         }
                         if (fragment && fragment.typeCondition) {
                             typeCondition = fragment.typeCondition.name.value;
@@ -2263,7 +2536,7 @@ var LocalState =  (function () {
                     },
                     FragmentSpread: function (spread, _, __, ___, ancestors) {
                         var fragment = fragmentMap[spread.name.value];
-                        globals.invariant(fragment, 19, spread.name.value);
+                        globals.invariant(fragment, 20, spread.name.value);
                         var fragmentSelections = collectByDefinition(fragment);
                         if (fragmentSelections.size > 0) {
                             ancestors.forEach(function (node) {
@@ -2366,10 +2639,10 @@ var ApolloClient =  (function () {
         this.resetStoreCallbacks = [];
         this.clearStoreCallbacks = [];
         if (!options.cache) {
-            throw globals.newInvariantError(15);
+            throw globals.newInvariantError(16);
         }
         var uri = options.uri, credentials = options.credentials, headers = options.headers, cache = options.cache, documentTransform = options.documentTransform, _b = options.ssrMode, ssrMode = _b === void 0 ? false : _b, _c = options.ssrForceFetchDelay, ssrForceFetchDelay = _c === void 0 ? 0 : _c,
-        connectToDevTools = options.connectToDevTools, _d = options.queryDeduplication, queryDeduplication = _d === void 0 ? true : _d, defaultOptions = options.defaultOptions, defaultContext = options.defaultContext, _e = options.assumeImmutableResults, assumeImmutableResults = _e === void 0 ? cache.assumeImmutableResults : _e, resolvers = options.resolvers, typeDefs = options.typeDefs, fragmentMatcher = options.fragmentMatcher, clientAwarenessName = options.name, clientAwarenessVersion = options.version, devtools = options.devtools;
+        connectToDevTools = options.connectToDevTools, _d = options.queryDeduplication, queryDeduplication = _d === void 0 ? true : _d, defaultOptions = options.defaultOptions, defaultContext = options.defaultContext, _e = options.assumeImmutableResults, assumeImmutableResults = _e === void 0 ? cache.assumeImmutableResults : _e, resolvers = options.resolvers, typeDefs = options.typeDefs, fragmentMatcher = options.fragmentMatcher, clientAwarenessName = options.name, clientAwarenessVersion = options.version, devtools = options.devtools, dataMasking = options.dataMasking;
         var link = options.link;
         if (!link) {
             link =
@@ -2409,6 +2682,7 @@ var ApolloClient =  (function () {
             documentTransform: documentTransform,
             queryDeduplication: queryDeduplication,
             ssrMode: ssrMode,
+            dataMasking: !!dataMasking,
             clientAwareness: {
                 name: clientAwarenessName,
                 version: clientAwarenessVersion,
@@ -2497,7 +2771,7 @@ var ApolloClient =  (function () {
         if (this.defaultOptions.query) {
             options = utilities.mergeOptions(this.defaultOptions.query, options);
         }
-        globals.invariant(options.fetchPolicy !== "cache-and-network", 16);
+        globals.invariant(options.fetchPolicy !== "cache-and-network", 17);
         if (this.disableNetworkFetches && options.fetchPolicy === "network-only") {
             options = tslib.__assign(tslib.__assign({}, options), { fetchPolicy: "cache-first" });
         }
@@ -2510,14 +2784,24 @@ var ApolloClient =  (function () {
         return this.queryManager.mutate(options);
     };
     ApolloClient.prototype.subscribe = function (options) {
-        return this.queryManager.startGraphQLSubscription(options);
+        var _this = this;
+        var id = this.queryManager.generateQueryId();
+        return this.queryManager
+            .startGraphQLSubscription(options)
+            .map(function (result) { return (tslib.__assign(tslib.__assign({}, result), { data: _this.queryManager.maskOperation({
+                document: options.query,
+                data: result.data,
+                fetchPolicy: options.fetchPolicy,
+                id: id,
+            }) })); });
     };
     ApolloClient.prototype.readQuery = function (options, optimistic) {
         if (optimistic === void 0) { optimistic = false; }
         return this.cache.readQuery(options, optimistic);
     };
     ApolloClient.prototype.watchFragment = function (options) {
-        return this.cache.watchFragment(options);
+        var _a;
+        return this.cache.watchFragment(tslib.__assign(tslib.__assign({}, options), (_a = {}, _a[Symbol.for("apollo.dataMasking")] = this.queryManager.dataMasking, _a)));
     };
     ApolloClient.prototype.readFragment = function (options, optimistic) {
         if (optimistic === void 0) { optimistic = false; }
@@ -2593,7 +2877,7 @@ var ApolloClient =  (function () {
         result.queries = queries;
         result.results = results;
         result.catch(function (error) {
-            globalThis.__DEV__ !== false && globals.invariant.debug(17, error);
+            globalThis.__DEV__ !== false && globals.invariant.debug(18, error);
         });
         return result;
     };

package/core/index.d.ts

@@ -14,6 +14,7 @@ export * from "../link/core/index.js";
 export * from "../link/http/index.js";
 export type { ServerError } from "../link/utils/index.js";
 export { fromError, toPromise, fromPromise, throwServerError, } from "../link/utils/index.js";
+export type { DataMasking, FragmentType, Masked, MaskedDocumentNode, MaybeMasked, Unmasked, } from "../masking/index.js";
 export type { DocumentTransformCacheKey, Observer, ObservableSubscription, Reference, StoreObject, } from "../utilities/index.js";
 export { DocumentTransform, Observable, isReference, makeReference, } from "../utilities/index.js";
 import { setVerbosity } from "ts-invariant";

package/core/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,UAAU;AAGV,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAK/D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAcvD,OAAO,EAAE,aAAa,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC5E,cAAc,YAAY,CAAC;AAE3B,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAoBhE,OAAO,EACL,KAAK,EACL,WAAW,EACX,aAAa,EACb,iBAAiB,EACjB,uBAAuB,EACvB,OAAO,GACR,MAAM,mBAAmB,CAAC;AAE3B,cAAc,4BAA4B,CAAC;AAE3C,UAAU;AAEV,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AAEtC,OAAO,EACL,SAAS,EACT,SAAS,EACT,WAAW,EACX,gBAAgB,GACjB,MAAM,wBAAwB,CAAC;AAWhC,OAAO,EACL,iBAAiB,EACjB,UAAU,EACV,WAAW,EACX,aAAa,GACd,MAAM,uBAAuB,CAAC;AAE/B,gBAAgB;AAEhB,yEAAyE;AACzE,qEAAqE;AACrE,uEAAuE;AACvE,6DAA6D;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,YAAY,IAAI,eAAe,EAAE,CAAC;AAC3C,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;AAEzC,0DAA0D;AAC1D,qEAAqE;AACrE,sEAAsE;AACtE,yEAAyE;AACzE,yCAAyC;AACzC,wEAAwE;AACxE,6EAA6E;AAC7E,8EAA8E;AAC9E,sEAAsE;AACtE,qEAAqE;AACrE,4EAA4E;AAC5E,6BAA6B;AAC7B,OAAO,EACL,GAAG,EACH,WAAW,EACX,uBAAuB,EACvB,mCAAmC,EACnC,oCAAoC,GACrC,MAAM,aAAa,CAAC","sourcesContent":["/* Core */\n\nexport type { ApolloClientOptions, DefaultOptions } from \"./ApolloClient.js\";\nexport { ApolloClient, mergeOptions } from \"./ApolloClient.js\";\nexport type {\n  FetchMoreOptions,\n  UpdateQueryOptions,\n} from \"./ObservableQuery.js\";\nexport { ObservableQuery } from \"./ObservableQuery.js\";\nexport type {\n  QueryOptions,\n  WatchQueryOptions,\n  MutationOptions,\n  SubscriptionOptions,\n  FetchPolicy,\n  WatchQueryFetchPolicy,\n  MutationFetchPolicy,\n  RefetchWritePolicy,\n  ErrorPolicy,\n  FetchMoreQueryOptions,\n  SubscribeToMoreOptions,\n} from \"./watchQueryOptions.js\";\nexport { NetworkStatus, isNetworkRequestSettled } from \"./networkStatus.js\";\nexport * from \"./types.js\";\nexport type { Resolver, FragmentMatcher } from \"./LocalState.js\";\nexport { isApolloError, ApolloError } from \"../errors/index.js\";\n/* Cache */\n\nexport type {\n  // All the exports (types) from ../cache, minus cacheSlot,\n  // which we want to keep semi-private.\n  Transaction,\n  DataProxy,\n  InMemoryCacheConfig,\n  ReactiveVar,\n  TypePolicies,\n  TypePolicy,\n  FieldPolicy,\n  FieldReadFunction,\n  FieldMergeFunction,\n  FieldFunctionOptions,\n  PossibleTypesMap,\n  WatchFragmentOptions,\n  WatchFragmentResult,\n} from \"../cache/index.js\";\nexport {\n  Cache,\n  ApolloCache,\n  InMemoryCache,\n  MissingFieldError,\n  defaultDataIdFromObject,\n  makeVar,\n} from \"../cache/index.js\";\n\nexport * from \"../cache/inmemory/types.js\";\n\n/* Link */\n\nexport * from \"../link/core/index.js\";\nexport * from \"../link/http/index.js\";\nexport type { ServerError } from \"../link/utils/index.js\";\nexport {\n  fromError,\n  toPromise,\n  fromPromise,\n  throwServerError,\n} from \"../link/utils/index.js\";\n\n/* Utilities */\n\nexport type {\n  DocumentTransformCacheKey,\n  Observer,\n  ObservableSubscription,\n  Reference,\n  StoreObject,\n} from \"../utilities/index.js\";\nexport {\n  DocumentTransform,\n  Observable,\n  isReference,\n  makeReference,\n} from \"../utilities/index.js\";\n\n/* Supporting */\n\n// The verbosity of invariant.{log,warn,error} can be controlled globally\n// (for anyone using the same ts-invariant package) by passing \"log\",\n// \"warn\", \"error\", or \"silent\" to setVerbosity (\"log\" is the default).\n// Note that all invariant.* logging is hidden in production.\nimport { setVerbosity } from \"ts-invariant\";\nexport { setVerbosity as setLogVerbosity };\nsetVerbosity(__DEV__ ? \"log\" : \"silent\");\n\n// Note that importing `gql` by itself, then destructuring\n// additional properties separately before exporting, is intentional.\n// Due to the way the `graphql-tag` library is setup, certain bundlers\n// can't find the properties added to the exported `gql` function without\n// additional guidance (e.g. Rollup - see\n// https://rollupjs.org/guide/en/#error-name-is-not-exported-by-module).\n// Instead of having people that are using bundlers with `@apollo/client` add\n// extra bundler config to help `graphql-tag` exports be found (which would be\n// awkward since they aren't importing `graphql-tag` themselves), this\n// workaround of pulling the extra properties off the `gql` function,\n// then re-exporting them separately, helps keeps bundlers happy without any\n// additional config changes.\nexport {\n  gql,\n  resetCaches,\n  disableFragmentWarnings,\n  enableExperimentalFragmentVariables,\n  disableExperimentalFragmentVariables,\n} from \"graphql-tag\";\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,UAAU;AAGV,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAK/D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAcvD,OAAO,EAAE,aAAa,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC5E,cAAc,YAAY,CAAC;AAE3B,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAoBhE,OAAO,EACL,KAAK,EACL,WAAW,EACX,aAAa,EACb,iBAAiB,EACjB,uBAAuB,EACvB,OAAO,GACR,MAAM,mBAAmB,CAAC;AAE3B,cAAc,4BAA4B,CAAC;AAE3C,UAAU;AAEV,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AAEtC,OAAO,EACL,SAAS,EACT,SAAS,EACT,WAAW,EACX,gBAAgB,GACjB,MAAM,wBAAwB,CAAC;AAqBhC,OAAO,EACL,iBAAiB,EACjB,UAAU,EACV,WAAW,EACX,aAAa,GACd,MAAM,uBAAuB,CAAC;AAE/B,gBAAgB;AAEhB,yEAAyE;AACzE,qEAAqE;AACrE,uEAAuE;AACvE,6DAA6D;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,YAAY,IAAI,eAAe,EAAE,CAAC;AAC3C,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;AAEzC,0DAA0D;AAC1D,qEAAqE;AACrE,sEAAsE;AACtE,yEAAyE;AACzE,yCAAyC;AACzC,wEAAwE;AACxE,6EAA6E;AAC7E,8EAA8E;AAC9E,sEAAsE;AACtE,qEAAqE;AACrE,4EAA4E;AAC5E,6BAA6B;AAC7B,OAAO,EACL,GAAG,EACH,WAAW,EACX,uBAAuB,EACvB,mCAAmC,EACnC,oCAAoC,GACrC,MAAM,aAAa,CAAC","sourcesContent":["/* Core */\n\nexport type { ApolloClientOptions, DefaultOptions } from \"./ApolloClient.js\";\nexport { ApolloClient, mergeOptions } from \"./ApolloClient.js\";\nexport type {\n  FetchMoreOptions,\n  UpdateQueryOptions,\n} from \"./ObservableQuery.js\";\nexport { ObservableQuery } from \"./ObservableQuery.js\";\nexport type {\n  QueryOptions,\n  WatchQueryOptions,\n  MutationOptions,\n  SubscriptionOptions,\n  FetchPolicy,\n  WatchQueryFetchPolicy,\n  MutationFetchPolicy,\n  RefetchWritePolicy,\n  ErrorPolicy,\n  FetchMoreQueryOptions,\n  SubscribeToMoreOptions,\n} from \"./watchQueryOptions.js\";\nexport { NetworkStatus, isNetworkRequestSettled } from \"./networkStatus.js\";\nexport * from \"./types.js\";\nexport type { Resolver, FragmentMatcher } from \"./LocalState.js\";\nexport { isApolloError, ApolloError } from \"../errors/index.js\";\n/* Cache */\n\nexport type {\n  // All the exports (types) from ../cache, minus cacheSlot,\n  // which we want to keep semi-private.\n  Transaction,\n  DataProxy,\n  InMemoryCacheConfig,\n  ReactiveVar,\n  TypePolicies,\n  TypePolicy,\n  FieldPolicy,\n  FieldReadFunction,\n  FieldMergeFunction,\n  FieldFunctionOptions,\n  PossibleTypesMap,\n  WatchFragmentOptions,\n  WatchFragmentResult,\n} from \"../cache/index.js\";\nexport {\n  Cache,\n  ApolloCache,\n  InMemoryCache,\n  MissingFieldError,\n  defaultDataIdFromObject,\n  makeVar,\n} from \"../cache/index.js\";\n\nexport * from \"../cache/inmemory/types.js\";\n\n/* Link */\n\nexport * from \"../link/core/index.js\";\nexport * from \"../link/http/index.js\";\nexport type { ServerError } from \"../link/utils/index.js\";\nexport {\n  fromError,\n  toPromise,\n  fromPromise,\n  throwServerError,\n} from \"../link/utils/index.js\";\n\n/* Masking */\nexport type {\n  DataMasking,\n  FragmentType,\n  Masked,\n  MaskedDocumentNode,\n  MaybeMasked,\n  Unmasked,\n} from \"../masking/index.js\";\n\n/* Utilities */\n\nexport type {\n  DocumentTransformCacheKey,\n  Observer,\n  ObservableSubscription,\n  Reference,\n  StoreObject,\n} from \"../utilities/index.js\";\nexport {\n  DocumentTransform,\n  Observable,\n  isReference,\n  makeReference,\n} from \"../utilities/index.js\";\n\n/* Supporting */\n\n// The verbosity of invariant.{log,warn,error} can be controlled globally\n// (for anyone using the same ts-invariant package) by passing \"log\",\n// \"warn\", \"error\", or \"silent\" to setVerbosity (\"log\" is the default).\n// Note that all invariant.* logging is hidden in production.\nimport { setVerbosity } from \"ts-invariant\";\nexport { setVerbosity as setLogVerbosity };\nsetVerbosity(__DEV__ ? \"log\" : \"silent\");\n\n// Note that importing `gql` by itself, then destructuring\n// additional properties separately before exporting, is intentional.\n// Due to the way the `graphql-tag` library is setup, certain bundlers\n// can't find the properties added to the exported `gql` function without\n// additional guidance (e.g. Rollup - see\n// https://rollupjs.org/guide/en/#error-name-is-not-exported-by-module).\n// Instead of having people that are using bundlers with `@apollo/client` add\n// extra bundler config to help `graphql-tag` exports be found (which would be\n// awkward since they aren't importing `graphql-tag` themselves), this\n// workaround of pulling the extra properties off the `gql` function,\n// then re-exporting them separately, helps keeps bundlers happy without any\n// additional config changes.\nexport {\n  gql,\n  resetCaches,\n  disableFragmentWarnings,\n  enableExperimentalFragmentVariables,\n  disableExperimentalFragmentVariables,\n} from \"graphql-tag\";\n"]}

package/core/masking.d.ts

@@ -0,0 +1,10 @@
+import type { ApolloCache, DocumentNode, TypedDocumentNode } from "./index.js";
+export declare const disableWarningsSlot: {
+    readonly id: string;
+    hasValue(): boolean;
+    getValue(): boolean | undefined;
+    withValue<TResult, TArgs extends any[], TThis = any>(value: boolean, callback: (this: TThis, ...args: TArgs) => TResult, args?: TArgs | undefined, thisArg?: TThis | undefined): TResult;
+};
+export declare function maskOperation<TData = unknown>(data: TData, document: DocumentNode | TypedDocumentNode<TData>, cache: ApolloCache<unknown>): TData;
+export declare function maskFragment<TData = unknown>(data: TData, document: TypedDocumentNode<TData> | DocumentNode, cache: ApolloCache<unknown>, fragmentName?: string): TData;
+//# sourceMappingURL=masking.d.ts.map