Revert "refactor!: simplify code by removing override parameters"

This reverts commit 166efde.
fixes #106

Author: p-kuen

lib/inflection.d.ts

@@ -18,8 +18,9 @@
  *     inflection.pluralize( 'person' ); // === 'people'
  *     inflection.pluralize( 'octopus' ); // === 'octopuses'
  *     inflection.pluralize( 'Hat' ); // === 'Hats'
+ *     inflection.pluralize( 'person', 'guys' ); // === 'guys'
  */
-export declare function pluralize(str: string): string;
+export declare function pluralize(str: string, plural?: string): string;
 /**
  * This function adds singularization support to every String object.
  * @param str The subject string.
@@ -32,8 +33,9 @@ export declare function pluralize(str: string): string;
  *     inflection.singularize( 'people' ); // === 'person'
  *     inflection.singularize( 'octopuses' ); // === 'octopus'
  *     inflection.singularize( 'Hats' ); // === 'Hat'
+ *     inflection.singularize( 'guys', 'person' ); // === 'person'
  */
-export declare function singularize(str: string): string;
+export declare function singularize(str: string, singular?: string): string;
 /**
  * This function will pluralize or singularlize a String appropriately based on a number value
  * @param str The subject string.
@@ -53,8 +55,9 @@ export declare function singularize(str: string): string;
  *     inflection.inflect( 'person', 2 ); // === 'people'
  *     inflection.inflect( 'octopus', 2 ); // === 'octopuses'
  *     inflection.inflect( 'Hat', 2 ); // === 'Hats'
+ *     inflection.inflect( 'person', 2, null, 'guys' ); // === 'guys'
  */
-export declare function inflect(str: string, count: number): string;
+export declare function inflect(str: string, count: number, singular?: string, plural?: string): string;
 /**
  * This function adds camelization support to every String object.
  * @param str The subject string.

lib/inflection.js

@@ -377,6 +377,7 @@ const regex = {
         tium: new RegExp('([ti])um$', 'gi'),
         sis: new RegExp('sis$', 'gi'),
         ffe: new RegExp('(?:([^f])fe|([lr])f)$', 'gi'),
+        focus: new RegExp('^(focus)$', 'gi'),
         hive: new RegExp('(hi|ti)ve$', 'gi'),
         aeiouyy: new RegExp('([^aeiouy]|qu)y$', 'gi'),
         x: new RegExp('(x|ch|ss|sh)$', 'gi'),
@@ -443,6 +444,7 @@ const pluralRules = [
     [regex.singular.tium, '$1a'],
     [regex.singular.sis, 'ses'],
     [regex.singular.ffe, '$1$2ves'],
+    [regex.singular.focus, '$1es'],
     [regex.singular.hive, '$1ves'],
     [regex.singular.aeiouyy, '$1ies'],
     [regex.singular.matrix, '$1ices'],
@@ -478,6 +480,7 @@ const singularRules = [
     [regex.singular.tium],
     [regex.singular.sis],
     [regex.singular.ffe],
+    [regex.singular.focus],
     [regex.singular.hive],
     [regex.singular.aeiouyy],
     [regex.singular.x],
@@ -574,17 +577,22 @@ const underbarPrefix = new RegExp('^_');
  *
  *     applyRules( 'cows', singular_rules ); // === 'cow'
  */
