mathjs 11.2.1 → 11.3.1

package/lib/esm/expression/node/FunctionNode.js

@@ -14,11 +14,11 @@ export var createFunctionNode = /* #__PURE__ */factory(name, dependencies, _ref
     Node,
     SymbolNode
   } = _ref;
-
   /* format to fixed length */
   var strin = entity => format(entity, {
     truncate: 78
   });
+
   /*
    * Expand a LaTeX template
    *
@@ -27,23 +27,19 @@ export var createFunctionNode = /* #__PURE__ */factory(name, dependencies, _ref
    * @param {Object} options
    * @private
    **/
-
-
   function expandTemplate(template, node, options) {
-    var latex = ''; // Match everything of the form ${identifier} or ${identifier[2]} or $$
-    // while submatching identifier and 2 (in the second case)
+    var latex = '';
 
+    // Match everything of the form ${identifier} or ${identifier[2]} or $$
+    // while submatching identifier and 2 (in the second case)
     var regex = /\$(?:\{([a-z_][a-z_0-9]*)(?:\[([0-9]+)\])?\}|\$)/gi;
     var inputPos = 0; // position in the input string
-
     var match;
-
     while ((match = regex.exec(template)) !== null) {
       // go through all matches
       // add everything in front of the match to the LaTeX string
       latex += template.substring(inputPos, match.index);
       inputPos = match.index;
-
       if (match[0] === '$$') {
         // escaped dollar sign
         latex += '$';
@@ -52,18 +48,15 @@ export var createFunctionNode = /* #__PURE__ */factory(name, dependencies, _ref
         // template parameter
         inputPos += match[0].length;
         var property = node[match[1]];
-
         if (!property) {
           throw new ReferenceError('Template: Property ' + match[1] + ' does not exist.');
         }
-
         if (match[2] === undefined) {
           // no square brackets
           switch (typeof property) {
             case 'string':
               latex += property;
               break;
-
             case 'object':
               if (isNode(property)) {
                 latex += property.toTex(options);
@@ -73,15 +66,12 @@ export var createFunctionNode = /* #__PURE__ */factory(name, dependencies, _ref
                   if (isNode(arg)) {
                     return arg.toTex(options);
                   }
-
                   throw new TypeError('Template: ' + match[1] + '[' + index + '] is not a Node.');
                 }).join(',');
               } else {
                 throw new TypeError('Template: ' + match[1] + ' has to be a Node, String or array of Nodes');
               }
-
               break;
-
             default:
               throw new TypeError('Template: ' + match[1] + ' has to be a Node, String or array of Nodes');
           }
@@ -95,12 +85,10 @@ export var createFunctionNode = /* #__PURE__ */factory(name, dependencies, _ref
         }
       }
     }
-
     latex += template.slice(inputPos); // append rest of the template
 
     return latex;
   }
-
   class FunctionNode extends Node {
     /**
      * @constructor FunctionNode
@@ -113,34 +101,30 @@ export var createFunctionNode = /* #__PURE__ */factory(name, dependencies, _ref
      */
     constructor(fn, args) {
       super();
-
       if (typeof fn === 'string') {
         fn = new SymbolNode(fn);
-      } // validate input
-
+      }
 
+      // validate input
       if (!isNode(fn)) throw new TypeError('Node expected as parameter "fn"');
-
       if (!Array.isArray(args) || !args.every(isNode)) {
         throw new TypeError('Array containing Nodes expected for parameter "args"');
       }
-
       this.fn = fn;
       this.args = args || [];
-    } // readonly property name
-
+    }
 
+    // readonly property name
     get name() {
       return this.fn.name || '';
     }
-
     get type() {
       return name;
     }
-
     get isFunctionNode() {
       return true;
     }
+
     /**
      * Compile a node into a JavaScript function.
      * This basically pre-calculates as much as possible and only leaves open
@@ -154,24 +138,18 @@ export var createFunctionNode = /* #__PURE__ */factory(name, dependencies, _ref
      * @return {function} Returns a function which can be called like:
      *                        evalNode(scope: Object, args: Object, context: *)
      */
-
-
     _compile(math, argNames) {
       // compile arguments
       var evalArgs = this.args.map(arg => arg._compile(math, argNames));
-
       if (isSymbolNode(this.fn)) {
         var _name = this.fn.name;
-
         if (!argNames[_name]) {
           // we can statically determine whether the function
           // has the rawArgs property
           var fn = _name in math ? getSafeProperty(math, _name) : undefined;
           var isRaw = typeof fn === 'function' && fn.rawArgs === true;
-
           var resolveFn = scope => {
             var value;
-
             if (scope.has(_name)) {
               value = scope.get(_name);
             } else if (_name in math) {
@@ -179,14 +157,11 @@ export var createFunctionNode = /* #__PURE__ */factory(name, dependencies, _ref
             } else {
               return FunctionNode.onUndefinedFunction(_name);
             }
-
             if (typeof value === 'function') {
               return value;
             }
-
             throw new TypeError("'".concat(_name, "' is not a function; its value is:\n  ").concat(strin(value)));
           };
-
           if (isRaw) {
             // pass unevaluated parameters (nodes) to the function
             // "raw" evaluation
@@ -203,14 +178,12 @@ export var createFunctionNode = /* #__PURE__ */factory(name, dependencies, _ref
                   var fn = resolveFn(scope);
                   return fn();
                 };
-
               case 1:
                 return function evalFunctionNode(scope, args, context) {
                   var fn = resolveFn(scope);
                   var evalArg0 = evalArgs[0];
                   return fn(evalArg0(scope, args, context));
                 };
-
               case 2:
                 return function evalFunctionNode(scope, args, context) {
                   var fn = resolveFn(scope);
@@ -218,7 +191,6 @@ export var createFunctionNode = /* #__PURE__ */factory(name, dependencies, _ref
                   var evalArg1 = evalArgs[1];
                   return fn(evalArg0(scope, args, context), evalArg1(scope, args, context));
                 };
-
               default:
                 return function evalFunctionNode(scope, args, context) {
                   var fn = resolveFn(scope);
@@ -232,11 +204,9 @@ export var createFunctionNode = /* #__PURE__ */factory(name, dependencies, _ref
           var _rawArgs = this.args;
           return function evalFunctionNode(scope, args, context) {
             var fn = args[_name];
-
             if (typeof fn !== 'function') {
               throw new TypeError("Argument '".concat(_name, "' was not a function; received: ").concat(strin(fn)));
             }
-
             if (fn.rawArgs) {
               // "Raw" evaluation
               return fn(_rawArgs, math, createSubScope(scope, args), scope);
@@ -249,15 +219,14 @@ export var createFunctionNode = /* #__PURE__ */factory(name, dependencies, _ref
       } else if (isAccessorNode(this.fn) && isIndexNode(this.fn.index) && this.fn.index.isObjectProperty()) {
         // execute the function with the right context:
         // the object of the AccessorNode
-        var evalObject = this.fn.object._compile(math, argNames);
 
+        var evalObject = this.fn.object._compile(math, argNames);
         var prop = this.fn.index.getObjectProperty();
         var _rawArgs2 = this.args;
         return function evalFunctionNode(scope, args, context) {
           var object = evalObject(scope, args, context);
           validateSafeMethod(object, prop);
           var isRaw = object[prop] && object[prop].rawArgs;
-
           if (isRaw) {
             // "Raw" evaluation
             return object[prop](_rawArgs2, math, createSubScope(scope, args), scope);
@@ -272,17 +241,13 @@ export var createFunctionNode = /* #__PURE__ */factory(name, dependencies, _ref
         // we have to dynamically determine whether the function has the
         // rawArgs property
         var fnExpr = this.fn.toString();
-
         var evalFn = this.fn._compile(math, argNames);
-
         var _rawArgs3 = this.args;
         return function evalFunctionNode(scope, args, context) {
           var fn = evalFn(scope, args, context);
-
           if (typeof fn !== 'function') {
             throw new TypeError("Expression '".concat(fnExpr, "' did not evaluate to a function; value is:") + "\n  ".concat(strin(fn)));
           }
-
           if (fn.rawArgs) {
             // "Raw" evaluation
             return fn(_rawArgs3, math, createSubScope(scope, args), scope);
@@ -294,53 +259,46 @@ export var createFunctionNode = /* #__PURE__ */factory(name, dependencies, _ref
         };
       }
     }
+
     /**
      * Execute a callback for each of the child nodes of this node
      * @param {function(child: Node, path: string, parent: Node)} callback
      */
-
-
     forEach(callback) {
       callback(this.fn, 'fn', this);
-
       for (var i = 0; i < this.args.length; i++) {
         callback(this.args[i], 'args[' + i + ']', this);
       }
     }
+
     /**
      * Create a new FunctionNode whose children are the results of calling
      * the provided callback function for each child of the original node.
      * @param {function(child: Node, path: string, parent: Node): Node} callback
      * @returns {FunctionNode} Returns a transformed copy of the node
      */
-
-
     map(callback) {
       var fn = this._ifNode(callback(this.fn, 'fn', this));
-
       var args = [];
-
       for (var i = 0; i < this.args.length; i++) {
         args[i] = this._ifNode(callback(this.args[i], 'args[' + i + ']', this));
       }
-
       return new FunctionNode(fn, args);
     }
+
     /**
      * Create a clone of this node, a shallow copy
      * @return {FunctionNode}
      */
-
-
     clone() {
       return new FunctionNode(this.fn, this.args.slice(0));
     }
+
     /**
      * Throws an error 'Undefined function {name}'
      * @param {string} name
      */
 
-
     /**
      * Get string representation. (wrapper function)
      * This overrides parts of Node's toString function.
@@ -356,40 +314,37 @@ export var createFunctionNode = /* #__PURE__ */factory(name, dependencies, _ref
     toString(options) {
       var customString;
       var name = this.fn.toString(options);
-
       if (options && typeof options.handler === 'object' && hasOwnProperty(options.handler, name)) {
         // callback is a map of callback functions
         customString = options.handler[name](this, options);
       }
-
       if (typeof customString !== 'undefined') {
         return customString;
-      } // fall back to Node's toString
-
+      }
 
+      // fall back to Node's toString
       return super.toString(options);
     }
+
     /**
      * Get string representation
      * @param {Object} options
      * @return {string} str
      */
-
-
     _toString(options) {
       var args = this.args.map(function (arg) {
         return arg.toString(options);
       });
-      var fn = isFunctionAssignmentNode(this.fn) ? '(' + this.fn.toString(options) + ')' : this.fn.toString(options); // format the arguments like "add(2, 4.2)"
+      var fn = isFunctionAssignmentNode(this.fn) ? '(' + this.fn.toString(options) + ')' : this.fn.toString(options);
 
+      // format the arguments like "add(2, 4.2)"
       return fn + '(' + args.join(', ') + ')';
     }
+
     /**
      * Get a JSON representation of the node
      * @returns {Object}
      */
-
-
     toJSON() {
       return {
         mathjs: name,
@@ -397,6 +352,7 @@ export var createFunctionNode = /* #__PURE__ */factory(name, dependencies, _ref
         args: this.args
       };
     }
+
     /**
      * Instantiate an AssignmentNode from its JSON representation
      * @param {Object} json  An object structured like
@@ -405,7 +361,6 @@ export var createFunctionNode = /* #__PURE__ */factory(name, dependencies, _ref
      * @returns {FunctionNode}
      */
 
-
     /**
      * Get HTML representation
      * @param {Object} options
@@ -414,10 +369,12 @@ export var createFunctionNode = /* #__PURE__ */factory(name, dependencies, _ref
     toHTML(options) {
       var args = this.args.map(function (arg) {
         return arg.toHTML(options);
-      }); // format the arguments like "add(2, 4.2)"
+      });
 
+      // format the arguments like "add(2, 4.2)"
       return '<span class="math-function">' + escape(this.fn) + '</span><span class="math-paranthesis math-round-parenthesis">(</span>' + args.join('<span class="math-separator">,</span>') + '<span class="math-paranthesis math-round-parenthesis">)</span>';
     }
+
     /**
      * Get LaTeX representation. (wrapper function)
      * This overrides parts of Node's toTex function.
@@ -429,60 +386,50 @@ export var createFunctionNode = /* #__PURE__ */factory(name, dependencies, _ref
      * @param {Object} options
      * @return {string}
      */
-
-
     toTex(options) {
       var customTex;
-
       if (options && typeof options.handler === 'object' && hasOwnProperty(options.handler, this.name)) {
         // callback is a map of callback functions
         customTex = options.handler[this.name](this, options);
       }
-
       if (typeof customTex !== 'undefined') {
         return customTex;
-      } // fall back to Node's toTex
-
+      }
 
+      // fall back to Node's toTex
       return super.toTex(options);
     }
+
     /**
      * Get LaTeX representation
      * @param {Object} options
      * @return {string} str
      */
-
-
     _toTex(options) {
       var args = this.args.map(function (arg) {
         // get LaTeX of the arguments
         return arg.toTex(options);
       });
       var latexConverter;
-
       if (latexFunctions[this.name]) {
         latexConverter = latexFunctions[this.name];
-      } // toTex property on the function itself
-
+      }
 
+      // toTex property on the function itself
       if (math[this.name] && (typeof math[this.name].toTex === 'function' || typeof math[this.name].toTex === 'object' || typeof math[this.name].toTex === 'string')) {
         // .toTex is a callback function
         latexConverter = math[this.name].toTex;
       }
-
       var customToTex;
-
       switch (typeof latexConverter) {
         case 'function':
           // a callback function
           customToTex = latexConverter(this, options);
           break;
-
         case 'string':
           // a template string
           customToTex = expandTemplate(latexConverter, this, options);
           break;
-
         case 'object':
           // an object with different "converters" for different
           // numbers of arguments
@@ -490,42 +437,32 @@ export var createFunctionNode = /* #__PURE__ */factory(name, dependencies, _ref
             case 'function':
               customToTex = latexConverter[args.length](this, options);
               break;
-
             case 'string':
               customToTex = expandTemplate(latexConverter[args.length], this, options);
               break;
           }
-
       }
-
       if (typeof customToTex !== 'undefined') {
         return customToTex;
       }
-
       return expandTemplate(defaultTemplate, this, options);
     }
+
     /**
      * Get identifier.
      * @return {string}
      */
-
-
     getIdentifier() {
       return this.type + ':' + this.name;
     }
-
   }
-
   _defineProperty(FunctionNode, "name", name);
-
   _defineProperty(FunctionNode, "onUndefinedFunction", function (name) {
     throw new Error('Undefined function ' + name);
   });
-
   _defineProperty(FunctionNode, "fromJSON", function (json) {
     return new FunctionNode(json.fn, json.args);
   });
-
   return FunctionNode;
 }, {
   isClass: true,

package/lib/esm/expression/node/IndexNode.js

@@ -11,7 +11,6 @@ export var createIndexNode = /* #__PURE__ */factory(name, dependencies, _ref =>
     Node,
     size
   } = _ref;
-
   class IndexNode extends Node {
     /**
      * @constructor IndexNode
@@ -30,24 +29,23 @@ export var createIndexNode = /* #__PURE__ */factory(name, dependencies, _ref =>
     constructor(dimensions, dotNotation) {
       super();
       this.dimensions = dimensions;
-      this.dotNotation = dotNotation || false; // validate input
+      this.dotNotation = dotNotation || false;
 
+      // validate input
       if (!Array.isArray(dimensions) || !dimensions.every(isNode)) {
         throw new TypeError('Array containing Nodes expected for parameter "dimensions"');
       }
-
       if (this.dotNotation && !this.isObjectProperty()) {
         throw new Error('dotNotation only applicable for object properties');
       }
     }
-
     get type() {
       return name;
     }
-
     get isIndexNode() {
       return true;
     }
+
     /**
      * Compile a node into a JavaScript function.
      * This basically pre-calculates as much as possible and only leaves open
@@ -61,30 +59,26 @@ export var createIndexNode = /* #__PURE__ */factory(name, dependencies, _ref =>
      * @return {function} Returns a function which can be called like:
      *                        evalNode(scope: Object, args: Object, context: *)
      */
-
-
     _compile(math, argNames) {
       // TODO: implement support for bignumber (currently bignumbers are silently
       //       reduced to numbers when changing the value to zero-based)
+
       // TODO: Optimization: when the range values are ConstantNodes,
       //       we can beforehand resolve the zero-based value
+
       // optimization for a simple object property
       var evalDimensions = map(this.dimensions, function (dimension, i) {
         var needsEnd = dimension.filter(node => node.isSymbolNode && node.name === 'end').length > 0;
-
         if (needsEnd) {
           // SymbolNode 'end' is used inside the index,
           // like in `A[end]` or `A[end - 2]`
           var childArgNames = Object.create(argNames);
           childArgNames.end = true;
-
           var _evalDimension = dimension._compile(math, childArgNames);
-
           return function evalDimension(scope, args, context) {
             if (!isMatrix(context) && !isArray(context) && !isString(context)) {
               throw new TypeError('Cannot resolve "end": ' + 'context must be a Matrix, Array, or string but is ' + typeOf(context));
             }
-
             var s = size(context).valueOf();
             var childArgs = Object.create(args);
             childArgs.end = s[i];
@@ -103,79 +97,70 @@ export var createIndexNode = /* #__PURE__ */factory(name, dependencies, _ref =>
         return index(...dimensions);
       };
     }
+
     /**
      * Execute a callback for each of the child nodes of this node
      * @param {function(child: Node, path: string, parent: Node)} callback
      */
-
-
     forEach(callback) {
       for (var i = 0; i < this.dimensions.length; i++) {
         callback(this.dimensions[i], 'dimensions[' + i + ']', this);
       }
     }
+
     /**
      * Create a new IndexNode whose children are the results of calling
      * the provided callback function for each child of the original node.
      * @param {function(child: Node, path: string, parent: Node): Node} callback
      * @returns {IndexNode} Returns a transformed copy of the node
      */
-
-
     map(callback) {
       var dimensions = [];
-
       for (var i = 0; i < this.dimensions.length; i++) {
         dimensions[i] = this._ifNode(callback(this.dimensions[i], 'dimensions[' + i + ']', this));
       }
-
       return new IndexNode(dimensions, this.dotNotation);
     }
+
     /**
      * Create a clone of this node, a shallow copy
      * @return {IndexNode}
      */
-
-
     clone() {
       return new IndexNode(this.dimensions.slice(0), this.dotNotation);
     }
+
     /**
      * Test whether this IndexNode contains a single property name
      * @return {boolean}
      */
-
-
     isObjectProperty() {
       return this.dimensions.length === 1 && isConstantNode(this.dimensions[0]) && typeof this.dimensions[0].value === 'string';
     }
+
     /**
      * Returns the property name if IndexNode contains a property.
      * If not, returns null.
      * @return {string | null}
      */
-
-
     getObjectProperty() {
       return this.isObjectProperty() ? this.dimensions[0].value : null;
     }
+
     /**
      * Get string representation
      * @param {Object} options
      * @return {string} str
      */
-
-
     _toString(options) {
       // format the parameters like "[1, 0:5]"
       return this.dotNotation ? '.' + this.getObjectProperty() : '[' + this.dimensions.join(', ') + ']';
     }
+
     /**
      * Get a JSON representation of the node
      * @returns {Object}
      */
-
-
     toJSON() {
       return {
         mathjs: name,
@@ -183,6 +168,7 @@ export var createIndexNode = /* #__PURE__ */factory(name, dependencies, _ref =>
         dotNotation: this.dotNotation
       };
     }
+
     /**
      * Instantiate an IndexNode from its JSON representation
      * @param {Object} json
@@ -191,50 +177,41 @@ export var createIndexNode = /* #__PURE__ */factory(name, dependencies, _ref =>
      *     where mathjs is optional
      * @returns {IndexNode}
      */
-
-
     static fromJSON(json) {
       return new IndexNode(json.dimensions, json.dotNotation);
     }
+
     /**
      * Get HTML representation
      * @param {Object} options
      * @return {string} str
      */
-
-
     toHTML(options) {
       // format the parameters like "[1, 0:5]"
       var dimensions = [];
-
       for (var i = 0; i < this.dimensions.length; i++) {
         dimensions[i] = this.dimensions[i].toHTML();
       }
-
       if (this.dotNotation) {
         return '<span class="math-operator math-accessor-operator">.</span>' + '<span class="math-symbol math-property">' + escape(this.getObjectProperty()) + '</span>';
       } else {
         return '<span class="math-parenthesis math-square-parenthesis">[</span>' + dimensions.join('<span class="math-separator">,</span>') + '<span class="math-parenthesis math-square-parenthesis">]</span>';
       }
     }
+
     /**
      * Get LaTeX representation
      * @param {Object} options
      * @return {string} str
      */
-
-
     _toTex(options) {
       var dimensions = this.dimensions.map(function (range) {
         return range.toTex(options);
       });
       return this.dotNotation ? '.' + this.getObjectProperty() + '' : '_{' + dimensions.join(',') + '}';
     }
-
   }
-
   _defineProperty(IndexNode, "name", name);
-
   return IndexNode;
 }, {
   isClass: true,