@cleverbrush/scheduler 1.0.0-beta.0

package/dist/types.js

@@ -0,0 +1,122 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Schemas = exports.schemaRegistry = void 0;
+const schema_1 = require("@cleverbrush/schema");
+const registry = new schema_1.SchemaRegistry()
+    .addPreprocessor('StringToDate', (value) => {
+    if (typeof value === 'undefined')
+        return value;
+    if (typeof value === 'string') {
+        const time = Date.parse(value);
+        if (Number.isNaN(time))
+            return value;
+        return new Date(time);
+    }
+    return value;
+})
+    .addSchema('Common.Date', ({ object }) => object()
+    .mapToType()
+    .addValidator((value) => value instanceof Date && !Number.isNaN(value)
+    ? {
+        valid: true
+    }
+    : {
+        valid: false,
+        errors: ['should be a valid Date object']
+    }))
+    .addSchema('Templates.Schedule', ({ object, number, alias }) => object({
+    /** Number of days between repeats */
+    interval: number().min(1).max(356),
+    /** Hour (0-23) */
+    hour: number().min(0).max(23).optional(),
+    /** Minute (0-59) */
+    minute: number().min(0).max(59).optional(),
+    /** Do not start earlier than this date */
+    startsOn: alias('Common.Date').optional(),
+    /** Do not repeat after this date */
+    endsOn: alias('Common.Date').optional(),
+    /** Max number of repeats (min 1) */
+    maxOccurences: number().min(1).optional(),
+    /** Skip this number of repeats - 1. Min value is 1.  */
+    startingFromIndex: number().min(1).optional()
+})
+    .setPropPreprocessor('endsOn', 'StringToDate')
+    .addValidator((val) => {
+    if ('endsOn' in val &&
+        'maxOccurences' in val &&
+        // TODO: remove this clause when object validator is fixed in a new version
+        typeof val.endsOf !== 'undefined') {
+        return {
+            valid: false,
+            errors: ['either endsOn or maxOccurences is required']
+        };
+    }
+    return { valid: true };
+}))
+    .addSchemaFrom('Templates.Schedule', 'Models.TaskScheduleMinute', ({ string, schema }) => schema
+    .removeProp('hour')
+    .removeProp('minute')
+    .addProps({
+    /** Repeat every minute */
+    every: string('minute')
+}))
+    .addSchemaFrom('Templates.Schedule', 'Models.TaskScheduleDay', ({ string, schema }) => schema.addProps({
+    /** Repeat every day */
+    every: string('day')
+}))
+    .addSchemaFrom('Templates.Schedule', 'Models.TaskScheduleWeek', ({ schema, number, string, array }) => schema.addProps({
+    /** Repeat every week */
+    every: string('week'),
+    /** Day of week: array of no more than 7 numbers numbers (from 1 to 7 where 1 is Monday). */
+    dayOfWeek: array()
+        .ofType(number().min(1).max(7))
+        .minLength(1)
+        .maxLength(7)
+        .addValidator((val) => {
+        const map = {};
+        for (let i = 0; i < val.length; i++) {
+            if (map[val[i]]) {
+                return {
+                    valid: false,
+                    errors: ['no duplicates allowed']
+                };
+            }
+            map[val[i]] = true;
+        }
+        return {
+            valid: true
+        };
+    })
+}))
+    .addSchemaFrom('Templates.Schedule', 'Models.TaskScheduleMonth', ({ schema, string, number, union }) => schema.addProps({
+    /** Repeat every month */
+    every: string('month'),
+    /** Day - 'last' or number from 1 to 28 */
+    day: union(string('last'), number().min(1).max(28))
+}))
+    .addSchemaFrom('Templates.Schedule', 'Models.TaskScheduleYear', ({ schema, string, number, union }) => schema.addProps({
+    /** Repeat every year */
+    every: string('year'),
+    /** Day - 'last' or number from 1 to 28 */
+    day: union(string('last')).or(number().min(1).max(28)),
+    /** Month - number from 1 to 12 */
+    month: number().min(1).max(12)
+}));
+exports.schemaRegistry = registry
+    .addSchema('Models.Schedule', ({ alias, union }) => union(alias('Models.TaskScheduleMinute'), alias('Models.TaskScheduleDay'), alias('Models.TaskScheduleWeek'), alias('Models.TaskScheduleMonth'), alias('Models.TaskScheduleYear')))
+    .addSchema('Models.CreateJobRequest', ({ object, number, string, alias, union, func }) => object({
+    /** Id of job, must be uniq */
+    id: string(),
+    /** Path to js file (relative to root folder) */
+    path: string().minLength(1),
+    /** Job's schedule */
+    schedule: alias('Models.Schedule'),
+    /** Timeout for job (in milliseconds) */
+    timeout: number().min(0).optional(),
+    /** Arbitrary props for job (can be a callback returning props or Promise<props>) */
+    props: union(object().canHaveUnknownProps(), func()).optional(),
+    /** Job will be considered as disabled when more than that count of runs fails consequently */
+    maxConsequentFails: number().min(0).optional()
+}));
+exports.Schemas = exports.schemaRegistry;
+//# sourceMappingURL=types.js.map

