rrule-rust 0.0.1-2 → 0.0.1-5

package/index.js

@@ -31,7 +31,7 @@ switch (platform) {
           if (localFileExisted) {
             nativeBinding = require('./rrule-rust.android-arm64.node')
           } else {
-            nativeBinding = require('@rrule-rust/android-arm64')
+            nativeBinding = require('@rrule-rust/lib-android-arm64')
           }
         } catch (e) {
           loadError = e
@@ -43,7 +43,7 @@ switch (platform) {
           if (localFileExisted) {
             nativeBinding = require('./rrule-rust.android-arm-eabi.node')
           } else {
-            nativeBinding = require('@rrule-rust/android-arm-eabi')
+            nativeBinding = require('@rrule-rust/lib-android-arm-eabi')
           }
         } catch (e) {
           loadError = e
@@ -63,7 +63,7 @@ switch (platform) {
           if (localFileExisted) {
             nativeBinding = require('./rrule-rust.win32-x64-msvc.node')
           } else {
-            nativeBinding = require('@rrule-rust/win32-x64-msvc')
+            nativeBinding = require('@rrule-rust/lib-win32-x64-msvc')
           }
         } catch (e) {
           loadError = e
@@ -77,7 +77,7 @@ switch (platform) {
           if (localFileExisted) {
             nativeBinding = require('./rrule-rust.win32-ia32-msvc.node')
           } else {
-            nativeBinding = require('@rrule-rust/win32-ia32-msvc')
+            nativeBinding = require('@rrule-rust/lib-win32-ia32-msvc')
           }
         } catch (e) {
           loadError = e
@@ -91,7 +91,7 @@ switch (platform) {
           if (localFileExisted) {
             nativeBinding = require('./rrule-rust.win32-arm64-msvc.node')
           } else {
-            nativeBinding = require('@rrule-rust/win32-arm64-msvc')
+            nativeBinding = require('@rrule-rust/lib-win32-arm64-msvc')
           }
         } catch (e) {
           loadError = e
@@ -107,7 +107,7 @@ switch (platform) {
       if (localFileExisted) {
         nativeBinding = require('./rrule-rust.darwin-universal.node')
       } else {
-        nativeBinding = require('@rrule-rust/darwin-universal')
+        nativeBinding = require('@rrule-rust/lib-darwin-universal')
       }
       break
     } catch {}
@@ -118,7 +118,7 @@ switch (platform) {
           if (localFileExisted) {
             nativeBinding = require('./rrule-rust.darwin-x64.node')
           } else {
-            nativeBinding = require('@rrule-rust/darwin-x64')
+            nativeBinding = require('@rrule-rust/lib-darwin-x64')
           }
         } catch (e) {
           loadError = e
@@ -132,7 +132,7 @@ switch (platform) {
           if (localFileExisted) {
             nativeBinding = require('./rrule-rust.darwin-arm64.node')
           } else {
-            nativeBinding = require('@rrule-rust/darwin-arm64')
+            nativeBinding = require('@rrule-rust/lib-darwin-arm64')
           }
         } catch (e) {
           loadError = e
@@ -151,7 +151,7 @@ switch (platform) {
       if (localFileExisted) {
         nativeBinding = require('./rrule-rust.freebsd-x64.node')
       } else {
-        nativeBinding = require('@rrule-rust/freebsd-x64')
+        nativeBinding = require('@rrule-rust/lib-freebsd-x64')
       }
     } catch (e) {
       loadError = e
@@ -168,7 +168,7 @@ switch (platform) {
             if (localFileExisted) {
               nativeBinding = require('./rrule-rust.linux-x64-musl.node')
             } else {
-              nativeBinding = require('@rrule-rust/linux-x64-musl')
+              nativeBinding = require('@rrule-rust/lib-linux-x64-musl')
             }
           } catch (e) {
             loadError = e
@@ -181,7 +181,7 @@ switch (platform) {
             if (localFileExisted) {
               nativeBinding = require('./rrule-rust.linux-x64-gnu.node')
             } else {
-              nativeBinding = require('@rrule-rust/linux-x64-gnu')
+              nativeBinding = require('@rrule-rust/lib-linux-x64-gnu')
             }
           } catch (e) {
             loadError = e
@@ -197,7 +197,7 @@ switch (platform) {
             if (localFileExisted) {
               nativeBinding = require('./rrule-rust.linux-arm64-musl.node')
             } else {
-              nativeBinding = require('@rrule-rust/linux-arm64-musl')
+              nativeBinding = require('@rrule-rust/lib-linux-arm64-musl')
             }
           } catch (e) {
             loadError = e
@@ -210,7 +210,7 @@ switch (platform) {
             if (localFileExisted) {
               nativeBinding = require('./rrule-rust.linux-arm64-gnu.node')
             } else {
-              nativeBinding = require('@rrule-rust/linux-arm64-gnu')
+              nativeBinding = require('@rrule-rust/lib-linux-arm64-gnu')
             }
           } catch (e) {
             loadError = e
@@ -225,7 +225,7 @@ switch (platform) {
           if (localFileExisted) {
             nativeBinding = require('./rrule-rust.linux-arm-gnueabihf.node')
           } else {
-            nativeBinding = require('@rrule-rust/linux-arm-gnueabihf')
+            nativeBinding = require('@rrule-rust/lib-linux-arm-gnueabihf')
           }
         } catch (e) {
           loadError = e

package/package.json

@@ -1,10 +1,13 @@
 {
   "name": "rrule-rust",
-  "version": "0.0.1-2",
+  "version": "0.0.1-5",
   "main": "index.js",
   "types": "index.d.ts",
   "napi": {
     "name": "rrule-rust",
+    "package": {
+      "name": "@rrule-rust/lib"
+    },
     "triples": {
       "additional": [
         "aarch64-apple-darwin",
@@ -34,7 +37,7 @@
   },
   "scripts": {
     "artifacts": "napi artifacts",
-    "build": "napi build --platform --release",
+    "build": "napi build --platform --release --js-package-name @rrule-rust/lib",
     "build:debug": "napi build --platform",
     "prepublishOnly": "napi prepublish -t npm",
     "test": "ava",
@@ -42,19 +45,19 @@
     "version": "napi version"
   },
   "optionalDependencies": {
-    "rrule-rust-win32-x64-msvc": "0.0.1-2",
-    "rrule-rust-darwin-x64": "0.0.1-2",
-    "rrule-rust-linux-x64-gnu": "0.0.1-2",
-    "rrule-rust-darwin-arm64": "0.0.1-2",
-    "rrule-rust-android-arm64": "0.0.1-2",
-    "rrule-rust-linux-arm64-gnu": "0.0.1-2",
-    "rrule-rust-linux-arm64-musl": "0.0.1-2",
-    "rrule-rust-win32-arm64-msvc": "0.0.1-2",
-    "rrule-rust-linux-arm-gnueabihf": "0.0.1-2",
-    "rrule-rust-linux-x64-musl": "0.0.1-2",
-    "rrule-rust-freebsd-x64": "0.0.1-2",
-    "rrule-rust-win32-ia32-msvc": "0.0.1-2",
-    "rrule-rust-android-arm-eabi": "0.0.1-2",
-    "rrule-rust-darwin-universal": "0.0.1-2"
+    "@rrule-rust/lib-win32-x64-msvc": "0.0.1-5",
+    "@rrule-rust/lib-darwin-x64": "0.0.1-5",
+    "@rrule-rust/lib-linux-x64-gnu": "0.0.1-5",
+    "@rrule-rust/lib-darwin-arm64": "0.0.1-5",
+    "@rrule-rust/lib-android-arm64": "0.0.1-5",
+    "@rrule-rust/lib-linux-arm64-gnu": "0.0.1-5",
+    "@rrule-rust/lib-linux-arm64-musl": "0.0.1-5",
+    "@rrule-rust/lib-win32-arm64-msvc": "0.0.1-5",
+    "@rrule-rust/lib-linux-arm-gnueabihf": "0.0.1-5",
+    "@rrule-rust/lib-linux-x64-musl": "0.0.1-5",
+    "@rrule-rust/lib-freebsd-x64": "0.0.1-5",
+    "@rrule-rust/lib-win32-ia32-msvc": "0.0.1-5",
+    "@rrule-rust/lib-android-arm-eabi": "0.0.1-5",
+    "@rrule-rust/lib-darwin-universal": "0.0.1-5"
   }
 }

package/src/lib.rs

@@ -280,6 +280,8 @@ impl JsRRule {
 pub struct JsRRuleSet {
   tz: Tz,
   rrule_set: RRuleSet,
+  before: Option<i64>,
+  after: Option<i64>,
 }
 
 #[napi]
@@ -290,7 +292,12 @@ impl JsRRuleSet {
     let date = timestamp_to_date_with_tz(dtstart, &tz);
     let rrule_set = RRuleSet::new(date);
 
-    JsRRuleSet { rrule_set, tz }
+    JsRRuleSet {
+      rrule_set,
+      tz,
+      before: None,
+      after: None,
+    }
   }
 
   #[napi]
@@ -319,18 +326,14 @@ impl JsRRuleSet {
 
   #[napi]
   pub fn after(&mut self, timestamp: i64) -> napi::Result<&Self> {
-    replace_with_or_abort(&mut self.rrule_set, |self_| {
-      self_.after(timestamp_to_date_with_tz(timestamp, &self.tz))
-    });
+    self.after = Some(timestamp);
 
     Ok(self)
   }
 
   #[napi]
   pub fn before(&mut self, timestamp: i64) -> napi::Result<&Self> {
-    replace_with_or_abort(&mut self.rrule_set, |self_| {
-      self_.before(timestamp_to_date_with_tz(timestamp, &self.tz))
-    });
+    self.before = Some(timestamp);
 
     Ok(self)
   }
@@ -368,23 +371,50 @@ impl JsRRuleSet {
     Ok(arr)
   }*/
 
+  fn is_after(&self, timestamp: i64) -> bool {
+    if let Some(after) = self.after {
+      if timestamp <= after {
+        return false;
+      }
+    }
+
+    true
+  }
+
+  fn is_before(&self, timestamp: i64) -> bool {
+    if let Some(before) = self.before {
+      if timestamp >= before {
+        return false;
+      }
+    }
+
+    true
+  }
+
   #[napi(ts_return_type = "number[]")]
   pub fn all(&self, env: Env, limit: Option<u32>) -> napi::Result<Array> {
     let mut arr = env.create_array(0).unwrap();
-    let iter = self.rrule_set.into_iter();
     let mut left = match limit {
       Some(number) => number,
       None => 0,
     };
 
-    for date in iter {
+    for date in self.rrule_set.into_iter() {
       if left > 0 {
         left = left - 1;
       } else if limit.is_some() {
         break;
       }
 
-      arr.insert(date.timestamp_millis()).unwrap();
+      let timestamp = date.timestamp_millis();
+      let is_after = self.is_after(timestamp);
+      let is_before = self.is_before(timestamp);
+
+      if is_after && is_before {
+        arr.insert(timestamp).unwrap();
+      } else if !is_before {
+        break;
+      }
     }
 
     Ok(arr)