Support negatives in default params

Author: keithwhor

lib/parser/nodejs/exported_function_parser.js

@@ -23,7 +23,8 @@ class ExportedFunctionParser {
       BooleanLiteral: 'boolean',
       NullLiteral: 'any',
       ObjectExpression: 'object',
-      ArrayExpression: 'array'
+      ArrayExpression: 'array',
+      UnaryExpression: 'number'
     };
     this.validateExpressions = {
       ObjectExpression: (node, stack) => {
@@ -41,6 +42,19 @@ class ExportedFunctionParser {
       },
       ArrayExpression: (node, stack) => {
         return node.elements.map((el, i) => this.validateDefaultParameterExpression(i, el, stack));
+      },
+      UnaryExpression: (node, stack) => {
+        if (node.argument.type === 'NumericLiteral') {
+          if (node.operator === '-') {
+            return -node.argument.value;
+          } else if (node.operator === '+') {
+            return node.argument.value;
+          } else {
+            throw new Error(`Invalid UnaryExpression`);
+          }
+        } else {
+          throw new Error(`Invalid UnaryExpression`);
+        }
       }
     };
   }
@@ -50,8 +64,11 @@ class ExportedFunctionParser {
     stack = (stack || []).slice(0);
     stack.push(name);
 
-    if (!this.literals[node.type]) {
-      throw new Error(`(${stack.join('.')}) Expected ${Object.keys(this.literals).join(', ')} in Right-Hand of AssignmentPattern`);
+    let type = node.type;
+
+    if (!this.literals[type]) {
+      console.log(node);
+      throw new Error(`(${stack.join('.')}) Expected ${Object.keys(this.literals).join(', ')} in Right-Hand of AssignmentPattern, got ${type}.`);
     }
 
     if (this.validateExpressions[node.type]) {
@@ -107,7 +124,7 @@ class ExportedFunctionParser {
     return expression.right;
   }
 
-  parseParamsFromFunctionExpression(functionExpression) {
+  parseParamsFromFunctionExpression(functionExpression, fileString) {
 
     if (!functionExpression) {
       return {
@@ -169,7 +186,15 @@ class ExportedFunctionParser {
               if (!this.validateFunctionParamName(param.left.name)) {
                 throw new Error(`Invalid parameter name "${param.left.name}"`);
               }
-              let defaultValue = this.validateDefaultParameterExpression(param.left.name, param.right);
+              let defaultValue;
+              try {
+                defaultValue = this.validateDefaultParameterExpression(param.left.name, param.right);
+              } catch (e) {
+                throw new Error([
+                  `Invalid default parameter: ${param.left.name} = ${fileString.slice(param.right.start, param.right.end)}`,
+                  `(${e.message})`
+                ].join(' '));
+              }
               formattedParam = {
                 name: param.left.name,
                 type: this.literals[param.right.type],
@@ -287,7 +312,7 @@ class ExportedFunctionParser {
     }
 
     let commentDefinition = this.commentDefinitionParser.parse(name, comment);
-    let functionDefinition = this.parseParamsFromFunctionExpression(functionExpression);
+    let functionDefinition = this.parseParamsFromFunctionExpression(functionExpression, fileString);
 
     let description = commentDefinition.description || '';
     let origins = commentDefinition.origins || null;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionscript",
-  "version": "2.9.1",
+  "version": "2.9.2",
   "description": "An API gateway and framework for turning functions into web services",
   "author": "Keith Horwood <keithwhor@gmail.com>",
   "main": "index.js",

tests/files/cases/function_invalid_parameter_not.js

@@ -0,0 +1,9 @@
+/**
+* My function
+* @param {string} a alpha
+* @param {number} b beta
+* @returns {string}
+*/
+module.exports = async (a = 'hi', b = !7, context) => {
+  // valid, negative number
+};

tests/files/cases/function_invalid_parameter_not_not.js

@@ -0,0 +1,9 @@
+/**
+* My function
+* @param {string} a alpha
+* @param {number} b beta
+* @returns {string}
+*/
+module.exports = async (a = 'hi', b = !!7, context) => {
+  // valid, negative number
+};

tests/files/cases/function_valid_parameter_negative.js

@@ -0,0 +1,9 @@
+/**
+* My function
+* @param {string} a alpha
+* @param {number} b beta
+* @returns {string}
+*/
+module.exports = async (a = 'hi', b = -7, context) => {
+  // valid, negative number
+};

tests/files/cases/function_valid_parameter_positive.js

@@ -0,0 +1,9 @@
+/**
+* My function
+* @param {string} a alpha
+* @param {number} b beta
+* @returns {string}
+*/
+module.exports = async (a = 'hi', b = +7, context) => {
+  // valid, negative number
+};