Merge branch '1.4.7' of http://10.73.97.24/oecloud.io/feel

grammar/feel-initializer.js

@@ -8,19 +8,23 @@
 
 // ast nodes are the constructors used to construct the ast for the parsed grammar
 const ast = require('./feel-ast');
-const { enableLexerLogging } = require('../settings');
+// const { enableLexerLogging } = require('../settings');
 
-const {logger} = require('../logger');
+// const {logger} = require('../logger');
 // adding build methods to prototype of each constructor
 require('./feel-ast-parser')(ast);
-const _log = logger('feel-grammer-parser');
-let loggerOptions;
-function log(msg) {
-  loggerOptions = options.loggerOptions || {};
-  if (enableLexerLogging) {
-    _log.debug(loggerOptions, msg)
-  }
-};
+// const _log = logger('feel-grammer-parser');
+// let loggerOptions;
+// function log(msg) {
+//   loggerOptions = options.loggerOptions || {};
+//   if (enableLexerLogging) {
+//     _log.debug(loggerOptions, msg)
+//   }
+// };
+
+function log() {
+  // empty function
+}
 
 let initialized = false;
 let ruleName = 'default';
@@ -34,12 +38,12 @@ function rule() {
 }
 
 function extractOptional(optional, index) {
-  log('_extractOptional');
+  //log('_extractOptional');
   return optional ? optional[index] : null;
 }
 
 function flatten(list) {
-  log('_flatten');
+  //log('_flatten');
   return list.filter( d => d && d.length).reduce((recur, next) => {
     if(next && Array.isArray(next)) {
       return [].concat.call(recur, flatten(next));
@@ -49,36 +53,36 @@ function flatten(list) {
 }
 
 function extractList(list, index) {
-  log('_extractList');
+  //log('_extractList');
   return list.map(element => element[index]);
 }
 
 function buildList(head, tail, index) {
-  log('_buildList')
+  //log('_buildList')
   return [head].concat(extractList(tail, index));
 }
 
 function buildName(head, tail, index) {
-  log('_buildName');
+  //log('_buildName');
   return tail && tail.length ? [...head, ...flatten(tail)].join("") : head.join("");
 }
 
 
 function buildBinaryExpression(head, tail, loc, text, rule) {
-  log('_buildBinaryExpression');
+  //log('_buildBinaryExpression');
   return tail.reduce((result, element) => new ast.ArithmeticExpressionNode(element[1], result, element[3], loc, text, rule), head);
 }
 
 function buildComparisionExpression(head, tail, loc, text, rule) {
-  log('_buildComparisionExpression');
+  //log('_buildComparisionExpression');
   return tail.reduce((result, element) => {
     const operator = Array.isArray(element[1]) ? element[1][0] : element[1];
     return new ast.ComparisionExpressionNode(operator, result, element[3], null, loc, text, rule);
   }, head);
 }
 
 function buildLogicalExpression(head, tail, loc, text, rule) {
-  log('_buildLogicalExpression');
+  //log('_buildLogicalExpression');
   return tail.reduce((result, element) => {
     let operator = element[1];
     if (operator === 'and') {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-feel",
-  "version": "1.4.5",
+  "version": "1.4.7",
   "description": "FEEL(Friendly Enough Expression Language) based on DMN specification 1.1 for conformance level 3",
   "main": "index.js",
   "scripts": {
@@ -35,10 +35,10 @@
   "dependencies": {
     "big.js": "3.2.0",
     "bunyan": "1.8.12",
-    "lodash": "4.17.15",
+    "lodash": "4.17.20",
     "moment": "2.24.0",
     "moment-timezone": "0.5.27",
-    "xlsx": "0.8.8"
+    "xlsx": "0.15.6"
   },
   "devDependencies": {
     "chai": "3.4.1",