support function parameters with schema

epoberezkin · epoberezkin · commit 32c00dbb5632 · 2016-05-01T19:24:27.000+01:00
diff --git a/lib/evaluation.js b/lib/evaluation.js
@@ -5,6 +5,7 @@ module.exports = Evaluation;
 
 function Evaluation(js, script, data, refPrefix) {
   this.js = js;
+  this.ajv = js.ajv;
   this.script = script;
   this.data = data;
   this.refPrefix = refPrefix;
diff --git a/lib/instruction_keywords.js b/lib/instruction_keywords.js
@@ -144,36 +144,53 @@ function eval$delay(params) {
  * @return {Function} Function that returns Script or synchronous/asynchronous value
  */
 function eval$func(params) {
-  var funcBody = params.$func;
-  if (typeof funcBody == 'string') {
-    if (Object.keys(params).length > 1)
-      throw new Error('reference to function "' + funcBody + '" has other properties');
-    if (!(funcBody in this.functions))
-      throw new Error('unknown function "' + funcBody + '"');
-    return this.functions[funcBody];
-  }
-
   var self = this;
-  var valid = this.js.validate(funcBody);
+  if (typeof params.$func == 'string')
+    return funcByName(params.$func);
+
+  var valid = this.js.validate(params.$func);
+  var argNames, argValidate;
   if (valid) {
     var pFunc = Promise.resolve(func);
     if (params.$name) this.functions[params.$name] = pFunc;
+    if (params.$args) {
+      argValidate = {};
+      argNames = params.$args.map(function (arg) {
+        if (typeof arg == 'string') return arg;
+        var name = Object.keys(arg)[0];
+        argValidate[name] = self.ajv.compile(arg[name]);
+        return name;
+      });
+    }
     return pFunc;
   }
-  throw new this.js.ajv.ValidationError(this.js.validate.errors);
+  throw new this.ajv.ValidationError(this.js.validate.errors);
 
   function func() {
-    var data = params.$args ? prepareArguments(arguments) : self.data;
-    var script = JSON.parse(JSON.stringify(funcBody));
+    var data = argNames ? prepareArguments(arguments) : self.data;
+    var script = JSON.parse(JSON.stringify(params.$func));
     return self.js.evaluate(script, data);
   }
 
+  function funcByName(name) {
+    if (Object.keys(params).length > 1)
+      throw new Error('reference to function "' + name + '" has other properties');
+    if (!(name in self.functions))
+      throw new Error('unknown function "' + name + '"');
+    return self.functions[name];
+  }
+
   function prepareArguments(args) {
     var data = {};
     for (var i=0; i<args.length; i++) {
       data[i] = args[i];
-      var argName = params.$args[i];
-      if (argName) data[argName] = args[i];
+      var argName = argNames[i];
+      if (argName) {
+        data[argName] = args[i];
+        var validate = argValidate[argName];
+        if (validate && !validate(args[i]))
+          throw new self.ajv.ValidationError(validate.errors);
+      }
     }
     return data;
   }