package/dist/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AAAA,gDAAgE;AAIhE,MAAM,QAAQ,GAAG,IAAI,uBAAc,EAAE;KAChC,eAAe,CAAC,cAAc,EAAE,CAAC,KAAK,EAAE,EAAE;IACvC,IAAI,OAAO,KAAK,KAAK,WAAW;QAAE,OAAO,KAAK,CAAC;IAC/C,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC3B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC/B,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;YAAE,OAAO,KAAK,CAAC;QACrC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC;KACzB;IACD,OAAO,KAAK,CAAC;AACjB,CAAC,CAAC;KACD,SAAS,CAAC,aAAa,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CACrC,MAAM,EAAE;KACH,SAAS,EAAQ;KACjB,YAAY,CAAC,CAAC,KAAK,EAAE,EAAE,CACpB,KAAK,YAAY,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC;IACzC,CAAC,CAAC;QACI,KAAK,EAAE,IAAI;KACd;IACH,CAAC,CAAC;QACI,KAAK,EAAE,KAAK;QACZ,MAAM,EAAE,CAAC,+BAA+B,CAAC;KAC5C,CACV,CACR;KACA,SAAS,CAAC,oBAAoB,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,CAC3D,MAAM,CAAC;IACH,qCAAqC;IACrC,QAAQ,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC;IAClC,kBAAkB;IAClB,IAAI,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE;IACxC,oBAAoB;IACpB,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE;IAC1C,0CAA0C;IAC1C,QAAQ,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE;IACzC,oCAAoC;IACpC,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE;IACvC,oCAAoC;IACpC,aAAa,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IACzC,wDAAwD;IACxD,iBAAiB,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;CAChD,CAAC;KACG,mBAAmB,CAAC,QAAQ,EAAE,cAAc,CAAC;KAC7C,YAAY,CAAC,CAAC,GAAG,EAAE,EAAE;IAClB,IACI,QAAQ,IAAI,GAAG;QACf,eAAe,IAAI,GAAG;QACtB,2EAA2E;QAC3E,OAAO,GAAG,CAAC,MAAM,KAAK,WAAW,EACnC;QACE,OAAO;YACH,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE,CAAC,4CAA4C,CAAC;SACzD,CAAC;KACL;IACD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AAC3B,CAAC,CAAC,CACT;KACA,aAAa,CACV,oBAAoB,EACpB,2BAA2B,EAC3B,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,CACnB,MAAM;KACD,UAAU,CAAC,MAAM,CAAC;KAClB,UAAU,CAAC,QAAQ,CAAC;KACpB,QAAQ,CAAC;IACN,0BAA0B;IAC1B,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC;CAC1B,CAAC,CACb;KACA,aAAa,CACV,oBAAoB,EACpB,wBAAwB,EACxB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,CACnB,MAAM,CAAC,QAAQ,CAAC;IACZ,uBAAuB;IACvB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;CACvB,CAAC,CACT;KACA,aAAa,CACV,oBAAoB,EACpB,yBAAyB,EACzB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,CAClC,MAAM,CAAC,QAAQ,CAAC;IACZ,wBAAwB;IACxB,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC;IACrB,4FAA4F;IAC5F,SAAS,EAAE,KAAK,EAAE;SACb,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SAC9B,SAAS,CAAC,CAAC,CAAC;SACZ,SAAS,CAAC,CAAC,CAAC;SACZ,YAAY,CAAC,CAAC,GAAG,EAAE,EAAE;QAClB,MAAM,GAAG,GAAG,EAAE,CAAC;QACf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACjC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE;gBACb,OAAO;oBACH,KAAK,EAAE,KAAK;oBACZ,MAAM,EAAE,CAAC,uBAAuB,CAAC;iBACpC,CAAC;aACL;YACD,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;SACtB;QACD,OAAO;YACH,KAAK,EAAE,IAAI;SACd,CAAC;IACN,CAAC,CAAC;CACT,CAAC,CACT;KACA,aAAa,CACV,oBAAoB,EACpB,0BAA0B,EAC1B,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,CAClC,MAAM,CAAC,QAAQ,CAAC;IACZ,yBAAyB;IACzB,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC;IACtB,0CAA0C;IAC1C,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;CACtD,CAAC,CACT;KACA,aAAa,CACV,oBAAoB,EACpB,yBAAyB,EACzB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,CAClC,MAAM,CAAC,QAAQ,CAAC;IACZ,wBAAwB;IACxB,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC;IACrB,0CAA0C;IAC1C,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACtD,kCAAkC;IAClC,KAAK,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;CACjC,CAAC,CACT,CAAC;AAEO,QAAA,cAAc,GAAG,QAAQ;KACjC,SAAS,CAAC,iBAAiB,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAC/C,KAAK,CACD,KAAK,CAAC,2BAA2B,CAAC,EAClC,KAAK,CAAC,wBAAwB,CAAC,EAC/B,KAAK,CAAC,yBAAyB,CAAC,EAChC,KAAK,CAAC,0BAA0B,CAAC,EACjC,KAAK,CAAC,yBAAyB,CAAC,CACnC,CACJ;KACA,SAAS,CACN,yBAAyB,EACzB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,CAC/C,MAAM,CAAC;IACH,8BAA8B;IAC9B,EAAE,EAAE,MAAM,EAAE;IACZ,gDAAgD;IAChD,IAAI,EAAE,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IAC3B,qBAAqB;IACrB,QAAQ,EAAE,KAAK,CAAC,iBAAiB,CAAC;IAClC,wCAAwC;IACxC,OAAO,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IACnC,oFAAoF;IACpF,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE;IAC/D,8FAA8F;IAC9F,kBAAkB,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;CACjD,CAAC,CACT,CAAC;AAUO,QAAA,OAAO,GAAG,sBAAc,CAAC"}

