@kizmann/pico-js 2.0.7 → 2.0.9

package/src/utils/{Now.js → Now.ts}

@@ -1,63 +1,77 @@
-import { Arr, Dom, Mix, Now, Num } from "../index.esm.js";
-import { PicoNowDefaultPlugin } from "../now/NowDefault.js";
-import { PicoNowFormatPlugin } from "../now/NowFormat.js";
-import { PicoNowMatchPlugin } from "../now/NowMatch.js";
-import { PicoNowGridPlugin } from "../now/NowGrid.js";
-import { PicoNowWalkerPlugin } from "../now/NowWalker.js";
-import { PicoNowRangePlugin } from "../now/NowRange.js";
-import { PicoNowHumanPlugin } from "../now/NowHuman.js";
+import { trait } from "../tool/scope.ts";
+import { Arr, Mix, Now } from "../index.esm.ts";
+import { PicoNowDefault } from "../now/NowDefault.ts";
+import { PicoNowFormat } from "../now/NowFormat.ts";
+import { PicoNowMatch } from "../now/NowMatch.ts";
+import { PicoNowGrid } from "../now/NowGrid.ts";
+import { PicoNowWalker } from "../now/NowWalker.ts";
+import { PicoNowRange } from "../now/NowRange.ts";
+import { PicoNowHuman } from "../now/NowHuman.ts";
 
 export const PicoNowPlugins = [
-    PicoNowDefaultPlugin,
-    PicoNowFormatPlugin,
-    PicoNowMatchPlugin,
-    PicoNowGridPlugin,
-    PicoNowWalkerPlugin,
-    PicoNowRangePlugin,
-    PicoNowHumanPlugin,
+    PicoNowDefault,
+    PicoNowFormat,
+    PicoNowMatch,
+    PicoNowGrid,
+    PicoNowWalker,
+    PicoNowRange,
+    PicoNowHuman,
 ];
 
+export interface PicoNowInterface
+{
+    value : Date;
+    input : any;
+    reset(config : any) : PicoNow;
+    clone() : PicoNow;
+    valid() : boolean;
+    toDate() : Date;
+    toUTC() : string;
+}
+
+export interface PicoNow extends PicoNowDefault,
+    PicoNowFormat,
+    PicoNowMatch,
+    PicoNowGrid,
+    PicoNowWalker,
+    PicoNowRange,
+    PicoNowHuman
+{
+    //
+}
+
 /**
  * @class PicoNow
- *
- * @typedef {import('../now/NowMatch.js').PicoNowMatchInstance} PicoNowMatchInstance
- * @typedef {import('../now/NowFormat.js').PicoNowFormatInstance} PicoNowFormatInstance
- * @typedef {import('../now/NowMatch.js').PicoNowMatchInstance} PicoNowMatchInstance
- * @typedef {import('../now/NowGrid.js').PicoNowGridInstance} PicoNowGridInstance
- * @typedef {import('../now/NowWalker.js').PicoNowWalkerInstance} PicoNowWalkerInstance
- * @typedef {import('../now/NowRange.js').PicoNowRangeInstance} PicoNowRangeInstance
- * @typedef {import('../now/NowHuman.js').PicoNowHumanInstance} PicoNowHumanInstance
- *
- * @extends PicoNowDefaultInstance
- * @extends PicoNowFormatInstance
- * @extends PicoNowMatchInstance
- * @extends PicoNowGridInstance
- * @extends PicoNowWalkerInstance
- * @extends PicoNowRangeInstance
- * @extends PicoNowHumanInstance
+ * @extends PicoNowDefault
+ * @extends PicoNowFormat
+ * @extends PicoNowMatch
+ * @extends PicoNowGrid
+ * @extends PicoNowWalker
+ * @extends PicoNowRange
+ * @extends PicoNowHuman
  */
