@kizmann/pico-js 2.0.7 → 2.0.9

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

@@ -1,11 +1,17 @@
-import { Arr, Mix, Num, Obj, Str } from "../index.esm.js";
-import { PicoNow } from "../utils/Now.js";
+import { Arr } from "../index.esm.ts";
+import { PicoNowInterface } from "../utils/Now.ts";
+import PicoNowWalker from "./NowWalker.js";
+
+export interface PicoNowGrid extends PicoNowInterface,
+PicoNowWalker
+{
+    //
+}
 
 /**
  * @memberof PicoNow
- * @extends {PicoNow}
  */
-export class PicoNowGridInstance
+export class PicoNowGrid
 {
     /**
      * Get grid of dates by scope
@@ -13,9 +19,9 @@ export class PicoNowGridInstance
      * @example Now.grid("month") // => [Now, Now, ...]
      *
      * @param {string} [scope] Grid scope
-     * @returns {Array<PicoNow>} Array of dates
+     * @returns {Array<PicoNowInterface>} Array of dates
      */
-    grid(scope = 'day')
+    grid(scope : string = 'day') : Array<PicoNowInterface>
     {
         if ( /^seconds?$/i.test(scope) ) {
             return this.getSecondsGrid();
@@ -58,9 +64,9 @@ export class PicoNowGridInstance
      * @example Now.getSecondsGrid(10)
      *
      * @param {number} [interval] Step interval
-     * @returns {Array<PicoNow>} Array of dates
+     * @returns {Array<PicoNowInterface>} Array of dates
      */
-    getSecondsGrid(interval = 1)
+    getSecondsGrid(interval : number = 1) : Array<PicoNowInterface>
     {
         if ( interval == null ) {
             interval = 1;
@@ -77,9 +83,9 @@ export class PicoNowGridInstance
      * @example Now.getMinutesGrid(10)
      *
      * @param {number} [interval] Step interval
-     * @returns {Array<PicoNow>} Array of dates
+     * @returns {Array<PicoNowInterface>} Array of dates
      */
-    getMinutesGrid(interval = 1)
+    getMinutesGrid(interval : number = 1) : Array<PicoNowInterface>
     {
         if ( interval == null ) {
             interval = 1;
@@ -96,9 +102,9 @@ export class PicoNowGridInstance
      * @example Now.getHoursGrid(2)
      *
      * @param {number} [interval] Step interval
-     * @returns {Array<PicoNow>} Array of dates
+     * @returns {Array<PicoNowInterface>} Array of dates
      */
-    getHoursGrid(interval = 1)
+    getHoursGrid(interval : number = 1) : Array<PicoNowInterface>
     {
         if ( interval == null ) {
             interval = 1;
@@ -114,9 +120,9 @@ export class PicoNowGridInstance
      *
      * @example Now.getDaysGrid()
      *
-     * @returns {Array<PicoNow>} Array of dates
+     * @returns {Array<PicoNowInterface>} Array of dates
      */
-    getDaysGrid()
+    getDaysGrid() : Array<PicoNowInterface>
     {
         let dates = [
             this.first('date').first('day'), this.last('date').last('day')
@@ -130,9 +136,9 @@ export class PicoNowGridInstance
      *
      * @example Now.getDatesGrid()
      *
-     * @returns {Array<PicoNow>} Array of dates
+     * @returns {Array<PicoNowInterface>} Array of dates
      */
-    getDatesGrid()
+    getDatesGrid() : Array<PicoNowInterface>
     {
         let dates = [
             this.first('date'), this.last('date')
@@ -146,9 +152,9 @@ export class PicoNowGridInstance
      *
      * @example Now.getMonthsGrid()
      *
-     * @returns {Array<PicoNow>} Array of dates
+     * @returns {Array<PicoNowInterface>} Array of dates
      */
-    getMonthsGrid()
+    getMonthsGrid() : Array<PicoNowInterface>
     {
         let dates = [
             this.first('month'), this.last('month')
@@ -162,9 +168,9 @@ export class PicoNowGridInstance
      *
      * @example Now.getYearsGrid()
      *
-     * @returns {Array<PicoNow>} Array of dates
+     * @returns {Array<PicoNowInterface>} Array of dates
      */
-    getYearsGrid()
+    getYearsGrid() : Array<PicoNowInterface>
     {
         let dates = [
             this.first('year'), this.clone().last('year')
@@ -178,9 +184,9 @@ export class PicoNowGridInstance
      *
      * @example Now.getDecadesGrid()
      *
-     * @returns {Array<PicoNow>} Array of dates
+     * @returns {Array<PicoNowInterface>} Array of dates
      */
-    getDecadesGrid()
+    getDecadesGrid() : Array<PicoNowInterface>
     {
         let dates = [
             this.first('decade'), this.clone().last('decade')
@@ -191,63 +197,40 @@ export class PicoNowGridInstance
 
 }
 
-/**
- * @see PicoNow.grid
- */
-PicoNowGridInstance.prototype.getYears = function () {
+// @ts-ignore
+PicoNowGrid.prototype.getYears = function () {
     console.warn('Now.getYears() is deprecated, use Now.grid(\'years\') instead.');
     return this.grid('years');
 }
 
-/**
- * @see PicoNow.grid
- */
-PicoNowGridInstance.prototype.getMonths = function () {
+// @ts-ignore
+PicoNowGrid.prototype.getMonths = function () {
     console.warn('Now.getMonths() is deprecated, use Now.grid(\'months\') instead.');
     return this.grid('months');
 }
 
-/**
- * @see PicoNow.grid
- */
-PicoNowGridInstance.prototype.getDates = function () {
+// @ts-ignore
+PicoNowGrid.prototype.getDates = function () {
     console.warn('Now.getDates() is deprecated, use Now.grid(\'dates\') instead.');
     return this.grid('dates');
 }
 
-/**
- * @see PicoNow.grid
- */
-PicoNowGridInstance.prototype.getHours = function () {
+// @ts-ignore
+PicoNowGrid.prototype.getHours = function () {
     console.warn('Now.getHours() is deprecated, use Now.grid(\'hours\') instead.');
     return this.grid('hours');
 }
 
-/**
- * @see PicoNow.grid
- */
-PicoNowGridInstance.prototype.getMinutes = function () {
+// @ts-ignore
+PicoNowGrid.prototype.getMinutes = function () {
     console.warn('Now.getMinutes() is deprecated, use Now.grid(\'minutes\') instead.');
     return this.grid('minutes');
 }
 
-/**
- * @see PicoNow.grid
- */
-PicoNowGridInstance.prototype.getSeconds = function () {
+// @ts-ignore
+PicoNowGrid.prototype.getSeconds = function () {
     console.warn('Now.getSeconds() is deprecated, use Now.grid(\'seconds\') instead.');
     return this.grid('seconds');
 }
 
-/**
- * @param {typeof PicoNow} self
- * @returns {typeof PicoNow}
- */
-export const PicoNowGridPlugin = function (self) {
-
-    Obj.each(Mix.proto(PicoNowGridInstance), (fn, id) => {
-        self.prototype[id] = fn;
-    });
-
-    return self;
-}
+export default PicoNowGrid;

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

@@ -1,7 +1,8 @@
-import { Arr, Locale, Mix, Num, Obj, Str } from "../index.esm.js";
-import { PicoNow } from "../utils/Now.js";
+import { Locale } from "../index.esm.ts";
+import { PicoNowInterface } from "../utils/Now.ts";
+import PicoNowDefault from "./NowDefault.js";
 
-export const NOW_HUMAN_DAYS = [
+export const NOW_HUMAN_DAYS : string[] = [
     'Sunday',
     'Monday',
     'Tuesday',
@@ -11,7 +12,7 @@ export const NOW_HUMAN_DAYS = [
     'Saturday'
 ];
 
-export const NOW_HUMAN_MONTHS = [
+export const NOW_HUMAN_MONTHS : string[] = [
     'January',
     'February',
     'March',
@@ -26,11 +27,12 @@ export const NOW_HUMAN_MONTHS = [
     'December'
 ];
 
-/**
- * @memberof PicoNow
- * @extends {PicoNow}
- */
-export class PicoNowHumanInstance
+export interface PicoNowHuman extends PicoNowInterface, PicoNowDefault
+{
+    //
+}
+
+export class PicoNowHuman
 {
     /**
      * Get human readable value
@@ -39,9 +41,9 @@ export class PicoNowHumanInstance
      *
      * @param {string} [scope] Value scope
      * @param {number} [substr] Substring length
-     * @returns {string|number} Human value
+     * @returns {any} Human value
      */
-    human(scope = 'day', substr = null)
+    human(scope : string = 'day', substr : number = null) : any
     {
         if ( /^days?$/i.test(scope) ) {
             return this.getHumanDay(substr);
@@ -62,11 +64,11 @@ export class PicoNowHumanInstance
      * @param {number} [substr] Substring length
      * @returns {string} Day name
      */
-    getHumanDay(substr = null)
+    getHumanDay(substr : number = null) : string
     {
         let day = this.day() - 1;
 
-        if ( ! NOW_HUMAN_DAYS[day] ) {
+        if ( !NOW_HUMAN_DAYS[day] ) {
             throw new Error(`Invalid day number "${day}".`);
         }
 
@@ -87,11 +89,11 @@ export class PicoNowHumanInstance
      * @param {number} [substr] Substring length
      * @returns {string} Month name
      */
-    getHumanMonth(substr = null)
+    getHumanMonth(substr : number = null) : string
     {
         let month = this.day() - 1;
 
-        if ( ! NOW_HUMAN_MONTHS[month] ) {
+        if ( !NOW_HUMAN_MONTHS[month] ) {
             throw new Error(`Invalid month number "${month}".`);
         }
 
@@ -106,15 +108,4 @@ export class PicoNowHumanInstance
 
 }
 
-/**
- * @param {typeof PicoNow} self
- * @returns {typeof PicoNow}
- */
-export const PicoNowHumanPlugin = function (self) {
-
-    Obj.each(Mix.proto(PicoNowHumanInstance), (fn, id) => {
-        self.prototype[id] = fn;
-    });
-
-    return self;
-}
+export default PicoNowHuman;

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

@@ -1,13 +1,18 @@
-import { Mix, Now, Obj } from "../index.esm.js";
-import { PicoNow } from "../utils/Now.js";
+import { Mix, Now, Obj } from "../index.esm.ts";
+import { PicoNow, PicoNowInterface } from "../utils/Now.ts";
+import PicoNowFormat from "./NowFormat.js";
+
+export interface PicoNowMatch extends PicoNowInterface,
+    PicoNowFormat
+{
+    //
+}
 
 /**
  * @memberof PicoNow
- * @extends {PicoNow}
  */
-export class PicoNowMatchInstance
+export class PicoNowMatch
 {
-
     /**
      * Check if date is before value
      *
@@ -17,7 +22,7 @@ export class PicoNowMatchInstance
      * @param {string} [format] Compare format
      * @returns {boolean} True if before
      */
-    before(value = null, format = 'x')
+    before(value : any = null, format : string = 'x') : boolean
     {
         return this.code(format) < Now.make(value).code(format);
     }
@@ -31,7 +36,7 @@ export class PicoNowMatchInstance
      * @param {string} [format] Compare format
      * @returns {boolean} True if before
      */
-    beforeDate(value = null, format = 'YYYYMMDD')
+    beforeDate(value : any = null, format : string = 'YYYYMMDD') : boolean
     {
         return this.before(value, format);
     }
@@ -45,7 +50,7 @@ export class PicoNowMatchInstance
      * @param {string} [format] Compare format
      * @returns {boolean} True if before
      */
-    beforeTime(value = null, format = 'HHmmss')
+    beforeTime(value : any = null, format : string = 'HHmmss') : boolean
     {
         return this.before(value, format);
     }
@@ -59,7 +64,7 @@ export class PicoNowMatchInstance
      * @param {string} [format] Compare format
      * @returns {boolean} True if after
      */
-    after(value = null, format = 'x')
+    after(value : any = null, format : string = 'x') : boolean
     {
         return this.code(format) > Now.make(value).code(format);
     }
@@ -73,7 +78,7 @@ export class PicoNowMatchInstance
      * @param {string} [format] Compare format
      * @returns {boolean} True if after
      */
-    afterDate(value = null, format = 'YYYYMMDD')
+    afterDate(value : any = null, format : string = 'YYYYMMDD') : boolean
     {
         return this.after(value, format);
     }
@@ -87,7 +92,7 @@ export class PicoNowMatchInstance
      * @param {string} [format] Compare format
      * @returns {boolean} True if after
      */
-    afterTime(value = null, format = 'HHmmss')
+    afterTime(value : any = null, format : string = 'HHmmss') : boolean
     {
         return this.after(value, format);
     }
@@ -101,9 +106,9 @@ export class PicoNowMatchInstance
      * @param {string} [format] Compare format
      * @returns {boolean} True if equal
      */
-    equal(value = null, format = 'x')
+    equal(value : any = null, format : string = 'x') : boolean
     {
-        if ( ! (value instanceof Now) ) {
+        if ( !(value instanceof Now) ) {
             value = Now.make(value);
         }
 
@@ -119,7 +124,7 @@ export class PicoNowMatchInstance
      * @param {string} [format] Compare format
      * @returns {boolean} True if equal
      */
-    equalDate(value = null, format = 'YYYYMMDD')
+    equalDate(value : any = null, format : string = 'YYYYMMDD') : boolean
     {
         return this.equal(value, format);
     }
@@ -133,7 +138,7 @@ export class PicoNowMatchInstance
      * @param {string} [format] Compare format
      * @returns {boolean} True if equal
      */
-    equalTime(value = null, format = 'HHmmss')
+    equalTime(value : any = null, format : string = 'HHmmss') : boolean
     {
         return this.equal(value, format);
     }
@@ -148,7 +153,7 @@ export class PicoNowMatchInstance
      * @param {string} [format] Compare format
      * @returns {boolean} True if between
      */
-    between(start = null, end = null, format = 'YYYYMMDD')
+    between(start : any = null, end : any = null, format : string = 'YYYYMMDD') : boolean
     {
         let dates = [
             Now.make(start), Now.make(end)
@@ -163,15 +168,4 @@ export class PicoNowMatchInstance
 
 }
 
-/**
- * @param {typeof PicoNow} self
- * @returns {typeof PicoNow}
- */
-export const PicoNowMatchPlugin = function (self) {
-
-    Obj.each(Mix.proto(PicoNowMatchInstance), (fn, id) => {
-        self.prototype[id] = fn;
-    });
-
-    return self;
-}
+export default PicoNowMatch;

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

@@ -1,11 +1,15 @@
-import { Mix, Now, Obj, Arr } from "../index.esm.js";
-import { PicoNow } from "../utils/Now.js";
+import { Now, Arr } from "../index.esm.ts";
+import { PicoNow, PicoNowInterface } from "../utils/Now.ts";
+
+export interface PicoNowRange extends PicoNowInterface
+{
+    //
+}
 
 /**
  * @memberof PicoNow
- * @extends {PicoNow}
  */
-export class PicoNowRangeInstance
+export class PicoNowRange
 {
 
     /**
@@ -17,7 +21,7 @@ export class PicoNowRangeInstance
      * @param {string} [scope] Range scope
      * @returns {Array<PicoNow>} Array of dates
      */
-    range(value = null, scope = 'date')
+    range(value:any = null, scope:string = 'date'):Array<PicoNow>
     {
         let format = 'YYYYMMDD';
 
@@ -50,23 +54,10 @@ export class PicoNowRangeInstance
 
 }
 
-/**
- * @see PicoNow.range
- */
-PicoNowRangeInstance.prototype.getDatesRange = function (...args) {
-    console.warn('NowRange.getDatesRange() is deprecated, use NowRange.range() instead.');
+// @ts-ignore
+PicoNowRange.prototype.getDatesRange = function (...args:Parameters<typeof PicoNowRange.range>) {
+    console.warn('Now.getDatesRange() is deprecated, use Now.range() instead.');
     return this.range(...args);
 }
 
-/**
- * @param {typeof PicoNow} self
- * @returns {typeof PicoNow}
- */
-export const PicoNowRangePlugin = function (self) {
-
-    Obj.each(Mix.proto(PicoNowRangeInstance), (fn, id) => {
-        self.prototype[id] = fn;
-    });
-
-    return self;
-}
+export default PicoNowRange;