price-extractor 2.0.3 → 2.1.1

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+declare type Json = Record<string, string | undefined>;
 export interface ICodeResult {
     code?: string;
     str: string;
@@ -6,6 +7,7 @@ export interface IExtractResult {
     code?: string;
     price?: number;
 }
-export declare const getCodeToSymbol: () => Record<string, string | undefined>;
-export declare const searchCode: (moneyStr: string, fallbackCode?: string | undefined) => string | undefined;
-export declare const searchPriceAndCode: (moneyStr: string, fallbackCode?: string | undefined) => IExtractResult;
+export declare const getCodeToSymbol: () => Json;
+export declare const searchCode: (moneyStr: string, fallbackCode?: string) => string | undefined;
+export declare const searchPriceAndCode: (moneyStr: string, fallbackCode?: string) => IExtractResult;
+export {};

package/dist/index.js

@@ -1,33 +1,47 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.searchPriceAndCode = exports.searchCode = exports.getCodeToSymbol = void 0;
 const symbolToCodeRaw = require("./symbolToCode.json");
 const nativeSymbolToCodeRaw = require("./nativeSymbolToCode.json");
 const codeToSymbolRaw = require("./codeToSymbol.json");
+const currenciesFileRaw = require("./currenciesSymbols.json");
+const currencies = currenciesFileRaw;
 const symbolToCode = symbolToCodeRaw;
 const nativeSymbolToCode = nativeSymbolToCodeRaw;
 const codeToSymbol = codeToSymbolRaw;
-// List of formats - https://www.thefinancials.com/Default.aspx?SubSectionID=curformat
 const unicodeRegex = /&#(x?[0-9a-fA-F]+);/;
-const regexReplace = /[0-9,'\-.\s]/g;
-const priceRegex = /^(\d{1,3}(,?\d{3})*(\.\d{1,2})?)$/;
-const priceRegex2 = /^(\d{1,3}(\.?\d{3})*(,\d{1,2})?)$/;
-const priceRegex3 = /^(\d{1,3}('?\d{3})*(\.\d{1,2})?)$/;
-const getPriceNumber = (str) => {
+const regexReplace = /[0-9,'_\-.\s]/g;
+const dotDecimalRegex = /^(\d{1,3}(,?\d{3})*(\.\d{1,2})?)$/; // dot decimal separator
+const longDotDecimalRegex = /^(\d{1,3}(,?\d{3})*(\.\d{1,3})?)$/; // dot decimal separator
+const commaDecimalRegex = /^(\d{1,3}(\.?\d{3})*(,\d{1,2})?)$/; // comma decimal separator
+const longCommaDecimalRegex = /^(\d{1,3}(\.?\d{3})*(,\d{1,3})?)$/; // comma decimal separator
+const getPriceNumber = (str, currency) => {
     let price = Number.NaN;
-    let regex = str.match(priceRegex);
-    if (regex && regex[0] === str) {
-        price = parseFloat(regex[1].replace(/,/g, '').trim());
-    }
-    if (isNaN(price)) {
-        regex = str.match(priceRegex2);
-        if (regex && regex[0] === str) {
-            price = parseFloat(regex[1].replace(/\./g, '').replace(/,/g, '.').trim());
+    let match;
+    if (currency && currency.decimal_digits === 3) {
+        if (currency.decimal_separator === ',') {
+            match = str.match(longCommaDecimalRegex);
+            if (match && match[0] === str) {
+                price = parseFloat(match[1].replace(/\./g, '').replace(/,/g, '.').trim());
+            }
+        }
+        else {
+            match = str.match(longDotDecimalRegex);
+            if (match && match[0] === str) {
+                price = parseFloat(match[1].replace(/,/g, '').trim());
+            }
         }
     }
-    if (isNaN(price)) {
-        regex = str.match(priceRegex3);
-        if (regex && regex[0] === str) {
-            price = parseFloat(regex[1].replace(/'/g, '').trim());
+    else {
+        match = str.match(dotDecimalRegex);
+        if (match && match[0] === str) {
+            price = parseFloat(match[1].replace(/,/g, '').trim());
+        }
+        if (isNaN(price)) {
+            match = str.match(commaDecimalRegex);
+            if (match && match[0] === str) {
+                price = parseFloat(match[1].replace(/\./g, '').replace(/,/g, '.').trim());
+            }
         }
     }
     return price;
@@ -66,28 +80,24 @@ const searchCodeAndStrip = (moneyStr, fallbackCode) => {
     }
     return { str: moneyStr };
 };
-exports.getCodeToSymbol = () => {
+const getCodeToSymbol = () => {
     return Object.assign({}, codeToSymbol);
 };
-exports.searchCode = (moneyStr, fallbackCode) => {
+exports.getCodeToSymbol = getCodeToSymbol;
+const searchCode = (moneyStr, fallbackCode) => {
     return searchCodeAndStrip(moneyStr, fallbackCode).code;
 };
-exports.searchPriceAndCode = (moneyStr, fallbackCode) => {
+exports.searchCode = searchCode;
+const searchPriceAndCode = (moneyStr, fallbackCode) => {
     const raw = searchCodeAndStrip(moneyStr, fallbackCode);
     const code = raw.code;
-    const str = raw.str;
-    let price = getPriceNumber(str);
-    if (isNaN(price) && str.match(/\s/)) {
-        const tmpStr = str.replace(/\s/g, '.');
-        price = getPriceNumber(tmpStr);
-    }
-    if (isNaN(price) && str.match(/\s/)) {
-        const tmpStr = str.replace(/\s/g, ',');
-        price = getPriceNumber(tmpStr);
-    }
+    // Remove custom thousands separator
+    const str = raw.str.replace(/\s/g, '').replace(/'/g, '').replace(/_/g, '');
+    const price = getPriceNumber(str, currencies[code || 'foo']);
     if (price || price === 0) {
         return { price, code };
     }
     return {};
 };
+exports.searchPriceAndCode = searchPriceAndCode;
 //# sourceMappingURL=index.js.map

package/dist/nativeSymbolToCode.json

@@ -25,6 +25,8 @@
     "Kč": "CZK",
     "L": "HNL",
     "Lek": "ALL",
+    "Ls": "LVL",
+    "Lt": "LTL",
     "L‏": "SZL",
     "MDL": "MDL",
     "MGA": "MGA",
@@ -55,6 +57,7 @@
     "UZS": "UZS",
     "VT": "VUV",
     "ZK": "ZMW",
+    "ZWL$": "ZWL",
     "kn": "HRK",
     "kr": "_____",
     "zł": "PLN",
@@ -62,7 +65,7 @@
     "дин.": "RSD",
     "лв.": "BGN",
     "ман.": "AZN",
-    "руб.": "RUB",
+    "руб.": "BYN",
     "тңг.": "KZT",
     "դր.": "AMD",
     "؋": "AFN",
@@ -98,6 +101,7 @@
     "₱": "PHP",
     "₲": "PYG",
     "₴": "UAH",
+    "₽.": "RUB",
     "﷼": "IRR",
     "￥": "JPY"
 }

package/dist/symbolToCode.json

@@ -32,6 +32,7 @@
     "DT": "TND",
     "Dkr": "DKK",
     "EGP": "EGP",
+    "Ekr": "EEK",
     "FBu": "BIF",
     "FCFA": "XAF",
     "FG": "GNF",
@@ -58,6 +59,8 @@
     "L": "SZL",
     "LB£": "LBP",
     "LD": "LYD",
+    "Ls": "LVL",
+    "Lt": "LTL",
     "MAD": "MAD",
     "MDL": "MDL",
     "MGA": "MGA",
@@ -104,6 +107,7 @@
     "VT": "VUV",
     "YR": "YER",
     "ZK": "ZMW",
+    "ZWL$": "ZWL",
     "din.": "RSD",
     "kn": "HRK",
     "man.": "AZN",

package/package.json

@@ -1,16 +1,19 @@
 {
   "name": "price-extractor",
-  "version": "2.0.3",
+  "version": "2.1.1",
   "description": "Given a price string, extract the price and currency code",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "engines": {
+    "node": "^6 || ^8 || ^10 || ^12 || ^14 || ^16 || ^18"
+  },
   "scripts": {
-    "test": "mocha --opts src/test/mocha.opts",
-    "build": "npm run lint && npm run buildDist",
-    "buildDist": "./node_modules/.bin/tsc",
-    "cover": "nyc --reporter=lcov --reporter=text-summary npm run test",
-    "lint": "tslint -c tslint.json 'src/**/*.ts' 'test/**/*.ts'",
-    "maps": "npm run buildDist && node dist/scripts/toMaps.js && npm run buildDist"
+    "test": "npm run lint && npm run test:cover",
+    "test:unit": "mocha --opts src/test/mocha.opts",
+    "build": "npm run lint && npm run compile",
+    "compile": "./node_modules/.bin/tsc",
+    "test:cover": "nyc --reporter=lcov --reporter=text-summary mocha --opts src/test/mocha.opts",
+    "lint": "tslint -c tslint.json 'src/**/*.ts' 'test/**/*.ts'"
   },
   "repository": {
     "type": "git",
@@ -34,18 +37,18 @@
   "homepage": "https://github.com/PruvoNet/price-extractor#readme",
   "dependencies": {},
   "devDependencies": {
-    "@istanbuljs/nyc-config-typescript": "^0.1.3",
-    "@types/chai": "^4.2.0",
-    "@types/mocha": "^5.2.7",
-    "@types/node": "^12.3.1",
-    "@types/underscore": "^1.9.2",
-    "chai": "^4.2.0",
-    "mocha": "^6.2.0",
+    "@istanbuljs/nyc-config-typescript": "0.1.3",
+    "@types/chai": "^4.2.15",
+    "@types/mocha": "^8.2.1",
+    "@types/node": "^14.14.34",
+    "@types/underscore": "^1.11.0",
+    "chai": "^4.3.4",
+    "mocha": "^6.2.3",
     "nyc": "^14.1.1",
-    "source-map-support": "^0.5.13",
-    "ts-node": "^8.3.0",
-    "tslint": "^5.18.0",
-    "typescript": "^3.5.3",
-    "underscore": "^1.9.1"
+    "source-map-support": "^0.5.21",
+    "ts-node": "^8.10.2",
+    "tslint": "^6.1.3",
+    "typescript": "^4.8.4",
+    "underscore": "^1.13.6"
   }
 }