Merge branch 'master' of github.com:serverless/serverless-openwhisk

Author: jthomas

compile/functions/runtimes/node.js

@@ -17,6 +17,21 @@ class Node extends BaseRuntime {
     zip.file("package.json", JSON.stringify({main: handlerFile}))
     return zip
   }
+
+  //We're handling a special case here which is that if TypeScript is being used
+  //we won't actually have a ".js" file (this.extension), instead we'll have a "ts"
+  //which should still be considered safe enough, or at least shouldn't
+  //completely stop the deployment process
+  isValidFile(handlerFile) {
+    return super.isValidFile(handlerFile) || this.isValidTypeScriptFile(handlerFile);
+  }
+
+  //Check for TypeScript version of handler file
+  isValidTypeScriptFile(handlerFile) {
+    //replaces the last occurance of `.js` with `.ts`, case insensitive
+    const typescriptHandlerFile = handlerFile.replace(/\.js$/gi, ".ts");
+    return super.isValidFile(typescriptHandlerFile);
+  }
 }
 
 module.exports = Node

compile/functions/runtimes/tests/node.js

@@ -7,6 +7,7 @@ require('chai').use(chaiAsPromised);
 
 const sinon = require('sinon');
 const Node = require('../node');
+const BaseRuntime = require('../base');
 const JSZip = require("jszip");
 const fs = require('fs-extra');
 
@@ -96,6 +97,28 @@ describe('Node', () => {
     })
   });
 
+  describe('#isValidTypeScriptFile()', () => {
+    it('should report valid file path when a js path is passed that has a ts file instead', () => {
+      //We need to mock the node's `super` call, which is why we're using BaseRuntime
+      sandbox.stub(BaseRuntime.prototype, 'isValidFile', (path) => {
+        expect(path).to.equal('valid_typescript_handler_wrong_extension.ts');
+        return true;
+      });
+      expect(node.isValidTypeScriptFile('valid_typescript_handler_wrong_extension.js')).to.equal(true)
+    });
+  });
+
+  describe('#isValidFile()', () => {
+    it('should still allow a js file to be used for handler', () => {
+      //We need to mock the node's `super` call, which is why we're using BaseRuntime
+      sandbox.stub(BaseRuntime.prototype, 'isValidFile', (path) => {
+        expect(path).to.equal('valid_js_handler.js');
+        return true;
+      });
+      expect(node.isValidFile('valid_js_handler.js')).to.equal(true)
+    });
+  });
+
   describe('#generateActionPackage()', () => {
     it('should throw error for missing handler file', () => {
       expect(() => node.generateActionPackage({handler: 'does_not_exist.main'}))