Use caching to reduce redundant work

Author: rschick

__tests__/fixtures/bar/index.js

@@ -1 +1,2 @@
+require('../babel');
 module.exports = require('./baz');

__tests__/fixtures/dep-local-named-2.js

@@ -0,0 +1 @@
+require('local/named');

__tests__/fixtures/foo/index.js

@@ -1 +1,2 @@
+require('../babel');
 module.exports = require('./baz');

__tests__/get-dependency-list.js

@@ -119,3 +119,17 @@ test('understands local named dependencies', (t) => {
   t.true(list.some(item => item.endsWith('dep-local-named.js')));
   t.true(list.some(item => item.endsWith('local/named/index.js')));
 });
+
+test('caches lookups', (t) => {
+  const fileName = path.join(__dirname, 'fixtures', 'dep-local-named.js');
+  const fileName2 = path.join(__dirname, 'fixtures', 'dep-local-named-2.js');
+
+  const cache = new Set();
+  const list1 = getDependencyList(fileName, serverless, cache);
+  const list2 = getDependencyList(fileName2, serverless, cache);
+
+  t.true(list1.some(item => item.endsWith('dep-local-named.js')));
+  t.true(list1.some(item => item.endsWith('local/named/index.js')));
+  t.true(list2.some(item => item.endsWith('dep-local-named-2.js')));
+  t.false(list2.some(item => item.endsWith('local/named/index.js')));
+});

get-dependency-list.js

@@ -13,18 +13,23 @@ function ignoreMissing(dependency, optional, peerDependenciesMeta) {
     || peerDependenciesMeta && dependency in peerDependenciesMeta && peerDependenciesMeta[dependency].optional;
 }
 
-module.exports = function(filename, serverless) {
+module.exports = function(filename, serverless, _cache) {
   const servicePath = serverless.config.servicePath;
-
-  const filePaths = new Set();
   const modulePaths = new Set();
-
+  const filePaths = new Set();
+  const cache = _cache || new Set();
   const modulesToProcess = [];
   const localFilesToProcess = [filename];
 
   function handle(name, basedir, optionalDependencies, peerDependenciesMeta) {
     const moduleName = requirePackageName(name.replace(/\\/, '/'));
 
+    if (cache.has(`${basedir}:${name}`)) {
+      return;
+    }
+
+    cache.add(`${basedir}:${name}`);
+
     try {
       const pathToModule = resolve.sync(path.join(moduleName, 'package.json'), { basedir });
       const pkg = readPkgUp.sync({ cwd: pathToModule });

include-dependencies.js

@@ -23,6 +23,10 @@ module.exports = class IncludeDependencies {
 
     this.serverless = serverless;
     this.options = options;
+    this.globalCache = new Set();
+
+    const service = this.serverless.service;
+    this.individually = service.package && service.package.individually;
 
     this.hooks = {
       'before:deploy:function:packageFunction': this.functionDeploy.bind(this),
@@ -93,7 +97,7 @@ module.exports = class IncludeDependencies {
       return;
     }
     const include = union(options.always, []);
-    if (service.package && service.package.individually) {
+    if (this.individually) {
       const exclude = union(service.package.exclude, functionObject.package.exclude);
       this.includeGlobs(functionObject, include, exclude);
     } else {
@@ -107,7 +111,7 @@ module.exports = class IncludeDependencies {
 
     const fileName = this.getHandlerFilename(functionObject.handler);
 
-    if (service.package && service.package.individually) {
+    if (this.individually) {
       const exclude = union(service.package.exclude, functionObject.package.exclude);
       const dependencies = this.getDependencies(fileName, exclude);
 
@@ -149,7 +153,8 @@ module.exports = class IncludeDependencies {
   }
 
   getDependencyList(fileName) {
-    return getDependencyList(fileName, this.serverless);
+    const cache = this.individually ? new Set() : this.globalCache;
+    return getDependencyList(fileName, this.serverless, cache);
   }
 
   include(target, dependencies) {

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "serverless-plugin-include-dependencies",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "engines": {
     "node": ">=4.0"
   },