mybase 1.1.36 → 1.1.38

package/package.json

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

package/ts/index.ts

@@ -31,3 +31,5 @@ export * from "./funcs/ensureFolder"
 export * from "./models/Unixtime"
 export * from "./models/Timespan"
 export * from "./models/IPAddress"
+
+

package/ts/models/Timespan.d.ts

@@ -15,4 +15,8 @@ export declare class Timespan {
     static days(days: number): Timespan;
     static weeks(weeks: number): Timespan;
     static months(months: number): Timespan;
+    toJSON(): {
+        __type: string;
+        value: number;
+    };
 }

package/ts/models/Timespan.js

@@ -47,6 +47,12 @@ class Timespan {
     static months(months) {
         return new Timespan(months * 30 * 24 * 60 * 60 * 1000);
     }
+    toJSON() {
+        return {
+            __type: 'Timespan',
+            value: this.ms
+        };
+    }
 }
 exports.Timespan = Timespan;
 //# sourceMappingURL=Timespan.js.map

package/ts/models/Timespan.ts

@@ -59,5 +59,10 @@ export class Timespan {
     }
 
 
-    
+    toJSON() {
+        return {
+            __type:'Timespan',
+            value:this.ms
+        }
+    }
 }

package/ts/models/Unixtime.d.ts

@@ -8,6 +8,10 @@ export declare class Unixtime {
     isEmpty(): boolean;
     lessThan(other: Unixtime): boolean;
     get elapsed(): Timespan;
+    toJSON(): {
+        __type: string;
+        value: number;
+    };
     constructor(value: Date | string | number);
     addTimespan(timespan: Timespan): Unixtime;
     subtractTimespan(timespan: Timespan): Unixtime;
@@ -28,5 +32,6 @@ export declare class Unixtime {
     toISOString(): string;
     elapsedSeconds(): number;
     elapsedMinutes(): number;
+    clone(): Unixtime;
     static try(value: Date | string | number): Unixtime | null;
 }

package/ts/models/Unixtime.js

@@ -22,6 +22,12 @@ class Unixtime {
     get elapsed() {
         return new Timespan_1.Timespan(Date.now() - this.toLongUnixtime());
     }
+    toJSON() {
+        return {
+            __type: 'Unixtime',
+            value: this.toLongUnixtime()
+        };
+    }
     constructor(value) {
         if (typeof value === 'string') {
             this.value = new Date(value);
@@ -123,6 +129,9 @@ class Unixtime {
     elapsedMinutes() {
         return Math.round(this.elapsedSeconds() / 60);
     }
+    clone() {
+        return new Unixtime(this.toLongUnixtime());
+    }
     static try(value) {
         try {
             return new Unixtime(value);

package/ts/models/Unixtime.test.ts

@@ -99,4 +99,11 @@ describe('Unixtime', () => {
     const addedUnixtime = unixtime.addYears(1);
     expect(addedUnixtime.toDate()).toEqual(new Date(date.setFullYear(date.getFullYear() + 1)));
   });
+
+  it('clone should create brand new object', () => {
+    const unixtime0 = new Unixtime(new Date())
+    const unixtime1 = unixtime0.clone();
+    expect(unixtime1).not.toBe(unixtime0);
+    expect(unixtime0.toDate()).toEqual(unixtime1.toDate());
+  });
 });

package/ts/models/Unixtime.ts

@@ -31,6 +31,13 @@ export class Unixtime {
         return new Timespan(Date.now() - this.toLongUnixtime())
     }
 
+    toJSON() {
+        return {
+            __type:'Unixtime',
+            value:this.toLongUnixtime()
+        }
+    }
+
 
     constructor(value: Date | string | number) {
         if (typeof value === 'string') {
@@ -153,6 +160,10 @@ export class Unixtime {
         return Math.round(this.elapsedSeconds() / 60)
     }
 
+    clone():Unixtime {
+        return new Unixtime(this.toLongUnixtime())
+    }
+
 
     static try(value: Date | string | number): Unixtime | null {
         try {