rrule-rust 1.2.0 → 2.0.0-next.1

package/index.d.ts

@@ -21,6 +21,16 @@ export const enum Weekday {
   Saturday = 5,
   Sunday = 6
 }
+export interface NWeekday {
+  /**
+   * If set, this represents the nth occurrence of the weekday.
+   * Otherwise it represents every occurrence of the weekday.
+   *
+   * A negative value represents nth occurrence from the end.
+   */
+  n?: number
+  weekday: Weekday
+}
 export const enum Month {
   January = 0,
   February = 1,
@@ -42,7 +52,7 @@ export class RRule {
   get frequency(): Frequency
   get interval(): number
   get count(): number | null
-  get byWeekday(): Weekday[]
+  get byWeekday(): NWeekday[]
   get byHour(): Array<number>
   get byMinute(): Array<number>
   get bySecond(): Array<number>
@@ -56,7 +66,7 @@ export class RRule {
   toString(): string
   setInterval(interval: number): this
   setCount(count: number): this
-  setByWeekday(weekdays: ReadonlyArray<Weekday>): this
+  setByWeekday(weekdays: readonly Array<NWeekday | Weekday>): this
   setByHour(hours: ReadonlyArray<number>): this
   setByMinute(minutes: ReadonlyArray<number>): this
   setBySecond(seconds: ReadonlyArray<number>): this

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rrule-rust",
-  "version": "1.2.0",
+  "version": "2.0.0-next.1",
   "main": "index.js",
   "types": "index.d.ts",
   "keywords": [
@@ -88,19 +88,19 @@
     "conventional-changelog-conventionalcommits": "^7.0.2"
   },
   "optionalDependencies": {
-    "@rrule-rust/lib-win32-x64-msvc": "1.2.0",
-    "@rrule-rust/lib-darwin-x64": "1.2.0",
-    "@rrule-rust/lib-linux-x64-gnu": "1.2.0",
-    "@rrule-rust/lib-darwin-arm64": "1.2.0",
-    "@rrule-rust/lib-android-arm64": "1.2.0",
-    "@rrule-rust/lib-linux-arm64-gnu": "1.2.0",
-    "@rrule-rust/lib-linux-arm64-musl": "1.2.0",
-    "@rrule-rust/lib-win32-arm64-msvc": "1.2.0",
-    "@rrule-rust/lib-linux-arm-gnueabihf": "1.2.0",
-    "@rrule-rust/lib-linux-x64-musl": "1.2.0",
-    "@rrule-rust/lib-freebsd-x64": "1.2.0",
-    "@rrule-rust/lib-win32-ia32-msvc": "1.2.0",
-    "@rrule-rust/lib-android-arm-eabi": "1.2.0",
-    "@rrule-rust/lib-darwin-universal": "1.2.0"
+    "@rrule-rust/lib-win32-x64-msvc": "2.0.0-next.1",
+    "@rrule-rust/lib-darwin-x64": "2.0.0-next.1",
+    "@rrule-rust/lib-linux-x64-gnu": "2.0.0-next.1",
+    "@rrule-rust/lib-darwin-arm64": "2.0.0-next.1",
+    "@rrule-rust/lib-android-arm64": "2.0.0-next.1",
+    "@rrule-rust/lib-linux-arm64-gnu": "2.0.0-next.1",
+    "@rrule-rust/lib-linux-arm64-musl": "2.0.0-next.1",
+    "@rrule-rust/lib-win32-arm64-msvc": "2.0.0-next.1",
+    "@rrule-rust/lib-linux-arm-gnueabihf": "2.0.0-next.1",
+    "@rrule-rust/lib-linux-x64-musl": "2.0.0-next.1",
+    "@rrule-rust/lib-freebsd-x64": "2.0.0-next.1",
+    "@rrule-rust/lib-win32-ia32-msvc": "2.0.0-next.1",
+    "@rrule-rust/lib-android-arm-eabi": "2.0.0-next.1",
+    "@rrule-rust/lib-darwin-universal": "2.0.0-next.1"
   }
 }

package/src/lib.rs

@@ -30,6 +30,40 @@ pub enum JsWeekday {
   Sunday,
 }
 
+#[napi(object, js_name = "NWeekday")]
+pub struct JsNWeekday {
+  /// If set, this represents the nth occurrence of the weekday.
+  /// Otherwise it represents every occurrence of the weekday.
+  ///
+  /// A negative value represents nth occurrence from the end.
+  pub n: Option<i16>,
+  pub weekday: JsWeekday,
+}
+
+impl From<NWeekday> for JsNWeekday {
+  fn from(nday: NWeekday) -> Self {
+    match nday {
+      NWeekday::Every(weekday) => JsNWeekday {
+        n: None,
+        weekday: map_rust_weekday(weekday),
+      },
+      NWeekday::Nth(n, weekday) => JsNWeekday {
+        n: Some(n),
+        weekday: map_rust_weekday(weekday),
+      },
+    }
+  }
+}
+
+impl Into<NWeekday> for JsNWeekday {
+  fn into(self) -> NWeekday {
+    match self.n {
+      Some(n) => NWeekday::Nth(n, map_js_weekday(self.weekday)),
+      None => NWeekday::Every(map_js_weekday(self.weekday)),
+    }
+  }
+}
+
 #[napi(js_name = "Month")]
 pub enum JsMonth {
   January,
@@ -114,21 +148,14 @@ impl JsRRule {
     Ok(self.rrule.get_count())
   }
 
-  #[napi(getter, ts_return_type = "Weekday[]")]
-  pub fn by_weekday(&self, env: Env) -> napi::Result<Array> {
-    let ndays = self.rrule.get_by_weekday();
-    let mut arr = env.create_array(0)?;
-
-    for nday in ndays.iter() {
-      let day = match nday {
-        NWeekday::Every(day) => *day,
-        _ => panic!("Unsupported"),
-      };
-
-      arr.insert(map_rust_weekday(day))?;
-    }
-
-    Ok(arr)
+  #[napi(getter, ts_return_type = "NWeekday[]")]
+  pub fn by_weekday(&self) -> Vec<JsNWeekday> {
+    return self
+      .rrule
+      .get_by_weekday()
+      .iter()
+      .map(|nday| JsNWeekday::from(*nday))
+      .collect();
   }
 
   #[napi(getter)]
@@ -213,18 +240,19 @@ impl JsRRule {
   #[napi]
   pub fn set_by_weekday(
     &mut self,
-    #[napi(ts_arg_type = "ReadonlyArray<Weekday>")] weekdays: Array,
+    #[napi(ts_arg_type = "readonly Array<NWeekday | Weekday>")] weekdays: Vec<
+      Either<JsNWeekday, JsWeekday>,
+    >,
   ) -> napi::Result<&Self> {
-    let mut vec: Vec<NWeekday> = Vec::new();
-
-    for i in 0..weekdays.len() {
-      let day: JsWeekday = weekdays.get(i).unwrap().unwrap();
-      let day = NWeekday::Every(map_js_weekday(day));
-
-      vec.push(day);
-    }
+    let by_weekday = weekdays
+      .into_iter()
+      .map(|weekday| match weekday {
+        Either::A(nday) => nday.into(),
+        Either::B(weekday) => NWeekday::Every(map_js_weekday(weekday)),
+      })
+      .collect();
 
-    replace_with_or_abort(&mut self.rrule, |self_| self_.by_weekday(vec));
+    replace_with_or_abort(&mut self.rrule, |self_| self_.by_weekday(by_weekday));
 
     Ok(self)
   }