n2words 5.0.0 → 5.1.1

package/src/en-KE.js

@@ -20,7 +20,9 @@
 import { parseCardinalValue } from './utils/parse-cardinal.js'
 import { parseCurrencyValue } from './utils/parse-currency.js'
 import { parseOrdinalValue } from './utils/parse-ordinal.js'
-import { validateOptions } from './utils/validate-options.js'
+import { checkMax } from './utils/check-max.js'
+import { western } from './utils/scale.js'
+import { resolveOptions } from './utils/resolve-options.js'
 
 // ============================================================================
 // Vocabulary (module-level constants)
@@ -35,9 +37,13 @@ const SCALES = [
   'quintillion', 'sextillion', 'septillion', 'octillion', 'nonillion',
   'decillion', 'undecillion', 'duodecillion', 'tredecillion', 'quattuordecillion',
   'quindecillion', 'sexdecillion', 'septendecillion', 'octodecillion', 'novemdecillion',
-  'vigintillion'
+  'vigintillion',
 ]
 
+export const cardinalMax = western(SCALES.length)
+export const ordinalMax = western(SCALES.length)
+export const currencyMax = western(SCALES.length)
+
 const HUNDRED = 'hundred'
 const ZERO = 'zero'
 const NEGATIVE = 'minus'
@@ -60,7 +66,11 @@ const CENTS = 'cents'
 
 const segmentResult = { word: '', hasHundred: false }
 
