fix: reset() should reset all multicharmap defaults

A typo prevented multicharmap from being reset in certain edge cases, and also added an extra key to some objects.
Trott · Oct 10, 2020 · a429809 · a429809
1 parent 6fe2100
commit a429809
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 24 deletions.
diff --git a/slug.js b/slug.js
@@ -177,10 +177,6 @@
     return result
   }
 
-  slug.defaults = {
-    mode: 'pretty'
-  }
-
   const initialMulticharmap = {
     '<3': 'love',
     '&&': 'and',
@@ -196,7 +192,6 @@
     य़: 'Yi',
     ज़: 'Za'
   }
-  slug.multicharmap = slug.defaults.multicharmap = Object.assign({}, initialMulticharmap)
 
   // https://github.com/django/django/blob/master/django/contrib/admin/static/admin/js/urlify.js
   const initialCharmap = {
@@ -830,34 +825,40 @@
     '<': 'less',
     '>': 'greater'
   }
-  slug.charmap = slug.defaults.charmap = Object.assign({}, initialCharmap)
+
+  slug.charmap = Object.assign({}, initialCharmap)
+  slug.multicharmap = Object.assign({}, initialMulticharmap)
+  slug.defaults = {
+    charmap: slug.charmap,
+    mode: 'pretty',
+    modes: {
+      rfc3986: {
+        replacement: '-',
+        remove: null,
+        lower: true,
+        charmap: slug.charmap,
+        multicharmap: slug.multicharmap
+      },
+      pretty: {
+        replacement: '-',
+        remove: null,
+        lower: true,
+        charmap: slug.charmap,
+        multicharmap: slug.multicharmap
+      }
+    },
+    multicharmap: slug.multicharmap
+  }
 
   slug.reset = function () {
     slug.defaults.modes.rfc3986.charmap = slug.defaults.modes.pretty.charmap = slug.charmap = slug.defaults.charmap = Object.assign({}, initialCharmap)
-    slug.defaults.modes.rfc3986.multiCharmap = slug.defaults.modes.pretty.multiCharmap = slug.multicharmap = slug.defaults.multicharmap = Object.assign({}, initialMulticharmap)
+    slug.defaults.modes.rfc3986.multicharmap = slug.defaults.modes.pretty.multicharmap = slug.multicharmap = slug.defaults.multicharmap = Object.assign({}, initialMulticharmap)
   }
 
   slug.extend = function (customMap) {
     Object.assign(slug.charmap, customMap)
   }
 
-  slug.defaults.modes = {
-    rfc3986: {
-      replacement: '-',
-      remove: null,
-      lower: true,
-      charmap: slug.defaults.charmap,
-      multicharmap: slug.defaults.multicharmap
-    },
-    pretty: {
-      replacement: '-',
-      remove: null,
-      lower: true,
-      charmap: slug.defaults.charmap,
-      multicharmap: slug.defaults.multicharmap
-    }
-  }
-
   /* global define */
   // Be compatible with different module systems
 

diff --git a/test/slug.test.js b/test/slug.test.js
@@ -1051,4 +1051,27 @@ describe('slug', function () {
     slug('fhqwhgads', opts)
     assert.deepStrictEqual(opts, {})
   })
+
+  it('should have charmaps reset by reset()', function () {
+    function checkAll (expectedCharmap, expectedMulticharmap, comparison) {
+      [slug, slug.defaults.modes.rfc3986, slug.defaults.modes.pretty, slug.defaults]
+        .forEach(function (actual) {
+          comparison(actual.charmap, expectedCharmap)
+          comparison(actual.multicharmap, expectedMulticharmap)
+        })
+    }
+    const charmap = slug.charmap
+    const multicharmap = slug.multicharmap
+    delete slug.charmap
+    delete slug.defaults.modes.rfc3986.charmap
+    delete slug.defaults.modes.pretty.charmap
+    delete slug.defaults.charmap
+    delete slug.multicharmap
+    delete slug.defaults.modes.rfc3986.multicharmap
+    delete slug.defaults.modes.pretty.multicharmap
+    delete slug.defaults.multicharmap
+    checkAll(undefined, undefined, assert.strictEqual)
+    slug.reset()
+    checkAll(charmap, multicharmap, assert.deepStrictEqual)
+  })
 })