feat: do not accept plain objects in constructors (#502)

relates-to: #500

Author: lsndr

src/datetime.ts

@@ -156,17 +156,9 @@ export class DateTime implements DateTimeLike {
     return new DateTime(numeric);
   }
 
-  /** @internal */
-  public static fromPlainOrInstance(
-    datetime: DateTime | DateTimeLike,
-  ): DateTime {
-    return datetime instanceof DateTime ? datetime : this.fromPlain(datetime);
-  }
-
   /**
    * Converts DateTime into a plain object.
    */
-
   public toPlain(options: { stripUtc: false } & ToPlainOptions): DateTimeLike;
   public toPlain(
     options: { stripUtc: true } & ToPlainOptions,

src/rrule-set.ts

@@ -3,12 +3,12 @@ import { RRuleSet as Rust } from './lib';
 import { DateTime, type DateTimeLike } from './datetime';
 
 export interface RRuleSetOptions {
-  readonly dtstart: DateTime | DateTimeLike;
+  readonly dtstart: DateTime;
   readonly tzid?: string;
-  readonly rrules?: readonly (RRule | RRuleLike)[];
-  readonly exrules?: readonly (RRule | RRuleLike)[];
-  readonly exdates?: readonly (DateTime | DateTimeLike)[];
-  readonly rdates?: readonly (DateTime | DateTimeLike)[];
+  readonly rrules?: readonly RRule[];
+  readonly exrules?: readonly RRule[];
+  readonly exdates?: readonly DateTime[];
+  readonly rdates?: readonly DateTime[];
 }
 
 export interface RRuleSetLike {
@@ -42,22 +42,14 @@ export class RRuleSet implements Iterable<DateTime> {
       !(optionsOrDtstart instanceof DateTime) &&
       'dtstart' in optionsOrDtstart
     ) {
-      this.dtstart = DateTime.fromPlainOrInstance(optionsOrDtstart.dtstart);
+      this.dtstart = optionsOrDtstart.dtstart;
 
       this.tzid = optionsOrDtstart.tzid ?? 'UTC';
 
-      this.rrules = (optionsOrDtstart?.rrules ?? []).map(
-        RRule.fromPlainOrInstance.bind(RRule),
-      );
-      this.exrules = (optionsOrDtstart?.exrules ?? []).map(
-        RRule.fromPlainOrInstance.bind(RRule),
-      );
-      this.exdates = (optionsOrDtstart?.exdates ?? []).map(
-        DateTime.fromPlainOrInstance.bind(DateTime),
-      );
-      this.rdates = (optionsOrDtstart?.rdates ?? []).map(
-        DateTime.fromPlainOrInstance.bind(DateTime),
-      );
+      this.rrules = optionsOrDtstart?.rrules ?? [];
+      this.exrules = optionsOrDtstart?.exrules ?? [];
+      this.exdates = optionsOrDtstart?.exdates ?? [];
+      this.rdates = optionsOrDtstart?.rdates ?? [];
     } else if (optionsOrDtstart instanceof DateTime) {
       this.dtstart = optionsOrDtstart;
       this.tzid = tzid ?? 'UTC';
@@ -81,7 +73,14 @@ export class RRuleSet implements Iterable<DateTime> {
   }
 
   public static fromPlain(plain: RRuleSetLike): RRuleSet {
-    return new RRuleSet(plain);
+    return new RRuleSet({
+      dtstart: DateTime.fromPlain(plain.dtstart),
+      tzid: plain.tzid,
+      rrules: plain.rrules.map((rrule) => RRule.fromPlain(rrule)),
+      exrules: plain.exrules.map((rrule) => RRule.fromPlain(rrule)),
+      exdates: plain.exdates.map((datetime) => DateTime.fromPlain(datetime)),
+      rdates: plain.rdates.map((datetime) => DateTime.fromPlain(datetime)),
+    });
   }
 
   /**
@@ -102,72 +101,72 @@ export class RRuleSet implements Iterable<DateTime> {
     return set;
   }
 
-  public setDtstart(dtstart: DateTime | DateTimeLike): RRuleSet {
+  public setDtstart(dtstart: DateTime): RRuleSet {
     return new RRuleSet({
-      ...this.toPlain(),
+      ...this.toOptions(),
       dtstart: dtstart,
     });
   }
 
   public setTzid(tzid: string): RRuleSet {
     return new RRuleSet({
-      ...this.toPlain(),
+      ...this.toOptions(),
       tzid: tzid,
     });
   }
 
-  public addRrule(rrule: RRule | RRuleLike): RRuleSet {
+  public addRrule(rrule: RRule): RRuleSet {
     return new RRuleSet({
-      ...this.toPlain(),
+      ...this.toOptions(),
       rrules: [...this.rrules, rrule],
     });
   }
 
-  public setRrules(rrules: readonly (RRule | RRuleLike)[]): RRuleSet {
+  public setRrules(rrules: readonly RRule[]): RRuleSet {
     return new RRuleSet({
-      ...this.toPlain(),
+      ...this.toOptions(),
       rrules: rrules,
     });
   }
 
-  public addExrule(rrule: RRule | RRuleLike): RRuleSet {
+  public addExrule(rrule: RRule): RRuleSet {
     return new RRuleSet({
-      ...this.toPlain(),
+      ...this.toOptions(),
       exrules: [...this.exrules, rrule],
     });
   }
 
-  public setExrules(rrules: readonly (RRule | RRuleLike)[]): RRuleSet {
+  public setExrules(rrules: readonly RRule[]): RRuleSet {
     return new RRuleSet({
-      ...this.toPlain(),
+      ...this.toOptions(),
       exrules: rrules,
     });
   }
 
-  public addExdate(datetime: DateTime | DateTimeLike): RRuleSet {
+  public addExdate(datetime: DateTime): RRuleSet {
     return new RRuleSet({
-      ...this.toPlain(),
+      ...this.toOptions(),
       exdates: [...this.exdates, datetime],
     });
   }
 
-  public setExdates(datetimes: readonly (DateTime | DateTimeLike)[]): RRuleSet {
+  public setExdates(datetimes: readonly DateTime[]): RRuleSet {
     return new RRuleSet({
-      ...this.toPlain(),
+      ...this.toOptions(),
       exdates: datetimes,
     });
   }
 
-  public addRdate(datetime: DateTime | DateTimeLike): RRuleSet {
+  public addRdate(datetime: DateTime): RRuleSet {
     return new RRuleSet({
-      ...this.toPlain(),
+      ...this.toOptions(),
       rdates: [...this.rdates, datetime],
     });
   }
 
-  public setRdates(datetimes: readonly (DateTime | DateTimeLike)[]): RRuleSet {
+  public setRdates(datetimes: readonly DateTime[]): RRuleSet {
     return new RRuleSet({
-      ...this.toPlain(),
+      ...this.toOptions(),
       rdates: datetimes,
     });
   }
@@ -264,4 +263,15 @@ export class RRuleSet implements Iterable<DateTime> {
       },
     };
   }
+
+  private toOptions(): RRuleSetOptions {
+    return {
+      dtstart: this.dtstart,
+      tzid: this.tzid,
+      rrules: this.rrules,
+      exrules: this.exrules,
+      exdates: this.exdates,
+      rdates: this.rdates,
+    };
+  }
 }

src/rrule.ts

@@ -51,7 +51,7 @@ export interface RRuleOptions {
   readonly frequency: Frequency;
   readonly interval?: number;
   readonly count?: number;
-  readonly until?: DateTime | DateTimeLike;
+  readonly until?: DateTime;
   readonly byWeekday?: readonly (NWeekday | Weekday)[];
   readonly byHour?: readonly number[];
   readonly byMinute?: readonly number[];
@@ -147,7 +147,7 @@ export class RRule {
     return new this({
       frequency: rrule.frequency,
       interval: rrule.interval,
-      until: rrule.until,
+      until: rrule.until && DateTime.fromPlain(rrule.until),
       count: rrule.count,
       byWeekday: rrule.byWeekday,
       byHour: rrule.byHour,
@@ -188,67 +188,60 @@ export class RRule {
     return rrule;
   }
 
-  /**
-   * @internal
-   */
-  public static fromPlainOrInstance(rrule: RRule | RRuleLike): RRule {
-    return rrule instanceof RRule ? rrule : this.fromPlain(rrule);
-  }
-
   public setFrequency(frequency: Frequency): RRule {
-    return new RRule({ ...this.toPlain(), frequency });
+    return new RRule({ ...this.toOptions(), frequency });
   }
 
   public setInterval(interval: number): RRule {
-    return new RRule({ ...this.toPlain(), interval });
+    return new RRule({ ...this.toOptions(), interval });
   }
 
   public setCount(count: number): RRule {
-    return new RRule({ ...this.toPlain(), count });
+    return new RRule({ ...this.toOptions(), count });
   }
 
   public setByWeekday(weekdays: readonly (NWeekday | Weekday)[]): RRule {
-    return new RRule({ ...this.toPlain(), byWeekday: weekdays });
+    return new RRule({ ...this.toOptions(), byWeekday: weekdays });
   }
 
   public setByHour(hours: readonly number[]): RRule {
-    return new RRule({ ...this.toPlain(), byHour: hours });
+    return new RRule({ ...this.toOptions(), byHour: hours });
   }
 
   public setByMinute(minutes: readonly number[]): RRule {
-    return new RRule({ ...this.toPlain(), byMinute: minutes });
+    return new RRule({ ...this.toOptions(), byMinute: minutes });
   }
 
   public setBySecond(seconds: readonly number[]): RRule {
-    return new RRule({ ...this.toPlain(), bySecond: seconds });
+    return new RRule({ ...this.toOptions(), bySecond: seconds });
   }
 
   public setByMonthday(days: readonly number[]): RRule {
-    return new RRule({ ...this.toPlain(), byMonthday: days });
+    return new RRule({ ...this.toOptions(), byMonthday: days });
   }
 
   public setBySetpos(poses: readonly number[]): RRule {
-    return new RRule({ ...this.toPlain(), bySetpos: poses });
+    return new RRule({ ...this.toOptions(), bySetpos: poses });
   }
 
   public setByMonth(months: readonly Month[]): RRule {
-    return new RRule({ ...this.toPlain(), byMonth: months });
+    return new RRule({ ...this.toOptions(), byMonth: months });
   }
 
   public setByWeekno(weekNumbers: readonly number[]): RRule {
-    return new RRule({ ...this.toPlain(), byWeekno: weekNumbers });
+    return new RRule({ ...this.toOptions(), byWeekno: weekNumbers });
   }
 
   public setByYearday(days: readonly number[]): RRule {
-    return new RRule({ ...this.toPlain(), byYearday: days });
+    return new RRule({ ...this.toOptions(), byYearday: days });
   }
 
   public setWeekstart(day: Weekday): RRule {
-    return new RRule({ ...this.toPlain(), weekstart: day });
+    return new RRule({ ...this.toOptions(), weekstart: day });
   }
 
-  public setUntil(datetime: DateTime | DateTimeLike): RRule {
-    return new RRule({ ...this.toPlain(), until: datetime });
+  public setUntil(datetime: DateTime): RRule {
+    return new RRule({ ...this.toOptions(), until: datetime });
   }
 
   public toString(): string {
@@ -297,4 +290,23 @@ export class RRule {
       until: this.until?.toPlain(),
     };
   }
+
+  private toOptions(): RRuleOptions {
+    return {
+      frequency: this.frequency,
+      interval: this.interval,
+      count: this.count,
+      byWeekday: this.byWeekday,
+      byHour: this.byHour,
+      byMinute: this.byMinute,
+      bySecond: this.bySecond,
+      byMonthday: this.byMonthday,
+      bySetpos: this.bySetpos,
+      byMonth: this.byMonth,
+      byWeekno: this.byWeekno,
+      byYearday: this.byYearday,
+      weekstart: this.weekstart,
+      until: this.until,
+    };
+  }
 }