-function applyRules(str, rules, skip) {
-    if (skip.includes(str.toLocaleLowerCase())) {
-        return str;
+function applyRules(str, rules, skip, override) {
+    if (override) {
+        return override;
     }
-    for (const rule of rules) {
-        if (str.match(rule[0])) {
-            if (rule[1] !== undefined) {
-                return str.replace(rule[0], rule[1]);
-            }
+    else {
+        if (skip.includes(str.toLocaleLowerCase())) {
             return str;
         }
+        for (const rule of rules) {
+            if (str.match(rule[0])) {
+                if (rule[1] !== undefined) {
+                    return str.replace(rule[0], rule[1]);
+                }
+                return str;
+            }
+        }
     }
     return str;
 }
@@ -600,9 +608,10 @@ function applyRules(str, rules, skip) {
  *     inflection.pluralize( 'person' ); // === 'people'
  *     inflection.pluralize( 'octopus' ); // === 'octopuses'
  *     inflection.pluralize( 'Hat' ); // === 'Hats'
+ *     inflection.pluralize( 'person', 'guys' ); // === 'guys'
  */
-function pluralize(str) {
-    return applyRules(str, pluralRules, uncountableWords);
+function pluralize(str, plural) {
+    return applyRules(str, pluralRules, uncountableWords, plural);
 }
 /**
  * This function adds singularization support to every String object.
@@ -616,9 +625,10 @@ function pluralize(str) {
  *     inflection.singularize( 'people' ); // === 'person'
  *     inflection.singularize( 'octopuses' ); // === 'octopus'
  *     inflection.singularize( 'Hats' ); // === 'Hat'
+ *     inflection.singularize( 'guys', 'person' ); // === 'person'
  */
-function singularize(str) {
-    return applyRules(str, singularRules, uncountableWords);
+function singularize(str, singular) {
+    return applyRules(str, singularRules, uncountableWords, singular);
 }
 /**
  * This function will pluralize or singularlize a String appropriately based on a number value
@@ -639,15 +649,16 @@ function singularize(str) {
  *     inflection.inflect( 'person', 2 ); // === 'people'
  *     inflection.inflect( 'octopus', 2 ); // === 'octopuses'
  *     inflection.inflect( 'Hat', 2 ); // === 'Hats'
+ *     inflection.inflect( 'person', 2, null, 'guys' ); // === 'guys'
  */
-function inflect(str, count) {
+function inflect(str, count, singular, plural) {
     if (isNaN(count))
         return str;
     if (count === 1) {
-        return applyRules(str, singularRules, uncountableWords);
+        return applyRules(str, singularRules, uncountableWords, singular);
     }
     else {
-        return applyRules(str, pluralRules, uncountableWords);
+        return applyRules(str, pluralRules, uncountableWords, plural);
     }
 }
 /**

src/inflection.ts

@@ -600,18 +600,27 @@ const underbarPrefix = new RegExp('^_');
  *
  *     applyRules( 'cows', singular_rules ); // === 'cow'
  */
-function applyRules(str: string, rules: [RegExp, string?][], skip: string[]) {
-  if (skip.includes(str.toLocaleLowerCase())) {
-    return str;
-  }
+function applyRules(
+  str: string,
+  rules: [RegExp, string?][],
+  skip: string[],
+  override?: string
+) {
+  if (override) {
+    return override;
+  } else {
+    if (skip.includes(str.toLocaleLowerCase())) {
+      return str;
+    }
 
-  for (const rule of rules) {
-    if (str.match(rule[0])) {
-      if (rule[1] !== undefined) {
-        return str.replace(rule[0], rule[1]);
-      }
+    for (const rule of rules) {
+      if (str.match(rule[0])) {
+        if (rule[1] !== undefined) {
+          return str.replace(rule[0], rule[1]);
+        }
 
-      return str;
+        return str;
+      }
     }
   }
 
@@ -630,9 +639,10 @@ function applyRules(str: string, rules: [RegExp, string?][], skip: string[]) {
  *     inflection.pluralize( 'person' ); // === 'people'
  *     inflection.pluralize( 'octopus' ); // === 'octopuses'
  *     inflection.pluralize( 'Hat' ); // === 'Hats'
+ *     inflection.pluralize( 'person', 'guys' ); // === 'guys'
  */
-export function pluralize(str: string) {
-  return applyRules(str, pluralRules, uncountableWords);
+export function pluralize(str: string, plural?: string) {
+  return applyRules(str, pluralRules, uncountableWords, plural);
 }
 
 /**
@@ -647,9 +657,10 @@ export function pluralize(str: string) {
  *     inflection.singularize( 'people' ); // === 'person'
  *     inflection.singularize( 'octopuses' ); // === 'octopus'
  *     inflection.singularize( 'Hats' ); // === 'Hat'
+ *     inflection.singularize( 'guys', 'person' ); // === 'person'
  */
-export function singularize(str: string) {
-  return applyRules(str, singularRules, uncountableWords);
+export function singularize(str: string, singular?: string) {
+  return applyRules(str, singularRules, uncountableWords, singular);
 }
 
 /**
@@ -671,14 +682,20 @@ export function singularize(str: string) {
  *     inflection.inflect( 'person', 2 ); // === 'people'
  *     inflection.inflect( 'octopus', 2 ); // === 'octopuses'
  *     inflection.inflect( 'Hat', 2 ); // === 'Hats'
+ *     inflection.inflect( 'person', 2, null, 'guys' ); // === 'guys'
  */
-export function inflect(str: string, count: number) {
+export function inflect(
+  str: string,
+  count: number,
+  singular?: string,
+  plural?: string
+) {
   if (isNaN(count)) return str;
 
   if (count === 1) {
-    return applyRules(str, singularRules, uncountableWords);
+    return applyRules(str, singularRules, uncountableWords, singular);
   } else {
-    return applyRules(str, pluralRules, uncountableWords);
+    return applyRules(str, pluralRules, uncountableWords, plural);
   }
 }