From 6ad1eb079d1da4cad7b5a793ef8ab8b0ecce8dd3 Mon Sep 17 00:00:00 2001
From: Matt Meyers <mmeyers@xomly.com>
Date: Fri, 18 Mar 2022 21:29:10 -0600
Subject: [PATCH 1/3] adding correct support for layers

---
 src/Serverless.d.ts | 7 +++++++
 src/index.ts        | 8 ++++++++
 2 files changed, 15 insertions(+)

diff --git a/src/Serverless.d.ts b/src/Serverless.d.ts
index 7c3e9f2d..38ef5875 100644
--- a/src/Serverless.d.ts
+++ b/src/Serverless.d.ts
@@ -15,8 +15,10 @@ declare namespace Serverless {
       functions: {
         [key: string]: Serverless.Function
       }
+      layers: { [key: string]: Serverless.Layer }
       package: Serverless.Package
       getAllFunctions(): string[]
+      getAllLayers: () => string[]
       custom?: {
         serverlessPluginTypescript?: {
           tsConfigFileLocation: string
@@ -38,6 +40,11 @@ declare namespace Serverless {
     package: Serverless.Package
   }
 
+  interface Layer {
+    handler: string
+    package: Serverless.Package
+  }
+
   interface Package {
     include: string[]
     exclude: string[]
diff --git a/src/index.ts b/src/index.ts
index adafe7a3..48cb3988 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -269,6 +269,14 @@ export class TypeScriptPlugin {
           path.basename(service.functions[name].package.artifact)
         )
       })
+      const layerNames = service.getAllLayers()
+      layerNames.forEach(name => {
+        service.layers[name].package.artifact = path.join(
+          this.originalServicePath,
+          SERVERLESS_FOLDER,
+          path.basename(service.layers[name].package.artifact)
+        )
+      })
       return
     }
 

From 863bb4435f8bd7c7ffbfaf95a4ecfe76321913e6 Mon Sep 17 00:00:00 2001
From: Matt Meyers <mmeyers@xomly.com>
Date: Sat, 19 Mar 2022 00:54:13 -0600
Subject: [PATCH 2/3] apply layers fix always

---
 src/index.ts | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index 48cb3988..fb1a875c 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -250,6 +250,15 @@ export class TypeScriptPlugin {
       path.join(this.originalServicePath, SERVERLESS_FOLDER)
     )
 
+    const layerNames = service.getAllLayers()
+    layerNames.forEach(name => {
+      service.layers[name].package.artifact = path.join(
+        this.originalServicePath,
+        SERVERLESS_FOLDER,
+        path.basename(service.layers[name].package.artifact)
+      )
+    })
+
     if (this.options.function) {
       const fn = service.functions[this.options.function]
       fn.package.artifact = path.join(
@@ -268,15 +277,7 @@ export class TypeScriptPlugin {
           SERVERLESS_FOLDER,
           path.basename(service.functions[name].package.artifact)
         )
-      })
-      const layerNames = service.getAllLayers()
-      layerNames.forEach(name => {
-        service.layers[name].package.artifact = path.join(
-          this.originalServicePath,
-          SERVERLESS_FOLDER,
-          path.basename(service.layers[name].package.artifact)
-        )
-      })
+      })      
       return
     }
 

From d8032babc29905c778805033333c0ce2da5841a2 Mon Sep 17 00:00:00 2001
From: Matt Meyers <mmeyers@xomly.com>
Date: Sat, 19 Mar 2022 00:56:23 -0600
Subject: [PATCH 3/3] matching styling

---
 src/Serverless.d.ts | 2 +-
 src/index.ts        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Serverless.d.ts b/src/Serverless.d.ts
index 38ef5875..3b05529e 100644
--- a/src/Serverless.d.ts
+++ b/src/Serverless.d.ts
@@ -18,7 +18,7 @@ declare namespace Serverless {
       layers: { [key: string]: Serverless.Layer }
       package: Serverless.Package
       getAllFunctions(): string[]
-      getAllLayers: () => string[]
+      getAllLayers(): string[]
       custom?: {
         serverlessPluginTypescript?: {
           tsConfigFileLocation: string
diff --git a/src/index.ts b/src/index.ts
index fb1a875c..d4ebc0b8 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -277,7 +277,7 @@ export class TypeScriptPlugin {
           SERVERLESS_FOLDER,
           path.basename(service.functions[name].package.artifact)
         )
-      })      
+      })
       return
     }