Additional fixes for bySetPos and updated tests.

sebbo2002 · Oct 9, 2022 · cc221aa · cc221aa
1 parent f888871
commit cc221aa
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/src/event.ts b/src/event.ts
@@ -151,7 +151,7 @@ interface ICalEventInternalRepeatingData {
     byDay?: ICalWeekday[];
     byMonth?: number[];
     byMonthDay?: number[];
-    bySetPos?: number;
+    bySetPos?: number[];
     exclude?: ICalDateTimeValue[];
     startOfWeek?: ICalWeekday;
 }
@@ -669,11 +669,11 @@ export default class ICalEvent {
             }
             const bySetPosArray = Array.isArray(repeating.bySetPos) ? repeating.bySetPos : [repeating.bySetPos];
             this.data.repeating.bySetPos = bySetPosArray.map(bySetPos => {
-              if (typeof bySetPos !== 'number' || bySetPos < -366 || bySetPos > 366 || bySetPos === 0) {
-                  throw '`repeating.bySetPos` contains invalid value `' + bySetPos + '`!';
-              }
-              return bySetPos;
-            })
+                if (typeof bySetPos !== 'number' || bySetPos < -366 || bySetPos > 366 || bySetPos === 0) {
+                    throw '`repeating.bySetPos` contains invalid value `' + bySetPos + '`!';
+                }
+                return bySetPos;
+            });
         }
 
         if (repeating.exclude) {

diff --git a/src/types.ts b/src/types.ts
@@ -14,7 +14,7 @@ export interface ICalRepeatingOptions {
     byDay?: ICalWeekday[] | ICalWeekday;
     byMonth?: number[] | number;
     byMonthDay?: number[] | number;
-    bySetPos?: number;
+    bySetPos?: number[] | number;
     exclude?: ICalDateTimeValue[] | ICalDateTimeValue;
     startOfWeek?: ICalWeekday;
 }

diff --git a/test/event.ts b/test/event.ts
@@ -887,7 +887,7 @@ describe('ical-generator Event', function () {
                         freq: ICalEventRepeatingFreq.MONTHLY,
                         interval: 2,
                         byDay: [ICalWeekday.SU],
-                        bySetPos: 367
+                        bySetPos: [367]
                     }
                 }, new ICalCalendar());
             }, /`repeating\.bySetPos` contains invalid value `367`/);
@@ -901,7 +901,7 @@ describe('ical-generator Event', function () {
                         freq: ICalEventRepeatingFreq.MONTHLY,
                         interval: 2,
                         byDay: [ICalWeekday.SU],
-                        bySetPos: -367
+                        bySetPos: [-367]
                     }
                 }, new ICalCalendar());
             }, /`repeating\.bySetPos` contains invalid value `-367`/);
@@ -915,7 +915,7 @@ describe('ical-generator Event', function () {
                         freq: ICalEventRepeatingFreq.MONTHLY,
                         interval: 2,
                         byDay: [ICalWeekday.SU],
-                        bySetPos: 0
+                        bySetPos: [0]
                     }
                 }, new ICalCalendar());
             }, /`repeating\.bySetPos` contains invalid value `0`/);
@@ -930,7 +930,7 @@ describe('ical-generator Event', function () {
                         interval: 2,
                         byDay: [ICalWeekday.SU],
                         // @ts-ignore
-                        bySetPos: 'FOO'
+                        bySetPos: ['FOO']
                     }
                 }, new ICalCalendar());
             }, /`repeating\.bySetPos` contains invalid value `FOO`/);
@@ -957,13 +957,13 @@ describe('ical-generator Event', function () {
             e.repeating({
                 freq: ICalEventRepeatingFreq.MONTHLY,
                 byDay: [ICalWeekday.SU],
-                bySetPos: 2
+                bySetPos: [2]
             });
 
             const result = e.repeating();
             assert.ok(result && !isRRule(result) && typeof result !== 'string');
             assert.strictEqual(result.byDay?.length, 1);
-            assert.strictEqual(result.bySetPos, [2]);
+            assert.strictEqual(result.bySetPos?.length, 1);
         });
 
         it('should throw error when repeating.exclude is not valid', function () {

diff --git a/test/issues.ts b/test/issues.ts
@@ -60,7 +60,7 @@ describe('Issues', function () {
             assert.ok(str.indexOf('RRULE:FREQ=MONTHLY;COUNT=3;INTERVAL=1;BYDAY=SU;BYSETPOS=3') > -1);
         });
 
-        it('should work with repeating bySetPos by taking the first elemnt of the byDay array', function () {
+        it('should work with repeating bySetPos by taking all elements of the byDay array', function () {
             const calendar = ical({
                 prodId: '//superman-industries.com//ical-generator//EN',
                 events: [{
@@ -79,7 +79,7 @@ describe('Issues', function () {
             });
 
             const str = calendar.toString();
-            assert.ok(str.indexOf('RRULE:FREQ=MONTHLY;COUNT=3;INTERVAL=1;BYDAY=MO;BYSETPOS=3') > -1);
+            assert.ok(str.indexOf('RRULE:FREQ=MONTHLY;COUNT=3;INTERVAL=1;BYDAY=MO,FR;BYSETPOS=3') > -1);
         });
     });