Skip functions that do not use node runtime. Allows mixed runtime projects.

Author: John Reeves

Diff for: src/Serverless.d.ts

@@ -11,6 +11,7 @@ declare namespace Serverless {
     service: {
       provider: {
         name: string
+        runtime: string
       }
       functions: {
         [key: string]: Serverless.Function
@@ -30,6 +31,7 @@ declare namespace Serverless {
 
   interface Function {
     handler: string
+    runtime: string
     package: Serverless.Package
   }
 

Diff for: src/typeScriptPlugin.ts

@@ -92,10 +92,24 @@ export class TypeScriptPlugin {
     return typescript.extractFileNames(
       this.originalServicePath,
       this.serverless.service.provider.name,
-      this.functions
+      this.nodeFunctions
     )
   }
 
+  get nodeFunctions() {
+    const { service } = this.serverless
+    const functions = this.functions
+
+    // filter out functions that have a non-node runtime because they can't even typescript
+    return Object.keys(this.functions)
+      .map(fn => ({fn, runtime: functions[fn].runtime || service.provider.runtime}))
+      .filter(fnObj => fnObj.runtime.match(/nodejs/))
+      .reduce((prev, cur) => ({
+        ...prev,
+        [cur.fn]: service.functions[cur.fn]
+      }), {} as {[key: string]: Serverless.Function})
+  }
+
   prepare() {
     // exclude serverless-plugin-typescript
     for (const fnName in this.functions) {
@@ -234,7 +248,7 @@ export class TypeScriptPlugin {
     }
 
     if (service.package.individually) {
-      const functionNames = service.getAllFunctions()
+      const functionNames = Object.keys(this.nodeFunctions)
       functionNames.forEach(name => {
         service.functions[name].package.artifact = path.join(
           this.originalServicePath,

Diff for: tests/TypeScriptPlugin.test.ts

@@ -0,0 +1,58 @@
+import {TypeScriptPlugin} from '../src/typeScriptPlugin'
+
+describe('TypeScriptPlugin', () => {
+    it('rootFileNames includes only node runtimes', () => {
+        const slsInstance: Serverless.Instance = {
+            cli: {
+              log: jest.fn()
+            },
+            config: {
+              servicePath: 'servicePath'
+            },
+            service: {
+              provider: {
+                name: 'aws',
+                runtime: 'nodejs99'
+              },
+              package: {
+                individually: true,
+                include: [],
+                exclude: [] 
+              },
+              functions: {
+                func1: {
+                    handler: 'java-fn',
+                    runtime: 'java8',
+                    package: {
+                        include: [],
+                        exclude: []
+                    }
+                },
+                func2: {
+                    handler: 'node-fn',
+                    runtime: 'nodejs99',
+                    package: {
+                        include: [],
+                        exclude: []
+                    }
+                }
+              },
+              
+              getAllFunctions: jest.fn()
+            },
+            pluginManager: {
+                spawn: jest.fn()
+            }
+          }
+
+        const plugin = new TypeScriptPlugin(slsInstance, {})
+
+        expect(
+            Object.keys(plugin.nodeFunctions)
+        ).toEqual(
+            [
+                'func2'
+            ],
+        )
+    })
+})

Diff for: tests/typescript.extractFileName.test.ts

@@ -4,20 +4,23 @@ import * as path from 'path'
 const functions: { [key: string]: Serverless.Function } = {
     hello: {
         handler: 'tests/assets/hello.handler',
+        runtime: 'nodejs10.1',
         package: {
             include: [],
             exclude: []
         }
     },
     world: {
         handler: 'tests/assets/world.handler',
+        runtime: 'nodejs10.1',
         package: {
             include: [],
             exclude: []
         }
     },
     js: {
         handler: 'tests/assets/jsfile.create',
+        runtime: 'nodejs10.1',
         package: {
             include: [],
             exclude: []