perf(rrule-set): do not use napi's iterator macro (#212)

benchmark/index.ts

@@ -18,6 +18,20 @@ function suite(tzid: string) {
 
  set.all();
  }),
+ b.add('...RRuleSet (rust)', () => {
+ const rrule = new rust.RRule({
+ frequency: rust.Frequency.Daily,
+ count: 30,
+ interval: 1,
+ });
+ const set = new rust.RRuleSet({
+ dtstart: rust.DateTime.create(2023, 2, 21, 23, 59, 0, false),
+ tzid,
+ rrules: [rrule],
+ });
+
+ [...set];
+ }),
  b.add('RRule.all() (node)', () => {
  const rrule = new node.RRule({
  freq: node.RRule.DAILY,

lib/js/rrule_set.rs

@@ -5,7 +5,6 @@ use crate::rrule::exdate::ExDate;
 use crate::rrule::rdate::RDate;
 use crate::rrule::{rrule, rrule_set};
 use napi::bindgen_prelude::{Array, Reference, SharedReference};
-use napi::iterator::Generator;
 use napi::Env;
 use napi_derive::napi;
 use replace_with::replace_with_or_abort_and_return;
@@ -286,18 +285,15 @@ impl RRuleSetIterator {
  }
 }
 
-#[napi(iterator)]
+#[napi]
 pub struct RRuleSetIteratorIterable {
  iterator: SharedReference<RRuleSetIterator, rrule_set::RRuleSetIteratorIterable<'static>>,
 }
 
 #[napi]
-impl Generator for RRuleSetIteratorIterable {
- type Yield = i64;
- type Next = ();
- type Return = ();
-
- fn next(&mut self, _next: Option<Self::Next>) -> Option<Self::Yield> {
+impl RRuleSetIteratorIterable {
+ #[napi]
+ pub fn next(&mut self) -> Option<i64> {
  self.iterator.next().map(|date: DateTime| (&date).into())
  }
 }

src/lib/index.d.ts

@@ -77,5 +77,5 @@ export class RRuleSetIterator {
  iterator(): RRuleSetIteratorIterable
 }
 export class RRuleSetIteratorIterable {
- [Symbol.iterator](): Iterator<number, void, void>
+ next(): number | null
 }

src/rrule-set.ts

@@ -235,19 +235,22 @@ export class RRuleSet implements Iterable<DateTime> {
  }
 
  public [Symbol.iterator]() {
- const iter = this.toRust().iterator().iterator()[Symbol.iterator]();
+ const iter = this.toRust().iterator().iterator();
 
  return {
  next: () => {
  const result = iter.next();
 
- if (result.done) {
- return result;
+ if (result === null) {
+ return {
+ done: true as const,
+ value: undefined,
+ };
  }
 
  return {
  done: false,
- value: DateTime.fromNumeric(result.value),
+ value: DateTime.fromNumeric(result),
  };
  },
  };