1.0.7

dist/index.d.ts

@@ -1,2 +1,3 @@
 export * from './smarttime.classes.hrtmeasurement';
 export * from './smarttime.classes.timestamp';
+export * from './smarttime.units';

dist/index.js

@@ -5,4 +5,5 @@ function __export(m) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("./smarttime.classes.hrtmeasurement"));
 __export(require("./smarttime.classes.timestamp"));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUVBLHdEQUFrRDtBQUNsRCxtREFBNkMifQ==
+__export(require("./smarttime.units"));
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUVBLHdEQUFrRDtBQUNsRCxtREFBNkM7QUFDN0MsdUNBQWlDIn0=

dist/smarttime.classes.timestamp.d.ts

@@ -8,15 +8,32 @@ export declare class TimeStamp {
      */
     date: Date;
     /**
-     * The time as linux time
+     * The time as linux time (milliseconds, not seconds though)
      * good for comparison
      */
-    linuxtime: number;
+    milliSeconds: number;
-    constructor(creatorArg?: number | TimeStamp);
+    /**
+     * The standard epoch time in seconds
+     */
+    epochtime: number;
+    /**
+     * if derived from another TimeStamp points out the change in milliseconds
+     */
+    change: number;
+    constructor(creatorArg?: number);
+    /**
+     * returns new TimeStamp from milliseconds
+     */
+    static fromMilliSeconds(milliSecondsArg: any): TimeStamp;
+    /**
+     * returns new TimeStamp for now with change set
+     * @param timeStampArg
+     */
+    static fromTimeStamp(timeStampArg: TimeStamp): TimeStamp;
     /**
      * Is the current instance older than the argument
      * @param TimeStampArg
      */
-    isOlderThan(TimeStampArg: TimeStamp): boolean;
+    isOlderThan(TimeStampArg: TimeStamp, tresholdTimeArg?: number): boolean;
-    isYoungerThan(TimeStampArg: TimeStamp): boolean;
+    isYoungerThan(TimeStampArg: TimeStamp, tresholdTimeArg?: number): boolean;
 }

dist/smarttime.classes.timestamp.js

