cafe-utility 10.7.0 → 10.8.0

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;
 };
@@ -315,6 +315,8 @@ declare function tickPlaybook<T>(playbook: Playbook<T>): {
 declare function getArgument(args: string[], key: string): string | null;
 declare function requireStringArgument(args: string[], key: string): string;
 declare function requireNumberArgument(args: string[], key: string): number;
+declare function bringToFrontInPlace<T>(array: T[], index: number): void;
+declare function bringToFront<T>(array: T[], index: number): T[];
 declare type Point = {
     x: number;
     y: number;
@@ -381,6 +383,8 @@ export declare const Arrays: {
     getArgument: typeof getArgument;
     requireStringArgument: typeof requireStringArgument;
     requireNumberArgument: typeof requireNumberArgument;
+    bringToFront: typeof bringToFront;
+    bringToFrontInPlace: typeof bringToFrontInPlace;
 };
 export declare const System: {
     sleepMillis: typeof sleepMillis;

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 = {}
@@ -1601,6 +1601,7 @@ function fromObjectString(string) {
     })
     string = string.replace(/(,)(\s+})/g, '$2')
     string = string.replace(/\.\.\..+?,/g, '')
+    string = string.replace(/({\s+)([a-zA-Z]\w+),/g, "$1$2: '$2',")
     string = string.replace(/(,\s+)([a-zA-Z]\w+),/g, "$1$2: '$2',")
     string = string.replace(/:(.+)\?(.+):/g, (match, $1, $2) => {
         return `: (${$1.trim()} && ${$2.trim()}) ||`
@@ -2150,6 +2151,18 @@ function requireNumberArgument(args, key) {
     }
 }
 
+function bringToFrontInPlace(array, index) {
+    const item = array[index]
+    array.splice(index, 1)
+    array.unshift(item)
+}
+
+function bringToFront(array, index) {
+    const newArray = [...array]
+    bringToFrontInPlace(newArray, index)
+    return newArray
+}
+
 function addPoint(a, b) {
     return {
         x: a.x + b.x,
@@ -2480,7 +2493,9 @@ exports.Arrays = {
     tickPlaybook,
     getArgument,
     requireStringArgument,
-    requireNumberArgument
+    requireNumberArgument,
+    bringToFront,
+    bringToFrontInPlace
 }
 
 exports.System = {

package/package.json

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