@kizmann/pico-js 2.0.12 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kizmann/pico-js",
-    "version": "2.0.12",
+    "version": "2.1.0",
     "license": "MIT",
     "type": "module",
     "private": false,

package/src/index.esm.ts

@@ -28,12 +28,12 @@ export {
 }
 
 // Work in progress (not started yet)
-// import { default as Map } from "./wip/Map.ts";
-// import { default as Element } from "./wip/Element.ts";
+import { default as Map } from "./wip/Map.ts";
+import { default as Element } from "./wip/Element.ts";
 
-// export {
-//     Map, Element
-// }
+export {
+    Map, Element
+}
 
 /**
  * @type {Mix}

package/src/now/NowDefault.ts

@@ -20,11 +20,36 @@ export interface PicoNowDefault extends PicoNowInterface
  */
 export class PicoNowDefault
 {
-    static test(value : any) : boolean
+    calc(value : any, scope : string) : PicoNow
     {
-        return value instanceof Date;
-    }
+        if ( ! Mix.isNum(value) ) {
+            value = Mix.int(value);
+        }
+
+        let result = 0;
+
+        if ( /^seconds?$/i.test(scope) ) {
+            result = value * 1000;
+        }
+
+        if ( /^minutes?$/i.test(scope) ) {
+            result = value * 1000 * 60;
+        }
 
+        if ( /^hours?$/i.test(scope) ) {
+            result = value * 1000 * 60 * 60;
+        }
+
+        if ( /^dates?$/i.test(scope) ) {
+            result = value * 1000 * 60 * 60 * 24;
+        }
+
+        this.value.setTime(...[
+            this.value.getTime() + result
+        ]);
+
+        return <PicoNow> <unknown> this;
+    }
     /**
      * Get value by scope
      *
@@ -81,6 +106,10 @@ export class PicoNowDefault
      */
     set(value : any, scope : string) : PicoNow
     {
+        if ( value == null) {
+            return <PicoNow> <unknown> this;
+        }
+
         if ( !Mix.isNum(value) ) {
             value = Mix.int(value);
         }
@@ -289,6 +318,22 @@ export class PicoNowDefault
             scope = 'date';
         }
 
+        if ( /^seconds?$/i.test(scope) ) {
+            return this.calc(value, scope);
+        }
+
+        if ( /^minutes?$/i.test(scope) ) {
+            return this.calc(value, scope);
+        }
+
+        if ( /^hours?$/i.test(scope) ) {
+            return this.calc(value, scope);
+        }
+
+        if ( /^dates?$/i.test(scope) ) {
+            return this.calc(value, scope);
+        }
+
         this.set(this.get(scope) + Mix.int(value), scope);
 
         return <PicoNow> <unknown> this;
@@ -309,7 +354,25 @@ export class PicoNowDefault
             scope = 'date';
         }
 
-        this.set(this.get(scope) - Mix.int(value), scope);
+        if ( /^seconds?$/i.test(scope) ) {
+            return this.calc(value * -1, scope);
+        }
+
+        if ( /^minutes?$/i.test(scope) ) {
+            return this.calc(value * -1, scope);
+        }
+
+        if ( /^hours?$/i.test(scope) ) {
+            return this.calc(value * -1, scope);
+        }
+
+        if ( /^dates?$/i.test(scope) ) {
+            return this.calc(value * -1, scope);
+        }
+
+        this.set(...[
+            this.get(scope) - Mix.int(value), scope
+        ]);
 
         return <PicoNow> <unknown> this;
     }

package/src/now/NowDuration.ts

