rrule-rust 2.0.0-alpha.4 → 2.0.0-next.10

package/{index.d.ts → dist/index.d.ts}

@@ -88,12 +88,15 @@ export class RRuleDateTime {
   get minute(): number
   get second(): number
   get millisecond(): number
-  get toString(): string
+  toString(): string
+  toRFC3339(): string
   toDate(): Date
   toUtcDate(): Date
+  toObject(): { day: number, month: number, year: number, hour: number, minute: number, second: number, millisecond: number }
 }
 export class RRuleSet {
   constructor(dtstart: RRuleDateTime | Date)
+  setFromString(str: string): this
   static parse(str: string): RRuleSet
   toString(): string
   addRrule(jsRrule: RRule): this

package/{index.js → dist/index.js}

@@ -17,7 +17,7 @@ function isMusl() {
   // For Node 10
   if (!process.report || typeof process.report.getReport !== 'function') {
     try {
-      const lddPath = require('child_process').execSync('which ldd').toString().trim();
+      const lddPath = require('child_process').execSync('which ldd').toString().trim()
       return readFileSync(lddPath, 'utf8').includes('musl')
     } catch (e) {
       return true
@@ -224,14 +224,72 @@ switch (platform) {
         }
         break
       case 'arm':
+        if (isMusl()) {
+          localFileExisted = existsSync(
+            join(__dirname, 'rrule-rust.linux-arm-musleabihf.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./rrule-rust.linux-arm-musleabihf.node')
+            } else {
+              nativeBinding = require('@rrule-rust/lib-linux-arm-musleabihf')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        } else {
+          localFileExisted = existsSync(
+            join(__dirname, 'rrule-rust.linux-arm-gnueabihf.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./rrule-rust.linux-arm-gnueabihf.node')
+            } else {
+              nativeBinding = require('@rrule-rust/lib-linux-arm-gnueabihf')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        }
+        break
+      case 'riscv64':
+        if (isMusl()) {
+          localFileExisted = existsSync(
+            join(__dirname, 'rrule-rust.linux-riscv64-musl.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./rrule-rust.linux-riscv64-musl.node')
+            } else {
+              nativeBinding = require('@rrule-rust/lib-linux-riscv64-musl')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        } else {
+          localFileExisted = existsSync(
+            join(__dirname, 'rrule-rust.linux-riscv64-gnu.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./rrule-rust.linux-riscv64-gnu.node')
+            } else {
+              nativeBinding = require('@rrule-rust/lib-linux-riscv64-gnu')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        }
+        break
+      case 's390x':
         localFileExisted = existsSync(
-          join(__dirname, 'rrule-rust.linux-arm-gnueabihf.node')
+          join(__dirname, 'rrule-rust.linux-s390x-gnu.node')
         )
         try {
           if (localFileExisted) {
-            nativeBinding = require('./rrule-rust.linux-arm-gnueabihf.node')
+            nativeBinding = require('./rrule-rust.linux-s390x-gnu.node')
           } else {
-            nativeBinding = require('@rrule-rust/lib-linux-arm-gnueabihf')
+            nativeBinding = require('@rrule-rust/lib-linux-s390x-gnu')
           }
         } catch (e) {
           loadError = e

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "rrule-rust",
-  "version": "2.0.0-alpha.4",
-  "main": "index.js",
-  "types": "index.d.ts",
+  "version": "2.0.0-next.10",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "keywords": [
     "rrule",
     "icalendar",
@@ -29,42 +29,48 @@
         "aarch64-unknown-linux-musl",
         "aarch64-pc-windows-msvc",
         "armv7-unknown-linux-gnueabihf",
+        "armv7-unknown-linux-musleabihf",
         "x86_64-unknown-linux-musl",
         "x86_64-unknown-freebsd",
         "i686-pc-windows-msvc",
         "armv7-linux-androideabi",
-        "universal-apple-darwin"
+        "universal-apple-darwin",
+        "riscv64gc-unknown-linux-gnu"
       ]
     }
   },
   "license": "MIT",
   "devDependencies": {
-    "@napi-rs/cli": "^2.15.1",
+    "@commitlint/cli": "^19.3.0",
+    "@commitlint/config-conventional": "^19.2.2",
+    "@napi-rs/cli": "^2.18.2",
     "@semantic-release/git": "^10.0.1",
     "@types/jest": "^29.5.0",
-    "@types/node": "^18.15.5",
+    "@types/node": "^20.12.8",
+    "@types/luxon": "^3.4.2",
     "@typescript-eslint/eslint-plugin": "^5.50.0",
     "@typescript-eslint/parser": "^5.50.0",
     "benny": "^3.7.1",
     "conventional-changelog-conventionalcommits": "^7.0.2",
+    "cpy-cli": "^5.0.0",
     "eslint": "^8.33.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-prettier": "^4.2.1",
+    "husky": "^9.0.11",
     "jest": "^29.5.0",
-    "lint-staged": "^13.1.0",
-    "pre-commit": "^1.2.2",
+    "lint-staged": "^15.2.2",
+    "mkdirp": "^3.0.1",
+    "luxon": "^3.4.4",
     "prettier": "^2.8.3",
+    "rimraf": "^5.0.5",
     "rrule": "^2.7.2",
-    "semantic-release": "^22.0.12",
+    "semantic-release": "^23.0.8",
     "ts-jest": "^29.0.5",
     "ts-node": "^10.9.1",
-    "typescript": "^4.9.4"
+    "typescript": "^5.4.5"
   },
-  "pre-commit": [
-    "lint:fix-staged"
-  ],
   "lint-staged": {
     "**/*.{js,ts,json}": "eslint --fix --max-warnings=0",
     "**/*.rs": "rustfmt"
@@ -74,31 +80,35 @@
   },
   "scripts": {
     "artifacts": "napi artifacts",
-    "build": "napi build --platform --release --js-package-name @rrule-rust/lib",
-    "build:debug": "napi build --platform",
+    "prebuild": "rimraf ./dist && mkdirp ./dist",
+    "postbuild": "cpy ./*.node ./dist && rimraf --glob ./*.node",
+    "build": "napi build --js dist/index.js --dts dist/index.d.ts --platform --release",
     "prepublishOnly": "napi prepublish -t npm",
     "test": "jest",
     "universal": "napi universal",
     "version": "napi version",
     "benchmark": "ts-node ./benchmark/index.ts",
     "lint": "cargo fmt --all -- --check && eslint \"**/*.{js,ts,json}\" --max-warnings=0",
-    "lint:fix": "cargo fmt --all && yarn lint --fix",
-    "lint:fix-staged": "lint-staged"
+    "lint:fix": "cargo fmt --all && npm run lint -- --fix",
+    "lint:fix-staged": "lint-staged",
+    "prepare": "husky && npm run build"
   },
   "optionalDependencies": {
-    "@rrule-rust/lib-win32-x64-msvc": "2.0.0-alpha.4",
-    "@rrule-rust/lib-darwin-x64": "2.0.0-alpha.4",
-    "@rrule-rust/lib-linux-x64-gnu": "2.0.0-alpha.4",
-    "@rrule-rust/lib-darwin-arm64": "2.0.0-alpha.4",
-    "@rrule-rust/lib-android-arm64": "2.0.0-alpha.4",
-    "@rrule-rust/lib-linux-arm64-gnu": "2.0.0-alpha.4",
-    "@rrule-rust/lib-linux-arm64-musl": "2.0.0-alpha.4",
-    "@rrule-rust/lib-win32-arm64-msvc": "2.0.0-alpha.4",
-    "@rrule-rust/lib-linux-arm-gnueabihf": "2.0.0-alpha.4",
-    "@rrule-rust/lib-linux-x64-musl": "2.0.0-alpha.4",
-    "@rrule-rust/lib-freebsd-x64": "2.0.0-alpha.4",
-    "@rrule-rust/lib-win32-ia32-msvc": "2.0.0-alpha.4",
-    "@rrule-rust/lib-android-arm-eabi": "2.0.0-alpha.4",
-    "@rrule-rust/lib-darwin-universal": "2.0.0-alpha.4"
+    "@rrule-rust/lib-win32-x64-msvc": "2.0.0-next.10",
+    "@rrule-rust/lib-darwin-x64": "2.0.0-next.10",
+    "@rrule-rust/lib-linux-x64-gnu": "2.0.0-next.10",
+    "@rrule-rust/lib-darwin-arm64": "2.0.0-next.10",
+    "@rrule-rust/lib-android-arm64": "2.0.0-next.10",
+    "@rrule-rust/lib-linux-arm64-gnu": "2.0.0-next.10",
+    "@rrule-rust/lib-linux-arm64-musl": "2.0.0-next.10",
+    "@rrule-rust/lib-win32-arm64-msvc": "2.0.0-next.10",
+    "@rrule-rust/lib-linux-arm-gnueabihf": "2.0.0-next.10",
+    "@rrule-rust/lib-linux-arm-musleabihf": "2.0.0-next.10",
+    "@rrule-rust/lib-linux-x64-musl": "2.0.0-next.10",
+    "@rrule-rust/lib-freebsd-x64": "2.0.0-next.10",
+    "@rrule-rust/lib-win32-ia32-msvc": "2.0.0-next.10",
+    "@rrule-rust/lib-android-arm-eabi": "2.0.0-next.10",
+    "@rrule-rust/lib-darwin-universal": "2.0.0-next.10",
+    "@rrule-rust/lib-linux-riscv64-gnu": "2.0.0-next.10"
   }
 }

package/.eslintrc.js

@@ -1,58 +0,0 @@
-module.exports = {
-  root: true,
-  extends: [
-    'eslint:recommended',
-    'plugin:@typescript-eslint/recommended',
-    'plugin:prettier/recommended',
-    'plugin:import/recommended',
-    'plugin:import/typescript',
-    'plugin:eslint-comments/recommended',
-  ],
-  plugins: ['@typescript-eslint'],
-  ignorePatterns: ['node_modules', '/target', '/index.d.ts', '/index.js'],
-  env: {
-    node: true,
-  },
-  overrides: [
-    {
-      files: ['*.ts'],
-      extends: [
-        'eslint:recommended',
-        'plugin:@typescript-eslint/recommended',
-        'plugin:prettier/recommended',
-        'plugin:import/recommended',
-        'plugin:import/typescript',
-      ],
-      parserOptions: {
-        project: ['tsconfig.eslint.json'],
-      },
-      rules: {
-        '@typescript-eslint/interface-name-prefix': 'off',
-        '@typescript-eslint/explicit-function-return-type': 'off',
-        '@typescript-eslint/explicit-module-boundary-types': 'off',
-        '@typescript-eslint/no-explicit-any': 'off',
-        '@typescript-eslint/ban-ts-comment': 'off',
-        'import/no-cycle': 'error',
-        'import/no-unresolved': 'error',
-        '@typescript-eslint/no-for-in-array': 'error',
-        'no-implied-eval': 'off',
-        '@typescript-eslint/no-implied-eval': 'error',
-        '@typescript-eslint/no-misused-promises': 'error',
-        'require-await': 'off',
-        '@typescript-eslint/require-await': 'error',
-        '@typescript-eslint/restrict-plus-operands': 'error',
-        '@typescript-eslint/unbound-method': 'error',
-        'import/no-default-export': 'error',
-        'eslint-comments/require-description': 'error',
-        'eslint-comments/disable-enable-pair': 'off',
-        'eslint-comments/no-unlimited-disable': 'off',
-      },
-      settings: {
-        'import/parsers': {
-          '@typescript-eslint/parser': ['.ts'],
-        },
-      },
-      reportUnusedDisableDirectives: true,
-    },
-  ],
-};

package/.prettierrc

@@ -1,4 +0,0 @@
-{
-  "singleQuote": true,
-  "trailingComma": "all"
-}

package/.releaserc

@@ -1,46 +0,0 @@
-{
-  "plugins": [
-    [
-      "@semantic-release/commit-analyzer",
-      {
-        "preset": "angular",
-        "releaseRules": [
-          { "type": "docs", "release": "patch" },
-          { "type": "perf", "release": "patch" },
-          { "type": "revert", "release": "patch" }
-        ]
-      }
-    ], 
-    [
-      "@semantic-release/release-notes-generator",
-      {
-        "parserOpts": {
-          "noteKeywords": ["BREAKING CHANGE", "BREAKING CHANGES", "BREAKING"]
-        },
-        "preset": "conventionalcommits",
-        "presetConfig": {
-          "types": [
-            { "type": "build", "section": "Build System", "hidden": false },
-            { "type": "chore", "section": "Build System", "hidden": false },
-            { "type": "chore", "scope": "merge", "section": "Build System", "hidden": true },
-            { "type": "ci", "section": "Continuous Integration", "hidden": false },
-            { "type": "docs", "section": "Documentation", "hidden": false },
-            { "type": "feat", "section": "Features", "hidden": false },
-            { "type": "fix", "section": "Bug Fixes", "hidden": false },
-            { "type": "perf", "section": "Performance Improvements", "hidden": false },
-            { "type": "refactor", "section": "Code Refactoring", "hidden": false },
-            { "type": "revert", "section": "Reverted Changes", "hidden": false },
-            { "type": "style", "section": "Styles", "hidden": false },
-            { "type": "test", "section": "Tests", "hidden": false }
-          ]
-        },
-        "writerOpts": {
-          "commitsSort": ["subject", "scope"]
-        }
-      }
-    ],
-    "@semantic-release/github",
-    "@semantic-release/npm"
-  ],
-  "branches": ["+([0-9])?(.{+([0-9]),x}).x", "master", {"name": "next", "prerelease": true}, {"name": "alpha", "prerelease": true}]
-}

package/.yarnrc.yml

@@ -1 +0,0 @@
-nodeLinker: node-modules

package/Cargo.toml

@@ -1,22 +0,0 @@
-[package]
-edition = "2021"
-name = "rrule-rust"
-version = "0.0.0"
-
-[lib]
-crate-type = ["cdylib"]
-
-[dependencies]
-chrono = "0.4.24"
-chrono-tz = "0.8.5"
-# Default enable napi5 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
-napi = { version = "2.11.1", default-features = false, features = ["napi5"] }
-napi-derive = "2.11.0"
-replace_with = "0.1.7"
-rrule = { version = "0.12.0", features = ["exrule"] }
-
-[build-dependencies]
-napi-build = "2.0.1"
-
-[profile.release]
-lto = true

package/benchmark/.gitignore

@@ -1,3 +0,0 @@
-*
-!index.ts
-!.gitignore

package/benchmark/index.ts

@@ -1,59 +0,0 @@
-import b from 'benny';
-import * as node from 'rrule';
-import * as rust from '../';
-
-b.suite(
-  'UTC TZ',
-  b.add('rrule-rust', () => {
-    const rrule = new rust.RRule(rust.Frequency.Daily)
-      .setCount(30)
-      .setInterval(1);
-    const set = new rust.RRuleSet(
-      new rust.RRuleDateTime(new Date(1679428740000), 'UTC'),
-    ).addRrule(rrule);
-
-    set.all();
-  }),
-  b.add('rrule', () => {
-    const rrule = new node.RRule({
-      freq: node.RRule.DAILY,
-      dtstart: new Date(Date.UTC(2023, 2, 21, 23, 59, 0)),
-      tzid: 'UTC',
-      count: 30,
-      interval: 1,
-    });
-
-    rrule.all();
-  }),
-
-  b.cycle(),
-  b.complete(),
-);
-
-b.suite(
-  'Other TZ',
-  b.add('rrule-rust', () => {
-    const rrule = new rust.RRule(rust.Frequency.Daily)
-      .setCount(30)
-      .setInterval(1);
-    const set = new rust.RRuleSet(
-      new rust.RRuleDateTime(new Date(1679428740000), 'Pacific/Kiritimati'),
-    ).addRrule(rrule);
-
-    set.all();
-  }),
-  b.add('rrule', () => {
-    const rrule = new node.RRule({
-      freq: node.RRule.DAILY,
-      dtstart: new Date(Date.UTC(2023, 2, 21, 23, 59, 0)),
-      tzid: 'Pacific/Kiritimati',
-      count: 30,
-      interval: 1,
-    });
-
-    rrule.all();
-  }),
-
-  b.cycle(),
-  b.complete(),
-);

package/build.rs

@@ -1,5 +0,0 @@
-extern crate napi_build;
-
-fn main() {
-  napi_build::setup();
-}

package/jest.config.ts

@@ -1,7 +0,0 @@
-/* eslint-disable import/no-default-export -- Required by jest */
-import { Config } from 'jest';
-
-export default {
-  preset: 'ts-jest',
-  testEnvironment: 'node',
-} satisfies Config;

package/src/js/frequency.rs

@@ -1,40 +0,0 @@
-use napi_derive::napi;
-
-#[napi(js_name = "Frequency")]
-pub enum Frequency {
-  Yearly,
-  Monthly,
-  Weekly,
-  Daily,
-  Hourly,
-  Minutely,
-  Secondly,
-}
-
-impl From<rrule::Frequency> for Frequency {
-  fn from(freq: rrule::Frequency) -> Self {
-    match freq {
-      rrule::Frequency::Daily => Frequency::Daily,
-      rrule::Frequency::Hourly => Frequency::Hourly,
-      rrule::Frequency::Minutely => Frequency::Minutely,
-      rrule::Frequency::Monthly => Frequency::Monthly,
-      rrule::Frequency::Secondly => Frequency::Secondly,
-      rrule::Frequency::Weekly => Frequency::Weekly,
-      rrule::Frequency::Yearly => Frequency::Yearly,
-    }
-  }
-}
-
-impl Into<rrule::Frequency> for Frequency {
-  fn into(self) -> rrule::Frequency {
-    match self {
-      Frequency::Daily => rrule::Frequency::Daily,
-      Frequency::Hourly => rrule::Frequency::Hourly,
-      Frequency::Minutely => rrule::Frequency::Minutely,
-      Frequency::Monthly => rrule::Frequency::Monthly,
-      Frequency::Secondly => rrule::Frequency::Secondly,
-      Frequency::Weekly => rrule::Frequency::Weekly,
-      Frequency::Yearly => rrule::Frequency::Yearly,
-    }
-  }
-}

package/src/js/month.rs

@@ -1,56 +0,0 @@
-use napi_derive::napi;
-
-#[napi(js_name = "Month")]
-pub enum Month {
-  January,
-  February,
-  March,
-  April,
-  May,
-  June,
-  July,
-  August,
-  September,
-  October,
-  November,
-  December,
-}
-
-impl From<&u8> for Month {
-  fn from(month: &u8) -> Self {
-    match month {
-      0 => Month::January,
-      1 => Month::February,
-      2 => Month::March,
-      3 => Month::April,
-      4 => Month::May,
-      5 => Month::June,
-      6 => Month::July,
-      7 => Month::August,
-      8 => Month::September,
-      9 => Month::October,
-      10 => Month::November,
-      11 => Month::December,
-      _ => panic!("Unknown month index: {}", month),
-    }
-  }
-}
-
-impl Into<chrono::Month> for Month {
-  fn into(self) -> chrono::Month {
-    match self {
-      Month::January => chrono::Month::January,
-      Month::February => chrono::Month::February,
-      Month::March => chrono::Month::March,
-      Month::April => chrono::Month::April,
-      Month::May => chrono::Month::May,
-      Month::June => chrono::Month::June,
-      Month::July => chrono::Month::July,
-      Month::August => chrono::Month::August,
-      Month::September => chrono::Month::September,
-      Month::October => chrono::Month::October,
-      Month::November => chrono::Month::November,
-      Month::December => chrono::Month::December,
-    }
-  }
-}

package/src/js/n_weekday.rs

@@ -1,36 +0,0 @@
-use super::weekday::Weekday;
-use napi_derive::napi;
-
-#[napi(object, js_name = "NWeekday")]
-pub struct 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.
-  pub n: Option<i16>,
-  pub weekday: Weekday,
-}
-
-impl From<rrule::NWeekday> for NWeekday {
-  fn from(nday: rrule::NWeekday) -> Self {
-    match nday {
-      rrule::NWeekday::Every(weekday) => NWeekday {
-        n: None,
-        weekday: Weekday::from(weekday),
-      },
-      rrule::NWeekday::Nth(n, weekday) => NWeekday {
-        n: Some(n),
-        weekday: weekday.into(),
-      },
-    }
-  }
-}
-
-impl Into<rrule::NWeekday> for NWeekday {
-  fn into(self) -> rrule::NWeekday {
-    match self.n {
-      Some(n) => rrule::NWeekday::Nth(n, self.weekday.into()),
-      None => rrule::NWeekday::Every(self.weekday.into()),
-    }
-  }
-}