Skip to content

Commit 5932005

Browse files
josdejonggwhitneyChristopherChudzickiHansuku
authored
V11 with typed-function@3 (#2560)
* 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 <[email protected]> * test: add two-dimensional test cases for diff of length 1 Co-authored-by: Chris Chudzicki <[email protected]> Co-authored-by: Glen Whitney <[email protected]> * 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 <[email protected]> Co-authored-by: Chris Chudzicki <[email protected]> Co-authored-by: Hansuku <[email protected]>
1 parent 09a044f commit 5932005

File tree

266 files changed

+7313
-8339
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

266 files changed

+7313
-8339
lines changed

AUTHORS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,5 +194,7 @@ Shadman Kolahzary <[email protected]>
194194
Laureen Beaudry <[email protected]>
195195
BOUYA Med. Salim <[email protected]>
196196
Alexander <[email protected]>
197+
FelixSelter <[email protected]>
198+
197199

198200
# Generated by tools/update-authors.js

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ See the [Getting Started](https://mathjs.org/docs/getting_started.html) for a mo
7575

7676
## Browser support
7777

78-
Math.js works on any ES5 compatible JavaScript engine: node.js, Chrome, Firefox, Safari, Edge, and IE11.
78+
Math.js works on any ES6 compatible JavaScript engine, including node.js, Chrome, Firefox, Safari, and Edge.
7979

8080

8181
## Documentation

docs/core/chaining.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,11 @@ a number of special functions:
3939
Executes `math.format(value)` onto the chain's value, returning
4040
a string representation of the value.
4141

42+
Note that a "rest" or "..." parameter may not be broken across the value
43+
in the chain and a function call. For example
44+
45+
```js
46+
math.chain(3).median(4,5).done() // throws error
47+
```
48+
49+
does not compute the median of 3, 4, and 5.

docs/datatypes/units.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,10 @@ Returns a clone of a unit represented in SI units. Works with units with or with
250250
Get a string representation of the unit. The function will
251251
determine the best fitting prefix for the unit.
252252

253+
### unit.valType()
254+
Get the string name of the current type of the value of this Unit object, e.g.
255+
'number', 'BigNumber', etc.
256+
253257
## Unit reference
254258

255259
This section lists all available units, prefixes, and physical constants. These can be used via the Unit object, or via `math.evaluate()`.

docs/expressions/algebra.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ console.log(simplified.toString()) // '3 * x'
2727
console.log(simplified.evaluate({x: 4})) // 12
2828
```
2929

30+
Among its other actions, calling `simplify()` on an expression will convert
31+
any functions that have operator equivalents to their operator form:
32+
```js
33+
console.log(math.simplify('multiply(x,3)').toString) // '3 * x'
34+
```
35+
3036
Note that `simplify` has an optional argument `scope` that allows the definitions of variables in the expression (as numeric values, or as further expressions) to be specified and used in the simplification, e.g. continuing the previous example,
3137

3238
```js

docs/expressions/syntax.md

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,11 @@ math.evaluate('2 + 3 * 4') // 14
4747
math.evaluate('(2 + 3) * 4') // 20
4848
```
4949

50-
The following operators are available:
50+
The following operators are available. Note that almost every operator listed
51+
also has a function form with identical meaning that can be used
52+
interchangeably. For example, `x+y` will always evaluate identically to
53+
`add(x,y)`. For a full list of the equivalences, see the section on
54+
Functions below.
5155

5256
Operator | Name | Syntax | Associativity | Example | Result
5357
----------- | -------------------------- | ---------- | ------------- | --------------------- | ---------------
@@ -197,6 +201,46 @@ const parser = math.parser()
197201
parser.evaluate('f = typed({"number": f(x) = x ^ 2 - 5})')
198202
```
199203

204+
Finally, as mentioned above, there is a function form for nearly every one of
205+
the mathematical operator symbols. Moreover, for some associative operators,
206+
the corresponding function allows arbitrarily many arguments. The table below
207+
gives the full correspondence.
208+
209+
Operator Expression | Equivalent Function Expression
210+
---------------------|-------------------------------
211+
`a or b` |`or(a,b)`
212+
`a xor b` |`xor(a,b)`
213+
`a and b` |`and(a,b)`
214+
`a \| b` |`bitOr(a,b)`
215+
`a ^\| b` |`bitXor(a,b)`
216+
`a & b` |`bitAnd(a,b)`
217+
`a == b` |`equal(a,b)`
218+
`a != b` |`unequal(a,b)`
219+
`a < b` |`smaller(a,b)`
220+
`a > b` |`larger(a,b)`
221+
`a <= b` |`smallerEq(a,b)`
222+
`a << 3` |`leftShift(a,3)`
223+
`a >> 3` |`rightArithShift(a,3)`
224+
`a >>> 3` |`rightLogShift(a,3)`
225+
`u to cm` |`to(u, cm)`
226+
`a + b + c + ...` |`add(a,b,c,...)`
227+
`a - b` |`subtract(a,b)`
228+
`a * b * c * ...` |`multiply(a,b,c,...)`
229+
`A .* B` |`dotMultiply(A,B)`
230+
`A ./ B` |`dotDivide(A,B)`
231+
`a mod b` |`mod(a,b)`
232+
`+a` |`unaryPlus(a)`
233+
`-a` |`unaryMinus(a)`
234+
`~a` |`bitNot(a)`
235+
`not a` |`not(a)`
236+
`a^b` |`pow(a,b)`
237+
`A .^ B` |`dotPow(A,B)`
238+
`a!` |`factorial(a)`
239+
`A'` |`ctranspose(A)`
240+
241+
Note that math.js embodies a preference for the operator forms, in that calling
242+
`simplify` (see [Algebra](./algebra.md)) converts any instances of the function
243+
form into the corresponding operator.
200244

201245
## Constants and variables
202246

package-lock.json

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"javascript-natural-sort": "^0.7.1",
3434
"seedrandom": "^3.0.5",
3535
"tiny-emitter": "^2.1.0",
36-
"typed-function": "^2.1.0"
36+
"typed-function": "^3.0.0"
3737
},
3838
"devDependencies": {
3939
"@babel/core": "7.18.6",
@@ -176,8 +176,5 @@
176176
"bugs": {
177177
"url": "https://github.com/josdejong/mathjs/issues"
178178
},
179-
"browserslist": [
180-
"IE 11"
181-
],
182179
"sideEffects": false
183180
}

src/core/create.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import './../utils/polyfills.js'
2+
import typedFunction from 'typed-function'
23
import { deepFlatten, isLegacyFactory, values } from '../utils/object.js'
34
import * as emitter from './../utils/emitter.js'
45
import { importFactory } from './function/import.js'
@@ -206,6 +207,8 @@ export function create (factories, config) {
206207
function lazyTyped (...args) {
207208
return math.typed.apply(math.typed, args)
208209
}
210+
lazyTyped.isTypedFunction = typedFunction.isTypedFunction
211+
209212
const internalImport = importFactory(lazyTyped, load, math, importedFactories)
210213
math.import = internalImport
211214

src/core/function/import.js

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ export function importFactory (typed, load, math, importedFactories) {
144144
})
145145
}
146146

