cafe-utility 10.6.0 → 10.7.1

package/index.d.ts

@@ -178,7 +178,7 @@ declare function fromMillis(millis: number): Date;
 declare function createTimeDigits(value: number): string;
 declare function humanizeTime(millis: number): string;
 declare function getAgo(date: Date, now?: number): string;
-declare function getAgoStructured(date: Date, now?: number): {
+declare function getAgoStructured(dateOrTimestamp: Date | number, now?: number): {
     value: number;
     unit: string;
 };
@@ -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

@@ -1293,25 +1293,25 @@ function getAgo(date, now) {
     return delta.toFixed(0) + ' days ago'
 }
 
-function getAgoStructured(date, now) {
+function getAgoStructured(dateOrTimestamp, now) {
     if (!now) {
         now = Date.now()
     }
-    const then = date.getTime()
+    const then = typeof dateOrTimestamp === 'number' ? dateOrTimestamp : dateOrTimestamp.getTime()
     let delta = (now - then) / 1000
     if (delta < 120) {
-        return { value: delta, unit: 'second' }
+        return { value: Math.floor(delta), unit: 'second' }
     }
     delta /= 60
     if (delta < 120) {
-        return { value: delta, unit: 'minute' }
+        return { value: Math.floor(delta), unit: 'minute' }
     }
     delta /= 60
     if (delta < 48) {
-        return { value: delta, unit: 'hour' }
+        return { value: Math.floor(delta), unit: 'hour' }
     }
     delta /= 24
-    return { value: delta, unit: 'day' }
+    return { value: Math.floor(delta), unit: 'day' }
 }
 
 const throttleTimers = {}
@@ -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, '')
 }
@@ -1623,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
@@ -2498,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.6.0",
+    "version": "10.7.1",
     "description": "",
     "main": "index.js",
     "exports": {