formattedPrice can formats also exponential

Author: irodger

README.md

@@ -61,14 +61,14 @@ yarn add price-like-humans -D
 
 | Argument | Required     | Argument type    | Description                                                                                                      |
 | -------- | ------------ | ---------------- | ---------------------------------------------------------------------------------------------------------------- |
-| value    | _\*required_ | `number, string` | Incoming numbers which will be formatted                                                                         |
+| value    | _\*required_ | `number, string` | Incoming numbers which will be formatted (exponential friendly)                                                                         |
 | options  | _optional_   | `object`         | Settings list, see [formattedPrice options](#formattedprice-options) |
 
 ### exponentformatter
 
 | Argument | Required     | Argument type    | Description                              |
 | -------- | ------------ | ---------------- | ---------------------------------------- |
-| value    | _\*required_ | `number, string` | Incoming numbers which will be formatted |
+| value    | _\*required_ | `number, string` | Incoming exponential numbers which will be formatted |
 
 ### formattedPrice options
 
@@ -143,35 +143,27 @@ formattedPrice(12345.6789, { lang: 'en' });
 //> "12,345.678,9"
 ```
 
-### `exponentFormatter` examples
-
 ```javascript
-exponentFormatter(1e-7);
+formattedPrice(1e-7, { lang: 'en' });
 
-//> "0.0000001"
+//> "0.000,000,1"
 ```
 
-### Also you can combine methods
-
-Exponential with price like humans
+### `exponentFormatter` examples
 
 ```javascript
-formattedPrice(1e-7);
+exponentFormatter(1e-7);
 
-//> '1e-7' // Needs to combine
+//> "0.0000001"
 ```
 
-```javascript
-formattedPrice(exponentFormatter(1e-7));
-
-//> "0.000 000 1"
-```
 
 ## Changelog
 
 <details>
     <summary>Show changelog</summary>
-    
+    v0.8.0
+    - formattedPrice can formats exponential too
     v0.7.0
     - Changed arguments in formattedPrice
     - Add more coverage and tests

package.json

@@ -1,6 +1,6 @@
 {
   "name": "price-like-humans",
-  "version": "0.7.6",
+  "version": "0.8.0",
   "description": "JS tools for formatting price or numbers to human likes format.",
   "main": "dist/index.js",
   "module": "dist/index.es.js",

src/__tests__/formattedPrice.spec.ts

@@ -4,13 +4,13 @@ describe('formattedPrice tests', () => {
   it('compare formattedPrice the same works with different types', () => {
     expect(formattedPrice(10000)).toEqual(formattedPrice('10000'));
     expect(formattedPrice(1000.1234)).toEqual(formattedPrice('1000.1234'));
-    expect(formattedPrice(1e-7)).toEqual(formattedPrice('1e-7'));
+    expect(formattedPrice(1e-7)).toEqual('0.000,000,1');
   });
 
   it('testing formattedPrice with different values', () => {
     expect(formattedPrice(10000)).toEqual('10,000');
     expect(formattedPrice('1000.1234')).toEqual('1,000.123,4');
-    expect(formattedPrice(1e-7)).toEqual('1e-7');
+    expect(formattedPrice(1e-7)).toEqual('0.000,000,1');
     expect(formattedPrice('test')).toEqual(false);
     expect(formattedPrice('t1000')).toEqual(false);
     expect(formattedPrice(1000.1234, { separator: '.' })).toEqual('1.000,123.4');
@@ -21,13 +21,16 @@ describe('formattedPrice tests', () => {
   it('testing formattedPrice with different separators', () => {
     expect(formattedPrice(1000.1234, { separator: ',' })).toEqual('1,000.123,4');
     expect(formattedPrice(1000.1234, { separator: ' ' })).toEqual('1 000.123 4');
+    // ToDo: Fix this, must be '1000.1234'
+    expect(formattedPrice(1000.1234, { separator: '' })).toEqual('1,000.123,4');
   });
 
   it('testing formattedPrice with different delimiters', () => {
     // ToDo: Fix this. Must be 1.000,123.4'
     expect(formattedPrice(1000.1234, { delimiter: ',' })).toEqual('1,000.123,4');
     expect(formattedPrice(1000.1234, { delimiter: '.' })).toEqual('1,000.123,4');
     expect(formattedPrice(1000.1234, { delimiter: ' ' })).toEqual('1,000 123,4');
+    expect(formattedPrice(1000.1234, { delimiter: '' })).toEqual(false);
   });
 
   it('testing formattedPrice with the same separators and delimiters', () => {

src/utils/exponentFormatter.ts

@@ -10,7 +10,7 @@ export default (value: number | string): string => {
       useGrouping: false,
     });
 
-    return localeFormatter.format(Number(value)).replace(',', '.');
+    return localeFormatter.format(Number(value.toString().replace(',', '.')));
   }
 
   return value.toString();

src/utils/formattedPrice.ts

@@ -1,9 +1,11 @@
 import reverser from './reverser';
 import getLocale from './locale';
-import { formattedPriceOptionsType } from "../types";
+import exponentFormatter from './exponentFormatter';
+import { formattedPriceOptionsType } from '../types';
 
 export default (value: string | number, options?: formattedPriceOptionsType): string | boolean => {
-  if (isNaN(Number(value.toString().split('')[0]))) {
+  if (isNaN(Number(value))) {
+    console.error('Value must be a number or a number inside the string');
     return false;
   }
 
@@ -12,6 +14,12 @@ export default (value: string | number, options?: formattedPriceOptionsType): st
     return false;
   }
 
+  if (typeof options?.delimiter !== 'undefined' && options?.delimiter === '') {
+    console.error('The delimiter can`t be empty. Remove this option to set default or set a value');
+    return false;
+  }
+
+  let formattedValue = value < 1e-6 ? exponentFormatter(Number(value)) : value;
   let delimiter = options?.delimiter || getLocale(options?.lang).delimiter;
   let separator = options?.separator || getLocale(options?.lang).separator;
 
@@ -22,17 +30,16 @@ export default (value: string | number, options?: formattedPriceOptionsType): st
   }
 
   const valueSeparator =
-    reverser(value).replace(/\s|\d/g, '').length === 1 ? reverser(value).replace(/\s|\d/g, '')[0] : delimiter;
-  const stringDelimiter = delimiter || valueSeparator;
-  const numberArray = value.toString().split(typeof value === 'number' ? '.' : valueSeparator);
+    typeof Number(formattedValue) === 'number' ? '.' : formattedValue.toString().replace(/\s|\d/g, '')[0];
+  const numberArray = formattedValue.toString().split(valueSeparator);
   const regexpWithSpace = /\B(?=(\d{3})+(?!\d))/g;
   const numberBeforeDot = numberArray[0].replace(regexpWithSpace, separator);
 
   if (numberArray.length > 1) {
     const reversedNumberAfterDot = reverser(numberArray[1]).replace(regexpWithSpace, separator);
     const numberAfterDot = reverser(reversedNumberAfterDot);
 
-    return [numberBeforeDot, numberAfterDot].join(stringDelimiter);
+    return [numberBeforeDot, numberAfterDot].join(delimiter);
   }
 
   return numberBeforeDot;