Merge pull request #59 from SqueezerIO/nickfix

Nickfix

Author: nickchisiu

CHANGELOG.md

@@ -1,3 +1,10 @@
+## v1.1.24 - 2018-01-25
+- disabled functions compiling when changing "squeezer.yml" vars on local development
+- added yarn to install the functions packages
+
+## v1.1.22 - 2017-12-18
+- fixed packages parsing issue
+
 ## v1.1.22 - 2017-12-16
 - fixed major dependencies parsing bugs
 ## v1.1.21 - 2017-12-02

docs/development/function.md

@@ -9,6 +9,8 @@ Any function can be trigger by a specific event .
 `FUNCTION/squeezer.yml`
 
 ```yaml
+name: hello
+
 event:
   type: http
   path: /rest/v1/hello

lib/common/checksums/lib/deps.js

@@ -47,9 +47,11 @@ class Deps {
           this.packages = JSON.parse(fs.readFileSync(path.join(this.sqz.vars.project.path, 'package.json'))).dependencies;
         }
 
+        const formattedVal = val.split('/')[0];
+
         packages.push({
-          pkg : val,
-          version : this.packages[val]
+          pkg : formattedVal,
+          version : this.packages[formattedVal]
         });
       }
     });

lib/common/functions/index.js

@@ -8,16 +8,21 @@ class Functions {
     this.sqz = sqz;
   }
 
-  add(functionName, functionPath, functionService) {
+  add(functionPath, functionService) {
     const options = this.sqz.cli.params.get().options;
     const configFilePath = path.join(functionPath, 'squeezer.yml');
     const functionObject = this.sqz.yaml.parse(configFilePath);
+    const functionName = functionObject.name;
     const functionIdentifier = this.sqz.utils.getIdentifier(functionName);
     const functionOpt = options.function || null;
 
     let flagged = true;
     let force = false;
 
+    if (!functionName) {
+      this.sqz.cli.log.error(`Missing function name on ${configFilePath}`);
+    }
+
     if (functionOpt && functionName !== functionOpt) {
       flagged = false;
     }

lib/plugins/compile/hooks.yml

@@ -1,3 +1,6 @@
 - identifier : 'compile:run'
   path : 'lib/compile'
   function : 'run'
+- identifier : 'compile:vars'
+  path : 'lib/compile'
+  function : 'vars'

lib/plugins/compile/lib/compile.js

@@ -43,6 +43,15 @@ class Compile {
     });
   }
 
+  vars() {
+    return new Promise((resolve) => {
+      this.buildMainVars('local', 'development').then((mainVars) => {
+        this.buildFunctionsVars(mainVars);
+        resolve();
+      });
+    });
+  }
+
   buildMainVars(stage, compileType) {
     return new Promise((resolve) => {
       const projectVars = this.sqz.vars.project.vars;

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

@@ -63,6 +63,7 @@ class Compile {
   compileFunction(functionObject) {
     return new Promise((resolve) => {
       const projectPath = path.normalize(this.sqz.vars.project.path);
+      const projectRuntime = this.sqz.vars.project.runtime;
       const source = path.join(functionObject.path, 'src');
       const output = path.join(projectPath, '.build', this.compileType, 'functions', functionObject.identifier);
 
@@ -86,17 +87,26 @@ class Compile {
 
       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 (projectRuntime === 'nodejs') {
+          const packagesData = {
+            license : 'UNLICENSED',
+            dependencies : {}
+          };
+
+          _.forEach(treeData.functions[functionObject.name].packages, (obj) => {
+            packagesData.dependencies[obj.pkg] = obj.version;
+          });
+
+          fs.writeFileSync(path.join(output, 'package.json'), JSON.stringify(packagesData, null, 2));
+        }
+
+        const functionPackagesHook = path.join(projectPath, 'lib', 'hooks', 'commands', 'compile', this.compileType, 'package.yml');
+
+        compileCmds = _.concat(
+          compileCmds,
+          this.sqz.yaml.parse(functionPackagesHook, options)
+        );
       }
 
       if (!_.isEmpty(compileCmds)) {

lib/plugins/functions/lib/load/index.js

@@ -29,9 +29,9 @@ class loadFunctions {
     const walkService = (service) => {
       const servicePath = path.join(projectPath, 'services', service);
 
-      fs.readdirSync(servicePath).forEach((functionName) => {
-        const functionPath = path.join(servicePath, functionName);
-        this.sqz.functions.add(functionName, functionPath, service);
+      fs.readdirSync(servicePath).forEach((functionDir) => {
+        const functionPath = path.join(servicePath, functionDir);
+        this.sqz.functions.add(functionPath, service);
       });
     };
 

lib/plugins/templates/lib/samples/api-nodejs/data/services/my-service/hello/squeezer.yml

@@ -1,3 +1,5 @@
+name: hello
+
 event:
   type: http
   path: /rest/v1/hello/*

lib/plugins/templates/lib/samples/api-nodejs/data/services/my-service/hello/src/handler.js

@@ -1,7 +1,9 @@
 'use strict';
 
 import event from 'squeezer-event-node';
-import vars from './.vars';
+import fs from 'fs';
+
+const vars = JSON.parse(fs.readFileSync('.vars.json', 'utf8'));
 
 exports.handler = (...args) => event(vars, (req, res) => {
   res.json(200, {