-export class PicoNow
+export class PicoNow extends trait(PicoNowPlugins)
 {
     /**
      * Init hooks for instance
      *
-     * @type {Array<function>}
+     * @type {Function[]}
      */
-    static init = [];
+    static init : Function[] = [];
 
     /**
      * Original input value
      *
      * @type {any}
      */
-    input = null;
+    input : any = null;
 
     /**
      * Current Date instance
      *
      * @type {Date}
      */
-    value = null;
+    value : Date = null;
 
     /**
      * Create Now instance from input
@@ -67,8 +81,10 @@ export class PicoNow
      * @param {any} [value] Date input
      * @param {string} [format] Input format
      */
-    constructor(value = null, format = 'YYYY-MM-DD HH:mm:ss')
+    constructor(value : any = null, format : string = 'YYYY-MM-DD HH:mm:ss')
     {
+        super();
+
         if ( value === 'now' ) {
             value = null;
         }
@@ -79,7 +95,7 @@ export class PicoNow
             value = value.toDate();
         }
 
-        if ( ! (value instanceof Date) ) {
+        if ( !(value instanceof Date) ) {
             value = new Date();
         }
 
@@ -95,8 +111,8 @@ export class PicoNow
             this.parse(input, format);
         }
 
-        Arr.each(Now.init, (fn) => {
-            el = fn.call(this, el, format);
+        Arr.each(Now.init, (fn : Function) => {
+            fn.call(this, format);
         });
 
         return this;
@@ -107,10 +123,10 @@ export class PicoNow
      *
      * @example Now.extend(fn)
      *
-     * @param {function} plugin Plugin function
+     * @param {Function} plugin Plugin function
      * @returns {void} No return value
      */
-    static extend(plugin)
+    static extend(plugin : Function) : void
     {
         plugin.call({}, this);
     }
@@ -124,7 +140,7 @@ export class PicoNow
      * @param {string} [format] Input format
      * @returns {PicoNow} Now instance
      */
-    static make(value = null, format = 'YYYY-MM-DD HH:mm:ss')
+    static make(value : any = null, format : string = 'YYYY-MM-DD HH:mm:ss') : PicoNow
     {
         return new Now(value, format);
     }
@@ -137,7 +153,7 @@ export class PicoNow
      * @param {any} [config] Reset flags
      * @returns {PicoNow} Now instance
      */
-    reset(config = null)
+    reset(config : any = null) : PicoNow
     {
         if ( config == null ) {
             config = { month: true, day: true, time: true };
@@ -163,12 +179,11 @@ export class PicoNow
      *
      * @example Now.make().clone() // => Now
      *
-     * @param {boolean} [reset] Reset clone
      * @returns {PicoNow} New instance
      */
-    clone(reset = false)
+    clone() : PicoNow
     {
-        return new Now(new Date(this.value), null, reset);
+        return new Now(new Date(this.value), null);
     }
 
     /**
@@ -178,9 +193,9 @@ export class PicoNow
      *
      * @returns {boolean} True if valid
      */
-    valid()
+    valid() : boolean
     {
-        return ! isNaN(this.input);
+        return !isNaN(this.input);
     }
 
     /**
@@ -190,7 +205,7 @@ export class PicoNow
      *
      * @returns {Date} Date instance
      */
-    toDate()
+    toDate() : Date
     {
         return this.value;
     }
@@ -202,33 +217,17 @@ export class PicoNow
      *
      * @returns {string} UTC string
      */
-    toUTC()
+    toUTC() : string
     {
         return this.value.toUTCString();
     }
 
 }
 
-/**
- * @see PicoNow.reset
- */
+// @ts-ignore
 PicoNow.prototype.resetTime = function () {
     console.warn('Now.resetTime() is deprecated, use Now.reset({ time: true }) instead.');
     return this.reset({ time: true });
 }
 
-/**
- * @returns {typeof PicoNow}
- */
-export function PicoNowBuilder() {
-
-    let cls = PicoNow;
-
-    for ( const plugin of PicoNowPlugins ) {
-        cls = plugin.call(cls, cls);
-    }
-
-    return cls;
-}
-
-export default PicoNowBuilder;
+export default PicoNow;

package/src/utils/{Number.js → Number.ts}

@@ -1,8 +1,7 @@
-import { Mix, Num, Arr, Hash, Str, Obj } from "../index.esm.js";
+import { Mix, Arr, Hash, Str } from "../index.esm.ts";
 
 export class PicoNumber
 {
-
     /**
      * Format number with decimals
      *
@@ -13,9 +12,9 @@ export class PicoNumber
      * @param {number} decimals Decimals count
      * @returns {string} Fixed string
      */
-    static fixed(value, decimals = 2)
+    static fixed(value : any, decimals : number = 2) : string
     {
-        if ( ! Mix.isNum(value) ) {
+        if ( !Mix.isNum(value) ) {
             value = Mix.num(value);
         }
 
@@ -31,9 +30,9 @@ export class PicoNumber
      * @param {any} value Numeric value
      * @returns {number} Parsed float
      */
-    static float(value)
+    static float(value : any) : number
     {
-        if ( ! Mix.isNum(value) ) {
+        if ( !Mix.isNum(value) ) {
             value = Mix.num(value);
         }
 
@@ -49,9 +48,9 @@ export class PicoNumber
      * @param {any} value Numeric value
      * @returns {number} Parsed int
      */
-    static int(value)
+    static int(value : any) : number
     {
-        if ( ! Mix.isNum(value) ) {
+        if ( !Mix.isNum(value) ) {
             value = Mix.num(value);
         }
 
@@ -67,9 +66,9 @@ export class PicoNumber
      * @param {any} value Numeric value
      * @returns {number} Ceil value
      */
-    static ceil(value)
+    static ceil(value : any) : number
     {
-        if ( ! Mix.isNum(value) ) {
+        if ( !Mix.isNum(value) ) {
             value = Mix.num(value);
         }
 
@@ -85,9 +84,9 @@ export class PicoNumber
      * @param {any} value Numeric value
      * @returns {number} Floor value
      */
-    static floor(value)
+    static floor(value : any) : number
     {
-        if ( ! Mix.isNum(value) ) {
+        if ( !Mix.isNum(value) ) {
             value = Mix.num(value);
         }
 
@@ -103,9 +102,9 @@ export class PicoNumber
      * @param {any} value Numeric value
      * @returns {number} Rounded value
      */
-    static round(value)
+    static round(value : any) : number
     {
-        if ( ! Mix.isNum(value) ) {
+        if ( !Mix.isNum(value) ) {
             value = Mix.num(value);
         }
 
@@ -118,12 +117,12 @@ export class PicoNumber
      * @example Num.combine([1, 2]) // => 3
      * @example Num.combine([5, -2]) // => 3
      *
-     * @param {Array<number>} value Number list
+     * @param {number[]} value Number list
      * @returns {number} Sum value
      */
-    static combine(value)
+    static combine(value : number[]) : number
     {
-        return Arr.reduce(value, (acc, val) => acc + val, 0);
+        return Arr.reduce(value, (acc : number, val : any) => acc + val, 0);
     }
 
     /**
@@ -132,12 +131,12 @@ export class PicoNumber
      * @example Num.subtract([5, 2]) // => 3
      * @example Num.subtract([10, 3]) // => 7
      *
-     * @param {Array<number>} value Number list
+     * @param {number[]} value Number list
      * @returns {number} Result value
      */
-    static subtract(value)
+    static subtract(value : number[]) : number
     {
-        return Arr.reduce(value, (acc, val) => acc - val, 0);
+        return Arr.reduce(value, (acc : number, val : any) => acc - val, 0);
     }
 
     /**
@@ -149,9 +148,9 @@ export class PicoNumber
      * @param {any} value Numeric value
      * @returns {number} Decade value
      */
-    static decade(value)
+    static decade(value : any) : number
     {
-        if ( ! Mix.isNum(value) ) {
+        if ( !Mix.isNum(value) ) {
             value = Mix.num(value);
         }
 
@@ -164,16 +163,19 @@ export class PicoNumber
      * @example Num.matrix(5) // => [4, 1]
      * @example Num.matrix(8) // => [8]
      *
-     * @param {number} num Input number
-     * @param {number} [limit] Unused (legacy)
-     * @param {Array<number>} [base] Result base
+     * @param {any} num Input number
+     * @param {number[]} [base] Result base
      * @returns {Array<number>} Power list
      */
-    static matrix(num, limit = 10, base = [])
+    static matrix(num : any, base : number[] = []) : Array<number>
     {
+        if ( !Mix.isNum(num) ) {
+            num = Mix.num(num);
+        }
+
         let value = 0;
 
-        for ( let i = 20; i >= 0; i -- ) {
+        for ( let i = 20; i >= 0; i-- ) {
             if ( num >= (value = Math.pow(2, i)) ) {
                 (base.push(value), num -= value);
             }
@@ -192,7 +194,7 @@ export class PicoNumber
      * @param {boolean} [miles] Return miles if true
      * @returns {number} Distance value
      */
-    static distance(cord1, cord2, miles = false)
+    static distance(cord1 : any, cord2 : any, miles : boolean = false) : number
     {
         let cord = { lat: 0, lng: 0 };
 
@@ -219,18 +221,14 @@ export class PicoNumber
 
 }
 
-/**
- * @see PicoStr.number
- */
-PicoNumber.format = (value, ...args) => {
+// @ts-ignore
+PicoNumber.format = (value : any, ...args : [any, any, any]) => {
     console.warn('Num.format() is deprecated, use Str.number() instead.');
     return Str.number(value, args[2] || null);
 };
 
-/**
- * @see PicoHash.number
- */
-PicoNumber.random = (...args) => {
+// @ts-ignore
+PicoNumber.random = (...args : Parameters<typeof Hash.number>) => {
     console.warn('Num.random() is deprecated, use Hash.number() instead.');
     return Hash.number(...args);
 };