Update to [email protected]

Author: josdejong

bin/cli.js

@@ -96,7 +96,7 @@ function completer (text) {
 
     // scope variables
     for (const def in scope) {
-      if (scope.hasOwnProperty(def)) {
+      if (hasOwnProperty(scope, def)) {
         if (def.indexOf(keyword) === 0) {
           matches.push(def)
         }
@@ -113,7 +113,7 @@ function completer (text) {
     // math functions and constants
     const ignore = ['expr', 'type']
     for (const func in math.expression.mathWithTransform) {
-      if (math.expression.mathWithTransform.hasOwnProperty(func)) {
+      if (hasOwnProperty(math.expression.mathWithTransform, func)) {
         if (func.indexOf(keyword) === 0 && ignore.indexOf(func) === -1) {
           matches.push(func)
         }
@@ -122,24 +122,24 @@ function completer (text) {
 
     // units
     const Unit = math.Unit
-    for (let name in Unit.UNITS) {
-      if (Unit.UNITS.hasOwnProperty(name)) {
+    for (const name in Unit.UNITS) {
+      if (hasOwnProperty(Unit.UNITS, name)) {
         if (name.indexOf(keyword) === 0) {
           matches.push(name)
         }
       }
     }
-    for (let name in Unit.PREFIXES) {
-      if (Unit.PREFIXES.hasOwnProperty(name)) {
+    for (const name in Unit.PREFIXES) {
+      if (hasOwnProperty(Unit.PREFIXES, name)) {
         const prefixes = Unit.PREFIXES[name]
         for (const prefix in prefixes) {
-          if (prefixes.hasOwnProperty(prefix)) {
+          if (hasOwnProperty(prefixes, prefix)) {
             if (prefix.indexOf(keyword) === 0) {
               matches.push(prefix)
             } else if (keyword.indexOf(prefix) === 0) {
               const unitKeyword = keyword.substring(prefix.length)
               for (const n in Unit.UNITS) {
-                if (Unit.UNITS.hasOwnProperty(n)) {
+                if (hasOwnProperty(Unit.UNITS, n)) {
                   if (n.indexOf(unitKeyword) === 0 &&
                       Unit.isValuelessUnit(prefix + n)) {
                     matches.push(prefix + n)
@@ -424,3 +424,9 @@ if (version) {
     }
   })
 }
+
+// helper function to safely check whether an object as a property
+// copy from the function in object.js which is ES6
+function hasOwnProperty (object, property) {
+  return object && Object.hasOwnProperty.call(object, property)
+}

examples/advanced/custom_argument_parsing.js

@@ -93,6 +93,6 @@ console.log(math.integrate(f, 0, 1)) // outputs 0.6667254718034714
 console.log(math.evaluate('integrate(x^0.5, x, 0, 1)')) // outputs 0.6667254718034714
 
 // use the function via the expression parser (2)
-let scope = {}
+const scope = {}
 math.evaluate('f(x) = 2 * x', scope)
 console.log(math.evaluate('integrate(f(x), x, 0, 2)', scope)) // outputs 4.000000000000003

examples/advanced/more_secure_eval.js

@@ -24,12 +24,12 @@ const math = create(all)
 const limitedEvaluate = math.evaluate
 
 math.import({
-  'import': function () { throw new Error('Function import is disabled') },
-  'createUnit': function () { throw new Error('Function createUnit is disabled') },
-  'evaluate': function () { throw new Error('Function evaluate is disabled') },
-  'parse': function () { throw new Error('Function parse is disabled') },
-  'simplify': function () { throw new Error('Function simplify is disabled') },
-  'derivative': function () { throw new Error('Function derivative is disabled') }
+  import: function () { throw new Error('Function import is disabled') },
+  createUnit: function () { throw new Error('Function createUnit is disabled') },
+  evaluate: function () { throw new Error('Function evaluate is disabled') },
+  parse: function () { throw new Error('Function parse is disabled') },
+  simplify: function () { throw new Error('Function simplify is disabled') },
+  derivative: function () { throw new Error('Function derivative is disabled') }
 }, { override: true })
 
 console.log(limitedEvaluate('sqrt(16)')) // Ok, 4

examples/advanced/web_server/math_worker.js

@@ -6,7 +6,7 @@ const math = create(all)
 function noImport () {
   throw new Error('function import is disabled.')
 }
-math.import({ 'import': noImport }, { override: true })
+math.import({ import: noImport }, { override: true })
 
 /**
  * Evaluate an expression

examples/expressions.js

@@ -36,7 +36,7 @@ print(math.evaluate([
 
 // provide a scope (just a regular JavaScript Object)
 console.log('\nevaluate expressions providing a scope with variables and functions')
-let scope = {
+const scope = {
   a: 3,
   b: 4
 }
@@ -84,7 +84,7 @@ console.log('\nprovide a scope')
 const node2 = math.parse('x^a')
 const code2 = node2.compile()
 print(node2.toString()) // "x ^ a"
-let scope2 = {
+const scope2 = {
   x: 3,
   a: 2
 }
@@ -115,7 +115,7 @@ print(code3.evaluate()) // 5
 // provide a scope for the variable assignment
 console.log('\nprovide a scope')
 const code4 = math.compile('a = a + 3')
-let scope3 = {
+const scope3 = {
   a: 7
 }
 code4.evaluate(scope3)

examples/objects.js

@@ -10,7 +10,7 @@ print(evaluate('{"name": "John"}')) // {"name": "John"}
 // create an object containing an object
 print(evaluate('{a: 2, b: {c: 3, d: 4}}')) // {"a": 2, "b": {"c": 3, "d": 4}}
 
-let scope = {
+const scope = {
   obj: {
     prop: 42
   }

gulpfile.js

@@ -169,8 +169,6 @@ function minify (done) {
 
     log('Minified ' + FILE_MIN)
     log('Mapped ' + FILE_MAP)
-  } catch (e) {
-    throw e
   } finally {
     process.chdir(oldCwd)
   }