@@ -6,25 +6,48 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 class TimeStamp {
     constructor(creatorArg) {
+        /**
+         * if derived from another TimeStamp points out the change in milliseconds
+         */
+        this.change = null;
         if (!creatorArg) {
             this.date = new Date();
-            this.linuxtime = this.date.getTime();
         }
+        else if (typeof creatorArg === 'number') {
+            this.date = new Date(creatorArg);
+        }
+        this.milliSeconds = this.date.getTime();
+        this.epochtime = Math.floor(this.milliSeconds / 1000);
+    }
+    /**
+     * returns new TimeStamp from milliseconds
+     */
+    static fromMilliSeconds(milliSecondsArg) {
+        return new TimeStamp(milliSecondsArg);
+    }
+    /**
+     * returns new TimeStamp for now with change set
+     * @param timeStampArg
+     */
+    static fromTimeStamp(timeStampArg) {
+        let localTimeStamp = new TimeStamp();
+        localTimeStamp.change = localTimeStamp.milliSeconds - timeStampArg.milliSeconds;
+        return localTimeStamp;
     }
     /**
      * Is the current instance older than the argument
      * @param TimeStampArg
      */
-    isOlderThan(TimeStampArg) {
+    isOlderThan(TimeStampArg, tresholdTimeArg = 0) {
-        if (this.linuxtime < TimeStampArg.linuxtime) {
+        if ((this.milliSeconds + tresholdTimeArg) < TimeStampArg.milliSeconds) {
             return true;
         }
         else {
             return false;
         }
     }
-    isYoungerThan(TimeStampArg) {
+    isYoungerThan(TimeStampArg, tresholdTimeArg = 0) {
-        if (this.linuxtime > TimeStampArg.linuxtime) {
+        if (this.milliSeconds > (TimeStampArg.milliSeconds + tresholdTimeArg)) {
             return true;
         }
         else {
@@ -33,4 +56,4 @@ class TimeStamp {
     }
 }
 exports.TimeStamp = TimeStamp;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnR0aW1lLmNsYXNzZXMudGltZXN0YW1wLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnR0aW1lLmNsYXNzZXMudGltZXN0YW1wLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBRUE7OztHQUdHO0FBQ0g7SUFXRSxZQUFhLFVBQStCO1FBQzFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztZQUNoQixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksSUFBSSxFQUFFLENBQUE7WUFDdEIsSUFBSSxDQUFDLFNBQVMsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFBO1FBQ3RDLENBQUM7SUFDSCxDQUFDO0lBRUQ7OztPQUdHO0lBQ0gsV0FBVyxDQUFFLFlBQXVCO1FBQ2xDLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxTQUFTLEdBQUcsWUFBWSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUM7WUFDNUMsTUFBTSxDQUFDLElBQUksQ0FBQTtRQUNiLENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNOLE1BQU0sQ0FBQyxLQUFLLENBQUE7UUFDZCxDQUFDO0lBQ0gsQ0FBQztJQUVELGFBQWEsQ0FBRSxZQUF1QjtRQUNwQyxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsU0FBUyxHQUFHLFlBQVksQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDO1lBQzVDLE1BQU0sQ0FBQyxJQUFJLENBQUE7UUFDYixDQUFDO1FBQUMsSUFBSSxDQUFDLENBQUM7WUFDTixNQUFNLENBQUMsS0FBSyxDQUFBO1FBQ2QsQ0FBQztJQUNILENBQUM7Q0FDRjtBQXJDRCw4QkFxQ0MifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnR0aW1lLmNsYXNzZXMudGltZXN0YW1wLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnR0aW1lLmNsYXNzZXMudGltZXN0YW1wLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBRUE7OztHQUdHO0FBQ0g7SUFzQkUsWUFBYSxVQUFtQjtRQUxoQzs7V0FFRztRQUNILFdBQU0sR0FBVyxJQUFJLENBQUE7UUFHbkIsRUFBRSxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO1lBQ2hCLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxJQUFJLEVBQUUsQ0FBQTtRQUN4QixDQUFDO1FBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLE9BQU8sVUFBVSxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUM7WUFDMUMsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQTtRQUNsQyxDQUFDO1FBQ0QsSUFBSSxDQUFDLFlBQVksR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFBO1FBQ3ZDLElBQUksQ0FBQyxTQUFTLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsWUFBWSxHQUFHLElBQUksQ0FBQyxDQUFBO0lBQ3ZELENBQUM7SUFFRDs7T0FFRztJQUNILE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBRSxlQUFlO1FBQ3RDLE1BQU0sQ0FBQyxJQUFJLFNBQVMsQ0FBQyxlQUFlLENBQUMsQ0FBQTtJQUN2QyxDQUFDO0lBRUQ7OztPQUdHO0lBQ0gsTUFBTSxDQUFDLGFBQWEsQ0FBRSxZQUF1QjtRQUMzQyxJQUFJLGNBQWMsR0FBRyxJQUFJLFNBQVMsRUFBRSxDQUFBO1FBQ3BDLGNBQWMsQ0FBQyxNQUFNLEdBQUcsY0FBYyxDQUFDLFlBQVksR0FBRyxZQUFZLENBQUMsWUFBWSxDQUFBO1FBQy9FLE1BQU0sQ0FBQyxjQUFjLENBQUE7SUFDdkIsQ0FBQztJQUVEOzs7T0FHRztJQUNILFdBQVcsQ0FBRSxZQUF1QixFQUFFLGtCQUEwQixDQUFDO1FBQy9ELEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLFlBQVksR0FBRyxlQUFlLENBQUMsR0FBRyxZQUFZLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQztZQUN0RSxNQUFNLENBQUMsSUFBSSxDQUFBO1FBQ2IsQ0FBQztRQUFDLElBQUksQ0FBQyxDQUFDO1lBQ04sTUFBTSxDQUFDLEtBQUssQ0FBQTtRQUNkLENBQUM7SUFDSCxDQUFDO0lBRUQsYUFBYSxDQUFFLFlBQXVCLEVBQUUsa0JBQTBCLENBQUM7UUFDakUsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLFlBQVksR0FBRyxDQUFDLFlBQVksQ0FBQyxZQUFZLEdBQUcsZUFBZSxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ3RFLE1BQU0sQ0FBQyxJQUFJLENBQUE7UUFDYixDQUFDO1FBQUMsSUFBSSxDQUFDLENBQUM7WUFDTixNQUFNLENBQUMsS0FBSyxDQUFBO1FBQ2QsQ0FBQztJQUNILENBQUM7Q0FDRjtBQXBFRCw4QkFvRUMifQ==

dist/smarttime.units.d.ts

@@ -0,0 +1,17 @@
+export declare let units: {
+    years: (timesArg?: number) => number;
+    months: (timesArg?: number) => number;
+    weeks: (timesArg?: number) => number;
+    days: (timesArg?: number) => number;
+    hours: (timesArg?: number) => number;
+    minutes: (timesArg?: number) => number;
+};
+export interface IUnitCombinationArg {
+    years?: number;
+    months?: number;
+    weeks?: number;
+    days?: number;
+    hours?: number;
+    minutes?: number;
+}
+export declare let getMilliSecondsFromUnits: (combinationArg: IUnitCombinationArg) => number;

dist/smarttime.units.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.units = {
+    years: (timesArg = 1) => {
+        return timesArg * 3154e+10;
+    },
+    months: (timesArg = 1) => {
+        return timesArg * 2628e+9;
+    },
+    weeks: (timesArg = 1) => {
+        return timesArg * 6048e+8;
+    },
+    days: (timesArg = 1) => {
+        return timesArg * 864e+7;
+    },
+    hours: (timesArg = 1) => {
+        return timesArg * 36e+6;
+    },
+    minutes: (timesArg = 1) => {
+        return timesArg * 60000;
+    }
+};
+exports.getMilliSecondsFromUnits = (combinationArg) => {
+    let timeInMilliseconds = 0;
+    let addMilliSeconds = (milliSecondsArg) => {
+        timeInMilliseconds = timeInMilliseconds + milliSecondsArg;
+    };
+    if (combinationArg.years) {
+        addMilliSeconds(exports.units.years(combinationArg.years));
+    }
+    if (combinationArg.months) {
+        addMilliSeconds(exports.units.months(combinationArg.months));
+    }
+    if (combinationArg.weeks) {
+        addMilliSeconds(exports.units.weeks(combinationArg.weeks));
+    }
+    if (combinationArg.days) {
+        addMilliSeconds(exports.units.days(combinationArg.days));
+    }
+    if (combinationArg.hours) {
+        addMilliSeconds(exports.units.hours(combinationArg.hours));
+    }
+    if (combinationArg.minutes) {
+        addMilliSeconds(exports.units.minutes(combinationArg.minutes));
+    }
+    return timeInMilliseconds;
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnR0aW1lLnVuaXRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnR0aW1lLnVuaXRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQVcsUUFBQSxLQUFLLEdBQUc7SUFDakIsS0FBSyxFQUFFLENBQUMsUUFBUSxHQUFHLENBQUM7UUFDbEIsTUFBTSxDQUFDLFFBQVEsR0FBRyxRQUFRLENBQUE7SUFDNUIsQ0FBQztJQUNELE1BQU0sRUFBRSxDQUFDLFFBQVEsR0FBRyxDQUFDO1FBQ25CLE1BQU0sQ0FBQyxRQUFRLEdBQUcsT0FBTyxDQUFBO0lBQzNCLENBQUM7SUFDRCxLQUFLLEVBQUUsQ0FBQyxRQUFRLEdBQUcsQ0FBQztRQUNsQixNQUFNLENBQUMsUUFBUSxHQUFHLE9BQU8sQ0FBQTtJQUMzQixDQUFDO0lBQ0QsSUFBSSxFQUFFLENBQUMsUUFBUSxHQUFHLENBQUM7UUFDakIsTUFBTSxDQUFDLFFBQVEsR0FBRyxNQUFNLENBQUE7SUFDMUIsQ0FBQztJQUNELEtBQUssRUFBRSxDQUFDLFFBQVEsR0FBRyxDQUFDO1FBQ2xCLE1BQU0sQ0FBQyxRQUFRLEdBQUcsS0FBSyxDQUFBO0lBQ3pCLENBQUM7SUFDRCxPQUFPLEVBQUUsQ0FBQyxRQUFRLEdBQUcsQ0FBQztRQUNwQixNQUFNLENBQUMsUUFBUSxHQUFHLEtBQUssQ0FBQTtJQUN6QixDQUFDO0NBQ0YsQ0FBQTtBQVdVLFFBQUEsd0JBQXdCLEdBQUcsQ0FBQyxjQUFtQztJQUN4RSxJQUFJLGtCQUFrQixHQUFHLENBQUMsQ0FBQTtJQUMxQixJQUFJLGVBQWUsR0FBRyxDQUFDLGVBQWU7UUFDcEMsa0JBQWtCLEdBQUcsa0JBQWtCLEdBQUcsZUFBZSxDQUFBO0lBQzNELENBQUMsQ0FBQTtJQUNELEVBQUUsQ0FBQyxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO1FBQUMsZUFBZSxDQUFDLGFBQUssQ0FBQyxLQUFLLENBQUMsY0FBYyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUE7SUFBQyxDQUFDO0lBQ2hGLEVBQUUsQ0FBQyxDQUFDLGNBQWMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQUMsZUFBZSxDQUFDLGFBQUssQ0FBQyxNQUFNLENBQUMsY0FBYyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUE7SUFBQyxDQUFDO0lBQ25GLEVBQUUsQ0FBQyxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO1FBQUMsZUFBZSxDQUFDLGFBQUssQ0FBQyxLQUFLLENBQUMsY0FBYyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUE7SUFBQyxDQUFDO0lBQ2hGLEVBQUUsQ0FBQyxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO1FBQUMsZUFBZSxDQUFDLGFBQUssQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUE7SUFBQyxDQUFDO0lBQzdFLEVBQUUsQ0FBQyxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO1FBQUMsZUFBZSxDQUFDLGFBQUssQ0FBQyxLQUFLLENBQUMsY0FBYyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUE7SUFBQyxDQUFDO0lBQ2hGLEVBQUUsQ0FBQyxDQUFDLGNBQWMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO1FBQUMsZUFBZSxDQUFDLGFBQUssQ0FBQyxPQUFPLENBQUMsY0FBYyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUE7SUFBQyxDQUFDO0lBRXRGLE1BQU0sQ0FBQyxrQkFBa0IsQ0FBQTtBQUMzQixDQUFDLENBQUEifQ==

package.json

@@ -1,6 +1,6 @@
 {
   "name": "smarttime",
-  "version": "1.0.3",
+  "version": "1.0.7",
   "description": "handle timeformats in smart ways",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

test/test.ts

@@ -32,5 +32,17 @@ tap.test('should create valid HrtMeasurements', async (tools) => {
   expect(testHrtMeasurement.milliSeconds).to.be.lessThan(25)
 })
 
+// check units
+tap.test('should combine units', async () => {
+  let computedTime = smarttime.getMilliSecondsFromUnits({
+    years: 2,
+    months: 2,
+    weeks: 2,
+    days: 2,
+    hours: 2,
+    minutes: 2
+  })
+  console.log(computedTime)
+})
 
 tap.start()

ts/index.ts

@@ -2,3 +2,4 @@ import * as plugins from './smarttime.plugins'
 
 export * from './smarttime.classes.hrtmeasurement'
 export * from './smarttime.classes.timestamp'
+export * from './smarttime.units'

ts/smarttime.classes.timestamp.ts

@@ -11,31 +11,62 @@ export class TimeStamp {
   date: Date
 
   /**
-   * The time as linux time
+   * The time as linux time (milliseconds, not seconds though)
    * good for comparison
    */
-  linuxtime: number
+  milliSeconds: number
-  constructor (creatorArg?: number | TimeStamp) {
+
+  /**
+   * The standard epoch time in seconds
+   */
+  epochtime: number
+
+  /**
+   * if derived from another TimeStamp points out the change in milliseconds
+   */
+  change: number = null
+
+  constructor (creatorArg?: number) {
     if (!creatorArg) {
       this.date = new Date()
-      this.linuxtime = this.date.getTime()
+    } else if (typeof creatorArg === 'number') {
+      this.date = new Date(creatorArg)
     }
+    this.milliSeconds = this.date.getTime()
+    this.epochtime = Math.floor(this.milliSeconds / 1000)
+  }
+
+  /**
+   * returns new TimeStamp from milliseconds
+   */
+  static fromMilliSeconds (milliSecondsArg) {
+    return new TimeStamp(milliSecondsArg)
+  }
+
+  /**
+   * returns new TimeStamp for now with change set
+   * @param timeStampArg
+   */
+  static fromTimeStamp (timeStampArg: TimeStamp) {
+    let localTimeStamp = new TimeStamp()
+    localTimeStamp.change = localTimeStamp.milliSeconds - timeStampArg.milliSeconds
+    return localTimeStamp
   }
 
   /**
    * Is the current instance older than the argument
    * @param TimeStampArg
    */
-  isOlderThan (TimeStampArg: TimeStamp) {
+  isOlderThan (TimeStampArg: TimeStamp, tresholdTimeArg: number = 0) {
-    if (this.linuxtime < TimeStampArg.linuxtime) {
+    if ((this.milliSeconds + tresholdTimeArg) < TimeStampArg.milliSeconds) {
       return true
     } else {
       return false
     }
   }
 
-  isYoungerThan (TimeStampArg: TimeStamp) {
+  isYoungerThan (TimeStampArg: TimeStamp, tresholdTimeArg: number = 0) {
-    if (this.linuxtime > TimeStampArg.linuxtime) {
+    if (this.milliSeconds > (TimeStampArg.milliSeconds + tresholdTimeArg)) {
       return true
     } else {
       return false

ts/smarttime.units.ts

@@ -0,0 +1,45 @@
+export let units = {
+  years: (timesArg = 1): number => {
+    return timesArg * 3154e+10
+  },
+  months: (timesArg = 1): number => {
+    return timesArg * 2628e+9
+  },
+  weeks: (timesArg = 1) => {
+    return timesArg * 6048e+8
+  },
+  days: (timesArg = 1) => {
+    return timesArg * 864e+7
+  },
+  hours: (timesArg = 1) => {
+    return timesArg * 36e+6
+  },
+  minutes: (timesArg = 1) => {
+    return timesArg * 60000
+  }
+}
+
+export interface IUnitCombinationArg {
+  years?: number
+  months?: number
+  weeks?: number
+  days?: number
+  hours?: number
+  minutes?: number
+}
+
+export let getMilliSecondsFromUnits = (combinationArg: IUnitCombinationArg) => {
+  let timeInMilliseconds = 0
+  let addMilliSeconds = (milliSecondsArg) => {
+    timeInMilliseconds = timeInMilliseconds + milliSecondsArg
+  }
+  if (combinationArg.years) { addMilliSeconds(units.years(combinationArg.years)) }
+  if (combinationArg.months) { addMilliSeconds(units.months(combinationArg.months)) }
+  if (combinationArg.weeks) { addMilliSeconds(units.weeks(combinationArg.weeks)) }
+  if (combinationArg.days) { addMilliSeconds(units.days(combinationArg.days)) }
+  if (combinationArg.hours) { addMilliSeconds(units.hours(combinationArg.hours)) }
+  if (combinationArg.minutes) { addMilliSeconds(units.minutes(combinationArg.minutes)) }
+
+  return timeInMilliseconds
+}
+