Merge branch 'develop' into v12

# Conflicts:
#	HISTORY.md

Author: josdejong

HISTORY.md

@@ -6,10 +6,13 @@
   Thanks @gwhitney.
 
 
-# unpublished changes since 11.11.1
+# 2023-10-11, 11.11.2
 
 - Fix #3025: improve handling of matrices and error handling 
   in function `corr` (#3030). Thanks @vrushaket.
+- Fix #3074: improve error message when using function `max` in `derivative`.
+- Fix #3073: fix parsing quotes inside a string.
+- Fix #2027: cannot use named operators like `to` or `mod` as property name. 
 
 
 # 2023-09-20, 11.11.1

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "mathjs",
-  "version": "11.11.1",
+  "version": "11.11.2",
   "description": "Math.js is an extensive math library for JavaScript and Node.js. It features a flexible expression parser with support for symbolic computation, comes with a large set of built-in functions and constants, and offers an integrated solution to work with different data types like numbers, big numbers, complex numbers, fractions, units, and matrices.",
   "author": "Jos de Jong <wjosdejong@gmail.com> (https://github.com/josdejong)",
   "homepage": "https://mathjs.org",
@@ -25,7 +25,7 @@
     "unit"
   ],
   "dependencies": {
-    "@babel/runtime": "^7.22.15",
+    "@babel/runtime": "^7.23.1",
     "complex.js": "^2.1.1",
     "decimal.js": "^10.4.3",
     "escape-latex": "^1.2.0",
@@ -36,32 +36,32 @@
     "typed-function": "^4.1.1"
   },
   "devDependencies": {
-    "@babel/core": "7.22.20",
+    "@babel/core": "7.23.0",
     "@babel/plugin-transform-object-assign": "7.22.5",
     "@babel/plugin-transform-runtime": "7.22.15",
     "@babel/preset-env": "7.22.20",
     "@babel/register": "7.22.15",
-    "@types/assert": "1.5.6",
-    "@types/mocha": "10.0.1",
-    "@typescript-eslint/eslint-plugin": "6.7.2",
-    "@typescript-eslint/parser": "6.7.2",
+    "@types/assert": "1.5.7",
+    "@types/mocha": "10.0.2",
+    "@typescript-eslint/eslint-plugin": "6.7.5",
+    "@typescript-eslint/parser": "6.7.5",
     "assert": "2.1.0",
     "babel-loader": "9.1.3",
     "benchmark": "2.1.4",
     "c8": "8.0.1",
     "codecov": "3.8.3",
-    "core-js": "3.32.2",
+    "core-js": "3.33.0",
     "del": "6.1.1",
     "dtslint": "4.2.1",
-    "eslint": "8.49.0",
+    "eslint": "8.51.0",
     "eslint-config-prettier": "9.0.0",
     "eslint-config-standard": "17.1.0",
     "eslint-plugin-import": "2.28.1",
-    "eslint-plugin-mocha": "10.1.0",
-    "eslint-plugin-n": "16.1.0",
-    "eslint-plugin-prettier": "5.0.0",
+    "eslint-plugin-mocha": "10.2.0",
+    "eslint-plugin-n": "16.2.0",
+    "eslint-plugin-prettier": "5.0.1",
     "eslint-plugin-promise": "6.1.1",
-    "expect-type": "0.16.0",
+    "expect-type": "0.17.3",
     "expr-eval": "2.0.2",
     "fancy-log": "2.0.0",
     "glob": "8.1.0",

package.json

@@ -1418,9 +1418,12 @@ export const createParse = /* #__PURE__ */ factory(name, dependencies, ({
         // dot notation like variable.prop
         getToken(state)
 
-        if (state.tokenType !== TOKENTYPE.SYMBOL) {
+        const isPropertyName = state.tokenType === TOKENTYPE.SYMBOL ||
+          (state.tokenType === TOKENTYPE.DELIMITER && state.token in NAMED_DELIMITERS)
+        if (!isPropertyName) {
           throw createSyntaxError(state, 'Property name expected after dot')
         }
+
         params.push(new ConstantNode(state.token))
         getToken(state)
 
@@ -1466,7 +1469,10 @@ export const createParse = /* #__PURE__ */ factory(name, dependencies, ({
       if (currentCharacter(state) === '\\') {
         // escape character, immediately process the next
         // character to prevent stopping at a next '\"'
-        str += currentCharacter(state)
+        const cNext = nextCharacter(state)
+        if (cNext !== "'") {
+          str += currentCharacter(state)
+        }
         next(state)
       }
 
@@ -1517,7 +1523,10 @@ export const createParse = /* #__PURE__ */ factory(name, dependencies, ({
       if (currentCharacter(state) === '\\') {
         // escape character, immediately process the next
         // character to prevent stopping at a next '\''
-        str += currentCharacter(state)
+        const cNext = nextCharacter(state)
+        if (cNext !== "'" && cNext !== '"') {
+          str += currentCharacter(state)
+        }
         next(state)
       }
 
@@ -1531,7 +1540,7 @@ export const createParse = /* #__PURE__ */ factory(name, dependencies, ({
     }
     getToken(state)
 
-    return JSON.parse('"' + str + '"') // unescape escaped characters
+    return JSON.parse('"' + str.replace(/"/g, '\\"') + '"') // unescape escaped characters
   }
 
   /**

src/expression/parse.js

@@ -765,7 +765,8 @@ export const createDerivative = /* #__PURE__ */ factory(name, dependencies, ({
     }
 
     node.compile().evaluate()
-    throw new Error('Expected TypeError, but none found')
+
+    throw new Error('Function "' + node.name + '" is not supported by derivative, or a wrong number of arguments is passed')
   }
 
   /**

src/function/algebra/derivative.js

@@ -1,3 +1,3 @@
-export const version = '11.11.1'
+export const version = '11.11.2'
 // Note: This file is automatically generated when building math.js.
 // Changes made in this file will be overwritten.

src/version.js

@@ -364,6 +364,19 @@ describe('parse', function () {
       assert.deepStrictEqual(parseAndEval('   "hi" '), 'hi')
     })
 
+    it('should parse a string containing quotes', function () {
+      // quote
+      assert.deepStrictEqual(parseAndEval('"with\'quote"'), "with'quote")
+
+      // escaped quote -> remove escape character
+      assert.deepStrictEqual(parseAndEval('"with\\"quote"'), 'with"quote')
+      assert.deepStrictEqual(parseAndEval('"with\\\'quote"'), "with'quote")
+
+      // escaped escape character -> remove two escape characters
+      assert.deepStrictEqual(parseAndEval('"with\\\\\\"quote"'), 'with\\"quote')
+      assert.deepStrictEqual(parseAndEval('"with\\\\\'quote"'), "with\\'quote")
+    })
+
     it('should parse a with escaped characters', function () {
       assert.deepStrictEqual(parseAndEval('"line end\\nnext"'), 'line end\nnext')
       assert.deepStrictEqual(parseAndEval('"line end\\n"'), 'line end\n')
@@ -420,7 +433,20 @@ describe('parse', function () {
       assert.deepStrictEqual(parseAndEval('   \'hi\' '), 'hi')
     })
 
-    it('should parse a with escaped characters', function () {
+    it('should parse a string containing quotes', function () {
+      // quote
+      assert.deepStrictEqual(parseAndEval("'with\"quote'"), 'with"quote')
+
+      // escaped quote -> remove escape character
+      assert.deepStrictEqual(parseAndEval("'with\\'quote'"), "with'quote")
+      assert.deepStrictEqual(parseAndEval("'with\\\"quote'"), 'with"quote')
+
+      // escaped escape character -> remove two escape characters
+      assert.deepStrictEqual(parseAndEval("'with\\\\\\'quote'"), "with\\'quote")
+      assert.deepStrictEqual(parseAndEval("'with\\\\\"quote'"), 'with\\"quote')
+    })
+
+    it('should parse a string with escaped characters', function () {
       assert.deepStrictEqual(parseAndEval('\'line end\\nnext\''), 'line end\nnext')
       assert.deepStrictEqual(parseAndEval('\'line end\\n\''), 'line end\n')
       assert.deepStrictEqual(parseAndEval('\'tab\\tnext\''), 'tab\tnext')
@@ -772,6 +798,12 @@ describe('parse', function () {
       assert.deepStrictEqual(parseAndEval('obj.foo[1].bar', { obj: { foo: [{ bar: 4 }] } }), 4)
     })
 
+    it('should get a property with the name of an operator like "to" or "in"', function () {
+      assert.deepStrictEqual(parseAndEval('obj.mod', { obj: { mod: 42 } }), 42)
+      assert.deepStrictEqual(parseAndEval('obj.in', { obj: { in: 42 } }), 42)
+      assert.deepStrictEqual(parseAndEval('obj.to', { obj: { to: 42 } }), 42)
+    })
+
     it('should set an object property', function () {
       const scope = { obj: { a: 3 } }
       const res = parseAndEval('obj["b"] = 2', scope)

test/unit-tests/expression/parse.test.js

@@ -238,8 +238,12 @@ describe('derivative', function () {
   })
 
   it('should throw error if expressions contain unsupported operators or functions', function () {
-    assert.throws(function () { derivative('x << 2', 'x') }, /Error: Operator "<<" is not supported by derivative/)
-    assert.throws(function () { derivative('subset(x)', 'x') }, /Error: Function "subset" is not supported by derivative/)
+    assert.throws(function () { derivative('x << 2', 'x') }, /Error: Operator "<<" is not supported by derivative, or a wrong number of arguments is passed/)
+    assert.throws(function () { derivative('subset(x)', 'x') }, /Error: Function "subset" is not supported by derivative, or a wrong number of arguments is passed/)
+    assert.throws(function () { derivative('max(x)', 'x') }, /Error: Function "max" is not supported by derivative, or a wrong number of arguments is passed/)
+    assert.throws(function () { derivative('max(x, y)', 'x') }, /Error: Function "max" is not supported by derivative, or a wrong number of arguments is passed/)
+    assert.throws(function () { derivative('max(x, 1)', 'x') }, /Error: Function "max" is not supported by derivative, or a wrong number of arguments is passed/)
+    assert.throws(function () { derivative('add(2,3,x)', 'x') }, /Error: Function "add" is not supported by derivative, or a wrong number of arguments is passed/)
   })
 
   it('should have controlled behavior on arguments errors', function () {