147-
if (isTypedFunction(math[name]) && isTypedFunction(value)) {
147+
if (typed.isTypedFunction(math[name]) && typed.isTypedFunction(value)) {
148148
if (options.override) {
149149
// give the typed function the right name
150150
value = typed(name, value.signatures)
@@ -280,7 +280,7 @@ export function importFactory (typed, load, math, importedFactories) {
280280
return instance
281281
}
282282

283-
if (isTypedFunction(existing) && isTypedFunction(instance)) {
283+
if (typed.isTypedFunction(existing) && typed.isTypedFunction(instance)) {
284284
// merge the existing and new typed function
285285
return typed(existing, instance)
286286
}
@@ -344,15 +344,6 @@ export function importFactory (typed, load, math, importedFactories) {
344344
Array.isArray(object)
345345
}
346346

347-
/**
348-
* Test whether a given thing is a typed-function
349-
* @param {*} fn
350-
* @return {boolean} Returns true when `fn` is a typed-function
351-
*/
352-
function isTypedFunction (fn) {
353-
return typeof fn === 'function' && typeof fn.signatures === 'object'
354-
}
355-
356347
function hasTypedFunctionSignature (fn) {
357348
return typeof fn === 'function' && typeof fn.signature === 'string'
358349
}

0 commit comments

Comments
 (0)