package/package.json

@@ -0,0 +1,23 @@
+{
+    "name": "@cleverbrush/scheduler",
+    "version": "1.0.0-beta.0",
+    "keywords": [
+        "task scheduler"
+    ],
+    "author": "Andrew Zolotukhin <andrew_zol@cleverbrush.com>",
+    "license": "BSD",
+    "main": "./dist/index.js",
+    "readme": "https://github.com/cleverbrush/libs/tree/master/libs/scheduler#readme",
+    "scripts": {
+        "watch": "tsc --watch",
+        "build": "tsc"
+    },
+    "repository": {
+        "type": "git",
+        "url": "github:cleverbrush/libs"
+    },
+    "dependencies": {
+        "@cleverbrush/schema": "1.0.0-beta.0"
+    },
+    "types": "./dist/index.d.ts"
+}

package/src/ScheduleCalculator.test.ts

@@ -0,0 +1,482 @@
+import { ScheduleCalculator } from './ScheduleCalculator.js';
+
+test('day - 1', () => {
+    const calculator = new ScheduleCalculator({
+        every: 'day',
+        interval: 2,
+        startsOn: new Date(Date.UTC(2022, 9, 12, 21, 0, 0, 0)),
+        endsOn: new Date(Date.UTC(2022, 11, 12, 0, 0, 0, 0)),
+        maxOccurences: 10
+    });
+
+    const results = [
+        new Date(Date.UTC(2022, 9, 13, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 15, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 17, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 19, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 21, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 23, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 25, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 27, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 29, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 31, 9, 0, 0, 0))
+    ];
+
+    for (let i = 0; i < results.length; i++) {
+        expect(calculator.hasNext()).toEqual(true);
+        expect(calculator.next().date.getTime()).toEqual(results[i].getTime());
+    }
+
+    expect(calculator.hasNext()).toEqual(false);
+});
+
+test('day - 2', () => {
+    const calculator = new ScheduleCalculator({
+        every: 'day',
+        interval: 1,
+        startsOn: new Date(Date.UTC(2022, 9, 12, 8, 0, 0, 0))
+    });
+
+    const results = [
+        new Date(Date.UTC(2022, 9, 12, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 13, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 14, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 15, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 16, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 17, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 18, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 19, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 20, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 21, 9, 0, 0, 0))
+    ];
+
+    for (let i = 0; i < results.length; i++) {
+        expect(calculator.hasNext()).toEqual(true);
+        expect(calculator.next().date.getTime()).toEqual(results[i].getTime());
+    }
+
+    expect(calculator.hasNext()).toEqual(true);
+});
+
+test('day - 3', () => {
+    const calculator = new ScheduleCalculator({
+        every: 'day',
+        interval: 1,
+        startsOn: new Date(Date.UTC(2022, 9, 12, 8, 0, 0, 0)),
+        endsOn: new Date(Date.UTC(2022, 9, 14, 12, 0, 0, 0))
+    });
+
+    const results = [
+        new Date(Date.UTC(2022, 9, 12, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 13, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 14, 9, 0, 0, 0))
+    ];
+
+    for (let i = 0; i < results.length; i++) {
+        expect(calculator.hasNext()).toEqual(true);
+        expect(calculator.next().date.getTime()).toEqual(results[i].getTime());
+    }
+
+    expect(calculator.hasNext()).toEqual(false);
+});
+
+test('day - 4', () => {
+    const calculator = new ScheduleCalculator({
+        every: 'day',
+        interval: 2,
+        startsOn: new Date(Date.UTC(2022, 9, 12, 21, 0, 0, 0)),
+        endsOn: new Date(Date.UTC(2022, 11, 12, 0, 0, 0, 0)),
+        startingFromIndex: 3,
+        maxOccurences: 10
+    });
+
+    const results = [
+        new Date(Date.UTC(2022, 9, 17, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 19, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 21, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 23, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 25, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 27, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 29, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 31, 9, 0, 0, 0))
+    ];
+
+    for (let i = 0; i < results.length; i++) {
+        expect(calculator.hasNext()).toEqual(true);
+        expect(calculator.next().date.getTime()).toEqual(results[i].getTime());
+    }
+
+    expect(calculator.hasNext()).toEqual(false);
+});
+
+test('day - 5', () => {
+    const calculator = new ScheduleCalculator({
+        startsOn: new Date('2022-10-29T00:14:37.396Z'),
+        hour: 9,
+        minute: 0,
+        every: 'day',
+        interval: 3,
+        maxOccurences: 1
+    });
+
+    const results = [new Date(Date.UTC(2022, 9, 29, 9, 0, 0, 0))];
+
+    for (let i = 0; i < results.length; i++) {
+        expect(calculator.hasNext()).toEqual(true);
+        expect(calculator.next().date.getTime()).toEqual(results[i].getTime());
+    }
+
+    expect(calculator.hasNext()).toEqual(false);
+});
+
+test('week - 1', () => {
+    const calculator = new ScheduleCalculator({
+        every: 'week',
+        interval: 1,
+        dayOfWeek: [1, 2],
+        startsOn: new Date(Date.UTC(2022, 8, 7, 8, 0, 0, 0)),
+        endsOn: new Date(Date.UTC(2022, 11, 12, 0, 0, 0, 0)),
+        maxOccurences: 10
+    });
+
+    const results = [
+        new Date(Date.UTC(2022, 8, 12, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 8, 13, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 8, 19, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 8, 20, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 8, 26, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 8, 27, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 3, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 4, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 10, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 9, 11, 9, 0, 0, 0))
+    ];
+
+    for (let i = 0; i < results.length; i++) {
+        expect(calculator.hasNext()).toEqual(true);
+        expect(calculator.next().date.getTime()).toEqual(results[i].getTime());
+    }
+
+    expect(calculator.hasNext()).toEqual(false);
+});
+
+test('week - 2', () => {
+    const calculator = new ScheduleCalculator({
+        every: 'week',
+        interval: 2,
+        dayOfWeek: [1, 2],
+        startsOn: new Date(Date.UTC(2022, 8, 7, 8, 0, 0, 0)),
+        maxOccurences: 3
+    });
+
+    const results = [
+        new Date(Date.UTC(2022, 8, 12, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 8, 13, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 8, 26, 9, 0, 0, 0))
+    ];
+
+    for (let i = 0; i < results.length; i++) {
+        expect(calculator.hasNext()).toEqual(true);
+        expect(calculator.next().date.getTime()).toEqual(results[i].getTime());
+    }
+
+    expect(calculator.hasNext()).toEqual(false);
+});
+
+test('week - 3', () => {
+    const calculator = new ScheduleCalculator({
+        every: 'week',
+        interval: 1,
+        dayOfWeek: [2],
+        startsOn: new Date(Date.UTC(2022, 8, 13, 11, 0, 0, 0)),
+        endsOn: new Date(Date.UTC(2022, 8, 27, 0, 0, 0, 0))
+    });
+
+    const results = [new Date(Date.UTC(2022, 8, 20, 9, 0, 0, 0))];
+
+    for (let i = 0; i < results.length; i++) {
+        expect(calculator.hasNext()).toEqual(true);
+        expect(calculator.next().date.getTime()).toEqual(results[i].getTime());
+    }
+
+    expect(calculator.hasNext()).toEqual(false);
+});
+
+test('month - 1', () => {
+    const calculator = new ScheduleCalculator({
+        every: 'month',
+        day: 1,
+        interval: 1,
+        startsOn: new Date(Date.UTC(2022, 9, 12, 21, 0, 0, 0)),
+        endsOn: new Date(Date.UTC(2023, 11, 12, 0, 0, 0, 0)),
+        maxOccurences: 10
+    });
+
+    const results = [
+        new Date(Date.UTC(2022, 10, 1, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 11, 1, 9, 0, 0, 0)),
+        new Date(Date.UTC(2023, 0, 1, 9, 0, 0, 0)),
+        new Date(Date.UTC(2023, 1, 1, 9, 0, 0, 0)),
+        new Date(Date.UTC(2023, 2, 1, 9, 0, 0, 0)),
+        new Date(Date.UTC(2023, 3, 1, 9, 0, 0, 0)),
+        new Date(Date.UTC(2023, 4, 1, 9, 0, 0, 0)),
+        new Date(Date.UTC(2023, 5, 1, 9, 0, 0, 0)),
+        new Date(Date.UTC(2023, 6, 1, 9, 0, 0, 0)),
+        new Date(Date.UTC(2023, 7, 1, 9, 0, 0, 0))
+    ];
+
+    for (let i = 0; i < results.length; i++) {
+        expect(calculator.hasNext()).toEqual(true);
+        const next = calculator.next().date;
+        expect(next.getTime()).toEqual(results[i].getTime());
+    }
+
+    expect(calculator.hasNext()).toEqual(false);
+});
+
+test('month - 2', () => {
+    const calculator = new ScheduleCalculator({
+        every: 'month',
+        day: 2,
+        interval: 2,
+        startsOn: new Date(Date.UTC(2022, 9, 12, 21, 0, 0, 0)),
+        endsOn: new Date(Date.UTC(2023, 6, 1, 0, 0, 0, 0))
+    });
+
+    const results = [
+        new Date(Date.UTC(2022, 10, 2, 9, 0, 0, 0)),
+        new Date(Date.UTC(2023, 0, 2, 9, 0, 0, 0)),
+        new Date(Date.UTC(2023, 2, 2, 9, 0, 0, 0)),
+        new Date(Date.UTC(2023, 4, 2, 9, 0, 0, 0))
+    ];
+
+    for (let i = 0; i < results.length; i++) {
+        expect(calculator.hasNext()).toEqual(true);
+        const next = calculator.next().date;
+        expect(next.getTime()).toEqual(results[i].getTime());
+    }
+
+    expect(calculator.hasNext()).toEqual(false);
+});
+
+test('month - 3', () => {
+    const calculator = new ScheduleCalculator({
+        every: 'month',
+        day: 'last',
+        interval: 1,
+        startsOn: new Date(Date.UTC(2022, 9, 12, 21, 0, 0, 0)),
+        maxOccurences: 4
+    });
+
+    const results = [
+        new Date(Date.UTC(2022, 9, 31, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 10, 30, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 11, 31, 9, 0, 0, 0)),
+        new Date(Date.UTC(2023, 0, 31, 9, 0, 0, 0))
+    ];
+
+    for (let i = 0; i < results.length; i++) {
+        expect(calculator.hasNext()).toEqual(true);
+        const next = calculator.next().date;
+        expect(next.getTime()).toEqual(results[i].getTime());
+    }
+
+    expect(calculator.hasNext()).toEqual(false);
+});
+
+test('month - 4', () => {
+    const calculator = new ScheduleCalculator({
+        every: 'month',
+        day: 'last',
+        interval: 3,
+        startsOn: new Date(Date.UTC(2022, 9, 31, 0, 0, 0, 0)),
+        maxOccurences: 3
+    });
+
+    const results = [
+        new Date(Date.UTC(2022, 9, 31, 9, 0, 0, 0)),
+        new Date(Date.UTC(2023, 0, 31, 9, 0, 0, 0)),
+        new Date(Date.UTC(2023, 3, 30, 9, 0, 0, 0))
+    ];
+
+    for (let i = 0; i < results.length; i++) {
+        expect(calculator.hasNext()).toEqual(true);
+        const next = calculator.next().date;
+        expect(next.getTime()).toEqual(results[i].getTime());
+    }
+
+    expect(calculator.hasNext()).toEqual(false);
+});
+
+test('month - 5', () => {
+    const calculator = new ScheduleCalculator({
+        every: 'month',
+        day: 'last',
+        interval: 1,
+        startsOn: new Date(Date.UTC(2022, 9, 31, 0, 0, 0, 0)),
+        endsOn: new Date(Date.UTC(2023, 4, 1, 0, 0, 0, 0))
+    });
+
+    const results = [
+        new Date(Date.UTC(2022, 9, 31, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 10, 30, 9, 0, 0, 0)),
+        new Date(Date.UTC(2022, 11, 31, 9, 0, 0, 0)),
+        new Date(Date.UTC(2023, 0, 31, 9, 0, 0, 0)),
+        new Date(Date.UTC(2023, 1, 28, 9, 0, 0, 0)),
+        new Date(Date.UTC(2023, 2, 31, 9, 0, 0, 0)),
+        new Date(Date.UTC(2023, 3, 30, 9, 0, 0, 0))
+    ];
+
+    for (let i = 0; i < results.length; i++) {
+        expect(calculator.hasNext()).toEqual(true);
+        const next = calculator.next().date;
+        expect(next.getTime()).toEqual(results[i].getTime());
+    }
+
+    expect(calculator.hasNext()).toEqual(false);
+});
+
+test('year - 1', () => {
+    const calculator = new ScheduleCalculator({
+        every: 'year',
+        day: 4,
+        month: 3,
+        interval: 1,
+        startsOn: new Date(Date.UTC(2022, 0, 1, 0, 0, 0, 0)),
+        endsOn: new Date(Date.UTC(2025, 4, 1, 0, 0, 0, 0))
+    });
+
+    const results = [
+        new Date(Date.UTC(2022, 2, 4, 9, 0, 0, 0)),
+        new Date(Date.UTC(2023, 2, 4, 9, 0, 0, 0)),
+        new Date(Date.UTC(2024, 2, 4, 9, 0, 0, 0)),
+        new Date(Date.UTC(2025, 2, 4, 9, 0, 0, 0))
+    ];
+
+    for (let i = 0; i < results.length; i++) {
+        expect(calculator.hasNext()).toEqual(true);
+        const next = calculator.next().date;
+        expect(next.getTime()).toEqual(results[i].getTime());
+    }
+
+    expect(calculator.hasNext()).toEqual(false);
+});
+
+test('year - 2', () => {
+    const calculator = new ScheduleCalculator({
+        every: 'year',
+        day: 4,
+        month: 3,
+        interval: 2,
+        startsOn: new Date(Date.UTC(2022, 0, 1, 0, 0, 0, 0)),
+        endsOn: new Date(Date.UTC(2025, 4, 1, 0, 0, 0, 0))
+    });
+
+    const results = [
+        new Date(Date.UTC(2022, 2, 4, 9, 0, 0, 0)),
+        new Date(Date.UTC(2024, 2, 4, 9, 0, 0, 0))
+    ];
+
+    for (let i = 0; i < results.length; i++) {
+        expect(calculator.hasNext()).toEqual(true);
+        const next = calculator.next().date;
+        expect(next.getTime()).toEqual(results[i].getTime());
+    }
+
+    expect(calculator.hasNext()).toEqual(false);
+});
+
+test('minute - 1', () => {
+    const calculator = new ScheduleCalculator({
+        every: 'minute',
+        interval: 1,
+        startsOn: new Date(Date.UTC(2022, 0, 1, 0, 0, 0, 0)),
+        maxOccurences: 20
+    });
+
+    const results = [
+        new Date(Date.UTC(2022, 0, 1, 0, 0, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 0, 1, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 0, 2, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 0, 3, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 0, 4, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 0, 5, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 0, 6, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 0, 7, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 0, 8, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 0, 9, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 0, 10, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 0, 11, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 0, 12, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 0, 13, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 0, 14, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 0, 15, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 0, 16, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 0, 17, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 0, 18, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 0, 19, 0, 0))
+    ];
+
+    for (let i = 0; i < results.length; i++) {
+        expect(calculator.hasNext()).toEqual(true);
+        const next = calculator.next().date;
+        expect(next.getTime()).toEqual(results[i].getTime());
+    }
+
+    expect(calculator.hasNext()).toEqual(false);
+});
+
+test('minute - 2', () => {
+    const calculator = new ScheduleCalculator({
+        every: 'minute',
+        interval: 20,
+        startsOn: new Date(Date.UTC(2022, 0, 1, 0, 0, 0, 0)),
+        maxOccurences: 5
+    });
+
+    const results = [
+        new Date(Date.UTC(2022, 0, 1, 0, 0, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 0, 20, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 0, 40, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 1, 0, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 1, 20, 0, 0))
+    ];
+
+    for (let i = 0; i < results.length; i++) {
+        expect(calculator.hasNext()).toEqual(true);
+        const next = calculator.next().date;
+        expect(next.getTime()).toEqual(results[i].getTime());
+    }
+
+    expect(calculator.hasNext()).toEqual(false);
+});
+
+test('minute - 3', () => {
+    const calculator = new ScheduleCalculator({
+        every: 'minute',
+        interval: 20,
+        startsOn: new Date(Date.UTC(2022, 0, 1, 0, 0, 0, 0)),
+        endsOn: new Date(Date.UTC(2022, 0, 1, 3, 0, 0, 0))
+    });
+
+    const results = [
+        new Date(Date.UTC(2022, 0, 1, 0, 0, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 0, 20, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 0, 40, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 1, 0, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 1, 20, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 1, 40, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 2, 0, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 2, 20, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 2, 40, 0, 0)),
+        new Date(Date.UTC(2022, 0, 1, 3, 0, 0, 0))
+    ];
+
+    for (let i = 0; i < results.length; i++) {
+        expect(calculator.hasNext()).toEqual(true);
+        const next = calculator.next().date;
+        expect(next.getTime()).toEqual(results[i].getTime());
+    }
+
+    expect(calculator.hasNext()).toEqual(false);
+});