mathjs 12.3.1 → 12.4.0

package/lib/cjs/type/matrix/utils/matAlgo07xSSf.js

@@ -28,10 +28,10 @@ var createMatAlgo07xSSf = exports.createMatAlgo07xSSf = /* #__PURE__ */(0, _fact
   return function matAlgo07xSSf(a, b, callback) {
     // sparse matrix arrays
     var asize = a._size;
-    var adt = a._datatype;
+    var adt = a._datatype || a._data === undefined ? a._datatype : a.getDataType();
     // sparse matrix arrays
     var bsize = b._size;
-    var bdt = b._datatype;
+    var bdt = b._datatype || b._data === undefined ? b._datatype : b.getDataType();
 
     // validate dimensions
     if (asize.length !== bsize.length) {
@@ -55,7 +55,7 @@ var createMatAlgo07xSSf = exports.createMatAlgo07xSSf = /* #__PURE__ */(0, _fact
     var cf = callback;
 
     // process data types
-    if (typeof adt === 'string' && adt === bdt) {
+    if (typeof adt === 'string' && adt === bdt && adt !== 'mixed') {
       // datatype
       dt = adt;
       // convert 0 to the same datatype
@@ -103,7 +103,7 @@ var createMatAlgo07xSSf = exports.createMatAlgo07xSSf = /* #__PURE__ */(0, _fact
     return new DenseMatrix({
       data: cdata,
       size: [rows, columns],
-      datatype: dt
+      datatype: adt === a._datatype && bdt === b._datatype ? dt : undefined
     });
   };
   function _scatter(m, j, w, x, mark) {

package/lib/cjs/type/matrix/utils/matAlgo08xS0Sid.js

@@ -35,13 +35,13 @@ var createMatAlgo08xS0Sid = exports.createMatAlgo08xS0Sid = /* #__PURE__ */(0, _
     var aindex = a._index;
     var aptr = a._ptr;
     var asize = a._size;
-    var adt = a._datatype;
+    var adt = a._datatype || a._data === undefined ? a._datatype : a.getDataType();
     // sparse matrix arrays
     var bvalues = b._values;
     var bindex = b._index;
     var bptr = b._ptr;
     var bsize = b._size;
-    var bdt = b._datatype;
+    var bdt = b._datatype || b._data === undefined ? b._datatype : b.getDataType();
 
     // validate dimensions
     if (asize.length !== bsize.length) {
@@ -72,7 +72,7 @@ var createMatAlgo08xS0Sid = exports.createMatAlgo08xS0Sid = /* #__PURE__ */(0, _
     var cf = callback;
 
     // process data types
-    if (typeof adt === 'string' && adt === bdt) {
+    if (typeof adt === 'string' && adt === bdt && adt !== 'mixed') {
       // datatype
       dt = adt;
       // find signature that matches (dt, dt)
@@ -152,7 +152,7 @@ var createMatAlgo08xS0Sid = exports.createMatAlgo08xS0Sid = /* #__PURE__ */(0, _
       index: cindex,
       ptr: cptr,
       size: [rows, columns],
-      datatype: dt
+      datatype: adt === a._datatype && bdt === b._datatype ? dt : undefined
     });
   };
 });

package/lib/cjs/type/matrix/utils/matAlgo09xS0Sf.js

@@ -35,13 +35,13 @@ var createMatAlgo09xS0Sf = exports.createMatAlgo09xS0Sf = /* #__PURE__ */(0, _fa
     var aindex = a._index;
     var aptr = a._ptr;
     var asize = a._size;
-    var adt = a._datatype;
+    var adt = a._datatype || a._data === undefined ? a._datatype : a.getDataType();
     // sparse matrix arrays
     var bvalues = b._values;
     var bindex = b._index;
     var bptr = b._ptr;
     var bsize = b._size;
-    var bdt = b._datatype;
+    var bdt = b._datatype || b._data === undefined ? b._datatype : b.getDataType();
 
     // validate dimensions
     if (asize.length !== bsize.length) {
@@ -67,7 +67,7 @@ var createMatAlgo09xS0Sf = exports.createMatAlgo09xS0Sf = /* #__PURE__ */(0, _fa
     var cf = callback;
 
     // process data types
-    if (typeof adt === 'string' && adt === bdt) {
+    if (typeof adt === 'string' && adt === bdt && adt !== 'mixed') {
       // datatype
       dt = adt;
       // find signature that matches (dt, dt)
@@ -140,7 +140,7 @@ var createMatAlgo09xS0Sf = exports.createMatAlgo09xS0Sf = /* #__PURE__ */(0, _fa
       index: cindex,
       ptr: cptr,
       size: [rows, columns],
-      datatype: dt
+      datatype: adt === a._datatype && bdt === b._datatype ? dt : undefined
     });
   };
 });

package/lib/cjs/utils/map.js

@@ -4,12 +4,13 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ObjectWrappingMap = void 0;
+exports.PartitionedMap = exports.ObjectWrappingMap = void 0;
 exports.assign = assign;
 exports.createEmptyMap = createEmptyMap;
 exports.createMap = createMap;
 exports.isMap = isMap;
 exports.toObject = toObject;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _customs = require("./customs.js");
@@ -29,11 +30,12 @@ var ObjectWrappingMap = exports.ObjectWrappingMap = /*#__PURE__*/function () {
   function ObjectWrappingMap(object) {
     (0, _classCallCheck2["default"])(this, ObjectWrappingMap);
     this.wrappedObject = object;
+    this[Symbol.iterator] = this.entries;
   }
   (0, _createClass2["default"])(ObjectWrappingMap, [{
     key: "keys",
     value: function keys() {
-      return Object.keys(this.wrappedObject);
+      return Object.keys(this.wrappedObject).values();
     }
   }, {
     key: "get",
@@ -51,9 +53,169 @@ var ObjectWrappingMap = exports.ObjectWrappingMap = /*#__PURE__*/function () {
     value: function has(key) {
       return (0, _customs.hasSafeProperty)(this.wrappedObject, key);
     }
+  }, {
+    key: "entries",
+    value: function entries() {
+      var _this = this;
+      return mapIterator(this.keys(), function (key) {
+        return [key, _this.get(key)];
+      });
+    }
+  }, {
+    key: "forEach",
+    value: function forEach(callback) {
+      var _iterator = _createForOfIteratorHelper(this.keys()),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var key = _step.value;
+          callback(this.get(key), key, this);
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+    }
+  }, {
+    key: "delete",
+    value: function _delete(key) {
+      delete this.wrappedObject[key];
+    }
+  }, {
+    key: "clear",
+    value: function clear() {
+      var _iterator2 = _createForOfIteratorHelper(this.keys()),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var key = _step2.value;
+          this["delete"](key);
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+    }
+  }, {
+    key: "size",
+    get: function get() {
+      return Object.keys(this.wrappedObject).length;
+    }
   }]);
   return ObjectWrappingMap;
 }();
+/**
+ * Create a map with two partitions: a and b.
+ * The set with bKeys determines which keys/values are read/written to map b,
+ * all other values are read/written to map a
+ *
+ * For example:
+ *
+ *   const a = new Map()
+ *   const b = new Map()
+ *   const p = new PartitionedMap(a, b, new Set(['x', 'y']))
+ *
+ * In this case, values `x` and `y` are read/written to map `b`,
+ * all other values are read/written to map `a`.
+ */
+var PartitionedMap = exports.PartitionedMap = /*#__PURE__*/function () {
+  /**
+   * @param {Map} a
+   * @param {Map} b
+   * @param {Set} bKeys
+   */
+  function PartitionedMap(a, b, bKeys) {
+    (0, _classCallCheck2["default"])(this, PartitionedMap);
+    this.a = a;
+    this.b = b;
+    this.bKeys = bKeys;
+    this[Symbol.iterator] = this.entries;
+  }
+  (0, _createClass2["default"])(PartitionedMap, [{
+    key: "get",
+    value: function get(key) {
+      return this.bKeys.has(key) ? this.b.get(key) : this.a.get(key);
+    }
+  }, {
+    key: "set",
+    value: function set(key, value) {
+      if (this.bKeys.has(key)) {
+        this.b.set(key, value);
+      } else {
+        this.a.set(key, value);
+      }
+      return this;
+    }
+  }, {
+    key: "has",
+    value: function has(key) {
+      return this.b.has(key) || this.a.has(key);
+    }
+  }, {
+    key: "keys",
+    value: function keys() {
+      return new Set([].concat((0, _toConsumableArray2["default"])(this.a.keys()), (0, _toConsumableArray2["default"])(this.b.keys())))[Symbol.iterator]();
+    }
+  }, {
+    key: "entries",
+    value: function entries() {
+      var _this2 = this;
+      return mapIterator(this.keys(), function (key) {
+        return [key, _this2.get(key)];
+      });
+    }
+  }, {
+    key: "forEach",
+    value: function forEach(callback) {
+      var _iterator3 = _createForOfIteratorHelper(this.keys()),
+        _step3;
+      try {
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var key = _step3.value;
+          callback(this.get(key), key, this);
+        }
+      } catch (err) {
+        _iterator3.e(err);
+      } finally {
+        _iterator3.f();
+      }
+    }
+  }, {
+    key: "delete",
+    value: function _delete(key) {
+      return this.bKeys.has(key) ? this.b["delete"](key) : this.a["delete"](key);
+    }
+  }, {
+    key: "clear",
+    value: function clear() {
+      this.a.clear();
+      this.b.clear();
+    }
+  }, {
+    key: "size",
+    get: function get() {
+      return (0, _toConsumableArray2["default"])(this.keys()).length;
+    }
+  }]);
+  return PartitionedMap;
+}();
+/**
+ * Create a new iterator that maps over the provided iterator, applying a mapping function to each item
+ */
+function mapIterator(it, callback) {
+  return {
+    next: function next() {
+      var n = it.next();
+      return n.done ? n : {
+        value: callback(n.value),
+        done: false
+      };
+    }
+  };
+}
+
 /**
  * Creates an empty map, or whatever your platform's polyfill is.
  *
@@ -93,18 +255,18 @@ function toObject(map) {
     return map.wrappedObject;
   }
   var object = {};
-  var _iterator = _createForOfIteratorHelper(map.keys()),
-    _step;
+  var _iterator4 = _createForOfIteratorHelper(map.keys()),
+    _step4;
   try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var key = _step.value;
+    for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+      var key = _step4.value;
       var value = map.get(key);
       (0, _customs.setSafeProperty)(object, key, value);
     }
   } catch (err) {
-    _iterator.e(err);
+    _iterator4.e(err);
   } finally {
-    _iterator.f();
+    _iterator4.f();
   }
   return object;
 }
@@ -143,17 +305,17 @@ function assign(map) {
       continue;
     }
     if (isMap(args)) {
-      var _iterator2 = _createForOfIteratorHelper(args.keys()),
-        _step2;
+      var _iterator5 = _createForOfIteratorHelper(args.keys()),
+        _step5;
       try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var key = _step2.value;
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+          var key = _step5.value;
           map.set(key, args.get(key));
         }
       } catch (err) {
-        _iterator2.e(err);
+        _iterator5.e(err);
       } finally {
-        _iterator2.f();
+        _iterator5.f();
       }
     } else if ((0, _is.isObject)(args)) {
       for (var _i2 = 0, _Object$keys = Object.keys(args); _i2 < _Object$keys.length; _i2++) {

package/lib/cjs/utils/scope.js

@@ -15,15 +15,9 @@ var _map = require("./map.js");
  * the remaining `args`.
  *
  * @param {Map} parentScope
- * @param  {...any} args
- * @returns {Map}
+ * @param  {Object} args
+ * @returns {PartitionedMap}
  */
-function createSubScope(parentScope) {
-  for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-    args[_key - 1] = arguments[_key];
-  }
-  if (typeof parentScope.createSubScope === 'function') {
-    return _map.assign.apply(void 0, [parentScope.createSubScope()].concat(args));
-  }
-  return _map.assign.apply(void 0, [(0, _map.createEmptyMap)(), parentScope].concat(args));
+function createSubScope(parentScope, args) {
+  return new _map.PartitionedMap(parentScope, new _map.ObjectWrappingMap(args), new Set(Object.keys(args)));
 }

package/lib/cjs/version.js

@@ -4,6 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.version = void 0;
-var version = exports.version = '12.3.1';
+var version = exports.version = '12.4.0';
 // Note: This file is automatically generated when building math.js.
 // Changes made in this file will be overwritten.

package/lib/esm/entry/pureFunctionsAny.generated.js

@@ -593,6 +593,7 @@ export var rightArithShift = /* #__PURE__ */createRightArithShift({
 export var round = /* #__PURE__ */createRound({
   BigNumber,
   DenseMatrix,
+  config,
   equalScalar,
   matrix,
   typed,

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

@@ -1,6 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { isNode, isConstantNode, isOperatorNode, isParenthesisNode } from '../../utils/is.js';
 import { map } from '../../utils/array.js';
+import { createSubScope } from '../../utils/scope.js';
 import { escape } from '../../utils/string.js';
 import { getSafeProperty, isSafeMethod } from '../../utils/customs.js';
 import { getAssociativity, getPrecedence, isAssociativeWith, properties } from '../operators.js';
@@ -289,7 +290,7 @@ export var createOperatorNode = /* #__PURE__ */factory(name, dependencies, _ref
         // "raw" evaluation
         var rawArgs = this.args;
         return function evalOperatorNode(scope, args, context) {
-          return fn(rawArgs, math, scope);
+          return fn(rawArgs, math, createSubScope(scope, args));
         };
       } else if (evalArgs.length === 1) {
         var evalArg0 = evalArgs[0];

package/lib/esm/expression/parse.js

@@ -1409,8 +1409,10 @@ export var createParse = /* #__PURE__ */factory(name, dependencies, _ref => {
           while (state.token === ';') {
             // eslint-disable-line no-unmodified-loop-condition
             getToken(state);
-            params[rows] = parseRow(state);
-            rows++;
+            if (state.token !== ']') {
+              params[rows] = parseRow(state);
+              rows++;
+            }
           }
           if (state.token !== ']') {
             throw createSyntaxError(state, 'End of matrix ] expected');
@@ -1458,8 +1460,10 @@ export var createParse = /* #__PURE__ */factory(name, dependencies, _ref => {
       getToken(state);
 
       // parse expression
-      params[len] = parseAssignment(state);
-      len++;
+      if (state.token !== ']' && state.token !== ';') {
+        params[len] = parseAssignment(state);
+        len++;
+      }
     }
     return new ArrayNode(params);
   }

package/lib/esm/expression/transform/utils/compileInlineExpression.js

@@ -1,11 +1,11 @@
 import { isSymbolNode } from '../../../utils/is.js';
-import { createSubScope } from '../../../utils/scope.js';
+import { PartitionedMap } from '../../../utils/map.js';
 
 /**
  * Compile an inline expression like "x > 0"
  * @param {Node} expression
  * @param {Object} math
- * @param {Object} scope
+ * @param {Map} scope
  * @return {function} Returns a function with one argument which fills in the
  *                    undefined variable (like "x") and evaluates the expression
  */
@@ -20,10 +20,11 @@ export function compileInlineExpression(expression, math, scope) {
 
   // create a test function for this equation
   var name = symbol.name; // variable name
-  var subScope = createSubScope(scope);
+  var argsScope = new Map();
+  var subScope = new PartitionedMap(scope, argsScope, new Set([name]));
   var eq = expression.compile();
   return function inlineExpression(x) {
-    subScope.set(name, x);
+    argsScope.set(name, x);
     return eq.evaluate(subScope);
   };
 }