Merge pull request #12076 from westy92/master

Fix node-schedule RecurrenceRule.

node-schedule/node-schedule-tests.ts

@@ -107,6 +107,13 @@ function testRecurrenceRule() {
     var rule:nodeSchedule.RecurrenceRule = new nodeSchedule.RecurrenceRule(0, 0, 0, 0, 0, 0, 0);
 
     var nextInvocation:Date = rule.nextInvocationDate(new Date());
+
+    var rule2 = new nodeSchedule.RecurrenceRule();
+    rule2.month = "7";
+    rule2.date = [1, new nodeSchedule.Range(5, 15, 5), "23"];
+    rule2.hour = 5;
+    rule2.minute = new nodeSchedule.Range(4, 6);
+    rule2.second = new nodeSchedule.Range(8, 12, 2);
 }
 
 /**

node-schedule/node-schedule.d.ts

@@ -142,6 +142,9 @@ declare module 'node-schedule' {
         contains(value: number): boolean;
     }
 
+    type Recurrence = number | Range | string;
+    type RecurrenceSegment = Recurrence | Recurrence[];
+
     /**
      * Recurrence rules.
      */
@@ -150,65 +153,65 @@ declare module 'node-schedule' {
          * Day of the month.
          *
          * @public
-         * @type {number}
+         * @type {RecurrenceSegment}
          */
-        date: number;
+        date: RecurrenceSegment;
 
         /**
          * Day of the week.
          *
          * @public
-         * @type {number|Array<number|Range>}
+         * @type {RecurrenceSegment}
          */
-        dayOfWeek: number | Array<number | Range>;
+        dayOfWeek: RecurrenceSegment;
 
         /**
          * Hour.
          *
          * @public
-         * @type {number}
+         * @type {RecurrenceSegment}
          */
-        hour: number;
+        hour: RecurrenceSegment;
 
         /**
          * Minute.
          *
          * @public
-         * @type {number}
+         * @type {RecurrenceSegment}
          */
-        minute: number;
+        minute: RecurrenceSegment;
 
         /**
          * Month.
          *
          * @public
-         * @type {number}
+         * @type {RecurrenceSegment}
          */
-        month: number;
+        month: RecurrenceSegment;
 
         /**
          * Second.
          *
          * @public
-         * @type {number}
+         * @type {RecurrenceSegment}
          */
-        second: number;
+        second: RecurrenceSegment;
 
         /**
          * Year.
          *
          * @public
-         * @type {number}
+         * @type {RecurrenceSegment}
          */
-        year: number;
+        year: RecurrenceSegment;
 
-        constructor(year?: number,
-            month?: number,
-            date?: number,
-            dayOfWeek?: number | Array<number | Range>,
-            hour?: number,
-            minute?: number,
-            second?: number);
+        constructor(year?: RecurrenceSegment,
+            month?: RecurrenceSegment,
+            date?: RecurrenceSegment,
+            dayOfWeek?: RecurrenceSegment,
+            hour?: RecurrenceSegment,
+            minute?: RecurrenceSegment,
+            second?: RecurrenceSegment);
 
         nextInvocationDate(base: Date): Date;
     }