mirror of
https://github.com/josdejong/mathjs.git
synced 2026-01-18 14:59:29 +00:00
* refactor: Remove the automatic conversion from number to string. (#2482) This is a breaking change. However, nothing in the unit tests or examples actually depended on such a conversion, and it's difficult to construct situations in which it's necessary. The best such example is e.g. `count(57)` which formerly gave the number of digits in its numeric argument. Of course, after this commit, that behavior can still be obtained by the just slightly longer expression `count(string(57))` The change is proposed in preparation for an addition of new facilities/ handlers to allow symbolic computation in a couple of different ways (see #2475 and #2470). * feat(simplifyCore): convert equivalent function calls into operators (#2466) * feat(simplifyCore): convert equivalent function calls into operators Resolves #2415. * docs: Every operator has a function form Also documents the new behavior of simplifyCore to convert function calls into any equivalent operator form they may have. Also fixes the syntax errors so that simplifyCore will successfully doctest. * docs: Fix table syntax for operator->function correspondence * fix(parse): Implement amended "Rule 2" As per the discussion in #2370, the amended "Rule 2" is "when having a division followed by an implicit multiplication, the division gets higher precedence over the implicit multiplication when (a) the numerator is a constant with optionally a prefix operator (-, +, ~), and (b) the denominator is a constant." This commit implements that behavior and adds tests for it. Resolves #2370. * fix: OperatorNode.toString() outputs match implicit multiplication parsing Also greatly extends the tests on OperatorNode.toString() and .toTex(), and ensures that all tests are performed on both. (toHTML() is still a testing stepchild.) Also fixes other small bugs in .toString() and .toTex() revealed by the new tests. Resolves #1431. * test(parse): More cases of implicit multiplication * refactor: Alter the precedence of implicit multiplication This greatly simplifies OperatorNode:calculateNecessaryParentheses, as opposed to trying to correct for the change in precedence after the fact. * Fix broken unit test * Replace `options && options.implicit` with `options?.implicit` * Replace `options?.implicit` with `options && options.implicit` again, it breaks the Node 12 tests * chore: Prevent confusion with standard matrix functions. (#2465) * chore: Prevent consfusion with standard matrix functions. Prior to this commit, many functions operated elementwise on matrices even though in standard mathematical usage they have a different meaning on square matrices. Since the elementwise operation is easily recoverable using `math.map`, this commit removes the elementwise operation on arrays and matrices from these functions. Affected functions include all trigonometric functions, exp, log, gamma, square, sqrt, cube, and cbrt. Resolves #2440. * chore(typescript): Revise usages in light of changes sqrt() is now correctly typed as `number | Complex` and so must be explicitly cast to number when called on a positive and used where a Complex is disallowed; sqrt() no longer applies to matrices at all. * feat: Provide better error messages for v10 -> v11 transition Uses new `typed.onMismatch` handler so that matrix calls that used to work will suggest a replacement. * Fix #2412: let function diff return an empty matrix when the input contains only one element (#2422) * Fix #2412: let function diff return an empty matrix when the input has only one element * Undo changes in History in this fixme * Add TypeScript definitions for src/utils/is.js (#2432) This is a first step toward full publication of these functions, that were already being exported by mathjs but had not yet had the associated actions (documentation/available in parser/typed, etc.) Also, makes most of them into TypeScript type guards, and adds Matrix as a constructor type. Resolved #2431. Co-authored-by: Glen Whitney <glen@studioinfinity.org> * test: add two-dimensional test cases for diff of length 1 Co-authored-by: Chris Chudzicki <christopher.chudzicki@gmail.com> Co-authored-by: Glen Whitney <glen@studioinfinity.org> * Refactor/simplify core cleanup (#2490) * refactor: don't simplify constants in simplifyCore Keeps the operation of simplifyCore cleanly separate from simplifyConstant. * fix; handle multiple consecutive operations in simplifyCore() Also adds support for logical operators. Resolves #2484. * feat: export simplifyConstant Now that simplifyCore does not do any constant folding, clients may wish to access that behavior via simplifyConstant. Moreover, exporting it makes it easier to use in custom rule lists for simplify(). Also adds docs, embedded docs, and tests for simplifyConstant(). Also fixes simplifyCore() on logical functions (they always return boolean, rather than "short-circuiting"). Resolves #2459. * refactor: Rename matrix algorithms to stay sane in next refactor * refactor: Create a generator for boilerplate matrix versions of operations This reduces code length and duplication, and significantly reduces the number of instances of 'this' that will require replacement when moving on top of typed-function v3. * refactor: add automatic conversion from string to Node Eliminates many `this` calls in src/function/algebra, which will help conversion to typed-function v3a. Also make `resolve` into a typed function so that it will now work on strings as well, and adds a test that it does. * refactor: Use temporary conversions to simplify typed-function definitions Specifically, temporarily converting Object to Map eases the definition of 'simplify' and a new, generally ignored type 'identifier' (a subtype of 'string') with a temporary conversion to 'SymbolNode' simplifies the definition of 'derivative'. These refactors eliminate multiple instances of this, which will ease conversion to typed-function v3a. * refactor: Speed up utils/is.js typeOf function In preparation for using it as the function selector for the Unit class. Also fixes the inconsistency between the `typed` type hierarchy 'function' and typeOf returning 'Function' in favor of 'function', again to minimize the special cases in typeOf * feat(Unit): Add a method giving the (string name of the) type of the value E.g. `math.unit('5cm').valType()` returns `number`. Also uses this for an internal method that directly gives the number converter for a Unit. Also fixes lint errors from previous commit (not clean, I know, I forgot that build-and-test does not run lint). Adds tests for unit.valType() * refactor: Eliminate hyperbolic functions operating on angles There is no mathematical meaning to a hyperbolic function operating on an angle (the proper units of its argument is actually area), and it eliminates a number of uses of `this`, so remove such arguments. * refactor: Remove miscellaneous unnecessary typed-function this refs * refactor: Adapt to typed-function v3a Mostly this involves replaceing instances of 'this' with used of (preferably) typed.referTo() or typed.referToSelf(). Some repeated batterns of boilerpolate signatures within different divisions of functions (bitwise, relational, trigonometry) were factored out into their own files and reused in several of the individual functions. * tests: Only require that derivative tests mention the proper node type * refactor: remove typed.ignore * chore: Update to typed-function 3.0 Also had to deal with new typing for `resolve()` in that it now accepts strings and Matrices; added tests for the new possibilities for `resolve()`, and eliminated empty comments from the Node representation of parsed strings as they can't really be doing anyone any good and they are a pain for testing. Also updates the TypeScript declarations and tests for `resolve()` * chore: Object.hasOwn not supported in Node 14 Also removes 'resolve' from the known failing doc tests, now that it handles strings. * chore: Drop ES5 / IE 11 support. * fix(types): Remove no-longer-implementd matrix overloads * test(identifier): As requested in review item 2 * refactor(Unit): valType => valueType as per review item 3 * test(hasNumericValue): Test boolean arguments as per review item 4 * refactor(Node): Use class syntax rather than assigning prototypes This change simplifies the typeOf() function, because now all subclasses of Node have the expected constructor name. Also, reformats the documentation of the typeOf() function so that the doc test of that function will serve as an exhaustive test that the bundle returns the proper types. * Prevent chain functions from matching stored value with a rest parameter (#2559) * chore: Prevent confusion with standard matrix functions. (#2465) * chore: Prevent consfusion with standard matrix functions. Prior to this commit, many functions operated elementwise on matrices even though in standard mathematical usage they have a different meaning on square matrices. Since the elementwise operation is easily recoverable using `math.map`, this commit removes the elementwise operation on arrays and matrices from these functions. Affected functions include all trigonometric functions, exp, log, gamma, square, sqrt, cube, and cbrt. Resolves #2440. * chore(typescript): Revise usages in light of changes sqrt() is now correctly typed as `number | Complex` and so must be explicitly cast to number when called on a positive and used where a Complex is disallowed; sqrt() no longer applies to matrices at all. * feat: Provide better error messages for v10 -> v11 transition Uses new `typed.onMismatch` handler so that matrix calls that used to work will suggest a replacement. * fix: prevent chain from matching rest parameter with stored value Since the revised code needs the isTypedFunction predicate, switch to using the typed-function implementation for that throughout mathjs, rather than rolling our own here. Also adds a test that chain() no longer allows this kind of usage. Removes the two type declarations in types/index.d.ts that were allowing this sort of "split rest" call and added tests that such calls are forbidden. Adds to the chaining documentation page that such "split" calls are not allowed. * chore: Refresh this PR to reflect underlying changes Also addresses the review request with a detailed comment on the correctness of a new code section. Note that it reverts some changes to the TypeScript signatures of the matrix functions ones() and zeros() -- they do not actually have a typed-function signature of two numbers and an optional format specifically for two dimensions. What they have is a single rest parameter, from which the format is extracted if present. Hence, due to the ban on breaking rest parameters, it is not valid to call math.chain(3).zeros(2) to make a 3-by-2 matrix of zeros, which seems like a perfectly valid ban as the division of the dimensions is very confusing; this should be written as math.chain([3,2]).zeros(). The TypeScript signatures are fixed accordingly, along with the edge case of no arguments to ones() and zeros() at all, which does work to produce the "empty matrix". * Unit test `typeOf` on the minified bundle (currently failing) * Update AUTHORS * Improve testing of typeOf on browser bundle (WIP) * fix #2621: Module "mathjs" has no exported member "count" .ts(2305) (#2622) * fix #2621: Module "mathjs" has no exported member "count" .ts(2305) * feat: Update comments of count * feat: update the signature for count * feat: add usage example for count and sum * chore: Ensure type info remains in bundling Co-authored-by: Glen Whitney <glen@studioinfinity.org> Co-authored-by: Chris Chudzicki <christopher.chudzicki@gmail.com> Co-authored-by: Hansuku <1556207795@qq.com>
379 lines
12 KiB
JavaScript
379 lines
12 KiB
JavaScript
import { isBigNumber, isComplex, isFraction, isMatrix, isUnit } from '../../utils/is.js'
|
|
import { isFactory, stripOptionalNotation } from '../../utils/factory.js'
|
|
import { hasOwnProperty, lazy } from '../../utils/object.js'
|
|
import { contains } from '../../utils/array.js'
|
|
import { ArgumentsError } from '../../error/ArgumentsError.js'
|
|
|
|
export function importFactory (typed, load, math, importedFactories) {
|
|
/**
|
|
* Import functions from an object or a module.
|
|
*
|
|
* This function is only available on a mathjs instance created using `create`.
|
|
*
|
|
* Syntax:
|
|
*
|
|
* math.import(functions)
|
|
* math.import(functions, options)
|
|
*
|
|
* Where:
|
|
*
|
|
* - `functions: Object`
|
|
* An object with functions or factories to be imported.
|
|
* - `options: Object` An object with import options. Available options:
|
|
* - `override: boolean`
|
|
* If true, existing functions will be overwritten. False by default.
|
|
* - `silent: boolean`
|
|
* If true, the function will not throw errors on duplicates or invalid
|
|
* types. False by default.
|
|
* - `wrap: boolean`
|
|
* If true, the functions will be wrapped in a wrapper function
|
|
* which converts data types like Matrix to primitive data types like Array.
|
|
* The wrapper is needed when extending math.js with libraries which do not
|
|
* support these data type. False by default.
|
|
*
|
|
* Examples:
|
|
*
|
|
* import { create, all } from 'mathjs'
|
|
* import * as numbers from 'numbers'
|
|
*
|
|
* // create a mathjs instance
|
|
* const math = create(all)
|
|
*
|
|
* // define new functions and variables
|
|
* math.import({
|
|
* myvalue: 42,
|
|
* hello: function (name) {
|
|
* return 'hello, ' + name + '!'
|
|
* }
|
|
* })
|
|
*
|
|
* // use the imported function and variable
|
|
* math.myvalue * 2 // 84
|
|
* math.hello('user') // 'hello, user!'
|
|
*
|
|
* // import the npm module 'numbers'
|
|
* // (must be installed first with `npm install numbers`)
|
|
* math.import(numbers, {wrap: true})
|
|
*
|
|
* math.fibonacci(7) // returns 13
|
|
*
|
|
* @param {Object | Array} functions Object with functions to be imported.
|
|
* @param {Object} [options] Import options.
|
|
*/
|
|
function mathImport (functions, options) {
|
|
const num = arguments.length
|
|
if (num !== 1 && num !== 2) {
|
|
throw new ArgumentsError('import', num, 1, 2)
|
|
}
|
|
|
|
if (!options) {
|
|
options = {}
|
|
}
|
|
|
|
function flattenImports (flatValues, value, name) {
|
|
if (Array.isArray(value)) {
|
|
value.forEach(item => flattenImports(flatValues, item))
|
|
} else if (typeof value === 'object') {
|
|
for (const name in value) {
|
|
if (hasOwnProperty(value, name)) {
|
|
flattenImports(flatValues, value[name], name)
|
|
}
|
|
}
|
|
} else if (isFactory(value) || name !== undefined) {
|
|
const flatName = isFactory(value)
|
|
? isTransformFunctionFactory(value)
|
|
? (value.fn + '.transform') // TODO: this is ugly
|
|
: value.fn
|
|
: name
|
|
|
|
// we allow importing the same function twice if it points to the same implementation
|
|
if (hasOwnProperty(flatValues, flatName) && flatValues[flatName] !== value && !options.silent) {
|
|
throw new Error('Cannot import "' + flatName + '" twice')
|
|
}
|
|
|
|
flatValues[flatName] = value
|
|
} else {
|
|
if (!options.silent) {
|
|
throw new TypeError('Factory, Object, or Array expected')
|
|
}
|
|
}
|
|
}
|
|
|
|
const flatValues = {}
|
|
flattenImports(flatValues, functions)
|
|
|
|
for (const name in flatValues) {
|
|
if (hasOwnProperty(flatValues, name)) {
|
|
// console.log('import', name)
|
|
const value = flatValues[name]
|
|
|
|
if (isFactory(value)) {
|
|
// we ignore name here and enforce the name of the factory
|
|
// maybe at some point we do want to allow overriding it
|
|
// in that case we can implement an option overrideFactoryNames: true
|
|
_importFactory(value, options)
|
|
} else if (isSupportedType(value)) {
|
|
_import(name, value, options)
|
|
} else {
|
|
if (!options.silent) {
|
|
throw new TypeError('Factory, Object, or Array expected')
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Add a property to the math namespace
|
|
* @param {string} name
|
|
* @param {*} value
|
|
* @param {Object} options See import for a description of the options
|
|
* @private
|
|
*/
|
|
function _import (name, value, options) {
|
|
// TODO: refactor this function, it's to complicated and contains duplicate code
|
|
if (options.wrap && typeof value === 'function') {
|
|
// create a wrapper around the function
|
|
value = _wrap(value)
|
|
}
|
|
|
|
// turn a plain function with a typed-function signature into a typed-function
|
|
if (hasTypedFunctionSignature(value)) {
|
|
value = typed(name, {
|
|
[value.signature]: value
|
|
})
|
|
}
|
|
|
|
if (typed.isTypedFunction(math[name]) && typed.isTypedFunction(value)) {
|
|
if (options.override) {
|
|
// give the typed function the right name
|
|
value = typed(name, value.signatures)
|
|
} else {
|
|
// merge the existing and typed function
|
|
value = typed(math[name], value)
|
|
}
|
|
|
|
math[name] = value
|
|
delete importedFactories[name]
|
|
|
|
_importTransform(name, value)
|
|
math.emit('import', name, function resolver () {
|
|
return value
|
|
})
|
|
return
|
|
}
|
|
|
|
if (math[name] === undefined || options.override) {
|
|
math[name] = value
|
|
delete importedFactories[name]
|
|
|
|
_importTransform(name, value)
|
|
math.emit('import', name, function resolver () {
|
|
return value
|
|
})
|
|
return
|
|
}
|
|
|
|
if (!options.silent) {
|
|
throw new Error('Cannot import "' + name + '": already exists')
|
|
}
|
|
}
|
|
|
|
function _importTransform (name, value) {
|
|
if (value && typeof value.transform === 'function') {
|
|
math.expression.transform[name] = value.transform
|
|
if (allowedInExpressions(name)) {
|
|
math.expression.mathWithTransform[name] = value.transform
|
|
}
|
|
} else {
|
|
// remove existing transform
|
|
delete math.expression.transform[name]
|
|
if (allowedInExpressions(name)) {
|
|
math.expression.mathWithTransform[name] = value
|
|
}
|
|
}
|
|
}
|
|
|
|
function _deleteTransform (name) {
|
|
delete math.expression.transform[name]
|
|
if (allowedInExpressions(name)) {
|
|
math.expression.mathWithTransform[name] = math[name]
|
|
} else {
|
|
delete math.expression.mathWithTransform[name]
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Create a wrapper a round an function which converts the arguments
|
|
* to their primitive values (like convert a Matrix to Array)
|
|
* @param {Function} fn
|
|
* @return {Function} Returns the wrapped function
|
|
* @private
|
|
*/
|
|
function _wrap (fn) {
|
|
const wrapper = function wrapper () {
|
|
const args = []
|
|
for (let i = 0, len = arguments.length; i < len; i++) {
|
|
const arg = arguments[i]
|
|
args[i] = arg && arg.valueOf()
|
|
}
|
|
return fn.apply(math, args)
|
|
}
|
|
|
|
if (fn.transform) {
|
|
wrapper.transform = fn.transform
|
|
}
|
|
|
|
return wrapper
|
|
}
|
|
|
|
/**
|
|
* Import an instance of a factory into math.js
|
|
* @param {function(scope: object)} factory
|
|
* @param {Object} options See import for a description of the options
|
|
* @param {string} [name=factory.name] Optional custom name
|
|
* @private
|
|
*/
|
|
function _importFactory (factory, options, name = factory.fn) {
|
|
if (contains(name, '.')) {
|
|
throw new Error('Factory name should not contain a nested path. ' +
|
|
'Name: ' + JSON.stringify(name))
|
|
}
|
|
|
|
const namespace = isTransformFunctionFactory(factory)
|
|
? math.expression.transform
|
|
: math
|
|
|
|
const existingTransform = name in math.expression.transform
|
|
const existing = hasOwnProperty(namespace, name) ? namespace[name] : undefined
|
|
|
|
const resolver = function () {
|
|
// collect all dependencies, handle finding both functions and classes and other special cases
|
|
const dependencies = {}
|
|
factory.dependencies
|
|
.map(stripOptionalNotation)
|
|
.forEach(dependency => {
|
|
if (contains(dependency, '.')) {
|
|
throw new Error('Factory dependency should not contain a nested path. ' +
|
|
'Name: ' + JSON.stringify(dependency))
|
|
}
|
|
|
|
if (dependency === 'math') {
|
|
dependencies.math = math
|
|
} else if (dependency === 'mathWithTransform') {
|
|
dependencies.mathWithTransform = math.expression.mathWithTransform
|
|
} else if (dependency === 'classes') { // special case for json reviver
|
|
dependencies.classes = math
|
|
} else {
|
|
dependencies[dependency] = math[dependency]
|
|
}
|
|
})
|
|
|
|
const instance = /* #__PURE__ */ factory(dependencies)
|
|
|
|
if (instance && typeof instance.transform === 'function') {
|
|
throw new Error('Transforms cannot be attached to factory functions. ' +
|
|
'Please create a separate function for it with exports.path="expression.transform"')
|
|
}
|
|
|
|
if (existing === undefined || options.override) {
|
|
return instance
|
|
}
|
|
|
|
if (typed.isTypedFunction(existing) && typed.isTypedFunction(instance)) {
|
|
// merge the existing and new typed function
|
|
return typed(existing, instance)
|
|
}
|
|
|
|
if (options.silent) {
|
|
// keep existing, ignore imported function
|
|
return existing
|
|
} else {
|
|
throw new Error('Cannot import "' + name + '": already exists')
|
|
}
|
|
}
|
|
|
|
// TODO: add unit test with non-lazy factory
|
|
if (!factory.meta || factory.meta.lazy !== false) {
|
|
lazy(namespace, name, resolver)
|
|
|
|
// FIXME: remove the `if (existing &&` condition again. Can we make sure subset is loaded before subset.transform? (Name collision, and no dependencies between the two)
|
|
if (existing && existingTransform) {
|
|
_deleteTransform(name)
|
|
} else {
|
|
if (isTransformFunctionFactory(factory) || factoryAllowedInExpressions(factory)) {
|
|
lazy(math.expression.mathWithTransform, name, () => namespace[name])
|
|
}
|
|
}
|
|
} else {
|
|
namespace[name] = resolver()
|
|
|
|
// FIXME: remove the `if (existing &&` condition again. Can we make sure subset is loaded before subset.transform? (Name collision, and no dependencies between the two)
|
|
if (existing && existingTransform) {
|
|
_deleteTransform(name)
|
|
} else {
|
|
if (isTransformFunctionFactory(factory) || factoryAllowedInExpressions(factory)) {
|
|
lazy(math.expression.mathWithTransform, name, () => namespace[name])
|
|
}
|
|
}
|
|
}
|
|
|
|
// TODO: improve factories, store a list with imports instead which can be re-played
|
|
importedFactories[name] = factory
|
|
|
|
math.emit('import', name, resolver)
|
|
}
|
|
|
|
/**
|
|
* Check whether given object is a type which can be imported
|
|
* @param {Function | number | string | boolean | null | Unit | Complex} object
|
|
* @return {boolean}
|
|
* @private
|
|
*/
|
|
function isSupportedType (object) {
|
|
return typeof object === 'function' ||
|
|
typeof object === 'number' ||
|
|
typeof object === 'string' ||
|
|
typeof object === 'boolean' ||
|
|
object === null ||
|
|
isUnit(object) ||
|
|
isComplex(object) ||
|
|
isBigNumber(object) ||
|
|
isFraction(object) ||
|
|
isMatrix(object) ||
|
|
Array.isArray(object)
|
|
}
|
|
|
|
function hasTypedFunctionSignature (fn) {
|
|
return typeof fn === 'function' && typeof fn.signature === 'string'
|
|
}
|
|
|
|
function allowedInExpressions (name) {
|
|
return !hasOwnProperty(unsafe, name)
|
|
}
|
|
|
|
function factoryAllowedInExpressions (factory) {
|
|
return factory.fn.indexOf('.') === -1 && // FIXME: make checking on path redundant, check on meta data instead
|
|
!hasOwnProperty(unsafe, factory.fn) &&
|
|
(!factory.meta || !factory.meta.isClass)
|
|
}
|
|
|
|
function isTransformFunctionFactory (factory) {
|
|
return (factory !== undefined &&
|
|
factory.meta !== undefined &&
|
|
factory.meta.isTransformFunction === true) || false
|
|
}
|
|
|
|
// namespaces and functions not available in the parser for safety reasons
|
|
const unsafe = {
|
|
expression: true,
|
|
type: true,
|
|
docs: true,
|
|
error: true,
|
|
json: true,
|
|
chain: true // chain method not supported. Note that there is a unit chain too.
|
|
}
|
|
|
|
return mathImport
|
|
}
|