feat(directives): support array type of result

thematters · Jul 30, 2020 · f5a028f · f5a028f
1 parent 734306a
commit f5a028f
Show file tree

Hide file tree

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

diff --git a/src/directives/logCache.ts b/src/directives/logCache.ts
@@ -47,20 +47,27 @@ export const LogCacheDirective = ({
         const [root, _, { __nodeFQCKeySet, __redis }] = args
         const result = await resolve.apply(this, args)
 
-        const nodeType = typeResolver ? typeResolver(type, result) : type
-        const nodeId =
-          get(result, identifier) || get(result, 'id') || get(result, '_id')
-
-        const shouldLogCache = __redis && __nodeFQCKeySet && nodeType && nodeId
-        if (!shouldLogCache) {
+        if (!__redis || !__nodeFQCKeySet) {
           return result
         }
 
-        try {
-          __nodeFQCKeySet.add(toNodeFQCKey({ type: nodeType, id: nodeId }))
-        } catch (error) {
-          console.warn(error)
-        }
+        const nodes = Array.isArray(result) ? result : [result]
+
+        nodes.forEach((node) => {
+          const nodeType = typeResolver ? typeResolver(type, node) : type
+          const nodeId =
+            get(node, identifier) || get(node, 'id') || get(node, '_id')
+
+          if (!nodeType || !nodeId) {
+            return
+          }
+
+          try {
+            __nodeFQCKeySet.add(toNodeFQCKey({ type: nodeType, id: nodeId }))
+          } catch (error) {
+            console.warn(error)
+          }
+        })
 
         return result
       }

diff --git a/src/directives/purgeCache.ts b/src/directives/purgeCache.ts
@@ -53,24 +53,28 @@ export const PurgeCacheDirective = ({
         const [root, _, { __redis }] = args
         const result = await resolve.apply(this, args)
 
-        const nodeType = typeResolver ? typeResolver(type, result) : type
-        const nodeId =
-          get(result, identifier) || get(result, 'id') || get(result, '_id')
-        const defaultNode = { id: nodeId, type: nodeType }
-
-        const shouldPurgeCache = __redis && nodeType && nodeId
-        if (!shouldPurgeCache) {
+        if (!__redis) {
           return result
         }
 
         const extraNodes = extraNodesPath ? get(result, extraNodesPath, []) : []
-        const nodes: Node[] = [...extraNodes, defaultNode]
-        nodes.map((node) => {
-          if (!node) {
+        const nodes = Array.isArray(result)
+          ? [...extraNodes, ...result]
+          : [...extraNodes, result]
+
+        nodes.forEach((node) => {
+          const nodeType = typeResolver ? typeResolver(type, node) : type
+          const nodeId =
+            get(node, identifier) || get(node, 'id') || get(node, '_id')
+
+          if (!nodeType || !nodeId) {
             return
           }
 
-          invalidateFQC({ node, redis: __redis })
+          invalidateFQC({
+            node: { type: nodeType, id: nodeId },
+            redis: __redis,
+          })
         })
 
         return result