@apollo/client 3.2.0-beta.9 → 3.2.2

package/utilities/policies/pagination.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pagination.d.ts","sourceRoot":"","sources":["../../../src/utilities/policies/pagination.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAErD,aAAK,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC;AAI3C,wBAAgB,gBAAgB,CAAC,CAAC,GAAG,SAAS,EAC5C,OAAO,GAAE,OAAe,GACvB,WAAW,CAAC,CAAC,EAAE,CAAC,CAUlB;AAMD,wBAAgB,qBAAqB,CAAC,CAAC,GAAG,SAAS,EACjD,OAAO,GAAE,OAAe,GACvB,WAAW,CAAC,CAAC,EAAE,CAAC,CAalB;AAED,aAAK,cAAc,CAAC,KAAK,IAAI,QAAQ,CAAC;IACpC,KAAK,EAAE,KAAK,CAAC;QACX,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,KAAK,CAAC;KACb,CAAC,CAAC;IACH,QAAQ,EAAE,QAAQ,CAAC;QACjB,eAAe,EAAE,OAAO,CAAC;QACzB,WAAW,EAAE,OAAO,CAAC;QACrB,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC,CAAC;CACJ,CAAC,CAAC;AAKH,wBAAgB,oBAAoB,CAAC,KAAK,GAAG,SAAS,EACpD,OAAO,GAAE,OAAe,GACvB,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAgFpC"}
+{"version":3,"file":"pagination.d.ts","sourceRoot":"","sources":["../../../src/utilities/policies/pagination.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAErD,aAAK,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC;AAI3C,wBAAgB,gBAAgB,CAAC,CAAC,GAAG,SAAS,EAC5C,OAAO,GAAE,OAAe,GACvB,WAAW,CAAC,CAAC,EAAE,CAAC,CAUlB;AAMD,wBAAgB,qBAAqB,CAAC,CAAC,GAAG,SAAS,EACjD,OAAO,GAAE,OAAe,GACvB,WAAW,CAAC,CAAC,EAAE,CAAC,CAalB;AASD,aAAK,KAAK,CAAC,KAAK,IAAI;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,KAAK,CAAC;CACb,GAAG,CAAC,SAAS,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEtC,aAAK,SAAS,GAAG;IACf,eAAe,EAAE,OAAO,CAAC;IACzB,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,aAAK,cAAc,CAAC,KAAK,IAAI,QAAQ,CAAC;IACpC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;IACtB,QAAQ,EAAE,SAAS,CAAC;CACrB,CAAC,CAAC;AAEH,aAAK,cAAc,CAAC,KAAK,IAAI;IAC3B,KAAK,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB,CAAC;AAEF,aAAK,gBAAgB,CAAC,KAAK,IAAI,WAAW,CACxC,cAAc,CAAC,KAAK,CAAC,EACrB,cAAc,CAAC,KAAK,CAAC,EACrB,cAAc,CAAC,KAAK,CAAC,CACtB,CAAC;AAKF,wBAAgB,oBAAoB,CAAC,KAAK,GAAG,SAAS,EACpD,OAAO,GAAE,OAAe,GACvB,gBAAgB,CAAC,KAAK,CAAC,CAyHzB"}

package/utilities/policies/pagination.js

@@ -1,4 +1,5 @@
 import { __assign, __spreadArrays } from "tslib";
+import { __rest } from "tslib";
 export function concatPagination(keyArgs) {
     if (keyArgs === void 0) { keyArgs = false; }
     return {
@@ -29,55 +30,80 @@ export function relayStylePagination(keyArgs) {
     return {
         keyArgs: keyArgs,
         read: function (existing, _a) {
-            var canRead = _a.canRead;
+            var canRead = _a.canRead, readField = _a.readField;
             if (!existing)
                 return;
-            var edges = existing.edges.filter(function (edge) { return canRead(edge.node); });
-            return __assign(__assign({}, existing), { edges: edges, pageInfo: __assign(__assign({}, existing.pageInfo), { startCursor: cursorFromEdge(edges, 0), endCursor: cursorFromEdge(edges, -1) }) });
+            var edges = [];
+            var startCursor = "";
+            var endCursor = "";
+            existing.edges.forEach(function (edge) {
+                if (canRead(readField("node", edge))) {
+                    edges.push(edge);
+                    if (edge.cursor) {
+                        startCursor = startCursor || edge.cursor;
+                        endCursor = edge.cursor;
+                    }
+                }
+            });
+            return __assign(__assign({}, getExtras(existing)), { edges: edges, pageInfo: __assign(__assign({}, existing.pageInfo), { startCursor: startCursor,
+                    endCursor: endCursor }) });
         },
         merge: function (existing, incoming, _a) {
             if (existing === void 0) { existing = makeEmptyData(); }
-            var args = _a.args;
-            if (!args)
-                return existing;
-            var incomingEdges = incoming.edges.slice(0);
+            var args = _a.args, isReference = _a.isReference, readField = _a.readField;
+            var incomingEdges = incoming.edges ? incoming.edges.map(function (edge) {
+                if (isReference(edge = __assign({}, edge))) {
+                    edge.cursor = readField("cursor", edge);
+                }
+                return edge;
+            }) : [];
             if (incoming.pageInfo) {
-                updateCursor(incomingEdges, 0, incoming.pageInfo.startCursor);
-                updateCursor(incomingEdges, -1, incoming.pageInfo.endCursor);
+                var _b = incoming.pageInfo, startCursor = _b.startCursor, endCursor = _b.endCursor;
+                var firstEdge_1 = incomingEdges[0];
+                if (firstEdge_1 && startCursor) {
+                    firstEdge_1.cursor = startCursor;
+                }
+                var lastEdge_1 = incomingEdges[incomingEdges.length - 1];
+                if (lastEdge_1 && endCursor) {
+                    lastEdge_1.cursor = endCursor;
+                }
             }
             var prefix = existing.edges;
             var suffix = [];
-            if (args.after) {
+            if (args && args.after) {
                 var index = prefix.findIndex(function (edge) { return edge.cursor === args.after; });
                 if (index >= 0) {
                     prefix = prefix.slice(0, index + 1);
                 }
             }
-            else if (args.before) {
+            else if (args && args.before) {
                 var index = prefix.findIndex(function (edge) { return edge.cursor === args.before; });
                 suffix = index < 0 ? prefix : prefix.slice(index);
                 prefix = [];
             }
-            else {
+            else if (incoming.edges) {
                 prefix = [];
             }
             var edges = __spreadArrays(prefix, incomingEdges, suffix);
-            var pageInfo = __assign(__assign(__assign({}, incoming.pageInfo), existing.pageInfo), { startCursor: cursorFromEdge(edges, 0), endCursor: cursorFromEdge(edges, -1) });
-            var updatePageInfo = function (name) {
-                var value = incoming.pageInfo[name];
-                if (value !== void 0) {
-                    pageInfo[name] = value;
+            var firstEdge = edges[0];
+            var lastEdge = edges[edges.length - 1];
+            var pageInfo = __assign(__assign(__assign({}, incoming.pageInfo), existing.pageInfo), { startCursor: firstEdge && firstEdge.cursor || "", endCursor: lastEdge && lastEdge.cursor || "" });
+            if (incoming.pageInfo) {
+                var _c = incoming.pageInfo, hasPreviousPage = _c.hasPreviousPage, hasNextPage = _c.hasNextPage;
+                if (!prefix.length && hasPreviousPage !== void 0) {
+                    pageInfo.hasPreviousPage = hasPreviousPage;
+                }
+                if (!suffix.length && hasNextPage !== void 0) {
+                    pageInfo.hasNextPage = hasNextPage;
                 }
-            };
-            if (!prefix.length)
-                updatePageInfo("hasPreviousPage");
-            if (!suffix.length)
-                updatePageInfo("hasNextPage");
-            return __assign(__assign(__assign({}, existing), incoming), { edges: edges,
+            }
+            return __assign(__assign(__assign({}, getExtras(existing)), getExtras(incoming)), { edges: edges,
                 pageInfo: pageInfo });
         },
     };
 }
+var getExtras = function (obj) { return __rest(obj, notExtras); };
+var notExtras = ["edges", "pageInfo"];
 function makeEmptyData() {
     return {
         edges: [],
@@ -89,18 +115,4 @@ function makeEmptyData() {
         },
     };
 }
-function cursorFromEdge(edges, index) {
-    if (index < 0)
-        index += edges.length;
-    var edge = edges[index];
-    return edge && edge.cursor || "";
-}
-function updateCursor(edges, index, cursor) {
-    if (index < 0)
-        index += edges.length;
-    var edge = edges[index];
-    if (cursor && edge && cursor !== edge.cursor) {
-        edges[index] = __assign(__assign({}, edge), { cursor: cursor });
-    }
-}
 //# sourceMappingURL=pagination.js.map

package/utilities/policies/pagination.js.map

@@ -1 +1 @@
-{"version":3,"file":"pagination.js","sourceRoot":"","sources":["../../../src/utilities/policies/pagination.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pagination.js","sourceRoot":"","sources":["../../../src/utilities/policies/pagination.ts"],"names":[],"mappings":"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"}

package/utilities/utilities.cjs.js

@@ -681,55 +681,80 @@ function relayStylePagination(keyArgs) {
     return {
         keyArgs: keyArgs,
         read: function (existing, _a) {
-            var canRead = _a.canRead;
+            var canRead = _a.canRead, readField = _a.readField;
             if (!existing)
                 return;
-            var edges = existing.edges.filter(function (edge) { return canRead(edge.node); });
-            return tslib.__assign(tslib.__assign({}, existing), { edges: edges, pageInfo: tslib.__assign(tslib.__assign({}, existing.pageInfo), { startCursor: cursorFromEdge(edges, 0), endCursor: cursorFromEdge(edges, -1) }) });
+            var edges = [];
+            var startCursor = "";
+            var endCursor = "";
+            existing.edges.forEach(function (edge) {
+                if (canRead(readField("node", edge))) {
+                    edges.push(edge);
+                    if (edge.cursor) {
+                        startCursor = startCursor || edge.cursor;
+                        endCursor = edge.cursor;
+                    }
+                }
+            });
+            return tslib.__assign(tslib.__assign({}, getExtras(existing)), { edges: edges, pageInfo: tslib.__assign(tslib.__assign({}, existing.pageInfo), { startCursor: startCursor,
+                    endCursor: endCursor }) });
         },
         merge: function (existing, incoming, _a) {
             if (existing === void 0) { existing = makeEmptyData(); }
-            var args = _a.args;
-            if (!args)
-                return existing;
-            var incomingEdges = incoming.edges.slice(0);
+            var args = _a.args, isReference = _a.isReference, readField = _a.readField;
+            var incomingEdges = incoming.edges ? incoming.edges.map(function (edge) {
+                if (isReference(edge = tslib.__assign({}, edge))) {
+                    edge.cursor = readField("cursor", edge);
+                }
+                return edge;
+            }) : [];
             if (incoming.pageInfo) {
-                updateCursor(incomingEdges, 0, incoming.pageInfo.startCursor);
-                updateCursor(incomingEdges, -1, incoming.pageInfo.endCursor);
+                var _b = incoming.pageInfo, startCursor = _b.startCursor, endCursor = _b.endCursor;
+                var firstEdge_1 = incomingEdges[0];
+                if (firstEdge_1 && startCursor) {
+                    firstEdge_1.cursor = startCursor;
+                }
+                var lastEdge_1 = incomingEdges[incomingEdges.length - 1];
+                if (lastEdge_1 && endCursor) {
+                    lastEdge_1.cursor = endCursor;
+                }
             }
             var prefix = existing.edges;
             var suffix = [];
-            if (args.after) {
+            if (args && args.after) {
                 var index = prefix.findIndex(function (edge) { return edge.cursor === args.after; });
                 if (index >= 0) {
                     prefix = prefix.slice(0, index + 1);
                 }
             }
-            else if (args.before) {
+            else if (args && args.before) {
                 var index = prefix.findIndex(function (edge) { return edge.cursor === args.before; });
                 suffix = index < 0 ? prefix : prefix.slice(index);
                 prefix = [];
             }
-            else {
+            else if (incoming.edges) {
                 prefix = [];
             }
             var edges = tslib.__spreadArrays(prefix, incomingEdges, suffix);
-            var pageInfo = tslib.__assign(tslib.__assign(tslib.__assign({}, incoming.pageInfo), existing.pageInfo), { startCursor: cursorFromEdge(edges, 0), endCursor: cursorFromEdge(edges, -1) });
-            var updatePageInfo = function (name) {
-                var value = incoming.pageInfo[name];
-                if (value !== void 0) {
-                    pageInfo[name] = value;
+            var firstEdge = edges[0];
+            var lastEdge = edges[edges.length - 1];
+            var pageInfo = tslib.__assign(tslib.__assign(tslib.__assign({}, incoming.pageInfo), existing.pageInfo), { startCursor: firstEdge && firstEdge.cursor || "", endCursor: lastEdge && lastEdge.cursor || "" });
+            if (incoming.pageInfo) {
+                var _c = incoming.pageInfo, hasPreviousPage = _c.hasPreviousPage, hasNextPage = _c.hasNextPage;
+                if (!prefix.length && hasPreviousPage !== void 0) {
+                    pageInfo.hasPreviousPage = hasPreviousPage;
+                }
+                if (!suffix.length && hasNextPage !== void 0) {
+                    pageInfo.hasNextPage = hasNextPage;
                 }
-            };
-            if (!prefix.length)
-                updatePageInfo("hasPreviousPage");
-            if (!suffix.length)
-                updatePageInfo("hasNextPage");
-            return tslib.__assign(tslib.__assign(tslib.__assign({}, existing), incoming), { edges: edges,
+            }
+            return tslib.__assign(tslib.__assign(tslib.__assign({}, getExtras(existing)), getExtras(incoming)), { edges: edges,
                 pageInfo: pageInfo });
         },
     };
 }
+var getExtras = function (obj) { return tslib.__rest(obj, notExtras); };
+var notExtras = ["edges", "pageInfo"];
 function makeEmptyData() {
     return {
         edges: [],
@@ -741,20 +766,6 @@ function makeEmptyData() {
         },
     };
 }
-function cursorFromEdge(edges, index) {
-    if (index < 0)
-        index += edges.length;
-    var edge = edges[index];
-    return edge && edge.cursor || "";
-}
-function updateCursor(edges, index, cursor) {
-    if (index < 0)
-        index += edges.length;
-    var edge = edges[index];
-    if (cursor && edge && cursor !== edge.cursor) {
-        edges[index] = tslib.__assign(tslib.__assign({}, edge), { cursor: cursor });
-    }
-}
 
 var hasOwnProperty = Object.prototype.hasOwnProperty;
 function mergeDeep() {