Merge pull request #66 from herzog31/issue/65

Optimize path extraction of action handlers

Author: jthomas

compile/functions/runtimes/base.js

@@ -51,7 +51,11 @@ class BaseRuntime {
   }
 
   convertHandlerToPath(functionHandler) {
-    return functionHandler.replace(/\..*$/, this.extension)
+    const lastDot = functionHandler.lastIndexOf('.');
+    if (lastDot === -1) {
+      return functionHandler;
+    }
+    return functionHandler.substring(0, lastDot) + this.extension;
   }
 
   generateActionPackage(functionObject) {

compile/functions/tests/index.js

@@ -7,6 +7,29 @@ require('chai').use(chaiAsPromised);
 
 const sinon = require('sinon');
 const OpenWhiskCompileFunctions = require('../index');
+const BaseRuntime = require('../runtimes/base.js');
+
+describe('BaseRuntime', () => {
+  describe('#convertHandlerToPath', () => {
+    const base = new BaseRuntime();
+    base.extension = '.js';
+
+    it('should extract the path for a given file handler', () => {
+      const result = base.convertHandlerToPath('index.main');
+      expect(result).to.equal('index.js');
+    });
+
+    it('should return the input for a given file handler without exported function', () => {
+      const result = base.convertHandlerToPath('index');
+      expect(result).to.equal('index');
+    });
+
+    it('should extract the path for a given path handler', () => {
+      const result = base.convertHandlerToPath('[email protected]/index.main');
+      expect(result).to.equal('[email protected]/index.js');
+    });
+  });
+});
 
 describe('OpenWhiskCompileFunctions', () => {
   let serverless;