rrule-rust 3.0.0-alpha.4 → 3.0.0-alpha.6

package/README.md

@@ -25,15 +25,14 @@ If you need a browser-compatible version with WASM support:
 For more usage examples and advanced scenarios, see the [tests directory](https://github.com/lsndr/rrule-rust/tree/master/tests) in the repository.
 
 ```typescript
-import { RRule, RRuleSet, Frequency, DateTime } from 'rrule-rust';
+import { RRule, RRuleSet, Frequency, DateTime, DtStart } from 'rrule-rust';
 
 const rrule = new RRule({
   frequency: Frequency.Daily,
   count: 5,
 });
 const set = new RRuleSet({
-  dtstart: DateTime.create(1997, 9, 2, 9, 0, 0, false),
-  tzid: 'US/Eastern',
+  dtstart: new DtStart(DateTime.local(1997, 9, 2, 9, 0, 0), 'US/Eastern'),
   rrules: [rrule],
 });
 

package/dist/browser/datetime.js

@@ -86,10 +86,6 @@ export class DateTime {
     static fromNumeric(numeric) {
         return new DateTime(numeric);
     }
-    /** @internal */
-    static fromPlainOrInstance(datetime) {
-        return datetime instanceof DateTime ? datetime : this.fromPlain(datetime);
-    }
     toPlain(options) {
         return {
             year: this.year,

package/dist/browser/dtstart.d.ts

@@ -0,0 +1,19 @@
+import { DateTime, type DateTimeLike } from './datetime';
+export interface DtStartOptions {
+    datetime: DateTime;
+    tzid?: string;
+}
+export interface DtStartLike {
+    datetime: DateTimeLike;
+    tzid?: string;
+}
+export declare class DtStart {
+    readonly datetime: DateTime;
+    readonly tzid?: string;
+    constructor(datetime: DateTime, tzid?: string);
+    constructor(options: DtStartOptions);
+    static fromPlain(plain: DtStartLike): DtStart;
+    setTzid(tzid: string): DtStart;
+    setDatetime(datetime: DateTime): DtStart;
+    toPlain(): DtStartLike;
+}

package/dist/browser/dtstart.js

@@ -0,0 +1,37 @@
+import { DateTime } from './datetime';
+export class DtStart {
+    constructor(datetimeOrOptions, tzid) {
+        if ('datetime' in datetimeOrOptions) {
+            this.datetime = datetimeOrOptions.datetime;
+            this.tzid = datetimeOrOptions.tzid;
+        }
+        else {
+            this.datetime = datetimeOrOptions;
+            this.tzid = tzid;
+        }
+    }
+    static fromPlain(plain) {
+        return new this({
+            datetime: DateTime.fromPlain(plain.datetime),
+            tzid: plain.tzid,
+        });
+    }
+    setTzid(tzid) {
+        return new DtStart({
+            datetime: this.datetime,
+            tzid,
+        });
+    }
+    setDatetime(datetime) {
+        return new DtStart({
+            datetime: datetime,
+            tzid: this.tzid,
+        });
+    }
+    toPlain() {
+        return {
+            datetime: this.datetime.toPlain(),
+            tzid: this.tzid,
+        };
+    }
+}

package/dist/browser/index.d.ts

@@ -1,3 +1,4 @@
 export * from './rrule-set';
 export * from './rrule';
 export * from './datetime';
+export * from './dtstart';

package/dist/browser/index.js

@@ -1,3 +1,4 @@
 export * from './rrule-set';
 export * from './rrule';
 export * from './datetime';
+export * from './dtstart';

package/dist/browser/rrule-set.d.ts

@@ -1,45 +1,42 @@
 import { RRule, type RRuleLike } from './rrule';
 import { DateTime, type DateTimeLike } from './datetime';
+import { DtStart, type DtStartLike } from './dtstart';
 export interface RRuleSetOptions {
-    readonly dtstart: DateTime | DateTimeLike;
-    readonly tzid?: string;
-    readonly rrules?: readonly (RRule | RRuleLike)[];
-    readonly exrules?: readonly (RRule | RRuleLike)[];
-    readonly exdates?: readonly (DateTime | DateTimeLike)[];
-    readonly rdates?: readonly (DateTime | DateTimeLike)[];
+    readonly dtstart: DtStart;
+    readonly rrules?: readonly RRule[];
+    readonly exrules?: readonly RRule[];
+    readonly exdates?: readonly DateTime[];
+    readonly rdates?: readonly DateTime[];
 }
 export interface RRuleSetLike {
-    readonly dtstart: DateTimeLike;
-    readonly tzid?: string;
+    readonly dtstart: DtStartLike;
     readonly rrules: readonly RRuleLike[];
     readonly exrules: readonly RRuleLike[];
     readonly exdates: readonly DateTimeLike[];
     readonly rdates: readonly DateTimeLike[];
 }
 export declare class RRuleSet implements Iterable<DateTime> {
-    readonly dtstart: DateTime;
-    readonly tzid: string;
+    readonly dtstart: DtStart;
     readonly rrules: readonly RRule[];
     readonly exrules: readonly RRule[];
     readonly exdates: readonly DateTime[];
     readonly rdates: readonly DateTime[];
-    constructor(dtstart: DateTime | DateTimeLike, tzid?: string);
+    constructor(dtstart: DtStart);
     constructor(options: RRuleSetOptions);
     /**
      * Parses a string into an RRuleSet.
      */
     static parse(str: string): RRuleSet;
     static fromPlain(plain: RRuleSetLike): RRuleSet;
-    setDtstart(dtstart: DateTime | DateTimeLike): RRuleSet;
-    setTzid(tzid: string): RRuleSet;
-    addRrule(rrule: RRule | RRuleLike): RRuleSet;
-    setRrules(rrules: readonly (RRule | RRuleLike)[]): RRuleSet;
-    addExrule(rrule: RRule | RRuleLike): RRuleSet;
-    setExrules(rrules: readonly (RRule | RRuleLike)[]): RRuleSet;
-    addExdate(datetime: DateTime | DateTimeLike): RRuleSet;
-    setExdates(datetimes: readonly (DateTime | DateTimeLike)[]): RRuleSet;
-    addRdate(datetime: DateTime | DateTimeLike): RRuleSet;
-    setRdates(datetimes: readonly (DateTime | DateTimeLike)[]): RRuleSet;
+    setDtstart(dtstart: DtStart): RRuleSet;
+    addRrule(rrule: RRule): RRuleSet;
+    setRrules(rrules: readonly RRule[]): RRuleSet;
+    addExrule(rrule: RRule): RRuleSet;
+    setExrules(rrules: readonly RRule[]): RRuleSet;
+    addExdate(datetime: DateTime): RRuleSet;
+    setExdates(datetimes: readonly DateTime[]): RRuleSet;
+    addRdate(datetime: DateTime): RRuleSet;
+    setRdates(datetimes: readonly DateTime[]): RRuleSet;
     /**
      * Returns all the occurrences of the rrule.
      *
@@ -66,4 +63,5 @@ export declare class RRuleSet implements Iterable<DateTime> {
      */
     toPlain(): RRuleSetLike;
     [Symbol.iterator](): Iterator<DateTime, any, any>;
+    private toOptions;
 }

package/dist/browser/rrule-set.js

@@ -1,29 +1,23 @@
 import { RRule } from './rrule';
 import { RRuleSet as Rust } from './lib';
 import { DateTime } from './datetime';
+import { DtStart } from './dtstart';
 export class RRuleSet {
-    constructor(optionsOrDtstart, tzid) {
-        if (optionsOrDtstart !== undefined &&
-            !(optionsOrDtstart instanceof DateTime) &&
-            'dtstart' in optionsOrDtstart) {
-            this.dtstart = DateTime.fromPlainOrInstance(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));
+    constructor(optionsOrDtstart) {
+        if ('dtstart' in optionsOrDtstart) {
+            this.dtstart = optionsOrDtstart.dtstart;
+            this.rrules = optionsOrDtstart?.rrules ?? [];
+            this.exrules = optionsOrDtstart?.exrules ?? [];
+            this.exdates = optionsOrDtstart?.exdates ?? [];
+            this.rdates = optionsOrDtstart?.rdates ?? [];
         }
-        else if (optionsOrDtstart instanceof DateTime) {
+        else {
             this.dtstart = optionsOrDtstart;
-            this.tzid = tzid ?? 'UTC';
             this.rrules = [];
             this.exrules = [];
             this.exdates = [];
             this.rdates = [];
         }
-        else {
-            throw new TypeError('Invalid arguments');
-        }
     }
     /**
      * Parses a string into an RRuleSet.
@@ -33,15 +27,23 @@ export class RRuleSet {
         return this.fromRust(rust);
     }
     static fromPlain(plain) {
-        return new RRuleSet(plain);
+        return new RRuleSet({
+            dtstart: DtStart.fromPlain(plain.dtstart),
+            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)),
+        });
     }
     /**
      * @internal
      */
     static fromRust(rust) {
         const set = new RRuleSet({
-            dtstart: DateTime.fromNumeric(rust.dtstart),
-            tzid: rust.tzid ?? undefined,
+            dtstart: new DtStart({
+                datetime: DateTime.fromNumeric(rust.dtstart),
+                tzid: rust.tzid ?? undefined,
+            }),
             rrules: rust.rrules.map((rrule) => RRule.fromRust(rrule)),
             exrules: rust.exrules.map((rrule) => RRule.fromRust(rrule)),
             exdates: rust.exdates.map((datetime) => DateTime.fromNumeric(datetime)),
@@ -52,61 +54,55 @@ export class RRuleSet {
     }
     setDtstart(dtstart) {
         return new RRuleSet({
-            ...this.toPlain(),
+            ...this.toOptions(),
             dtstart: dtstart,
         });
     }
-    setTzid(tzid) {
-        return new RRuleSet({
-            ...this.toPlain(),
-            tzid: tzid,
-        });
-    }
     addRrule(rrule) {
         return new RRuleSet({
-            ...this.toPlain(),
+            ...this.toOptions(),
             rrules: [...this.rrules, rrule],
         });
     }
     setRrules(rrules) {
         return new RRuleSet({
-            ...this.toPlain(),
+            ...this.toOptions(),
             rrules: rrules,
         });
     }
     addExrule(rrule) {
         return new RRuleSet({
-            ...this.toPlain(),
+            ...this.toOptions(),
             exrules: [...this.exrules, rrule],
         });
     }
     setExrules(rrules) {
         return new RRuleSet({
-            ...this.toPlain(),
+            ...this.toOptions(),
             exrules: rrules,
         });
     }
     addExdate(datetime) {
         return new RRuleSet({
-            ...this.toPlain(),
+            ...this.toOptions(),
             exdates: [...this.exdates, datetime],
         });
     }
     setExdates(datetimes) {
         return new RRuleSet({
-            ...this.toPlain(),
+            ...this.toOptions(),
             exdates: datetimes,
         });
     }
     addRdate(datetime) {
         return new RRuleSet({
-            ...this.toPlain(),
+            ...this.toOptions(),
             rdates: [...this.rdates, datetime],
         });
     }
     setRdates(datetimes) {
         return new RRuleSet({
-            ...this.toPlain(),
+            ...this.toOptions(),
             rdates: datetimes,
         });
     }
@@ -144,7 +140,7 @@ export class RRuleSet {
      * @internal
      */
     toRust() {
-        this.rust ??= new Rust(this.dtstart.toNumeric(), this.tzid, this.rrules.map((rrule) => rrule.toRust()), this.exrules.map((rrule) => rrule.toRust()), this.exdates.map((datetime) => datetime.toNumeric()), this.rdates.map((datetime) => datetime.toNumeric()));
+        this.rust ??= new Rust(this.dtstart.datetime.toNumeric(), this.dtstart.tzid, this.rrules.map((rrule) => rrule.toRust()), this.exrules.map((rrule) => rrule.toRust()), this.exdates.map((datetime) => datetime.toNumeric()), this.rdates.map((datetime) => datetime.toNumeric()));
         return this.rust;
     }
     toString() {
@@ -156,7 +152,6 @@ export class RRuleSet {
     toPlain() {
         return {
             dtstart: this.dtstart.toPlain(),
-            tzid: this.tzid,
             rrules: this.rrules.map((rrule) => rrule.toPlain()),
             exrules: this.exrules.map((rrule) => rrule.toPlain()),
             exdates: this.exdates.map((rrule) => rrule.toPlain()),
@@ -181,4 +176,13 @@ export class RRuleSet {
             },
         };
     }
+    toOptions() {
+        return {
+            dtstart: this.dtstart,
+            rrules: this.rrules,
+            exrules: this.exrules,
+            exdates: this.exdates,
+            rdates: this.rdates,
+        };
+    }
 }

package/dist/browser/rrule.d.ts

@@ -45,7 +45,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[];
@@ -108,7 +108,8 @@ export declare class RRule {
     setByWeekno(weekNumbers: readonly number[]): RRule;
     setByYearday(days: readonly number[]): RRule;
     setWeekstart(day: Weekday): RRule;
-    setUntil(datetime: DateTime | DateTimeLike): RRule;
+    setUntil(datetime: DateTime): RRule;
     toString(): string;
     toPlain(): RRuleLike;
+    private toOptions;
 }

package/dist/browser/rrule.js

@@ -79,7 +79,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,
@@ -116,53 +116,47 @@ export class RRule {
         rrule.rust = rust;
         return rrule;
     }
-    /**
-     * @internal
-     */
-    static fromPlainOrInstance(rrule) {
-        return rrule instanceof RRule ? rrule : this.fromPlain(rrule);
-    }
     setFrequency(frequency) {
-        return new RRule({ ...this.toPlain(), frequency });
+        return new RRule({ ...this.toOptions(), frequency });
     }
     setInterval(interval) {
-        return new RRule({ ...this.toPlain(), interval });
+        return new RRule({ ...this.toOptions(), interval });
     }
     setCount(count) {
-        return new RRule({ ...this.toPlain(), count });
+        return new RRule({ ...this.toOptions(), count });
     }
     setByWeekday(weekdays) {
-        return new RRule({ ...this.toPlain(), byWeekday: weekdays });
+        return new RRule({ ...this.toOptions(), byWeekday: weekdays });
     }
     setByHour(hours) {
-        return new RRule({ ...this.toPlain(), byHour: hours });
+        return new RRule({ ...this.toOptions(), byHour: hours });
     }
     setByMinute(minutes) {
-        return new RRule({ ...this.toPlain(), byMinute: minutes });
+        return new RRule({ ...this.toOptions(), byMinute: minutes });
     }
     setBySecond(seconds) {
-        return new RRule({ ...this.toPlain(), bySecond: seconds });
+        return new RRule({ ...this.toOptions(), bySecond: seconds });
     }
     setByMonthday(days) {
-        return new RRule({ ...this.toPlain(), byMonthday: days });
+        return new RRule({ ...this.toOptions(), byMonthday: days });
     }
     setBySetpos(poses) {
-        return new RRule({ ...this.toPlain(), bySetpos: poses });
+        return new RRule({ ...this.toOptions(), bySetpos: poses });
     }
     setByMonth(months) {
-        return new RRule({ ...this.toPlain(), byMonth: months });
+        return new RRule({ ...this.toOptions(), byMonth: months });
     }
     setByWeekno(weekNumbers) {
-        return new RRule({ ...this.toPlain(), byWeekno: weekNumbers });
+        return new RRule({ ...this.toOptions(), byWeekno: weekNumbers });
     }
     setByYearday(days) {
-        return new RRule({ ...this.toPlain(), byYearday: days });
+        return new RRule({ ...this.toOptions(), byYearday: days });
     }
     setWeekstart(day) {
-        return new RRule({ ...this.toPlain(), weekstart: day });
+        return new RRule({ ...this.toOptions(), weekstart: day });
     }
     setUntil(datetime) {
-        return new RRule({ ...this.toPlain(), until: datetime });
+        return new RRule({ ...this.toOptions(), until: datetime });
     }
     toString() {
         return this.toRust().toString();
@@ -192,4 +186,22 @@ export class RRule {
             until: this.until?.toPlain(),
         };
     }
+    toOptions() {
+        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,
+        };
+    }
 }

package/dist/node/datetime.js

@@ -89,10 +89,6 @@ class DateTime {
     static fromNumeric(numeric) {
         return new DateTime(numeric);
     }
-    /** @internal */
-    static fromPlainOrInstance(datetime) {
-        return datetime instanceof DateTime ? datetime : this.fromPlain(datetime);
-    }
     toPlain(options) {
         return {
             year: this.year,

package/dist/node/dtstart.d.ts

@@ -0,0 +1,19 @@
+import { DateTime, type DateTimeLike } from './datetime';
+export interface DtStartOptions {
+    datetime: DateTime;
+    tzid?: string;
+}
+export interface DtStartLike {
+    datetime: DateTimeLike;
+    tzid?: string;
+}
+export declare class DtStart {
+    readonly datetime: DateTime;
+    readonly tzid?: string;
+    constructor(datetime: DateTime, tzid?: string);
+    constructor(options: DtStartOptions);
+    static fromPlain(plain: DtStartLike): DtStart;
+    setTzid(tzid: string): DtStart;
+    setDatetime(datetime: DateTime): DtStart;
+    toPlain(): DtStartLike;
+}

package/dist/node/dtstart.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DtStart = void 0;
+const datetime_1 = require("./datetime");
+class DtStart {
+    constructor(datetimeOrOptions, tzid) {
+        if ('datetime' in datetimeOrOptions) {
+            this.datetime = datetimeOrOptions.datetime;
+            this.tzid = datetimeOrOptions.tzid;
+        }
+        else {
+            this.datetime = datetimeOrOptions;
+            this.tzid = tzid;
+        }
+    }
+    static fromPlain(plain) {
+        return new this({
+            datetime: datetime_1.DateTime.fromPlain(plain.datetime),
+            tzid: plain.tzid,
+        });
+    }
+    setTzid(tzid) {
+        return new DtStart({
+            datetime: this.datetime,
+            tzid,
+        });
+    }
+    setDatetime(datetime) {
+        return new DtStart({
+            datetime: datetime,
+            tzid: this.tzid,
+        });
+    }
+    toPlain() {
+        return {
+            datetime: this.datetime.toPlain(),
+            tzid: this.tzid,
+        };
+    }
+}
+exports.DtStart = DtStart;

package/dist/node/index.d.ts

@@ -1,3 +1,4 @@
 export * from './rrule-set';
 export * from './rrule';
 export * from './datetime';
+export * from './dtstart';

package/dist/node/index.js

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./rrule-set"), exports);
 __exportStar(require("./rrule"), exports);
 __exportStar(require("./datetime"), exports);
+__exportStar(require("./dtstart"), exports);

package/dist/node/rrule-set.d.ts

@@ -1,45 +1,42 @@
 import { RRule, type RRuleLike } from './rrule';
 import { DateTime, type DateTimeLike } from './datetime';
+import { DtStart, type DtStartLike } from './dtstart';
 export interface RRuleSetOptions {
-    readonly dtstart: DateTime | DateTimeLike;
-    readonly tzid?: string;
-    readonly rrules?: readonly (RRule | RRuleLike)[];
-    readonly exrules?: readonly (RRule | RRuleLike)[];
-    readonly exdates?: readonly (DateTime | DateTimeLike)[];
-    readonly rdates?: readonly (DateTime | DateTimeLike)[];
+    readonly dtstart: DtStart;
+    readonly rrules?: readonly RRule[];
+    readonly exrules?: readonly RRule[];
+    readonly exdates?: readonly DateTime[];
+    readonly rdates?: readonly DateTime[];
 }
 export interface RRuleSetLike {
-    readonly dtstart: DateTimeLike;
-    readonly tzid?: string;
+    readonly dtstart: DtStartLike;
     readonly rrules: readonly RRuleLike[];
     readonly exrules: readonly RRuleLike[];
     readonly exdates: readonly DateTimeLike[];
     readonly rdates: readonly DateTimeLike[];
 }
 export declare class RRuleSet implements Iterable<DateTime> {
-    readonly dtstart: DateTime;
-    readonly tzid: string;
+    readonly dtstart: DtStart;
     readonly rrules: readonly RRule[];
     readonly exrules: readonly RRule[];
     readonly exdates: readonly DateTime[];
     readonly rdates: readonly DateTime[];
-    constructor(dtstart: DateTime | DateTimeLike, tzid?: string);
+    constructor(dtstart: DtStart);
     constructor(options: RRuleSetOptions);
     /**
      * Parses a string into an RRuleSet.
      */
     static parse(str: string): RRuleSet;
     static fromPlain(plain: RRuleSetLike): RRuleSet;
-    setDtstart(dtstart: DateTime | DateTimeLike): RRuleSet;
-    setTzid(tzid: string): RRuleSet;
-    addRrule(rrule: RRule | RRuleLike): RRuleSet;
-    setRrules(rrules: readonly (RRule | RRuleLike)[]): RRuleSet;
-    addExrule(rrule: RRule | RRuleLike): RRuleSet;
-    setExrules(rrules: readonly (RRule | RRuleLike)[]): RRuleSet;
-    addExdate(datetime: DateTime | DateTimeLike): RRuleSet;
-    setExdates(datetimes: readonly (DateTime | DateTimeLike)[]): RRuleSet;
-    addRdate(datetime: DateTime | DateTimeLike): RRuleSet;
-    setRdates(datetimes: readonly (DateTime | DateTimeLike)[]): RRuleSet;
+    setDtstart(dtstart: DtStart): RRuleSet;
+    addRrule(rrule: RRule): RRuleSet;
+    setRrules(rrules: readonly RRule[]): RRuleSet;
+    addExrule(rrule: RRule): RRuleSet;
+    setExrules(rrules: readonly RRule[]): RRuleSet;
+    addExdate(datetime: DateTime): RRuleSet;
+    setExdates(datetimes: readonly DateTime[]): RRuleSet;
+    addRdate(datetime: DateTime): RRuleSet;
+    setRdates(datetimes: readonly DateTime[]): RRuleSet;
     /**
      * Returns all the occurrences of the rrule.
      *
@@ -66,4 +63,5 @@ export declare class RRuleSet implements Iterable<DateTime> {
      */
     toPlain(): RRuleSetLike;
     [Symbol.iterator](): Iterator<DateTime, any, any>;
+    private toOptions;
 }

package/dist/node/rrule-set.js

@@ -4,29 +4,23 @@ exports.RRuleSet = void 0;
 const rrule_1 = require("./rrule");
 const lib_1 = require("./lib");
 const datetime_1 = require("./datetime");
+const dtstart_1 = require("./dtstart");
 class RRuleSet {
-    constructor(optionsOrDtstart, tzid) {
-        if (optionsOrDtstart !== undefined &&
-            !(optionsOrDtstart instanceof datetime_1.DateTime) &&
-            'dtstart' in optionsOrDtstart) {
-            this.dtstart = datetime_1.DateTime.fromPlainOrInstance(optionsOrDtstart.dtstart);
-            this.tzid = optionsOrDtstart.tzid ?? 'UTC';
-            this.rrules = (optionsOrDtstart?.rrules ?? []).map(rrule_1.RRule.fromPlainOrInstance.bind(rrule_1.RRule));
-            this.exrules = (optionsOrDtstart?.exrules ?? []).map(rrule_1.RRule.fromPlainOrInstance.bind(rrule_1.RRule));
-            this.exdates = (optionsOrDtstart?.exdates ?? []).map(datetime_1.DateTime.fromPlainOrInstance.bind(datetime_1.DateTime));
-            this.rdates = (optionsOrDtstart?.rdates ?? []).map(datetime_1.DateTime.fromPlainOrInstance.bind(datetime_1.DateTime));
+    constructor(optionsOrDtstart) {
+        if ('dtstart' in optionsOrDtstart) {
+            this.dtstart = optionsOrDtstart.dtstart;
+            this.rrules = optionsOrDtstart?.rrules ?? [];
+            this.exrules = optionsOrDtstart?.exrules ?? [];
+            this.exdates = optionsOrDtstart?.exdates ?? [];
+            this.rdates = optionsOrDtstart?.rdates ?? [];
         }
-        else if (optionsOrDtstart instanceof datetime_1.DateTime) {
+        else {
             this.dtstart = optionsOrDtstart;
-            this.tzid = tzid ?? 'UTC';
             this.rrules = [];
             this.exrules = [];
             this.exdates = [];
             this.rdates = [];
         }
-        else {
-            throw new TypeError('Invalid arguments');
-        }
     }
     /**
      * Parses a string into an RRuleSet.
@@ -36,15 +30,23 @@ class RRuleSet {
         return this.fromRust(rust);
     }
     static fromPlain(plain) {
-        return new RRuleSet(plain);
+        return new RRuleSet({
+            dtstart: dtstart_1.DtStart.fromPlain(plain.dtstart),
+            rrules: plain.rrules.map((rrule) => rrule_1.RRule.fromPlain(rrule)),
+            exrules: plain.exrules.map((rrule) => rrule_1.RRule.fromPlain(rrule)),
+            exdates: plain.exdates.map((datetime) => datetime_1.DateTime.fromPlain(datetime)),
+            rdates: plain.rdates.map((datetime) => datetime_1.DateTime.fromPlain(datetime)),
+        });
     }
     /**
      * @internal
      */
     static fromRust(rust) {
         const set = new RRuleSet({
-            dtstart: datetime_1.DateTime.fromNumeric(rust.dtstart),
-            tzid: rust.tzid ?? undefined,
+            dtstart: new dtstart_1.DtStart({
+                datetime: datetime_1.DateTime.fromNumeric(rust.dtstart),
+                tzid: rust.tzid ?? undefined,
+            }),
             rrules: rust.rrules.map((rrule) => rrule_1.RRule.fromRust(rrule)),
             exrules: rust.exrules.map((rrule) => rrule_1.RRule.fromRust(rrule)),
             exdates: rust.exdates.map((datetime) => datetime_1.DateTime.fromNumeric(datetime)),
@@ -55,61 +57,55 @@ class RRuleSet {
     }
     setDtstart(dtstart) {
         return new RRuleSet({
-            ...this.toPlain(),
+            ...this.toOptions(),
             dtstart: dtstart,
         });
     }
-    setTzid(tzid) {
-        return new RRuleSet({
-            ...this.toPlain(),
-            tzid: tzid,
-        });
-    }
     addRrule(rrule) {
         return new RRuleSet({
-            ...this.toPlain(),
+            ...this.toOptions(),
             rrules: [...this.rrules, rrule],
         });
     }
     setRrules(rrules) {
         return new RRuleSet({
-            ...this.toPlain(),
+            ...this.toOptions(),
             rrules: rrules,
         });
     }
     addExrule(rrule) {
         return new RRuleSet({
-            ...this.toPlain(),
+            ...this.toOptions(),
             exrules: [...this.exrules, rrule],
         });
     }
     setExrules(rrules) {
         return new RRuleSet({
-            ...this.toPlain(),
+            ...this.toOptions(),
             exrules: rrules,
         });
     }
     addExdate(datetime) {
         return new RRuleSet({
-            ...this.toPlain(),
+            ...this.toOptions(),
             exdates: [...this.exdates, datetime],
         });
     }
     setExdates(datetimes) {
         return new RRuleSet({
-            ...this.toPlain(),
+            ...this.toOptions(),
             exdates: datetimes,
         });
     }
     addRdate(datetime) {
         return new RRuleSet({
-            ...this.toPlain(),
+            ...this.toOptions(),
             rdates: [...this.rdates, datetime],
         });
     }
     setRdates(datetimes) {
         return new RRuleSet({
-            ...this.toPlain(),
+            ...this.toOptions(),
             rdates: datetimes,
         });
     }
@@ -147,7 +143,7 @@ class RRuleSet {
      * @internal
      */
     toRust() {
-        this.rust ??= new lib_1.RRuleSet(this.dtstart.toNumeric(), this.tzid, this.rrules.map((rrule) => rrule.toRust()), this.exrules.map((rrule) => rrule.toRust()), this.exdates.map((datetime) => datetime.toNumeric()), this.rdates.map((datetime) => datetime.toNumeric()));
+        this.rust ??= new lib_1.RRuleSet(this.dtstart.datetime.toNumeric(), this.dtstart.tzid, this.rrules.map((rrule) => rrule.toRust()), this.exrules.map((rrule) => rrule.toRust()), this.exdates.map((datetime) => datetime.toNumeric()), this.rdates.map((datetime) => datetime.toNumeric()));
         return this.rust;
     }
     toString() {
@@ -159,7 +155,6 @@ class RRuleSet {
     toPlain() {
         return {
             dtstart: this.dtstart.toPlain(),
-            tzid: this.tzid,
             rrules: this.rrules.map((rrule) => rrule.toPlain()),
             exrules: this.exrules.map((rrule) => rrule.toPlain()),
             exdates: this.exdates.map((rrule) => rrule.toPlain()),
@@ -184,5 +179,14 @@ class RRuleSet {
             },
         };
     }
+    toOptions() {
+        return {
+            dtstart: this.dtstart,
+            rrules: this.rrules,
+            exrules: this.exrules,
+            exdates: this.exdates,
+            rdates: this.rdates,
+        };
+    }
 }
 exports.RRuleSet = RRuleSet;

package/dist/node/rrule.d.ts

@@ -45,7 +45,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[];
@@ -108,7 +108,8 @@ export declare class RRule {
     setByWeekno(weekNumbers: readonly number[]): RRule;
     setByYearday(days: readonly number[]): RRule;
     setWeekstart(day: Weekday): RRule;
-    setUntil(datetime: DateTime | DateTimeLike): RRule;
+    setUntil(datetime: DateTime): RRule;
     toString(): string;
     toPlain(): RRuleLike;
+    private toOptions;
 }

package/dist/node/rrule.js

@@ -82,7 +82,7 @@ class RRule {
         return new this({
             frequency: rrule.frequency,
             interval: rrule.interval,
-            until: rrule.until,
+            until: rrule.until && datetime_1.DateTime.fromPlain(rrule.until),
             count: rrule.count,
             byWeekday: rrule.byWeekday,
             byHour: rrule.byHour,
@@ -119,53 +119,47 @@ class RRule {
         rrule.rust = rust;
         return rrule;
     }
-    /**
-     * @internal
-     */
-    static fromPlainOrInstance(rrule) {
-        return rrule instanceof RRule ? rrule : this.fromPlain(rrule);
-    }
     setFrequency(frequency) {
-        return new RRule({ ...this.toPlain(), frequency });
+        return new RRule({ ...this.toOptions(), frequency });
     }
     setInterval(interval) {
-        return new RRule({ ...this.toPlain(), interval });
+        return new RRule({ ...this.toOptions(), interval });
     }
     setCount(count) {
-        return new RRule({ ...this.toPlain(), count });
+        return new RRule({ ...this.toOptions(), count });
     }
     setByWeekday(weekdays) {
-        return new RRule({ ...this.toPlain(), byWeekday: weekdays });
+        return new RRule({ ...this.toOptions(), byWeekday: weekdays });
     }
     setByHour(hours) {
-        return new RRule({ ...this.toPlain(), byHour: hours });
+        return new RRule({ ...this.toOptions(), byHour: hours });
     }
     setByMinute(minutes) {
-        return new RRule({ ...this.toPlain(), byMinute: minutes });
+        return new RRule({ ...this.toOptions(), byMinute: minutes });
     }
     setBySecond(seconds) {
-        return new RRule({ ...this.toPlain(), bySecond: seconds });
+        return new RRule({ ...this.toOptions(), bySecond: seconds });
     }
     setByMonthday(days) {
-        return new RRule({ ...this.toPlain(), byMonthday: days });
+        return new RRule({ ...this.toOptions(), byMonthday: days });
     }
     setBySetpos(poses) {
-        return new RRule({ ...this.toPlain(), bySetpos: poses });
+        return new RRule({ ...this.toOptions(), bySetpos: poses });
     }
     setByMonth(months) {
-        return new RRule({ ...this.toPlain(), byMonth: months });
+        return new RRule({ ...this.toOptions(), byMonth: months });
     }
     setByWeekno(weekNumbers) {
-        return new RRule({ ...this.toPlain(), byWeekno: weekNumbers });
+        return new RRule({ ...this.toOptions(), byWeekno: weekNumbers });
     }
     setByYearday(days) {
-        return new RRule({ ...this.toPlain(), byYearday: days });
+        return new RRule({ ...this.toOptions(), byYearday: days });
     }
     setWeekstart(day) {
-        return new RRule({ ...this.toPlain(), weekstart: day });
+        return new RRule({ ...this.toOptions(), weekstart: day });
     }
     setUntil(datetime) {
-        return new RRule({ ...this.toPlain(), until: datetime });
+        return new RRule({ ...this.toOptions(), until: datetime });
     }
     toString() {
         return this.toRust().toString();
@@ -195,5 +189,23 @@ class RRule {
             until: this.until?.toPlain(),
         };
     }
+    toOptions() {
+        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,
+        };
+    }
 }
 exports.RRule = RRule;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rrule-rust",
-  "version": "3.0.0-alpha.4",
+  "version": "3.0.0-alpha.6",
   "main": "dist/node/index.js",
   "browser": "dist/browser/index.js",
   "keywords": [
@@ -96,19 +96,19 @@
     "prepublishOnly": "npm run build && napi prepublish -t npm"
   },
   "optionalDependencies": {
-    "@rrule-rust/lib-win32-x64-msvc": "3.0.0-alpha.4",
-    "@rrule-rust/lib-darwin-x64": "3.0.0-alpha.4",
-    "@rrule-rust/lib-linux-x64-gnu": "3.0.0-alpha.4",
-    "@rrule-rust/lib-linux-x64-musl": "3.0.0-alpha.4",
-    "@rrule-rust/lib-linux-arm64-gnu": "3.0.0-alpha.4",
-    "@rrule-rust/lib-win32-ia32-msvc": "3.0.0-alpha.4",
-    "@rrule-rust/lib-linux-arm-gnueabihf": "3.0.0-alpha.4",
-    "@rrule-rust/lib-darwin-arm64": "3.0.0-alpha.4",
-    "@rrule-rust/lib-android-arm64": "3.0.0-alpha.4",
-    "@rrule-rust/lib-freebsd-x64": "3.0.0-alpha.4",
-    "@rrule-rust/lib-linux-arm64-musl": "3.0.0-alpha.4",
-    "@rrule-rust/lib-win32-arm64-msvc": "3.0.0-alpha.4",
-    "@rrule-rust/lib-android-arm-eabi": "3.0.0-alpha.4",
-    "@rrule-rust/lib-wasm32-wasi": "3.0.0-alpha.4"
+    "@rrule-rust/lib-win32-x64-msvc": "3.0.0-alpha.6",
+    "@rrule-rust/lib-darwin-x64": "3.0.0-alpha.6",
+    "@rrule-rust/lib-linux-x64-gnu": "3.0.0-alpha.6",
+    "@rrule-rust/lib-linux-x64-musl": "3.0.0-alpha.6",
+    "@rrule-rust/lib-linux-arm64-gnu": "3.0.0-alpha.6",
+    "@rrule-rust/lib-win32-ia32-msvc": "3.0.0-alpha.6",
+    "@rrule-rust/lib-linux-arm-gnueabihf": "3.0.0-alpha.6",
+    "@rrule-rust/lib-darwin-arm64": "3.0.0-alpha.6",
+    "@rrule-rust/lib-android-arm64": "3.0.0-alpha.6",
+    "@rrule-rust/lib-freebsd-x64": "3.0.0-alpha.6",
+    "@rrule-rust/lib-linux-arm64-musl": "3.0.0-alpha.6",
+    "@rrule-rust/lib-win32-arm64-msvc": "3.0.0-alpha.6",
+    "@rrule-rust/lib-android-arm-eabi": "3.0.0-alpha.6",
+    "@rrule-rust/lib-wasm32-wasi": "3.0.0-alpha.6"
   }
 }