croner 9.0.0-dev.2 → 9.0.0-dev.4

package/dist/croner.cjs

@@ -145,7 +145,7 @@ var CronPattern = class {
    * @private
    */
   parse() {
-    if (!(typeof this.pattern === "string")) {
+    if (!(typeof this.pattern === "string" || this.pattern instanceof String)) {
       throw new TypeError("CronPattern: Pattern has to be of type string.");
     }
     if (this.pattern.indexOf("@") >= 0) this.pattern = this.handleNicknames(this.pattern).trim();
@@ -371,6 +371,9 @@ var CronPattern = class {
     if (split.length !== 2) {
       throw new TypeError("CronPattern: Syntax error, illegal stepping: '" + conf + "'");
     }
+    if (split[0] === "") {
+      split[0] = "*";
+    }
     let start = 0;
     if (split[0] !== "*") {
       start = parseInt(split[0], 10) + valueIndexOffset;
@@ -439,13 +442,13 @@ var CronPattern = class {
   setNthWeekdayOfMonth(index, nthWeekday) {
     if (typeof nthWeekday !== "number" && nthWeekday === "L") {
       this["dayOfWeek"][index] = this["dayOfWeek"][index] | LAST_OCCURRENCE;
-    } else if (typeof nthWeekday === "number" && nthWeekday < 6 && nthWeekday > 0) {
-      this["dayOfWeek"][index] = this["dayOfWeek"][index] | OCCURRENCE_BITMASKS[nthWeekday - 1];
-    } else if (typeof nthWeekday === "number" && nthWeekday === ANY_OCCURRENCE) {
+    } else if (nthWeekday === ANY_OCCURRENCE) {
       this["dayOfWeek"][index] = ANY_OCCURRENCE;
+    } else if (nthWeekday < 6 && nthWeekday > 0) {
+      this["dayOfWeek"][index] = this["dayOfWeek"][index] | OCCURRENCE_BITMASKS[nthWeekday - 1];
     } else {
       throw new TypeError(
-        `CronPattern: nth weekday of of range, should be 1-5 or L. Value: ${nthWeekday}`
+        `CronPattern: nth weekday out of range, should be 1-5 or L. Value: ${nthWeekday}, Type: ${typeof nthWeekday}`
       );
     }
   }
@@ -625,7 +628,7 @@ var CronDate = class _CronDate {
    */
   fromString(str) {
     if (typeof this.tz === "number") {
-      const inDate = minitz.fromTZISO(str, "UTC");
+      const inDate = minitz.fromTZISO(str);
       this.ms = inDate.getUTCMilliseconds();
       this.second = inDate.getUTCSeconds();
       this.minute = inDate.getUTCMinutes();
@@ -634,8 +637,8 @@ var CronDate = class _CronDate {
       this.month = inDate.getUTCMonth();
       this.year = inDate.getUTCFullYear();
       this.apply();
-    } else if (this.tz === void 0) {
-      return this.fromDate(minitz.fromTZISO(str, this.tz === void 0 ? "UTC" : this.tz));
+    } else {
+      return this.fromDate(minitz.fromTZISO(str, this.tz));
     }
   }
   /**
@@ -987,7 +990,7 @@ var Cron = class {
     prev = prev || /* @__PURE__ */ new Date();
     const next = this._next(prev);
     if (next) {
-      if (prev instanceof CronDate) {
+      if (prev instanceof CronDate || prev instanceof Date) {
         return next.getTime() - prev.getTime();
       } else {
         return next.getTime() - new CronDate(prev).getTime();
@@ -1092,6 +1095,12 @@ var Cron = class {
   async trigger() {
     await this._trigger();
   }
+  /**
+   * Returns number of runs left, undefined = unlimited
+   */
+  runsLeft() {
+    return this._states.maxRuns;
+  }
   /**
    * Called when it's time to trigger.
    * Checks if all conditions are currently met,
@@ -1152,14 +1161,14 @@ var Cron = class {
     let newPrev = prev;
     if (this.options.startAt.getTime() <= now.getTime()) {
       newPrev = this.options.startAt;
-      let prevTimePlusInterval = prev.getTime() + this.options.interval * 1e3;
+      let prevTimePlusInterval = newPrev.getTime() + this.options.interval * 1e3;
       while (prevTimePlusInterval <= now.getTime()) {
-        newPrev = new CronDate(prev, this.options.timezone || this.options.utcOffset).increment(
+        newPrev = new CronDate(newPrev, this.options.timezone || this.options.utcOffset).increment(
           this._states.pattern,
           this.options,
           true
         );
-        prevTimePlusInterval = prev.getTime() + this.options.interval * 1e3;
+        prevTimePlusInterval = newPrev.getTime() + this.options.interval * 1e3;
       }
       hasPreviousRun = true;
     }

package/dist/croner.d.cts

@@ -6,7 +6,7 @@ declare module "helpers/minitz" {
         h: number;
         i: number;
         s: number;
-        tz: string;
+        tz?: string;
     }
     /**
      * Converts a date/time from a specific timezone to a normal date object using the system local time
@@ -29,7 +29,7 @@ declare module "helpers/minitz" {
      */
     function minitz(y: number, m: number, d: number, h: number, i: number, s: number, tz: string, throwOnInvalid?: boolean): Date;
     namespace minitz {
-        var fromTZISO: (localTimeStr: string, tz: string, throwOnInvalid?: boolean) => Date;
+        var fromTZISO: (localTimeStr: string, tz?: string, throwOnInvalid?: boolean) => Date;
         var fromTZ: (tp: TimePoint, throwOnInvalid?: boolean) => Date;
         var toTZ: (d: Date, tzStr: string) => {
             y: number;
@@ -40,7 +40,7 @@ declare module "helpers/minitz" {
             s: number;
             tz: string;
         };
-        var tp: (y: number, m: number, d: number, h: number, i: number, s: number, tz: string) => {
+        var tp: (y: number, m: number, d: number, h: number, i: number, s: number, tz?: string) => {
             y: number;
             m: number;
             d: number;
@@ -240,7 +240,7 @@ declare module "date" {
          * Current full year, in local time or target timezone specified by `this.tz`
          */
         year: number;
-        constructor(d?: CronDate | Date | string, tz?: string | number);
+        constructor(d?: CronDate | Date | string | null, tz?: string | number);
         /**
          * Check if the given date is the nth occurrence of a weekday in its month.
          *
@@ -354,7 +354,7 @@ declare module "croner" {
          * @param prev - Date to start from
          * @returns  Next run time
          */
-        nextRun(prev?: CronDate | Date | string): Date | null;
+        nextRun(prev?: CronDate | Date | string | null): Date | null;
         /**
          * Find next n runs, based on supplied date. Strips milliseconds.
          *
@@ -362,7 +362,7 @@ declare module "croner" {
          * @param previous - Date to start from
          * @returns - Next n run times
          */
-        nextRuns(n: number, previous: Date | string): Date[];
+        nextRuns(n: number, previous?: Date | string): Date[];
         /**
          * Return the original pattern, if there was one
          *
@@ -438,6 +438,10 @@ declare module "croner" {
          * Trigger a run manually
          */
         trigger(): Promise<void>;
+        /**
+         * Returns number of runs left, undefined = unlimited
+         */
+        runsLeft(): number | undefined;
         /**
          * Called when it's time to trigger.
          * Checks if all conditions are currently met,

package/dist/croner.d.ts

@@ -6,7 +6,7 @@ declare module "helpers/minitz" {
         h: number;
         i: number;
         s: number;
-        tz: string;
+        tz?: string;
     }
     /**
      * Converts a date/time from a specific timezone to a normal date object using the system local time
@@ -29,7 +29,7 @@ declare module "helpers/minitz" {
      */
     function minitz(y: number, m: number, d: number, h: number, i: number, s: number, tz: string, throwOnInvalid?: boolean): Date;
     namespace minitz {
-        var fromTZISO: (localTimeStr: string, tz: string, throwOnInvalid?: boolean) => Date;
+        var fromTZISO: (localTimeStr: string, tz?: string, throwOnInvalid?: boolean) => Date;
         var fromTZ: (tp: TimePoint, throwOnInvalid?: boolean) => Date;
         var toTZ: (d: Date, tzStr: string) => {
             y: number;
@@ -40,7 +40,7 @@ declare module "helpers/minitz" {
             s: number;
             tz: string;
         };
-        var tp: (y: number, m: number, d: number, h: number, i: number, s: number, tz: string) => {
+        var tp: (y: number, m: number, d: number, h: number, i: number, s: number, tz?: string) => {
             y: number;
             m: number;
             d: number;
@@ -240,7 +240,7 @@ declare module "date" {
          * Current full year, in local time or target timezone specified by `this.tz`
          */
         year: number;
-        constructor(d?: CronDate | Date | string, tz?: string | number);
+        constructor(d?: CronDate | Date | string | null, tz?: string | number);
         /**
          * Check if the given date is the nth occurrence of a weekday in its month.
          *
@@ -354,7 +354,7 @@ declare module "croner" {
          * @param prev - Date to start from
          * @returns  Next run time
          */
-        nextRun(prev?: CronDate | Date | string): Date | null;
+        nextRun(prev?: CronDate | Date | string | null): Date | null;
         /**
          * Find next n runs, based on supplied date. Strips milliseconds.
          *
@@ -362,7 +362,7 @@ declare module "croner" {
          * @param previous - Date to start from
          * @returns - Next n run times
          */
-        nextRuns(n: number, previous: Date | string): Date[];
+        nextRuns(n: number, previous?: Date | string): Date[];
         /**
          * Return the original pattern, if there was one
          *
@@ -438,6 +438,10 @@ declare module "croner" {
          * Trigger a run manually
          */
         trigger(): Promise<void>;
+        /**
+         * Returns number of runs left, undefined = unlimited
+         */
+        runsLeft(): number | undefined;
         /**
          * Called when it's time to trigger.
          * Checks if all conditions are currently met,

package/dist/croner.js

@@ -115,7 +115,7 @@ var CronPattern = class {
    * @private
    */
   parse() {
-    if (!(typeof this.pattern === "string")) {
+    if (!(typeof this.pattern === "string" || this.pattern instanceof String)) {
       throw new TypeError("CronPattern: Pattern has to be of type string.");
     }
     if (this.pattern.indexOf("@") >= 0) this.pattern = this.handleNicknames(this.pattern).trim();
@@ -341,6 +341,9 @@ var CronPattern = class {
     if (split.length !== 2) {
       throw new TypeError("CronPattern: Syntax error, illegal stepping: '" + conf + "'");
     }
+    if (split[0] === "") {
+      split[0] = "*";
+    }
     let start = 0;
     if (split[0] !== "*") {
       start = parseInt(split[0], 10) + valueIndexOffset;
@@ -409,13 +412,13 @@ var CronPattern = class {
   setNthWeekdayOfMonth(index, nthWeekday) {
     if (typeof nthWeekday !== "number" && nthWeekday === "L") {
       this["dayOfWeek"][index] = this["dayOfWeek"][index] | LAST_OCCURRENCE;
-    } else if (typeof nthWeekday === "number" && nthWeekday < 6 && nthWeekday > 0) {
-      this["dayOfWeek"][index] = this["dayOfWeek"][index] | OCCURRENCE_BITMASKS[nthWeekday - 1];
-    } else if (typeof nthWeekday === "number" && nthWeekday === ANY_OCCURRENCE) {
+    } else if (nthWeekday === ANY_OCCURRENCE) {
       this["dayOfWeek"][index] = ANY_OCCURRENCE;
+    } else if (nthWeekday < 6 && nthWeekday > 0) {
+      this["dayOfWeek"][index] = this["dayOfWeek"][index] | OCCURRENCE_BITMASKS[nthWeekday - 1];
     } else {
       throw new TypeError(
-        `CronPattern: nth weekday of of range, should be 1-5 or L. Value: ${nthWeekday}`
+        `CronPattern: nth weekday out of range, should be 1-5 or L. Value: ${nthWeekday}, Type: ${typeof nthWeekday}`
       );
     }
   }
@@ -595,7 +598,7 @@ var CronDate = class _CronDate {
    */
   fromString(str) {
     if (typeof this.tz === "number") {
-      const inDate = minitz.fromTZISO(str, "UTC");
+      const inDate = minitz.fromTZISO(str);
       this.ms = inDate.getUTCMilliseconds();
       this.second = inDate.getUTCSeconds();
       this.minute = inDate.getUTCMinutes();
@@ -604,8 +607,8 @@ var CronDate = class _CronDate {
       this.month = inDate.getUTCMonth();
       this.year = inDate.getUTCFullYear();
       this.apply();
-    } else if (this.tz === void 0) {
-      return this.fromDate(minitz.fromTZISO(str, this.tz === void 0 ? "UTC" : this.tz));
+    } else {
+      return this.fromDate(minitz.fromTZISO(str, this.tz));
     }
   }
   /**
@@ -957,7 +960,7 @@ var Cron = class {
     prev = prev || /* @__PURE__ */ new Date();
     const next = this._next(prev);
     if (next) {
-      if (prev instanceof CronDate) {
+      if (prev instanceof CronDate || prev instanceof Date) {
         return next.getTime() - prev.getTime();
       } else {
         return next.getTime() - new CronDate(prev).getTime();
@@ -1062,6 +1065,12 @@ var Cron = class {
   async trigger() {
     await this._trigger();
   }
+  /**
+   * Returns number of runs left, undefined = unlimited
+   */
+  runsLeft() {
+    return this._states.maxRuns;
+  }
   /**
    * Called when it's time to trigger.
    * Checks if all conditions are currently met,
@@ -1122,14 +1131,14 @@ var Cron = class {
     let newPrev = prev;
     if (this.options.startAt.getTime() <= now.getTime()) {
       newPrev = this.options.startAt;
-      let prevTimePlusInterval = prev.getTime() + this.options.interval * 1e3;
+      let prevTimePlusInterval = newPrev.getTime() + this.options.interval * 1e3;
       while (prevTimePlusInterval <= now.getTime()) {
-        newPrev = new CronDate(prev, this.options.timezone || this.options.utcOffset).increment(
+        newPrev = new CronDate(newPrev, this.options.timezone || this.options.utcOffset).increment(
           this._states.pattern,
           this.options,
           true
         );
-        prevTimePlusInterval = prev.getTime() + this.options.interval * 1e3;
+        prevTimePlusInterval = newPrev.getTime() + this.options.interval * 1e3;
       }
       hasPreviousRun = true;
     }

package/dist/croner.umd.js

@@ -145,7 +145,7 @@ var base64 = (() => {
      * @private
      */
     parse() {
-      if (!(typeof this.pattern === "string")) {
+      if (!(typeof this.pattern === "string" || this.pattern instanceof String)) {
         throw new TypeError("CronPattern: Pattern has to be of type string.");
       }
       if (this.pattern.indexOf("@") >= 0) this.pattern = this.handleNicknames(this.pattern).trim();
@@ -371,6 +371,9 @@ var base64 = (() => {
       if (split.length !== 2) {
         throw new TypeError("CronPattern: Syntax error, illegal stepping: '" + conf + "'");
       }
+      if (split[0] === "") {
+        split[0] = "*";
+      }
       let start = 0;
       if (split[0] !== "*") {
         start = parseInt(split[0], 10) + valueIndexOffset;
@@ -439,13 +442,13 @@ var base64 = (() => {
     setNthWeekdayOfMonth(index, nthWeekday) {
       if (typeof nthWeekday !== "number" && nthWeekday === "L") {
         this["dayOfWeek"][index] = this["dayOfWeek"][index] | LAST_OCCURRENCE;
-      } else if (typeof nthWeekday === "number" && nthWeekday < 6 && nthWeekday > 0) {
-        this["dayOfWeek"][index] = this["dayOfWeek"][index] | OCCURRENCE_BITMASKS[nthWeekday - 1];
-      } else if (typeof nthWeekday === "number" && nthWeekday === ANY_OCCURRENCE) {
+      } else if (nthWeekday === ANY_OCCURRENCE) {
         this["dayOfWeek"][index] = ANY_OCCURRENCE;
+      } else if (nthWeekday < 6 && nthWeekday > 0) {
+        this["dayOfWeek"][index] = this["dayOfWeek"][index] | OCCURRENCE_BITMASKS[nthWeekday - 1];
       } else {
         throw new TypeError(
-          `CronPattern: nth weekday of of range, should be 1-5 or L. Value: ${nthWeekday}`
+          `CronPattern: nth weekday out of range, should be 1-5 or L. Value: ${nthWeekday}, Type: ${typeof nthWeekday}`
         );
       }
     }
@@ -625,7 +628,7 @@ var base64 = (() => {
      */
     fromString(str) {
       if (typeof this.tz === "number") {
-        const inDate = minitz.fromTZISO(str, "UTC");
+        const inDate = minitz.fromTZISO(str);
         this.ms = inDate.getUTCMilliseconds();
         this.second = inDate.getUTCSeconds();
         this.minute = inDate.getUTCMinutes();
@@ -634,8 +637,8 @@ var base64 = (() => {
         this.month = inDate.getUTCMonth();
         this.year = inDate.getUTCFullYear();
         this.apply();
-      } else if (this.tz === void 0) {
-        return this.fromDate(minitz.fromTZISO(str, this.tz === void 0 ? "UTC" : this.tz));
+      } else {
+        return this.fromDate(minitz.fromTZISO(str, this.tz));
       }
     }
     /**
@@ -987,7 +990,7 @@ var base64 = (() => {
       prev = prev || /* @__PURE__ */ new Date();
       const next = this._next(prev);
       if (next) {
-        if (prev instanceof CronDate) {
+        if (prev instanceof CronDate || prev instanceof Date) {
           return next.getTime() - prev.getTime();
         } else {
           return next.getTime() - new CronDate(prev).getTime();
@@ -1092,6 +1095,12 @@ var base64 = (() => {
     async trigger() {
       await this._trigger();
     }
+    /**
+     * Returns number of runs left, undefined = unlimited
+     */
+    runsLeft() {
+      return this._states.maxRuns;
+    }
     /**
      * Called when it's time to trigger.
      * Checks if all conditions are currently met,
@@ -1152,14 +1161,14 @@ var base64 = (() => {
       let newPrev = prev;
       if (this.options.startAt.getTime() <= now.getTime()) {
         newPrev = this.options.startAt;
-        let prevTimePlusInterval = prev.getTime() + this.options.interval * 1e3;
+        let prevTimePlusInterval = newPrev.getTime() + this.options.interval * 1e3;
         while (prevTimePlusInterval <= now.getTime()) {
-          newPrev = new CronDate(prev, this.options.timezone || this.options.utcOffset).increment(
+          newPrev = new CronDate(newPrev, this.options.timezone || this.options.utcOffset).increment(
             this._states.pattern,
             this.options,
             true
           );
-          prevTimePlusInterval = prev.getTime() + this.options.interval * 1e3;
+          prevTimePlusInterval = newPrev.getTime() + this.options.interval * 1e3;
         }
         hasPreviousRun = true;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "croner",
-  "version": "9.0.0-dev.2",
+  "version": "9.0.0-dev.4",
   "description": "Trigger functions and/or evaluate cron expressions in JavaScript. No dependencies. Most features. All environments.",
   "author": "Hexagon <github.com/hexagon>",
   "homepage": "https://croner.56k.guru",