natural 6.10.2 → 6.10.3

package/lib/natural/inflectors/noun_inflector.js

@@ -23,148 +23,133 @@ THE SOFTWARE.
 'use strict'
 
 const SingularPluralInflector = require('./singular_plural_inflector')
-const util = require('util')
 const FormSet = require('./form_set')
 
-// Changing the prototype of a native type is bad practice
-/*
-function attach () {
-  const inflector = this
-
-  String.prototype.singularizeNoun = function () {
-    return inflector.singularize(this)
-  }
-
-  String.prototype.pluralizeNoun = function () {
-    return inflector.pluralize(this)
+class NounInflector extends SingularPluralInflector {
+  constructor () {
+    super()
+    this.ambiguous = [
+      'bison', 'bream', 'carp', 'chassis', 'christmas', 'cod', 'corps', 'debris', 'deer',
+      'diabetes', 'equipment', 'elk', 'fish', 'flounder', 'gallows', 'graffiti',
+      'headquarters', 'herpes', 'highjinks', 'homework', 'information',
+      'mackerel', 'mews', 'money', 'news', 'rice', 'rabies', 'salmon', 'series',
+      'sheep', 'shrimp', 'species', 'swine', 'tennis', 'trout', 'tuna', 'whiting', 'wildebeest'
+    ]
+
+    this.customPluralForms = []
+    this.customSingularForms = []
+    this.singularForms = new FormSet()
+    this.pluralForms = new FormSet()
+
+    // this.attach = attach
+
+    this.addIrregular('child', 'children')
+    this.addIrregular('man', 'men')
+    this.addIrregular('person', 'people')
+    this.addIrregular('sex', 'sexes')
+    this.addIrregular('mouse', 'mice')
+    this.addIrregular('ox', 'oxen')
+    this.addIrregular('foot', 'feet')
+    this.addIrregular('tooth', 'teeth')
+    this.addIrregular('goose', 'geese')
+    this.addIrregular('ephemeris', 'ephemerides')
+    this.addIrregular('cloth', 'clothes')
+    this.addIrregular('hero', 'heroes')
+    this.addIrregular('torso', 'torsi')
+
+    // see if it is possible to unify the creation of both the singular and
+    // plural regexes or maybe even just have one list. with a complete list
+    // of rules it may only be possible for some regular forms, but worth a shot
+    this.pluralForms.regularForms.push([/([aeiou]y)$/i, '$1s'])
+    this.pluralForms.regularForms.push([/y$/i, 'ies'])
+    this.pluralForms.regularForms.push([/ife$/i, 'ives'])
+    this.pluralForms.regularForms.push([/(antenn|formul|nebul|vertebr|vit)a$/i, '$1ae'])
+    this.pluralForms.regularForms.push([/(octop|vir|radi|nucle|fung|cact|stimul|alumn|calcul|hippopotam|macrofung|phoet|syllab|troph)us$/i, '$1i'])
+    this.pluralForms.regularForms.push([/(buffal|tomat|tornad)o$/i, '$1oes'])
+    this.pluralForms.regularForms.push([/(sis)$/i, 'ses'])
+    this.pluralForms.regularForms.push([/(matr|vert|ind|cort)(ix|ex)$/i, '$1ices'])
+    this.pluralForms.regularForms.push([/sses$/i, 'sses'])
+    this.pluralForms.regularForms.push([/(x|ch|ss|sh|s|z)$/i, '$1es'])
+    this.pluralForms.regularForms.push([/^(?!talis|.*hu)(.*)man$/i, '$1men'])
+    this.pluralForms.regularForms.push([/(.*)/i, '$1s'])
+
+    // Words ending in -ff or -ffe you just add s to make the plural.
+    // Sheriffs | Giraffes
+    // this.pluralForms.regularForms.push([/(.+ffe?)$/i, '$1s'])
+
+    // words ending in f that just add s:
+    // roof - roofs
+    // chief - chiefs
+    // oaf -oafs
+    // this.pluralForms.regularForms.push([/([^f]+f)$/i, '$1s'])
+
+    // Example of words using the -f / -fe to -ves rule
+    // leaf - leaves
+    // wolf - wolves
+    // calf - calves
+    // half - halves
+    // knife - knives
+    // loaf - loaves
+    // life - lives
+    // wife - wives
+    // shelf - shelves
+    // thief - thieves
+    // yourself - yourselves
+    this.addIrregular('leaf', 'leaves')
+    this.addIrregular('wolf', 'wolves')
+    this.addIrregular('calf', 'calves')
+    this.addIrregular('half', 'halves')
+    this.addIrregular('knife', 'knives')
+    this.addIrregular('loaf', 'loaves')
+    this.addIrregular('life', 'lives')
+    this.addIrregular('wife', 'wives')
+    this.addIrregular('shelf', 'shelves')
+    this.addIrregular('thief', 'thieves')
+    this.addIrregular('yourself', 'yourselves')
+
+    // Some words have multiple valid plural forms endings with -ves or -s:
+    // scarf - scarfs/scarves
+    // dwarf - dwarfs / dwarves
+    // wharf - wharfs / wharves
+    // handkerchief - handkerchiefs / handkerchieves
+    // this.pluralForms.regularForms.push([/(.*r)f/i, '$1ves'])
+
+    // Singular inflections
+
+    // Some words have multiple valid plural forms endings with -ves or -s:
+    // scarf - scarfs/scarves
+    // dwarf - dwarfs / dwarves
+    // wharf - wharfs / wharves
+    // handkerchief - handkerchiefs / handkerchieves
+    this.singularForms.regularForms.push([/(.*)ves$/i, '$1f'])
+
+    // expenses - expense
+    // defenses - defense
+    this.singularForms.regularForms.push([/(.*)nses$/i, '$1nse'])
+
+    this.singularForms.regularForms.push([/([^v])ies$/i, '$1y'])
+    this.singularForms.regularForms.push([/ives$/i, 'ife'])
+    this.singularForms.regularForms.push([/(antenn|formul|nebul|vertebr|vit)ae$/i, '$1a'])
+    this.singularForms.regularForms.push([/(octop|vir|radi|nucle|fung|cact|stimul|alumn|calcul|hippopotam|macrofung|phoet|syllab|troph)(i)$/i, '$1us'])
+    this.singularForms.regularForms.push([/(buffal|tomat|tornad)(oes)$/i, '$1o'])
+    this.singularForms.regularForms.push([/(analy|naly|synop|parenthe|diagno|the)ses$/i, '$1sis'])
+    this.singularForms.regularForms.push([/(vert|ind|cort)(ices)$/i, '$1ex'])
+    // our pluralizer won''t cause this form of appendix (appendicies)
+    // but we should handle it
+    this.singularForms.regularForms.push([/(matr|append)(ices)$/i, '$1ix'])
+    this.singularForms.regularForms.push([/(x|ch|ss|sh|s|z)es$/i, '$1'])
+    this.singularForms.regularForms.push([/men$/i, 'man'])
+    this.singularForms.regularForms.push([/ss$/i, 'ss'])
+    this.singularForms.regularForms.push([/s$/i, ''])
+
+    this.pluralize = function (token) {
+      return this.ize(token, this.pluralForms, this.customPluralForms)
+    }
+
+    this.singularize = function (token) {
+      return this.ize(token, this.singularForms, this.customSingularForms)
+    }
   }
 }
-*/
-
-const NounInflector = function () {
-  this.ambiguous = [
-    'bison', 'bream', 'carp', 'chassis', 'christmas', 'cod', 'corps', 'debris', 'deer',
-    'diabetes', 'equipment', 'elk', 'fish', 'flounder', 'gallows', 'graffiti',
-    'headquarters', 'herpes', 'highjinks', 'homework', 'information',
-    'mackerel', 'mews', 'money', 'news', 'rice', 'rabies', 'salmon', 'series',
-    'sheep', 'shrimp', 'species', 'swine', 'tennis', 'trout', 'tuna', 'whiting', 'wildebeest'
-  ]
-
-  this.customPluralForms = []
-  this.customSingularForms = []
-  this.singularForms = new FormSet()
-  this.pluralForms = new FormSet()
-
-  // this.attach = attach
-
-  this.addIrregular('child', 'children')
-  this.addIrregular('man', 'men')
-  this.addIrregular('person', 'people')
-  this.addIrregular('sex', 'sexes')
-  this.addIrregular('mouse', 'mice')
-  this.addIrregular('ox', 'oxen')
-  this.addIrregular('foot', 'feet')
-  this.addIrregular('tooth', 'teeth')
-  this.addIrregular('goose', 'geese')
-  this.addIrregular('ephemeris', 'ephemerides')
-  this.addIrregular('cloth', 'clothes')
-  this.addIrregular('hero', 'heroes')
-  this.addIrregular('torso', 'torsi')
-
-  // see if it is possible to unify the creation of both the singular and
-  // plural regexes or maybe even just have one list. with a complete list
-  // of rules it may only be possible for some regular forms, but worth a shot
-  this.pluralForms.regularForms.push([/([aeiou]y)$/i, '$1s'])
-  this.pluralForms.regularForms.push([/y$/i, 'ies'])
-  this.pluralForms.regularForms.push([/ife$/i, 'ives'])
-  this.pluralForms.regularForms.push([/(antenn|formul|nebul|vertebr|vit)a$/i, '$1ae'])
-  this.pluralForms.regularForms.push([/(octop|vir|radi|nucle|fung|cact|stimul|alumn|calcul|hippopotam|macrofung|phoet|syllab|troph)us$/i, '$1i'])
-  this.pluralForms.regularForms.push([/(buffal|tomat|tornad)o$/i, '$1oes'])
-  this.pluralForms.regularForms.push([/(sis)$/i, 'ses'])
-  this.pluralForms.regularForms.push([/(matr|vert|ind|cort)(ix|ex)$/i, '$1ices'])
-  this.pluralForms.regularForms.push([/sses$/i, 'sses'])
-  this.pluralForms.regularForms.push([/(x|ch|ss|sh|s|z)$/i, '$1es'])
-  this.pluralForms.regularForms.push([/^(?!talis|.*hu)(.*)man$/i, '$1men'])
-  this.pluralForms.regularForms.push([/(.*)/i, '$1s'])
-
-  // Words ending in -ff or -ffe you just add s to make the plural.
-  // Sheriffs | Giraffes
-  // this.pluralForms.regularForms.push([/(.+ffe?)$/i, '$1s'])
-
-  // words ending in f that just add s:
-  // roof - roofs
-  // chief - chiefs
-  // oaf -oafs
-  // this.pluralForms.regularForms.push([/([^f]+f)$/i, '$1s'])
-
-  // Example of words using the -f / -fe to -ves rule
-  // leaf - leaves
-  // wolf - wolves
-  // calf - calves
-  // half - halves
-  // knife - knives
-  // loaf - loaves
-  // life - lives
-  // wife - wives
-  // shelf - shelves
-  // thief - thieves
-  // yourself - yourselves
-  this.addIrregular('leaf', 'leaves')
-  this.addIrregular('wolf', 'wolves')
-  this.addIrregular('calf', 'calves')
-  this.addIrregular('half', 'halves')
-  this.addIrregular('knife', 'knives')
-  this.addIrregular('loaf', 'loaves')
-  this.addIrregular('life', 'lives')
-  this.addIrregular('wife', 'wives')
-  this.addIrregular('shelf', 'shelves')
-  this.addIrregular('thief', 'thieves')
-  this.addIrregular('yourself', 'yourselves')
-
-  // Some words have multiple valid plural forms endings with -ves or -s:
-  // scarf - scarfs/scarves
-  // dwarf - dwarfs / dwarves
-  // wharf - wharfs / wharves
-  // handkerchief - handkerchiefs / handkerchieves
-  // this.pluralForms.regularForms.push([/(.*r)f/i, '$1ves'])
-
-  // Singular inflections
-
-  // Some words have multiple valid plural forms endings with -ves or -s:
-  // scarf - scarfs/scarves
-  // dwarf - dwarfs / dwarves
-  // wharf - wharfs / wharves
-  // handkerchief - handkerchiefs / handkerchieves
-  this.singularForms.regularForms.push([/(.*)ves$/i, '$1f'])
-
-  // expenses - expense
-  // defenses - defense
-  this.singularForms.regularForms.push([/(.*)nses$/i, '$1nse'])
-
-  this.singularForms.regularForms.push([/([^v])ies$/i, '$1y'])
-  this.singularForms.regularForms.push([/ives$/i, 'ife'])
-  this.singularForms.regularForms.push([/(antenn|formul|nebul|vertebr|vit)ae$/i, '$1a'])
-  this.singularForms.regularForms.push([/(octop|vir|radi|nucle|fung|cact|stimul|alumn|calcul|hippopotam|macrofung|phoet|syllab|troph)(i)$/i, '$1us'])
-  this.singularForms.regularForms.push([/(buffal|tomat|tornad)(oes)$/i, '$1o'])
-  this.singularForms.regularForms.push([/(analy|naly|synop|parenthe|diagno|the)ses$/i, '$1sis'])
-  this.singularForms.regularForms.push([/(vert|ind|cort)(ices)$/i, '$1ex'])
-  // our pluralizer won''t cause this form of appendix (appendicies)
-  // but we should handle it
-  this.singularForms.regularForms.push([/(matr|append)(ices)$/i, '$1ix'])
-  this.singularForms.regularForms.push([/(x|ch|ss|sh|s|z)es$/i, '$1'])
-  this.singularForms.regularForms.push([/men$/i, 'man'])
-  this.singularForms.regularForms.push([/ss$/i, 'ss'])
-  this.singularForms.regularForms.push([/s$/i, ''])
-
-  this.pluralize = function (token) {
-    return this.ize(token, this.pluralForms, this.customPluralForms)
-  }
-
-  this.singularize = function (token) {
-    return this.ize(token, this.singularForms, this.customSingularForms)
-  }
-}
-
-util.inherits(NounInflector, SingularPluralInflector)
 
 module.exports = NounInflector

