count to see more.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - Code and docs -
-
- rrule.js demo
-
-
- This is a demo and test app for
- rrule.js, a JavaScript library for working with recurrence rules for calendar dates.
-
Output
-
- rule =
- |
- - - | -
|---|---|
- rule.origOptions
- |
- - - | -
- rule.toString()
- |
-
- - |
-
- rule.toText()
- |
- - - - - | -
- rule.all()
- |
-
- |
-
-
- Input
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Options
- - -
- RRULE string
- - -
-
- Enter an
- RRULE as per
- iCalendar RFC.
-
Examples:
--
-
-
-
FREQ=WEEKLY;BYDAY=MO,WE-
- -
-
FREQ=MONTHLY;BYMONTHDAY=10,15;COUNT=20-
- -
-
FREQ=DAILY;INTERVAL=3;COUNT=10-
- -
-
FREQ=MONTHLY;BYDAY=-2FR;COUNT=7-
-
Text input
-- -
-Examples:
--
-
-
-
Every weekday-
- -
-
Every 2 weeks on Tuesday-
- -
-
Every week on Monday, Wednesday-
- -
-
Every month on the 2nd last Friday for 7 times-
- -
-
Every 6 months-
-
-
-
-
-
diff --git a/index.html b/index.html
deleted file mode 120000
index 5ad281df..00000000
--- a/index.html
+++ /dev/null
@@ -1 +0,0 @@
-demo/index.html
\ No newline at end of file
diff --git a/jest.config.js b/jest.config.js
new file mode 100644
index 00000000..8bb37208
--- /dev/null
+++ b/jest.config.js
@@ -0,0 +1,5 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+ preset: 'ts-jest',
+ testEnvironment: 'node',
+}
diff --git a/package.json b/package.json
index 8c837dbf..a31a1116 100644
--- a/package.json
+++ b/package.json
@@ -1,9 +1,9 @@
{
"name": "rrule",
- "version": "2.6.2",
+ "version": "2.8.0",
"description": "JavaScript library for working with recurrence rules for calendar dates.",
"homepage": "http://jakubroztocil.github.io/rrule/",
- "license": "SEE LICENSE IN LICENSE",
+ "license": "BSD-3-Clause",
"keywords": [
"dates",
"recurrences",
@@ -13,22 +13,23 @@
],
"author": "Jakub Roztocil, Lars Schöning, and David Golightly",
"main": "dist/es5/rrule.js",
- "module": "dist/esm/src/index.js",
- "typings": "dist/esm/src/index.d.ts",
+ "module": "dist/esm/index.js",
+ "types": "dist/esm/index.d.ts",
"repository": {
"type": "git",
"url": "git://github.com/jakubroztocil/rrule.git"
},
- "husky": {
- "hooks": {
- "pre-commit": "yarn lint"
- }
- },
"scripts": {
- "build": "yarn lint && tsc && webpack && tsc dist/esm/**/*.d.ts",
- "lint": "yarn tslint --project . --fix --config tslint.json",
- "test": "TS_NODE_PROJECT=tsconfig.test.json mocha **/*.test.ts",
- "test-ci": "TS_NODE_PROJECT=tsconfig.test.json nyc mocha **/*.test.ts"
+ "prebuild": "yarn clean",
+ "prepublish": "yarn build",
+ "build": "yarn lint && yarn format-check && tsc -b tsconfig.build.json && webpack && tsc dist/esm/**/*.d.ts",
+ "clean": "rm -rf dist/",
+ "lint": "yarn eslint . --fix --config .eslintrc.js",
+ "format": "yarn prettier --write .",
+ "format-check": "yarn prettier --check .",
+ "run-ts": "TS_NODE_PROJECT=tsconfig.json node --loader ts-node/esm",
+ "test": "jest **/*.test.ts",
+ "test-ci": "yarn run-ts ./node_modules/.bin/nyc jest **/*.test.ts"
},
"nyc": {
"extension": [
@@ -43,47 +44,48 @@
],
"all": true
},
- "devDependencies": {
- "@types/assert": "^0.0.31",
- "@types/chai": "^4.1.4",
- "@types/jquery": "^3.3.29",
- "@types/luxon": "^1.2.2",
- "@types/mocha": "^5.2.5",
- "@types/mockdate": "^2.0.0",
- "@types/node": "^10.12.18",
- "chai": "^4.1.2",
- "copy-webpack-plugin": "^4.5.2",
- "coverage": "^0.0.0",
- "html-webpack-plugin": "^3.2.0",
- "husky": "^1.0.0-rc.13",
- "jquery": "^3.3.1",
- "mocha": "^5.2.0",
- "mockdate": "^2.0.2",
- "nyc": "^12.0.2",
- "source-map-loader": "^0.2.4",
- "source-map-support": "^0.5.8",
- "ts-loader": "^4.4.2",
- "ts-node": "^7.0.0",
- "tslint": "^5.11.0",
- "tslint-eslint-rules": "^5.4.0",
- "typescript": "^3.0.1",
- "webpack": "^4.16.3",
- "webpack-cli": "^3.1.0"
- },
- "standard": {
- "ignore": [
- "demo"
+ "lint-staged": {
+ "*.ts": [
+ "yarn lint",
+ "yarn format"
]
},
+ "devDependencies": {
+ "@types/assert": "^1.4.3",
+ "@types/jest": "^29.5.8",
+ "@types/mockdate": "^3.0.0",
+ "@types/node": "^17.0.41",
+ "@typescript-eslint/eslint-plugin": "^5.27.1",
+ "@typescript-eslint/parser": "^5.27.1",
+ "coverage": "^0.4.1",
+ "eslint": "^8.17.0",
+ "eslint-config-prettier": "^8.5.0",
+ "eslint-plugin-import": "^2.26.0",
+ "eslint-plugin-jsdoc": "^39.3.2",
+ "eslint-plugin-prettier": "^4.0.0",
+ "husky": "^8.0.1",
+ "jest": "^29.7.0",
+ "lint-staged": "^13.0.1",
+ "mockdate": "^3.0.5",
+ "nyc": "^15.1.0",
+ "prettier": "^2.6.2",
+ "source-map-loader": "^3.0.1",
+ "source-map-support": "^0.5.16",
+ "terser-webpack-plugin": "^5.3.3",
+ "ts-jest": "^29.1.1",
+ "ts-loader": "^9.3.0",
+ "ts-node": "^10.8.1",
+ "typescript": "^4.7.3",
+ "unminified-webpack-plugin": "^3.0.0",
+ "webpack": "^5.73.0",
+ "webpack-cli": "^4.9.2"
+ },
"files": [
"dist",
"README.md"
],
- "optionalDependencies": {
- "luxon": "^1.3.3"
- },
"peerDependencies": {},
"dependencies": {
- "tslib": "^1.9.0"
+ "tslib": "^2.4.0"
}
}
diff --git a/src/cache.ts b/src/cache.ts
index 442f53ac..02ed58e3 100644
--- a/src/cache.ts
+++ b/src/cache.ts
@@ -1,9 +1,26 @@
import IterResult, { IterArgs } from './iterresult'
-import dateutil from './dateutil'
+import { clone, cloneDates } from './dateutil'
import { isArray } from './helpers'
export type CacheKeys = 'before' | 'after' | 'between'
+function argsMatch(
+ left: IterArgs[keyof IterArgs] | undefined,
+ right: IterArgs[keyof IterArgs] | undefined
+) {
+ if (Array.isArray(left)) {
+ if (!Array.isArray(right)) return false
+ if (left.length !== right.length) return false
+ return left.every((date, i) => date.getTime() === right[i].getTime())
+ }
+
+ if (left instanceof Date) {
+ return right instanceof Date && left.getTime() === right.getTime()
+ }
+
+ return left === right
+}
+
export class Cache {
all: Date[] | Partial