n2words 2.0.0 → 3.1.0

package/lib/languages/sr-Cyrl.js

@@ -1,113 +1,221 @@
-import { SlavicLanguage } from '../classes/slavic-language.js'
-
 /**
- * Serbian language converter (Cyrillic script).
+ * Serbian Cyrillic language converter - Functional Implementation
+ *
+ * Self-contained module with its own input validation, ready for subpath exports.
  *
- * Supports:
+ * Key features:
  * - Three-form pluralization (one/few/many)
- * - Gender agreement (један/једна, два/две)
- * - Cyrillic script representation
+ * - Gender: thousands are feminine, millions+ are masculine
+ * - Irregular hundreds
+ * - Long scale naming with -ard forms
+ * - Cyrillic script
  */
-export class SerbianCyrillic extends SlavicLanguage {
-  negativeWord = 'минус'
-  decimalSeparatorWord = 'запета'
-  zeroWord = 'нула'
-
-  onesWords = {
-    1: 'један',
-    2: 'два',
-    3: 'три',
-    4: 'четири',
-    5: 'пет',
-    6: 'шест',
-    7: 'седам',
-    8: 'осам',
-    9: 'девет'
+
+import { parseNumericValue } from '../utils/parse-numeric.js'
+import { validateOptions } from '../utils/validate-options.js'
+
+// ============================================================================
+// Vocabulary
+// ============================================================================
+
+const ONES_MASC = ['', 'један', 'два', 'три', 'четири', 'пет', 'шест', 'седам', 'осам', 'девет']
+const ONES_FEM = ['', 'једна', 'две', 'три', 'четири', 'пет', 'шест', 'седам', 'осам', 'девет']
+const TEENS = ['десет', 'једанаест', 'дванаест', 'тринаест', 'четрнаест', 'петнаест', 'шеснаест', 'седамнаест', 'осамнаест', 'деветнаест']
+const TENS = ['', '', 'двадесет', 'тридесет', 'четрдесет', 'педесет', 'шездесет', 'седамдесет', 'осамдесет', 'деведесет']
+const HUNDREDS = ['', 'сто', 'двеста', 'триста', 'четиристо', 'петсто', 'шесто', 'седамсто', 'осамсто', 'девестo']
+
+const ZERO = 'нула'
+const NEGATIVE = 'минус'
+const DECIMAL_SEP = 'запета'
+
+// Scale words: [singular, few, many]
+const SCALE_FORMS = [
+  ['хиљада', 'хиљаде', 'хиљада'],
+  ['милион', 'милиона', 'милиона'],
+  ['милијарда', 'милијарде', 'милијарда'],
+  ['билион', 'билиона', 'билиона'],
+  ['билијарда', 'билијарде', 'билијарда'],
+  ['трилион', 'трилиона', 'трилиона'],
+  ['трилијарда', 'трилијарде', 'трилијарда'],
+  ['квадрилион', 'квадрилиона', 'квадрилиона'],
+  ['квадрилијарда', 'квадрилијарде', 'квадрилијарда']
+]
+
+// ============================================================================
+// Segment Building
+// ============================================================================
+
+function pluralize (n, forms) {
+  const num = typeof n === 'bigint' ? Number(n) : n
+  const lastDigit = num % 10
+  const lastTwoDigits = num % 100
+
+  if (lastTwoDigits >= 11 && lastTwoDigits <= 19) {
+    return forms[2]
   }
 
-  onesFeminineWords = {
-    1: 'једна',
-    2: 'две',
-    3: 'три',
-    4: 'четири',
-    5: 'пет',
-    6: 'шест',
-    7: 'седам',
-    8: 'осам',
-    9: 'девет'
+  if (lastDigit === 1) return forms[0]
+  if (lastDigit >= 2 && lastDigit <= 4) return forms[1]
+  return forms[2]
+}
+
+function buildSegmentMasc (n) {
+  if (n === 0) return ''
+
+  const onesDigit = n % 10
+  const tensDigit = Math.floor(n / 10) % 10
+  const hundredsDigit = Math.floor(n / 100)
+
+  const parts = []
+
+  if (hundredsDigit > 0) {
+    parts.push(HUNDREDS[hundredsDigit])
+  }
+
+  if (tensDigit > 1) {
+    parts.push(TENS[tensDigit])
   }
 
-  teensWords = {
-    0: 'десет',
-    1: 'једанаест',
-    2: 'дванаест',
-    3: 'тринаест',
-    4: 'четрнаест',
-    5: 'петнаест',
-    6: 'шеснаест',
-    7: 'седамнаест',
-    8: 'осамнаест',
-    9: 'деветнаест'
+  if (tensDigit === 1) {
+    parts.push(TEENS[onesDigit])
+  } else if (onesDigit > 0) {
+    parts.push(ONES_MASC[onesDigit])
   }
 
-  twentiesWords = {
-    2: 'двадесет',
-    3: 'тридесет',
-    4: 'четрдесет',
-    5: 'педесет',
-    6: 'шездесет',
-    7: 'седамдесет',
-    8: 'осамдесет',
-    9: 'деведесет'
+  return parts.join(' ')
+}
+
+function buildSegmentFem (n) {
+  if (n === 0) return ''
+
+  const onesDigit = n % 10
+  const tensDigit = Math.floor(n / 10) % 10
+  const hundredsDigit = Math.floor(n / 100)
+
+  const parts = []
+
+  if (hundredsDigit > 0) {
+    parts.push(HUNDREDS[hundredsDigit])
   }
 
-  hundredsWords = {
-    1: 'сто',
-    2: 'двеста',
-    3: 'триста',
-    4: 'четиристо',
-    5: 'петсто',
-    6: 'шесто',
-    7: 'седамсто',
-    8: 'осамсто',
-    9: 'девестo'
+  if (tensDigit > 1) {
+    parts.push(TENS[tensDigit])
   }
 
-  pluralForms = {
-    1: ['хиљада', 'хиљаде', 'хиљада'], // 10 ^ 3
-    2: ['милион', 'милиона', 'милиона'], // 10 ^ 6
-    3: ['милијарда', 'милијарде', 'милијарда'], // 10 ^ 9
-    4: ['билион', 'билиона', 'билиона'], // 10 ^ 12
-    5: ['билијарда', 'билијарде', 'билијарда'], // 10 ^ 15
-    6: ['трилион', 'трилиона', 'трилиона'], // 10 ^ 18
-    7: ['трилијарда', 'трилијарде', 'трилијарда'], // 10 ^ 21
-    8: ['квадрилион', 'квадрилиона', 'квадрилиона'], // 10 ^ 24
-    9: ['квадрилијарда', 'квадрилијарде', 'квадрилијарда'], // 10 ^ 27
-    10: ['квинтилион', 'квинтилиона', 'квинтилиона'] // 10 ^ 30
+  if (tensDigit === 1) {
+    parts.push(TEENS[onesDigit])
+  } else if (onesDigit > 0) {
+    parts.push(ONES_FEM[onesDigit])
   }
 
-  /**
-   * Maps segment indices to whether they are grammatically feminine.
-   * In Serbian, thousands (index 1) are feminine, others are masculine.
-   * @type {Object.<number, boolean>}
-   */
-  scaleGenders = {
-    1: true // thousands are feminine (others default to false)
+  return parts.join(' ')
+}
+
+// ============================================================================
+// Conversion Functions
+// ============================================================================
+
+function integerToWords (n, options = {}) {
+  if (n === 0n) return ZERO
+
+  if (n < 1000n) {
+    return options.gender === 'feminine' ? buildSegmentFem(Number(n)) : buildSegmentMasc(Number(n))
   }
 
-  /** Selects Serbian plural form: 1 = singular, 2-4 = few, else = many. */
-  pluralize (n, forms) {
-    const lastDigit = n % 10n
-    const lastTwoDigits = n % 100n
+  return buildLargeNumberWords(n, options)
+}
 
-    if ((lastTwoDigits < 10n || lastTwoDigits > 20n) && lastDigit === 1n) {
-      return forms[0]
-    }
+function buildLargeNumberWords (n, options) {
+  const numStr = n.toString()
+  const len = numStr.length
 
-    if ((lastTwoDigits < 10n || lastTwoDigits > 20n) && lastDigit > 1n && lastDigit < 5n) {
-      return forms[1]
+  const segments = []
+  const segmentSize = 3
+
+  const remainderLen = len % segmentSize
+  let pos = 0
+  if (remainderLen > 0) {
+    segments.push(Number(numStr.slice(0, remainderLen)))
+    pos = remainderLen
+  }
+  while (pos < len) {
+    segments.push(Number(numStr.slice(pos, pos + segmentSize)))
+    pos += segmentSize
+  }
+
+  const parts = []
+  let scaleIndex = segments.length - 1
+
+  for (let i = 0; i < segments.length; i++) {
+    const segment = segments[i]
+
+    if (segment !== 0) {
+      if (scaleIndex === 0) {
+        parts.push(options.gender === 'feminine' ? buildSegmentFem(segment) : buildSegmentMasc(segment))
+      } else {
+        const scaleForms = SCALE_FORMS[scaleIndex - 1]
+        const scaleWord = pluralize(segment, scaleForms)
+        // Thousands (scaleIndex=1) are feminine, others masculine
+        const isFeminine = scaleIndex === 1
+        const segmentWord = isFeminine ? buildSegmentFem(segment) : buildSegmentMasc(segment)
+        parts.push(segmentWord + ' ' + scaleWord)
+      }
     }
 
-    return forms[2]
+    scaleIndex--
   }
+
+  return parts.join(' ')
+}
+
+function decimalPartToWords (decimalPart, options) {
+  let result = ''
+  let i = 0
+
+  while (i < decimalPart.length && decimalPart[i] === '0') {
+    if (result) result += ' '
+    result += ZERO
+    i++
+  }
+
+  const remainder = decimalPart.slice(i)
+  if (remainder) {
+    if (result) result += ' '
+    result += integerToWords(BigInt(remainder), options)
+  }
+
+  return result
 }
+
+/**
+ * Converts a numeric value to Serbian (Cyrillic) words.
+ *
+ * @param {number | string | bigint} value - The numeric value to convert
+ * @param {Object} [options] - Optional configuration
+ * @param {('masculine'|'feminine')} [options.gender='masculine'] - Grammatical gender
+ * @returns {string} The number in Serbian Cyrillic 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, options)
+  }
+
+  return result
+}
+
+// ============================================================================
+// Exports
+// ============================================================================
+
+export { toWords }

package/lib/languages/sr-Latn.d.ts

@@ -1,80 +1,11 @@
 /**
- * Serbian Latin language converter.
+ * Converts a numeric value to Serbian (Latin) words.
  *
- * Supports:
- * - Three-form pluralization (one/few/many)
- * - Gender agreement (jedan/jedna, dva/dve)
- * - Latin script representation
+ * @param {number | string | bigint} value - The numeric value to convert
+ * @param {Object} [options] - Optional configuration
+ * @param {('masculine'|'feminine')} [options.gender='masculine'] - Grammatical gender
+ * @returns {string} The number in Serbian Latin words
  */
-export class SerbianLatin extends SlavicLanguage {
-    onesWords: {
-        1: string;
-        2: string;
-        3: string;
-        4: string;
-        5: string;
-        6: string;
-        7: string;
-        8: string;
-        9: string;
-    };
-    onesFeminineWords: {
-        1: string;
-        2: string;
-        3: string;
-        4: string;
-        5: string;
-        6: string;
-        7: string;
-        8: string;
-        9: string;
-    };
-    teensWords: {
-        0: string;
-        1: string;
-        2: string;
-        3: string;
-        4: string;
-        5: string;
-        6: string;
-        7: string;
-        8: string;
-        9: string;
-    };
-    twentiesWords: {
-        2: string;
-        3: string;
-        4: string;
-        5: string;
-        6: string;
-        7: string;
-        8: string;
-        9: string;
-    };
-    hundredsWords: {
-        1: string;
-        2: string;
-        3: string;
-        4: string;
-        5: string;
-        6: string;
-        7: string;
-        8: string;
-        9: string;
-    };
-    pluralForms: {
-        1: string[];
-        2: string[];
-        3: string[];
-        4: string[];
-        5: string[];
-        6: string[];
-        7: string[];
-        8: string[];
-        9: string[];
-        10: string[];
-    };
-    /** Selects Serbian plural form: 1 = singular, 2-4 = few, else = many. */
-    pluralize(n: any, forms: any): any;
-}
-import { SlavicLanguage } from '../classes/slavic-language.js';
+export function toWords(value: number | string | bigint, options?: {
+    gender?: "masculine" | "feminine" | undefined;
+}): string;