Merge branch 'feat-if-holiday-rule' into norfolk-island

Author: svict4

data/countries/CH.yaml

@@ -22,6 +22,9 @@ holidays:
     days:
       01-01:
         _name: 01-01
+      easter -3:
+        _name: easter -3
+        type: observance
       easter -2:
         _name: easter -2
       easter:
@@ -247,15 +250,11 @@ holidays:
               de: Berchtoldstag
               fr: Saint-Berthold
             type: optional
-          # TODO: needs new rule: "Thursday after 04-02 if easter -3 then next Thursday"
-          thursday after 04-02:
+          # if falls on easter -3 (Maundy Thursday) then move to next Thursday
+          Thursday after 04-02 if is observance holiday then next Thursday:
             name:
               de: Näfelser Fahrt
               fr: Bataille de Näfels
-            disable:
-              - "2023-04-06"
-            enable:
-              - "2023-04-13"
           3rd sunday after 09-01: false
           11-01:
             _name: 11-01

data/countries/HK.yaml

@@ -67,16 +67,11 @@ holidays:
         name:
           en: Hong Kong Special Administrative Region Establishment Day
           zh: 香港特別行政區成立紀念日
-      # TODO: add rule: "chinese 08-0-15 if 07-01 then next weekday"
-      chinese 08-0-16 and if Sunday then next Monday:
+      chinese 08-0-16 and if Sunday then next Monday if is public holiday then next day omit Saturday, Sunday:
         substitute: true
         name:
           en: The day following the Chinese Mid-Autumn Festival
           zh: 中秋節翌日
-        disable:
-          - "2020-10-01"
-        enable:
-          - "2020-10-02"
       10-01 and if Sunday then next Monday:
         substitute: true
         name:

data/countries/NZ.yaml

@@ -238,11 +238,10 @@ holidays:
           en: Otago Province
           mi: Ōtākou
         days:
-          # TODO: needs new rule "03-23 if ... then next monday if easter 1 then next Monday"
-          03-23 if tuesday,wednesday,thursday then previous monday if friday,saturday,sunday then next monday:
+          # 03-23 if ... then next monday if easter 1 then next Monday"; This will happen in 2285 the next time ;)
+          03-23 if Tuesday,Wednesday,Thursday then previous Monday if Friday,Saturday,Sunday then next Monday if is public holiday then next Monday:
             name:
               en: Provincial anniversary day
-            note: varies if coincides with easter monday
       STL:
         names:
           en: Southland

docs/specification.md

@@ -1,6 +1,6 @@
 # Specification for `holidays.yaml`
 
-Version: 2.0.0
+Version: 2.1.0
 
 This document describes the data contained within the files `holidays.yaml` and
 `names.yaml`.
@@ -523,6 +523,25 @@ Where:
 - `09-22 if 09-21 is holiday` is September 22nd is public holiday only if September 21st is also a holiday
 - `09-22 if 09-21 and 09-23 is public holiday` is September 22nd is public holiday only if September 21st and September 23rd are public holidays
 
+### Change to different weekday if date already falls on a holiday 
+
+Rule: `<rule> if is (<type>)? holiday then (<count>)? (next|previous) <weekday>`
+
+Rule: `<rule> if is (<type>)? holiday then (<count>)? (next|previous) day (omit <weekdays>)?`
+
+Where:
+- `<rule>` any rule
+- `<type>` public, bank, school, observance, optional (defaults to public if omitted)
+- `<count>` 1...31, 1st, 2nd, 3rd
+- `<weekday>` Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday
+- `<weekdays>` Comma separated list of `<weekday>`
+
+**Examples**:
+
+- `Thursday after 04-02 if is observance holiday then next Thursday`
+- `03-01 and if Saturday, Sunday then next Monday if is holiday then 2nd next Tuesday since 2022`
+- `05-01 if is public holiday then 2nd next day omit Saturday, Sunday`
+
 ### Enabling a rule since or in certain years
 
 > __Note:__ Use quotes around dates!

test/fixtures/CH-2015.json

@@ -8,6 +8,15 @@
     "rule": "01-01",
     "_weekday": "Thu"
   },
+  {
+    "date": "2015-04-02 00:00:00",
+    "start": "2015-04-01T22:00:00.000Z",
+    "end": "2015-04-02T22:00:00.000Z",
+    "name": "Gründonnerstag",
+    "type": "observance",
+    "rule": "easter -3",
+    "_weekday": "Thu"
+  },
   {
     "date": "2015-04-03 00:00:00",
     "start": "2015-04-02T22:00:00.000Z",

test/fixtures/CH-2016.json

@@ -8,6 +8,15 @@
     "rule": "01-01",
     "_weekday": "Fri"
   },
+  {
+    "date": "2016-03-24 00:00:00",
+    "start": "2016-03-23T23:00:00.000Z",
+    "end": "2016-03-24T23:00:00.000Z",
+    "name": "Gründonnerstag",
+    "type": "observance",
+    "rule": "easter -3",
+    "_weekday": "Thu"
+  },
   {
     "date": "2016-03-25 00:00:00",
     "start": "2016-03-24T23:00:00.000Z",

test/fixtures/CH-2017.json

@@ -8,6 +8,15 @@
     "rule": "01-01",
     "_weekday": "Sun"
   },
+  {
+    "date": "2017-04-13 00:00:00",
+    "start": "2017-04-12T22:00:00.000Z",
+    "end": "2017-04-13T22:00:00.000Z",
+    "name": "Gründonnerstag",
+    "type": "observance",
+    "rule": "easter -3",
+    "_weekday": "Thu"
+  },
   {
     "date": "2017-04-14 00:00:00",
     "start": "2017-04-13T22:00:00.000Z",

test/fixtures/CH-2018.json

@@ -8,6 +8,15 @@
     "rule": "01-01",
     "_weekday": "Mon"
   },
+  {
+    "date": "2018-03-29 00:00:00",
+    "start": "2018-03-28T22:00:00.000Z",
+    "end": "2018-03-29T22:00:00.000Z",
+    "name": "Gründonnerstag",
+    "type": "observance",
+    "rule": "easter -3",
+    "_weekday": "Thu"
+  },
   {
     "date": "2018-03-30 00:00:00",
     "start": "2018-03-29T22:00:00.000Z",

test/fixtures/CH-2019.json

@@ -8,6 +8,15 @@
     "rule": "01-01",
     "_weekday": "Tue"
   },
+  {
+    "date": "2019-04-18 00:00:00",
+    "start": "2019-04-17T22:00:00.000Z",
+    "end": "2019-04-18T22:00:00.000Z",
+    "name": "Gründonnerstag",
+    "type": "observance",
+    "rule": "easter -3",
+    "_weekday": "Thu"
+  },
   {
     "date": "2019-04-19 00:00:00",
     "start": "2019-04-18T22:00:00.000Z",

test/fixtures/CH-2020.json

@@ -8,6 +8,15 @@
     "rule": "01-01",
     "_weekday": "Wed"
   },
+  {
+    "date": "2020-04-09 00:00:00",
+    "start": "2020-04-08T22:00:00.000Z",
+    "end": "2020-04-09T22:00:00.000Z",
+    "name": "Gründonnerstag",
+    "type": "observance",
+    "rule": "easter -3",
+    "_weekday": "Thu"
+  },
   {
     "date": "2020-04-10 00:00:00",
     "start": "2020-04-09T22:00:00.000Z",