cafe-utility 10.5.0 → 10.7.0

package/index.d.ts

@@ -211,6 +211,7 @@ declare function getDayInfoFromDateTimeString(dateTimeString: string): DayInfo;
 declare function seconds(value: number): number;
 declare function minutes(value: number): number;
 declare function hours(value: number): number;
+declare function makeDate(numberWithUnit: string): number;
 declare function getPreLine(string: string): string;
 declare function containsWord(string: string, word: string): boolean;
 declare function containsWords(string: string, words: string[]): boolean;
@@ -431,6 +432,7 @@ export declare const Dates: {
     seconds: typeof seconds;
     minutes: typeof minutes;
     hours: typeof hours;
+    make: typeof makeDate;
 };
 export declare const Objects: {
     safeParse: typeof safeParse;

package/index.js

@@ -1391,6 +1391,43 @@ function hours(value) {
     return value * 3600000
 }
 
+const dateUnits = [
+    ['ms', 1],
+    ['milli', 1],
+    ['millis', 1],
+    ['millisecond', 1],
+    ['milliseconds', 1],
+    ['s', 1000],
+    ['sec', 1000],
+    ['second', 1000],
+    ['seconds', 1000],
+    ['m', 60000],
+    ['min', 60000],
+    ['minute', 60000],
+    ['minutes', 60000],
+    ['h', 3600000],
+    ['hour', 3600000],
+    ['hours', 3600000],
+    ['d', 86400000],
+    ['day', 86400000],
+    ['days', 86400000],
+    ['w', 604800000],
+    ['week', 604800000],
+    ['weeks', 604800000]
+]
+function makeDate(numberWithUnit) {
+    const number = parseFloat(numberWithUnit)
+    if (isNaN(number)) {
+        throw 'makeDate got NaN for input'
+    }
+    const unit = numberWithUnit.replace(/^-?[0-9.]+/, '').trim()
+    const index = dateUnits.findIndex(value => value[0] === unit.toLowerCase())
+    if (index === -1) {
+        return number
+    }
+    return number * dateUnits[index][1]
+}
+
 function getPreLine(string) {
     return string.replace(/ +/g, ' ').replace(/^ /gm, '')
 }
@@ -1577,7 +1614,7 @@ function fromObjectString(string) {
     return JSON.parse(string)
 }
 
-const thresholds = [1e3, 1e6, 1e9, 1e12, 1e15, 1e18, 1e21, 1e24, 1e27, 1e30, 1e16, 1e18, 1e18, 1e18, 1e33]
+const thresholds = [1e3, 1e6, 1e9, 1e12, 1e15, 1e18, 1e21, 1e24, 1e27, 1e30, 1e9, 1e16, 1e18, 1e18, 1e18, 1e33]
 const longNumberUnits = [
     'thousand',
     'million',
@@ -1589,13 +1626,14 @@ const longNumberUnits = [
     'septillion',
     'octillion',
     'nonillion',
+    'gwei',
     'bzz',
     'btc',
     'eth',
     'dai',
     'decillion'
 ]
-const shortNumberUnits = ['K', 'M', 'B', 'T', 'Qa', 'Qi', 'Sx', 'Sp', 'O', 'N', 'bzz', 'eth', 'btc', 'dai', 'D']
+const shortNumberUnits = ['K', 'M', 'B', 'T', 'Qa', 'Qi', 'Sx', 'Sp', 'O', 'N', 'gwei', 'bzz', 'eth', 'btc', 'dai', 'D']
 function formatNumber(number, options) {
     var _a, _b
     const longFormat =
@@ -1622,7 +1660,7 @@ function makeNumber(numberWithUnit) {
     if (isNaN(number)) {
         throw 'makeNumber got NaN for input'
     }
-    const unit = numberWithUnit.replace(/^-?[0-9.]+/, '')
+    const unit = numberWithUnit.replace(/^-?[0-9.]+/, '').trim()
     const index = shortNumberUnits.findIndex(value => value.toLowerCase() === unit.toLowerCase())
     if (index === -1) {
         return number
@@ -2497,7 +2535,8 @@ exports.Dates = {
     getDayInfoFromDateTimeString,
     seconds,
     minutes,
-    hours
+    hours,
+    make: makeDate
 }
 
 exports.Objects = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "cafe-utility",
-    "version": "10.5.0",
+    "version": "10.7.0",
     "description": "",
     "main": "index.js",
     "exports": {