Fix not being able to set configuration after disabling function import

josdejong · josdejong · commit c147d54435dc · 2019-06-11T20:40:07.000+02:00
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,6 +1,12 @@
 # History
 
 
+# not yet published, version 6.0.2
+
+- Fix not being able to set configuration after disabling function `import`
+  (regression since v6.0.0).
+
+
 # 2019-06-09, version 6.0.1
 
 - Fix function reference not published in npm library.
diff --git a/src/core/create.js b/src/core/create.js
@@ -208,15 +208,17 @@ export function create (factories, config) {
   function lazyTyped (...args) {
     return math.typed.apply(math.typed, args)
   }
-  math['import'] = importFactory(lazyTyped, load, math, importedFactories)
+  const internalImport = importFactory(lazyTyped, load, math, importedFactories)
+  math['import'] = internalImport
 
   // listen for changes in config, import all functions again when changed
+  // TODO: move this listener into the import function?
   math.on('config', () => {
     values(importedFactories).forEach(factory => {
       if (factory && factory.meta && factory.meta.recreateOnConfigChange) {
         // FIXME: only re-create when the current instance is the same as was initially created
         // FIXME: delete the functions/constants before importing them again?
-        math['import'](factory, { override: true })
+        internalImport(factory, { override: true })
       }
     })
   })
diff --git a/test/unit-tests/core/config.test.js b/test/unit-tests/core/config.test.js
@@ -1,4 +1,20 @@
+import assert from 'assert'
+import math from '../../../src/bundleAny'
 
 describe('config', function () {
+  it('should allow setting config after having overwritten import', () => {
+    const math2 = math.create()
+
+    assert.strictEqual(math2.typeOf(math2.pi), 'number')
+
+    math2.import({
+      import: () => { throw new Error('Function import is disabled') }
+    }, { override: true })
+
+    math2.config({ number: 'BigNumber' })
+
+    assert.strictEqual(math2.typeOf(math2.pi), 'BigNumber')
+  })
+
   // TODO: test function config
 })
