croner 3.0.49 → 4.0.53

package/README.md

@@ -3,12 +3,17 @@
 [![Build status](https://travis-ci.org/Hexagon/croner.svg)](https://travis-ci.org/Hexagon/croner) [![npm version](https://badge.fury.io/js/croner.svg)](https://badge.fury.io/js/croner) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/4978bdbf495941c087ecb32b120f28ff)](https://www.codacy.com/gh/Hexagon/croner/dashboard?utm_source=github.com&utm_medium=referral&utm_content=Hexagon/croner&utm_campaign=Badge_Grade)
 [![MIT License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/Hexagon/croner/blob/master/LICENSE) [![jsdelivr](https://data.jsdelivr.com/v1/package/npm/croner/badge?style=rounded)](https://www.jsdelivr.com/package/npm/croner)
 
-Pure JavaScript minimal isomorphic cron parser and scheduler. Or simply speaking - setInterval on steroids. 
+*   Trigger functions in javascript using [Cron](https://en.wikipedia.org/wiki/Cron#CRON_expression) syntax.
+*   Pause, resume or stop exection efter a task is scheduled.
+*   Find first date of next month, find date of next tuesday, etc.
+*   Supports Node.js from 4.0 to current. Both require (commonjs) and import (module).
+*   Supports browser use ([UMD](https://github.com/umdjs/umd) (standalone, requirejs etc.), [ES-module](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Modules))
+*   *Experimental:* Schedule in other timezone than default.
 
 Documented with [JSDoc](https://jsdoc.app/) for intellisense, and include [TypeScript](https://www.typescriptlang.org/) typings.
 
 ```html
-<script src="https://cdn.jsdelivr.net/npm/croner@3/dist/croner.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/croner@4/dist/croner.min.js"></script>
 ```
 
 ```javascript
@@ -16,15 +21,18 @@ Documented with [JSDoc](https://jsdoc.app/) for intellisense, and include [TypeS
 Cron('* * * * * *', function () {
 	console.log('This will run every second');
 });
+
+// What date is next sunday?
+console.log(Cron('0 0 0 * * 7').next().toLocaleDateString());
 ```
 
 ## Installation
 
 ### Manual
 
-*	Download latest [zipball](http://github.com/Hexagon/croner/zipball/master/)
-*	Unpack
-*	Grab ```croner.min.js``` ([UMD](https://github.com/umdjs/umd)) or ```croner.min.mjs``` ([ES-module](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Modules)) from the [dist/](/dist) folder
+*   Download latest [zipball](http://github.com/Hexagon/croner/zipball/master/)
+*   Unpack
+*   Grab ```croner.min.js``` ([UMD](https://github.com/umdjs/umd)) or ```croner.min.mjs``` ([ES-module](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Modules)) from the [dist/](/dist) folder
 
 ### Node.js
 
@@ -46,14 +54,14 @@ const Cron = require("croner");
 To use as a [UMD](https://github.com/umdjs/umd)-module (stand alone, [RequireJS](https://requirejs.org/) etc.)
 
 ```html
-<script src="https://cdn.jsdelivr.net/npm/croner@3/dist/croner.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/croner@4/dist/croner.min.js"></script>
 ```
 
 To use as a [ES-module](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Modules)
 
 ```html
 <script type="module">
-	import Cron from "https://cdn.jsdelivr.net/npm/croner@3/dist/croner.min.mjs";
+	import Cron from "https://cdn.jsdelivr.net/npm/croner@4/dist/croner.min.mjs";
 
 	// ... see usage section ...
 </script>
@@ -64,7 +72,7 @@ To use as a [ES-module](https://developer.mozilla.org/en-US/docs/Web/JavaScript/
 <script type="importmap">
 	{
 		"imports": {
-			"croner": "https://cdn.jsdelivr.net/npm/croner@3/dist/croner.min.mjs"
+			"croner": "https://cdn.jsdelivr.net/npm/croner@4/dist/croner.min.mjs"
 		}
 	}
 </script>
@@ -85,10 +93,20 @@ Cron('* * * * * *', function () {
 });
 ```
 
+### Find dates
+```javascript
+// Find next month
+let nextMonth = Cron('0 0 0 1 * *').next(),
+	nextSunday = Cron('0 0 0 * * 7').next();
+
+console.log("First day of next month: " +  nextMonth.toLocaleDateString());
+console.log("Next sunday: " +  nextSunday.toLocaleDateString());
+```
+
 ### Minimalist scheduling with stepping and custom timezone
 ```javascript
 // Run a function every fifth second
-Cron('*/5 * * * * *', { timezone: 'Europe/Stockholm' } function () {
+Cron('*/5 * * * * *', { timezone: 'Europe/Stockholm' }, function () {
 	console.log('This will run every fifth second');
 });
 ```
@@ -142,49 +160,41 @@ scheduler.schedule(function() {
 ```javascript
 
 // Run every minute
-var scheduler = Cron('0 * * * * *');
+var scheduler = Cron('0 * * * * *', { maxRuns: 5 });
 
 // Schedule with options (all options are optional)
-scheduler.schedule({ maxRuns: 5 }, function() {
+scheduler.schedule(function() {
 	console.log('This will run every minute.');
 });
 ```
-### Scheduling with job controls controlled by croner
+### Scheduling with controls
 ```javascript
 let scheduler = Cron('* * * * * *')
 
-let job = scheduler.schedule(function () {
+scheduler.schedule(function () {
 	console.log('This will run every second. Pause on second 10. Resume on second 15. And quit on second 20.');
 	console.log('Current second: ', new Date().getSeconds());
-	console.log('Previous run: ' + scheduler.next());
+	console.log('Previous run: ' + scheduler.previous());
 	console.log('Next run: ' + scheduler.next());
 });
 
-Cron('10 * * * * *', {maxRuns: 1}, () => job.pause());
-Cron('15 * * * * *', {maxRuns: 1}, () => job.resume());
-Cron('20 * * * * *', {maxRuns: 1}, () => job.stop());
+Cron('10 * * * * *', {maxRuns: 1}, () => scheduler.pause());
+Cron('15 * * * * *', {maxRuns: 1}, () => scheduler.resume());
+Cron('20 * * * * *', {maxRuns: 1}, () => scheduler.stop());
 ```
 
 ## Full API
 ```javascript
 
-var o = Cron( <string pattern> [, <object options>] [, <function callback> ] );
-```
-```javascript
-// If Cron is initialized without a scheduled function, cron itself is returned
-// and the following member functions is available.
-o.next( [ <date previous> ] );
-o.msToNext();
-o.previous();
-
-// If Cron is initialized _with_ a scheduled function, the job is retured instead.
-// Otherwise you get a reference to the job when scheduling a new job.
-var job = o.schedule( [ { startAt: <date|string>, stopAt: <date|string>, maxRuns: <integer>, timezone: <string> } ,] callback);
+var scheduler = Cron( <string pattern> [, { startAt: <date|string>, stopAt: <date|string>, maxRuns: <integer>, timezone: <string> } ] [, <function job> ] )
 
-// These self-explanatory functions is available to control the job
-job.pause();
-job.resume();
-job.stop();
+scheduler.next( [ <date previous> ] );
+scheduler.msToNext( [ <date previous> ] );
+scheduler.previous();
+scheduler.schedule( <fn job> );
+scheduler.pause();
+scheduler.resume();
+scheduler.stop();
 
 ```
 
@@ -204,4 +214,4 @@ job.stop();
 
 ## License
 
-MIT
+MIT

package/dist/croner.min.js

@@ -1 +1 @@
-!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.Cron=e():t.Cron=e()}(this,(function(){return(()=>{"use strict";var t={d:(e,r)=>{for(var s in r)t.o(r,s)&&!t.o(e,s)&&Object.defineProperty(e,s,{enumerable:!0,get:r[s]})},o:(t,e)=>Object.prototype.hasOwnProperty.call(t,e)},e={};t.d(e,{default:()=>i});function r(t,e){if(this.timezone=e,t&&t instanceof Date)this.fromDate(t);else if(void 0===t)this.fromDate(new Date);else if(t&&"string"==typeof t)this.fromString(t);else{if(!(t instanceof r))throw new TypeError("CronDate: Invalid type passed as parameter to CronDate constructor");this.fromCronDate(t)}}function s(t){this.pattern=t,this.seconds=Array(60).fill(0),this.minutes=Array(60).fill(0),this.hours=Array(24).fill(0),this.days=Array(31).fill(0),this.months=Array(12).fill(0),this.daysOfWeek=Array(8).fill(0),this.parse()}r.prototype.fromDate=function(t){let e=t.getTime();this.timezone&&(t=function(t,e){return new Date(t.toLocaleString("en-US",{timeZone:e}))}(t,this.timezone));let r=t.getTime();this.UTCmsOffset=r-e,this.milliseconds=t.getMilliseconds(),this.seconds=t.getSeconds(),this.minutes=t.getMinutes(),this.hours=t.getHours(),this.days=t.getDate(),this.months=t.getMonth(),this.years=t.getFullYear()},r.prototype.fromCronDate=function(t){this.UTCmsOffset=t.UTCmsOffset,this.milliseconds=t.milliseconds,this.seconds=t.seconds,this.minutes=t.minutes,this.hours=t.hours,this.days=t.days,this.months=t.months,this.years=t.years},r.prototype.fromString=function(t){let e=Date.parse(t);if(isNaN(e))throw new TypeError("CronDate: Provided string value for CronDate could not be parsed as date.");this.fromDate(new Date(e))},r.prototype.increment=function(t){this.seconds+=1,this.milliseconds=0;let e=this,r=function(t,r,s,o){for(let n=void 0===o?e[t]+s:0+s;n<r[t].length;n++)if(r[t][n])return e[t]=n-s,!0;return!1},s=[["seconds","minutes",0],["minutes","hours",0],["hours","days",0],["days","months",-1],["months","years",0]],o=0;for(;o<5;){if(!r(s[o][0],t,s[o][2]))for(this[s[o][1]]++;o>=0;)r(s[o][0],t,s[o][2],0),o--;o++}for(;!t.daysOfWeek[this.getDate().getDay()];)this.days+=1;return this},r.prototype.getDate=function(){return new Date(this.years,this.months,this.days,this.hours,this.minutes,this.seconds,this.milliseconds-this.UTCmsOffset)},r.prototype.getTime=function(){return new Date(this.years,this.months,this.days,this.hours,this.minutes,this.seconds,this.milliseconds-this.UTCmsOffset).getTime()},s.prototype.parse=function(){if("string"!=typeof this.pattern&&this.pattern.constructor!==String)throw new TypeError("CronPattern: Pattern has to be of type string.");let t,e,r,s,o,n=this.pattern.trim().replace(/\s+/g," ").split(" "),i=/[^/*0-9,-]+/;if(n.length<5||n.length>6)throw new TypeError("CronPattern: invalid configuration format ('"+this.pattern+"'), exacly five or six space separated parts required.");for(5===n.length&&n.unshift("0"),e=0;e<n.length;e++)if(t=n[e].trim(),i.test(t))throw new TypeError("CronPattern: configuration entry "+(e+1)+" ("+t+") contains illegal characters.");if(r="*"!==n[4],s="*"!==n[5],o="*"!==n[3],s&&(r||o))throw new TypeError("CronPattern: configuration invalid, you can not combine month/date with day of week.");this.partToArray("seconds",n[0],0),this.partToArray("minutes",n[1],0),this.partToArray("hours",n[2],0),this.partToArray("days",n[3],-1),this.partToArray("months",n[4],-1),this.partToArray("daysOfWeek",n[5],0),this.daysOfWeek[7]&&(this.daysOfWeek[0]=1)},s.prototype.partToArray=function(t,e,r){let s,o,n,i,a,h=this[t];if("*"!==e)if(o=e.split(","),o.length>1)for(s=0;s<o.length;s++)this.partToArray(t,o[s],r);else if(-1!==e.indexOf("-")){if(o=e.split("-"),2!==o.length)throw new TypeError("CronPattern: Syntax error, illegal range: '"+e+"'");if(n=parseInt(o[0],10)+r,i=parseInt(o[1],10)+r,isNaN(n))throw new TypeError("CronPattern: Syntax error, illegal lower range (NaN)");if(isNaN(i))throw new TypeError("CronPattern: Syntax error, illegal upper range (NaN)");if(n<0||i>=h.length)throw new TypeError("CronPattern: Value out of range: '"+e+"'");if(n>i)throw new TypeError("CronPattern: From value is larger than to value: '"+e+"'");for(s=n;s<=i;s++)h[s+r]=1}else if(-1!==e.indexOf("/")){if(o=e.split("/"),2!==o.length)throw new TypeError("CronPattern: Syntax error, illegal stepping: '"+e+"'");if("*"!==o[0])throw new TypeError("CronPattern: Syntax error, left part of / needs to be * : '"+e+"'");if(a=parseInt(o[1],10),isNaN(a))throw new TypeError("CronPattern: Syntax error, illegal stepping: (NaN)");if(0===a)throw new TypeError("CronPattern: Syntax error, illegal stepping: 0");if(a>h.length)throw new TypeError("CronPattern: Syntax error, steps cannot be greater than maximum value of part ("+h.length+")");for(s=0;s<h.length;s+=a)h[s+r]=1}else{if(s=parseInt(e,10)+r,s<0||s>=h.length)throw new TypeError("CronPattern: "+t+" value out of range: '"+e+"'");h[s]=1}else for(s=0;s<h.length;s++)h[s]=1};const o=Math.pow(2,31)-1;function n(t,e,r){let o=this;return this instanceof n?(o.pattern=new s(t),o.schedulerDefaults={maxRuns:1/0,kill:!1},"function"==typeof e&&(r=e,e={}),o.opts=o.validateOpts(e||{}),void 0===r?o:this.schedule(e,r)):new n(t,e,r)}n.prototype.next=function(t){let e=this._next(t);return e?e.getDate():null},n.prototype.previous=function(){return this.opts.previous?this.opts.previous.getDate():null},n.prototype._next=function(t){t=new r(t,this.opts.timezone),this.opts.startAt&&t&&t.getTime()<this.opts.startAt.getTime()&&(t=new r(this.opts.startAt,this.opts.timezone));let e=new r(t,this.opts.timezone).increment(this.pattern);return this.opts.maxRuns<=0||this.opts.kill||this.opts.stopAt&&e.getTime()>=this.opts.stopAt.getTime()?null:e},n.prototype.validateOpts=function(t){return t.startAt&&(t.startAt=new r(t.startAt,t.timezone)),t.stopAt&&(t.stopAt=new r(t.stopAt,t.timezone)),t},n.prototype.msToNext=function(t){t=t||new r(void 0,this.opts.timezone);let e=this._next(t);return e?e.getTime()-t.getTime():null},n.prototype.schedule=function(t,e){let r=this;return e||(e=t,t=this.opts),t.paused=void 0!==t.paused&&t.paused,t.kill=t.kill||this.schedulerDefaults.kill,t.maxRuns||0===t.maxRuns||(t.maxRuns=this.schedulerDefaults.maxRuns),this.opts=this.validateOpts(t||{}),this._schedule(e),{stop:function(){r.opts.kill=!0,r.opts.currentTimeout&&clearTimeout(r.opts.currentTimeout)},pause:function(){return(r.opts.paused=!0)&&!r.opts.kill},resume:function(){return!(r.opts.paused=!1)&&!r.opts.kill}}},n.prototype._schedule=function(t){let e,s=this,n=s.maxDelay||o;e=this.msToNext(s.opts.previous),null!==e&&(e>n&&(e=n),s.opts.currentTimeout=setTimeout((function(){e!==n&&(s.opts.paused||(s.opts.maxRuns--,t()),s.opts.previous=new r(void 0,s.opts.timezone)),s._schedule(t)}),e))};const i=n;return e.default})()}));
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.Cron=e():t.Cron=e()}(this,(function(){return(()=>{"use strict";var t={d:(e,r)=>{for(var o in r)t.o(r,o)&&!t.o(e,o)&&Object.defineProperty(e,o,{enumerable:!0,get:r[o]})},o:(t,e)=>Object.prototype.hasOwnProperty.call(t,e)},e={};t.d(e,{default:()=>i});function r(t,e){if(this.timezone=e,t&&t instanceof Date)this.fromDate(t);else if(void 0===t)this.fromDate(new Date);else if(t&&"string"==typeof t)this.fromString(t);else{if(!(t instanceof r))throw new TypeError("CronDate: Invalid type ("+typeof t+") passed as parameter to CronDate constructor");this.fromCronDate(t)}}function o(t){this.pattern=t,this.seconds=Array(60).fill(0),this.minutes=Array(60).fill(0),this.hours=Array(24).fill(0),this.days=Array(31).fill(0),this.months=Array(12).fill(0),this.daysOfWeek=Array(8).fill(0),this.parse()}r.prototype.fromDate=function(t){let e=t.getTime();this.timezone&&(t=function(t,e){return new Date(t.toLocaleString("en-US",{timeZone:e}))}(t,this.timezone));let r=t.getTime();this.UTCmsOffset=r-e,this.milliseconds=t.getMilliseconds(),this.seconds=t.getSeconds(),this.minutes=t.getMinutes(),this.hours=t.getHours(),this.days=t.getDate(),this.months=t.getMonth(),this.years=t.getFullYear()},r.prototype.fromCronDate=function(t){this.UTCmsOffset=t.UTCmsOffset,this.timezone=t.timezone;let e=new Date(t.years,t.months,t.days,t.hours,t.minutes,t.seconds,t.milliseconds);this.milliseconds=e.getMilliseconds(),this.seconds=e.getSeconds(),this.minutes=e.getMinutes(),this.hours=e.getHours(),this.days=e.getDate(),this.months=e.getMonth(),this.years=e.getFullYear()},r.prototype.fromString=function(t){let e=Date.parse(t);if(isNaN(e))throw new TypeError("CronDate: Provided string value for CronDate could not be parsed as date.");this.fromDate(new Date(e))},r.prototype.increment=function(t,e){e||(this.seconds+=1);let o=this.getTime();this.milliseconds=0;let n=this,s=function(t,e,r,o){for(let s=void 0===o?n[t]+r:0+r;s<e[t].length;s++)if(e[t][s])return n[t]=s-r,!0;return!1},i=function(){for(;h>=0;)s(a[h][0],t,a[h][2],0),h--},a=[["seconds","minutes",0],["minutes","hours",0],["hours","days",0],["days","months",-1],["months","years",0]],h=0;for(;h<5;)s(a[h][0],t,a[h][2])||(this[a[h][1]]++,i()),h++;for(;!t.daysOfWeek[this.getDate().getDay()];)this.days+=1,h=2,i();return o!=n.getTime()?(n=new r(n),this.years>=4e3?null:n.increment(t,!0)):this},r.prototype.getDate=function(){return new Date(this.years,this.months,this.days,this.hours,this.minutes,this.seconds,this.milliseconds-this.UTCmsOffset)},r.prototype.getTime=function(){return new Date(this.years,this.months,this.days,this.hours,this.minutes,this.seconds,this.milliseconds-this.UTCmsOffset).getTime()},o.prototype.parse=function(){if("string"!=typeof this.pattern&&this.pattern.constructor!==String)throw new TypeError("CronPattern: Pattern has to be of type string.");let t,e,r=this.pattern.trim().replace(/\s+/g," ").split(" "),o=/[^/*0-9,-]+/;if(r.length<5||r.length>6)throw new TypeError("CronPattern: invalid configuration format ('"+this.pattern+"'), exacly five or six space separated parts required.");for(5===r.length&&r.unshift("0"),e=0;e<r.length;e++)if(t=r[e].trim(),o.test(t))throw new TypeError("CronPattern: configuration entry "+(e+1)+" ("+t+") contains illegal characters.");this.partToArray("seconds",r[0],0),this.partToArray("minutes",r[1],0),this.partToArray("hours",r[2],0),this.partToArray("days",r[3],-1),this.partToArray("months",r[4],-1),this.partToArray("daysOfWeek",r[5],0),this.daysOfWeek[7]&&(this.daysOfWeek[0]=1)},o.prototype.partToArray=function(t,e,r){let o,n,s,i,a,h=this[t];if("*"!==e)if(n=e.split(","),n.length>1)for(o=0;o<n.length;o++)this.partToArray(t,n[o],r);else if(-1!==e.indexOf("-")){if(n=e.split("-"),2!==n.length)throw new TypeError("CronPattern: Syntax error, illegal range: '"+e+"'");if(s=parseInt(n[0],10)+r,i=parseInt(n[1],10)+r,isNaN(s))throw new TypeError("CronPattern: Syntax error, illegal lower range (NaN)");if(isNaN(i))throw new TypeError("CronPattern: Syntax error, illegal upper range (NaN)");if(s<0||i>=h.length)throw new TypeError("CronPattern: Value out of range: '"+e+"'");if(s>i)throw new TypeError("CronPattern: From value is larger than to value: '"+e+"'");for(o=s;o<=i;o++)h[o+r]=1}else if(-1!==e.indexOf("/")){if(n=e.split("/"),2!==n.length)throw new TypeError("CronPattern: Syntax error, illegal stepping: '"+e+"'");if("*"!==n[0])throw new TypeError("CronPattern: Syntax error, left part of / needs to be * : '"+e+"'");if(a=parseInt(n[1],10),isNaN(a))throw new TypeError("CronPattern: Syntax error, illegal stepping: (NaN)");if(0===a)throw new TypeError("CronPattern: Syntax error, illegal stepping: 0");if(a>h.length)throw new TypeError("CronPattern: Syntax error, steps cannot be greater than maximum value of part ("+h.length+")");for(o=0;o<h.length;o+=a)h[o+r]=1}else{if(o=parseInt(e,10)+r,o<0||o>=h.length)throw new TypeError("CronPattern: "+t+" value out of range: '"+e+"'");h[o]=1}else for(o=0;o<h.length;o++)h[o]=1};const n=Math.pow(2,31)-1;function s(t,e,r){return this instanceof s?(this.pattern=new o(t),"function"==typeof e&&(r=e,e=void 0),this.options=this.processOptions(e),void 0!==r&&this.schedule(r),this):new s(t,e,r)}s.prototype.processOptions=function(t){return void 0===t&&(t={}),t.paused=void 0!==t.paused&&t.paused,t.maxRuns=void 0===t.maxRuns?1/0:t.maxRuns,t.kill=!1,t.startAt&&(t.startAt=new r(t.startAt,t.timezone)),t.stopAt&&(t.stopAt=new r(t.stopAt,t.timezone)),t},s.prototype.next=function(t){let e=this._next(t);return e?e.getDate():null},s.prototype.previous=function(){return this.previousrun?this.previousrun.getDate():null},s.prototype._next=function(t){t=new r(t,this.options.timezone),this.options.startAt&&t&&t.getTime()<this.options.startAt.getTime()&&(t=new r(this.options.startAt,this.options.timezone));let e=new r(t,this.options.timezone).increment(this.pattern);return null===e||this.options.maxRuns<=0||this.options.kill||this.options.stopAt&&e.getTime()>=this.options.stopAt.getTime()?null:e},s.prototype.msToNext=function(t){t=t||new r(void 0,this.options.timezone);let e=this._next(t);return e?e.getTime()-t.getTime():null},s.prototype.stop=function(){this.options.kill=!0,this.currentTimeout&&clearTimeout(this.currentTimeout)},s.prototype.pause=function(){return(this.options.paused=!0)&&!this.options.kill},s.prototype.resume=function(){return!(this.options.paused=!1)&&!this.options.kill},s.prototype.schedule=function(t){let e=this,o=this.msToNext(e.previousrun),s=e.maxDelay||n;return o>s&&(o=s),null!==o&&(e.currentTimeout=setTimeout((function(){o!==s&&(e.options.paused||(e.options.maxRuns--,t()),e.previousrun=new r(void 0,e.options.timezone)),e.schedule(t)}),o)),this};const i=s;return e.default})()}));

package/dist/croner.min.mjs

@@ -1 +1 @@
-var t={d:(e,r)=>{for(var s in r)t.o(r,s)&&!t.o(e,s)&&Object.defineProperty(e,s,{enumerable:!0,get:r[s]})},o:(t,e)=>Object.prototype.hasOwnProperty.call(t,e)},e={};t.d(e,{P:()=>n,Z:()=>i});function r(t,e){if(this.timezone=e,t&&t instanceof Date)this.fromDate(t);else if(void 0===t)this.fromDate(new Date);else if(t&&"string"==typeof t)this.fromString(t);else{if(!(t instanceof r))throw new TypeError("CronDate: Invalid type passed as parameter to CronDate constructor");this.fromCronDate(t)}}function s(t){this.pattern=t,this.seconds=Array(60).fill(0),this.minutes=Array(60).fill(0),this.hours=Array(24).fill(0),this.days=Array(31).fill(0),this.months=Array(12).fill(0),this.daysOfWeek=Array(8).fill(0),this.parse()}r.prototype.fromDate=function(t){let e=t.getTime();this.timezone&&(t=function(t,e){return new Date(t.toLocaleString("en-US",{timeZone:e}))}(t,this.timezone));let r=t.getTime();this.UTCmsOffset=r-e,this.milliseconds=t.getMilliseconds(),this.seconds=t.getSeconds(),this.minutes=t.getMinutes(),this.hours=t.getHours(),this.days=t.getDate(),this.months=t.getMonth(),this.years=t.getFullYear()},r.prototype.fromCronDate=function(t){this.UTCmsOffset=t.UTCmsOffset,this.milliseconds=t.milliseconds,this.seconds=t.seconds,this.minutes=t.minutes,this.hours=t.hours,this.days=t.days,this.months=t.months,this.years=t.years},r.prototype.fromString=function(t){let e=Date.parse(t);if(isNaN(e))throw new TypeError("CronDate: Provided string value for CronDate could not be parsed as date.");this.fromDate(new Date(e))},r.prototype.increment=function(t){this.seconds+=1,this.milliseconds=0;let e=this,r=function(t,r,s,o){for(let n=void 0===o?e[t]+s:0+s;n<r[t].length;n++)if(r[t][n])return e[t]=n-s,!0;return!1},s=[["seconds","minutes",0],["minutes","hours",0],["hours","days",0],["days","months",-1],["months","years",0]],o=0;for(;o<5;){if(!r(s[o][0],t,s[o][2]))for(this[s[o][1]]++;o>=0;)r(s[o][0],t,s[o][2],0),o--;o++}for(;!t.daysOfWeek[this.getDate().getDay()];)this.days+=1;return this},r.prototype.getDate=function(){return new Date(this.years,this.months,this.days,this.hours,this.minutes,this.seconds,this.milliseconds-this.UTCmsOffset)},r.prototype.getTime=function(){return new Date(this.years,this.months,this.days,this.hours,this.minutes,this.seconds,this.milliseconds-this.UTCmsOffset).getTime()},s.prototype.parse=function(){if("string"!=typeof this.pattern&&this.pattern.constructor!==String)throw new TypeError("CronPattern: Pattern has to be of type string.");let t,e,r,s,o,n=this.pattern.trim().replace(/\s+/g," ").split(" "),i=/[^/*0-9,-]+/;if(n.length<5||n.length>6)throw new TypeError("CronPattern: invalid configuration format ('"+this.pattern+"'), exacly five or six space separated parts required.");for(5===n.length&&n.unshift("0"),e=0;e<n.length;e++)if(t=n[e].trim(),i.test(t))throw new TypeError("CronPattern: configuration entry "+(e+1)+" ("+t+") contains illegal characters.");if(r="*"!==n[4],s="*"!==n[5],o="*"!==n[3],s&&(r||o))throw new TypeError("CronPattern: configuration invalid, you can not combine month/date with day of week.");this.partToArray("seconds",n[0],0),this.partToArray("minutes",n[1],0),this.partToArray("hours",n[2],0),this.partToArray("days",n[3],-1),this.partToArray("months",n[4],-1),this.partToArray("daysOfWeek",n[5],0),this.daysOfWeek[7]&&(this.daysOfWeek[0]=1)},s.prototype.partToArray=function(t,e,r){let s,o,n,i,a,h=this[t];if("*"!==e)if(o=e.split(","),o.length>1)for(s=0;s<o.length;s++)this.partToArray(t,o[s],r);else if(-1!==e.indexOf("-")){if(o=e.split("-"),2!==o.length)throw new TypeError("CronPattern: Syntax error, illegal range: '"+e+"'");if(n=parseInt(o[0],10)+r,i=parseInt(o[1],10)+r,isNaN(n))throw new TypeError("CronPattern: Syntax error, illegal lower range (NaN)");if(isNaN(i))throw new TypeError("CronPattern: Syntax error, illegal upper range (NaN)");if(n<0||i>=h.length)throw new TypeError("CronPattern: Value out of range: '"+e+"'");if(n>i)throw new TypeError("CronPattern: From value is larger than to value: '"+e+"'");for(s=n;s<=i;s++)h[s+r]=1}else if(-1!==e.indexOf("/")){if(o=e.split("/"),2!==o.length)throw new TypeError("CronPattern: Syntax error, illegal stepping: '"+e+"'");if("*"!==o[0])throw new TypeError("CronPattern: Syntax error, left part of / needs to be * : '"+e+"'");if(a=parseInt(o[1],10),isNaN(a))throw new TypeError("CronPattern: Syntax error, illegal stepping: (NaN)");if(0===a)throw new TypeError("CronPattern: Syntax error, illegal stepping: 0");if(a>h.length)throw new TypeError("CronPattern: Syntax error, steps cannot be greater than maximum value of part ("+h.length+")");for(s=0;s<h.length;s+=a)h[s+r]=1}else{if(s=parseInt(e,10)+r,s<0||s>=h.length)throw new TypeError("CronPattern: "+t+" value out of range: '"+e+"'");h[s]=1}else for(s=0;s<h.length;s++)h[s]=1};const o=Math.pow(2,31)-1;function n(t,e,r){let o=this;return this instanceof n?(o.pattern=new s(t),o.schedulerDefaults={maxRuns:1/0,kill:!1},"function"==typeof e&&(r=e,e={}),o.opts=o.validateOpts(e||{}),void 0===r?o:this.schedule(e,r)):new n(t,e,r)}n.prototype.next=function(t){let e=this._next(t);return e?e.getDate():null},n.prototype.previous=function(){return this.opts.previous?this.opts.previous.getDate():null},n.prototype._next=function(t){t=new r(t,this.opts.timezone),this.opts.startAt&&t&&t.getTime()<this.opts.startAt.getTime()&&(t=new r(this.opts.startAt,this.opts.timezone));let e=new r(t,this.opts.timezone).increment(this.pattern);return this.opts.maxRuns<=0||this.opts.kill||this.opts.stopAt&&e.getTime()>=this.opts.stopAt.getTime()?null:e},n.prototype.validateOpts=function(t){return t.startAt&&(t.startAt=new r(t.startAt,t.timezone)),t.stopAt&&(t.stopAt=new r(t.stopAt,t.timezone)),t},n.prototype.msToNext=function(t){t=t||new r(void 0,this.opts.timezone);let e=this._next(t);return e?e.getTime()-t.getTime():null},n.prototype.schedule=function(t,e){let r=this;return e||(e=t,t=this.opts),t.paused=void 0!==t.paused&&t.paused,t.kill=t.kill||this.schedulerDefaults.kill,t.maxRuns||0===t.maxRuns||(t.maxRuns=this.schedulerDefaults.maxRuns),this.opts=this.validateOpts(t||{}),this._schedule(e),{stop:function(){r.opts.kill=!0,r.opts.currentTimeout&&clearTimeout(r.opts.currentTimeout)},pause:function(){return(r.opts.paused=!0)&&!r.opts.kill},resume:function(){return!(r.opts.paused=!1)&&!r.opts.kill}}},n.prototype._schedule=function(t){let e,s=this,n=s.maxDelay||o;e=this.msToNext(s.opts.previous),null!==e&&(e>n&&(e=n),s.opts.currentTimeout=setTimeout((function(){e!==n&&(s.opts.paused||(s.opts.maxRuns--,t()),s.opts.previous=new r(void 0,s.opts.timezone)),s._schedule(t)}),e))};const i=n;var a=e.P,h=e.Z;export{a as Cron,h as default};
+var t={d:(e,r)=>{for(var s in r)t.o(r,s)&&!t.o(e,s)&&Object.defineProperty(e,s,{enumerable:!0,get:r[s]})},o:(t,e)=>Object.prototype.hasOwnProperty.call(t,e)},e={};t.d(e,{P:()=>o,Z:()=>i});function r(t,e){if(this.timezone=e,t&&t instanceof Date)this.fromDate(t);else if(void 0===t)this.fromDate(new Date);else if(t&&"string"==typeof t)this.fromString(t);else{if(!(t instanceof r))throw new TypeError("CronDate: Invalid type ("+typeof t+") passed as parameter to CronDate constructor");this.fromCronDate(t)}}function s(t){this.pattern=t,this.seconds=Array(60).fill(0),this.minutes=Array(60).fill(0),this.hours=Array(24).fill(0),this.days=Array(31).fill(0),this.months=Array(12).fill(0),this.daysOfWeek=Array(8).fill(0),this.parse()}r.prototype.fromDate=function(t){let e=t.getTime();this.timezone&&(t=function(t,e){return new Date(t.toLocaleString("en-US",{timeZone:e}))}(t,this.timezone));let r=t.getTime();this.UTCmsOffset=r-e,this.milliseconds=t.getMilliseconds(),this.seconds=t.getSeconds(),this.minutes=t.getMinutes(),this.hours=t.getHours(),this.days=t.getDate(),this.months=t.getMonth(),this.years=t.getFullYear()},r.prototype.fromCronDate=function(t){this.UTCmsOffset=t.UTCmsOffset,this.timezone=t.timezone;let e=new Date(t.years,t.months,t.days,t.hours,t.minutes,t.seconds,t.milliseconds);this.milliseconds=e.getMilliseconds(),this.seconds=e.getSeconds(),this.minutes=e.getMinutes(),this.hours=e.getHours(),this.days=e.getDate(),this.months=e.getMonth(),this.years=e.getFullYear()},r.prototype.fromString=function(t){let e=Date.parse(t);if(isNaN(e))throw new TypeError("CronDate: Provided string value for CronDate could not be parsed as date.");this.fromDate(new Date(e))},r.prototype.increment=function(t,e){e||(this.seconds+=1);let s=this.getTime();this.milliseconds=0;let n=this,o=function(t,e,r,s){for(let o=void 0===s?n[t]+r:0+r;o<e[t].length;o++)if(e[t][o])return n[t]=o-r,!0;return!1},i=function(){for(;h>=0;)o(a[h][0],t,a[h][2],0),h--},a=[["seconds","minutes",0],["minutes","hours",0],["hours","days",0],["days","months",-1],["months","years",0]],h=0;for(;h<5;)o(a[h][0],t,a[h][2])||(this[a[h][1]]++,i()),h++;for(;!t.daysOfWeek[this.getDate().getDay()];)this.days+=1,h=2,i();return s!=n.getTime()?(n=new r(n),this.years>=4e3?null:n.increment(t,!0)):this},r.prototype.getDate=function(){return new Date(this.years,this.months,this.days,this.hours,this.minutes,this.seconds,this.milliseconds-this.UTCmsOffset)},r.prototype.getTime=function(){return new Date(this.years,this.months,this.days,this.hours,this.minutes,this.seconds,this.milliseconds-this.UTCmsOffset).getTime()},s.prototype.parse=function(){if("string"!=typeof this.pattern&&this.pattern.constructor!==String)throw new TypeError("CronPattern: Pattern has to be of type string.");let t,e,r=this.pattern.trim().replace(/\s+/g," ").split(" "),s=/[^/*0-9,-]+/;if(r.length<5||r.length>6)throw new TypeError("CronPattern: invalid configuration format ('"+this.pattern+"'), exacly five or six space separated parts required.");for(5===r.length&&r.unshift("0"),e=0;e<r.length;e++)if(t=r[e].trim(),s.test(t))throw new TypeError("CronPattern: configuration entry "+(e+1)+" ("+t+") contains illegal characters.");this.partToArray("seconds",r[0],0),this.partToArray("minutes",r[1],0),this.partToArray("hours",r[2],0),this.partToArray("days",r[3],-1),this.partToArray("months",r[4],-1),this.partToArray("daysOfWeek",r[5],0),this.daysOfWeek[7]&&(this.daysOfWeek[0]=1)},s.prototype.partToArray=function(t,e,r){let s,n,o,i,a,h=this[t];if("*"!==e)if(n=e.split(","),n.length>1)for(s=0;s<n.length;s++)this.partToArray(t,n[s],r);else if(-1!==e.indexOf("-")){if(n=e.split("-"),2!==n.length)throw new TypeError("CronPattern: Syntax error, illegal range: '"+e+"'");if(o=parseInt(n[0],10)+r,i=parseInt(n[1],10)+r,isNaN(o))throw new TypeError("CronPattern: Syntax error, illegal lower range (NaN)");if(isNaN(i))throw new TypeError("CronPattern: Syntax error, illegal upper range (NaN)");if(o<0||i>=h.length)throw new TypeError("CronPattern: Value out of range: '"+e+"'");if(o>i)throw new TypeError("CronPattern: From value is larger than to value: '"+e+"'");for(s=o;s<=i;s++)h[s+r]=1}else if(-1!==e.indexOf("/")){if(n=e.split("/"),2!==n.length)throw new TypeError("CronPattern: Syntax error, illegal stepping: '"+e+"'");if("*"!==n[0])throw new TypeError("CronPattern: Syntax error, left part of / needs to be * : '"+e+"'");if(a=parseInt(n[1],10),isNaN(a))throw new TypeError("CronPattern: Syntax error, illegal stepping: (NaN)");if(0===a)throw new TypeError("CronPattern: Syntax error, illegal stepping: 0");if(a>h.length)throw new TypeError("CronPattern: Syntax error, steps cannot be greater than maximum value of part ("+h.length+")");for(s=0;s<h.length;s+=a)h[s+r]=1}else{if(s=parseInt(e,10)+r,s<0||s>=h.length)throw new TypeError("CronPattern: "+t+" value out of range: '"+e+"'");h[s]=1}else for(s=0;s<h.length;s++)h[s]=1};const n=Math.pow(2,31)-1;function o(t,e,r){return this instanceof o?(this.pattern=new s(t),"function"==typeof e&&(r=e,e=void 0),this.options=this.processOptions(e),void 0!==r&&this.schedule(r),this):new o(t,e,r)}o.prototype.processOptions=function(t){return void 0===t&&(t={}),t.paused=void 0!==t.paused&&t.paused,t.maxRuns=void 0===t.maxRuns?1/0:t.maxRuns,t.kill=!1,t.startAt&&(t.startAt=new r(t.startAt,t.timezone)),t.stopAt&&(t.stopAt=new r(t.stopAt,t.timezone)),t},o.prototype.next=function(t){let e=this._next(t);return e?e.getDate():null},o.prototype.previous=function(){return this.previousrun?this.previousrun.getDate():null},o.prototype._next=function(t){t=new r(t,this.options.timezone),this.options.startAt&&t&&t.getTime()<this.options.startAt.getTime()&&(t=new r(this.options.startAt,this.options.timezone));let e=new r(t,this.options.timezone).increment(this.pattern);return null===e||this.options.maxRuns<=0||this.options.kill||this.options.stopAt&&e.getTime()>=this.options.stopAt.getTime()?null:e},o.prototype.msToNext=function(t){t=t||new r(void 0,this.options.timezone);let e=this._next(t);return e?e.getTime()-t.getTime():null},o.prototype.stop=function(){this.options.kill=!0,this.currentTimeout&&clearTimeout(this.currentTimeout)},o.prototype.pause=function(){return(this.options.paused=!0)&&!this.options.kill},o.prototype.resume=function(){return!(this.options.paused=!1)&&!this.options.kill},o.prototype.schedule=function(t){let e=this,s=this.msToNext(e.previousrun),o=e.maxDelay||n;return s>o&&(s=o),null!==s&&(e.currentTimeout=setTimeout((function(){s!==o&&(e.options.paused||(e.options.maxRuns--,t()),e.previousrun=new r(void 0,e.options.timezone)),e.schedule(t)}),s)),this};const i=o;var a=e.P,h=e.Z;export{a as Cron,h as default};

package/dist-legacy/croner.cjs

@@ -1 +1 @@
-!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.Cron=e():t.Cron=e()}(this,(function(){return(()=>{"use strict";var t={d:(e,r)=>{for(var s in r)t.o(r,s)&&!t.o(e,s)&&Object.defineProperty(e,s,{enumerable:!0,get:r[s]})},o:(t,e)=>Object.prototype.hasOwnProperty.call(t,e)},e={};t.d(e,{default:()=>i});function r(t,e){if(this.timezone=e,t&&t instanceof Date)this.fromDate(t);else if(void 0===t)this.fromDate(new Date);else if(t&&"string"==typeof t)this.fromString(t);else{if(!(t instanceof r))throw new TypeError("CronDate: Invalid type passed as parameter to CronDate constructor");this.fromCronDate(t)}}function s(t){this.pattern=t,this.seconds=Array(60).fill(0),this.minutes=Array(60).fill(0),this.hours=Array(24).fill(0),this.days=Array(31).fill(0),this.months=Array(12).fill(0),this.daysOfWeek=Array(8).fill(0),this.parse()}r.prototype.fromDate=function(t){let e=t.getTime();this.timezone&&(t=function(t,e){return new Date(t.toLocaleString("en-US",{timeZone:e}))}(t,this.timezone));let r=t.getTime();this.UTCmsOffset=r-e,this.milliseconds=t.getMilliseconds(),this.seconds=t.getSeconds(),this.minutes=t.getMinutes(),this.hours=t.getHours(),this.days=t.getDate(),this.months=t.getMonth(),this.years=t.getFullYear()},r.prototype.fromCronDate=function(t){this.UTCmsOffset=t.UTCmsOffset,this.milliseconds=t.milliseconds,this.seconds=t.seconds,this.minutes=t.minutes,this.hours=t.hours,this.days=t.days,this.months=t.months,this.years=t.years},r.prototype.fromString=function(t){let e=Date.parse(t);if(isNaN(e))throw new TypeError("CronDate: Provided string value for CronDate could not be parsed as date.");this.fromDate(new Date(e))},r.prototype.increment=function(t){this.seconds+=1,this.milliseconds=0;let e=this,r=function(t,r,s,o){for(let n=void 0===o?e[t]+s:0+s;n<r[t].length;n++)if(r[t][n])return e[t]=n-s,!0;return!1},s=[["seconds","minutes",0],["minutes","hours",0],["hours","days",0],["days","months",-1],["months","years",0]],o=0;for(;o<5;){if(!r(s[o][0],t,s[o][2]))for(this[s[o][1]]++;o>=0;)r(s[o][0],t,s[o][2],0),o--;o++}for(;!t.daysOfWeek[this.getDate().getDay()];)this.days+=1;return this},r.prototype.getDate=function(){return new Date(this.years,this.months,this.days,this.hours,this.minutes,this.seconds,this.milliseconds-this.UTCmsOffset)},r.prototype.getTime=function(){return new Date(this.years,this.months,this.days,this.hours,this.minutes,this.seconds,this.milliseconds-this.UTCmsOffset).getTime()},s.prototype.parse=function(){if("string"!=typeof this.pattern&&this.pattern.constructor!==String)throw new TypeError("CronPattern: Pattern has to be of type string.");let t,e,r,s,o,n=this.pattern.trim().replace(/\s+/g," ").split(" "),i=/[^/*0-9,-]+/;if(n.length<5||n.length>6)throw new TypeError("CronPattern: invalid configuration format ('"+this.pattern+"'), exacly five or six space separated parts required.");for(5===n.length&&n.unshift("0"),e=0;e<n.length;e++)if(t=n[e].trim(),i.test(t))throw new TypeError("CronPattern: configuration entry "+(e+1)+" ("+t+") contains illegal characters.");if(r="*"!==n[4],s="*"!==n[5],o="*"!==n[3],s&&(r||o))throw new TypeError("CronPattern: configuration invalid, you can not combine month/date with day of week.");this.partToArray("seconds",n[0],0),this.partToArray("minutes",n[1],0),this.partToArray("hours",n[2],0),this.partToArray("days",n[3],-1),this.partToArray("months",n[4],-1),this.partToArray("daysOfWeek",n[5],0),this.daysOfWeek[7]&&(this.daysOfWeek[0]=1)},s.prototype.partToArray=function(t,e,r){let s,o,n,i,a,h=this[t];if("*"!==e)if(o=e.split(","),o.length>1)for(s=0;s<o.length;s++)this.partToArray(t,o[s],r);else if(-1!==e.indexOf("-")){if(o=e.split("-"),2!==o.length)throw new TypeError("CronPattern: Syntax error, illegal range: '"+e+"'");if(n=parseInt(o[0],10)+r,i=parseInt(o[1],10)+r,isNaN(n))throw new TypeError("CronPattern: Syntax error, illegal lower range (NaN)");if(isNaN(i))throw new TypeError("CronPattern: Syntax error, illegal upper range (NaN)");if(n<0||i>=h.length)throw new TypeError("CronPattern: Value out of range: '"+e+"'");if(n>i)throw new TypeError("CronPattern: From value is larger than to value: '"+e+"'");for(s=n;s<=i;s++)h[s+r]=1}else if(-1!==e.indexOf("/")){if(o=e.split("/"),2!==o.length)throw new TypeError("CronPattern: Syntax error, illegal stepping: '"+e+"'");if("*"!==o[0])throw new TypeError("CronPattern: Syntax error, left part of / needs to be * : '"+e+"'");if(a=parseInt(o[1],10),isNaN(a))throw new TypeError("CronPattern: Syntax error, illegal stepping: (NaN)");if(0===a)throw new TypeError("CronPattern: Syntax error, illegal stepping: 0");if(a>h.length)throw new TypeError("CronPattern: Syntax error, steps cannot be greater than maximum value of part ("+h.length+")");for(s=0;s<h.length;s+=a)h[s+r]=1}else{if(s=parseInt(e,10)+r,s<0||s>=h.length)throw new TypeError("CronPattern: "+t+" value out of range: '"+e+"'");h[s]=1}else for(s=0;s<h.length;s++)h[s]=1};const o=Math.pow(2,31)-1;function n(t,e,r){let o=this;return this instanceof n?(o.pattern=new s(t),o.schedulerDefaults={maxRuns:1/0,kill:!1},"function"==typeof e&&(r=e,e={}),o.opts=o.validateOpts(e||{}),void 0===r?o:this.schedule(e,r)):new n(t,e,r)}n.prototype.next=function(t){let e=this._next(t);return e?e.getDate():null},n.prototype.previous=function(){return this.opts.previous?this.opts.previous.getDate():null},n.prototype._next=function(t){t=new r(t,this.opts.timezone),this.opts.startAt&&t&&t.getTime()<this.opts.startAt.getTime()&&(t=new r(this.opts.startAt,this.opts.timezone));let e=new r(t,this.opts.timezone).increment(this.pattern);return this.opts.maxRuns<=0||this.opts.kill||this.opts.stopAt&&e.getTime()>=this.opts.stopAt.getTime()?null:e},n.prototype.validateOpts=function(t){return t.startAt&&(t.startAt=new r(t.startAt,t.timezone)),t.stopAt&&(t.stopAt=new r(t.stopAt,t.timezone)),t},n.prototype.msToNext=function(t){t=t||new r(void 0,this.opts.timezone);let e=this._next(t);return e?e.getTime()-t.getTime():null},n.prototype.schedule=function(t,e){let r=this;return e||(e=t,t=this.opts),t.paused=void 0!==t.paused&&t.paused,t.kill=t.kill||this.schedulerDefaults.kill,t.maxRuns||0===t.maxRuns||(t.maxRuns=this.schedulerDefaults.maxRuns),this.opts=this.validateOpts(t||{}),this._schedule(e),{stop:function(){r.opts.kill=!0,r.opts.currentTimeout&&clearTimeout(r.opts.currentTimeout)},pause:function(){return(r.opts.paused=!0)&&!r.opts.kill},resume:function(){return!(r.opts.paused=!1)&&!r.opts.kill}}},n.prototype._schedule=function(t){let e,s=this,n=s.maxDelay||o;e=this.msToNext(s.opts.previous),null!==e&&(e>n&&(e=n),s.opts.currentTimeout=setTimeout((function(){e!==n&&(s.opts.paused||(s.opts.maxRuns--,t()),s.opts.previous=new r(void 0,s.opts.timezone)),s._schedule(t)}),e))};const i=n;return e.default})()}));
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.Cron=e():t.Cron=e()}(this,(function(){return(()=>{"use strict";var t={d:(e,r)=>{for(var o in r)t.o(r,o)&&!t.o(e,o)&&Object.defineProperty(e,o,{enumerable:!0,get:r[o]})},o:(t,e)=>Object.prototype.hasOwnProperty.call(t,e)},e={};t.d(e,{default:()=>i});function r(t,e){if(this.timezone=e,t&&t instanceof Date)this.fromDate(t);else if(void 0===t)this.fromDate(new Date);else if(t&&"string"==typeof t)this.fromString(t);else{if(!(t instanceof r))throw new TypeError("CronDate: Invalid type ("+typeof t+") passed as parameter to CronDate constructor");this.fromCronDate(t)}}function o(t){this.pattern=t,this.seconds=Array(60).fill(0),this.minutes=Array(60).fill(0),this.hours=Array(24).fill(0),this.days=Array(31).fill(0),this.months=Array(12).fill(0),this.daysOfWeek=Array(8).fill(0),this.parse()}r.prototype.fromDate=function(t){let e=t.getTime();this.timezone&&(t=function(t,e){return new Date(t.toLocaleString("en-US",{timeZone:e}))}(t,this.timezone));let r=t.getTime();this.UTCmsOffset=r-e,this.milliseconds=t.getMilliseconds(),this.seconds=t.getSeconds(),this.minutes=t.getMinutes(),this.hours=t.getHours(),this.days=t.getDate(),this.months=t.getMonth(),this.years=t.getFullYear()},r.prototype.fromCronDate=function(t){this.UTCmsOffset=t.UTCmsOffset,this.timezone=t.timezone;let e=new Date(t.years,t.months,t.days,t.hours,t.minutes,t.seconds,t.milliseconds);this.milliseconds=e.getMilliseconds(),this.seconds=e.getSeconds(),this.minutes=e.getMinutes(),this.hours=e.getHours(),this.days=e.getDate(),this.months=e.getMonth(),this.years=e.getFullYear()},r.prototype.fromString=function(t){let e=Date.parse(t);if(isNaN(e))throw new TypeError("CronDate: Provided string value for CronDate could not be parsed as date.");this.fromDate(new Date(e))},r.prototype.increment=function(t,e){e||(this.seconds+=1);let o=this.getTime();this.milliseconds=0;let n=this,s=function(t,e,r,o){for(let s=void 0===o?n[t]+r:0+r;s<e[t].length;s++)if(e[t][s])return n[t]=s-r,!0;return!1},i=function(){for(;h>=0;)s(a[h][0],t,a[h][2],0),h--},a=[["seconds","minutes",0],["minutes","hours",0],["hours","days",0],["days","months",-1],["months","years",0]],h=0;for(;h<5;)s(a[h][0],t,a[h][2])||(this[a[h][1]]++,i()),h++;for(;!t.daysOfWeek[this.getDate().getDay()];)this.days+=1,h=2,i();return o!=n.getTime()?(n=new r(n),this.years>=4e3?null:n.increment(t,!0)):this},r.prototype.getDate=function(){return new Date(this.years,this.months,this.days,this.hours,this.minutes,this.seconds,this.milliseconds-this.UTCmsOffset)},r.prototype.getTime=function(){return new Date(this.years,this.months,this.days,this.hours,this.minutes,this.seconds,this.milliseconds-this.UTCmsOffset).getTime()},o.prototype.parse=function(){if("string"!=typeof this.pattern&&this.pattern.constructor!==String)throw new TypeError("CronPattern: Pattern has to be of type string.");let t,e,r=this.pattern.trim().replace(/\s+/g," ").split(" "),o=/[^/*0-9,-]+/;if(r.length<5||r.length>6)throw new TypeError("CronPattern: invalid configuration format ('"+this.pattern+"'), exacly five or six space separated parts required.");for(5===r.length&&r.unshift("0"),e=0;e<r.length;e++)if(t=r[e].trim(),o.test(t))throw new TypeError("CronPattern: configuration entry "+(e+1)+" ("+t+") contains illegal characters.");this.partToArray("seconds",r[0],0),this.partToArray("minutes",r[1],0),this.partToArray("hours",r[2],0),this.partToArray("days",r[3],-1),this.partToArray("months",r[4],-1),this.partToArray("daysOfWeek",r[5],0),this.daysOfWeek[7]&&(this.daysOfWeek[0]=1)},o.prototype.partToArray=function(t,e,r){let o,n,s,i,a,h=this[t];if("*"!==e)if(n=e.split(","),n.length>1)for(o=0;o<n.length;o++)this.partToArray(t,n[o],r);else if(-1!==e.indexOf("-")){if(n=e.split("-"),2!==n.length)throw new TypeError("CronPattern: Syntax error, illegal range: '"+e+"'");if(s=parseInt(n[0],10)+r,i=parseInt(n[1],10)+r,isNaN(s))throw new TypeError("CronPattern: Syntax error, illegal lower range (NaN)");if(isNaN(i))throw new TypeError("CronPattern: Syntax error, illegal upper range (NaN)");if(s<0||i>=h.length)throw new TypeError("CronPattern: Value out of range: '"+e+"'");if(s>i)throw new TypeError("CronPattern: From value is larger than to value: '"+e+"'");for(o=s;o<=i;o++)h[o+r]=1}else if(-1!==e.indexOf("/")){if(n=e.split("/"),2!==n.length)throw new TypeError("CronPattern: Syntax error, illegal stepping: '"+e+"'");if("*"!==n[0])throw new TypeError("CronPattern: Syntax error, left part of / needs to be * : '"+e+"'");if(a=parseInt(n[1],10),isNaN(a))throw new TypeError("CronPattern: Syntax error, illegal stepping: (NaN)");if(0===a)throw new TypeError("CronPattern: Syntax error, illegal stepping: 0");if(a>h.length)throw new TypeError("CronPattern: Syntax error, steps cannot be greater than maximum value of part ("+h.length+")");for(o=0;o<h.length;o+=a)h[o+r]=1}else{if(o=parseInt(e,10)+r,o<0||o>=h.length)throw new TypeError("CronPattern: "+t+" value out of range: '"+e+"'");h[o]=1}else for(o=0;o<h.length;o++)h[o]=1};const n=Math.pow(2,31)-1;function s(t,e,r){return this instanceof s?(this.pattern=new o(t),"function"==typeof e&&(r=e,e=void 0),this.options=this.processOptions(e),void 0!==r&&this.schedule(r),this):new s(t,e,r)}s.prototype.processOptions=function(t){return void 0===t&&(t={}),t.paused=void 0!==t.paused&&t.paused,t.maxRuns=void 0===t.maxRuns?1/0:t.maxRuns,t.kill=!1,t.startAt&&(t.startAt=new r(t.startAt,t.timezone)),t.stopAt&&(t.stopAt=new r(t.stopAt,t.timezone)),t},s.prototype.next=function(t){let e=this._next(t);return e?e.getDate():null},s.prototype.previous=function(){return this.previousrun?this.previousrun.getDate():null},s.prototype._next=function(t){t=new r(t,this.options.timezone),this.options.startAt&&t&&t.getTime()<this.options.startAt.getTime()&&(t=new r(this.options.startAt,this.options.timezone));let e=new r(t,this.options.timezone).increment(this.pattern);return null===e||this.options.maxRuns<=0||this.options.kill||this.options.stopAt&&e.getTime()>=this.options.stopAt.getTime()?null:e},s.prototype.msToNext=function(t){t=t||new r(void 0,this.options.timezone);let e=this._next(t);return e?e.getTime()-t.getTime():null},s.prototype.stop=function(){this.options.kill=!0,this.currentTimeout&&clearTimeout(this.currentTimeout)},s.prototype.pause=function(){return(this.options.paused=!0)&&!this.options.kill},s.prototype.resume=function(){return!(this.options.paused=!1)&&!this.options.kill},s.prototype.schedule=function(t){let e=this,o=this.msToNext(e.previousrun),s=e.maxDelay||n;return o>s&&(o=s),null!==o&&(e.currentTimeout=setTimeout((function(){o!==s&&(e.options.paused||(e.options.maxRuns--,t()),e.previousrun=new r(void 0,e.options.timezone)),e.schedule(t)}),o)),this};const i=s;return e.default})()}));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "croner",
-  "version": "3.0.49",
-  "description": "Isomorphic JavaScript cron parser and scheduler.",
+  "version": "4.0.53",
+  "description": "Trigger functions in javascript using Cron syntax. No deps. All features.",
   "author": "Hexagon <github.com/hexagon>",
   "contributors": [
     {
@@ -25,11 +25,12 @@
     "isomorphic"
   ],
   "scripts": {
-    "test": "npm run test:mocha",
-    "test:mocha": "mocha",
+    "test": "npm run test:coverage",
+    "test:dist": "mocha",
+    "test:coverage": "c8 --reporter=text mocha test/test.croner.js",
     "test:lint": "eslint ./**/*.js ./**/*.cjs",
     "test:lint:fix": "eslint --fix  ./**/*.js ./**/*.cjs",
-    "build": "npm run test:lint && npm run build:typings && npm run build:webpack && npm run test:mocha && npm run build:finalize",
+    "build": "npm run test:lint && npm run build:typings && npm run build:webpack && npm run test:coverage && npm run build:finalize",
     "build:webpack": "webpack",
     "build:typings": "tsc",
     "build:finalize": "echo \"All good\""
@@ -52,6 +53,7 @@
   },
   "types": "types/croner.d.ts",
   "devDependencies": {
+    "c8": "^7.10.0",
     "eslint": "^7.32.0",
     "mocha": "^9.1.2",
     "should": "^13.2.3",

package/src/croner.js

@@ -35,10 +35,8 @@ import { CronPattern } from "./pattern.js";
  *
  * @typedef {Object} CronOptions - Cron scheduler options
  * @property {boolean} [paused] - Job is paused
- * @property {boolean} [kill] - Job is about to be killed
+ * @property {boolean} [kill] - Job is about to be killed or killed
  * @property {number} [maxRuns] - Maximum nuber of executions
- * @property {number} [currentTimeout] - Internal: setTimeout "id"
- * @property {CronNextResult} [previous] - Previous run time
  * @property {string | Date} [startAt] - When to start running
  * @property {string | Date} [stopAt] - When to stop running
  * @property {string} [timezone] - Time zone in Europe/Stockholm format
@@ -99,36 +97,53 @@ function Cron (pattern, options, fn) {
 	/** @type {CronPattern} */
 	self.pattern = new CronPattern(pattern);
 
-	/** @type {CronOptions} */
-	self.schedulerDefaults = {
-		maxRuns:    Infinity,
-		kill:       false
-	};
-
 	// Make options optional
 	if( typeof options === "function" ) {
 		fn = options;
-		options = {};
+		options = void 0;
 	}
 
-	/** 
-	 * Store and validate options
-	 * @type {CronOptions} 
+	/** @type {CronOptions} */
+	this.options = this.processOptions(options);
+
+	/**
+	 * Allow shorthand scheduling
 	 */
-	self.opts = self.validateOpts(options || {});
+	if( fn !== void 0 ) {
+		this.schedule(fn);
+	}
 
-	// Determine what to return, default is self
-	if( fn === void 0 ) {
-		// Normal initialization, return self
-		return self;
+	return this;
 
-	} else {
-		// Shorthand schedule requested, return job
-		return this.schedule(options, fn);
+}
 
+/**
+ * 
+ * @param {CronOptions} options 
+ * @returns {CronOptions}
+ */
+Cron.prototype.processOptions = function (options) {
+
+	// If no options are passed, create empty object
+	if (options === void 0) {
+		options = {};
 	}
 
-}
+	// Keep options, or set defaults
+	options.paused = (options.paused === void 0) ? false : options.paused;
+	options.maxRuns = (options.maxRuns === void 0) ? Infinity : options.maxRuns;
+	options.kill = false;
+
+	// startAt is set, validate it
+	if( options.startAt ) {
+		options.startAt = new CronDate(options.startAt, options.timezone);
+	} 
+	if( options.stopAt ) {
+		options.stopAt = new CronDate(options.stopAt, options.timezone);
+	}	
+
+	return options;
+};
 
 /**
  * Find next runtime, based on supplied date. Strips milliseconds.
@@ -147,7 +162,7 @@ Cron.prototype.next = function (prev) {
  * @returns {Date | null} - Previous run time
  */
 Cron.prototype.previous = function () {
-	return this.opts.previous ? this.opts.previous.getDate() : null;
+	return this.previousrun ? this.previousrun.getDate() : null;
 };
 
 /**
@@ -155,24 +170,25 @@ Cron.prototype.previous = function () {
  * @private
  * 
  * @param {Date} prev - Input pattern
- * @returns {CronNextResult | null} - Next run time
+ * @returns {CronDate | null} - Next run time
  */
 Cron.prototype._next = function (prev) {
-	
-	prev = new CronDate(prev, this.opts.timezone);
+
+	prev = new CronDate(prev, this.options.timezone);
 
 	// Previous run should never be before startAt
-	if( this.opts.startAt && prev && prev.getTime() < this.opts.startAt.getTime() ) {
-		prev = new CronDate(this.opts.startAt, this.opts.timezone);
+	if( this.options.startAt && prev && prev.getTime() < this.options.startAt.getTime() ) {
+		prev = new CronDate(this.options.startAt, this.options.timezone);
 	}
 
 	// Calculate next run
-	let nextRun = new CronDate(prev, this.opts.timezone).increment(this.pattern);
+	let nextRun = new CronDate(prev, this.options.timezone).increment(this.pattern);
 
 	// Check for stop condition
-	if ((this.opts.maxRuns <= 0) ||	
-		(this.opts.kill) ||
-		(this.opts.stopAt && nextRun.getTime() >= this.opts.stopAt.getTime() )) {
+	if ((nextRun === null) ||
+		(this.options.maxRuns <= 0) ||	
+		(this.options.kill) ||
+		(this.options.stopAt && nextRun.getTime() >= this.options.stopAt.getTime() )) {
 		return null;
 	} else {
 		// All seem good, return next run
@@ -181,23 +197,6 @@ Cron.prototype._next = function (prev) {
 	
 };
 
-/**
- * Validate (and cleans) options. Raises error on failure.
- * 
- * @param {CronOptions} opts - Input options
- * @returns {CronOptions} - Clean and validated options.
- */
-Cron.prototype.validateOpts = function (opts) {
-	// startAt is set, validate it
-	if( opts.startAt ) {
-		opts.startAt = new CronDate(opts.startAt, opts.timezone);
-	} 
-	if( opts.stopAt ) {
-		opts.stopAt = new CronDate(opts.stopAt, opts.timezone);
-	}
-	return opts;
-};
-
 /**
  * Returns number of milliseconds to next run
  * 
@@ -205,7 +204,7 @@ Cron.prototype.validateOpts = function (opts) {
  * @returns {number | null}
  */
 Cron.prototype.msToNext = function (prev) {
-	prev = prev || new CronDate(void 0, this.opts.timezone);
+	prev = prev || new CronDate(void 0, this.options.timezone);
 	let next = this._next(prev);
 	if( next ) {
 		return (next.getTime() - prev.getTime());
@@ -215,115 +214,84 @@ Cron.prototype.msToNext = function (prev) {
 };
 
 /**
- * Schedule a new job
- * 
- * @signature
- * @param {CronOptions | Function} [options] - Options
- * @param {Function} [func] - Function to be run each iteration of pattern
- * @returns {CronJob}
- * 
+ * Stop execution 
+ * @public
  */
-Cron.prototype.schedule = function (opts, func) {
-	
-	let self = this;
-
-	// Make opts optional
-	if( !func ) {
-		func = opts;
-
-		// If options isn't passed to schedule, use stored options
-		opts = this.opts;
+Cron.prototype.stop = function () {
+	this.options.kill = true;
+	// Stop any awaiting call
+	if( this.currentTimeout ) {
+		clearTimeout( this.currentTimeout );
 	}
+};
 
-	// Keep options, or set defaults
-	opts.paused = (opts.paused === void 0) ? false : opts.paused;
-	opts.kill = opts.kill || this.schedulerDefaults.kill;
-	if( !opts.maxRuns && opts.maxRuns !== 0 ) {
-		opts.maxRuns = this.schedulerDefaults.maxRuns;
-	}
-
-	// Store options
-	this.opts = this.validateOpts(opts || {});
-
-	this._schedule(func);
-
-	
-	// Return control functions
-	return {
-
-		// Return undefined
-		stop: function() {
-			self.opts.kill = true;
-			// Stop any awaiting call
-			if( self.opts.currentTimeout ) {
-				clearTimeout( self.opts.currentTimeout );
-			}
-		},
-
-		// Return bool wether pause were successful
-		pause: function() {
-			return (self.opts.paused = true) && !self.opts.kill;
-		},
-
-		// Return bool wether resume were successful
-		resume: function () {
-			return !(self.opts.paused = false) && !self.opts.kill;
-		}
+/**
+ * Pause execution
+ * @public
+ * 
+ * @returns {boolean} - Wether pause was successful
+ */
+Cron.prototype.pause = function () {
+	return (this.options.paused = true) && !this.options.kill;
+};
 
-	};
+/**
+ * Pause execution
+ * @public
+ * 
+ * @returns {boolean} - Wether resume was successful
+ */
+Cron.prototype.resume = function () {
+	return !(this.options.paused = false) && !this.options.kill;
 };
 
 /**
  * Schedule a new job
- * @private
+ * @public
  * 
- * @param {Function} [func] - Function to be run each iteration of pattern
+ * @param {Function} func - Function to be run each iteration of pattern
  * @returns {CronJob}
  */
-Cron.prototype._schedule = function (func) {
+Cron.prototype.schedule = function (func) {
 
 	let self = this,
-		waitMs,
+	
+		// Get ms to next run
+		waitMs = this.msToNext(self.previousrun),
 
 		// Prioritize context before closure,
 		// to allow testing of maximum delay. 
 		_maxDelay = self.maxDelay || maxDelay;
 
-	// Get ms to next run
-	waitMs = this.msToNext(self.opts.previous);
-
-	// Check for stop conditions
-	if  ( waitMs === null ) {
-		return;  
-	} 
-
 	// setTimeout cant handle more than Math.pow(2, 32 - 1) - 1 ms
 	if( waitMs > _maxDelay ) {
 		waitMs = _maxDelay;
 	}
 
 	// All ok, go go!
-	self.opts.currentTimeout = setTimeout(function () {
+	if  ( waitMs !== null ) {
+		self.currentTimeout = setTimeout(function () {
 
-		// Are we running? If waitMs is maxed out, this is a blank run
-		if( waitMs !== _maxDelay ) {
+			// Are we running? If waitMs is maxed out, this is a blank run
+			if( waitMs !== _maxDelay ) {
 
-			if ( !self.opts.paused ) {
-				self.opts.maxRuns--;
-				func();	
-			}
+				if ( !self.options.paused ) {
+					self.options.maxRuns--;
+					func();	
+				}
 
-			self.opts.previous = new CronDate(void 0, self.opts.timezone);
+				self.previousrun = new CronDate(void 0, self.options.timezone);
+			}
 
-		}
+			// Recurseg
+			self.schedule(func);
 
-		// Recurse
-		self._schedule(func);
+		}, waitMs );
+	}
 
-	}, waitMs );
+	return this;
 
 };
 
-
 export default Cron;
 export { Cron };

package/src/date.js

@@ -10,7 +10,7 @@ import convertTZ from "./timezone.js";
 function CronDate (date, timezone) {	
 
 	this.timezone = timezone;
-
+	
 	if (date && date instanceof Date) {
 		this.fromDate(date);
 	} else if (date === void 0) {
@@ -20,7 +20,7 @@ function CronDate (date, timezone) {
 	} else if (date instanceof CronDate) {
 		this.fromCronDate(date);
 	} else {
-		throw new TypeError("CronDate: Invalid type passed as parameter to CronDate constructor");
+		throw new TypeError("CronDate: Invalid type (" + typeof date + ") passed as parameter to CronDate constructor");
 	}
 }
 
@@ -60,14 +60,18 @@ CronDate.prototype.fromDate = function (date) {
 CronDate.prototype.fromCronDate = function (date) {
 
 	this.UTCmsOffset = date.UTCmsOffset;
+	this.timezone = date.timezone;
 
-	this.milliseconds = date.milliseconds;
-	this.seconds = date.seconds;
-	this.minutes = date.minutes;
-	this.hours = date.hours;
-	this.days = date.days;
-	this.months  = date.months;
-	this.years = date.years;
+	// Recreate date object to avoid getDate > 31 etc...
+	let newDate = new Date(date.years, date.months, date.days, date.hours, date.minutes, date.seconds, date.milliseconds);
+	
+	this.milliseconds = newDate.getMilliseconds();
+	this.seconds = newDate.getSeconds();
+	this.minutes = newDate.getMinutes();
+	this.hours = newDate.getHours();
+	this.days = newDate.getDate();
+	this.months  = newDate.getMonth();
+	this.years = newDate.getFullYear();
 };
 
 /**
@@ -93,11 +97,17 @@ CronDate.prototype.fromString = function (str) {
  * @public
  * 
  * @param {string} pattern - The pattern used to increment current state
- * @return {CronPattern} - Returns itself for chaining
+ * @param {boolean} [rerun=false] - If this is an internal incremental run
+ * @return {CronDate|null} - Returns itself for chaining, or null if increment wasnt possible
  */
-CronDate.prototype.increment = function (pattern) {
+CronDate.prototype.increment = function (pattern, rerun) {
+
+	if (!rerun) {
+		this.seconds += 1;
+	}
+
+	let origTime = this.getTime();
 
-	this.seconds += 1;
 	this.milliseconds = 0;
 
 	let self = this,
@@ -119,14 +129,33 @@ CronDate.prototype.increment = function (pattern) {
 			let startPos = (override === void 0) ? self[target] + offset : 0 + offset;
 
 			for( let i = startPos; i < pattern[target].length; i++ ) {
+
 				if( pattern[target][i] ) {
 					self[target] = i-offset;
 					return true;
 				}
 			}
-
 			return false;
 
+		},
+		
+		resetPrevious = function () {
+			// Now when we have gone to next minute, we have to set seconds to the first match
+			// Now we are at 00:01:05 following the same example.
+			// 
+			// This goes all the way back to seconds, hence the reverse loop.
+			while(doing >= 0) {
+
+				// Ok, reset current member(e.g. seconds) to first match in pattern, using 
+				// the same method as aerlier
+				// 
+				// Note the fourth parameter, stating that we should start matching the pattern
+				// from zero, instead of current time.
+				findNext(toDo[doing][0], pattern, toDo[doing][2], 0);
+
+				// Go back up, days -> hours -> minutes -> seconds
+				doing--;
+			}
 		};
 
 	// Array of work to be done, consisting of subarrays described below:
@@ -152,27 +181,11 @@ CronDate.prototype.increment = function (pattern) {
 		// findNext sets the current member to next match in pattern
 		// If time is 00:00:01 and pattern says *:*:05, seconds will
 		// be set to 5
-		if(!findNext(toDo[doing][0], pattern, toDo[doing][2])) {
 
-			// If pattern didn't provide a match, increment next vanlue (e.g. minues)
+		// If pattern didn't provide a match, increment next vanlue (e.g. minues)
+		if(!findNext(toDo[doing][0], pattern, toDo[doing][2])) {
 			this[toDo[doing][1]]++;
-
-			// Now when we have gone to next minute, we have to set seconds to the first match
-			// Now we are at 00:01:05 following the same example.
-			// 
-			// This goes all the way back to seconds, hence the reverse loop.
-			while(doing >= 0) {
-
-				// Ok, reset current member(e.g. seconds) to first match in pattern, using 
-				// the same method as aerlier
-				// 
-				// Note the fourth parameter, stating that we should start matching the pattern
-				// from zero, instead of current time.
-				findNext(toDo[doing][0], pattern, toDo[doing][2], 0);
-
-				// Go back up, days -> hours -> minutes -> seconds
-				doing--;
-			}
+			resetPrevious();
 		}
 
 		// Gp down, seconds -> minutes -> hours -> days -> months -> year
@@ -183,9 +196,22 @@ CronDate.prototype.increment = function (pattern) {
 	// with weekday patterns, it's just to increment days until we get a match.
 	while (!pattern.daysOfWeek[this.getDate().getDay()]) {
 		this.days += 1;
+		doing = 2;
+		resetPrevious();
 	}
 
-	return this;
+	// If anything changed, recreate this CronDate and run again without incrementing
+	if (origTime != self.getTime()) {
+		self = new CronDate(self);
+		if (this.years >= 4000) {
+			// Stop incrementing, an impossible pattern is used
+			return null;
+		} else {
+			return self.increment(pattern, true);
+		}
+	} else {
+		return this;
+	}
 
 };
 

package/src/pattern.js

@@ -37,10 +37,7 @@ CronPattern.prototype.parse = function () {
 	let parts = this.pattern.trim().replace(/\s+/g, " ").split(" "),
 		part,
 		i,
-		reValidCron = /[^/*0-9,-]+/,
-		hasMonths,
-		hasDaysOfWeek,
-		hasDates;
+		reValidCron = /[^/*0-9,-]+/;
 
 	// Validite number of configuration entries
 	if( parts.length < 5 || parts.length > 6 ) {
@@ -62,16 +59,6 @@ CronPattern.prototype.parse = function () {
 		}
 	}
 
-	// Check that we dont have both months and daysofweek
-	hasMonths = (parts[4] !== "*");
-	hasDaysOfWeek = (parts[5] !== "*");
-	hasDates = (parts[3] !== "*");
-
-	// Month/Date and dayofweek is incompatible
-	if( hasDaysOfWeek && (hasMonths || hasDates) ) {
-		throw new TypeError("CronPattern: configuration invalid, you can not combine month/date with day of week.");
-	}
-
 	// Parse parts into arrays, validates as we go
 	this.partToArray("seconds",    parts[0], 0);
 	this.partToArray("minutes",    parts[1], 0);

package/test/src/suite.cjs

@@ -120,6 +120,13 @@ module.exports = function (Cron) {
 			}).should.throw();
 		});
 
+		it("Multiple stepping should throw", function () {
+			(function(){
+				let scheduler = new Cron("* */5/5 * * * *");
+				scheduler.next();
+			}).should.throw();
+		});
+
 		it("Missing lower range should throw", function () {
 			(function(){
 				let scheduler = new Cron("* -9 * * * *");
@@ -134,6 +141,27 @@ module.exports = function (Cron) {
 			}).should.throw();
 		});
 
+		it("Higher upper range than lower range should throw", function () {
+			(function(){
+				let scheduler = new Cron("* 12-2 * * * *");
+				scheduler.next();
+			}).should.throw();
+		});
+
+		it("Rangerange should throw", function () {
+			(function(){
+				let scheduler = new Cron("* 0-0-0 * * * *");
+				scheduler.next();
+			}).should.throw();
+		});
+
+		it("Invalid data type of pattern should throw", function () {
+			(function(){
+				let scheduler = new Cron(new Date());
+				scheduler.next();
+			}).should.throw();
+		});
+
 		it("Valid range should not throw", function () {
 			(function(){
 				let scheduler = new Cron("* 0-9 * * * *");
@@ -182,6 +210,13 @@ module.exports = function (Cron) {
 				scheduler.next();
 			}).should.throw();
 		});
+		
+		it("Array passed as next date should throw", function () {
+			(function(){
+				let scheduler = new Cron("* * * * * *");
+				scheduler.next([]);
+			}).should.throw();
+		});
 
 		it("Valid days should not throw", function () {
 			(function(){
@@ -365,15 +400,14 @@ module.exports = function (Cron) {
 
 		it("* * * * * * with maxRuns: 1 should return undefined after 1.5 seconds", function (done) {
 			let 
-				scheduler = new Cron("* * * * * *");
-			scheduler.schedule({ maxRuns: 1 }, function () {});
+				scheduler = new Cron("* * * * * *", { maxRuns: 1 });
+			scheduler.schedule(function () {});
 			setTimeout(function () {
 				let nextRun = scheduler.next();
 				// Do comparison
 				should.equal(nextRun, void 0);
 				done();
 			},1500);
-
 		});
 
 		it("0 0 0 * * * with 40 iterations should return 40 days from now", function () {
@@ -524,10 +558,7 @@ module.exports = function (Cron) {
 			nextRun0.getTime().should.equal(nextRun7.getTime());
 		});
 
-	});
-
-	describe("Comprehensive testing ( will fail first day of the year)", function () {
-		it("Test milliseconds to 01:01:91 XXXX-01-01 (most often next year), 1000s steps", function () {
+		it("Test milliseconds to 01:01:01 XXXX-01-01 (most often next year), 1000s steps", function () {
 
 			let prevRun = new Date(new Date().setMilliseconds(0)),
 				target = new Date(new Date((prevRun.getFullYear()+1) + "-01-01 01:01:01").getTime()),
@@ -569,5 +600,77 @@ module.exports = function (Cron) {
 			}
 
 		});
+		it("Test when next thursday 1st november occurr, starting from 2021-10-13 00:00:00", function () {
+			//Cron("0 0 0 1 11 4").next(new Date(1634076000000)).getTime().should.equal(1888182000000);
+			Cron("0 0 0 1 11 4").next(new Date(1634076000000)).getFullYear().should.equal(2029);
+		});
+		it("getTime should return expcted difference with different timezones (now)", function () {
+			let timeStockholm = Cron("* * * * * *", {timezone: "Europe/Stockholm"}).next(new Date()).getTime(),
+				timeNewYork = Cron("* * * * * *", {timezone: "America/New_York"}).next(new Date()).getTime();
+
+			// The time right now should be the same in utc wether in new york or stockholm
+			timeStockholm.should.be.above(timeNewYork-1000);
+			timeStockholm.should.be.below(timeNewYork+1000);
+		});
+		/*it("getTime should return expcted difference with different timezones (net sunday 1st november)", function () {
+			let timeStockholm = Cron("* * * 1 11 4", {timezone: "Europe/Stockholm"}).next(new Date(1634076000000)).getTime(),
+				timeNewYork = Cron("* * * 1 11 4", {timezone: "America/New_York"}).next(new Date(1634076000000)).getTime();
+
+			// The time when next sunday 1st november occur should be with 6 hours difference (seen from utc)
+			timeStockholm.should.equal(timeNewYork-6*1000*3600);
+		});*/
+		it("maxRuns should be inherited from scheduler to job", function () {
+			let scheduler = Cron("* * * 1 11 4", {maxRuns: 14}),
+				job = scheduler.schedule(() => {});
+			job.options.maxRuns.should.equal(14);
+			job.stop();
+		});
+		it("Next saturday at 29th of february should occur 2048", function () {
+			let nextSaturday29feb = Cron("0 0 0 29 2 6").next(new Date(1634076000000));
+			nextSaturday29feb.getFullYear().should.equal(2048);
+		});
+		it("Impossible combination should result in null", function () {
+			let impossible = Cron("0 0 0 30 2 6").next(new Date(1634076000000));
+			should.equal(null, impossible);
+		});
+		it("shorthand schedule without options should not throw, and execute", function (done) {
+			(function(){
+				let job = Cron("* * * * * *",() => { job.stop(); done(); });
+			}).should.not.throw();
+		});
+		it("sanity check start stop resume", function () {
+			let job = Cron("* * * 1 11 4",() => {});
+			(function(){
+				job.pause();
+				job.resume();
+				job.stop();
+			}).should.not.throw();
+		});
+		it("pause by options work", function (done) {
+			let job = Cron("* * * * * *",{paused:true},() => { throw new Error("This should not happen"); });
+			setTimeout(function () {
+				job.stop();
+				done();
+			},1500);
+		});
+		it("previous run time should be null if not yet executed", function () {
+			let job = Cron("* * * 1 11 4",() => {});
+			let result = job.previous();
+			should.equal(result,null);
+			job.stop();
+		});
+		it("previous run time should be set if executed", function (done) {
+			let 
+				scheduler = new Cron("* * * * * *", { maxRuns: 1 });
+			scheduler.schedule(function () {});
+			setTimeout(function () {
+				let previous = scheduler.previous();
+				// Do comparison
+				previous.should.be.above(new Date().getTime()-3000);
+				previous.should.be.below(new Date().getTime()+3000);
+				scheduler.stop();
+				done();
+			},1500);
+		});
 	});
 };

package/types/croner.d.ts

@@ -9,21 +9,13 @@ export type CronOptions = {
      */
     paused?: boolean;
     /**
-     * - Job is about to be killed
+     * - Job is about to be killed or killed
      */
     kill?: boolean;
     /**
      * - Maximum nuber of executions
      */
     maxRuns?: number;
-    /**
-     * - Internal: setTimeout "id"
-     */
-    currentTimeout?: number;
-    /**
-     * - Previous run time
-     */
-    previous?: CronNextResult;
     /**
      * - When to start running
      */
@@ -95,12 +87,13 @@ export class Cron {
     /** @type {CronPattern} */
     pattern: CronPattern;
     /** @type {CronOptions} */
-    schedulerDefaults: CronOptions;
+    options: CronOptions;
     /**
-     * Store and validate options
-     * @type {CronOptions}
+     *
+     * @param {CronOptions} options
+     * @returns {CronOptions}
      */
-    opts: CronOptions;
+    processOptions(options: CronOptions): CronOptions;
     /**
      * Find next runtime, based on supplied date. Strips milliseconds.
      *
@@ -115,13 +108,6 @@ export class Cron {
      */
     previous(): Date | null;
     private _next;
-    /**
-     * Validate (and cleans) options. Raises error on failure.
-     *
-     * @param {CronOptions} opts - Input options
-     * @returns {CronOptions} - Clean and validated options.
-     */
-    validateOpts(opts: CronOptions): CronOptions;
     /**
      * Returns number of milliseconds to next run
      *
@@ -129,17 +115,33 @@ export class Cron {
      * @returns {number | null}
      */
     msToNext(prev?: CronNextResult): number | null;
+    /**
+     * Stop execution
+     * @public
+     */
+    public stop(): void;
+    /**
+     * Pause execution
+     * @public
+     *
+     * @returns {boolean} - Wether pause was successful
+     */
+    public pause(): boolean;
+    /**
+     * Pause execution
+     * @public
+     *
+     * @returns {boolean} - Wether resume was successful
+     */
+    public resume(): boolean;
     /**
      * Schedule a new job
+     * @public
      *
-     * @signature
-     * @param {CronOptions | Function} [options] - Options
-     * @param {Function} [func] - Function to be run each iteration of pattern
+     * @param {Function} func - Function to be run each iteration of pattern
      * @returns {CronJob}
-     *
      */
-    schedule(opts: any, func?: Function): CronJob;
-    private _schedule;
+    public schedule(func: Function): CronJob;
 }
 import { CronDate } from "./date.js";
 import { CronPattern } from "./pattern.js";

package/types/date.d.ts

@@ -32,9 +32,10 @@ export class CronDate {
      * @public
      *
      * @param {string} pattern - The pattern used to increment current state
-     * @return {CronPattern} - Returns itself for chaining
+     * @param {boolean} [rerun=false] - If this is an internal incremental run
+     * @return {CronDate|null} - Returns itself for chaining, or null if increment wasnt possible
      */
-    public increment(pattern: string): any;
+    public increment(pattern: string, rerun?: boolean): CronDate | null;
     /**
      * Convert current state back to a javascript Date()
      * @public