-function buildSegment (n) {
+/**
+ * @param {number} n The 0-999 group value to convert
+ * @returns {{word: string, hasHundred: boolean}} The segment words and whether it includes a hundreds place
+ */
+function buildSegment(n) {
   if (n === 0) {
     segmentResult.word = ''
     segmentResult.hasHundred = false
@@ -74,20 +84,24 @@ function buildSegment (n) {
   let tensOnes = ''
   if (tens === 1) {
     tensOnes = TEENS[ones]
-  } else if (tens >= 2) {
+  }
+  else if (tens >= 2) {
     tensOnes = ones > 0 ? TENS[tens] + '-' + ONES[ones] : TENS[tens]
-  } else if (ones > 0) {
+  }
+  else if (ones > 0) {
     tensOnes = ONES[ones]
   }
 
   if (hundreds > 0) {
     if (tensOnes) {
       segmentResult.word = ONES[hundreds] + ' ' + HUNDRED + ' and ' + tensOnes
-    } else {
+    }
+    else {
       segmentResult.word = ONES[hundreds] + ' ' + HUNDRED
     }
     segmentResult.hasHundred = true
-  } else {
+  }
+  else {
     segmentResult.word = tensOnes
     segmentResult.hasHundred = false
   }
@@ -99,7 +113,11 @@ function buildSegment (n) {
 // Conversion Functions
 // ============================================================================
 
-function integerToWords (n) {
+/**
+ * @param {bigint} n The non-negative integer to convert
+ * @returns {string} The integer in English words
+ */
+function integerToWords(n) {
   if (n === 0n) return ZERO
 
   if (n < 1000n) {
@@ -124,7 +142,11 @@ function integerToWords (n) {
   return buildLargeNumberWords(n)
 }
 
-function buildLargeNumberWords (n) {
+/**
+ * @param {bigint} n The integer of one million or greater to convert
+ * @returns {string} The integer in English words
+ */
+function buildLargeNumberWords(n) {
   const segments = []
   let temp = n
   while (temp > 0n) {
@@ -160,7 +182,8 @@ function buildLargeNumberWords (n) {
     if (i > 0) {
       result += ' ' + SCALES[i - 1]
       prevWasScale = true
-    } else {
+    }
+    else {
       prevWasScale = false
     }
   }
@@ -168,7 +191,11 @@ function buildLargeNumberWords (n) {
   return result
 }
 
-function decimalPartToWords (decimalPart) {
+/**
+ * @param {string} decimalPart The fractional digits as a string
+ * @returns {string} The decimal digits in English words
+ */
+function decimalPartToWords(decimalPart) {
   let result = ''
 
   let i = 0
@@ -189,14 +216,16 @@ function decimalPartToWords (decimalPart) {
 
 /**
  * Converts a numeric value to Kenyan English words.
- *
  * @param {number | string | bigint} value - The numeric value to convert
  * @returns {string} The number in English words
  * @throws {TypeError} If value is not a valid numeric type
  * @throws {Error} If value is not a valid number format
  */
-function toCardinal (value) {
+function toCardinal(value) {
   const { isNegative, integerPart, decimalPart } = parseCardinalValue(value)
+  // Both the integer part and the decimal's significant digits are spelled via
+  // the scale builder, so both must clear the ceiling.
+  checkMax(integerPart, cardinalMax, decimalPart)
 
   let result = ''
 
@@ -217,7 +246,11 @@ function toCardinal (value) {
 // ORDINAL
 // ============================================================================
 
-function buildOrdinalSegment (n) {
+/**
+ * @param {number} n The 0-999 group value to convert
+ * @returns {string} The segment as ordinal English words
+ */
+function buildOrdinalSegment(n) {
   const ones = n % 10
   const tens = Math.trunc(n / 10) % 10
   const hundreds = Math.trunc(n / 100)
@@ -225,20 +258,24 @@ function buildOrdinalSegment (n) {
   let tensOnesOrdinal = ''
   if (tens === 1) {
     tensOnesOrdinal = ORDINAL_TEENS[ones]
-  } else if (tens >= 2) {
+  }
+  else if (tens >= 2) {
     if (ones > 0) {
       tensOnesOrdinal = TENS[tens] + '-' + ORDINAL_ONES[ones]
-    } else {
+    }
+    else {
       tensOnesOrdinal = ORDINAL_TENS[tens]
     }
-  } else if (ones > 0) {
+  }
+  else if (ones > 0) {
     tensOnesOrdinal = ORDINAL_ONES[ones]
   }
 
   if (hundreds > 0) {
     if (tensOnesOrdinal) {
       return ONES[hundreds] + ' ' + HUNDRED + ' ' + tensOnesOrdinal
-    } else {
+    }
+    else {
       return ONES[hundreds] + ' hundredth'
     }
   }
@@ -246,7 +283,11 @@ function buildOrdinalSegment (n) {
   return tensOnesOrdinal
 }
 
-function integerToOrdinal (n) {
+/**
+ * @param {bigint} n The non-negative integer to convert
+ * @returns {string} The integer as ordinal English words
+ */
+function integerToOrdinal(n) {
   if (n < 1000n) {
     return buildOrdinalSegment(Number(n))
   }
@@ -266,7 +307,11 @@ function integerToOrdinal (n) {
   return buildLargeOrdinal(n)
 }
 
-function buildLargeOrdinal (n) {
+/**
+ * @param {bigint} n The integer of one million or greater to convert
+ * @returns {string} The integer as ordinal English words
+ */
+function buildLargeOrdinal(n) {
   const segments = []
   let temp = n
   while (temp > 0n) {
@@ -295,10 +340,12 @@ function buildLargeOrdinal (n) {
     if (isLowestSegment) {
       if (i === 0) {
         result += buildOrdinalSegment(segment)
-      } else {
+      }
+      else {
         result += buildSegment(segment).word + ' ' + SCALES[i - 1] + 'th'
       }
-    } else {
+    }
+    else {
       result += buildSegment(segment).word
       if (i > 0) {
         result += ' ' + SCALES[i - 1]
@@ -309,8 +356,14 @@ function buildLargeOrdinal (n) {
   return result
 }
 
-function toOrdinal (value) {
+/**
+ * Converts a numeric value to Kenyan English ordinal words.
+ * @param {number | string | bigint} value - The numeric value to convert
+ * @returns {string} The ordinal in English words
+ */
+function toOrdinal(value) {
   const integerPart = parseOrdinalValue(value)
+  checkMax(integerPart, ordinalMax)
   return integerToOrdinal(integerPart)
 }
 
@@ -318,10 +371,24 @@ function toOrdinal (value) {
 // CURRENCY
 // ============================================================================
 
-function toCurrency (value, options) {
-  options = validateOptions(options)
+/**
+ * @typedef {object} CurrencyOptions
+ * @property {boolean} [and] - Use "and" between shillings and cents
+ */
+
+/** @type {Required<CurrencyOptions>} */
+export const currencyDefaults = { and: true }
+
+/**
+ * Converts a numeric value to Kenyan English currency words.
+ * @param {number | string | bigint} value - The numeric value to convert
+ * @param {CurrencyOptions} [options] - Optional configuration
+ * @returns {string} The currency in English words
+ */
+function toCurrency(value, options) {
   const { isNegative, dollars: shillings, cents } = parseCurrencyValue(value)
-  const { and: useAnd = true } = options
+  checkMax(shillings, currencyMax)
+  const { and: useAnd } = resolveOptions(options, currencyDefaults)
 
   let result = ''
   if (isNegative) result = NEGATIVE + ' '

package/src/en-MY.d.ts

@@ -1,11 +1,34 @@
+export const cardinalMax: bigint;
+export const ordinalMax: bigint;
+export const currencyMax: bigint;
+/**
+ * @typedef {object} CurrencyOptions
+ * @property {boolean} [and] - Use "and" between ringgit and sen
+ */
+/** @type {Required<CurrencyOptions>} */
+export const currencyDefaults: Required<CurrencyOptions>;
+export type CurrencyOptions = {
+    /**
+     * - Use "and" between ringgit and sen
+     */
+    and?: boolean | undefined;
+};
 /**
  * Converts a numeric value to Malaysian English words.
- *
  * @param {number | string | bigint} value - The numeric value to convert
  * @returns {string} The number in English words
  * @throws {TypeError} If value is not a valid numeric type
  * @throws {Error} If value is not a valid number format
  */
 export function toCardinal(value: number | string | bigint): string;
-export function toOrdinal(value: any): string;
-export function toCurrency(value: any, options: any): string;
+/**
+ * @param {number | string | bigint} value The numeric value to convert.
+ * @returns {string} The number as an ordinal in English words.
+ */
+export function toOrdinal(value: number | string | bigint): string;
+/**
+ * @param {number | string | bigint} value The numeric value to convert.
+ * @param {CurrencyOptions} [options] - Optional configuration
+ * @returns {string} The amount in Malaysian ringgit and sen in English words.
+ */
+export function toCurrency(value: number | string | bigint, options?: CurrencyOptions): string;

package/src/en-MY.js

@@ -23,7 +23,9 @@
 import { parseCardinalValue } from './utils/parse-cardinal.js'
 import { parseCurrencyValue } from './utils/parse-currency.js'
 import { parseOrdinalValue } from './utils/parse-ordinal.js'
-import { validateOptions } from './utils/validate-options.js'
+import { checkMax } from './utils/check-max.js'
+import { western } from './utils/scale.js'
+import { resolveOptions } from './utils/resolve-options.js'
 
 // ============================================================================
 // Vocabulary (module-level constants)
@@ -38,9 +40,13 @@ const SCALES = [
   'quintillion', 'sextillion', 'septillion', 'octillion', 'nonillion',
   'decillion', 'undecillion', 'duodecillion', 'tredecillion', 'quattuordecillion',
   'quindecillion', 'sexdecillion', 'septendecillion', 'octodecillion', 'novemdecillion',
-  'vigintillion'
+  'vigintillion',
 ]
 
+export const cardinalMax = western(SCALES.length)
+export const ordinalMax = western(SCALES.length)
+export const currencyMax = western(SCALES.length)
+
 const HUNDRED = 'hundred'
 const ZERO = 'zero'
 const NEGATIVE = 'minus'
@@ -61,7 +67,11 @@ const SEN = 'sen'
 
 const segmentResult = { word: '', hasHundred: false }
 
-function buildSegment (n) {
+/**
+ * @param {number} n The 0-999 segment to convert.
+ * @returns {{word: string, hasHundred: boolean}} The segment in words and whether it includes a hundreds part.
+ */
+function buildSegment(n) {
   if (n === 0) {
     segmentResult.word = ''
     segmentResult.hasHundred = false
@@ -75,20 +85,24 @@ function buildSegment (n) {
   let tensOnes = ''
   if (tens === 1) {
     tensOnes = TEENS[ones]
-  } else if (tens >= 2) {
+  }
+  else if (tens >= 2) {
     tensOnes = ones > 0 ? TENS[tens] + '-' + ONES[ones] : TENS[tens]
-  } else if (ones > 0) {
+  }
+  else if (ones > 0) {
     tensOnes = ONES[ones]
   }
 
   if (hundreds > 0) {
     if (tensOnes) {
       segmentResult.word = ONES[hundreds] + ' ' + HUNDRED + ' and ' + tensOnes
-    } else {
+    }
+    else {
       segmentResult.word = ONES[hundreds] + ' ' + HUNDRED
     }
     segmentResult.hasHundred = true
-  } else {
+  }
+  else {
     segmentResult.word = tensOnes
     segmentResult.hasHundred = false
   }
@@ -100,7 +114,11 @@ function buildSegment (n) {
 // Conversion Functions
 // ============================================================================
 
-function integerToWords (n) {
+/**
+ * @param {bigint} n The non-negative integer to convert.
+ * @returns {string} The integer in English words.
+ */
+function integerToWords(n) {
   if (n === 0n) return ZERO
 
   if (n < 1000n) {
@@ -125,7 +143,11 @@ function integerToWords (n) {
   return buildLargeNumberWords(n)
 }
 
-function buildLargeNumberWords (n) {
+/**
+ * @param {bigint} n The integer of one million or greater to convert.
+ * @returns {string} The integer in English words.
+ */
+function buildLargeNumberWords(n) {
   const segments = []
   let temp = n
   while (temp > 0n) {
@@ -161,7 +183,8 @@ function buildLargeNumberWords (n) {
     if (i > 0) {
       result += ' ' + SCALES[i - 1]
       prevWasScale = true
-    } else {
+    }
+    else {
       prevWasScale = false
     }
   }
@@ -169,7 +192,11 @@ function buildLargeNumberWords (n) {
   return result
 }
 
-function decimalPartToWords (decimalPart) {
+/**
+ * @param {string} decimalPart The fractional digits after the decimal point.
+ * @returns {string} The decimal digits in English words.
+ */
+function decimalPartToWords(decimalPart) {
   let result = ''
 
   let i = 0
@@ -190,14 +217,16 @@ function decimalPartToWords (decimalPart) {
 
 /**
  * Converts a numeric value to Malaysian English words.
- *
  * @param {number | string | bigint} value - The numeric value to convert
  * @returns {string} The number in English words
  * @throws {TypeError} If value is not a valid numeric type
  * @throws {Error} If value is not a valid number format
  */
-function toCardinal (value) {
+function toCardinal(value) {
   const { isNegative, integerPart, decimalPart } = parseCardinalValue(value)
+  // Both the integer part and the decimal's significant digits are spelled via
+  // the scale builder, so both must clear the ceiling.
+  checkMax(integerPart, cardinalMax, decimalPart)
 
   let result = ''
 
@@ -218,7 +247,11 @@ function toCardinal (value) {
 // ORDINAL
 // ============================================================================
 
-function buildOrdinalSegment (n) {
+/**
+ * @param {number} n The 0-999 segment to convert.
+ * @returns {string} The segment as an ordinal in English words.
+ */
+function buildOrdinalSegment(n) {
   const ones = n % 10
   const tens = Math.trunc(n / 10) % 10
   const hundreds = Math.trunc(n / 100)
@@ -226,20 +259,24 @@ function buildOrdinalSegment (n) {
   let tensOnesOrdinal = ''
   if (tens === 1) {
     tensOnesOrdinal = ORDINAL_TEENS[ones]
-  } else if (tens >= 2) {
+  }
+  else if (tens >= 2) {
     if (ones > 0) {
       tensOnesOrdinal = TENS[tens] + '-' + ORDINAL_ONES[ones]
-    } else {
+    }
+    else {
       tensOnesOrdinal = ORDINAL_TENS[tens]
     }
-  } else if (ones > 0) {
+  }
+  else if (ones > 0) {
     tensOnesOrdinal = ORDINAL_ONES[ones]
   }
 
   if (hundreds > 0) {
     if (tensOnesOrdinal) {
       return ONES[hundreds] + ' ' + HUNDRED + ' ' + tensOnesOrdinal
-    } else {
+    }
+    else {
       return ONES[hundreds] + ' hundredth'
     }
   }
@@ -247,7 +284,11 @@ function buildOrdinalSegment (n) {
   return tensOnesOrdinal
 }
 
-function integerToOrdinal (n) {
+/**
+ * @param {bigint} n The non-negative integer to convert.
+ * @returns {string} The integer as an ordinal in English words.
+ */
+function integerToOrdinal(n) {
   if (n < 1000n) {
     return buildOrdinalSegment(Number(n))
   }
@@ -267,7 +308,11 @@ function integerToOrdinal (n) {
   return buildLargeOrdinal(n)
 }
 
-function buildLargeOrdinal (n) {
+/**
+ * @param {bigint} n The integer of one million or greater to convert.
+ * @returns {string} The integer as an ordinal in English words.
+ */
+function buildLargeOrdinal(n) {
   const segments = []
   let temp = n
   while (temp > 0n) {
@@ -296,10 +341,12 @@ function buildLargeOrdinal (n) {
     if (isLowestSegment) {
       if (i === 0) {
         result += buildOrdinalSegment(segment)
-      } else {
+      }
+      else {
         result += buildSegment(segment).word + ' ' + SCALES[i - 1] + 'th'
       }
-    } else {
+    }
+    else {
       result += buildSegment(segment).word
       if (i > 0) {
         result += ' ' + SCALES[i - 1]
@@ -310,8 +357,13 @@ function buildLargeOrdinal (n) {
   return result
 }
 
-function toOrdinal (value) {
+/**
+ * @param {number | string | bigint} value The numeric value to convert.
+ * @returns {string} The number as an ordinal in English words.
+ */
+function toOrdinal(value) {
   const integerPart = parseOrdinalValue(value)
+  checkMax(integerPart, ordinalMax)
   return integerToOrdinal(integerPart)
 }
 
@@ -319,10 +371,23 @@ function toOrdinal (value) {
 // CURRENCY
 // ============================================================================
 
-function toCurrency (value, options) {
-  options = validateOptions(options)
+/**
+ * @typedef {object} CurrencyOptions
+ * @property {boolean} [and] - Use "and" between ringgit and sen
+ */
+
+/** @type {Required<CurrencyOptions>} */
+export const currencyDefaults = { and: true }
+
+/**
+ * @param {number | string | bigint} value The numeric value to convert.
+ * @param {CurrencyOptions} [options] - Optional configuration
+ * @returns {string} The amount in Malaysian ringgit and sen in English words.
+ */
+function toCurrency(value, options) {
   const { isNegative, dollars: ringgit, cents: sen } = parseCurrencyValue(value)
-  const { and: useAnd = true } = options
+  checkMax(ringgit, currencyMax)
+  const { and: useAnd } = resolveOptions(options, currencyDefaults)
 
   let result = ''
   if (isNegative) result = NEGATIVE + ' '

package/src/en-NG.d.ts

@@ -1,14 +1,27 @@
+export const cardinalMax: bigint;
+export const ordinalMax: bigint;
+export const currencyMax: bigint;
+/**
+ * @typedef {object} CurrencyOptions
+ * @property {boolean} [and] - Use "and" between naira and kobo (e.g., "one naira and fifty kobo")
+ */
+/** @type {Required<CurrencyOptions>} */
+export const currencyDefaults: Required<CurrencyOptions>;
+export type CurrencyOptions = {
+    /**
+     * - Use "and" between naira and kobo (e.g., "one naira and fifty kobo")
+     */
+    and?: boolean | undefined;
+};
 /**
  * Converts a numeric value to Nigerian English words.
  *
  * This is the main public API. It accepts any valid numeric input
  * (number, string, or bigint) and handles parsing internally.
- *
  * @param {number | string | bigint} value - The numeric value to convert
  * @returns {string} The number in English words
  * @throws {TypeError} If value is not a valid numeric type
  * @throws {Error} If value is not a valid number format
- *
  * @example
  * toCardinal(42)           // 'forty-two'
  * toCardinal(-3.14)        // 'minus three point fourteen'
@@ -17,12 +30,10 @@
 export function toCardinal(value: number | string | bigint): string;
 /**
  * Converts a numeric value to Nigerian English ordinal words.
- *
  * @param {number | string | bigint} value - The numeric value to convert (must be a positive integer)
  * @returns {string} The number as ordinal words (e.g., "first", "forty-second")
  * @throws {TypeError} If value is not a valid numeric type
  * @throws {RangeError} If value is negative, zero, or has a decimal part
- *
  * @example
  * toOrdinal(1)    // 'first'
  * toOrdinal(2)    // 'second'
@@ -36,14 +47,11 @@ export function toCardinal(value: number | string | bigint): string;
 export function toOrdinal(value: number | string | bigint): string;
 /**
  * Converts a numeric value to Nigerian English currency words.
- *
  * @param {number | string | bigint} value - The currency amount to convert
- * @param {Object} [options] - Optional configuration
- * @param {boolean} [options.and=true] - Use "and" between naira and kobo (e.g., "one naira and fifty kobo")
+ * @param {CurrencyOptions} [options] - Optional configuration
  * @returns {string} The amount in Nigerian English currency words
  * @throws {TypeError} If value is not a valid numeric type
  * @throws {Error} If value is not a valid number format
- *
  * @example
  * toCurrency(42.50)                    // 'forty-two naira and fifty kobo'
  * toCurrency(1)                        // 'one naira'
@@ -51,6 +59,4 @@ export function toOrdinal(value: number | string | bigint): string;
  * toCurrency(0.01)                     // 'one kobo'
  * toCurrency(42.50, { and: false })    // 'forty-two naira fifty kobo'
  */
-export function toCurrency(value: number | string | bigint, options?: {
-    and?: boolean | undefined;
-}): string;
+export function toCurrency(value: number | string | bigint, options?: CurrencyOptions): string;