Merge pull request #21 from thematters/develop

Release: v1.2.1
thematters · Aug 10, 2020 · e04b624 · e04b624
2 parents d3514df + adb4560
commit e04b624
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@matters/apollo-response-cache",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Caching and invalidation mechanisms (plugins, directives) of Apollo GraphQL",
   "author": "Matters <hi@matters.news>",
   "license": "MIT",

diff --git a/src/directives/purgeCache.ts b/src/directives/purgeCache.ts
@@ -57,12 +57,10 @@ export const PurgeCacheDirective = ({
           return result
         }
 
-        const extraNodes = extraNodesPath ? get(result, extraNodesPath, []) : []
-        const nodes = Array.isArray(result)
-          ? [...extraNodes, ...result]
-          : [...extraNodes, result]
-
-        nodes.forEach((node) => {
+        // parse results
+        const results = Array.isArray(result) ? [...result] : [result]
+        const parsedResults: Node[] = []
+        results.map((node) => {
           const nodeType = typeResolver ? typeResolver(type, node) : type
           const nodeId =
             get(node, identifier) || get(node, 'id') || get(node, '_id')
@@ -71,8 +69,19 @@ export const PurgeCacheDirective = ({
             return
           }
 
+          parsedResults.push({ type: nodeType, id: nodeId })
+        })
+
+        // merge results and extras
+        const extraNodes: Node[] = extraNodesPath
+          ? get(result, extraNodesPath, [])
+          : []
+        const nodes = [...extraNodes, ...parsedResults]
+
+        // invalidate
+        nodes.forEach((node) => {
           invalidateFQC({
-            node: { type: nodeType, id: nodeId },
+            node,
             redis: __redis,
           })
         })