Merge pull request #763 from spencermountain/dev

Dev

changelog.md

@@ -12,6 +12,13 @@ While all _Major_ releases should be reviewed, our only two _large_ releases are
 
 -move (some) contractions into tokenizer?
 
+#### 13.3.0
+
+- bugfixes (conjugation and tagging) 752, 737, 725, 751, 743 748, 755, 758, 706, 761
+- support tokenized array as input
+- update deps
+- bugfix updates to `plugin-sentences`, and `plugin-dates`
+
 #### 13.2.0
 
 - deprecate `.money()` and favour overloaded method in compromise-numbers plugin

data/numbers/cardinals.js

@@ -37,4 +37,9 @@ module.exports = [
   'quintillion',
   'sextillion',
   'septillion',
+  // plural-multiples
+  'thousands',
+  'millions',
+  'billions',
+  'trillions',
 ]

data/people/maleNames.js

@@ -904,6 +904,7 @@ module.exports = [
   'vernon',
   'vicente',
   'victor',
+  'viktor',
   'vihaan',
   'vince',
   'vincent',

package.json

@@ -2,7 +2,7 @@
   "author": "Spencer Kelly <[email protected]> (http://spencermounta.in)",
   "name": "compromise",
   "description": "modest natural language processing",
-  "version": "13.2.0",
+  "version": "13.3.0",
   "main": "./builds/compromise.js",
   "unpkg": "./builds/compromise.min.js",
   "module": "./builds/compromise.mjs",
@@ -54,21 +54,21 @@
     "efrt-unpack": "2.2.0"
   },
   "devDependencies": {
-    "@babel/core": "7.9.0",
-    "@babel/preset-env": "7.9.5",
-    "@rollup/plugin-alias": "3.1.0",
-    "@rollup/plugin-commonjs": "11.1.0",
-    "@rollup/plugin-json": "4.0.3",
-    "@rollup/plugin-node-resolve": "7.1.3",
+    "@babel/core": "7.10.2",
+    "@babel/preset-env": "7.10.2",
+    "@rollup/plugin-alias": "3.1.1",
+    "@rollup/plugin-commonjs": "13.0.0",
+    "@rollup/plugin-json": "4.1.0",
+    "@rollup/plugin-node-resolve": "8.0.1",
     "amble": "1.0.0",
     "efrt": "2.2.2",
-    "rollup": "2.7.2",
+    "rollup": "2.15.0",
     "rollup-plugin-babel": "4.4.0",
     "rollup-plugin-filesize-check": "0.0.1",
-    "rollup-plugin-terser": "5.3.0",
+    "rollup-plugin-terser": "6.1.0",
     "shelljs": "0.8.4",
     "tap-dancer": "0.2.0",
-    "tape": "5.0.0"
+    "tape": "5.0.1"
   },
   "eslintIgnore": [
     "builds/*.js",

plugins/adjectives/src/toVerb.js

@@ -9,7 +9,7 @@ let dontDo = ['c', 'e', 'g', 'l', 'n', 'r', 'w', 'y'].reduce((h, c) => {
 
 const dontDoTwo = { ed: true, nt: true }
 
-const blacklist = {
+const banList = {
   random: true,
   wild: true,
 }
@@ -24,15 +24,15 @@ const irregulars = {
   tired: 'tire',
 }
 
-const toVerb = str => {
+const toVerb = (str) => {
   if (irregulars.hasOwnProperty(str) === true) {
     return irregulars[str]
   }
   //don't bother with these:
   if (str.length <= 3) {
     return null
   }
-  if (blacklist.hasOwnProperty(str) === true) {
+  if (banList.hasOwnProperty(str) === true) {
     return null
   }
   //suffixes to avoid