mybase 1.1.39 → 1.1.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mybase",
-  "version": "1.1.39",
+  "version": "1.1.40",
   "description": "",
   "main": "mybase.js",
   "scripts": {

package/ts/models/Unixtime.d.ts

@@ -24,7 +24,16 @@ export declare class Unixtime {
     addYears(years?: number): Unixtime;
     yyyymmdd(): string;
     yyymmddhh(): string;
+    /**
+    @deprecated use 'day' instead
+    */
     getDay(): number;
+    get day(): number;
+    get month(): number;
+    get year(): number;
+    get hours(): number;
+    get minutes(): number;
+    get seconds(): number;
     static from(value: Date | string | number): Unixtime;
     toShortUnixtime(): number;
     toLongUnixtime(): number;
@@ -33,5 +42,6 @@ export declare class Unixtime {
     elapsedSeconds(): number;
     elapsedMinutes(): number;
     clone(): Unixtime;
+    static fromYYYYMMDD(value: string): Unixtime;
     static try(value: Date | string | number): Unixtime | null;
 }

package/ts/models/Unixtime.js

@@ -80,34 +80,41 @@ class Unixtime {
         return this;
     }
     addMonths(months = 1) {
-        this.value.setMonth(this.value.getMonth() + months);
+        this.value.setUTCMonth(this.value.getMonth() + months);
         return this;
     }
     addYears(years = 1) {
-        this.value.setFullYear(this.value.getFullYear() + years);
+        this.value.setUTCFullYear(this.year + years);
         return this;
     }
     yyyymmdd() {
-        let mm = this.value.getMonth() + 1;
-        let dd = this.value.getDate();
+        let mm = this.month;
+        let dd = this.day;
         return [this.value.getFullYear(),
             (mm > 9 ? '' : '0') + mm,
             (dd > 9 ? '' : '0') + dd
         ].join('');
     }
     yyymmddhh() {
-        let mm = this.value.getMonth() + 1;
-        let dd = this.value.getDate();
-        let hh = this.value.getHours();
-        return [this.value.getFullYear(),
+        let mm = this.month;
+        let dd = this.day;
+        let hh = this.hours;
+        return [this.year,
             (mm > 9 ? '' : '0') + mm,
             (dd > 9 ? '' : '0') + dd,
             (hh > 9 ? '' : '0') + hh
         ].join('');
     }
-    getDay() {
-        return this.value.getDay();
-    }
+    /**
+    @deprecated use 'day' instead
+    */
+    getDay() { return this.value.getUTCDay(); }
+    get day() { return this.value.getUTCDate(); }
+    get month() { return this.value.getUTCMonth() + 1; }
+    get year() { return this.value.getUTCFullYear(); }
+    get hours() { return this.value.getUTCHours(); }
+    get minutes() { return this.value.getUTCMinutes(); }
+    get seconds() { return this.value.getUTCSeconds(); }
     static from(value) {
         return new Unixtime(value);
     }
@@ -132,6 +139,20 @@ class Unixtime {
     clone() {
         return new Unixtime(this.toLongUnixtime());
     }
+    static fromYYYYMMDD(value) {
+        if (value.length != 8)
+            throw new Error('Invalid yyyymmdd value');
+        let year = parseInt(value.substring(0, 4));
+        let month = parseInt(value.substring(4, 6)) - 1;
+        let day = parseInt(value.substring(6, 8));
+        if (isNaN(year) || isNaN(month) || isNaN(day))
+            throw new Error('Invalid yyyymmdd value');
+        if (month < 0 || month > 11)
+            throw new Error('Invalid month');
+        if (day < 1 || day > 31)
+            throw new Error('Invalid day');
+        return new Unixtime(new Date(Date.UTC(year, month, day)));
+    }
     static try(value) {
         try {
             return new Unixtime(value);

package/ts/models/Unixtime.test.ts

@@ -106,4 +106,28 @@ describe('Unixtime', () => {
     expect(unixtime1).not.toBe(unixtime0);
     expect(unixtime0.toDate()).toEqual(unixtime1.toDate());
   });
+
+
+  it('day,month,year should return correct values', () => {
+    const unixtime = new Unixtime("2024-10-11T12:13:14Z");
+    expect(unixtime.day).toEqual(11);
+    expect(unixtime.month).toEqual(10);
+    expect(unixtime.year).toEqual(2024);
+    expect(unixtime.minutes).toEqual(13);
+    expect(unixtime.seconds).toEqual(14);
+    expect(unixtime.hours).toEqual(12);
+  })
+
+  it('fromYYYYMMDD should create Unixtime object from string', () => {
+    const unixtime = Unixtime.fromYYYYMMDD('20241011');
+    expect(unixtime.toISOString()).toEqual('2024-10-11T00:00:00.000Z');
+  })
+
+  it('fromYYYYMMDD should throw error when invalid date', () => {
+    expect(() => Unixtime.fromYYYYMMDD('20243131')).toThrow('Invalid month');
+    expect(() => Unixtime.fromYYYYMMDD('20241233')).toThrow('Invalid day');
+    expect(() => Unixtime.fromYYYYMMDD('xx')).toThrow('Invalid yyyymmdd value');
+    //@ts-ignore
+    expect(() => Unixtime.fromYYYYMMDD([])).toThrow('Invalid yyyymmdd value');
+  })
 });

package/ts/models/Unixtime.ts

@@ -98,18 +98,18 @@ export class Unixtime {
     }
 
     public addMonths(months: number = 1): Unixtime {
-        this.value.setMonth(this.value.getMonth() + months)
+        this.value.setUTCMonth(this.value.getMonth() + months)
         return this
     }
 
     public addYears(years: number = 1): Unixtime {
-        this.value.setFullYear(this.value.getFullYear() + years)
+        this.value.setUTCFullYear(this.year + years)
         return this
     }
 
     public yyyymmdd(): string {
-        let mm = this.value.getMonth() + 1
-        let dd = this.value.getDate()
+        let mm = this.month
+        let dd = this.day
         return [this.value.getFullYear(),
         (mm > 9 ? '' : '0') + mm,
         (dd > 9 ? '' : '0') + dd
@@ -117,20 +117,27 @@ export class Unixtime {
     }
 
     public yyymmddhh(): string {
-        let mm = this.value.getMonth() + 1
-        let dd = this.value.getDate()
-        let hh = this.value.getHours()
-        return [this.value.getFullYear(),
+        let mm = this.month
+        let dd = this.day
+        let hh = this.hours
+        return [this.year,
         (mm > 9 ? '' : '0') + mm,
         (dd > 9 ? '' : '0') + dd,
         (hh > 9 ? '' : '0') + hh
         ].join('')
     }
 
+    /**
+    @deprecated use 'day' instead
+    */
+    public getDay() : number {return this.value.getUTCDay()}
 
-    public getDay() : number {
-        return this.value.getDay()
-    }
+    get day(): number {  return this.value.getUTCDate() }
+    get month(): number { return this.value.getUTCMonth() + 1 }
+    get year(): number { return this.value.getUTCFullYear() }
+    get hours(): number { return this.value.getUTCHours() }
+    get minutes(): number { return this.value.getUTCMinutes() }
+    get seconds(): number { return this.value.getUTCSeconds() }
 
     static from(value: Date | string | number) {
         return new Unixtime(value)
@@ -165,6 +172,17 @@ export class Unixtime {
     }
 
 
+    static fromYYYYMMDD(value: string): Unixtime {
+        if (value.length != 8) throw new Error('Invalid yyyymmdd value')
+        let year = parseInt(value.substring(0, 4))
+        let month = parseInt(value.substring(4, 6)) - 1
+        let day = parseInt(value.substring(6, 8))
+        if (isNaN(year) || isNaN(month) || isNaN(day)) throw new Error('Invalid yyyymmdd value')
+        if (month < 0 || month > 11) throw new Error('Invalid month')
+        if (day < 1 || day > 31) throw new Error('Invalid day')
+        return new Unixtime(new Date(Date.UTC(year, month, day)))
+    }
+
     static try(value: Date | string | number): Unixtime | null {
         try {
             return new Unixtime(value)