(WIP) Add option to package individually without moving module content to root folder (i.e. like base serverless)

index.js

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

lib/inject.js

@@ -56,20 +56,17 @@ function injectRequirements(requirementsPath, packagePath, options) {
  * @param {string} module module to keep
  * @return {Promise} the JSZip object written out.
  */
-function moveModuleUp(source, target, module) {
+function injectSourceCode(source, target, module) {
   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')
-      )
-    )
+    .then(sourceZip => sourceZip.filter(() => true))
+    .map(srcZipObj => {
+      let targetName = srcZipObj.name.replace(module + '/', '');
+      return zipFile(targetZip, targetName, srcZipObj.async('nodebuffer'));
+    })
     .then(() => writeZip(targetZip, target));
 }
 
@@ -99,14 +96,24 @@ function injectAllRequirements(funcArtifact) {
         return func;
       })
       .map(func => {
-        if (func.module !== '.') {
+        if (
+          this.options.IndividuallyMoveUpModules === true ||
+          this.options.IndividuallyMoveUpModules === 'true'
+        ) {
           const artifact = func.package ? func.package.artifact : funcArtifact;
-          const newArtifact = path.join(
-            '.serverless',
-            `${func.module}-${func.name}.zip`
-          );
+
+          let newArtifact;
+          if (func.module === '.') {
+            newArtifact = path.join('.serverless', `root-${func.name}.zip`);
+          } else {
+            newArtifact = path.join(
+              '.serverless',
+              `${func.module}-${func.name}.zip`
+            );
+          }
+
           func.package.artifact = newArtifact;
-          return moveModuleUp(artifact, newArtifact, func.module).then(
+          return injectSourceCode(artifact, newArtifact, func.module).then(
             () => func
           );
         } else {