package/lib/natural/inflectors/present_verb_inflector.js

@@ -20,58 +20,44 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-const util = require('util')
 const SingularPluralInflector = require('./singular_plural_inflector')
 const FormSet = require('./form_set')
 
-/*
-function attach () {
-  const inflector = this
-
-  String.prototype.singularizePresentVerb = function () {
-    return inflector.singularize(this)
-  }
-
-  String.prototype.pluralizePresentVerb = function () {
-    return inflector.pluralize(this)
+class VerbInflector extends SingularPluralInflector {
+  constructor () {
+    super()
+    this.ambiguous = [
+      'will'
+    ]
+
+    // this.attach = attach
+
+    this.customPluralForms = []
+    this.customSingularForms = []
+    this.singularForms = new FormSet()
+    this.pluralForms = new FormSet()
+
+    this.addIrregular('am', 'are')
+    this.addIrregular('is', 'are')
+    this.addIrregular('was', 'were')
+    this.addIrregular('has', 'have')
+
+    this.singularForms.regularForms.push([/ed$/i, 'ed'])
+    this.singularForms.regularForms.push([/ss$/i, 'sses'])
+    this.singularForms.regularForms.push([/x$/i, 'xes'])
+    this.singularForms.regularForms.push([/(h|z|o)$/i, '$1es'])
+    this.singularForms.regularForms.push([/$zz/i, 'zzes'])
+    this.singularForms.regularForms.push([/([^a|e|i|o|u])y$/i, '$1ies'])
+    this.singularForms.regularForms.push([/$/i, 's'])
+
+    this.pluralForms.regularForms.push([/sses$/i, 'ss'])
+    this.pluralForms.regularForms.push([/xes$/i, 'x'])
+    this.pluralForms.regularForms.push([/([cs])hes$/i, '$1h'])
+    this.pluralForms.regularForms.push([/zzes$/i, 'zz'])
+    this.pluralForms.regularForms.push([/([^h|z|o|i])es$/i, '$1e'])
+    this.pluralForms.regularForms.push([/ies$/i, 'y'])// flies->fly
+    this.pluralForms.regularForms.push([/e?s$/i, ''])
   }
 }
-*/
-
-const VerbInflector = function () {
-  this.ambiguous = [
-    'will'
-  ]
-
-  // this.attach = attach
-
-  this.customPluralForms = []
-  this.customSingularForms = []
-  this.singularForms = new FormSet()
-  this.pluralForms = new FormSet()
-
-  this.addIrregular('am', 'are')
-  this.addIrregular('is', 'are')
-  this.addIrregular('was', 'were')
-  this.addIrregular('has', 'have')
-
-  this.singularForms.regularForms.push([/ed$/i, 'ed'])
-  this.singularForms.regularForms.push([/ss$/i, 'sses'])
-  this.singularForms.regularForms.push([/x$/i, 'xes'])
-  this.singularForms.regularForms.push([/(h|z|o)$/i, '$1es'])
-  this.singularForms.regularForms.push([/$zz/i, 'zzes'])
-  this.singularForms.regularForms.push([/([^a|e|i|o|u])y$/i, '$1ies'])
-  this.singularForms.regularForms.push([/$/i, 's'])
-
-  this.pluralForms.regularForms.push([/sses$/i, 'ss'])
-  this.pluralForms.regularForms.push([/xes$/i, 'x'])
-  this.pluralForms.regularForms.push([/([cs])hes$/i, '$1h'])
-  this.pluralForms.regularForms.push([/zzes$/i, 'zz'])
-  this.pluralForms.regularForms.push([/([^h|z|o|i])es$/i, '$1e'])
-  this.pluralForms.regularForms.push([/ies$/i, 'y'])// flies->fly
-  this.pluralForms.regularForms.push([/e?s$/i, ''])
-}
-
-util.inherits(VerbInflector, SingularPluralInflector)
 
 module.exports = VerbInflector

