Merge pull request #58 from SqueezerIO/nickfix

fixed major dependencies parsing bugs

Author: nickchisiu

CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.1.22 - 2017-12-16
+- fixed major dependencies parsing bugs
+## v1.1.21 - 2017-12-02
+- fixed packages issues
+
 ## v1.1.20 - 2017-11-24
 - fixed functions checksum file deps
 

lib/common/checksums/index.js

@@ -84,7 +84,8 @@ class Checksums {
 
     if (!_.has(this.tree.functions, functionName)) {
       this.tree.functions[functionName] = {
-        deps: []
+        deps: [],
+        packages : []
       };
     }
 
@@ -106,28 +107,33 @@ class Checksums {
   }
 
   parseFile(file, functionName) {
-    const stat = fs.statSync(file);
+    if (fs.existsSync(file)) {
+      const stat = fs.statSync(file);
 
-    if (!_.includes(this.tree.functions[functionName].deps, file)) {
-      this.tree.functions[functionName].deps.push(file);
-    }
+      if (!_.includes(this.tree.functions[functionName].deps, file)) {
+        this.tree.functions[functionName].deps.push(file);
+      }
 
-    if (this.tree.files[file] && this.tree.files[file].mtimeMs === stat.mtimeMs) {
-      return;
-    }
+      if (this.tree.files[file] && this.tree.files[file].mtimeMs === stat.mtimeMs
+        && this.tree.functions[functionName].deps[file]) {
+        return;
+      }
 
-    const data = fs.readFileSync(file, 'utf8');
-    const md5 = crypto.createHash('md5').update(data).digest('hex');
-    const deps = this.deps.crawl(data, file);
+      const data = fs.readFileSync(file, 'utf8');
+      const md5 = crypto.createHash('md5').update(data).digest('hex');
+      const deps = this.deps.crawl(data, file);
 
-    this.tree.files[file] = {
-      md5: md5,
-      mtimeMs: stat.mtimeMs
-    };
+      this.tree.files[file] = {
+        md5: md5,
+        mtimeMs: stat.mtimeMs
+      };
 
-    _.forEach(deps, (dep) => {
-      this.parseFile(dep, functionName);
-    });
+      _.forEach(deps.files, (dep) => {
+        this.parseFile(dep, functionName);
+      });
+
+      this.tree.functions[functionName].packages = _.unionBy(deps.packages, this.tree.functions[functionName].packages, 'pkg');
+    }
   }
 }
 

lib/common/checksums/lib/data.js

@@ -37,7 +37,7 @@ class Data {
         const key = this.getKey();
         const apiBaseUrl = this.sqz.vars.apiBaseUrl;
         const endpoint = `${apiBaseUrl}/rest/v1/deployment/${key}`;
-
+resolve();
         if (key) {
           request.get(endpoint, { json: true }, (error, response, body) => {
             if (!error && response.statusCode === 200 && body.message === 'success') {

lib/common/checksums/lib/deps.js

@@ -25,7 +25,8 @@ class Deps {
   javascriptCrawler(data, dir) {
     const localRegex = /^.\.\/|^.\/|^\//;
 
-    const deps = [];
+    const files = [];
+    const packages = [];
 
     const umdData = precinct(data);
 
@@ -38,13 +39,25 @@ class Deps {
 
         _.forEach(permutations, (permutation) => {
           if (fs.existsSync(permutation)) {
-            deps.push(permutation);
+            files.push(permutation);
           }
         });
+      } else {
+        if (!this.packages) {
+          this.packages = JSON.parse(fs.readFileSync(path.join(this.sqz.vars.project.path, 'package.json'))).dependencies;
+        }
+
+        packages.push({
+          pkg : val,
+          version : this.packages[val]
+        });
       }
     });
 
-    return deps;
+    return {
+      files : files,
+      packages : packages
+    };
   }
 }
 

lib/plugins/compile/lib/compile.js

@@ -19,7 +19,7 @@ class Compile {
       const compileFunctions = new CompileFunctions(this.sqz);
       let compileType = 'development' || this.options.cloud;
 
-      let stage = this.options.stage;
+      let stage = this.options.stage || 'local';
 
       if (_.has(this.options, 'cloud')) {
         compileType = 'cloud';

lib/plugins/functions/lib/compile/lib/index.js

@@ -84,6 +84,21 @@ class Compile {
         this.sqz.yaml.parse(functionHook, options)
       );
 
+      if (this.compileType === 'cloud') {
+        const treeData = JSON.parse(fs.readFileSync(path.join(projectPath, '.build', 'tree.json')));
+        _.forEach(treeData.functions[functionObject.name].packages, (obj) => {
+          const functionPackagesHook = path.join(projectPath, 'lib', 'hooks', 'commands', 'compile', this.compileType, 'package.yml');
+
+          compileCmds = _.concat(
+            compileCmds,
+            this.sqz.yaml.parse(functionPackagesHook, Object.assign(options, {
+              pkg : obj.pkg,
+              version : obj.version
+            }))
+          );
+        });
+      }
+
       if (!_.isEmpty(compileCmds)) {
         this.sqz.cli.log.info(`Compiling function "${colors.blue.bold(functionObject.name)}"`);
       }

lib/plugins/run/index.js

@@ -12,6 +12,7 @@ class PluginRun {
         lifecycle   : [
           'project:validate',
           'functions:load',
+          'compile:run',
           'function:run'
         ],
         options     : {

lib/plugins/templates/lib/shared/nodejs/lib/hooks/commands/compile/cloud/package.yml

@@ -0,0 +1,8 @@
+- description: Installing package ${pkg}
+  bin: npm
+  args:
+    - 'install'
+    - '--silent'
+    - '--prefix'
+    - '${output}'
+    - '${pkg}@${version}'

lib/plugins/templates/lib/shared/nodejs/lib/webpack/functions/cloud.js

@@ -1,5 +1,8 @@
+const nodeExternals = require('webpack-node-externals');
+
 module.exports = {
   target: 'node',
+  externals: [nodeExternals()],
   module: {
     loaders: [{
       test: /\.js$/,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "squeezer-cli",
-  "version": "1.1.20",
+  "version": "1.1.22",
   "preferGlobal": true,
   "description": "Event-driven APIs & Web apps on functions, serverless ! Squeezer is a framework designed to help developers to get a better architecture on serverless zero-administration compute platforms with code that runs into cloud functions like [AWS Lambda](https://aws.amazon.com/documentation/lambda/) , [Azure Functions](https://azure.microsoft.com/en-us/services/functions/) , [Google Cloud Functions](https://cloud.google.com/functions/docs/) and [IBM OpenWhisk](https://developer.ibm.com/openwhisk/) .",
   "homepage": "https://squeezer.io/",