@@ -0,0 +1,122 @@
+import { Arr, Mix, Now, Obj, Str } from "../index.esm.ts";
+import { PicoNow, PicoNowInterface } from "../utils/Now.ts";
+import PicoNowDefault from "./NowDefault.ts";
+import PicoNowFormat from "./NowFormat.ts";
+
+export interface PicoNowDuration extends PicoNowInterface,
+    PicoNowDefault,
+    PicoNowFormat
+{
+    //
+}
+
+/**
+ * @memberof PicoNow
+ */
+export class PicoNowDuration
+{
+
+    /**
+     * Calculate duration between two dates
+     *
+     * @example Now.make("2026-01-01").duration("2026-02-01") // => { years: 0, months: 1, ... }
+     *
+     * @param {any} value End date
+     * @returns {any} Duration object
+     */
+    duration(value : any) : any
+    {
+        if ( Mix.isNum(value) ) {
+            value = this.clone().add(value, 'seconds');
+        }
+
+        const date = Now.make(value);
+
+        const keys = [
+            'years', 'months', 'dates', 'hours', 'minutes', 'seconds'
+        ];
+
+        let result : any = {};
+
+        Arr.each(keys, (key : string) => {
+            result[key] = date.get(key) - this.get(key);
+        });
+
+        const last = date.clone().sub(1, 'month')
+            .last('date').date();
+
+        if ( result.minutes && result.seconds < 0 ) {
+            result.minutes -= 1, result.seconds += 60;
+        }
+
+        if ( result.hours && result.minutes < 0 ) {
+            result.hours -= 1, result.minutes += 60;
+        }
+
+        if ( result.dates && result.hours < 0 ) {
+            result.dates -= 1, result.hours += 24;
+        }
+
+        if ( result.months && result.dates < 0 ) {
+            result.months -= 1, result.dates += last;
+        }
+
+        if ( result.years && result.months < 0 ) {
+            result.years -= 1, result.months += 12;
+        }
+
+        return result;
+    }
+
+    /**
+     * Normalize seconds into duration parts
+     *
+     * @example Now.make().safeDuration(3661) // => { dates: 0, hours: 1, minutes: 1, seconds: 1 }
+     *
+     * @param {number} value Seconds value
+     * @returns {any} Duration object
+     */
+    safeDuration(value : number) : any
+    {
+        let result : any = {
+            dates: 0,
+            hours: 0,
+            minutes: 0,
+            seconds: Mix.int(value)
+        };
+
+        if ( result.seconds >= 60 ) {
+            result.minutes = Math.floor(result.seconds / 60);
+            result.seconds %= 60;
+        }
+
+        if ( result.minutes >= 60 ) {
+            result.hours = Math.floor(result.minutes / 60);
+            result.minutes %= 60;
+        }
+
+        if ( result.hours >= 24 ) {
+            result.dates = Math.floor(result.hours / 24);
+            result.hours %= 24;
+        }
+
+        return result;
+    }
+
+    /**
+     * Get difference between two dates in seconds
+     *
+     * @example Now.make("2026-01-02").diffrence("2026-01-01") // => 86400
+     *
+     * @param {any} [value=null] Compare date
+     * @returns {number} Seconds difference
+     */
+    diffrence(value : any = null) : number
+    {
+        return this.code('x') - Now.make(value).code('x');
+    }
+
+}
+
+
+export default PicoNowDuration;

package/src/now/NowFormat.ts

@@ -70,6 +70,7 @@ export class PicoNowFormat
             format = 'YYYY-MM-DD';
         }
 
+
         if ( this.isModifible(value) ) {
             return this.modify(value);
         }

package/src/now/NowGrid.ts

@@ -1,5 +1,5 @@
 import { Arr } from "../index.esm.ts";
-import { PicoNowInterface } from "../utils/Now.ts";
+import { PicoNow, PicoNowInterface } from "../utils/Now.ts";
 import PicoNowWalker from "./NowWalker.js";
 
 export interface PicoNowGrid extends PicoNowInterface,
@@ -19,9 +19,9 @@ export class PicoNowGrid
      * @example Now.grid("month") // => [Now, Now, ...]
      *
      * @param {string} [scope] Grid scope
-     * @returns {Array<PicoNowInterface>} Array of dates
+     * @returns {Array<PicoNow>} Array of dates
      */
