@kizmann/pico-js 2.0.7 → 2.0.9

package/src/now/{NowDefault.js → NowDefault.ts}

@@ -1,7 +1,7 @@
-import { Arr, Mix, Now, Num, Obj, Str } from "../index.esm.js";
-import { PicoNow } from "../utils/Now.js";
+import { Mix, Now, Obj, Str } from "../index.esm.ts";
+import { PicoNow, PicoNowInterface } from "../utils/Now.ts";
 
-export const NOW_MODIFY = {
+export const NOW_MODIFY : any = {
     'second': /([+-])([0-9]+)\s?seconds?/i,
     'minute': /([+-])([0-9]+)\s?minutes?/i,
     'hour': /([+-])([0-9]+)\s?hours?/i,
@@ -10,12 +10,20 @@ export const NOW_MODIFY = {
     'year': /([+-])([0-9]+)\s?years?/i
 };
 
+export interface PicoNowDefault extends PicoNowInterface
+{
+    //
+}
+
 /**
  * @memberof PicoNow
- * @extends {PicoNow}
  */
-export class PicoNowDefaultInstance
+export class PicoNowDefault
 {
+    static test(value : any) : boolean
+    {
+        return value instanceof Date;
+    }
 
     /**
      * Get value by scope
@@ -23,9 +31,9 @@ export class PicoNowDefaultInstance
      * @example Now.get("year") // => 2026
      *
      * @param {string} scope Value scope
-     * @returns {number|PicoNow} Scope value
+     * @returns {any} Scope value
      */
-    get(scope)
+    get(scope : string) : any
     {
         if ( scope === 'time' ) {
             return this.value.getTime();
@@ -71,7 +79,7 @@ export class PicoNowDefaultInstance
      * @param {string} scope Value scope
      * @returns {PicoNow} Current instance
      */
-    set(value, scope)
+    set(value : any, scope : string) : PicoNow
     {
         if ( !Mix.isNum(value) ) {
             value = Mix.int(value);
@@ -115,7 +123,7 @@ export class PicoNowDefaultInstance
             this.value.setFullYear(value);
         }
 
-        return this;
+        return <PicoNow> <unknown> this;
     }
 
     /**
@@ -124,9 +132,9 @@ export class PicoNowDefaultInstance
      * @example Now.time() // => 1739334660000
      *
      * @param {any} [value] New timestamp
-     * @returns {number|PicoNow} Timestamp or instance
+     * @returns {any} Timestamp or instance
      */
-    time(value = null)
+    time(value : any = null) : any
     {
         if ( value == null ) {
             return this.get('time');
@@ -141,9 +149,9 @@ export class PicoNowDefaultInstance
      * @example Now.second() // => 45
      *
      * @param {any} [value] New seconds
-     * @returns {number|PicoNow} Seconds or instance
+     * @returns {any} Seconds or instance
      */
-    second(value = null)
+    second(value : any = null) : any
     {
         if ( value == null ) {
             return this.get('second');
@@ -158,9 +166,9 @@ export class PicoNowDefaultInstance
      * @example Now.minute() // => 30
      *
      * @param {any} [value] New minutes
-     * @returns {number|PicoNow} Minutes or instance
+     * @returns {any} Minutes or instance
      */
-    minute(value = null)
+    minute(value : any = null) : any
     {
         if ( value == null ) {
             return this.get('minute');
@@ -175,9 +183,9 @@ export class PicoNowDefaultInstance
      * @example Now.hour() // => 12
      *
      * @param {any} [value] New hours
-     * @returns {number|PicoNow} Hours or instance
+     * @returns {any} Hours or instance
      */
-    hour(value = null)
+    hour(value : any = null) : any
     {
         if ( value == null ) {
             return this.get('hour');
@@ -192,9 +200,9 @@ export class PicoNowDefaultInstance
      * @example Now.day() // => 1
      *
      * @param {any} [value] New day
-     * @returns {number|PicoNow} Day or instance
+     * @returns {any} Day or instance
      */
-    day(value = null)
+    day(value : any = null) : any
     {
         if ( value == null ) {
             return this.get('day');
@@ -209,9 +217,9 @@ export class PicoNowDefaultInstance
      * @example Now.date() // => 12
      *
      * @param {any} [value] New date
-     * @returns {number|PicoNow} Date or instance
+     * @returns {any} Date or instance
      */
-    date(value = null)
+    date(value : any = null) : any
     {
         if ( value == null ) {
             return this.get('date');
@@ -226,9 +234,9 @@ export class PicoNowDefaultInstance
      * @example Now.month() // => 2
      *
      * @param {any} [value] New month
-     * @returns {number|PicoNow} Month or instance
+     * @returns {any} Month or instance
      */
-    month(value = null)
+    month(value : any = null) : any
     {
         if ( value == null ) {
             return this.get('month');
@@ -243,9 +251,9 @@ export class PicoNowDefaultInstance
      * @example Now.year() // => 2026
      *
      * @param {any} [value] New year
-     * @returns {number|PicoNow} Year or instance
+     * @returns {any} Year or instance
      */
-    year(value = null)
+    year(value : any = null) : any
     {
         if ( value == null ) {
             return this.get('year');
@@ -261,9 +269,9 @@ export class PicoNowDefaultInstance
      *
      * @returns {string} Short year
      */
-    shortyear()
+    shortyear() : string
     {
-        return this.get('year').toString().slice(- 2);
+        return this.get('year').toString().slice(-2);
     }
 
     /**
@@ -271,11 +279,11 @@ export class PicoNowDefaultInstance
      *
      * @example Now.add(1, "day")
      *
-     * @param {number} value Add value
+     * @param {any} value Add value
      * @param {string} [scope] Target scope
      * @returns {PicoNow} Current instance
      */
-    add(value, scope = 'day')
+    add(value : any, scope : string = 'day') : PicoNow
     {
         if ( /^days?$/i.test(scope) ) {
             scope = 'date';
@@ -283,7 +291,7 @@ export class PicoNowDefaultInstance
 
         this.set(this.get(scope) + Mix.int(value), scope);
 
-        return this;
+        return <PicoNow> <unknown> this;
     }
 
     /**
@@ -291,11 +299,11 @@ export class PicoNowDefaultInstance
      *
      * @example Now.sub(1, "day")
      *
-     * @param {number} value Sub value
+     * @param {any} value Sub value
      * @param {string} [scope] Target scope
      * @returns {PicoNow} Current instance
      */
-    sub(value, scope = 'day')
+    sub(value : any, scope : string = 'day') : PicoNow
     {
         if ( /^days?$/i.test(scope) ) {
             scope = 'date';
@@ -303,7 +311,7 @@ export class PicoNowDefaultInstance
 
         this.set(this.get(scope) - Mix.int(value), scope);
 
-        return this;
+        return <PicoNow> <unknown> this;
     }
 
     /**
@@ -314,7 +322,7 @@ export class PicoNowDefaultInstance
      * @param {string} value Test value
      * @returns {boolean} Is modifiable
      */
-    isModifible(value)
+    isModifible(value : string) : boolean
     {
         return /^(\s*[+-][0-9]+\s?[a-z]+\s*)+$/i.test(value);
     }
@@ -327,19 +335,19 @@ export class PicoNowDefaultInstance
      * @param {string} value Modify string
      * @returns {PicoNow} Current instance
      */
-    modify(value)
+    modify(value : string) : PicoNow
     {
         if ( Mix.isEmpty(value) ) {
-            return this;
+            return <PicoNow> <unknown> this;
         }
 
-        Obj.each(NOW_MODIFY, (val, key) => {
+        Obj.each(NOW_MODIFY, (val : any, key : any) => {
             Str.match(value, val, ([f, o, c]) => {
                 o === '+' ? this.add(c, key) : this.sub(c, key);
             });
         });
 
-        return this;
+        return <PicoNow> <unknown> this;
     }
 
     /**
@@ -349,10 +357,10 @@ export class PicoNowDefaultInstance
      *
      * @param {any} value Source value
      * @param {string} [format] Source format
-     * @param {Array<string>} [keys] Scope keys
+     * @param {string[]} [keys] Scope keys
      * @returns {PicoNow} Current instance
      */
-    apply(value, format = 'YYYY-MM-DD HH:mm:ss', keys = [])
+    apply(value : any, format : string = 'YYYY-MM-DD HH:mm:ss', keys : string[] = []) : PicoNow
     {
         value = Now.make(value, format);
 
@@ -360,7 +368,7 @@ export class PicoNowDefaultInstance
             this.set(value.get(key), key);
         }
 
-        return this;
+        return <PicoNow> <unknown> this;
     }
 
     /**
@@ -372,9 +380,9 @@ export class PicoNowDefaultInstance
      * @param {string} [format] Source format
      * @returns {PicoNow} Current instance
      */
-    applyDate(value, format = 'YYYY-MM-DD HH:mm:ss')
+    applyDate(value : any, format : string = 'YYYY-MM-DD HH:mm:ss') : PicoNow
     {
-        return this.apply(value, format, ['date', 'month', 'year']);
+        return <PicoNow> this.apply(value, format, ['date', 'month', 'year']);
     }
 
     /**
@@ -386,150 +394,107 @@ export class PicoNowDefaultInstance
      * @param {string} [format] Source format
      * @returns {PicoNow} Current instance
      */
-    applyTime(value, format = 'YYYY-MM-DD HH:mm:ss')
+    applyTime(value : any, format : string = 'YYYY-MM-DD HH:mm:ss') : PicoNow
     {
-        return this.apply(value, format, ['hour', 'minute', 'second']);
+        return <PicoNow> this.apply(value, format, ['hour', 'minute', 'second']);
     }
 
 }
 
-/**
- * @see PicoNow.add
- */
-PicoNowDefaultInstance.prototype.addSecond = function (value) {
+// @ts-ignore
+PicoNowDefault.prototype.addSecond = function (value : any) {
     console.warn('Now.addSecond() is deprecated, use Now.add(value, \'second\') instead.');
     return this.add(value, 'second');
 }
 
-/**
- * @see PicoNow.sub
- */
-PicoNowDefaultInstance.prototype.subSecond = function (value) {
+// @ts-ignore
+PicoNowDefault.prototype.subSecond = function (value : any) {
     console.warn('Now.subSecond() is deprecated, use Now.sub(value, \'second\') instead.');
     return this.sub(value, 'second');
 }
 
-/**
- * @see PicoNow.add
- */
-PicoNowDefaultInstance.prototype.addMinute = function (value) {
+// @ts-ignore
+PicoNowDefault.prototype.addMinute = function (value : any) {
     console.warn('Now.addMinute() is deprecated, use Now.add(value, \'minute\') instead.');
     return this.add(value, 'minute');
 }
 
-/**
- * @see PicoNow.sub
- */
-PicoNowDefaultInstance.prototype.subMinute = function (value) {
+// @ts-ignore
+PicoNowDefault.prototype.subMinute = function (value : any) {
     console.warn('Now.subMinute() is deprecated, use Now.sub(value, \'minute\') instead.');
     return this.sub(value, 'minute');
 }
 
-/**
- * @see PicoNow.add
- */
-PicoNowDefaultInstance.prototype.addHour = function (value) {
+// @ts-ignore
+PicoNowDefault.prototype.addHour = function (value : any) {
     console.warn('Now.addHour() is deprecated, use Now.add(value, \'hour\') instead.');
     return this.add(value, 'hour');
 }
 
-/**
- * @see PicoNow.sub
- */
-PicoNowDefaultInstance.prototype.subHour = function (value) {
+// @ts-ignore
+PicoNowDefault.prototype.subHour = function (value : any) {
     console.warn('Now.subHour() is deprecated, use Now.sub(value, \'hour\') instead.');
     return this.sub(value, 'hour');
 }
 
-/**
- * @see PicoNow.add
- */
-PicoNowDefaultInstance.prototype.addDates = function (value) {
+// @ts-ignore
+PicoNowDefault.prototype.addDates = function (value : any) {
     console.warn('Now.addDates() is deprecated, use Now.add(value, \'date\') instead.');
     return this.add(value, 'date');
 }
 
-/**
- * @see PicoNow.sub
- */
-PicoNowDefaultInstance.prototype.subDates = function (value) {
+// @ts-ignore
+PicoNowDefault.prototype.subDates = function (value : any) {
     console.warn('Now.subDates() is deprecated, use Now.sub(value, \'date\') instead.');
     return this.sub(value, 'date');
 }
 
-/**
- * @see PicoNow.add
- */
-PicoNowDefaultInstance.prototype.addMonths = function (value) {
+// @ts-ignore
+PicoNowDefault.prototype.addMonths = function (value : any) {
     console.warn('Now.addMonths() is deprecated, use Now.add(value, \'month\') instead.');
     return this.add(value, 'month');
 }
 
-/**
- * @see PicoNow.sub
- */
-PicoNowDefaultInstance.prototype.subMonths = function (value) {
+// @ts-ignore
+PicoNowDefault.prototype.subMonths = function (value : any) {
     console.warn('Now.subMonths() is deprecated, use Now.sub(value, \'month\') instead.');
     return this.sub(value, 'month');
 }
 
-/**
- * @see PicoNow.add
- */
-PicoNowDefaultInstance.prototype.addYears = function (value) {
+// @ts-ignore
+PicoNowDefault.prototype.addYears = function (value : any) {
     console.warn('Now.addYears() is deprecated, use Now.add(value, \'year\') instead.');
     return this.add(value, 'year');
 }
 
-/**
- * @see PicoNow.sub
- */
-PicoNowDefaultInstance.prototype.subYears = function (value) {
+// @ts-ignore
+PicoNowDefault.prototype.subYears = function (value : any) {
     console.warn('Now.subYears() is deprecated, use Now.sub(value, \'year\') instead.');
     return this.sub(value, 'year');
 }
 
-/**
- * @see PicoNow.add
- */
-PicoNowDefaultInstance.prototype.addDecades = function (value) {
+// @ts-ignore
+PicoNowDefault.prototype.addDecades = function (value : any) {
     console.warn('Now.addDecades() is deprecated, use Now.grid(10 * value, \'year\') instead.');
     return this.add(10 * value, 'year');
 }
 
-/**
- * @see PicoNow.sub
- */
-PicoNowDefaultInstance.prototype.subDecades = function (value) {
+// @ts-ignore
+PicoNowDefault.prototype.subDecades = function (value : any) {
     console.warn('Now.subDecades() is deprecated, use Now.grid(10 * value, \'year\') instead.');
     return this.sub(10 * value, 'year');
 }
 
-/**
- * @see PicoNow.day
- */
-PicoNowDefaultInstance.prototype.humanDay = function () {
+// @ts-ignore
+PicoNowDefault.prototype.humanDay = function () {
     console.warn('Now.humanDay() is deprecated, use Now.day() instead.');
     return this.day();
 }
 
-/**
- * @see PicoNow.month
- */
-PicoNowDefaultInstance.prototype.humanMonth = function () {
+// @ts-ignore
+PicoNowDefault.prototype.humanMonth = function () {
     console.warn('Now.humanMonth() is deprecated, use Now.month() instead.');
     return this.month();
 }
 
-/**
- * @param {typeof PicoNow} self
- * @returns {typeof PicoNow}
- */
-export const PicoNowDefaultPlugin = function (self) {
-
-    Obj.each(Mix.proto(PicoNowDefaultInstance), (fn, id) => {
-        self.prototype[id] = fn;
-    });
-
-    return self;
-}
+export default PicoNowDefault;

package/src/now/{NowFormat.js → NowFormat.ts}

@@ -1,7 +1,9 @@
-import { Arr, Locale, Mix, Num, Obj, Str } from "../index.esm.js";
-import { PicoNow } from "../utils/Now.js";
+import { Locale, Mix, Obj, Str } from "../index.esm.ts";
+import { PicoNow, PicoNowInterface } from "../utils/Now.ts";
+import PicoNowDefault from "./NowDefault.js";
+import PicoNowHuman from "./NowHuman.js";
 
-export const NOW_FORMAT = {
+export const NOW_FORMAT : any = {
     'L': 'DD/MM/YYYY',
     'LL': 'MMMM DD, YYYY',
     'LLL': 'MMMM DD, YYYY HH:mm',
@@ -11,7 +13,7 @@ export const NOW_FORMAT = {
     'LTSD': 'DD/MM/YYYY HH:mm:ss',
 }
 
-export const NOW_PARSE = {
+export const NOW_PARSE : any = {
     'second': 'ss',
     'minute': 'mm',
     'hour': 'HH',
@@ -20,13 +22,17 @@ export const NOW_PARSE = {
     'year': 'YYYY'
 };
 
+export interface PicoNowFormat extends PicoNowInterface,
+    PicoNowDefault, PicoNowHuman
+{
+    //
+}
+
 /**
  * @memberof PicoNow
- * @extends {PicoNow}
  */
-export class PicoNowFormatInstance
+export class PicoNowFormat
 {
-
     /**
      * Check if value matches format
      *
@@ -36,7 +42,7 @@ export class PicoNowFormatInstance
      * @param {string} [format] Date format
      * @returns {boolean} Is parsable
      */
-    isParsable(value, format = 'YYYY-MM-DD HH:mm:ss')
+    isParsable(value : string, format : string = 'YYYY-MM-DD HH:mm:ss') : boolean
     {
         for ( const key in NOW_PARSE ) {
             value = Str.replace(value, NOW_PARSE[key], format);
@@ -54,7 +60,7 @@ export class PicoNowFormatInstance
      * @param {string} [format] Input format
      * @returns {PicoNow} Current instance
      */
-    parse(value, format = 'YYYY-MM-DD HH:mm:ss')
+    parse(value : any, format : string = 'YYYY-MM-DD HH:mm:ss') : PicoNow
     {
         if ( Mix.isTime(value) ) {
             format = 'HH:mm:ss';
@@ -68,13 +74,13 @@ export class PicoNowFormatInstance
             return this.modify(value);
         }
 
-        if ( ! Mix.isIsoDate(value) ) {
+        if ( !Mix.isIsoDate(value) ) {
             return this.parseFormat(value, format);
         }
 
         this.value = new Date(value);
 
-        return this;
+        return <PicoNow> <unknown> this;
     }
 
     /**
@@ -86,17 +92,17 @@ export class PicoNowFormatInstance
      * @param {string} format Input format
      * @returns {PicoNow} Current instance
      */
-    parseFormat(value, format)
+    parseFormat(value : string, format : string) : PicoNow
     {
         if ( !this.isParsable(value, format) ) {
-            return (this.value = new Date(NaN), this);
+            return <PicoNow> <unknown> (this.value = new Date(NaN), this);
         }
 
         for ( const key in NOW_PARSE ) {
             this.set(Str.extract(value, NOW_PARSE[key], format), key);
         }
 
-        return this;
+        return <PicoNow> <unknown> this;
     }
 
     /**
@@ -107,7 +113,7 @@ export class PicoNowFormatInstance
      * @param {string} [format] Output format
      * @returns {string} Formatted string
      */
-    format(format = 'YYYY-MM-DD HH:mm:ss')
+    format(format : string = 'YYYY-MM-DD HH:mm:ss') : string
     {
         if ( Obj.has(NOW_FORMAT, format) ) {
             format = Locale.$text[format] ?? NOW_FORMAT[format];
@@ -180,22 +186,11 @@ export class PicoNowFormatInstance
      * @param {string} [format] Output format
      * @returns {number} Formatted integer
      */
-    code(format = 'X')
+    code(format : string = 'X') : number
     {
         return Mix.int(this.format(format));
     }
 
 }
 
-/**
- * @param {typeof PicoNow} self
- * @returns {typeof PicoNow}
- */
-export const PicoNowFormatPlugin = function (self) {
-
-    Obj.each(Mix.proto(PicoNowFormatInstance), (fn, id) => {
-        self.prototype[id] = fn;
-    });
-
-    return self;
-}
+export default PicoNowFormat;