n2words 1.10.0 → 1.11.1

package/lib/classes/N2WordsAbs.mjs

@@ -21,8 +21,8 @@ export default class {
 
   /**
    *
-   * @param {number} decimalPart
-   * @returns {string}
+   * @param {number} decimalPart Decimal part of the number to convert.
+   * @returns {string} Decimal part in written format.
    */
   toDecimal(decimalPart) {
     let decimalPartArray = Array.from(decimalPart);
@@ -39,8 +39,9 @@ export default class {
 
   /**
    *
-   * @param {number} value
-   * @returns {string|undefined}
+   * @param {number} value Float number.
+   * @throws {TypeError} Value must be a valid number.
+   * @returns {string|undefined} Cardinal number in written format.
    */
   floatToCardinal(value) {
     if (isNaN(Number(value))) {

package/lib/i18n/EN.mjs

@@ -54,7 +54,7 @@ class N2WordsEN extends N2WordsBase {
    *
    * @param {object} lPair {'one':1}
    * @param {object} rPair {'hundred':100}
-   * @returns {object}
+   * @returns {object} {'one hundred': 100}
    */
   merge(lPair, rPair) {
     const lText = Object.keys(lPair)[0]; const lNum = parseInt(Object.values(lPair)[0]);

package/lib/i18n/HR.mjs

@@ -0,0 +1,117 @@
+import {N2WordsRU} from './RU.mjs';
+
+export class N2WordsHR extends N2WordsRU {
+  constructor() {
+    super();
+
+    this.negativeWord = 'minus';
+    this.separatorWord = 'zarez';
+    this.zero = 'nula';
+    this.ones = {
+      1: ['jedan', 'jedna'],
+      2: ['dva', 'dvije'],
+      3: ['tri', 'tri'],
+      4: ['četiri', 'četiri'],
+      5: ['pet', 'pet'],
+      6: ['šest', 'šest'],
+      7: ['sedam', 'sedam'],
+      8: ['osam', 'osam'],
+      9: ['devet', 'devet']
+    };
+    this.tens = {
+      0: 'deset',
+      1: 'jedanaest',
+      2: 'dvanaest',
+      3: 'trinaest',
+      4: 'četrnaest',
+      5: 'petnaest',
+      6: 'šesnaest',
+      7: 'sedamnaest',
+      8: 'osamnaest',
+      9: 'devetnaest'
+    };
+    this.twenties = {
+      2: 'dvadeset',
+      3: 'trideset',
+      4: 'četrdeset',
+      5: 'pedeset',
+      6: 'šezdeset',
+      7: 'sedamdeset',
+      8: 'osamdeset',
+      9: 'devedeset'
+    };
+    this.hundreds = {
+      1: 'sto',
+      2: 'dvjesto',
+      3: 'tristo',
+      4: 'četiristo',
+      5: 'petsto',
+      6: 'šesto',
+      7: 'sedamsto',
+      8: 'osamsto',
+      9: 'devetsto'
+    };
+    this.SCALE = {
+      0: ['', '', '', false],
+      1: ['tisuća', 'tisuće', 'tisuća', true], // 10 ^ 3
+      2: ['milijun', 'milijuna', 'milijuna', false], // 10 ^ 6
+      3: ['milijarda', 'milijarde', 'milijarda', false], // 10 ^ 9
+      4: ['bilijun', 'bilijuna', 'bilijuna', false], // 10 ^ 12
+      5: ['bilijarda', 'bilijarde', 'bilijarda', false], // 10 ^ 15
+      6: ['trilijun', 'trilijuna', 'trilijuna', false], // 10 ^ 18
+      7: ['trilijarda', 'trilijarde', 'trilijarda', false], // 10 ^ 21
+      8: ['kvadrilijun', 'kvadrilijuna', 'kvadrilijuna', false], // 10 ^ 24
+      9: ['kvadrilijarda', 'kvadrilijarde', 'kvadrilijarda', false], // 10 ^ 27
+      10: ['kvintilijun', 'kvintilijuna', 'kvintilijuna', false], // 10 ^ 30
+    };
+    this.feminine = false;
+  }
+
+  pluralize(n, forms) {
+    let form = 2;
+    if ((n % 100 < 10) || (n % 100 > 20)) {
+      if (n % 10 == 1) {
+        form = 0;
+      } else if ((n % 10 > 1) && (n % 10 < 5)) {
+        form = 1;
+      }
+    }
+    return forms[form];
+  }
+
+  toCardinal(number) {
+    if (parseInt(number) == 0) {
+      return this.zero;
+    }
+    const words = [];
+    const chunks = this.splitByX(JSON.stringify(number), 3);
+    let i = chunks.length;
+    for (let j = 0; j < chunks.length; j++) {
+      const x = chunks[j];
+      i = i - 1;
+      // if (x == 0) { continue; }
+      const [n1, n2, n3] = this.getDigits(x);
+      if (n3 > 0) {
+        words.push(this.hundreds[n3]);
+      }
+      if (n2 > 1) {
+        words.push(this.twenties[n2]);
+      }
+      if (n2 == 1) {
+        words.push(this.tens[n1]);
+      } else if (n1 > 0) {
+        const isFeminine = (this.feminine || this.SCALE[i][3]);
+        const genderIdx = isFeminine ? 1 : 0;
+        words.push(this.ones[n1][genderIdx]);
+      }
+      if ((i > 0) && (x != 0)) {
+        words.push(this.pluralize(x, this.SCALE[i]));
+      }
+    }
+    return words.join(' ');
+  }
+}
+
+export default function(n) {
+  return new N2WordsHR().floatToCardinal(n);
+}

package/lib/i18n/NL.mjs

@@ -33,7 +33,7 @@ export class N2WordsNL extends N2WordsBase {
       {30: 'dertig'},
       {20: 'twintig'},
       {19: 'negentien'},
-      {18: 'achtien'},
+      {18: 'achttien'},
       {17: 'zeventien'},
       {16: 'zestien'},
       {15: 'vijftien'},

package/lib/i18n/SR.mjs

@@ -44,7 +44,7 @@ export class N2WordsSR extends N2WordsRU {
       1: 'sto',
       2: 'dvesta',
       3: 'trista',
-      4: 'četristo',
+      4: 'četiristo',
       5: 'petsto',
       6: 'šesto',
       7: 'sedamsto',
@@ -55,14 +55,14 @@ export class N2WordsSR extends N2WordsRU {
       0: ['', '', '', false],
       1: ['hiljada', 'hiljade', 'hiljada', true], // 10 ^ 3
       2: ['milion', 'miliona', 'miliona', false], // 10 ^ 6
-      3: ['bilion', 'biliona', 'biliona', false], // 10 ^ 9
-      4: ['trilion', 'triliona', 'triliona', false], // 10 ^ 12
-      5: ['kvadrilion', 'kvadriliona', 'kvadriliona', false], // 10 ^ 15
-      6: ['kvintilion', 'kvintiliona', 'kvintiliona', false], // 10 ^ 18
-      7: ['sekstilion', 'sekstiliona', 'sekstiliona', false], // 10 ^ 21
-      8: ['septilion', 'septiliona', 'septiliona', false], // 10 ^ 24
-      9: ['oktilion', 'oktiliona', 'oktiliona', false], // 10 ^ 27
-      10: ['nonilion', 'noniliona', 'noniliona', false], // 10 ^ 30
+      3: ['milijarda', 'milijarde', 'milijarda', false], // 10 ^ 9
+      4: ['bilion', 'biliona', 'biliona', false], // 10 ^ 12
+      5: ['bilijarda', 'bilijarde', 'bilijarda', false], // 10 ^ 15
+      6: ['trilion', 'triliona', 'triliona', false], // 10 ^ 18
+      7: ['trilijarda', 'trilijarde', 'trilijarda', false], // 10 ^ 21
+      8: ['kvadrilion', 'kvadriliona', 'kvadriliona', false], // 10 ^ 24
+      9: ['kvadrilijarda', 'kvadrilijarde', 'kvadrilijarda', false], // 10 ^ 27
+      10: ['kvintilion', 'kvintiliona', 'kvintiliona', false], // 10 ^ 30
     };
     this.feminine = false;
   }

package/lib/n2words.mjs

@@ -8,6 +8,7 @@ import n2wordsES from './i18n/ES.mjs';
 import n2wordsFA from './i18n/FA.mjs';
 import n2wordsFR from './i18n/FR.mjs';
 import n2wordsHE from './i18n/HE.mjs';
+import n2wordsHR from './i18n/HR.mjs';
 import n2wordsHU from './i18n/HU.mjs';
 import n2wordsID from './i18n/ID.mjs';
 import n2wordsIT from './i18n/IT.mjs';
@@ -49,6 +50,7 @@ const supportedLanguages = [
   'zh',
   'hu',
   'id',
+  'hr',
 ];
 
 /**
@@ -111,6 +113,8 @@ export default function(n, options = {lang: 'en'}) {
   } else if (lang === 'HE') {
     // only for numbers <= 9999
     return n2wordsHE(n);
+  } else if (lang === 'HR') {
+    return n2wordsHR(n);
   } else if (lang === 'HU') {
     return n2wordsHU(n);
   } else if (lang === 'KO') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n2words",
-  "version": "1.10.0",
+  "version": "1.11.1",
   "description": "Convert numbers to words, in multiple languages",
   "main": "dist/n2words.js",
   "scripts": {
@@ -45,7 +45,8 @@
     "persian",
     "chinese",
     "hungarian",
-    "indonesian"
+    "indonesian",
+    "croatian"
   ],
   "author": "Wael TELLAT",
   "license": "MIT",
@@ -54,19 +55,19 @@
   },
   "homepage": "https://github.com/forzagreen/n2words#readme",
   "devDependencies": {
-    "@babel/core": "^7.14.8",
-    "@babel/preset-env": "^7.14.9",
-    "ava": "^3.15.0",
-    "babel-loader": "^8.2.2",
-    "c8": "^7.8.0",
-    "core-js": "^3.16.0",
-    "eslint": "^7.32.0",
-    "eslint-plugin-ava": "^12.0.0",
-    "eslint-plugin-import": "^2.23.4",
-    "eslint-plugin-jsdoc": "^36.0.6",
+    "@babel/core": "^7.17.7",
+    "@babel/preset-env": "^7.16.11",
+    "ava": "^4.1.0",
+    "babel-loader": "^8.2.3",
+    "c8": "^7.11.0",
+    "core-js": "^3.21.1",
+    "eslint": "^8.11.0",
+    "eslint-plugin-ava": "^13.2.0",
+    "eslint-plugin-import": "^2.25.4",
+    "eslint-plugin-jsdoc": "^38.0.4",
     "eslint-plugin-node": "^11.1.0",
-    "webpack": "^5.48.0",
-    "webpack-cli": "^4.7.2"
+    "webpack": "^5.70.0",
+    "webpack-cli": "^4.9.2"
   },
   "ava": {
     "files": [

package/webpack.config.js

@@ -12,9 +12,6 @@ module.exports = {
     rules: [{
       test: /\.m?js$/,
       exclude: /node_modules/,
-      resolve: {
-        fullySpecified: false,
-      },
       use: {
         loader: 'babel-loader',
         options: {
@@ -23,7 +20,7 @@ module.exports = {
               '@babel/preset-env',
               {
                 useBuiltIns: 'usage',
-                corejs: '3.16',
+                corejs: '3.21.1',
               },
             ],
           ],