-    grid(scope : string = 'day') : Array<PicoNowInterface>
+    grid(scope : string = 'day') : Array<PicoNow>
     {
         if ( /^seconds?$/i.test(scope) ) {
             return this.getSecondsGrid();
@@ -64,9 +64,9 @@ export class PicoNowGrid
      * @example Now.getSecondsGrid(10)
      *
      * @param {number} [interval] Step interval
-     * @returns {Array<PicoNowInterface>} Array of dates
+     * @returns {Array<PicoNow>} Array of dates
      */
-    getSecondsGrid(interval : number = 1) : Array<PicoNowInterface>
+    getSecondsGrid(interval : number = 1) : Array<PicoNow>
     {
         if ( interval == null ) {
             interval = 1;
@@ -83,9 +83,9 @@ export class PicoNowGrid
      * @example Now.getMinutesGrid(10)
      *
      * @param {number} [interval] Step interval
-     * @returns {Array<PicoNowInterface>} Array of dates
+     * @returns {Array<PicoNow>} Array of dates
      */
-    getMinutesGrid(interval : number = 1) : Array<PicoNowInterface>
+    getMinutesGrid(interval : number = 1) : Array<PicoNow>
     {
         if ( interval == null ) {
             interval = 1;
@@ -102,9 +102,9 @@ export class PicoNowGrid
      * @example Now.getHoursGrid(2)
      *
      * @param {number} [interval] Step interval
-     * @returns {Array<PicoNowInterface>} Array of dates
+     * @returns {Array<PicoNow>} Array of dates
      */
-    getHoursGrid(interval : number = 1) : Array<PicoNowInterface>
+    getHoursGrid(interval : number = 1) : Array<PicoNow>
     {
         if ( interval == null ) {
             interval = 1;
@@ -120,9 +120,9 @@ export class PicoNowGrid
      *
      * @example Now.getDaysGrid()
      *
-     * @returns {Array<PicoNowInterface>} Array of dates
+     * @returns {Array<PicoNow>} Array of dates
      */
-    getDaysGrid() : Array<PicoNowInterface>
+    getDaysGrid() : Array<PicoNow>
     {
         let dates = [
             this.first('date').first('day'), this.last('date').last('day')
@@ -136,9 +136,9 @@ export class PicoNowGrid
      *
      * @example Now.getDatesGrid()
      *
-     * @returns {Array<PicoNowInterface>} Array of dates
+     * @returns {Array<PicoNow>} Array of dates
      */
-    getDatesGrid() : Array<PicoNowInterface>
+    getDatesGrid() : Array<PicoNow>
     {
         let dates = [
             this.first('date'), this.last('date')
@@ -152,9 +152,9 @@ export class PicoNowGrid
      *
      * @example Now.getMonthsGrid()
      *
-     * @returns {Array<PicoNowInterface>} Array of dates
+     * @returns {Array<PicoNow>} Array of dates
      */
-    getMonthsGrid() : Array<PicoNowInterface>
+    getMonthsGrid() : Array<PicoNow>
     {
         let dates = [
             this.first('month'), this.last('month')
@@ -168,9 +168,9 @@ export class PicoNowGrid
      *
      * @example Now.getYearsGrid()
      *
-     * @returns {Array<PicoNowInterface>} Array of dates
+     * @returns {Array<PicoNow>} Array of dates
      */
-    getYearsGrid() : Array<PicoNowInterface>
+    getYearsGrid() : Array<PicoNow>
     {
         let dates = [
             this.first('year'), this.clone().last('year')
@@ -184,9 +184,9 @@ export class PicoNowGrid
      *
      * @example Now.getDecadesGrid()
      *
-     * @returns {Array<PicoNowInterface>} Array of dates
+     * @returns {Array<PicoNow>} Array of dates
      */
-    getDecadesGrid() : Array<PicoNowInterface>
+    getDecadesGrid() : Array<PicoNow>
     {
         let dates = [
             this.first('decade'), this.clone().last('decade')
@@ -201,7 +201,7 @@ export class PicoNowGrid
  * @deprecated use Now.grid instead
  */
 // @ts-ignore
-PicoNowGrid.prototype.getYears = function() : Array<PicoNowInterface> {
+PicoNowGrid.prototype.getYears = function() : Array<PicoNow> {
     console.warn('Now.getYears() is deprecated, use Now.grid(\'years\') instead.');
     return this.grid('years');
 };
@@ -210,7 +210,7 @@ PicoNowGrid.prototype.getYears = function() : Array<PicoNowInterface> {
  * @deprecated use Now.grid instead
  */
 // @ts-ignore
-PicoNowGrid.prototype.getMonths = function() : Array<PicoNowInterface> {
+PicoNowGrid.prototype.getMonths = function() : Array<PicoNow> {
     console.warn('Now.getMonths() is deprecated, use Now.grid(\'months\') instead.');
     return this.grid('months');
 };
@@ -219,7 +219,7 @@ PicoNowGrid.prototype.getMonths = function() : Array<PicoNowInterface> {
  * @deprecated use Now.grid instead
  */
 // @ts-ignore
-PicoNowGrid.prototype.getDates = function() : Array<PicoNowInterface> {
+PicoNowGrid.prototype.getDates = function() : Array<PicoNow> {
     console.warn('Now.getDates() is deprecated, use Now.grid(\'dates\') instead.');
     return this.grid('dates');
 };
@@ -228,7 +228,7 @@ PicoNowGrid.prototype.getDates = function() : Array<PicoNowInterface> {
  * @deprecated use Now.grid instead
  */
 // @ts-ignore
-PicoNowGrid.prototype.getHours = function() : Array<PicoNowInterface> {
+PicoNowGrid.prototype.getHours = function() : Array<PicoNow> {
     console.warn('Now.getHours() is deprecated, use Now.grid(\'hours\') instead.');
     return this.grid('hours');
 };
@@ -237,7 +237,7 @@ PicoNowGrid.prototype.getHours = function() : Array<PicoNowInterface> {
  * @deprecated use Now.grid instead
  */
 // @ts-ignore
-PicoNowGrid.prototype.getMinutes = function() : Array<PicoNowInterface> {
+PicoNowGrid.prototype.getMinutes = function() : Array<PicoNow> {
     console.warn('Now.getMinutes() is deprecated, use Now.grid(\'minutes\') instead.');
     return this.grid('minutes');
 };
@@ -246,7 +246,7 @@ PicoNowGrid.prototype.getMinutes = function() : Array<PicoNowInterface> {
  * @deprecated use Now.grid instead
  */
 // @ts-ignore
-PicoNowGrid.prototype.getSeconds = function() : Array<PicoNowInterface> {
+PicoNowGrid.prototype.getSeconds = function() : Array<PicoNow> {
     console.warn('Now.getSeconds() is deprecated, use Now.grid(\'seconds\') instead.');
     return this.grid('seconds');
 };

package/src/now/NowHuman.ts

@@ -66,7 +66,7 @@ export class PicoNowHuman
      */
     getHumanDay(substr : number = null) : string
     {
-        let day = this.day() - 1;
+        let day = this.day();
 
         if ( !NOW_HUMAN_DAYS[day] ) {
             throw new Error(`Invalid day number "${day}".`);
@@ -91,7 +91,7 @@ export class PicoNowHuman
      */
     getHumanMonth(substr : number = null) : string
     {
-        let month = this.day() - 1;
+        let month = this.month() - 1;
 
         if ( !NOW_HUMAN_MONTHS[month] ) {
             throw new Error(`Invalid month number "${month}".`);

package/src/utils/Array.ts

@@ -107,7 +107,7 @@ export class PicoArray
             return 0;
         }
 
-        if ( index + 1 > target.length ) {
+        if ( index + 1 > target.length - 1 ) {
             return 0;
         }
 

package/src/utils/Dom.ts

@@ -28,11 +28,35 @@ export const PicoDomPlugins = [
 
 export interface PicoDomInterface
 {
+    /**
+     * @type {any}
+     */
     el: any;
+
+    /**
+     * @type {any[]}
+     */
     els: any[];
+
+    /**
+     * @param {Function} plugin
+     * @returns {void}
+     */
     extend(plugin : Function) : void;
+
+    /**
+     * @returns {any}
+     */
     win() : any;
+
+    /**
+     * @returns {any}
+     */
     doc() : any;
+
+    /**
+     * @returns {any}
+     */
     body() : any;
 }
 
@@ -199,6 +223,18 @@ export class PicoDom extends trait(PicoDomPlugins)
         return this.doc().body;
     }
 
+    /**
+     * Remove elements from DOM
+     *
+     * @example Dom.find("div").remove()
+     *
+     * @returns {void} No return value
+     */
+    remove() : void
+    {
+        this.each((el : any) => el.remove());
+    }
+
 }
 
 export default PicoDom;

package/src/utils/Format.ts

@@ -27,6 +27,13 @@ export interface PicoFormat extends PicoFormatParser,
     //
 }
 
+/**
+ * @class PicoFormat
+ * @extends PicoFormatParam
+ * @extends PicoFormatOption
+ * @extends PicoFormatUrl
+ * @extends PicoFormatFile
+ */
 export class PicoFormat extends trait(PicoFormatPlugins)
 {
 

package/src/utils/Hash.ts

@@ -1,4 +1,4 @@
-import { Str } from "../index.esm.ts";
+import { Mix, Str } from "../index.esm.ts";
 
 /**
  * @var {string[]} RADIX_NUMBER Radix from 0 to 9
@@ -159,6 +159,25 @@ export class PicoHash
         return hash;
     }
 
+    /**
+     * Get a numeric hash for object
+     *
+     * @example Hash.object({ a: 1 }) // => '8823432'
+     *
+     * @param {any} value Object to hash
+     * @returns {string} String numeric hash
+     */
+    static object(value : any) : string
+    {
+        let conv = JSON.stringify(value), hash = 0;
+
+        for (let i = 0; i < conv.length; i++) {
+            hash = (hash << 5) - hash + conv.charCodeAt(i) | 0;
+        }
+
+        return Mix.str(hash).replace('-', 'X');
+    }
+
 }
 
 export default PicoHash;

package/src/utils/Now.ts

@@ -7,6 +7,7 @@ import { PicoNowGrid } from "../now/NowGrid.ts";
 import { PicoNowWalker } from "../now/NowWalker.ts";
 import { PicoNowRange } from "../now/NowRange.ts";
 import { PicoNowHuman } from "../now/NowHuman.ts";
+import PicoNowDuration from "../now/NowDuration.ts";
 
 export const PicoNowPlugins = [
     PicoNowDefault,
@@ -16,6 +17,7 @@ export const PicoNowPlugins = [
     PicoNowWalker,
     PicoNowRange,
     PicoNowHuman,
+    PicoNowDuration,
 ];
 
 export interface PicoNowInterface
@@ -62,9 +64,9 @@ export class PicoNow extends trait(PicoNowPlugins)
     /**
      * Original input value
      *
-     * @type {any}
+     * @type {Date}
      */
-    input : any = null;
+    input : Date = null;
 
     /**
      * Current Date instance
@@ -195,7 +197,8 @@ export class PicoNow extends trait(PicoNowPlugins)
      */
     valid() : boolean
     {
-        return !isNaN(this.input);
+        // @ts-ignore
+        return !isNaN(this.input) && !isNaN(this.value);
     }
 
     /**

package/src/utils/Number.ts

@@ -148,7 +148,13 @@ export class PicoNumber
      */
     static combine(value : number[]) : number
     {
-        return Arr.reduce(value, (acc : number, val : any) => acc + val, 0);
+        const iter = Arr.slice(...[
+            value, 1, value.length
+        ]);
+
+        return Arr.reduce(iter, (acc : number, val : any) => {
+            return acc + val;
+        }, Arr.first(value) ?? 0);
     }
 
     /**
@@ -162,7 +168,13 @@ export class PicoNumber
      */
     static subtract(value : number[]) : number
     {
-        return Arr.reduce(value, (acc : number, val : any) => acc - val, 0);
+        const iter = Arr.slice(...[
+            value, 1, value.length
+        ]);
+
+        return Arr.reduce(iter, (acc : number, val : any) => {
+            return acc - val;
+        }, Arr.first(value) ?? 0);
     }
 
     /**

package/src/utils/Runner.ts

@@ -221,7 +221,7 @@ export class PicoRunner
      */
     static framerate(cb : Function, fps : number = 30, finish : boolean = true) : Function
     {
-        let timer : any, last = 0, hertz = 1000 / fps;
+        let timer : any, frame : any, last = 0, hertz = 1000 / fps;
 
         const fn = (...args : any) => {
 
@@ -231,7 +231,13 @@ export class PicoRunner
                 return finish && (timer = setTimeout(fn, hertz + 1));
             }
 
-            (this.frame(() => cb(...args)), last = Date.now());
+            cancelAnimationFrame(frame);
+
+            frame = requestAnimationFrame(() => {
+                cb(...args);
+            });
+
+            last = Date.now()
         };
 
         return fn;

package/src/utils/String.ts

@@ -285,6 +285,10 @@ export class PicoString
      */
     static has(value : any, search : any) : boolean
     {
+        if ( Mix.isEmpty(search) ) {
+            return true;
+        }
+
         return this.lc(value).indexOf(this.lc(search)) !== -1;
     }
 

package/types/index.esm.d.ts

@@ -17,6 +17,9 @@ export { go, browser, device, trait };
 import { default as Data } from "./utils/Data.ts";
 import { default as Route } from "./utils/Route.ts";
 export { Route, Data };
+import { default as Map } from "./wip/Map.ts";
+import { default as Element } from "./wip/Element.ts";
+export { Map, Element };
 /**
  * @type {Mix}
  */

package/types/now/NowDefault.d.ts

@@ -6,7 +6,7 @@ export interface PicoNowDefault extends PicoNowInterface {
  * @memberof PicoNow
  */
 export declare class PicoNowDefault {
-    static test(value: any): boolean;
+    calc(value: any, scope: string): PicoNow;
     /**
      * Get value by scope
      *