mirror of
https://github.com/josdejong/mathjs.git
synced 2026-01-18 14:59:29 +00:00
* Add `.js` extension to source file imports * Specify package `exports` in `package.json` Specify package type as `commonjs` (It's good to be specific) * Move all compiled scripts into `lib` directory Remove ./number.js (You can use the compiled ones in `./lib/*`) Tell node that the `esm` directory is type `module` and enable tree shaking. Remove unused files from packages `files` property * Allow importing of package.json * Make library ESM first * - Fix merge conflicts - Refactor `bundleAny` into `defaultInstance.js` and `browserBundle.cjs` - Refactor unit tests to be able to run with plain nodejs (no transpiling) - Fix browser examples * Fix browser and browserstack tests * Fix running unit tests on Node 10 (which has no support for modules) * Fix node.js examples (those are still commonjs) * Remove the need for `browserBundle.cjs` * Generate minified bundle only * [Security] Bump node-fetch from 2.6.0 to 2.6.1 (#1963) Bumps [node-fetch](https://github.com/bitinn/node-fetch) from 2.6.0 to 2.6.1. **This update includes a security fix.** - [Release notes](https://github.com/bitinn/node-fetch/releases) - [Changelog](https://github.com/node-fetch/node-fetch/blob/master/docs/CHANGELOG.md) - [Commits](https://github.com/bitinn/node-fetch/compare/v2.6.0...v2.6.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * Cleanup console.log * Add integration tests to test the entry points (commonjs/esm, full/number only) * Create backward compatibility error messages in the files moved/removed since v8 * Describe breaking changes in HISTORY.md * Bump karma from 5.2.1 to 5.2.2 (#1965) Bumps [karma](https://github.com/karma-runner/karma) from 5.2.1 to 5.2.2. - [Release notes](https://github.com/karma-runner/karma/releases) - [Changelog](https://github.com/karma-runner/karma/blob/master/CHANGELOG.md) - [Commits](https://github.com/karma-runner/karma/compare/v5.2.1...v5.2.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Lee Langley-Rees <lee@greenimp.co.uk> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
158 lines
4.0 KiB
JavaScript
158 lines
4.0 KiB
JavaScript
import { isOperatorNode } from '../../../utils/is.js'
|
|
import { factory } from '../../../utils/factory.js'
|
|
import { hasOwnProperty } from '../../../utils/object.js'
|
|
|
|
const name = 'simplifyUtil'
|
|
const dependencies = [
|
|
'FunctionNode',
|
|
'OperatorNode',
|
|
'SymbolNode'
|
|
]
|
|
|
|
export const createUtil = /* #__PURE__ */ factory(name, dependencies, ({ FunctionNode, OperatorNode, SymbolNode }) => {
|
|
// TODO commutative/associative properties rely on the arguments
|
|
// e.g. multiply is not commutative for matrices
|
|
// The properties should be calculated from an argument to simplify, or possibly something in math.config
|
|
// the other option is for typed() to specify a return type so that we can evaluate the type of arguments
|
|
const commutative = {
|
|
add: true,
|
|
multiply: true
|
|
}
|
|
const associative = {
|
|
add: true,
|
|
multiply: true
|
|
}
|
|
|
|
function isCommutative (node, context) {
|
|
if (!isOperatorNode(node)) {
|
|
return true
|
|
}
|
|
const name = node.fn.toString()
|
|
if (context && hasOwnProperty(context, name) && hasOwnProperty(context[name], 'commutative')) {
|
|
return context[name].commutative
|
|
}
|
|
return commutative[name] || false
|
|
}
|
|
|
|
function isAssociative (node, context) {
|
|
if (!isOperatorNode(node)) {
|
|
return false
|
|
}
|
|
const name = node.fn.toString()
|
|
if (context && hasOwnProperty(context, name) && hasOwnProperty(context[name], 'associative')) {
|
|
return context[name].associative
|
|
}
|
|
return associative[name] || false
|
|
}
|
|
|
|
/**
|
|
* Flatten all associative operators in an expression tree.
|
|
* Assumes parentheses have already been removed.
|
|
*/
|
|
function flatten (node) {
|
|
if (!node.args || node.args.length === 0) {
|
|
return node
|
|
}
|
|
node.args = allChildren(node)
|
|
for (let i = 0; i < node.args.length; i++) {
|
|
flatten(node.args[i])
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Get the children of a node as if it has been flattened.
|
|
* TODO implement for FunctionNodes
|
|
*/
|
|
function allChildren (node) {
|
|
let op
|
|
const children = []
|
|
const findChildren = function (node) {
|
|
for (let i = 0; i < node.args.length; i++) {
|
|
const child = node.args[i]
|
|
if (isOperatorNode(child) && op === child.op) {
|
|
findChildren(child)
|
|
} else {
|
|
children.push(child)
|
|
}
|
|
}
|
|
}
|
|
|
|
if (isAssociative(node)) {
|
|
op = node.op
|
|
findChildren(node)
|
|
return children
|
|
} else {
|
|
return node.args
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Unflatten all flattened operators to a right-heavy binary tree.
|
|
*/
|
|
function unflattenr (node) {
|
|
if (!node.args || node.args.length === 0) {
|
|
return
|
|
}
|
|
const makeNode = createMakeNodeFunction(node)
|
|
const l = node.args.length
|
|
for (let i = 0; i < l; i++) {
|
|
unflattenr(node.args[i])
|
|
}
|
|
if (l > 2 && isAssociative(node)) {
|
|
let curnode = node.args.pop()
|
|
while (node.args.length > 0) {
|
|
curnode = makeNode([node.args.pop(), curnode])
|
|
}
|
|
node.args = curnode.args
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Unflatten all flattened operators to a left-heavy binary tree.
|
|
*/
|
|
function unflattenl (node) {
|
|
if (!node.args || node.args.length === 0) {
|
|
return
|
|
}
|
|
const makeNode = createMakeNodeFunction(node)
|
|
const l = node.args.length
|
|
for (let i = 0; i < l; i++) {
|
|
unflattenl(node.args[i])
|
|
}
|
|
if (l > 2 && isAssociative(node)) {
|
|
let curnode = node.args.shift()
|
|
while (node.args.length > 0) {
|
|
curnode = makeNode([curnode, node.args.shift()])
|
|
}
|
|
node.args = curnode.args
|
|
}
|
|
}
|
|
|
|
function createMakeNodeFunction (node) {
|
|
if (isOperatorNode(node)) {
|
|
return function (args) {
|
|
try {
|
|
return new OperatorNode(node.op, node.fn, args, node.implicit)
|
|
} catch (err) {
|
|
console.error(err)
|
|
return []
|
|
}
|
|
}
|
|
} else {
|
|
return function (args) {
|
|
return new FunctionNode(new SymbolNode(node.name), args)
|
|
}
|
|
}
|
|
}
|
|
|
|
return {
|
|
createMakeNodeFunction,
|
|
isCommutative,
|
|
isAssociative,
|
|
flatten,
|
|
allChildren,
|
|
unflattenr,
|
|
unflattenl
|
|
}
|
|
})
|