initial implementation of base behavior of individual packaging

Author: bweigel

index.js

@@ -46,6 +46,7 @@ class ServerlessPythonRequirements {
         useDownloadCache: false,
         cacheLocation: false,
         staticCacheMaxVersions: 0,
+        IndividuallyMoveUpModules: true,
         pipCmdExtraArgs: [],
         noDeploy: [
           'boto3',

lib/inject.js

@@ -50,20 +50,27 @@ function injectRequirements(requirementsPath, packagePath, options) {
  * @param {string} module module to keep
  * @return {Promise} the JSZip object written out.
  */
-function moveModuleUp(source, target, module) {
+function moveModuleUp(source, target, module, options) {
   const targetZip = new JSZip();
 
   return fse
     .readFileAsync(source)
     .then(buffer => JSZip.loadAsync(buffer))
     .then(sourceZip => sourceZip.filter(file => file.startsWith(module + '/')))
-    .map(srcZipObj =>
-      zipFile(
-        targetZip,
-        srcZipObj.name.replace(module + '/', ''),
-        srcZipObj.async('nodebuffer')
-      )
-    )
+    .map(srcZipObj => {
+      let targetName;
+
+      if (
+        options.IndividuallyMoveUpModules === true ||
+        options.IndividuallyMoveUpModules == 'true'
+      ) {
+        targetName = srcZipObj.name.replace(module + '/', '');
+      } else {
+        targetName = srcZipObj.name;
+      }
+
+      return zipFile(targetZip, targetName, srcZipObj.async('nodebuffer'));
+    })
     .then(() => writeZip(targetZip, target));
 }
 
@@ -95,9 +102,12 @@ function injectAllRequirements(funcArtifact) {
             `${func.module}-${func.name}.zip`
           );
           func.package.artifact = newArtifact;
-          return moveModuleUp(artifact, newArtifact, func.module).then(
-            () => func
-          );
+          return moveModuleUp(
+            artifact,
+            newArtifact,
+            func.module,
+            this.options
+          ).then(() => func);
         } else {
           return func;
         }
@@ -106,10 +116,10 @@ function injectAllRequirements(funcArtifact) {
         return this.options.zip
           ? func
           : injectRequirements(
-              path.join('.serverless', func.module, 'requirements'),
-              func.package.artifact,
-              this.options
-            );
+            path.join('.serverless', func.module, 'requirements'),
+            func.package.artifact,
+            this.options
+          );
       });
   } else if (!this.options.zip) {
     return injectRequirements(