n2words 2.0.0 → 3.1.0

package/lib/languages/he.js

@@ -1,206 +1,265 @@
-import { SlavicLanguage } from '../classes/slavic-language.js'
-
 /**
- * Modern Hebrew language converter.
+ * Modern Hebrew language converter - Functional Implementation
+ *
+ * Self-contained module with its own input validation, ready for subpath exports.
  *
- * Supports:
- * - Right-to-left text orientation
+ * Key features:
  * - Feminine grammatical forms (default in Modern Hebrew)
- * - Three-form pluralization (singular/few/many)
- * - Optional "ve" (ו) conjunction via options
+ * - Dual forms for 2, 200, 2000
+ * - Special 1-9 thousands construct state
+ * - "ו" (ve) conjunction rules vary by position
+ * - Per-digit decimal reading
  */
-export class Hebrew extends SlavicLanguage {
-  negativeWord = 'מינוס'
-  decimalSeparatorWord = 'נקודה'
-  zeroWord = 'אפס'
-  usePerDigitDecimals = true
-
-  // Feminine forms (default in Modern Hebrew)
-  onesWords = {
-    1: 'אחת',
-    2: 'שתים',
-    3: 'שלש',
-    4: 'ארבע',
-    5: 'חמש',
-    6: 'שש',
-    7: 'שבע',
-    8: 'שמונה',
-    9: 'תשע'
-  }
 
-  teensWords = {
-    0: 'עשר',
-    1: 'אחת עשרה',
-    2: 'שתים עשרה',
-    3: 'שלש עשרה',
-    4: 'ארבע עשרה',
-    5: 'חמש עשרה',
-    6: 'שש עשרה',
-    7: 'שבע עשרה',
-    8: 'שמונה עשרה',
-    9: 'תשע עשרה'
-  }
+import { parseNumericValue } from '../utils/parse-numeric.js'
+import { validateOptions } from '../utils/validate-options.js'
 
-  twentiesWords = {
-    2: 'עשרים',
-    3: 'שלשים',
-    4: 'ארבעים',
-    5: 'חמישים',
-    6: 'ששים',
-    7: 'שבעים',
-    8: 'שמונים',
-    9: 'תשעים'
-  }
+// ============================================================================
+// Vocabulary (arrays for indexed access - faster than object property lookup)
+// ============================================================================
 
-  hundredsWords = {
-    1: 'מאה',
-    2: 'מאתיים',
-    3: 'מאות'
-  }
+// Feminine forms (default in Modern Hebrew) - index 0 unused
+const ONES = ['', 'אחת', 'שתים', 'שלש', 'ארבע', 'חמש', 'שש', 'שבע', 'שמונה', 'תשע']
+const TEENS = ['עשר', 'אחת עשרה', 'שתים עשרה', 'שלש עשרה', 'ארבע עשרה', 'חמש עשרה', 'שש עשרה', 'שבע עשרה', 'שמונה עשרה', 'תשע עשרה']
+const TENS = ['', '', 'עשרים', 'שלשים', 'ארבעים', 'חמישים', 'ששים', 'שבעים', 'שמונים', 'תשעים']
+const HUNDREDS = ['', 'מאה', 'מאתיים', 'שלש מאות', 'ארבע מאות', 'חמש מאות', 'שש מאות', 'שבע מאות', 'שמונה מאות', 'תשע מאות']
 
-  pluralForms = {
-    1: 'אלף',
-    2: 'אלפיים',
-    3: 'שלשת אלפים',
-    4: 'ארבעת אלפים',
-    5: 'חמשת אלפים',
-    6: 'ששת אלפים',
-    7: 'שבעת אלפים',
-    8: 'שמונת אלפים',
-    9: 'תשעת אלפים'
-  }
+// Special forms for 1-9 thousand (index 0 unused)
+const THOUSANDS_SPECIAL = ['', 'אלף', 'אלפיים', 'שלשת אלפים', 'ארבעת אלפים', 'חמשת אלפים', 'ששת אלפים', 'שבעת אלפים', 'שמונת אלפים', 'תשעת אלפים']
+
+// Scale words (index 1 = thousands, 2 = millions, etc.)
+const SCALE = ['', 'אלף', 'מיליון', 'מיליארד', 'טריליון', 'קוודרליון', 'קווינטיליון']
+const SCALE_PLURAL = ['', 'אלפים', 'מיליונים', 'מיליארדים', 'טריליונים', 'קוודרליונים', 'קווינטיליונים']
+
+const ZERO = 'אפס'
+const NEGATIVE = 'מינוס'
+const DECIMAL_SEP = 'נקודה'
 
-  scale = {
-    1: 'אלף', // thousand (singular)
-    2: 'מיליון', // million
-    3: 'מיליארד', // billion
-    4: 'טריליון', // trillion
-    5: 'קוודרליון', // quadrillion
-    6: 'קווינטיליון' // quintillion
+// ============================================================================
+// Segment Building
+// ============================================================================
+
+/**
+ * Builds segment word for scale segments (thousands, millions, etc.).
+ * "ו" is added before tens and ones when following hundreds.
+ */
+function buildScaleSegment (n, andWord) {
+  if (n === 0) return ''
+
+  const ones = n % 10
+  const tens = Math.floor(n / 10) % 10
+  const hundreds = Math.floor(n / 100)
+
+  let result = ''
+
+  // Hundreds
+  if (hundreds > 0) {
+    result = HUNDREDS[hundreds]
   }
 
-  scalePlural = {
-    1: 'אלפים', // thousands
-    2: 'מיליונים', // millions
-    3: 'מיליארדים', // billions
-    4: 'טריליונים', // trillions
-    5: 'קוודרליונים', // quadrillions
-    6: 'קווינטיליונים' // quintillions
+  // Tens and ones
+  if (tens === 1) {
+    // Teens (10-19)
+    const teenWord = TEENS[ones]
+    if (result) {
+      result += ' ' + andWord + teenWord
+    } else {
+      result = teenWord
+    }
+  } else {
+    // Tens (20-90)
+    if (tens >= 2) {
+      if (result) {
+        result += ' ' + andWord + TENS[tens]
+      } else {
+        result = TENS[tens]
+      }
+    }
+
+    // Ones
+    if (ones > 0) {
+      if (result) {
+        result += ' ' + andWord + ONES[ones]
+      } else {
+        result = ONES[ones]
+      }
+    }
   }
 
-  constructor (options = {}) {
-    super(options)
+  return result
+}
+
+/**
+ * Builds segment word for units segment (no scale word).
+ * "ו" is only added before the final ones digit.
+ */
+function buildUnitsSegment (n, andWord) {
+  if (n === 0) return ''
+
+  const ones = n % 10
+  const tens = Math.floor(n / 10) % 10
+  const hundreds = Math.floor(n / 100)
+
+  let result = ''
 
-    this.setOptions({
-      andWord: 'ו'
-    }, options)
+  // Hundreds
+  if (hundreds > 0) {
+    result = HUNDREDS[hundreds]
   }
 
-  /** Converts integer part to Hebrew words with special handling for thousands. */
-  integerToWords (integerPart) {
-    if (integerPart === 0n) {
-      return this.zeroWord
+  // Tens (no conjunction)
+  if (tens === 1) {
+    // Teens (10-19)
+    if (result) {
+      result += ' ' + TEENS[ones]
+    } else {
+      result = TEENS[ones]
     }
-    const words = []
-    const segments = this.splitToSegments(integerPart.toString(), 3)
-    let index = segments.length
-    for (const x of segments) {
-      index = index - 1
-      if (x === 0n) {
-        continue
+  } else {
+    if (tens >= 2) {
+      if (result) {
+        result += ' ' + TENS[tens]
+      } else {
+        result = TENS[tens]
       }
+    }
 
-      const [n1, n2, n3] = this.extractDigits(x)
-
-      if (index > 0) {
-        // For thousands and above, handle the full chunk value
-        const chunkWords = []
-        let hasHundreds = false
-
-        // Process hundreds in this chunk
-        if (n3 > 0n) {
-          hasHundreds = true
-          if (n3 <= 2n) {
-            chunkWords.push(this.hundredsWords[n3])
-          } else {
-            chunkWords.push(this.onesWords[n3] + ' ' + this.hundredsWords[3])
-          }
-        }
+    // Ones - conjunction only here
+    if (ones > 0) {
+      if (result) {
+        result += ' ' + andWord + ONES[ones]
+      } else {
+        result = ONES[ones]
+      }
+    }
+  }
 
-        // Process tens in this chunk
-        if (n2 > 1n) {
-          // Add conjunction if there were hundreds before
-          const tensWord = this.twentiesWords[n2]
-          chunkWords.push(hasHundreds ? this.options.andWord + tensWord : tensWord)
-        }
+  return result
+}
 
-        // Process ones in this chunk
-        if (n2 === 1n) {
-          // Add conjunction if there were hundreds before
-          const onesWord = this.teensWords[n1]
-          chunkWords.push(hasHundreds ? this.options.andWord + onesWord : onesWord)
-        } else if (n1 > 0n) {
-          // For "one million", "one billion", etc., don't add the word "one"
-          if (x === 1n && index > 1) {
-            // Skip adding "one" for millions/billions/etc.
-          } else if (x <= 9n && chunkWords.length === 0 && index === 1) {
-            // Use special forms for 1-9 thousand
-            chunkWords.push(this.pluralForms[n1])
-          } else {
-            const onesWord = this.onesWords[n1]
-            // Add conjunction if there were hundreds or tens before
-            chunkWords.push((hasHundreds || n2 > 0n) ? this.options.andWord + onesWord : onesWord)
-          }
-        }
+// ============================================================================
+// Conversion Functions
+// ============================================================================
 
-        // Add scale word (thousand, million, billion, etc.)
-        if (x > 9n || index > 1) {
-          // For numbers > 9 or higher scales, use appropriate scale word
-          if (x === 1n) {
-            // Singular form (e.g., "one thousand", "one million")
-            chunkWords.push(this.scale[index])
-          } else if (x === 2n && index === 1) {
-            // Special dual form for "two thousand" (already in thousands[2])
-            return [this.pluralForms[2], ...words].join(' ')
-          } else if (x === 2n) {
-            // For two million, two billion, etc. - use plural form
-            chunkWords.push(this.scalePlural[index])
-          } else if (index === 1) {
-            // For thousands (10+), always use singular "אלף"
-            chunkWords.push(this.scale[index])
-          } else {
-            // For millions/billions/etc. use plural form
-            chunkWords.push(this.scalePlural[index])
-          }
-        }
+/**
+ * Converts a non-negative integer to Hebrew words.
+ *
+ * @param {bigint} n - Non-negative integer to convert
+ * @param {Object} options - Conversion options
+ * @returns {string} Hebrew words
+ */
+function integerToWords (n, options) {
+  if (n === 0n) return ZERO
 
-        words.push(chunkWords.join(' '))
-        continue
-      }
+  const andWord = options.andWord ?? 'ו'
+
+  // Fast path: numbers < 1000
+  if (n < 1000n) {
+    return buildUnitsSegment(Number(n), andWord)
+  }
+
+  // Extract segments using BigInt modulo
+  const segments = []
+  let temp = n
+  while (temp > 0n) {
+    segments.push(Number(temp % 1000n))
+    temp = temp / 1000n
+  }
 
-      if (n3 > 0n) {
-        if (n3 <= 2n) {
-          words.push(this.hundredsWords[n3])
+  // Build result string directly
+  let result = ''
+
+  for (let i = segments.length - 1; i >= 0; i--) {
+    const segment = segments[i]
+    if (segment === 0) continue
+
+    if (i === 0) {
+      // Units segment (no scale word)
+      const segmentWord = buildUnitsSegment(segment, andWord)
+      if (result) {
+        // Add "ו" before single-digit units when following scale words
+        if (segment <= 9) {
+          result += ' ' + andWord + segmentWord
         } else {
-          words.push(this.onesWords[n3] + ' ' + this.hundredsWords[3])
+          result += ' ' + segmentWord
         }
+      } else {
+        result = segmentWord
       }
-
-      if (n2 > 1n) {
-        words.push(this.twentiesWords[n2])
+    } else if (i === 1) {
+      // Thousands - special handling for 1-9
+      if (segment <= 9) {
+        if (result) result += ' '
+        result += THOUSANDS_SPECIAL[segment]
+      } else {
+        const segmentWord = buildScaleSegment(segment, andWord)
+        if (result) result += ' '
+        result += segmentWord + ' ' + SCALE[1]
       }
-
-      if (n2 === 1n) {
-        words.push(this.teensWords[n1])
-      } else if (n1 > 0n) {
-        words.push(this.onesWords[n1])
+    } else {
+      // Millions and above
+      if (segment === 1) {
+        if (result) result += ' '
+        result += SCALE[i]
+      } else {
+        const segmentWord = buildScaleSegment(segment, andWord)
+        if (result) result += ' '
+        result += segmentWord + ' ' + SCALE_PLURAL[i]
       }
     }
+  }
 
-    if (words.length > 1) {
-      words[words.length - 1] = this.options.andWord + words.at(-1)
-    }
+  return result
+}
 
-    return words.join(' ')
+/**
+ * Converts decimal digits to Hebrew words (digit by digit).
+ *
+ * @param {string} decimalPart - Decimal digits (without the point)
+ * @returns {string} Hebrew words for decimal part
+ */
+function decimalPartToWords (decimalPart) {
+  let result = ''
+
+  for (let i = 0; i < decimalPart.length; i++) {
+    const d = parseInt(decimalPart[i], 10)
+    if (result) result += ' '
+    result += d === 0 ? ZERO : ONES[d]
   }
+
+  return result
 }
+
+/**
+ * Converts a numeric value to Modern Hebrew words.
+ *
+ * @param {number | string | bigint} value - The numeric value to convert
+ * @param {Object} [options] - Optional configuration
+ * @param {('masculine'|'feminine')} [options.gender='masculine'] - Grammatical gender
+ * @param {string} [options.andWord] - Custom conjunction word
+ * @returns {string} The number in Modern Hebrew words
+ */
+function toWords (value, options) {
+  options = validateOptions(options)
+  const { isNegative, integerPart, decimalPart } = parseNumericValue(value)
+
+  let result = ''
+
+  if (isNegative) {
+    result = NEGATIVE + ' '
+  }
+
+  result += integerToWords(integerPart, options)
+
+  if (decimalPart) {
+    result += ' ' + DECIMAL_SEP + ' ' + decimalPartToWords(decimalPart)
+  }
+
+  return result
+}
+
+// ============================================================================
+// Exports
+// ============================================================================
+
+export { toWords }

package/lib/languages/hi.d.ts

@@ -1,11 +1,7 @@
 /**
- * Hindi language converter.
+ * Converts a numeric value to Hindi words.
  *
- * Supports:
- * - Indian numbering system (हज़ार, लाख, करोड़)
- * - Devanagari script
- * - Complete word forms for 0-99
+ * @param {number | string | bigint} value - The numeric value to convert
+ * @returns {string} The number in Hindi words
  */
-export class Hindi extends SouthAsianLanguage {
-}
-import { SouthAsianLanguage } from '../classes/south-asian-language.js';
+export function toWords(value: number | string | bigint): string;