package/lib/natural/inflectors/singular_plural_inflector.js

@@ -20,90 +20,91 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-const TenseInflector = function () {
+const uppercaseify = (token) => {
+  return token.toUpperCase()
 }
 
-TenseInflector.prototype.addSingular = function (pattern, replacement) {
-  this.customSingularForms.push([pattern, replacement])
+const capitalize = (token) => {
+  return token[0].toUpperCase() + token.slice(1)
 }
 
-TenseInflector.prototype.addPlural = function (pattern, replacement) {
-  this.customPluralForms.push([pattern, replacement])
+const lowercaseify = (token) => {
+  return token.toLowerCase()
 }
 
-TenseInflector.prototype.ize = function (token, formSet, customForms) {
-  const restoreCase = this.restoreCase(token)
-  return restoreCase(this.izeRegExps(token, customForms) || this.izeAbiguous(token) ||
-        this.izeRegulars(token, formSet) || this.izeRegExps(token, formSet.regularForms) ||
-        token)
-}
+class TenseInflector {
+  addSingular (pattern, replacement) {
+    this.customSingularForms.push([pattern, replacement])
+  }
 
-TenseInflector.prototype.izeAbiguous = function (token) {
-  if (this.ambiguous.indexOf(token.toLowerCase()) > -1) { return token.toLowerCase() }
+  addPlural (pattern, replacement) {
+    this.customPluralForms.push([pattern, replacement])
+  }
 
-  return false
-}
+  ize (token, formSet, customForms) {
+    const restoreCase = this.restoreCase(token)
+    return restoreCase(this.izeRegExps(token, customForms) || this.izeAbiguous(token) ||
+          this.izeRegulars(token, formSet) || this.izeRegExps(token, formSet.regularForms) ||
+          token)
+  }
 
-TenseInflector.prototype.pluralize = function (token) {
-  return this.ize(token, this.pluralForms, this.customPluralForms)
-}
+  izeAbiguous (token) {
+    if (this.ambiguous.indexOf(token.toLowerCase()) > -1) { return token.toLowerCase() }
 
-TenseInflector.prototype.singularize = function (token) {
-  return this.ize(token, this.singularForms, this.customSingularForms)
-}
+    return false
+  }
 
-const uppercaseify = function (token) {
-  return token.toUpperCase()
-}
-const capitalize = function (token) {
-  return token[0].toUpperCase() + token.slice(1)
-}
-const lowercaseify = function (token) {
-  return token.toLowerCase()
-}
+  pluralize (token) {
+    return this.ize(token, this.pluralForms, this.customPluralForms)
+  }
+
+  singularize (token) {
+    return this.ize(token, this.singularForms, this.customSingularForms)
+  }
 
-TenseInflector.prototype.restoreCase = function (token) {
-  if (token[0] === token[0].toUpperCase()) {
-    if (token[1] && token[1] === token[1].toLowerCase()) {
-      return capitalize
+  restoreCase (token) {
+    if (token[0] === token[0].toUpperCase()) {
+      if (token[1] && token[1] === token[1].toLowerCase()) {
+        return capitalize
+      } else {
+        return uppercaseify
+      }
     } else {
-      return uppercaseify
+      return lowercaseify
     }
-  } else {
-    return lowercaseify
   }
-}
 
-TenseInflector.prototype.izeRegulars = function (token, formSet) {
-  token = token.toLowerCase()
-  // if (formSet.irregularForms.hasOwnProperty(token) && formSet.irregularForms[token]) {
-  if (formSet.irregularForms[token]) {
-    return formSet.irregularForms[token]
+  izeRegulars (token, formSet) {
+    token = token.toLowerCase()
+    // if (formSet.irregularForms.hasOwnProperty(token) && formSet.irregularForms[token]) {
+    if (formSet.irregularForms[token]) {
+      return formSet.irregularForms[token]
+    }
+
+    return false
   }
 
-  return false
-}
+  addForm (singularTable, pluralTable, singular, plural) {
+    singular = singular.toLowerCase()
+    plural = plural.toLowerCase()
+    pluralTable[singular] = plural
+    singularTable[plural] = singular
+  }
 
-TenseInflector.prototype.addForm = function (singularTable, pluralTable, singular, plural) {
-  singular = singular.toLowerCase()
-  plural = plural.toLowerCase()
-  pluralTable[singular] = plural
-  singularTable[plural] = singular
-}
+  addIrregular (singular, plural) {
+    this.addForm(this.singularForms.irregularForms, this.pluralForms.irregularForms, singular, plural)
+  }
 
-TenseInflector.prototype.addIrregular = function (singular, plural) {
-  this.addForm(this.singularForms.irregularForms, this.pluralForms.irregularForms, singular, plural)
-}
+  izeRegExps (token, forms) {
+    let i, form
+    for (i = 0; i < forms.length; i++) {
+      form = forms[i]
 
-TenseInflector.prototype.izeRegExps = function (token, forms) {
-  let i, form
-  for (i = 0; i < forms.length; i++) {
-    form = forms[i]
+      if (token.match(form[0])) { return token.replace(form[0], form[1]) }
+    }
 
-    if (token.match(form[0])) { return token.replace(form[0], form[1]) }
+    return false
   }
-
-  return false
 }
 
 module.exports = TenseInflector