Merge pull request #61 from commenthol/fix-set-unset-rule-throws

Fix: set unset rule throws

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [16.x, 18.x, 20.x]
+        node-version: [18.x, 20.x, 22.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
     steps:
     - uses: actions/checkout@v3

package.json

@@ -1,6 +1,6 @@
 {
   "name": "date-holidays-parser",
-  "version": "3.4.4",
+  "version": "3.4.5-0",
   "description": "parser for worldwide holidays",
   "keywords": [
     "holidays",
@@ -51,7 +51,7 @@
     "prepublishOnly": "npm run all",
     "test": "npm-run-all test:*",
     "test:ci": "mocha",
-    "test:ts": "dtslint types",
+    "__disabled__test:ts": "dtslint types",
     "test:tz": "TZ=UTC-10 mocha && TZ=UTC+10 mocha",
     "zuul": "zuul test/Holidays.test.js"
   },
@@ -64,26 +64,26 @@
     "caldate": "^2.0.5",
     "date-bengali-revised": "^2.0.2",
     "date-chinese": "^2.1.4",
-    "date-easter": "^1.0.2",
+    "date-easter": "^1.0.3",
     "deepmerge": "^4.3.1",
-    "jalaali-js": "^1.2.6",
-    "moment-timezone": "^0.5.43"
+    "jalaali-js": "^1.2.7",
+    "moment-timezone": "^0.5.46"
   },
   "devDependencies": {
-    "c8": "^7.13.0",
+    "c8": "^10.1.2",
     "dtslint": "^4.2.1",
-    "eslint": "^8.40.0",
-    "eslint-config-standard": "^17.0.0",
-    "eslint-plugin-import": "^2.27.5",
+    "eslint": "^8.57.1",
+    "eslint-config-standard": "^17.1.0",
+    "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-n": "^15.7.0",
-    "eslint-plugin-promise": "^6.1.1",
+    "eslint-plugin-promise": "^6.6.0",
     "hashtree": "^0.7.0",
-    "mocha": "^10.2.0",
+    "mocha": "^11.0.0",
     "npm-run-all": "^4.1.5",
-    "rimraf": "^5.0.0",
-    "rollup": "^2.79.1",
+    "rimraf": "^6.0.1",
+    "rollup": "^2.79.2",
     "serialize-to-module": "^1.1.0",
-    "typescript": "^5.0.4"
+    "typescript": "^5.7.2"
   },
   "engines": {
     "node": ">=12.0.0"

src/Holidays.js

@@ -385,6 +385,9 @@ export class Holidays {
    */
   _dateByRule (year, rule) {
     const _rule = this.holidays[rule]
+    if (!_rule?.fn?.inYear) {
+      return []
+    }
     const dates = _rule.fn.inYear(year)
       .get(this.__timezone)
       .map((date) => {

src/PostRule.js

@@ -1,4 +1,3 @@
-
 import { get as _get, toNumber } from './utils.js'
 import Rule from './Rule.js'
 import CalEvent from './CalEvent.js'

test/issue-set-unset-rule.mocha.js

@@ -0,0 +1,20 @@
+import assert from 'assert'
+import Holidays from '../src/index.js'
+import fixtures from './fixtures/index.cjs'
+
+const fixture = fixtures.holidays
+
+describe('#issue-set-unset-rule', function () {
+  it('should not throw if rule is unset', function () {
+    const hd = new Holidays(fixture, 'AR')
+    hd.unsetRule('12-31 12:00')
+    hd.setHoliday('12-31')
+    assert.deepEqual(hd.isHoliday('2024-12-31T12:00:00Z'), [{
+      date: '2024-12-31 00:00:00',
+      end: new Date('2025-01-01T03:00:00.000Z'),
+      name: '12-31',
+      start: new Date('2024-12-31T03:00:00.000Z'),
+      type: 'public'
+    }])
+  })
+})