mybase 1.1.21 → 1.1.23

package/package.json

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

package/ts/funcs/getWeekNumber.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getWeekNumber = void 0;
+// credit: https://stackoverflow.com/questions/6117814/get-week-of-year-in-javascript-like-in-php
+/* For a given date, get the ISO week number
+ 
+  Based on information at:
+ 
+     THIS PAGE (DOMAIN EVEN) DOESN'T EXIST ANYMORE UNFORTUNATELY
+     http://www.merlyn.demon.co.uk/weekcalc.htm#WNR
+ 
+  Algorithm is to find nearest thursday, it's year
+  is the year of the week number. Then get weeks
+  between that date and the first day of that year.
+ 
+  Note that dates in one year can be weeks of previous
+  or next year, overlap is up to 3 days.
+ 
+  e.g. 2014/12/29 is Monday in week  1 of 2015
+       2012/1/1   is Sunday in week 52 of 2011
+*/
+function getWeekNumber(d = new Date()) {
+    // Copy date so don't modify original
+    const date = new Date(Date.UTC(d.getFullYear(), d.getMonth(), d.getDate()));
+    // Set to nearest Thursday: current date + 4 - current day number
+    // Make Sunday's day number 7
+    date.setUTCDate(date.getUTCDate() + 4 - (date.getUTCDay() || 7));
+    // Get first day of year
+    const yearStart = new Date(Date.UTC(date.getUTCFullYear(), 0, 1));
+    // Calculate full weeks to nearest Thursday
+    const weekNo = Math.ceil(((date.getTime() - yearStart.getTime()) / 86400000 + 1) / 7);
+    // Return the week number
+    return weekNo;
+}
+exports.getWeekNumber = getWeekNumber;
+//# sourceMappingURL=getWeekNumber.js.map

package/ts/funcs/getWeekNumber.test.ts

@@ -0,0 +1,9 @@
+import { getWeekNumber } from './getWeekNumber'
+
+
+describe('getWeekNumber', () => {
+    it('should return the correct week number', () => {
+        expect(getWeekNumber(new Date('2012-01-01'))).toBe(52)
+        expect(getWeekNumber(new Date('2014-12-30'))).toBe(1)
+    })  
+})

package/ts/funcs/getWeekNumber.ts

@@ -0,0 +1,31 @@
+// credit: https://stackoverflow.com/questions/6117814/get-week-of-year-in-javascript-like-in-php
+/* For a given date, get the ISO week number
+ 
+  Based on information at:
+ 
+     THIS PAGE (DOMAIN EVEN) DOESN'T EXIST ANYMORE UNFORTUNATELY
+     http://www.merlyn.demon.co.uk/weekcalc.htm#WNR
+ 
+  Algorithm is to find nearest thursday, it's year
+  is the year of the week number. Then get weeks
+  between that date and the first day of that year.
+ 
+  Note that dates in one year can be weeks of previous
+  or next year, overlap is up to 3 days.
+ 
+  e.g. 2014/12/29 is Monday in week  1 of 2015
+       2012/1/1   is Sunday in week 52 of 2011
+*/
+export function getWeekNumber(d: Date = new Date()): number {
+    // Copy date so don't modify original
+    const date = new Date(Date.UTC(d.getFullYear(), d.getMonth(), d.getDate()));
+    // Set to nearest Thursday: current date + 4 - current day number
+    // Make Sunday's day number 7
+    date.setUTCDate(date.getUTCDate() + 4 - (date.getUTCDay() || 7));
+    // Get first day of year
+    const yearStart = new Date(Date.UTC(date.getUTCFullYear(), 0, 1));
+    // Calculate full weeks to nearest Thursday
+    const weekNo = Math.ceil(((date.getTime() - yearStart.getTime()) / 86400000 + 1) / 7);
+    // Return the week number
+    return weekNo;
+}

package/ts/index.js

@@ -14,6 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./funcs/getWeekNumber"), exports);
 __exportStar(require("./funcs/Geoip2Paths"), exports);
 __exportStar(require("./funcs/isLocal"), exports);
 __exportStar(require("./funcs/randomString"), exports);

package/ts/index.ts

@@ -1,3 +1,4 @@
+export * from "./funcs/getWeekNumber"
 export * from "./funcs/Geoip2Paths";
 export * from "./funcs/isLocal"
 export * from "./funcs/randomString"

package/ts/models/Timespan.ts

@@ -1,6 +1,3 @@
-
-
-
 export class Timespan {
     constructor(private readonly ms: number){
     }

package/ts/models/Unixtime.js

@@ -35,9 +35,15 @@ class Unixtime {
             // set the value
             this.value = new Date(value);
         }
-        else {
+        else if (value instanceof Date) {
             this.value = value;
         }
+        else {
+            throw new Error('Invalid value');
+        }
+        if (isNaN(this.value.getTime())) {
+            throw new Error('Invalid date');
+        }
     }
     addTimespan(timespan) {
         this.value = new Date(this.value.getTime() + timespan.miliseconds);
@@ -93,6 +99,9 @@ class Unixtime {
             (hh > 9 ? '' : '0') + hh
         ].join('');
     }
+    getDay() {
+        return this.value.getDay();
+    }
     static from(value) {
         return new Unixtime(value);
     }
@@ -114,6 +123,14 @@ class Unixtime {
     elapsedMinutes() {
         return Math.round(this.elapsedSeconds() / 60);
     }
+    static try(value) {
+        try {
+            return new Unixtime(value);
+        }
+        catch (e) {
+            return null;
+        }
+    }
 }
 exports.Unixtime = Unixtime;
 Unixtime.EMPTY = new Unixtime(new Date(0));

package/ts/models/Unixtime.test.ts

@@ -7,6 +7,10 @@ describe('Unixtime', () => {
     expect(unixtime.toDate()).toEqual(date);
   });
 
+  it('create invalid date should throw error', () => {
+    expect(() => new Unixtime('invalid date')).toThrow();
+  })
+
   it('should create Unixtime object from string', () => {
     const dateString = '2022-01-01T00:00:00Z';
     const date = new Date(dateString);

package/ts/models/Unixtime.ts

@@ -42,8 +42,16 @@ export class Unixtime {
                 value = Math.round(value)
             // set the value
             this.value = new Date(value)
-        } else {
+        }
+        else if (value instanceof Date) {
             this.value = value
+        } 
+        else {
+            throw new Error('Invalid value')
+        }
+
+        if (isNaN(this.value.getTime())) {
+            throw new Error('Invalid date')
         }
     }
 
@@ -113,6 +121,10 @@ export class Unixtime {
     }
 
 
+    public getDay() : number {
+        return this.value.getDay()
+    }
+
     static from(value: Date | string | number) {
         return new Unixtime(value)
     }
@@ -141,4 +153,12 @@ export class Unixtime {
         return Math.round(this.elapsedSeconds() / 60)
     }
 
+
+    static try(value: Date | string | number): Unixtime | null {
+        try {
+            return new Unixtime(value)
+        } catch (e) {
+            return null
+        }
+    }
 }