rrule-rust 2.0.2-next.1 → 2.0.3-next.1

package/README.md

@@ -12,12 +12,20 @@
 
 ## Quick Start
 
-See [test folder](https://github.com/lsndr/rrule-rust/tree/master/tests) to find more use cases
-
 ```
   npm i rrule-rust
 ```
 
+If you need browser-compatible version with wasm support, install it from `alpha` channel:
+
+```
+  npm i rrule-rust@alpha
+```
+
+Wasm package is distributed via `alpha` channel because it is based on alpha version of [napi.rs](https://napi.rs/). Once [napi.rs](https://napi.rs/) v3 get released, we will add wasm support to `latest` channel.
+
+See [test folder](https://github.com/lsndr/rrule-rust/tree/master/tests) to find more use cases
+
 ```typescript
 import { RRule, RRuleSet, Frequency, DateTime } from 'rrule-rust';
 

package/dist/lib/index.d.ts

@@ -39,7 +39,7 @@ export enum Weekday {
   Saturday = 5,
   Sunday = 6
 }
-export class RRule {
+export declare class RRule {
   constructor(frequency: Frequency, interval?: number | undefined | null, count?: number | undefined | null, weekstart?: Weekday | undefined | null, until?: number | undefined | null, byWeekday?: (readonly (NWeekday | Weekday)[]) | undefined | null, byHour?: (readonly number[]) | undefined | null, byMinute?: (readonly number[]) | undefined | null, bySecond?: (readonly number[]) | undefined | null, byMonthday?: (readonly number[]) | undefined | null, bySetpos?: (readonly number[]) | undefined | null, byMonth?: (readonly number[]) | undefined | null, byWeekno?: (readonly number[]) | undefined | null, byYearday?: (readonly number[]) | undefined | null)
   static parse(str: string): RRule
   get frequency(): Frequency
@@ -58,7 +58,7 @@ export class RRule {
   get until(): number | null
   toString(): string
 }
-export class RRuleSet {
+export declare class RRuleSet {
   constructor(dtstart: number, tzid?: string | undefined | null, rrules?: (readonly RRule[]) | undefined | null, exrules?: (readonly RRule[]) | undefined | null, exdates?: (readonly number[]) | undefined | null, rdates?: (readonly number[]) | undefined | null)
   get tzid(): string | null
   get dtstart(): number
@@ -73,9 +73,6 @@ export class RRuleSet {
   toString(): string
   iterator(): RRuleSetIterator
 }
-export class RRuleSetIterator {
-  iterator(): RRuleSetIteratorIterable
-}
-export class RRuleSetIteratorIterable {
+export declare class RRuleSetIterator {
   next(): number | null
 }

package/dist/lib/index.js

@@ -310,12 +310,11 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { Frequency, Month, RRule, RRuleSet, RRuleSetIterator, RRuleSetIteratorIterable, Weekday } = nativeBinding
+const { Frequency, Month, RRule, RRuleSet, RRuleSetIterator, Weekday } = nativeBinding
 
 module.exports.Frequency = Frequency
 module.exports.Month = Month
 module.exports.RRule = RRule
 module.exports.RRuleSet = RRuleSet
 module.exports.RRuleSetIterator = RRuleSetIterator
-module.exports.RRuleSetIteratorIterable = RRuleSetIteratorIterable
 module.exports.Weekday = Weekday

package/dist/rrule-set.d.ts

@@ -15,7 +15,7 @@ export declare class RRuleSet implements Iterable<DateTime> {
     readonly exrules: readonly RRule[];
     readonly exdates: readonly DateTime[];
     readonly rdates: readonly DateTime[];
-    constructor(dtstart: DateTime, tzid: string | undefined);
+    constructor(dtstart: DateTime, tzid?: string);
     constructor(options: Partial<RRuleSetLike>);
     /**
      * Parses a string into an RRuleSet.
@@ -56,13 +56,5 @@ export declare class RRuleSet implements Iterable<DateTime> {
      * Converts the RRuleSet to a plain object.
      */
     toObject(): RRuleSetLike;
-    [Symbol.iterator](): {
-        next: () => {
-            done: true;
-            value: undefined;
-        } | {
-            done: boolean;
-            value: DateTime;
-        };
-    };
+    [Symbol.iterator](): Iterator<DateTime, any, any>;
 }

package/dist/rrule-set.js

@@ -148,9 +148,7 @@ class RRuleSet {
      * @internal
      */
     toRust() {
-        if (!this.rust) {
-            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.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()));
         return this.rust;
     }
     toString() {
@@ -170,7 +168,7 @@ class RRuleSet {
         };
     }
     [Symbol.iterator]() {
-        const iter = this.toRust().iterator().iterator();
+        const iter = this.toRust().iterator();
         return {
             next: () => {
                 const result = iter.next();

package/dist/rrule.js

@@ -84,7 +84,7 @@ class RRule {
             frequency: rust.frequency,
             interval: rust.interval ?? undefined,
             until: rust.until === null ? undefined : datetime_1.DateTime.fromNumeric(rust.until),
-            count: rust.count === null ? undefined : rust.count,
+            count: rust.count ?? undefined,
             byWeekday: rust.byWeekday,
             byHour: rust.byHour,
             byMinute: rust.byMinute,
@@ -148,9 +148,7 @@ class RRule {
      * @internal
      */
     toRust() {
-        if (!this.rust) {
-            this.rust = new lib_1.RRule(this.frequency, this.interval, this.count, this.weekstart, this.until?.toNumeric(), this.byWeekday, this.byHour, this.byMinute, this.bySecond, this.byMonthday, this.bySetpos, this.byMonth, this.byWeekno, this.byYearday);
-        }
+        this.rust ??= new lib_1.RRule(this.frequency, this.interval, this.count, this.weekstart, this.until?.toNumeric(), this.byWeekday, this.byHour, this.byMinute, this.bySecond, this.byMonthday, this.bySetpos, this.byMonth, this.byWeekno, this.byYearday);
         return this.rust;
     }
     toObject() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rrule-rust",
-  "version": "2.0.2-next.1",
+  "version": "2.0.3-next.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "keywords": [
@@ -43,33 +43,34 @@
   "devDependencies": {
     "@commitlint/cli": "^19.3.0",
     "@commitlint/config-conventional": "^19.2.2",
+    "@eslint-community/eslint-plugin-eslint-comments": "^4.5.0",
+    "@eslint/compat": "^1.2.9",
+    "@eslint/js": "^9.27.0",
     "@napi-rs/cli": "^2.18.2",
     "@semantic-release/git": "^10.0.1",
     "@types/jest": "^29.5.0",
     "@types/luxon": "^3.4.2",
-    "@types/node": "^20.12.8",
-    "@typescript-eslint/eslint-plugin": "^7.12.0",
-    "@typescript-eslint/parser": "^7.12.0",
+    "@types/node": "^22.1.0",
     "benny": "^3.7.1",
     "conventional-changelog-conventionalcommits": "^7.0.2",
     "cpy-cli": "^5.0.0",
     "cross-env": "^7.0.3",
-    "eslint": "^8.57.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-eslint-comments": "^3.2.0",
-    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-json": "^3.1.0",
+    "eslint": "^9.27.0",
+    "eslint-config-prettier": "^10.1.5",
+    "eslint-import-resolver-typescript": "^4.3.5",
+    "eslint-plugin-import-x": "^4.12.2",
     "husky": "^9.0.11",
     "jest": "^29.5.0",
     "luxon": "^3.4.4",
     "mkdirp": "^3.0.1",
-    "prettier": "^2.8.3",
-    "rimraf": "^5.0.5",
+    "prettier": "^3.5.3",
+    "rimraf": "^6.0.1",
     "rrule": "^2.7.2",
     "semantic-release": "^23.0.8",
     "ts-jest": "^29.0.5",
     "ts-node": "^10.9.1",
-    "typescript": "^5.4.5"
+    "typescript": "^5.4.5",
+    "typescript-eslint": "^8.32.1"
   },
   "engines": {
     "node": ">= 10"
@@ -79,6 +80,7 @@
     "build:lib": "napi build --no-const-enum --platform --release src/lib",
     "prebuild": "rimraf ./dist && npm run build:lib",
     "build": "tsc -p ./tsconfig.build.json",
+    "build:tests": "tsc -p ./tsconfig.test.json",
     "postbuild": "cpy ./src/lib/* ./dist/lib --flat",
     "prepublishOnly": "napi prepublish -t npm",
     "test": "cross-env TZ=Europe/Moscow jest --testPathIgnorePatterns=\\.e2e\\.spec\\.ts",
@@ -88,26 +90,26 @@
     "benchmark": "ts-node ./benchmark/index.ts",
     "format": "cargo fmt --all --check && prettier --check .",
     "format:fix": "cargo fmt --all && prettier --write .",
-    "lint": "eslint \"**/*.{js,ts,json}\" --max-warnings=0",
+    "lint": "eslint --max-warnings=0",
     "lint:fix": "npm run lint -- --fix",
     "prepare": "husky && npm run build"
   },
   "optionalDependencies": {
-    "@rrule-rust/lib-win32-x64-msvc": "2.0.2-next.1",
-    "@rrule-rust/lib-darwin-x64": "2.0.2-next.1",
-    "@rrule-rust/lib-linux-x64-gnu": "2.0.2-next.1",
-    "@rrule-rust/lib-darwin-arm64": "2.0.2-next.1",
-    "@rrule-rust/lib-android-arm64": "2.0.2-next.1",
-    "@rrule-rust/lib-linux-arm64-gnu": "2.0.2-next.1",
-    "@rrule-rust/lib-linux-arm64-musl": "2.0.2-next.1",
-    "@rrule-rust/lib-win32-arm64-msvc": "2.0.2-next.1",
-    "@rrule-rust/lib-linux-arm-gnueabihf": "2.0.2-next.1",
-    "@rrule-rust/lib-linux-arm-musleabihf": "2.0.2-next.1",
-    "@rrule-rust/lib-linux-x64-musl": "2.0.2-next.1",
-    "@rrule-rust/lib-freebsd-x64": "2.0.2-next.1",
-    "@rrule-rust/lib-win32-ia32-msvc": "2.0.2-next.1",
-    "@rrule-rust/lib-android-arm-eabi": "2.0.2-next.1",
-    "@rrule-rust/lib-darwin-universal": "2.0.2-next.1",
-    "@rrule-rust/lib-linux-riscv64-gnu": "2.0.2-next.1"
+    "@rrule-rust/lib-win32-x64-msvc": "2.0.3-next.1",
+    "@rrule-rust/lib-darwin-x64": "2.0.3-next.1",
+    "@rrule-rust/lib-linux-x64-gnu": "2.0.3-next.1",
+    "@rrule-rust/lib-darwin-arm64": "2.0.3-next.1",
+    "@rrule-rust/lib-android-arm64": "2.0.3-next.1",
+    "@rrule-rust/lib-linux-arm64-gnu": "2.0.3-next.1",
+    "@rrule-rust/lib-linux-arm64-musl": "2.0.3-next.1",
+    "@rrule-rust/lib-win32-arm64-msvc": "2.0.3-next.1",
+    "@rrule-rust/lib-linux-arm-gnueabihf": "2.0.3-next.1",
+    "@rrule-rust/lib-linux-arm-musleabihf": "2.0.3-next.1",
+    "@rrule-rust/lib-linux-x64-musl": "2.0.3-next.1",
+    "@rrule-rust/lib-freebsd-x64": "2.0.3-next.1",
+    "@rrule-rust/lib-win32-ia32-msvc": "2.0.3-next.1",
+    "@rrule-rust/lib-android-arm-eabi": "2.0.3-next.1",
+    "@rrule-rust/lib-darwin-universal": "2.0.3-next.1",
+    "@rrule-rust/lib-linux-riscv64-gnu": "2.0.3-next.1"
   }
 }