rrule-rust 1.2.0-next.1 → 1.2.0-next.2

package/index.d.ts

@@ -38,6 +38,7 @@ export const enum Month {
 export type JsRRule = RRule
 export class RRule {
   constructor(frequency: Frequency)
+  static parse(str: string): RRule
   get frequency(): Frequency
   get interval(): number
   get count(): number | null
@@ -75,11 +76,13 @@ export class RRuleSet {
   addRrule(jsRrule: RRule): this
   addExrule(jsRrule: RRule): this
   addExdate(timestamp: number): this
+  addRdate(timestamp: number): this
   get dtstart(): number
   get tzid(): string
   getRrules(): Array<RRule>
   getExrules(): Array<RRule>
   getExdates(): Array<number>
+  getRdates(): Array<number>
   all(limit?: number | undefined | null): number[]
   between(after: number, before: number, inclusive?: boolean | undefined | null): number[]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rrule-rust",
-  "version": "1.2.0-next.1",
+  "version": "1.2.0-next.2",
   "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-next.1",
-    "@rrule-rust/lib-darwin-x64": "1.2.0-next.1",
-    "@rrule-rust/lib-linux-x64-gnu": "1.2.0-next.1",
-    "@rrule-rust/lib-darwin-arm64": "1.2.0-next.1",
-    "@rrule-rust/lib-android-arm64": "1.2.0-next.1",
-    "@rrule-rust/lib-linux-arm64-gnu": "1.2.0-next.1",
-    "@rrule-rust/lib-linux-arm64-musl": "1.2.0-next.1",
-    "@rrule-rust/lib-win32-arm64-msvc": "1.2.0-next.1",
-    "@rrule-rust/lib-linux-arm-gnueabihf": "1.2.0-next.1",
-    "@rrule-rust/lib-linux-x64-musl": "1.2.0-next.1",
-    "@rrule-rust/lib-freebsd-x64": "1.2.0-next.1",
-    "@rrule-rust/lib-win32-ia32-msvc": "1.2.0-next.1",
-    "@rrule-rust/lib-android-arm-eabi": "1.2.0-next.1",
-    "@rrule-rust/lib-darwin-universal": "1.2.0-next.1"
+    "@rrule-rust/lib-win32-x64-msvc": "1.2.0-next.2",
+    "@rrule-rust/lib-darwin-x64": "1.2.0-next.2",
+    "@rrule-rust/lib-linux-x64-gnu": "1.2.0-next.2",
+    "@rrule-rust/lib-darwin-arm64": "1.2.0-next.2",
+    "@rrule-rust/lib-android-arm64": "1.2.0-next.2",
+    "@rrule-rust/lib-linux-arm64-gnu": "1.2.0-next.2",
+    "@rrule-rust/lib-linux-arm64-musl": "1.2.0-next.2",
+    "@rrule-rust/lib-win32-arm64-msvc": "1.2.0-next.2",
+    "@rrule-rust/lib-linux-arm-gnueabihf": "1.2.0-next.2",
+    "@rrule-rust/lib-linux-x64-musl": "1.2.0-next.2",
+    "@rrule-rust/lib-freebsd-x64": "1.2.0-next.2",
+    "@rrule-rust/lib-win32-ia32-msvc": "1.2.0-next.2",
+    "@rrule-rust/lib-android-arm-eabi": "1.2.0-next.2",
+    "@rrule-rust/lib-darwin-universal": "1.2.0-next.2"
   }
 }

package/src/lib.rs

@@ -90,6 +90,15 @@ impl JsRRule {
     JsRRule { rrule }
   }
 
+  #[napi(factory, ts_return_type = "RRule")]
+  pub fn parse(str: String) -> napi::Result<Self> {
+    let rrule: RRule<Unvalidated> = str
+      .parse()
+      .map_err(|e| napi::Error::new(napi::Status::GenericFailure, e))?;
+
+    Ok(JsRRule { rrule })
+  }
+
   #[napi(getter)]
   pub fn frequency(&self) -> napi::Result<JsFrequency> {
     Ok(map_rust_frequency(self.rrule.get_freq()))
@@ -398,6 +407,15 @@ impl JsRRuleSet {
     Ok(self)
   }
 
+  #[napi]
+  pub fn add_rdate(&mut self, timestamp: i64) -> napi::Result<&Self> {
+    replace_with_or_abort(&mut self.rrule_set, |self_| {
+      self_.rdate(timestamp_to_date_with_tz(timestamp, &self.tz))
+    });
+
+    Ok(self)
+  }
+
   #[napi(getter)]
   pub fn dtstart(&self) -> napi::Result<i64> {
     Ok(self.rrule_set.get_dt_start().timestamp_millis())
@@ -442,6 +460,16 @@ impl JsRRuleSet {
       .collect();
   }
 
+  #[napi]
+  pub fn get_rdates(&self) -> Vec<i64> {
+    return self
+      .rrule_set
+      .get_rdate()
+      .iter()
+      .map(|date| date.timestamp_millis())
+      .collect();
+  }
+
   fn is_after(&self, timestamp: i64, after_timestamp: i64, inclusive: Option<bool>) -> bool {
     let inclusive = inclusive.unwrap_or(false);