From 1638e4e1296779edbd0a7ac4d9276125dd26f6d5 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 21 May 2021 11:11:13 +0800
Subject: [PATCH 001/402] Fix getting multiple xDataset for each target

---
 src/parsing.ts | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/parsing.ts b/src/parsing.ts
index 68ab572..d80957f 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -811,10 +811,23 @@ export function getRenderInfoFromYaml(
     multipleValueSparator = retMultipleValueSparator;
 
     // xDataset
-    let xDataset = null;
-    if (typeof yaml.xDataset === "number") {
-        xDataset = yaml.xDataset;
+    let retXDataset = getNumberArrayFromInput(
+        "xDataset",
+        yaml.xDataset,
+        numDatasets,
+        -1,
+        true
+    );
+    if (typeof retXDataset === "string") {
+        return retXDataset; // errorMessage
     }
+    let xDataset = retXDataset.map((d: number) => {
+        if (d < 0 || d >= numDatasets) {
+            return -1;
+        }
+        return d;
+    });
+    // assign this to renderInfo later
 
     // Create queries
     let queries: Array<Query> = [];
@@ -825,7 +838,7 @@ export function getRenderInfoFromYaml(
             searchTarget[ind]
         );
         query.setSeparator(multipleValueSparator[ind]);
-        if (ind === xDataset) query.usedAsXDataset = true;
+        if (xDataset.includes(ind)) query.usedAsXDataset = true;
         queries.push(query);
     }
     // console.log(queries);
@@ -975,23 +988,7 @@ export function getRenderInfoFromYaml(
     // console.log(renderInfo.endDate);
 
     // xDataset
-    let retXDataset = getNumberArrayFromInput(
-        "xDataset",
-        yaml.xDataset,
-        numDatasets,
-        -1,
-        true
-    );
-    if (typeof retXDataset === "string") {
-        return retXDataset; // errorMessage
-    }
-    retXDataset = retXDataset.map((d: number) => {
-        if (d < 0 || d >= numDatasets) {
-            return -1;
-        }
-        return d;
-    });
-    renderInfo.xDataset = retXDataset;
+    renderInfo.xDataset = xDataset;
     // console.log(renderInfo.xDataset);
 
     // Dataset name (need xDataset to set default name)

From 12b5e5bfd7bb297e47082c5d3431179fdc3699ea Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 21 May 2021 21:43:51 +0800
Subject: [PATCH 002/402] Fix using comma as separator

---
 README.md                                    | 4 ++--
 examples/TestMultipleTargesMultipleValues.md | 5 +++--
 src/collecting.ts                            | 7 +++++--
 src/parsing.ts                               | 8 +++++++-
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 968a7af..c9c3b86 100644
--- a/README.md
+++ b/README.md
@@ -15,10 +15,10 @@ This is an [Obsidian](https://obsidian.md/) plugin that helps you do tracking in
 | content | #blood-pressure:180/120 | searchType: tag<br>searchTarget: blood-pressure[0], blood-pressure[1] | V |
 | content | dvTarget:: 20.5 | searchType: dvField<br>searchTarget: dvTarget | V |
 | content | dvTarget:: 20.5/30.5 | searchType: dvField<br>searchTarget: dvTarget[0], dvTarget[1] | V |
-| content | dvTarget:: 20.5, 30.5 | searchType: dvField<br>searchTarget: dvTarget[0], dvTarget[1]<br>separator: ',' | V |
+| content | dvTarget:: 20.5, 30.5 | searchType: dvField<br>searchTarget: dvTarget[0], dvTarget[1]<br>separator: 'comma' | V |
 | frontmatter | ---<br>mood: 10<br>--- | searchType: frontmatter<br>searchTarget: mood | V |
 | frontmatter | ---<br>bp: 184.4/118.8<br>--- | searchType: frontmatter<br>searchTarget: bp[0], bp[1] | V |
-| frontmatter | ---<br>bp: 184.4, 118.8<br>--- | searchType: frontmatter<br>searchTarget: bp[0], bp[1]<br>separator: ',' | V |
+| frontmatter | ---<br>bp: 184.4, 118.8<br>--- | searchType: frontmatter<br>searchTarget: bp[0], bp[1]<br>separator: 'comma' | V |
 | frontmatter | ---<br>bp: [184.4, 118.8]<br>--- | searchType: frontmatter<br>searchTarget: bp[0], bp[1] | V |
 | content | [[journal]] | searchType: wiki<br>searchTarget: journal | O |
 | content | ⭐ | searchType: text<br>searchTarget: ⭐ | O |
diff --git a/examples/TestMultipleTargesMultipleValues.md b/examples/TestMultipleTargesMultipleValues.md
index 1402518..1a8607c 100644
--- a/examples/TestMultipleTargesMultipleValues.md
+++ b/examples/TestMultipleTargesMultipleValues.md
@@ -68,7 +68,7 @@ searchTarget: bloodpressure1[0], bloodpressure1[1]
 folder: diary
 startDate: 2021-01-01
 endDate: 2021-01-31
-separator: ","
+separator: comma
 line:
     title: Blood Pressure
     lineColor: yellow, red
@@ -142,13 +142,14 @@ line:
     lineColor: green, red
 ```
 
-Multiple values seprated by ','
+Multiple values seprated by 'comma'
 ``` tracker
 searchType: dvField
 searchTarget: dataviewTarget3[0], dataviewTarget3[1]
 folder: diary
 startDate: 2021-01-01
 endDate: 2021-01-31
+separator: comma
 line:
     title: dvField
     lineColor: green, red
diff --git a/src/collecting.ts b/src/collecting.ts
index a770f46..8200ab6 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -355,12 +355,12 @@ export function collectDataFromDvField(
     dataMap: DataMap,
     xValueMap: XValueMap
 ) {
-    // Test this in Regex101
-    // (^|\s)\*{0,2}dvTarget\*{0,2}(::\s*(?<values>[\d\.\/\-\w,@;\s]*))(\s|$)
     let dvTarget = query.getTarget();
     if (query.getParentTarget()) {
         dvTarget = query.getParentTarget(); // use parent tag name for multiple values
     }
+    // Test this in Regex101
+    // (^|\s)\*{0,2}dvTarget\*{0,2}(::\s*(?<values>[\d\.\/\-\w,@;\s]*))(\s|$)
     let strHashtagRegex =
         "(^|\\s)\\*{0,2}" +
         dvTarget +
@@ -377,7 +377,10 @@ export function collectDataFromDvField(
             typeof match.groups.values !== "undefined"
         ) {
             let values = match.groups.values.trim();
+            // console.log(values);
+            // console.log(query.getSeparator());
             let splitted = values.split(query.getSeparator());
+            // console.log(splitted);
             if (!splitted) continue;
             if (splitted.length === 1) {
                 // console.log("single-value");
diff --git a/src/parsing.ts b/src/parsing.ts
index d80957f..12e1041 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -808,7 +808,13 @@ export function getRenderInfoFromYaml(
     if (typeof retMultipleValueSparator === "string") {
         return retMultipleValueSparator; // errorMessage
     }
-    multipleValueSparator = retMultipleValueSparator;
+    multipleValueSparator = retMultipleValueSparator.map( sep => {
+        if (sep === "comma") {
+            return ",";
+        }
+        return sep;
+    });
+    // console.log(multipleValueSparator);
 
     // xDataset
     let retXDataset = getNumberArrayFromInput(

From 28315873546bbb5913407c0c8614414139673260 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 21 May 2021 21:49:47 +0800
Subject: [PATCH 003/402] Update examples

---
 examples/diary/2021-01-01.md  | 2 ++
 examples/diary/2021-01-02.md  | 2 ++
 examples/diary/2021-01-03.md  | 2 ++
 examples/diary/2021-01-04.md  | 2 ++
 examples/diary/2021-01-05.md  | 2 ++
 examples/diary/2021-01-06.md  | 2 ++
 examples/diary/2021-01-07.md  | 2 ++
 examples/diary/2021-01-08.md  | 2 ++
 examples/diary/2021-01-09.md  | 2 ++
 examples/diary/2021-01-10.md  | 2 ++
 examples/diary/2021-01-11.md  | 2 ++
 examples/diary/2021-01-12.md  | 2 ++
 examples/diary/2021-01-13.md  | 2 ++
 examples/diary/2021-01-14.md  | 2 ++
 examples/diary/2021-01-15.md  | 2 ++
 examples/diary/2021-01-16.md  | 2 ++
 examples/diary/2021-01-17.md  | 2 ++
 examples/diary/2021-01-18.md  | 2 ++
 examples/diary/2021-01-19.md  | 2 ++
 examples/diary/2021-01-20.md  | 2 ++
 examples/diary/2021-01-21.md  | 2 ++
 examples/diary/2021-01-22.md  | 2 ++
 examples/diary/2021-01-23.md  | 2 ++
 examples/diary/2021-01-24.md  | 2 ++
 examples/diary/2021-01-25.md  | 2 ++
 examples/diary/2021-01-26.md  | 2 ++
 examples/diary/2021-01-27.md  | 2 ++
 examples/diary/2021-01-28.md  | 2 ++
 examples/diary/2021-01-29.md  | 2 ++
 examples/diary/2021-01-30.md  | 2 ++
 examples/diary/2021-01-31.md  | 2 ++
 examples/example_generator.ts | 2 ++
 32 files changed, 64 insertions(+)

diff --git a/examples/diary/2021-01-01.md b/examples/diary/2021-01-01.md
index 4b97fd2..fc7e51d 100644
--- a/examples/diary/2021-01-01.md
+++ b/examples/diary/2021-01-01.md
@@ -27,6 +27,8 @@ obsidian-tracker+1@gmail.com
 weightlifting: 16
 
 dataviewTarget:: 80
+- Make Progress:: 11
+- Make-Progress:: 74
 dataviewTarget1:: 80/11
 dataviewTarget2:: 11 @ 74
 dataviewTarget3:: 11, 74
diff --git a/examples/diary/2021-01-02.md b/examples/diary/2021-01-02.md
index a6c9767..4671c72 100644
--- a/examples/diary/2021-01-02.md
+++ b/examples/diary/2021-01-02.md
@@ -27,6 +27,8 @@ sleep: 9:49 pm/5:12 am
 weightlifting: 19
 
 dataviewTarget:: 45
+- Make Progress:: 24
+- Make-Progress:: 62
 dataviewTarget1:: 45/24
 dataviewTarget2:: 24 @ 62
 dataviewTarget3:: 24, 62
diff --git a/examples/diary/2021-01-03.md b/examples/diary/2021-01-03.md
index ea1d43b..f8ca1af 100644
--- a/examples/diary/2021-01-03.md
+++ b/examples/diary/2021-01-03.md
@@ -29,6 +29,8 @@ obsidian-tracker@yahoo.com
 weightlifting: 16
 
 dataviewTarget:: 28
+- Make Progress:: 27
+- Make-Progress:: 59
 dataviewTarget1:: 28/27
 dataviewTarget2:: 27 @ 59
 dataviewTarget3:: 27, 59
diff --git a/examples/diary/2021-01-04.md b/examples/diary/2021-01-04.md
index 6bac30d..322da2a 100644
--- a/examples/diary/2021-01-04.md
+++ b/examples/diary/2021-01-04.md
@@ -26,6 +26,8 @@ obsidian-tracker@yahoo.com
 
 
 dataviewTarget:: 18
+- Make Progress:: 47
+- Make-Progress:: 67
 dataviewTarget1:: 18/47
 dataviewTarget2:: 47 @ 67
 dataviewTarget3:: 47, 67
diff --git a/examples/diary/2021-01-05.md b/examples/diary/2021-01-05.md
index 322bc84..0f0d4e7 100644
--- a/examples/diary/2021-01-05.md
+++ b/examples/diary/2021-01-05.md
@@ -27,6 +27,8 @@ obsidian-tracker+1@gmail.com
 
 
 dataviewTarget:: 97
+- Make Progress:: 6
+- Make-Progress:: 80
 dataviewTarget1:: 97/6
 dataviewTarget2:: 6 @ 80
 dataviewTarget3:: 6, 80
diff --git a/examples/diary/2021-01-06.md b/examples/diary/2021-01-06.md
index b81331e..8405eda 100644
--- a/examples/diary/2021-01-06.md
+++ b/examples/diary/2021-01-06.md
@@ -29,6 +29,8 @@ obsidian-tracker+1@gmail.com
 weightlifting: 17
 
 dataviewTarget:: 67
+- Make Progress:: 26
+- Make-Progress:: 62
 dataviewTarget1:: 67/26
 dataviewTarget2:: 26 @ 62
 dataviewTarget3:: 26, 62
diff --git a/examples/diary/2021-01-07.md b/examples/diary/2021-01-07.md
index e894a25..827f95e 100644
--- a/examples/diary/2021-01-07.md
+++ b/examples/diary/2021-01-07.md
@@ -26,6 +26,8 @@ sleep: 9:11 pm/5:55 am
 weightlifting: 19
 
 dataviewTarget:: 90
+- Make Progress:: 19
+- Make-Progress:: 83
 dataviewTarget1:: 90/19
 dataviewTarget2:: 19 @ 83
 dataviewTarget3:: 19, 83
diff --git a/examples/diary/2021-01-08.md b/examples/diary/2021-01-08.md
index ba849cb..acec5e3 100644
--- a/examples/diary/2021-01-08.md
+++ b/examples/diary/2021-01-08.md
@@ -26,6 +26,8 @@ obsidian-tracker@yahoo.com
 
 
 dataviewTarget:: 21
+- Make Progress:: 0
+- Make-Progress:: 51
 dataviewTarget1:: 21/0
 dataviewTarget2:: 0 @ 51
 dataviewTarget3:: 0, 51
diff --git a/examples/diary/2021-01-09.md b/examples/diary/2021-01-09.md
index c958119..3b97488 100644
--- a/examples/diary/2021-01-09.md
+++ b/examples/diary/2021-01-09.md
@@ -30,6 +30,8 @@ obsidian-tracker@yahoo.com
 weightlifting: 14
 
 dataviewTarget:: 54
+- Make Progress:: 40
+- Make-Progress:: 52
 dataviewTarget1:: 54/40
 dataviewTarget2:: 40 @ 52
 dataviewTarget3:: 40, 52
diff --git a/examples/diary/2021-01-10.md b/examples/diary/2021-01-10.md
index 4d0a0a5..ae58672 100644
--- a/examples/diary/2021-01-10.md
+++ b/examples/diary/2021-01-10.md
@@ -29,6 +29,8 @@ obsidian-tracker@yahoo.com
 
 
 dataviewTarget:: 52
+- Make Progress:: 18
+- Make-Progress:: 86
 dataviewTarget1:: 52/18
 dataviewTarget2:: 18 @ 86
 dataviewTarget3:: 18, 86
diff --git a/examples/diary/2021-01-11.md b/examples/diary/2021-01-11.md
index 7b9377c..8ccedd2 100644
--- a/examples/diary/2021-01-11.md
+++ b/examples/diary/2021-01-11.md
@@ -30,6 +30,8 @@ obsidian-tracker@yahoo.com
 weightlifting: 11
 
 dataviewTarget:: 0
+- Make Progress:: 45
+- Make-Progress:: 57
 dataviewTarget1:: 0/45
 dataviewTarget2:: 45 @ 57
 dataviewTarget3:: 45, 57
diff --git a/examples/diary/2021-01-12.md b/examples/diary/2021-01-12.md
index 1595967..e8a3954 100644
--- a/examples/diary/2021-01-12.md
+++ b/examples/diary/2021-01-12.md
@@ -29,6 +29,8 @@ obsidian-tracker+1@gmail.com
 weightlifting: 16
 
 dataviewTarget:: 38
+- Make Progress:: 11
+- Make-Progress:: 72
 dataviewTarget1:: 38/11
 dataviewTarget2:: 11 @ 72
 dataviewTarget3:: 11, 72
diff --git a/examples/diary/2021-01-13.md b/examples/diary/2021-01-13.md
index 4d27100..49e2b29 100644
--- a/examples/diary/2021-01-13.md
+++ b/examples/diary/2021-01-13.md
@@ -26,6 +26,8 @@ sleep: 9:0 pm/7:43 am
 
 
 dataviewTarget:: 1
+- Make Progress:: 17
+- Make-Progress:: 82
 dataviewTarget1:: 1/17
 dataviewTarget2:: 17 @ 82
 dataviewTarget3:: 17, 82
diff --git a/examples/diary/2021-01-14.md b/examples/diary/2021-01-14.md
index 827f231..d6d4e52 100644
--- a/examples/diary/2021-01-14.md
+++ b/examples/diary/2021-01-14.md
@@ -27,6 +27,8 @@ sleep: 11:43 pm/5:28 am
 weightlifting: 15
 
 dataviewTarget:: 64
+- Make Progress:: 28
+- Make-Progress:: 84
 dataviewTarget1:: 64/28
 dataviewTarget2:: 28 @ 84
 dataviewTarget3:: 28, 84
diff --git a/examples/diary/2021-01-15.md b/examples/diary/2021-01-15.md
index 393f8d8..9c2cf67 100644
--- a/examples/diary/2021-01-15.md
+++ b/examples/diary/2021-01-15.md
@@ -27,6 +27,8 @@ obsidian-tracker+1@gmail.com
 
 
 dataviewTarget:: 68
+- Make Progress:: 47
+- Make-Progress:: 71
 dataviewTarget1:: 68/47
 dataviewTarget2:: 47 @ 71
 dataviewTarget3:: 47, 71
diff --git a/examples/diary/2021-01-16.md b/examples/diary/2021-01-16.md
index eaf9f2d..023d888 100644
--- a/examples/diary/2021-01-16.md
+++ b/examples/diary/2021-01-16.md
@@ -28,6 +28,8 @@ obsidian-tracker+1@gmail.com
 weightlifting: 15
 
 dataviewTarget:: 58
+- Make Progress:: 34
+- Make-Progress:: 91
 dataviewTarget1:: 58/34
 dataviewTarget2:: 34 @ 91
 dataviewTarget3:: 34, 91
diff --git a/examples/diary/2021-01-17.md b/examples/diary/2021-01-17.md
index 63b0b3b..e594e13 100644
--- a/examples/diary/2021-01-17.md
+++ b/examples/diary/2021-01-17.md
@@ -29,6 +29,8 @@ obsidian-tracker@yahoo.com
 weightlifting: 18
 
 dataviewTarget:: 14
+- Make Progress:: 27
+- Make-Progress:: 96
 dataviewTarget1:: 14/27
 dataviewTarget2:: 27 @ 96
 dataviewTarget3:: 27, 96
diff --git a/examples/diary/2021-01-18.md b/examples/diary/2021-01-18.md
index 0952563..6b772c6 100644
--- a/examples/diary/2021-01-18.md
+++ b/examples/diary/2021-01-18.md
@@ -28,6 +28,8 @@ obsidian-tracker@gmail.com
 weightlifting: 14
 
 dataviewTarget:: 73
+- Make Progress:: 11
+- Make-Progress:: 58
 dataviewTarget1:: 73/11
 dataviewTarget2:: 11 @ 58
 dataviewTarget3:: 11, 58
diff --git a/examples/diary/2021-01-19.md b/examples/diary/2021-01-19.md
index 6e4b0d4..b639039 100644
--- a/examples/diary/2021-01-19.md
+++ b/examples/diary/2021-01-19.md
@@ -28,6 +28,8 @@ obsidian-tracker@yahoo.com
 weightlifting: 17
 
 dataviewTarget:: 46
+- Make Progress:: 38
+- Make-Progress:: 82
 dataviewTarget1:: 46/38
 dataviewTarget2:: 38 @ 82
 dataviewTarget3:: 38, 82
diff --git a/examples/diary/2021-01-20.md b/examples/diary/2021-01-20.md
index 0803e46..43c965e 100644
--- a/examples/diary/2021-01-20.md
+++ b/examples/diary/2021-01-20.md
@@ -28,6 +28,8 @@ obsidian-tracker@yahoo.com
 weightlifting: 16
 
 dataviewTarget:: 44
+- Make Progress:: 48
+- Make-Progress:: 64
 dataviewTarget1:: 44/48
 dataviewTarget2:: 48 @ 64
 dataviewTarget3:: 48, 64
diff --git a/examples/diary/2021-01-21.md b/examples/diary/2021-01-21.md
index a48c4bd..3c2b862 100644
--- a/examples/diary/2021-01-21.md
+++ b/examples/diary/2021-01-21.md
@@ -28,6 +28,8 @@ obsidian-tracker@gmail.com
 weightlifting: 13
 
 dataviewTarget:: 76
+- Make Progress:: 38
+- Make-Progress:: 61
 dataviewTarget1:: 76/38
 dataviewTarget2:: 38 @ 61
 dataviewTarget3:: 38, 61
diff --git a/examples/diary/2021-01-22.md b/examples/diary/2021-01-22.md
index 3356ad7..3065d02 100644
--- a/examples/diary/2021-01-22.md
+++ b/examples/diary/2021-01-22.md
@@ -30,6 +30,8 @@ obsidian-tracker@yahoo.com
 weightlifting: 11
 
 dataviewTarget:: 63
+- Make Progress:: 33
+- Make-Progress:: 58
 dataviewTarget1:: 63/33
 dataviewTarget2:: 33 @ 58
 dataviewTarget3:: 33, 58
diff --git a/examples/diary/2021-01-23.md b/examples/diary/2021-01-23.md
index 41fc3e5..42ec814 100644
--- a/examples/diary/2021-01-23.md
+++ b/examples/diary/2021-01-23.md
@@ -27,6 +27,8 @@ obsidian-tracker+1@gmail.com
 
 
 dataviewTarget:: 34
+- Make Progress:: 49
+- Make-Progress:: 86
 dataviewTarget1:: 34/49
 dataviewTarget2:: 49 @ 86
 dataviewTarget3:: 49, 86
diff --git a/examples/diary/2021-01-24.md b/examples/diary/2021-01-24.md
index 61a5105..c03e46f 100644
--- a/examples/diary/2021-01-24.md
+++ b/examples/diary/2021-01-24.md
@@ -29,6 +29,8 @@ obsidian-tracker+1@gmail.com
 weightlifting: 16
 
 dataviewTarget:: 23
+- Make Progress:: 10
+- Make-Progress:: 92
 dataviewTarget1:: 23/10
 dataviewTarget2:: 10 @ 92
 dataviewTarget3:: 10, 92
diff --git a/examples/diary/2021-01-25.md b/examples/diary/2021-01-25.md
index ac13b66..35ac46f 100644
--- a/examples/diary/2021-01-25.md
+++ b/examples/diary/2021-01-25.md
@@ -28,6 +28,8 @@ obsidian-tracker@yahoo.com
 weightlifting: 16
 
 dataviewTarget:: 52
+- Make Progress:: 18
+- Make-Progress:: 58
 dataviewTarget1:: 52/18
 dataviewTarget2:: 18 @ 58
 dataviewTarget3:: 18, 58
diff --git a/examples/diary/2021-01-26.md b/examples/diary/2021-01-26.md
index 5ac4721..1a0ed93 100644
--- a/examples/diary/2021-01-26.md
+++ b/examples/diary/2021-01-26.md
@@ -28,6 +28,8 @@ obsidian-tracker+1@gmail.com
 
 
 dataviewTarget:: 21
+- Make Progress:: 1
+- Make-Progress:: 77
 dataviewTarget1:: 21/1
 dataviewTarget2:: 1 @ 77
 dataviewTarget3:: 1, 77
diff --git a/examples/diary/2021-01-27.md b/examples/diary/2021-01-27.md
index cf3e408..497e800 100644
--- a/examples/diary/2021-01-27.md
+++ b/examples/diary/2021-01-27.md
@@ -29,6 +29,8 @@ obsidian-tracker+1@gmail.com
 weightlifting: 12
 
 dataviewTarget:: 85
+- Make Progress:: 36
+- Make-Progress:: 64
 dataviewTarget1:: 85/36
 dataviewTarget2:: 36 @ 64
 dataviewTarget3:: 36, 64
diff --git a/examples/diary/2021-01-28.md b/examples/diary/2021-01-28.md
index d64e14a..252566c 100644
--- a/examples/diary/2021-01-28.md
+++ b/examples/diary/2021-01-28.md
@@ -28,6 +28,8 @@ obsidian-tracker@yahoo.com
 weightlifting: 10
 
 dataviewTarget:: 24
+- Make Progress:: 46
+- Make-Progress:: 85
 dataviewTarget1:: 24/46
 dataviewTarget2:: 46 @ 85
 dataviewTarget3:: 46, 85
diff --git a/examples/diary/2021-01-29.md b/examples/diary/2021-01-29.md
index 0cc7e47..0adad37 100644
--- a/examples/diary/2021-01-29.md
+++ b/examples/diary/2021-01-29.md
@@ -27,6 +27,8 @@ obsidian-tracker+1@gmail.com
 weightlifting: 11
 
 dataviewTarget:: 21
+- Make Progress:: 7
+- Make-Progress:: 71
 dataviewTarget1:: 21/7
 dataviewTarget2:: 7 @ 71
 dataviewTarget3:: 7, 71
diff --git a/examples/diary/2021-01-30.md b/examples/diary/2021-01-30.md
index c982e27..e22783e 100644
--- a/examples/diary/2021-01-30.md
+++ b/examples/diary/2021-01-30.md
@@ -29,6 +29,8 @@ obsidian-tracker@yahoo.com
 
 
 dataviewTarget:: 26
+- Make Progress:: 5
+- Make-Progress:: 87
 dataviewTarget1:: 26/5
 dataviewTarget2:: 5 @ 87
 dataviewTarget3:: 5, 87
diff --git a/examples/diary/2021-01-31.md b/examples/diary/2021-01-31.md
index 8a8af8d..ace81d2 100644
--- a/examples/diary/2021-01-31.md
+++ b/examples/diary/2021-01-31.md
@@ -29,6 +29,8 @@ obsidian-tracker+1@gmail.com
 weightlifting: 17
 
 dataviewTarget:: 15
+- Make Progress:: 25
+- Make-Progress:: 98
 dataviewTarget1:: 15/25
 dataviewTarget2:: 25 @ 98
 dataviewTarget3:: 25, 98
diff --git a/examples/example_generator.ts b/examples/example_generator.ts
index a95d179..7aa3294 100644
--- a/examples/example_generator.ts
+++ b/examples/example_generator.ts
@@ -193,6 +193,8 @@ for (
     let dataviewValue1 = randomIntFromInterval(0, 50);
     let dataviewValue2 = randomIntFromInterval(50, 100);
     content += "dataviewTarget:: " + dataviewValue + "\n";
+    content += "- Make Progress:: " + dataviewValue1 + "\n";
+    content += "- Make-Progress:: " + dataviewValue2 + "\n";
     content +=
         "dataviewTarget1:: " + dataviewValue + "/" + dataviewValue1 + "\n";
     content +=

From 8fe2331cc4a34dfe3f0cae7e2fa3efa2348b1275 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 21 May 2021 21:51:31 +0800
Subject: [PATCH 004/402] Add example trackers for dvField

---
 examples/TestDvField.md | 87 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 examples/TestDvField.md

diff --git a/examples/TestDvField.md b/examples/TestDvField.md
new file mode 100644
index 0000000..f78346b
--- /dev/null
+++ b/examples/TestDvField.md
@@ -0,0 +1,87 @@
+# Test dvField
+
+Simple inline field
+``` tracker
+searchType: dvField
+searchTarget: dataviewTarget
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-31
+line:
+    title: dvField
+	lineColor: green
+```
+
+Field with a space
+``` tracker
+searchType: dvField
+searchTarget: Make Progress
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-31
+line:
+    title: dvField
+	lineColor: yellow
+```
+
+Field with a dash line
+``` tracker
+searchType: dvField
+searchTarget: Make-Progress
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-31
+line:
+    title: dvField
+	lineColor: red
+```
+
+Extract the first value from multiple values
+``` tracker
+searchType: dvField
+searchTarget: dataviewTarget1[0]
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-31
+line:
+    title: dvField
+	lineColor: blue
+```
+
+Multiple values separated by '/' (default)
+``` tracker
+searchType: dvField
+searchTarget: dataviewTarget1[0], dataviewTarget1[1]
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-31
+line:
+    title: dvField
+    lineColor: green, red
+```
+
+Multiple values seprated by 'comma'
+``` tracker
+searchType: dvField
+searchTarget: dataviewTarget3[0], dataviewTarget3[1]
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-31
+separator: 'comma'
+line:
+    title: dvField
+    lineColor: green, red
+```
+
+Use custom multiple value separator
+``` tracker
+searchType: dvField
+searchTarget: dataviewTarget2[0], dataviewTarget2[1]
+separator: '@'
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-31
+line:
+    title: dvField
+    lineColor: green, red
+```
\ No newline at end of file

From 45faf3536456866f620eb60be6daeff5a4001952 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 23 May 2021 21:00:01 +0800
Subject: [PATCH 005/402] Update examples

---
 examples/TestTable.md   | 14 +++++++++++++-
 examples/data/Tables.md | 24 ++++++++++++------------
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/examples/TestTable.md b/examples/TestTable.md
index 53dba8f..e88bc8c 100644
--- a/examples/TestTable.md
+++ b/examples/TestTable.md
@@ -1,5 +1,5 @@
 # Test Table
-Use first column as X dataset and others as Y values
+Use first column as X dataset , and second and third columns as Y values
 ``` tracker
 searchType: table
 searchTarget: data/Tables[0][0], data/Tables[0][1], data/Tables[0][2]
@@ -10,6 +10,18 @@ line:
     showLegend: true
 ```
 
+Use first column as X dataset , and third and forth columns as Y values
+``` tracker
+searchType: table
+searchTarget: data/Tables[0][0], data/Tables[0][2], data/Tables[0][3]
+xDataset: 0
+line:
+    yAxisLocation: none, left, right
+    lineColor: none, yellow, red
+    showLegend: true
+    legendPosition: right
+```
+
 Use first column as X dataset. Second column posses multiple values in each cell.
 ``` tracker
 searchType: table
diff --git a/examples/data/Tables.md b/examples/data/Tables.md
index 6585f08..1b568c5 100644
--- a/examples/data/Tables.md
+++ b/examples/data/Tables.md
@@ -1,18 +1,18 @@
 # Tables
 
 ## Weight Table
- Date | Jeffrey (kg) | Lucas (kg) |
-| - | - | - 
-| 2021-05-01 | 60.0 | 20.1 |
- 2021-05-02 | 62.1 | 20.5 
-| 2021-05-03 | 62.2 | 20.3 |
-| 2021-05-04 | 62.3 | 20.4 |
- 2021-05-05 | 62.2 | 20.2 
-| 2021-05-06 | 62.4 | 21.0 |
-| 2021-05-07 | 62.6 | 20.9 |
-| 2021-05-08 | 62.3 | 20.9 
-| 2021-05-09 | 62.2 | 20.3 |
-| 2021-05-10 | 62.1 | 20.8 |
+ Date | Jeffrey (kg) | Lucas (kg) | Anne (kg) |
+| - | - | - | - |
+| 2021-05-01 | 60.0 | 20.1 | 18.2
+ 2021-05-02 | 62.1 | 20.5 | 18.1 |
+| 2021-05-03 | 62.2 | 20.3 | 18.3
+| 2021-05-04 | 62.3 | 20.4 | 18.2 |
+ 2021-05-05 | 62.2 | 20.2 | 18.4
+| 2021-05-06 | 62.4 | 21.0 | 18.4
+| 2021-05-07 | 62.6 | 20.9 | 18.3 |
+| 2021-05-08 | 62.3 | 20.9 | 18.2
+| 2021-05-09 | 62.2 | 20.3 | 18.5
+| 2021-05-10 | 62.1 | 20.8 | 18.9
 
 
 ## Running Records

From a7b7a60e2ac85f69b95c72f8f8d9e5db64b67956 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 21 May 2021 11:13:20 +0800
Subject: [PATCH 006/402] Add TestTimeValues.md

---
 examples/TestTimeValues.md | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 examples/TestTimeValues.md

diff --git a/examples/TestTimeValues.md b/examples/TestTimeValues.md
new file mode 100644
index 0000000..4d33c08
--- /dev/null
+++ b/examples/TestTimeValues.md
@@ -0,0 +1,25 @@
+# Test Time Values
+
+``` tracker
+searchType: frontmatter
+searchTarget: clock-in, clock-out
+endDate: 2021-01-15
+folder: diary
+line:
+    title: "Working Hours"
+    yAxisLabel: "Time"
+    lineColor: yellow, red
+    showPoint: false
+```
+
+``` tracker
+searchType: frontmatter
+searchTarget: sleep[0], sleep[1]
+endDate: 2021-01-15
+folder: diary
+line:
+    title: "Sleep"
+    yAxisLabel: "Time"
+    lineColor: yellow, red
+    showPoint: false
+```
\ No newline at end of file

From 3b4cc2f61eca753d3180f5c01a95beb5c32e7c4d Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 24 May 2021 18:08:40 +0800
Subject: [PATCH 007/402] Add a new template variable lastBreaks

---
 examples/HabitTracker.md      | 12 ++++++++++
 examples/diary/2021-01-01.md  | 20 ++++++++--------
 examples/diary/2021-01-02.md  | 40 ++++++++++++++++----------------
 examples/diary/2021-01-03.md  | 39 ++++++++++++++++---------------
 examples/diary/2021-01-04.md  | 39 ++++++++++++++++---------------
 examples/diary/2021-01-05.md  | 42 ++++++++++++++++++----------------
 examples/diary/2021-01-06.md  | 35 ++++++++++++++--------------
 examples/diary/2021-01-07.md  | 36 ++++++++++++++++-------------
 examples/diary/2021-01-08.md  | 37 +++++++++++++++---------------
 examples/diary/2021-01-09.md  | 41 ++++++++++++++++-----------------
 examples/diary/2021-01-10.md  | 41 +++++++++++++++++----------------
 examples/diary/2021-01-11.md  | 41 +++++++++++++++++----------------
 examples/diary/2021-01-12.md  | 38 +++++++++++++++----------------
 examples/diary/2021-01-13.md  | 38 +++++++++++++++++--------------
 examples/diary/2021-01-14.md  | 37 +++++++++++++++---------------
 examples/diary/2021-01-15.md  | 39 +++++++++++++++----------------
 examples/diary/2021-01-16.md  | 37 +++++++++++++++---------------
 examples/diary/2021-01-17.md  | 42 +++++++++++++++++-----------------
 examples/diary/2021-01-18.md  | 43 ++++++++++++++++++-----------------
 examples/diary/2021-01-19.md  | 39 +++++++++++++++----------------
 examples/diary/2021-01-20.md  | 41 +++++++++++++++++----------------
 examples/diary/2021-01-21.md  | 35 ++++++++++++++--------------
 examples/diary/2021-01-22.md  | 41 ++++++++++++++++-----------------
 examples/diary/2021-01-23.md  | 40 +++++++++++++++++---------------
 examples/diary/2021-01-24.md  | 42 +++++++++++++++++-----------------
 examples/diary/2021-01-25.md  | 39 +++++++++++++++----------------
 examples/diary/2021-01-26.md  | 39 +++++++++++++++----------------
 examples/diary/2021-01-27.md  | 40 ++++++++++++++++----------------
 examples/diary/2021-01-28.md  | 41 +++++++++++++++++----------------
 examples/diary/2021-01-29.md  | 41 +++++++++++++++++----------------
 examples/diary/2021-01-30.md  | 34 ++++++++++++++-------------
 examples/diary/2021-01-31.md  | 39 ++++++++++++++++---------------
 examples/example_generator.ts |  9 ++++++++
 src/rendering.ts              | 16 ++++++++++++-
 34 files changed, 649 insertions(+), 584 deletions(-)

diff --git a/examples/HabitTracker.md b/examples/HabitTracker.md
index 594ab92..1b606d4 100644
--- a/examples/HabitTracker.md
+++ b/examples/HabitTracker.md
@@ -35,6 +35,7 @@ line:
 ```
 
 ## Summary
+Meditation
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -43,6 +44,17 @@ summary:
     template: "Longest Streak: {{maxStreak}} day(s)\nLongest Break: {{maxBreak}} day(s)\nLast streak: {{lastStreak}} day(s)"
 ```
 
+CleanUp
+``` tracker
+searchType: tag
+searchTarget: clean-up
+folder: diary
+endDate: 2021-01-31
+summary:
+    template: "Last Break: {{lastBreaks}} day(s)"
+```
+
+Work log
 ``` tracker
 searchType: tag
 searchTarget: work_log
diff --git a/examples/diary/2021-01-01.md b/examples/diary/2021-01-01.md
index fc7e51d..183ddf5 100644
--- a/examples/diary/2021-01-01.md
+++ b/examples/diary/2021-01-01.md
@@ -17,21 +17,23 @@ sleep: 10:11 pm/7:5 am
 
 ⭐⭐⭐⭐⭐
 
-#finance/bank1:-2.1USD
+
+#finance/bank1:-2.3USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker+1@gmail.com
+obsidian-tracker@gmail.com
+obsidian-tracker@yahoo.com
 
-weightlifting: 16
+weightlifting: 15
 
-dataviewTarget:: 80
-- Make Progress:: 11
-- Make-Progress:: 74
-dataviewTarget1:: 80/11
-dataviewTarget2:: 11 @ 74
-dataviewTarget3:: 11, 74
+dataviewTarget:: 21
+- Make Progress:: 24
+- Make-Progress:: 79
+dataviewTarget1:: 21/24
+dataviewTarget2:: 24 @ 79
+dataviewTarget3:: 24, 79
 
 #sin:0.00000/0.20791/0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452
 
diff --git a/examples/diary/2021-01-02.md b/examples/diary/2021-01-02.md
index 4671c72..50fc695 100644
--- a/examples/diary/2021-01-02.md
+++ b/examples/diary/2021-01-02.md
@@ -1,37 +1,39 @@
 ---
 tags: 
-mood: 6
-bloodpressure: 181.8/117.6
-bloodpressure1: 181.8, 117.6
-bloodpressure2: [181.8, 117.6]
-clock-in: 9:41
-clock-out: 19:16
-sleep: 9:49 pm/5:12 am
+mood: 8
+bloodpressure: 173.8/120.6
+bloodpressure1: 173.8, 120.6
+bloodpressure2: [173.8, 120.6]
+clock-in: 10:37
+clock-out: 17:7
+sleep: 11:10 pm/5:37 am
 ---
 
-#weight:73.0kg
+#weight:74.4kg
 
-#exercise-pushup:44
-#exercise-plank:116sec
+#exercise-pushup:50
+#exercise-plank:41sec
 
-#meditation
 
 ⭐⭐⭐⭐
 
-#finance/bank1:-3.6USD
+
+#finance/bank1:-2.0USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
+obsidian-tracker+1@gmail.com
+obsidian-tracker@yahoo.com
 
-weightlifting: 19
+weightlifting: 14
 
-dataviewTarget:: 45
-- Make Progress:: 24
-- Make-Progress:: 62
-dataviewTarget1:: 45/24
-dataviewTarget2:: 24 @ 62
-dataviewTarget3:: 24, 62
+dataviewTarget:: 25
+- Make Progress:: 14
+- Make-Progress:: 64
+dataviewTarget1:: 25/14
+dataviewTarget2:: 14 @ 64
+dataviewTarget3:: 14, 64
 
 #sin:0.20791/0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452/0.95106
 
diff --git a/examples/diary/2021-01-03.md b/examples/diary/2021-01-03.md
index f8ca1af..82b3cad 100644
--- a/examples/diary/2021-01-03.md
+++ b/examples/diary/2021-01-03.md
@@ -1,39 +1,38 @@
 ---
 tags: 
 mood: 3
-bloodpressure: 176.2/118.4
-bloodpressure1: 176.2, 118.4
-bloodpressure2: [176.2, 118.4]
-clock-in: 8:26
-clock-out: 18:38
-sleep: 11:22 pm/7:49 am
+bloodpressure: 174.2/119.4
+bloodpressure1: 174.2, 119.4
+bloodpressure2: [174.2, 119.4]
+clock-in: 9:38
+clock-out: 19:22
+sleep: 11:49 pm/5:33 am
 ---
 
-#weight:64.1kg
+#weight:65.5kg
 
-#exercise-pushup:41
-#exercise-plank:53sec
+#exercise-pushup:36
+#exercise-plank:74sec
 
-#meditation
 
-⭐⭐
+⭐⭐⭐⭐
 
-#finance/bank1:-3.6USD
+
+#finance/bank1:-3.8USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
 obsidian-tracker@gmail.com
-obsidian-tracker@yahoo.com
 
-weightlifting: 16
+weightlifting: 15
 
-dataviewTarget:: 28
-- Make Progress:: 27
-- Make-Progress:: 59
-dataviewTarget1:: 28/27
-dataviewTarget2:: 27 @ 59
-dataviewTarget3:: 27, 59
+dataviewTarget:: 7
+- Make Progress:: 10
+- Make-Progress:: 90
+dataviewTarget1:: 7/10
+dataviewTarget2:: 10 @ 90
+dataviewTarget3:: 10, 90
 
 #sin:0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452/0.95106/0.86603
 
diff --git a/examples/diary/2021-01-04.md b/examples/diary/2021-01-04.md
index 322da2a..ae0d5da 100644
--- a/examples/diary/2021-01-04.md
+++ b/examples/diary/2021-01-04.md
@@ -1,36 +1,39 @@
 ---
 tags: work_log
-mood: 1
-bloodpressure: 174.6/120.2
-bloodpressure1: 174.6, 120.2
-bloodpressure2: [174.6, 120.2]
-clock-in: 10:6
-clock-out: 16:17
-sleep: 10:54 pm/5:24 am
+mood: 9
+bloodpressure: 173.6/117.2
+bloodpressure1: 173.6, 117.2
+bloodpressure2: [173.6, 117.2]
+clock-in: 8:38
+clock-out: 20:14
+sleep: 10:49 pm/7:41 am
 ---
 
-#weight:77.3kg
+#weight:80.3kg
 
-#exercise-pushup:50
-#exercise-plank:93sec
+#exercise-pushup:48
+#exercise-plank:60sec
 
+#meditation
 
-⭐⭐⭐⭐⭐
+⭐⭐
 
-#finance/bank1:-2.7USD
+
+#finance/bank1:-3.8USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
 obsidian-tracker@yahoo.com
 
+weightlifting: 13
 
-dataviewTarget:: 18
-- Make Progress:: 47
-- Make-Progress:: 67
-dataviewTarget1:: 18/47
-dataviewTarget2:: 47 @ 67
-dataviewTarget3:: 47, 67
+dataviewTarget:: 27
+- Make Progress:: 45
+- Make-Progress:: 89
+dataviewTarget1:: 27/45
+dataviewTarget2:: 45 @ 89
+dataviewTarget3:: 45, 89
 
 #sin:0.58779/0.74314/0.86603/0.95106/0.99452/0.99452/0.95106/0.86603/0.74314
 
diff --git a/examples/diary/2021-01-05.md b/examples/diary/2021-01-05.md
index 0f0d4e7..d990407 100644
--- a/examples/diary/2021-01-05.md
+++ b/examples/diary/2021-01-05.md
@@ -1,37 +1,39 @@
 ---
 tags: work_log
-mood: 3
-bloodpressure: 174/121
-bloodpressure1: 174, 121
-bloodpressure2: [174, 121]
-clock-in: 10:38
-clock-out: 18:49
-sleep: 9:25 pm/6:29 am
+mood: 7
+bloodpressure: 178/121
+bloodpressure1: 178, 121
+bloodpressure2: [178, 121]
+clock-in: 8:25
+clock-out: 18:29
+sleep: 9:10 pm/7:21 am
 ---
 
-#weight:60.9kg
+#weight:72.9kg
 
-#exercise-pushup:33
-#exercise-plank:103sec
+#exercise-pushup:30
+#exercise-plank:73sec
 
-#meditation
 
-⭐⭐⭐
 
-#finance/bank1:-2.0USD
+
+
+#finance/bank1:-2.3USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker+1@gmail.com
+obsidian-tracker@gmail.com
+obsidian-tracker@yahoo.com
 
+weightlifting: 19
 
-dataviewTarget:: 97
-- Make Progress:: 6
-- Make-Progress:: 80
-dataviewTarget1:: 97/6
-dataviewTarget2:: 6 @ 80
-dataviewTarget3:: 6, 80
+dataviewTarget:: 38
+- Make Progress:: 13
+- Make-Progress:: 97
+dataviewTarget1:: 38/13
+dataviewTarget2:: 13 @ 97
+dataviewTarget3:: 13, 97
 
 #sin:0.74314/0.86603/0.95106/0.99452/0.99452/0.95106/0.86603/0.74314/0.58779
 
diff --git a/examples/diary/2021-01-06.md b/examples/diary/2021-01-06.md
index 8405eda..0a105d4 100644
--- a/examples/diary/2021-01-06.md
+++ b/examples/diary/2021-01-06.md
@@ -1,39 +1,38 @@
 ---
 tags: work_log
 mood: 10
-bloodpressure: 174.4/117.8
-bloodpressure1: 174.4, 117.8
-bloodpressure2: [174.4, 117.8]
-clock-in: 8:56
-clock-out: 20:50
-sleep: 10:14 pm/7:40 am
+bloodpressure: 180.4/119.8
+bloodpressure1: 180.4, 119.8
+bloodpressure2: [180.4, 119.8]
+clock-in: 8:41
+clock-out: 19:51
+sleep: 10:48 pm/6:42 am
 ---
 
-#weight:78.0kg
+#weight:61.0kg
 
-#exercise-pushup:40
-#exercise-plank:102sec
+#exercise-pushup:41
+#exercise-plank:101sec
 
 #meditation
 
 ⭐⭐⭐⭐
 
-#finance/bank1:-2.1USD
+
+#finance/bank1:-3.3USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
 obsidian-tracker@gmail.com
-obsidian-tracker+1@gmail.com
 
-weightlifting: 17
 
-dataviewTarget:: 67
-- Make Progress:: 26
-- Make-Progress:: 62
-dataviewTarget1:: 67/26
-dataviewTarget2:: 26 @ 62
-dataviewTarget3:: 26, 62
+dataviewTarget:: 80
+- Make Progress:: 44
+- Make-Progress:: 57
+dataviewTarget1:: 80/44
+dataviewTarget2:: 44 @ 57
+dataviewTarget3:: 44, 57
 
 #sin:0.86603/0.95106/0.99452/0.99452/0.95106/0.86603/0.74314/0.58779/0.40674
 
diff --git a/examples/diary/2021-01-07.md b/examples/diary/2021-01-07.md
index 827f95e..de33cd1 100644
--- a/examples/diary/2021-01-07.md
+++ b/examples/diary/2021-01-07.md
@@ -1,36 +1,40 @@
 ---
 tags: work_log
-mood: 5
+mood: 6
 bloodpressure: 172.8/116.6
 bloodpressure1: 172.8, 116.6
 bloodpressure2: [172.8, 116.6]
-clock-in: 10:52
-clock-out: 16:30
-sleep: 9:11 pm/5:55 am
+clock-in: 8:55
+clock-out: 18:53
+sleep: 9:58 pm/7:29 am
 ---
 
-#weight:70.4kg
+#weight:65.6kg
 
-#exercise-pushup:48
-#exercise-plank:59sec
+#exercise-pushup:30
+#exercise-plank:75sec
 
 
-⭐⭐⭐⭐⭐
+⭐⭐⭐
 
-#finance/bank1:-3.0USD
+
+#finance/bank1:-2.8USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
+obsidian-tracker@gmail.com
+obsidian-tracker+1@gmail.com
+obsidian-tracker@yahoo.com
 
-weightlifting: 19
+weightlifting: 18
 
-dataviewTarget:: 90
-- Make Progress:: 19
-- Make-Progress:: 83
-dataviewTarget1:: 90/19
-dataviewTarget2:: 19 @ 83
-dataviewTarget3:: 19, 83
+dataviewTarget:: 47
+- Make Progress:: 24
+- Make-Progress:: 59
+dataviewTarget1:: 47/24
+dataviewTarget2:: 24 @ 59
+dataviewTarget3:: 24, 59
 
 #sin:0.95106/0.99452/0.99452/0.95106/0.86603/0.74314/0.58779/0.40674/0.20791
 
diff --git a/examples/diary/2021-01-08.md b/examples/diary/2021-01-08.md
index acec5e3..12f2a96 100644
--- a/examples/diary/2021-01-08.md
+++ b/examples/diary/2021-01-08.md
@@ -1,36 +1,37 @@
 ---
 tags: work_log
-mood: 6
-bloodpressure: 179.2/119.4
-bloodpressure1: 179.2, 119.4
-bloodpressure2: [179.2, 119.4]
-clock-in: 8:28
-clock-out: 18:11
-sleep: 11:50 pm/5:45 am
+mood: 9
+bloodpressure: 179.2/117.4
+bloodpressure1: 179.2, 117.4
+bloodpressure2: [179.2, 117.4]
+clock-in: 10:17
+clock-out: 19:10
+sleep: 11:5 pm/6:26 am
 ---
 
-#weight:66.1kg
+#weight:62.9kg
 
-#exercise-pushup:46
-#exercise-plank:46sec
+#exercise-pushup:41
+#exercise-plank:57sec
 
+#meditation
 
+⭐
 
 
-#finance/bank1:-3.2USD
+#finance/bank1:-2.1USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@yahoo.com
 
 
-dataviewTarget:: 21
-- Make Progress:: 0
-- Make-Progress:: 51
-dataviewTarget1:: 21/0
-dataviewTarget2:: 0 @ 51
-dataviewTarget3:: 0, 51
+dataviewTarget:: 58
+- Make Progress:: 48
+- Make-Progress:: 84
+dataviewTarget1:: 58/48
+dataviewTarget2:: 48 @ 84
+dataviewTarget3:: 48, 84
 
 #sin:0.99452/0.99452/0.95106/0.86603/0.74314/0.58779/0.40674/0.20791/0.00000
 
diff --git a/examples/diary/2021-01-09.md b/examples/diary/2021-01-09.md
index 3b97488..ac22602 100644
--- a/examples/diary/2021-01-09.md
+++ b/examples/diary/2021-01-09.md
@@ -1,40 +1,39 @@
 ---
 tags: 
-mood: 1
-bloodpressure: 171.6/116.2
-bloodpressure1: 171.6, 116.2
-bloodpressure2: [171.6, 116.2]
-clock-in: 8:1
-clock-out: 18:56
-sleep: 11:39 pm/5:31 am
+mood: 7
+bloodpressure: 171.6/118.2
+bloodpressure1: 171.6, 118.2
+bloodpressure2: [171.6, 118.2]
+clock-in: 9:17
+clock-out: 20:27
+sleep: 10:11 pm/7:51 am
 ---
 
-#weight:71.1kg
+#weight:80.7kg
 
-#exercise-pushup:36
-#exercise-plank:120sec
+#exercise-pushup:38
+#exercise-plank:76sec
 
-#meditation
 
-⭐⭐⭐
+⭐⭐⭐⭐
 
-#finance/bank1:-2.4USD
+#clean-up
+
+#finance/bank1:-3.1USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
 obsidian-tracker@gmail.com
-obsidian-tracker+1@gmail.com
 obsidian-tracker@yahoo.com
 
-weightlifting: 14
 
-dataviewTarget:: 54
-- Make Progress:: 40
-- Make-Progress:: 52
-dataviewTarget1:: 54/40
-dataviewTarget2:: 40 @ 52
-dataviewTarget3:: 40, 52
+dataviewTarget:: 23
+- Make Progress:: 20
+- Make-Progress:: 58
+dataviewTarget1:: 23/20
+dataviewTarget2:: 20 @ 58
+dataviewTarget3:: 20, 58
 
 #sin:0.99452/0.95106/0.86603/0.74314/0.58779/0.40674/0.20791/0.00000/-0.20791
 
diff --git a/examples/diary/2021-01-10.md b/examples/diary/2021-01-10.md
index ae58672..ce5cc33 100644
--- a/examples/diary/2021-01-10.md
+++ b/examples/diary/2021-01-10.md
@@ -1,39 +1,40 @@
 ---
 tags: 
-mood: 6
-bloodpressure: 175/117
-bloodpressure1: 175, 117
-bloodpressure2: [175, 117]
-clock-in: 9:21
-clock-out: 16:13
-sleep: 10:10 pm/7:40 am
+mood: 9
+bloodpressure: 176/118
+bloodpressure1: 176, 118
+bloodpressure2: [176, 118]
+clock-in: 8:54
+clock-out: 18:37
+sleep: 11:54 pm/6:52 am
 ---
 
-#weight:68.8kg
+#weight:72.6kg
 
-#exercise-pushup:35
-#exercise-plank:112sec
+#exercise-pushup:31
+#exercise-plank:77sec
 
 #meditation
 
-⭐⭐⭐
+⭐⭐⭐⭐
 
-#finance/bank1:-3.8USD
+#clean-up
+
+#finance/bank1:-2.2USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@gmail.com
 obsidian-tracker+1@gmail.com
-obsidian-tracker@yahoo.com
 
+weightlifting: 20
 
-dataviewTarget:: 52
-- Make Progress:: 18
-- Make-Progress:: 86
-dataviewTarget1:: 52/18
-dataviewTarget2:: 18 @ 86
-dataviewTarget3:: 18, 86
+dataviewTarget:: 35
+- Make Progress:: 47
+- Make-Progress:: 70
+dataviewTarget1:: 35/47
+dataviewTarget2:: 47 @ 70
+dataviewTarget3:: 47, 70
 
 #sin:0.95106/0.86603/0.74314/0.58779/0.40674/0.20791/0.00000/-0.20791/-0.40674
 
diff --git a/examples/diary/2021-01-11.md b/examples/diary/2021-01-11.md
index 8ccedd2..7be3f2f 100644
--- a/examples/diary/2021-01-11.md
+++ b/examples/diary/2021-01-11.md
@@ -1,40 +1,41 @@
 ---
 tags: work_log
-mood: 1
-bloodpressure: 169.4/116.8
-bloodpressure1: 169.4, 116.8
-bloodpressure2: [169.4, 116.8]
-clock-in: 10:5
-clock-out: 20:25
-sleep: 10:55 pm/6:11 am
+mood: 2
+bloodpressure: 168.4/117.8
+bloodpressure1: 168.4, 117.8
+bloodpressure2: [168.4, 117.8]
+clock-in: 8:6
+clock-out: 18:40
+sleep: 10:31 pm/6:6 am
 ---
 
-#weight:61.7kg
+#weight:72.0kg
 
-#exercise-pushup:41
-#exercise-plank:45sec
+#exercise-pushup:30
+#exercise-plank:110sec
 
 #meditation
 
-⭐⭐⭐
 
-#finance/bank1:-3.4USD
+
+#clean-up
+
+#finance/bank1:-2.4USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
 obsidian-tracker@gmail.com
 obsidian-tracker+1@gmail.com
-obsidian-tracker@yahoo.com
 
-weightlifting: 11
+weightlifting: 15
 
-dataviewTarget:: 0
-- Make Progress:: 45
-- Make-Progress:: 57
-dataviewTarget1:: 0/45
-dataviewTarget2:: 45 @ 57
-dataviewTarget3:: 45, 57
+dataviewTarget:: 64
+- Make Progress:: 36
+- Make-Progress:: 93
+dataviewTarget1:: 64/36
+dataviewTarget2:: 36 @ 93
+dataviewTarget3:: 36, 93
 
 #sin:0.86603/0.74314/0.58779/0.40674/0.20791/0.00000/-0.20791/-0.40674/-0.58779
 
diff --git a/examples/diary/2021-01-12.md b/examples/diary/2021-01-12.md
index e8a3954..98bb8a5 100644
--- a/examples/diary/2021-01-12.md
+++ b/examples/diary/2021-01-12.md
@@ -1,39 +1,39 @@
 ---
 tags: work_log
-mood: 2
-bloodpressure: 167.8/116.6
-bloodpressure1: 167.8, 116.6
-bloodpressure2: [167.8, 116.6]
-clock-in: 10:54
-clock-out: 18:30
-sleep: 10:38 pm/7:51 am
+mood: 6
+bloodpressure: 177.8/118.6
+bloodpressure1: 177.8, 118.6
+bloodpressure2: [177.8, 118.6]
+clock-in: 9:8
+clock-out: 17:59
+sleep: 11:10 pm/6:41 am
 ---
 
-#weight:72.4kg
+#weight:67.9kg
 
-#exercise-pushup:50
-#exercise-plank:101sec
+#exercise-pushup:34
+#exercise-plank:70sec
 
 #meditation
 
+⭐⭐⭐
 
 
-#finance/bank1:-2.5USD
+#finance/bank1:-2.1USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
 obsidian-tracker@gmail.com
-obsidian-tracker+1@gmail.com
+obsidian-tracker@yahoo.com
 
-weightlifting: 16
 
-dataviewTarget:: 38
-- Make Progress:: 11
-- Make-Progress:: 72
-dataviewTarget1:: 38/11
-dataviewTarget2:: 11 @ 72
-dataviewTarget3:: 11, 72
+dataviewTarget:: 88
+- Make Progress:: 36
+- Make-Progress:: 54
+dataviewTarget1:: 88/36
+dataviewTarget2:: 36 @ 54
+dataviewTarget3:: 36, 54
 
 #sin:0.74314/0.58779/0.40674/0.20791/0.00000/-0.20791/-0.40674/-0.58779/-0.74314
 
diff --git a/examples/diary/2021-01-13.md b/examples/diary/2021-01-13.md
index 49e2b29..2b15abb 100644
--- a/examples/diary/2021-01-13.md
+++ b/examples/diary/2021-01-13.md
@@ -1,36 +1,40 @@
 ---
 tags: work_log
-mood: 4
-bloodpressure: 172.2/116.4
-bloodpressure1: 172.2, 116.4
-bloodpressure2: [172.2, 116.4]
-clock-in: 8:57
-clock-out: 17:38
-sleep: 9:0 pm/7:43 am
+mood: 10
+bloodpressure: 167.2/116.4
+bloodpressure1: 167.2, 116.4
+bloodpressure2: [167.2, 116.4]
+clock-in: 10:23
+clock-out: 17:15
+sleep: 10:4 pm/5:0 am
 ---
 
-#weight:61.8kg
+#weight:67.3kg
 
-#exercise-pushup:49
-#exercise-plank:36sec
+#exercise-pushup:43
+#exercise-plank:110sec
 
 #meditation
 
 ⭐⭐⭐⭐⭐
 
-#finance/bank1:-2.8USD
+
+#finance/bank1:-2.4USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
+obsidian-tracker+1@gmail.com
+obsidian-tracker@yahoo.com
 
+weightlifting: 17
 
-dataviewTarget:: 1
-- Make Progress:: 17
-- Make-Progress:: 82
-dataviewTarget1:: 1/17
-dataviewTarget2:: 17 @ 82
-dataviewTarget3:: 17, 82
+dataviewTarget:: 47
+- Make Progress:: 47
+- Make-Progress:: 55
+dataviewTarget1:: 47/47
+dataviewTarget2:: 47 @ 55
+dataviewTarget3:: 47, 55
 
 #sin:0.58779/0.40674/0.20791/0.00000/-0.20791/-0.40674/-0.58779/-0.74314/-0.86603
 
diff --git a/examples/diary/2021-01-14.md b/examples/diary/2021-01-14.md
index d6d4e52..63fb0d9 100644
--- a/examples/diary/2021-01-14.md
+++ b/examples/diary/2021-01-14.md
@@ -1,37 +1,38 @@
 ---
 tags: work_log
-mood: 9
-bloodpressure: 169.6/119.2
-bloodpressure1: 169.6, 119.2
-bloodpressure2: [169.6, 119.2]
-clock-in: 9:11
-clock-out: 16:57
-sleep: 11:43 pm/5:28 am
+mood: 3
+bloodpressure: 167.6/115.2
+bloodpressure1: 167.6, 115.2
+bloodpressure2: [167.6, 115.2]
+clock-in: 9:0
+clock-out: 16:2
+sleep: 10:37 pm/6:33 am
 ---
 
-#weight:79.5kg
+#weight:74.1kg
 
-#exercise-pushup:32
-#exercise-plank:53sec
+#exercise-pushup:33
+#exercise-plank:75sec
 
 #meditation
 
+⭐⭐⭐
 
 
-#finance/bank1:-2.8USD
+#finance/bank1:-2.3USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
 
-weightlifting: 15
+weightlifting: 11
 
-dataviewTarget:: 64
-- Make Progress:: 28
-- Make-Progress:: 84
-dataviewTarget1:: 64/28
-dataviewTarget2:: 28 @ 84
-dataviewTarget3:: 28, 84
+dataviewTarget:: 91
+- Make Progress:: 23
+- Make-Progress:: 54
+dataviewTarget1:: 91/23
+dataviewTarget2:: 23 @ 54
+dataviewTarget3:: 23, 54
 
 #sin:0.40674/0.20791/0.00000/-0.20791/-0.40674/-0.58779/-0.74314/-0.86603/-0.95106
 
diff --git a/examples/diary/2021-01-15.md b/examples/diary/2021-01-15.md
index 9c2cf67..57514b8 100644
--- a/examples/diary/2021-01-15.md
+++ b/examples/diary/2021-01-15.md
@@ -1,37 +1,38 @@
 ---
 tags: work_log
-mood: 2
-bloodpressure: 171/115
-bloodpressure1: 171, 115
-bloodpressure2: [171, 115]
-clock-in: 9:41
-clock-out: 16:9
-sleep: 9:13 pm/5:51 am
+mood: 5
+bloodpressure: 175/117
+bloodpressure1: 175, 117
+bloodpressure2: [175, 117]
+clock-in: 8:53
+clock-out: 17:19
+sleep: 9:40 pm/7:25 am
 ---
 
-#weight:79.0kg
+#weight:72.8kg
 
-#exercise-pushup:39
-#exercise-plank:38sec
+#exercise-pushup:47
+#exercise-plank:63sec
 
-#meditation
 
-⭐⭐⭐⭐⭐
+⭐
 
-#finance/bank1:-2.9USD
+
+#finance/bank1:-2.7USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
 obsidian-tracker+1@gmail.com
 
+weightlifting: 11
 
-dataviewTarget:: 68
-- Make Progress:: 47
-- Make-Progress:: 71
-dataviewTarget1:: 68/47
-dataviewTarget2:: 47 @ 71
-dataviewTarget3:: 47, 71
+dataviewTarget:: 89
+- Make Progress:: 21
+- Make-Progress:: 55
+dataviewTarget1:: 89/21
+dataviewTarget2:: 21 @ 55
+dataviewTarget3:: 21, 55
 
 #sin:0.20791/0.00000/-0.20791/-0.40674/-0.58779/-0.74314/-0.86603/-0.95106/-0.99452
 
diff --git a/examples/diary/2021-01-16.md b/examples/diary/2021-01-16.md
index 023d888..edc0e18 100644
--- a/examples/diary/2021-01-16.md
+++ b/examples/diary/2021-01-16.md
@@ -1,38 +1,39 @@
 ---
 tags: 
-mood: 7
-bloodpressure: 173.4/115.8
-bloodpressure1: 173.4, 115.8
-bloodpressure2: [173.4, 115.8]
-clock-in: 9:13
-clock-out: 17:19
-sleep: 9:33 pm/5:6 am
+mood: 9
+bloodpressure: 166.4/114.8
+bloodpressure1: 166.4, 114.8
+bloodpressure2: [166.4, 114.8]
+clock-in: 10:4
+clock-out: 18:20
+sleep: 10:40 pm/7:14 am
 ---
 
-#weight:70.1kg
+#weight:71.9kg
 
-#exercise-pushup:48
+#exercise-pushup:45
 #exercise-plank:69sec
 
 #meditation
 
-⭐⭐⭐⭐
+⭐⭐
 
-#finance/bank1:-2.3USD
+
+#finance/bank1:-2.1USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
 obsidian-tracker+1@gmail.com
 
-weightlifting: 15
+weightlifting: 10
 
-dataviewTarget:: 58
-- Make Progress:: 34
-- Make-Progress:: 91
-dataviewTarget1:: 58/34
-dataviewTarget2:: 34 @ 91
-dataviewTarget3:: 34, 91
+dataviewTarget:: 86
+- Make Progress:: 20
+- Make-Progress:: 63
+dataviewTarget1:: 86/20
+dataviewTarget2:: 20 @ 63
+dataviewTarget3:: 20, 63
 
 #sin:0.00000/-0.20791/-0.40674/-0.58779/-0.74314/-0.86603/-0.95106/-0.99452/-0.99452
 
diff --git a/examples/diary/2021-01-17.md b/examples/diary/2021-01-17.md
index e594e13..32a9ce7 100644
--- a/examples/diary/2021-01-17.md
+++ b/examples/diary/2021-01-17.md
@@ -1,39 +1,39 @@
 ---
 tags: 
-mood: 3
-bloodpressure: 170.8/117.6
-bloodpressure1: 170.8, 117.6
-bloodpressure2: [170.8, 117.6]
-clock-in: 9:27
-clock-out: 18:46
-sleep: 9:8 pm/6:15 am
+mood: 7
+bloodpressure: 165.8/117.6
+bloodpressure1: 165.8, 117.6
+bloodpressure2: [165.8, 117.6]
+clock-in: 10:48
+clock-out: 17:8
+sleep: 10:54 pm/6:3 am
 ---
 
-#weight:61.7kg
+#weight:79.8kg
 
-#exercise-pushup:34
-#exercise-plank:107sec
+#exercise-pushup:38
+#exercise-plank:79sec
 
-#meditation
 
-⭐
+⭐⭐⭐⭐
 
-#finance/bank1:-3.2USD
+
+#finance/bank1:-2.8USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
+obsidian-tracker@gmail.com
 obsidian-tracker+1@gmail.com
-obsidian-tracker@yahoo.com
 
-weightlifting: 18
+weightlifting: 13
 
-dataviewTarget:: 14
-- Make Progress:: 27
-- Make-Progress:: 96
-dataviewTarget1:: 14/27
-dataviewTarget2:: 27 @ 96
-dataviewTarget3:: 27, 96
+dataviewTarget:: 5
+- Make Progress:: 35
+- Make-Progress:: 50
+dataviewTarget1:: 5/35
+dataviewTarget2:: 35 @ 50
+dataviewTarget3:: 35, 50
 
 #sin:-0.20791/-0.40674/-0.58779/-0.74314/-0.86603/-0.95106/-0.99452/-0.99452/-0.95106
 
diff --git a/examples/diary/2021-01-18.md b/examples/diary/2021-01-18.md
index 6b772c6..2f387fd 100644
--- a/examples/diary/2021-01-18.md
+++ b/examples/diary/2021-01-18.md
@@ -1,38 +1,39 @@
 ---
 tags: work_log
-mood: 6
-bloodpressure: 164.2/118.4
-bloodpressure1: 164.2, 118.4
-bloodpressure2: [164.2, 118.4]
-clock-in: 9:32
-clock-out: 19:48
-sleep: 10:23 pm/7:38 am
+mood: 8
+bloodpressure: 165.2/114.4
+bloodpressure1: 165.2, 114.4
+bloodpressure2: [165.2, 114.4]
+clock-in: 9:50
+clock-out: 19:13
+sleep: 9:10 pm/5:3 am
 ---
 
-#weight:68.9kg
+#weight:61.2kg
 
-#exercise-pushup:35
-#exercise-plank:57sec
+#exercise-pushup:38
+#exercise-plank:73sec
 
-#meditation
 
-⭐⭐⭐⭐
+⭐⭐
 
-#finance/bank1:-2.0USD
+
+#finance/bank1:-2.9USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@gmail.com
+obsidian-tracker+1@gmail.com
+obsidian-tracker@yahoo.com
 
-weightlifting: 14
+weightlifting: 18
 
-dataviewTarget:: 73
-- Make Progress:: 11
-- Make-Progress:: 58
-dataviewTarget1:: 73/11
-dataviewTarget2:: 11 @ 58
-dataviewTarget3:: 11, 58
+dataviewTarget:: 67
+- Make Progress:: 41
+- Make-Progress:: 76
+dataviewTarget1:: 67/41
+dataviewTarget2:: 41 @ 76
+dataviewTarget3:: 41, 76
 
 #sin:-0.40674/-0.58779/-0.74314/-0.86603/-0.95106/-0.99452/-0.99452/-0.95106/-0.86603
 
diff --git a/examples/diary/2021-01-19.md b/examples/diary/2021-01-19.md
index b639039..6057d79 100644
--- a/examples/diary/2021-01-19.md
+++ b/examples/diary/2021-01-19.md
@@ -1,23 +1,24 @@
 ---
 tags: work_log
-mood: 2
-bloodpressure: 165.6/114.2
-bloodpressure1: 165.6, 114.2
-bloodpressure2: [165.6, 114.2]
-clock-in: 8:23
-clock-out: 18:42
-sleep: 10:30 pm/6:13 am
+mood: 1
+bloodpressure: 171.6/117.2
+bloodpressure1: 171.6, 117.2
+bloodpressure2: [171.6, 117.2]
+clock-in: 8:27
+clock-out: 19:38
+sleep: 11:7 pm/5:53 am
 ---
 
-#weight:78.6kg
+#weight:63.5kg
 
-#exercise-pushup:44
-#exercise-plank:98sec
+#exercise-pushup:46
+#exercise-plank:87sec
 
 
-⭐⭐⭐
 
-#finance/bank1:-3.6USD
+
+
+#finance/bank1:-3.7USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
@@ -25,14 +26,14 @@ sleep: 10:30 pm/6:13 am
 obsidian-tracker@gmail.com
 obsidian-tracker@yahoo.com
 
-weightlifting: 17
+weightlifting: 16
 
-dataviewTarget:: 46
-- Make Progress:: 38
-- Make-Progress:: 82
-dataviewTarget1:: 46/38
-dataviewTarget2:: 38 @ 82
-dataviewTarget3:: 38, 82
+dataviewTarget:: 4
+- Make Progress:: 11
+- Make-Progress:: 100
+dataviewTarget1:: 4/11
+dataviewTarget2:: 11 @ 100
+dataviewTarget3:: 11, 100
 
 #sin:-0.58779/-0.74314/-0.86603/-0.95106/-0.99452/-0.99452/-0.95106/-0.86603/-0.74314
 
diff --git a/examples/diary/2021-01-20.md b/examples/diary/2021-01-20.md
index 43c965e..6af17c5 100644
--- a/examples/diary/2021-01-20.md
+++ b/examples/diary/2021-01-20.md
@@ -1,38 +1,39 @@
 ---
 tags: work_log
-mood: 9
-bloodpressure: 164/115
-bloodpressure1: 164, 115
-bloodpressure2: [164, 115]
-clock-in: 10:10
-clock-out: 20:37
-sleep: 11:1 pm/5:51 am
+mood: 7
+bloodpressure: 169/114
+bloodpressure1: 169, 114
+bloodpressure2: [169, 114]
+clock-in: 9:57
+clock-out: 17:16
+sleep: 11:37 pm/6:33 am
 ---
 
-#weight:78.1kg
+#weight:64.3kg
 
-#exercise-pushup:34
-#exercise-plank:111sec
+#exercise-pushup:44
+#exercise-plank:45sec
 
 
-⭐⭐⭐
+⭐
 
-#finance/bank1:-2.1USD
+
+#finance/bank1:-2.4USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
+obsidian-tracker@gmail.com
 obsidian-tracker+1@gmail.com
-obsidian-tracker@yahoo.com
 
-weightlifting: 16
+weightlifting: 13
 
-dataviewTarget:: 44
-- Make Progress:: 48
-- Make-Progress:: 64
-dataviewTarget1:: 44/48
-dataviewTarget2:: 48 @ 64
-dataviewTarget3:: 48, 64
+dataviewTarget:: 82
+- Make Progress:: 21
+- Make-Progress:: 52
+dataviewTarget1:: 82/21
+dataviewTarget2:: 21 @ 52
+dataviewTarget3:: 21, 52
 
 #sin:-0.74314/-0.86603/-0.95106/-0.99452/-0.99452/-0.95106/-0.86603/-0.74314/-0.58779
 
diff --git a/examples/diary/2021-01-21.md b/examples/diary/2021-01-21.md
index 3c2b862..4aff3c6 100644
--- a/examples/diary/2021-01-21.md
+++ b/examples/diary/2021-01-21.md
@@ -1,38 +1,37 @@
 ---
 tags: work_log
-mood: 3
+mood: 4
 bloodpressure: 170.4/116.8
 bloodpressure1: 170.4, 116.8
 bloodpressure2: [170.4, 116.8]
-clock-in: 9:33
-clock-out: 17:41
-sleep: 9:30 pm/5:42 am
+clock-in: 10:13
+clock-out: 16:37
+sleep: 10:43 pm/5:10 am
 ---
 
-#weight:63.9kg
+#weight:80.1kg
 
-#exercise-pushup:42
-#exercise-plank:112sec
+#exercise-pushup:38
+#exercise-plank:37sec
 
-#meditation
 
-⭐
+⭐⭐
 
-#finance/bank1:-2.9USD
+
+#finance/bank1:-4.0USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@gmail.com
 
-weightlifting: 13
+weightlifting: 17
 
-dataviewTarget:: 76
-- Make Progress:: 38
-- Make-Progress:: 61
-dataviewTarget1:: 76/38
-dataviewTarget2:: 38 @ 61
-dataviewTarget3:: 38, 61
+dataviewTarget:: 56
+- Make Progress:: 50
+- Make-Progress:: 57
+dataviewTarget1:: 56/50
+dataviewTarget2:: 50 @ 57
+dataviewTarget3:: 50, 57
 
 #sin:-0.86603/-0.95106/-0.99452/-0.99452/-0.95106/-0.86603/-0.74314/-0.58779/-0.40674
 
diff --git a/examples/diary/2021-01-22.md b/examples/diary/2021-01-22.md
index 3065d02..0c7c474 100644
--- a/examples/diary/2021-01-22.md
+++ b/examples/diary/2021-01-22.md
@@ -1,40 +1,39 @@
 ---
 tags: work_log
-mood: 1
-bloodpressure: 167.8/114.6
-bloodpressure1: 167.8, 114.6
-bloodpressure2: [167.8, 114.6]
-clock-in: 10:9
-clock-out: 16:57
-sleep: 10:4 pm/7:24 am
+mood: 7
+bloodpressure: 167.8/116.6
+bloodpressure1: 167.8, 116.6
+bloodpressure2: [167.8, 116.6]
+clock-in: 8:35
+clock-out: 16:5
+sleep: 9:49 pm/6:38 am
 ---
 
-#weight:70.8kg
+#weight:60.2kg
 
-#exercise-pushup:50
-#exercise-plank:50sec
+#exercise-pushup:31
+#exercise-plank:46sec
 
 #meditation
 
-⭐⭐
+⭐⭐⭐⭐
 
-#finance/bank1:-3.4USD
+
+#finance/bank1:-2.7USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@gmail.com
 obsidian-tracker+1@gmail.com
-obsidian-tracker@yahoo.com
 
-weightlifting: 11
+weightlifting: 15
 
-dataviewTarget:: 63
-- Make Progress:: 33
-- Make-Progress:: 58
-dataviewTarget1:: 63/33
-dataviewTarget2:: 33 @ 58
-dataviewTarget3:: 33, 58
+dataviewTarget:: 48
+- Make Progress:: 32
+- Make-Progress:: 55
+dataviewTarget1:: 48/32
+dataviewTarget2:: 32 @ 55
+dataviewTarget3:: 32, 55
 
 #sin:-0.95106/-0.99452/-0.99452/-0.95106/-0.86603/-0.74314/-0.58779/-0.40674/-0.20791
 
diff --git a/examples/diary/2021-01-23.md b/examples/diary/2021-01-23.md
index 42ec814..35b0478 100644
--- a/examples/diary/2021-01-23.md
+++ b/examples/diary/2021-01-23.md
@@ -1,37 +1,41 @@
 ---
 tags: 
-mood: 6
-bloodpressure: 162.2/113.4
-bloodpressure1: 162.2, 113.4
-bloodpressure2: [162.2, 113.4]
-clock-in: 8:49
-clock-out: 19:38
-sleep: 9:5 pm/5:21 am
+mood: 4
+bloodpressure: 171.2/116.4
+bloodpressure1: 171.2, 116.4
+bloodpressure2: [171.2, 116.4]
+clock-in: 9:38
+clock-out: 19:23
+sleep: 11:8 pm/5:50 am
 ---
 
-#weight:76.1kg
+#weight:73.9kg
 
-#exercise-pushup:31
-#exercise-plank:62sec
+#exercise-pushup:48
+#exercise-plank:104sec
 
 #meditation
 
-⭐⭐⭐⭐
+⭐⭐
 
-#finance/bank1:-3.0USD
+
+#finance/bank1:-2.8USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
+obsidian-tracker@gmail.com
 obsidian-tracker+1@gmail.com
+obsidian-tracker@yahoo.com
 
+weightlifting: 18
 
-dataviewTarget:: 34
-- Make Progress:: 49
-- Make-Progress:: 86
-dataviewTarget1:: 34/49
-dataviewTarget2:: 49 @ 86
-dataviewTarget3:: 49, 86
+dataviewTarget:: 57
+- Make Progress:: 21
+- Make-Progress:: 61
+dataviewTarget1:: 57/21
+dataviewTarget2:: 21 @ 61
+dataviewTarget3:: 21, 61
 
 #sin:-0.99452/-0.99452/-0.95106/-0.86603/-0.74314/-0.58779/-0.40674/-0.20791/-0.00000
 
diff --git a/examples/diary/2021-01-24.md b/examples/diary/2021-01-24.md
index c03e46f..e82e8f2 100644
--- a/examples/diary/2021-01-24.md
+++ b/examples/diary/2021-01-24.md
@@ -1,39 +1,39 @@
 ---
 tags: 
-mood: 5
-bloodpressure: 167.6/116.2
-bloodpressure1: 167.6, 116.2
-bloodpressure2: [167.6, 116.2]
-clock-in: 9:50
-clock-out: 16:12
-sleep: 11:39 pm/7:48 am
+mood: 3
+bloodpressure: 169.6/114.2
+bloodpressure1: 169.6, 114.2
+bloodpressure2: [169.6, 114.2]
+clock-in: 8:46
+clock-out: 20:12
+sleep: 10:38 pm/7:16 am
 ---
 
-#weight:70.5kg
+#weight:63.7kg
 
-#exercise-pushup:37
-#exercise-plank:104sec
+#exercise-pushup:31
+#exercise-plank:59sec
 
 #meditation
 
-⭐⭐⭐
 
-#finance/bank1:-3.3USD
+
+
+#finance/bank1:-2.2USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@gmail.com
-obsidian-tracker+1@gmail.com
+obsidian-tracker@yahoo.com
 
-weightlifting: 16
+weightlifting: 18
 
-dataviewTarget:: 23
-- Make Progress:: 10
-- Make-Progress:: 92
-dataviewTarget1:: 23/10
-dataviewTarget2:: 10 @ 92
-dataviewTarget3:: 10, 92
+dataviewTarget:: 62
+- Make Progress:: 26
+- Make-Progress:: 68
+dataviewTarget1:: 62/26
+dataviewTarget2:: 26 @ 68
+dataviewTarget3:: 26, 68
 
 #sin:-0.99452/-0.95106/-0.86603/-0.74314/-0.58779/-0.40674/-0.20791/-0.00000/0.20791
 
diff --git a/examples/diary/2021-01-25.md b/examples/diary/2021-01-25.md
index 35ac46f..f730597 100644
--- a/examples/diary/2021-01-25.md
+++ b/examples/diary/2021-01-25.md
@@ -1,38 +1,39 @@
 ---
 tags: work_log
-mood: 3
-bloodpressure: 160/116
-bloodpressure1: 160, 116
-bloodpressure2: [160, 116]
-clock-in: 10:12
-clock-out: 19:38
-sleep: 11:16 pm/5:5 am
+mood: 2
+bloodpressure: 167/115
+bloodpressure1: 167, 115
+bloodpressure2: [167, 115]
+clock-in: 8:20
+clock-out: 20:35
+sleep: 11:46 pm/6:22 am
 ---
 
-#weight:66.8kg
+#weight:71.9kg
 
-#exercise-pushup:37
-#exercise-plank:31sec
+#exercise-pushup:35
+#exercise-plank:46sec
 
+#meditation
 
+⭐⭐
 
 
-#finance/bank1:-2.0USD
+#finance/bank1:-3.1USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
+obsidian-tracker@gmail.com
 obsidian-tracker+1@gmail.com
-obsidian-tracker@yahoo.com
 
-weightlifting: 16
 
-dataviewTarget:: 52
-- Make Progress:: 18
-- Make-Progress:: 58
-dataviewTarget1:: 52/18
-dataviewTarget2:: 18 @ 58
-dataviewTarget3:: 18, 58
+dataviewTarget:: 21
+- Make Progress:: 1
+- Make-Progress:: 77
+dataviewTarget1:: 21/1
+dataviewTarget2:: 1 @ 77
+dataviewTarget3:: 1, 77
 
 #sin:-0.95106/-0.86603/-0.74314/-0.58779/-0.40674/-0.20791/-0.00000/0.20791/0.40674
 
diff --git a/examples/diary/2021-01-26.md b/examples/diary/2021-01-26.md
index 1a0ed93..4321670 100644
--- a/examples/diary/2021-01-26.md
+++ b/examples/diary/2021-01-26.md
@@ -1,38 +1,39 @@
 ---
 tags: work_log
-mood: 7
-bloodpressure: 164.4/113.8
-bloodpressure1: 164.4, 113.8
-bloodpressure2: [164.4, 113.8]
-clock-in: 9:49
-clock-out: 18:41
-sleep: 11:25 pm/6:33 am
+mood: 2
+bloodpressure: 162.4/116.8
+bloodpressure1: 162.4, 116.8
+bloodpressure2: [162.4, 116.8]
+clock-in: 8:33
+clock-out: 17:11
+sleep: 10:9 pm/5:42 am
 ---
 
-#weight:65.8kg
+#weight:63.4kg
 
-#exercise-pushup:33
-#exercise-plank:54sec
+#exercise-pushup:44
+#exercise-plank:107sec
 
 #meditation
 
-⭐⭐
+⭐⭐⭐
 
-#finance/bank1:-3.1USD
+
+#finance/bank1:-3.9USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
 obsidian-tracker@gmail.com
-obsidian-tracker+1@gmail.com
 
+weightlifting: 19
 
-dataviewTarget:: 21
-- Make Progress:: 1
-- Make-Progress:: 77
-dataviewTarget1:: 21/1
-dataviewTarget2:: 1 @ 77
-dataviewTarget3:: 1, 77
+dataviewTarget:: 71
+- Make Progress:: 14
+- Make-Progress:: 83
+dataviewTarget1:: 71/14
+dataviewTarget2:: 14 @ 83
+dataviewTarget3:: 14, 83
 
 #sin:-0.86603/-0.74314/-0.58779/-0.40674/-0.20791/-0.00000/0.20791/0.40674/0.58779
 
diff --git a/examples/diary/2021-01-27.md b/examples/diary/2021-01-27.md
index 497e800..8624562 100644
--- a/examples/diary/2021-01-27.md
+++ b/examples/diary/2021-01-27.md
@@ -1,39 +1,39 @@
 ---
 tags: work_log
-mood: 2
-bloodpressure: 161.8/116.6
-bloodpressure1: 161.8, 116.6
-bloodpressure2: [161.8, 116.6]
-clock-in: 8:33
-clock-out: 17:11
-sleep: 10:9 pm/5:42 am
+mood: 9
+bloodpressure: 160.8/116.6
+bloodpressure1: 160.8, 116.6
+bloodpressure2: [160.8, 116.6]
+clock-in: 9:53
+clock-out: 17:3
+sleep: 11:6 pm/5:52 am
 ---
 
-#weight:63.4kg
+#weight:79.1kg
 
-#exercise-pushup:44
-#exercise-plank:107sec
+#exercise-pushup:32
+#exercise-plank:102sec
 
-#meditation
 
-⭐⭐⭐
+⭐
 
-#finance/bank1:-2.2USD
+
+#finance/bank1:-2.9USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
 obsidian-tracker@gmail.com
-obsidian-tracker+1@gmail.com
+obsidian-tracker@yahoo.com
 
 weightlifting: 12
 
-dataviewTarget:: 85
-- Make Progress:: 36
-- Make-Progress:: 64
-dataviewTarget1:: 85/36
-dataviewTarget2:: 36 @ 64
-dataviewTarget3:: 36, 64
+dataviewTarget:: 71
+- Make Progress:: 13
+- Make-Progress:: 66
+dataviewTarget1:: 71/13
+dataviewTarget2:: 13 @ 66
+dataviewTarget3:: 13, 66
 
 #sin:-0.74314/-0.58779/-0.40674/-0.20791/-0.00000/0.20791/0.40674/0.58779/0.74314
 
diff --git a/examples/diary/2021-01-28.md b/examples/diary/2021-01-28.md
index 252566c..0d35093 100644
--- a/examples/diary/2021-01-28.md
+++ b/examples/diary/2021-01-28.md
@@ -1,38 +1,39 @@
 ---
 tags: work_log
-mood: 7
-bloodpressure: 167.2/113.4
-bloodpressure1: 167.2, 113.4
-bloodpressure2: [167.2, 113.4]
-clock-in: 10:24
-clock-out: 20:21
-sleep: 9:48 pm/5:2 am
+mood: 6
+bloodpressure: 166.2/114.4
+bloodpressure1: 166.2, 114.4
+bloodpressure2: [166.2, 114.4]
+clock-in: 9:12
+clock-out: 19:36
+sleep: 10:2 pm/7:36 am
 ---
 
-#weight:78.5kg
+#weight:72.2kg
 
 #exercise-pushup:49
-#exercise-plank:40sec
+#exercise-plank:68sec
 
+#meditation
 
-⭐⭐⭐⭐
+⭐⭐
 
-#finance/bank1:-2.5USD
+
+#finance/bank1:-2.6USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@gmail.com
-obsidian-tracker@yahoo.com
+obsidian-tracker+1@gmail.com
 
-weightlifting: 10
+weightlifting: 11
 
-dataviewTarget:: 24
-- Make Progress:: 46
-- Make-Progress:: 85
-dataviewTarget1:: 24/46
-dataviewTarget2:: 46 @ 85
-dataviewTarget3:: 46, 85
+dataviewTarget:: 39
+- Make Progress:: 43
+- Make-Progress:: 76
+dataviewTarget1:: 39/43
+dataviewTarget2:: 43 @ 76
+dataviewTarget3:: 43, 76
 
 #sin:-0.58779/-0.40674/-0.20791/-0.00000/0.20791/0.40674/0.58779/0.74314/0.86603
 
diff --git a/examples/diary/2021-01-29.md b/examples/diary/2021-01-29.md
index 0adad37..8cfa359 100644
--- a/examples/diary/2021-01-29.md
+++ b/examples/diary/2021-01-29.md
@@ -1,37 +1,38 @@
 ---
 tags: work_log
-mood: 3
-bloodpressure: 160.6/114.2
-bloodpressure1: 160.6, 114.2
-bloodpressure2: [160.6, 114.2]
-clock-in: 10:24
-clock-out: 19:12
-sleep: 11:36 pm/6:2 am
+mood: 4
+bloodpressure: 164.6/113.2
+bloodpressure1: 164.6, 113.2
+bloodpressure2: [164.6, 113.2]
+clock-in: 10:28
+clock-out: 18:4
+sleep: 11:34 pm/6:12 am
 ---
 
-#weight:75.2kg
+#weight:76.3kg
 
-#exercise-pushup:42
-#exercise-plank:82sec
+#exercise-pushup:33
+#exercise-plank:100sec
 
+#meditation
 
-⭐⭐
+⭐
 
-#finance/bank1:-2.6USD
+
+#finance/bank1:-2.3USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker+1@gmail.com
 
-weightlifting: 11
+weightlifting: 18
 
-dataviewTarget:: 21
-- Make Progress:: 7
-- Make-Progress:: 71
-dataviewTarget1:: 21/7
-dataviewTarget2:: 7 @ 71
-dataviewTarget3:: 7, 71
+dataviewTarget:: 54
+- Make Progress:: 29
+- Make-Progress:: 81
+dataviewTarget1:: 54/29
+dataviewTarget2:: 29 @ 81
+dataviewTarget3:: 29, 81
 
 #sin:-0.40674/-0.20791/-0.00000/0.20791/0.40674/0.58779/0.74314/0.86603/0.95106
 
diff --git a/examples/diary/2021-01-30.md b/examples/diary/2021-01-30.md
index e22783e..e7f7c71 100644
--- a/examples/diary/2021-01-30.md
+++ b/examples/diary/2021-01-30.md
@@ -1,23 +1,24 @@
 ---
 tags: 
 mood: 4
-bloodpressure: 166/114
-bloodpressure1: 166, 114
-bloodpressure2: [166, 114]
-clock-in: 9:41
-clock-out: 17:53
-sleep: 10:28 pm/5:58 am
+bloodpressure: 163/112
+bloodpressure1: 163, 112
+bloodpressure2: [163, 112]
+clock-in: 8:39
+clock-out: 20:44
+sleep: 9:41 pm/6:27 am
 ---
 
-#weight:72.2kg
+#weight:60.1kg
 
-#exercise-pushup:40
-#exercise-plank:49sec
+#exercise-pushup:33
+#exercise-plank:102sec
 
 
 ⭐
 
-#finance/bank1:-3.5USD
+
+#finance/bank1:-3.2USD
 #finance/bank2:200USD
 #finance/bank2/transfer:-100USD
 #finance/bank1/transfer:100USD
@@ -27,13 +28,14 @@ sleep: 10:28 pm/5:58 am
 
 obsidian-tracker@yahoo.com
 
+weightlifting: 19
 
-dataviewTarget:: 26
-- Make Progress:: 5
-- Make-Progress:: 87
-dataviewTarget1:: 26/5
-dataviewTarget2:: 5 @ 87
-dataviewTarget3:: 5, 87
+dataviewTarget:: 99
+- Make Progress:: 38
+- Make-Progress:: 64
+dataviewTarget1:: 99/38
+dataviewTarget2:: 38 @ 64
+dataviewTarget3:: 38, 64
 
 #sin:-0.20791/-0.00000/0.20791/0.40674/0.58779/0.74314/0.86603/0.95106/0.99452
 
diff --git a/examples/diary/2021-01-31.md b/examples/diary/2021-01-31.md
index ace81d2..dfa3907 100644
--- a/examples/diary/2021-01-31.md
+++ b/examples/diary/2021-01-31.md
@@ -1,39 +1,38 @@
 ---
 tags: 
-mood: 2
-bloodpressure: 161.4/113.8
-bloodpressure1: 161.4, 113.8
-bloodpressure2: [161.4, 113.8]
-clock-in: 9:21
-clock-out: 19:7
-sleep: 9:39 pm/7:44 am
+mood: 4
+bloodpressure: 163.4/115.8
+bloodpressure1: 163.4, 115.8
+bloodpressure2: [163.4, 115.8]
+clock-in: 9:44
+clock-out: 18:10
+sleep: 9:19 pm/5:35 am
 ---
 
-#weight:63.7kg
+#weight:78.1kg
 
-#exercise-pushup:44
-#exercise-plank:85sec
+#exercise-pushup:46
+#exercise-plank:74sec
 
-#meditation
 
+⭐
 
 
-#finance/bank1:-2.4USD
+#finance/bank1:-3.2USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@gmail.com
 obsidian-tracker+1@gmail.com
 
-weightlifting: 17
+weightlifting: 20
 
-dataviewTarget:: 15
-- Make Progress:: 25
-- Make-Progress:: 98
-dataviewTarget1:: 15/25
-dataviewTarget2:: 25 @ 98
-dataviewTarget3:: 25, 98
+dataviewTarget:: 6
+- Make Progress:: 2
+- Make-Progress:: 89
+dataviewTarget1:: 6/2
+dataviewTarget2:: 2 @ 89
+dataviewTarget3:: 2, 89
 
 #sin:-0.00000/0.20791/0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452
 
diff --git a/examples/example_generator.ts b/examples/example_generator.ts
index 7aa3294..6320e92 100644
--- a/examples/example_generator.ts
+++ b/examples/example_generator.ts
@@ -144,6 +144,15 @@ for (
 
     content += "\n";
 
+    // clean up
+    let tagCleanUp = "#clean-up";
+    let doCleanUp = randomIntFromInterval(0, 30);
+    if (doCleanUp === 1) {
+        content += tagCleanUp + "\n";
+    }
+
+    content += "\n";
+
     // finance
     let tagFinanceBank1 = "#finance/bank1";
     let tagFinanceBank2 = "#finance/bank2";
diff --git a/src/rendering.ts b/src/rendering.ts
index 286acd3..46fa7ac 100644
--- a/src/rendering.ts
+++ b/src/rendering.ts
@@ -1538,7 +1538,7 @@ let fnSet = {
         }
         return maxStreak;
     },
-    maxBreak: function (renderInfo: RenderInfo, datasetId: number) {
+    maxBreaks: function (renderInfo: RenderInfo, datasetId: number) {
         let streak = 0;
         let maxBreak = 0;
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
@@ -1569,6 +1569,20 @@ let fnSet = {
         }
         return streak;
     },
+    lastBreaks: function (renderInfo: RenderInfo, datasetId: number) {
+        let breakDays = 0;
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        let values = dataset.getValues();
+        for (let ind = values.length - 1; ind >= 0; ind--) {
+            let value = values[ind];
+            if (value === null) {
+                breakDays++;
+            } else {
+                break;
+            }
+        }
+        return breakDays;
+    },
     average: function (renderInfo: RenderInfo, datasetId: number) {
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
         let countNotNull = dataset.getLengthNotNull();

From a1bd5c464492503974fef58eb7978bc5afeece1f Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 24 May 2021 18:31:37 +0800
Subject: [PATCH 008/402] Refactoring

---
 src/rendering.ts | 261 +----------------------------------------------
 src/summary.ts   | 257 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 259 insertions(+), 259 deletions(-)
 create mode 100644 src/summary.ts

diff --git a/src/rendering.ts b/src/rendering.ts
index 46fa7ac..b28683d 100644
--- a/src/rendering.ts
+++ b/src/rendering.ts
@@ -4,14 +4,12 @@ import {
     DataPoint,
     RenderInfo,
     Dataset,
-    LineInfo,
-    BarInfo,
     Size,
     Transform,
-    CommonChartInfo,
     ChartElements,
     OutputType,
 } from "./data";
+import * as summary from './summary';
 
 function getTickInterval(datasets: Datasets) {
     let tickInterval;
@@ -122,7 +120,7 @@ export function render(canvas: HTMLElement, renderInfo: RenderInfo) {
         case OutputType.Bar:
             return renderBarChart(canvas, renderInfo);
         case OutputType.Summary:
-            return renderSummary(canvas, renderInfo);
+            return summary.renderSummary(canvas, renderInfo);
         default:
             return "Unknown output type";
     }
@@ -1496,261 +1494,6 @@ function renderBarChart(canvas: HTMLElement, renderInfo: RenderInfo) {
     setChartScale(canvas, chartElements, renderInfo);
 }
 
-function checkSummaryTemplateValid(summaryTemplate: string): boolean {
-    return true;
-}
-
-let fnSet = {
-    min: function (renderInfo: RenderInfo, datasetId: number) {
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
-        return d3.min(dataset.getValues());
-    },
-    max: function (renderInfo: RenderInfo, datasetId: number) {
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
-        return d3.max(dataset.getValues());
-    },
-    sum: function (renderInfo: RenderInfo, datasetId: number) {
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
-        return d3.sum(dataset.getValues());
-    },
-    count: function (renderInfo: RenderInfo, datasetId: number) {
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
-        return dataset.getLengthNotNull();
-    },
-    days: function (renderInfo: RenderInfo, datasetId: number) {
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
-        let result = dataset.getLength();
-        return result;
-    },
-    maxStreak: function (renderInfo: RenderInfo, datasetId: number) {
-        let streak = 0;
-        let maxStreak = 0;
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
-        for (let dataPoint of dataset) {
-            if (dataPoint.value !== null) {
-                streak++;
-            } else {
-                streak = 0;
-            }
-            if (streak > maxStreak) {
-                maxStreak = streak;
-            }
-        }
-        return maxStreak;
-    },
-    maxBreaks: function (renderInfo: RenderInfo, datasetId: number) {
-        let streak = 0;
-        let maxBreak = 0;
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
-
-        for (let dataPoint of dataset) {
-            if (dataPoint.value === null) {
-                streak++;
-            } else {
-                streak = 0;
-            }
-            if (streak > maxBreak) {
-                maxBreak = streak;
-            }
-        }
-        return maxBreak;
-    },
-    lastStreak: function (renderInfo: RenderInfo, datasetId: number) {
-        let streak = 0;
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
-        let values = dataset.getValues();
-        for (let ind = values.length - 1; ind >= 0; ind--) {
-            let value = values[ind];
-            if (value === null) {
-                break;
-            } else {
-                streak++;
-            }
-        }
-        return streak;
-    },
-    lastBreaks: function (renderInfo: RenderInfo, datasetId: number) {
-        let breakDays = 0;
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
-        let values = dataset.getValues();
-        for (let ind = values.length - 1; ind >= 0; ind--) {
-            let value = values[ind];
-            if (value === null) {
-                breakDays++;
-            } else {
-                break;
-            }
-        }
-        return breakDays;
-    },
-    average: function (renderInfo: RenderInfo, datasetId: number) {
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
-        let countNotNull = dataset.getLengthNotNull();
-        if (countNotNull > 0) {
-            let sum = d3.sum(dataset.getValues());
-            return sum / countNotNull;
-        }
-        return null;
-    },
-    median: function (renderInfo: RenderInfo, datasetId: number) {
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
-        return d3.median(dataset.getValues());
-    },
-    variance: function (renderInfo: RenderInfo, datasetId: number) {
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
-        return d3.variance(dataset.getValues());
-    },
-};
-
-function renderSummary(canvas: HTMLElement, renderInfo: RenderInfo) {
-    // console.log("renderSummary");
-    // console.log(renderInfo);
-    if (renderInfo.summary === null) return;
-
-    let outputSummary = "";
-    if (checkSummaryTemplateValid(renderInfo.summary.template)) {
-        outputSummary = renderInfo.summary.template;
-    } else {
-        return "Invalid summary template";
-    }
-
-    let replaceMap: { [key: string]: string } = {};
-    // Loop over fnSet, prepare replaceMap
-    Object.entries(fnSet).forEach(([fnName, fn]) => {
-        // {{\s*max(\(\s*Dataset\(\s*(?<datasetId>\d+)\s*\)\s*\))?\s*}}
-        let strRegex =
-            "{{\\s*" +
-            fnName +
-            "(\\(\\s*Dataset\\(\\s*((?<datasetId>\\d+)|(?<datasetName>\\w+))\\s*\\)\\s*\\))?\\s*}}";
-        // console.log(strRegex);
-        let regex = new RegExp(strRegex, "gm");
-        let match;
-        while ((match = regex.exec(outputSummary))) {
-            // console.log(match);
-            if (typeof match.groups !== "undefined") {
-                if (typeof match.groups.datasetId !== "undefined") {
-                    let datasetId = parseInt(match.groups.datasetId);
-                    // console.log(datasetId);
-                    if (Number.isInteger(datasetId)) {
-                        let strReplaceRegex =
-                            "{{\\s*" +
-                            fnName +
-                            "(\\(\\s*Dataset\\(\\s*" +
-                            datasetId.toString() +
-                            "\\s*\\)\\s*\\))?\\s*}}";
-
-                        if (!(strReplaceRegex in replaceMap)) {
-                            let result = fn(renderInfo, datasetId); // calculate result
-                            let strResult = "{{NA}}";
-                            if (
-                                typeof result !== "undefined" &&
-                                result !== null
-                            ) {
-                                if (Number.isInteger(result)) {
-                                    strResult = result.toFixed(0);
-                                } else {
-                                    strResult = result.toFixed(2);
-                                }
-                            }
-
-                            replaceMap[strReplaceRegex] = strResult;
-                        }
-                    }
-                } else if (typeof match.groups.datasetName !== "undefined") {
-                    let datasetName = match.groups.datasetName;
-                    // console.log(datasetName);
-                    let strReplaceRegex =
-                        "{{\\s*" +
-                        fnName +
-                        "(\\(\\s*Dataset\\(\\s*" +
-                        datasetName +
-                        "\\s*\\)\\s*\\))?\\s*}}";
-
-                    let datasetId = renderInfo.datasetName.indexOf(datasetName);
-                    // console.log(datasetName);
-                    // console.log(renderInfo.datasetName);
-                    // console.log(datasetId);
-                    if (!(strReplaceRegex in replaceMap)) {
-                        let strResult = "{{NA}}";
-                        if (datasetId >= 0) {
-                            let result = fn(renderInfo, datasetId); // calculate result
-                            if (
-                                typeof result !== "undefined" &&
-                                result !== null
-                            ) {
-                                if (Number.isInteger(result)) {
-                                    strResult = result.toFixed(0);
-                                } else {
-                                    strResult = result.toFixed(2);
-                                }
-                            }
-                        }
-                        replaceMap[strReplaceRegex] = strResult;
-                    }
-                } else {
-                    // no datasetId assigned use id 0
-                    // console.log("{{" + fnName + "}}")
-                    let strReplaceRegex = "{{\\s*" + fnName + "\\s*}}";
-                    if (!(strReplaceRegex in replaceMap)) {
-                        let result = fn(renderInfo, 0); // calculate result
-                        let strResult = "{{NA}}";
-                        if (typeof result !== "undefined" && result !== null) {
-                            if (Number.isInteger(result)) {
-                                strResult = result.toFixed(0);
-                            } else {
-                                strResult = result.toFixed(2);
-                            }
-                        }
-
-                        replaceMap[strReplaceRegex] = strResult;
-                    }
-                }
-            } else {
-                // groups undefined
-                // no datasetId assigned use id 0
-                // console.log("{{" + fnName + "}}")
-                let strReplaceRegex = "{{\\s*" + fnName + "\\s*}}";
-                if (!(strReplaceRegex in replaceMap)) {
-                    let result = fn(renderInfo, 0); // calculate result
-                    let strResult = "{{NA}}";
-                    if (typeof result !== "undefined" && result !== null) {
-                        if (Number.isInteger(result)) {
-                            strResult = result.toFixed(0);
-                        } else {
-                            strResult = result.toFixed(2);
-                        }
-                    }
-
-                    replaceMap[strReplaceRegex] = strResult;
-                }
-            }
-        }
-    });
-    // console.log(replaceMap);
-    // Do replace
-    for (let strReplaceRegex in replaceMap) {
-        let strResult = replaceMap[strReplaceRegex];
-        let regex = new RegExp(strReplaceRegex, "gi");
-        outputSummary = outputSummary.replace(regex, strResult);
-    }
-
-    if (outputSummary !== "") {
-        let textBlock = d3.select(canvas).append("div");
-        if (outputSummary.includes("\n")) {
-            let outputLines = outputSummary.split("\n");
-            for (let outputLine of outputLines) {
-                textBlock.append("div").text(outputLine);
-            }
-        } else {
-            textBlock.text(outputSummary);
-        }
-
-        if (renderInfo.summary.style !== "") {
-            textBlock.attr("style", renderInfo.summary.style);
-        }
-    }
-}
-
 export function renderErrorMessage(canvas: HTMLElement, errorMessage: string) {
     let svg = d3
         .select(canvas)
diff --git a/src/summary.ts b/src/summary.ts
new file mode 100644
index 0000000..3de3821
--- /dev/null
+++ b/src/summary.ts
@@ -0,0 +1,257 @@
+import * as d3 from "d3";
+import { RenderInfo } from "./data";
+
+function checkSummaryTemplateValid(summaryTemplate: string): boolean {
+    return true;
+}
+
+let fnSet = {
+    min: function (renderInfo: RenderInfo, datasetId: number) {
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        return d3.min(dataset.getValues());
+    },
+    max: function (renderInfo: RenderInfo, datasetId: number) {
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        return d3.max(dataset.getValues());
+    },
+    sum: function (renderInfo: RenderInfo, datasetId: number) {
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        return d3.sum(dataset.getValues());
+    },
+    count: function (renderInfo: RenderInfo, datasetId: number) {
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        return dataset.getLengthNotNull();
+    },
+    days: function (renderInfo: RenderInfo, datasetId: number) {
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        let result = dataset.getLength();
+        return result;
+    },
+    maxStreak: function (renderInfo: RenderInfo, datasetId: number) {
+        let streak = 0;
+        let maxStreak = 0;
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        for (let dataPoint of dataset) {
+            if (dataPoint.value !== null) {
+                streak++;
+            } else {
+                streak = 0;
+            }
+            if (streak > maxStreak) {
+                maxStreak = streak;
+            }
+        }
+        return maxStreak;
+    },
+    maxBreaks: function (renderInfo: RenderInfo, datasetId: number) {
+        let streak = 0;
+        let maxBreak = 0;
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+
+        for (let dataPoint of dataset) {
+            if (dataPoint.value === null) {
+                streak++;
+            } else {
+                streak = 0;
+            }
+            if (streak > maxBreak) {
+                maxBreak = streak;
+            }
+        }
+        return maxBreak;
+    },
+    lastStreak: function (renderInfo: RenderInfo, datasetId: number) {
+        let streak = 0;
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        let values = dataset.getValues();
+        for (let ind = values.length - 1; ind >= 0; ind--) {
+            let value = values[ind];
+            if (value === null) {
+                break;
+            } else {
+                streak++;
+            }
+        }
+        return streak;
+    },
+    lastBreaks: function (renderInfo: RenderInfo, datasetId: number) {
+        let breakDays = 0;
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        let values = dataset.getValues();
+        for (let ind = values.length - 1; ind >= 0; ind--) {
+            let value = values[ind];
+            if (value === null) {
+                breakDays++;
+            } else {
+                break;
+            }
+        }
+        return breakDays;
+    },
+    average: function (renderInfo: RenderInfo, datasetId: number) {
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        let countNotNull = dataset.getLengthNotNull();
+        if (countNotNull > 0) {
+            let sum = d3.sum(dataset.getValues());
+            return sum / countNotNull;
+        }
+        return null;
+    },
+    median: function (renderInfo: RenderInfo, datasetId: number) {
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        return d3.median(dataset.getValues());
+    },
+    variance: function (renderInfo: RenderInfo, datasetId: number) {
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        return d3.variance(dataset.getValues());
+    },
+};
+
+export function renderSummary(canvas: HTMLElement, renderInfo: RenderInfo) {
+    // console.log("renderSummary");
+    // console.log(renderInfo);
+    if (renderInfo.summary === null) return;
+
+    let outputSummary = "";
+    if (checkSummaryTemplateValid(renderInfo.summary.template)) {
+        outputSummary = renderInfo.summary.template;
+    } else {
+        return "Invalid summary template";
+    }
+
+    let replaceMap: { [key: string]: string } = {};
+    // Loop over fnSet, prepare replaceMap
+    Object.entries(fnSet).forEach(([fnName, fn]) => {
+        // {{\s*max(\(\s*Dataset\(\s*(?<datasetId>\d+)\s*\)\s*\))?\s*}}
+        let strRegex =
+            "{{\\s*" +
+            fnName +
+            "(\\(\\s*Dataset\\(\\s*((?<datasetId>\\d+)|(?<datasetName>\\w+))\\s*\\)\\s*\\))?\\s*}}";
+        // console.log(strRegex);
+        let regex = new RegExp(strRegex, "gm");
+        let match;
+        while ((match = regex.exec(outputSummary))) {
+            // console.log(match);
+            if (typeof match.groups !== "undefined") {
+                if (typeof match.groups.datasetId !== "undefined") {
+                    let datasetId = parseInt(match.groups.datasetId);
+                    // console.log(datasetId);
+                    if (Number.isInteger(datasetId)) {
+                        let strReplaceRegex =
+                            "{{\\s*" +
+                            fnName +
+                            "(\\(\\s*Dataset\\(\\s*" +
+                            datasetId.toString() +
+                            "\\s*\\)\\s*\\))?\\s*}}";
+
+                        if (!(strReplaceRegex in replaceMap)) {
+                            let result = fn(renderInfo, datasetId); // calculate result
+                            let strResult = "{{NA}}";
+                            if (
+                                typeof result !== "undefined" &&
+                                result !== null
+                            ) {
+                                if (Number.isInteger(result)) {
+                                    strResult = result.toFixed(0);
+                                } else {
+                                    strResult = result.toFixed(2);
+                                }
+                            }
+
+                            replaceMap[strReplaceRegex] = strResult;
+                        }
+                    }
+                } else if (typeof match.groups.datasetName !== "undefined") {
+                    let datasetName = match.groups.datasetName;
+                    // console.log(datasetName);
+                    let strReplaceRegex =
+                        "{{\\s*" +
+                        fnName +
+                        "(\\(\\s*Dataset\\(\\s*" +
+                        datasetName +
+                        "\\s*\\)\\s*\\))?\\s*}}";
+
+                    let datasetId = renderInfo.datasetName.indexOf(datasetName);
+                    // console.log(datasetName);
+                    // console.log(renderInfo.datasetName);
+                    // console.log(datasetId);
+                    if (!(strReplaceRegex in replaceMap)) {
+                        let strResult = "{{NA}}";
+                        if (datasetId >= 0) {
+                            let result = fn(renderInfo, datasetId); // calculate result
+                            if (
+                                typeof result !== "undefined" &&
+                                result !== null
+                            ) {
+                                if (Number.isInteger(result)) {
+                                    strResult = result.toFixed(0);
+                                } else {
+                                    strResult = result.toFixed(2);
+                                }
+                            }
+                        }
+                        replaceMap[strReplaceRegex] = strResult;
+                    }
+                } else {
+                    // no datasetId assigned use id 0
+                    // console.log("{{" + fnName + "}}")
+                    let strReplaceRegex = "{{\\s*" + fnName + "\\s*}}";
+                    if (!(strReplaceRegex in replaceMap)) {
+                        let result = fn(renderInfo, 0); // calculate result
+                        let strResult = "{{NA}}";
+                        if (typeof result !== "undefined" && result !== null) {
+                            if (Number.isInteger(result)) {
+                                strResult = result.toFixed(0);
+                            } else {
+                                strResult = result.toFixed(2);
+                            }
+                        }
+
+                        replaceMap[strReplaceRegex] = strResult;
+                    }
+                }
+            } else {
+                // groups undefined
+                // no datasetId assigned use id 0
+                // console.log("{{" + fnName + "}}")
+                let strReplaceRegex = "{{\\s*" + fnName + "\\s*}}";
+                if (!(strReplaceRegex in replaceMap)) {
+                    let result = fn(renderInfo, 0); // calculate result
+                    let strResult = "{{NA}}";
+                    if (typeof result !== "undefined" && result !== null) {
+                        if (Number.isInteger(result)) {
+                            strResult = result.toFixed(0);
+                        } else {
+                            strResult = result.toFixed(2);
+                        }
+                    }
+
+                    replaceMap[strReplaceRegex] = strResult;
+                }
+            }
+        }
+    });
+    // console.log(replaceMap);
+    // Do replace
+    for (let strReplaceRegex in replaceMap) {
+        let strResult = replaceMap[strReplaceRegex];
+        let regex = new RegExp(strReplaceRegex, "gi");
+        outputSummary = outputSummary.replace(regex, strResult);
+    }
+
+    if (outputSummary !== "") {
+        let textBlock = d3.select(canvas).append("div");
+        if (outputSummary.includes("\n")) {
+            let outputLines = outputSummary.split("\n");
+            for (let outputLine of outputLines) {
+                textBlock.append("div").text(outputLine);
+            }
+        } else {
+            textBlock.text(outputSummary);
+        }
+
+        if (renderInfo.summary.style !== "") {
+            textBlock.attr("style", renderInfo.summary.style);
+        }
+    }
+}

From 7645873561ce24d3d313759e54909661bf98e9f6 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Wed, 26 May 2021 08:55:33 +0800
Subject: [PATCH 009/402] Refactoring

---
 src/collecting.ts | 13 ++++++------
 src/data.ts       | 54 +++++++++++++++++++++++------------------------
 src/main.ts       |  3 +--
 src/parsing.ts    | 14 ++++++++++++
 src/rendering.ts  |  3 ++-
 5 files changed, 51 insertions(+), 36 deletions(-)

diff --git a/src/collecting.ts b/src/collecting.ts
index 8200ab6..08fbc4a 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -7,6 +7,7 @@ import {
     QueryValuePair,
     TableData,
     SearchType,
+    ValueType
 } from "./data";
 import * as helper from "./helper";
 
@@ -108,7 +109,7 @@ export function collectDataFromFrontmatterKey(
                     // time value
                     let timeValue = window.moment(toParse, timeFormat, true);
                     if (timeValue.isValid()) {
-                        query.setUsingTimeValue();
+                        query.valueType = ValueType.Time;
                         value = timeValue.diff(
                             window.moment("00:00", "HH:mm", true),
                             "seconds"
@@ -159,7 +160,7 @@ export function collectDataFromFrontmatterKey(
                         true
                     );
                     if (timeValue.isValid()) {
-                        query.setUsingTimeValue();
+                        query.valueType = ValueType.Time;
                         value = timeValue.diff(
                             window.moment("00:00", "HH:mm", true),
                             "seconds"
@@ -242,7 +243,7 @@ export function collectDataFromInlineTag(
                 if (toParse.includes(":")) {
                     let timeValue = window.moment(toParse, timeFormat, true);
                     if (timeValue.isValid()) {
-                        query.setUsingTimeValue();
+                        query.valueType = ValueType.Time;
                         tagMeasure = timeValue.diff(
                             window.moment("00:00", "HH:mm", true),
                             "seconds"
@@ -272,7 +273,7 @@ export function collectDataFromInlineTag(
                 if (toParse.includes(":")) {
                     let timeValue = window.moment(toParse, timeFormat, true);
                     if (timeValue.isValid()) {
-                        query.setUsingTimeValue();
+                        query.valueType = ValueType.Time;
                         tagMeasure = timeValue.diff(
                             window.moment("00:00", "HH:mm", true),
                             "seconds"
@@ -388,7 +389,7 @@ export function collectDataFromDvField(
                 if (toParse.includes(":")) {
                     let timeValue = window.moment(toParse, timeFormat, true);
                     if (timeValue.isValid()) {
-                        query.setUsingTimeValue();
+                        query.valueType = ValueType.Time;
                         tagMeasure = timeValue.diff(
                             window.moment("00:00", "HH:mm", true),
                             "seconds"
@@ -418,7 +419,7 @@ export function collectDataFromDvField(
                 if (toParse.includes(":")) {
                     let timeValue = window.moment(toParse, timeFormat, true);
                     if (timeValue.isValid()) {
-                        query.setUsingTimeValue();
+                        query.valueType = ValueType.Time;
                         tagMeasure = timeValue.diff(
                             window.moment("00:00", "HH:mm", true),
                             "seconds"
diff --git a/src/data.ts b/src/data.ts
index 842175c..3e79d10 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -1,7 +1,5 @@
 import { Moment } from "moment";
 
-export type NullableNumber = number | null;
-
 export enum SearchType {
     Tag,
     Frontmatter,
@@ -20,11 +18,20 @@ export enum OutputType {
     Heatmap,
 }
 
+export enum ValueType {
+    Number,
+    Int,
+    Date,
+    Time,
+    DateTime,
+    String
+}
+
 export class DataPoint {
     date: Moment;
-    value: NullableNumber;
+    value: number;
 
-    constructor(date: Moment, value: NullableNumber) {
+    constructor(date: Moment, value: number) {
         this.date = date;
         this.value = value;
     }
@@ -40,7 +47,7 @@ export class Query {
     private accessor1: number;
     private accessor2: number;
 
-    private valueIsTime: boolean;
+    valueType: ValueType;
     usedAsXDataset: boolean;
 
     constructor(id: number, searchType: SearchType, searchTarget: string) {
@@ -51,7 +58,7 @@ export class Query {
         this.accessor = -1;
         this.accessor1 = -1;
         this.accessor2 = -1;
-        this.valueIsTime = false;
+        this.valueType = ValueType.Number;
         this.usedAsXDataset = false;
 
         if (searchType === SearchType.Table) {
@@ -145,14 +152,6 @@ export class Query {
         return null;
     }
 
-    public isUsingTimeValue() {
-        return this.valueIsTime;
-    }
-
-    public setUsingTimeValue() {
-        this.valueIsTime = true;
-    }
-
     public setSeparator(sep: string) {
         this.separator = sep;
     }
@@ -164,21 +163,22 @@ export class Query {
 
 export interface QueryValuePair {
     query: Query;
-    value: NullableNumber;
+    value: number;
 }
 
 export class Dataset implements IterableIterator<DataPoint> {
     // Array of DataPoints
     private name: string;
     private query: Query;
-    private values: NullableNumber[];
+    private values: number[];
     private parent: Datasets;
     private id: number;
-    private yMin: NullableNumber;
-    private yMax: NullableNumber;
+    private yMin: number;
+    private yMax: number;
     private lineInfo: LineInfo;
     private barInfo: BarInfo;
-    private valueIsTime: boolean;
+    
+    valueType: ValueType;
 
     private currentIndex = 0; // IterableIterator
 
@@ -192,7 +192,7 @@ export class Dataset implements IterableIterator<DataPoint> {
         this.yMax = null;
         this.lineInfo = null;
         this.barInfo = null;
-        this.valueIsTime = query.isUsingTimeValue();
+        this.valueType = query.valueType;
 
         for (let ind = 0; ind < parent.getDates().length; ind++) {
             this.values.push(null);
@@ -230,7 +230,7 @@ export class Dataset implements IterableIterator<DataPoint> {
         this.id = id;
     }
 
-    public setValue(date: Moment, value: NullableNumber) {
+    public setValue(date: Moment, value: number) {
         let ind = this.parent.getIndexOfDate(date);
         // console.log(ind);
         if (ind >= 0) {
@@ -271,10 +271,6 @@ export class Dataset implements IterableIterator<DataPoint> {
         return this.query;
     }
 
-    public isUsingTimeValue() {
-        return this.valueIsTime;
-    }
-
     public accumulateValues() {
         let accumValue = 0.0;
         for (let ind = 0; ind < this.values.length; ind++) {
@@ -471,6 +467,8 @@ export class RenderInfo {
     ignoreZeroValue: boolean[];
     accum: boolean[];
     penalty: number[];
+    shift: number[];
+    valueType: string[];// number/float, int, string, boolean, date, time, datetime
 
     dataAreaSize: Size;
     margin: Margin;
@@ -501,6 +499,8 @@ export class RenderInfo {
         this.ignoreZeroValue = []; // false
         this.accum = []; // false, accum values start from zero over days
         this.penalty = []; // null, use this value instead of null value
+        this.shift = [];
+        this.valueType = [];
 
         this.dataAreaSize = new Size(300, 300);
         this.margin = new Margin(10, 10, 10, 10); // top, right, bottom, left
@@ -535,8 +535,8 @@ export class CommonChartInfo {
     yAxisColor: string[];
     yAxisLabelColor: string[];
     yAxisUnit: string[];
-    yMin: NullableNumber[];
-    yMax: NullableNumber[];
+    yMin: number[];
+    yMax: number[];
     allowInspectData: boolean;
     showLegend: boolean;
     legendPosition: string;
diff --git a/src/main.ts b/src/main.ts
index cd2153d..64ef50a 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -4,7 +4,6 @@ import { TFile, TFolder, normalizePath } from "obsidian";
 import { render, renderErrorMessage } from "./rendering";
 import { getRenderInfoFromYaml } from "./parsing";
 import {
-    NullableNumber,
     Datasets,
     Query,
     QueryValuePair,
@@ -123,7 +122,7 @@ export default class Tracker extends Plugin {
         dataMap: DataMap,
         date: string,
         query: Query,
-        value: NullableNumber
+        value: number
     ) {
         if (!dataMap.has(date)) {
             let queryValuePairs = new Array<QueryValuePair>();
diff --git a/src/parsing.ts b/src/parsing.ts
index 12e1041..2ac75b2 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1097,6 +1097,20 @@ export function getRenderInfoFromYaml(
     renderInfo.penalty = retPenalty;
     // console.log(renderInfo.penalty);
 
+    // shift
+    let retShift = getNumberArrayFromInput(
+        "shift",
+        yaml.shift,
+        numDatasets,
+        null,
+        true
+    );
+    if (typeof retShift === "string") {
+        return retShift;
+    }
+    renderInfo.shift = retShift;
+    // console.log(renderInfo.shift);
+
     // fixedScale
     if (typeof yaml.fixedScale === "number") {
         renderInfo.fixedScale = yaml.fixedScale;
diff --git a/src/rendering.ts b/src/rendering.ts
index b28683d..f5a6501 100644
--- a/src/rendering.ts
+++ b/src/rendering.ts
@@ -8,6 +8,7 @@ import {
     Transform,
     ChartElements,
     OutputType,
+    ValueType,
 } from "./data";
 import * as summary from './summary';
 
@@ -251,7 +252,7 @@ function renderYAxis(
         }
 
         // Need all datasets have same settings for time value
-        valueIsTime = dataset.isUsingTimeValue();
+        valueIsTime = dataset.valueType === ValueType.Time;
         if (tmpValueIsTime === null) {
             tmpValueIsTime = valueIsTime;
         } else {

From 868c30a2ff6a61a465528858c9e682254e2db2b5 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 13 May 2021 10:54:44 +0800
Subject: [PATCH 010/402] Prepare inputs for rendering calendar

---
 examples/TestCalendar.md |  9 +++++++++
 src/data.ts              | 12 +++++++++++-
 src/parsing.ts           | 42 +++++++++++++++++++++++++++++++++++++---
 src/rendering.ts         |  8 ++++++++
 4 files changed, 67 insertions(+), 4 deletions(-)
 create mode 100644 examples/TestCalendar.md

diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
new file mode 100644
index 0000000..e986adc
--- /dev/null
+++ b/examples/TestCalendar.md
@@ -0,0 +1,9 @@
+# Test Calendar
+
+``` tracker
+searchType: tag
+searchTarget: meditation
+folder: diary
+calendar:
+    heatMap: false
+```
\ No newline at end of file
diff --git a/src/data.ts b/src/data.ts
index 3e79d10..f76c158 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -15,7 +15,7 @@ export enum OutputType {
     Radar,
     Summary,
     Table,
-    Heatmap,
+    Calendar,
 }
 
 export enum ValueType {
@@ -481,6 +481,7 @@ export class RenderInfo {
     line: LineInfo | null;
     bar: BarInfo | null;
     summary: SummaryInfo | null;
+    calendar: CalendarInfo | null;
 
     public datasets: Datasets | null;
 
@@ -513,6 +514,7 @@ export class RenderInfo {
         this.line = null;
         this.summary = null;
         this.bar = null;
+        this.calendar = null;
 
         this.datasets = null;
     }
@@ -612,6 +614,14 @@ export class SummaryInfo {
     }
 }
 
+export class CalendarInfo {
+    heatMap: boolean;
+
+    constructor() {
+        this.heatMap = false;
+    }
+}
+
 export class Size {
     width: number;
     height: number;
diff --git a/src/parsing.ts b/src/parsing.ts
index 2ac75b2..ffe39c8 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -9,6 +9,7 @@ import {
     Margin,
     OutputType,
     LineInfo,
+    CalendarInfo,
 } from "./data";
 import { TFolder, normalizePath } from "obsidian";
 import { parseYaml } from "obsidian";
@@ -1150,15 +1151,24 @@ export function getRenderInfoFromYaml(
     if (typeof yaml.summary !== "undefined") {
         hasSummary = true;
     }
-    let sumOutput = Number(hasLine) + Number(hasBar) + Number(hasSummary);
+    let hasCalendar = false;
+    if (typeof yaml.calendar !== "undefined") {
+        hasCalendar = true;
+    }
+    let sumOutput =
+        Number(hasLine) +
+        Number(hasBar) +
+        Number(hasSummary) +
+        Number(hasCalendar);
     if (sumOutput === 0) {
-        return "No output parameter provided, please place line, bar, or summary.";
+        return "No output parameter provided, please place line, bar, calendar, or summary.";
     } else if (sumOutput === 1) {
         if (hasLine) renderInfo.output = OutputType.Line;
         if (hasBar) renderInfo.output = OutputType.Bar;
         if (hasSummary) renderInfo.output = OutputType.Summary;
+        if (hasCalendar) renderInfo.output = OutputType.Calendar;
     } else if (sumOutput >= 2) {
-        return "Too many output parameters, pick line, bar, or summary.";
+        return "Too many output parameters, pick line, bar, calendar, or summary.";
     }
 
     // line related parameters
@@ -1411,6 +1421,32 @@ export function getRenderInfoFromYaml(
             }
         }
     } // summary related parameters
+    // calendar related parameters
+    if (renderInfo.output === OutputType.Calendar) {
+        renderInfo.calendar = new CalendarInfo();
+
+        if (yaml.calendar !== null) {
+            let keysOfSummaryInfo = getAvailableKeysOfClass(
+                renderInfo.calendar
+            );
+            let keysFoundInYAML = getAvailableKeysOfClass(yaml.calendar);
+            // console.log(keysOfSummaryInfo);
+            // console.log(keysFoundInYAML);
+            for (let key of keysFoundInYAML) {
+                if (!keysOfSummaryInfo.includes(key)) {
+                    errorMessage = "'" + key + "' is not an available key";
+                    return errorMessage;
+                }
+            }
+        }
+
+        if (yaml.calendar !== null) {
+            // heatMap
+            if (typeof yaml.calendar.heatMap === "boolean") {
+                renderInfo.calendar.heatMap = yaml.calendar.heatMap;
+            }
+        }
+    } // calendar related parameters
 
     return renderInfo;
 }
diff --git a/src/rendering.ts b/src/rendering.ts
index f5a6501..69df1d8 100644
--- a/src/rendering.ts
+++ b/src/rendering.ts
@@ -122,6 +122,8 @@ export function render(canvas: HTMLElement, renderInfo: RenderInfo) {
             return renderBarChart(canvas, renderInfo);
         case OutputType.Summary:
             return summary.renderSummary(canvas, renderInfo);
+        case OutputType.Calendar:
+            return renderCalendar(canvas, renderInfo);
         default:
             return "Unknown output type";
     }
@@ -1495,6 +1497,12 @@ function renderBarChart(canvas: HTMLElement, renderInfo: RenderInfo) {
     setChartScale(canvas, chartElements, renderInfo);
 }
 
+function renderCalendar(canvas: HTMLElement, renderInfo: RenderInfo) {
+    console.log("renderCalendar");
+    // console.log(renderInfo);
+    if (renderInfo.calendar === null) return;
+}
+
 export function renderErrorMessage(canvas: HTMLElement, errorMessage: string) {
     let svg = d3
         .select(canvas)

From 6e87d432de00bbd5fa22874ba21d5165abaf9525 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 15 May 2021 10:19:35 +0800
Subject: [PATCH 011/402] Render days

---
 examples/TestCalendar.md |   4 +-
 src/data.ts              |  12 ++--
 src/parsing.ts           |  41 +++++++-------
 src/rendering.ts         | 118 +++++++++++++++++++++++++++++++++++++--
 4 files changed, 141 insertions(+), 34 deletions(-)

diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
index e986adc..cdf2bbd 100644
--- a/examples/TestCalendar.md
+++ b/examples/TestCalendar.md
@@ -4,6 +4,6 @@
 searchType: tag
 searchTarget: meditation
 folder: diary
-calendar:
-    heatMap: false
+month:
+    startWeekOn: 
 ```
\ No newline at end of file
diff --git a/src/data.ts b/src/data.ts
index f76c158..1f9c930 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -15,7 +15,7 @@ export enum OutputType {
     Radar,
     Summary,
     Table,
-    Calendar,
+    Month,
 }
 
 export enum ValueType {
@@ -481,7 +481,7 @@ export class RenderInfo {
     line: LineInfo | null;
     bar: BarInfo | null;
     summary: SummaryInfo | null;
-    calendar: CalendarInfo | null;
+    month: MonthInfo | null;
 
     public datasets: Datasets | null;
 
@@ -514,7 +514,7 @@ export class RenderInfo {
         this.line = null;
         this.summary = null;
         this.bar = null;
-        this.calendar = null;
+        this.month = null;
 
         this.datasets = null;
     }
@@ -614,11 +614,11 @@ export class SummaryInfo {
     }
 }
 
-export class CalendarInfo {
-    heatMap: boolean;
+export class MonthInfo {
+    startWeekOn: string;
 
     constructor() {
-        this.heatMap = false;
+        this.startWeekOn = "Sun";
     }
 }
 
diff --git a/src/parsing.ts b/src/parsing.ts
index ffe39c8..cdda59a 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -9,7 +9,7 @@ import {
     Margin,
     OutputType,
     LineInfo,
-    CalendarInfo,
+    MonthInfo,
 } from "./data";
 import { TFolder, normalizePath } from "obsidian";
 import { parseYaml } from "obsidian";
@@ -1151,24 +1151,24 @@ export function getRenderInfoFromYaml(
     if (typeof yaml.summary !== "undefined") {
         hasSummary = true;
     }
-    let hasCalendar = false;
-    if (typeof yaml.calendar !== "undefined") {
-        hasCalendar = true;
+    let hasMonth = false;
+    if (typeof yaml.month !== "undefined") {
+        hasMonth = true;
     }
     let sumOutput =
         Number(hasLine) +
         Number(hasBar) +
         Number(hasSummary) +
-        Number(hasCalendar);
+        Number(hasMonth);
     if (sumOutput === 0) {
-        return "No output parameter provided, please place line, bar, calendar, or summary.";
+        return "No output parameter provided, please place line, bar, month, or summary.";
     } else if (sumOutput === 1) {
         if (hasLine) renderInfo.output = OutputType.Line;
         if (hasBar) renderInfo.output = OutputType.Bar;
         if (hasSummary) renderInfo.output = OutputType.Summary;
-        if (hasCalendar) renderInfo.output = OutputType.Calendar;
+        if (hasMonth) renderInfo.output = OutputType.Month;
     } else if (sumOutput >= 2) {
-        return "Too many output parameters, pick line, bar, calendar, or summary.";
+        return "Too many output parameters, pick line, bar, month, or summary.";
     }
 
     // line related parameters
@@ -1421,15 +1421,13 @@ export function getRenderInfoFromYaml(
             }
         }
     } // summary related parameters
-    // calendar related parameters
-    if (renderInfo.output === OutputType.Calendar) {
-        renderInfo.calendar = new CalendarInfo();
+    // month related parameters
+    if (renderInfo.output === OutputType.Month) {
+        renderInfo.month = new MonthInfo();
 
-        if (yaml.calendar !== null) {
-            let keysOfSummaryInfo = getAvailableKeysOfClass(
-                renderInfo.calendar
-            );
-            let keysFoundInYAML = getAvailableKeysOfClass(yaml.calendar);
+        if (yaml.month !== null) {
+            let keysOfSummaryInfo = getAvailableKeysOfClass(renderInfo.month);
+            let keysFoundInYAML = getAvailableKeysOfClass(yaml.month);
             // console.log(keysOfSummaryInfo);
             // console.log(keysFoundInYAML);
             for (let key of keysFoundInYAML) {
@@ -1440,13 +1438,14 @@ export function getRenderInfoFromYaml(
             }
         }
 
-        if (yaml.calendar !== null) {
-            // heatMap
-            if (typeof yaml.calendar.heatMap === "boolean") {
-                renderInfo.calendar.heatMap = yaml.calendar.heatMap;
+        if (yaml.month !== null) {
+            if (typeof yaml.month.startWeekOn === "string") {
+                if (yaml.month.startWeekOn === "month") {
+                    renderInfo.month.startWeekOn = yaml.month.startWeekOn;
+                }
             }
         }
-    } // calendar related parameters
+    } // month related parameters
 
     return renderInfo;
 }
diff --git a/src/rendering.ts b/src/rendering.ts
index 69df1d8..5ddfb83 100644
--- a/src/rendering.ts
+++ b/src/rendering.ts
@@ -1,4 +1,5 @@
 import * as d3 from "d3";
+import { Moment } from "moment";
 import {
     Datasets,
     DataPoint,
@@ -122,8 +123,8 @@ export function render(canvas: HTMLElement, renderInfo: RenderInfo) {
             return renderBarChart(canvas, renderInfo);
         case OutputType.Summary:
             return summary.renderSummary(canvas, renderInfo);
-        case OutputType.Calendar:
-            return renderCalendar(canvas, renderInfo);
+        case OutputType.Month:
+            return renderMonth(canvas, renderInfo);
         default:
             return "Unknown output type";
     }
@@ -1497,10 +1498,117 @@ function renderBarChart(canvas: HTMLElement, renderInfo: RenderInfo) {
     setChartScale(canvas, chartElements, renderInfo);
 }
 
-function renderCalendar(canvas: HTMLElement, renderInfo: RenderInfo) {
-    console.log("renderCalendar");
+interface DayInfo {
+    date: string;
+    dayInMonth: number;
+    row: number;
+    col: number;
+}
+
+function renderMonthHeader(
+    chartElements: ChartElements,
+    renderInfo: RenderInfo,
+    dataset: Dataset
+) {}
+
+function renderMonthDays(
+    chartElements: ChartElements,
+    renderInfo: RenderInfo,
+    dataset: Dataset
+) {
+    // console.log("renderMonthDays");
+
+    let maxDayTextSize = measureTextSize("30");
+    let dayCellWidth = maxDayTextSize.width * 1.2;
+    let dayCellSpacing = dayCellWidth * 0.1;
+
+    let lastDate = renderInfo.datasets.getDates().last();
+    let monthOfLastDate = lastDate.month(); // 0~11
+    let daysInMonth = lastDate.daysInMonth(); // 28~31
+
+    let daysInThisMonth: Array<DayInfo> = [];
+    const monthStartDate = lastDate.clone().startOf("month");
+    const monthEndDate = lastDate.endOf("month");
+    for (
+        let curDate = monthStartDate.clone();
+        curDate <= monthEndDate;
+        curDate.add(1, "days")
+    ) {
+        let indCol = curDate.day();
+        let indRow = Math.floor(
+            (monthStartDate.day() - 1 + curDate.date()) / 7.0
+        );
+        daysInThisMonth.push({
+            date: curDate.format(renderInfo.dateFormat),
+            dayInMonth: curDate.date(),
+            row: indRow,
+            col: indCol,
+        });
+    }
+
+    // scale
+    let scale = d3
+        .scaleLinear()
+        .domain([0, 8])
+        .range([0, renderInfo.dataAreaSize.width]);
+
+    // streak lines
+
+    // days in this month
+    let dots = chartElements.dataArea
+        .selectAll("dot")
+        .data(daysInThisMonth)
+        .enter()
+        .append("circle")
+        .attr("r", dayCellWidth / 2.0)
+        .attr("cx", function (d: DayInfo) {
+            return scale(d.col);
+        })
+        .attr("cy", function (d: DayInfo) {
+            return scale(d.row);
+        })
+        .attr("class", "tracker-dot");
+
+    // labels
+    let dayLabals = chartElements.dataArea
+        .selectAll("dayLabel")
+        .data(daysInThisMonth)
+        .enter()
+        .append("text")
+        .text(function (d: DayInfo) {
+            return d.dayInMonth.toString();
+        })
+        .attr("transform", function (d: DayInfo) {
+            let strTranslate =
+                "translate(" +
+                scale(d.col) +
+                "," +
+                (scale(d.row) + maxDayTextSize.height / 4) +
+                ")";
+
+            return strTranslate;
+        })
+        .attr("class", "tracker-axis-label");
+}
+
+function renderMonth(canvas: HTMLElement, renderInfo: RenderInfo) {
+    // console.log("renderMonth");
     // console.log(renderInfo);
-    if (renderInfo.calendar === null) return;
+    if (renderInfo.month === null) return;
+
+    let chartElements = createAreas(canvas, renderInfo);
+
+    renderMonthHeader(
+        chartElements,
+        renderInfo,
+        renderInfo.datasets.getDatasetById(0)
+    );
+
+    renderMonthDays(
+        chartElements,
+        renderInfo,
+        renderInfo.datasets.getDatasetById(0)
+    );
 }
 
 export function renderErrorMessage(canvas: HTMLElement, errorMessage: string) {

From 5bc46073306e750925e01f918eeb9878bf90cbae Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Wed, 26 May 2021 09:19:22 +0800
Subject: [PATCH 012/402] Refactoring

---
 src/helper.ts    |  27 ++++++++-
 src/rendering.ts | 152 +++--------------------------------------------
 2 files changed, 35 insertions(+), 144 deletions(-)

diff --git a/src/helper.ts b/src/helper.ts
index c02b19d..9b01977 100644
--- a/src/helper.ts
+++ b/src/helper.ts
@@ -1,6 +1,8 @@
-import { RenderInfo } from "./data";
+import { RenderInfo, Size } from "./data";
 import { TFile, TFolder, normalizePath } from "obsidian";
+import * as d3 from "d3";
 
+// String helpers
 export function trimByChar(str: string, char: string) {
     const arr = Array.from(str);
     const first = arr.findIndex((c) => c !== char);
@@ -35,3 +37,26 @@ export function getDateFromFilename(file: TFile, renderInfo: RenderInfo) {
 
     return fileDate;
 }
+
+// Chart helpers
+export function measureTextSize(
+    text: string,
+    styleClass: string = "",
+    rotate: string = ""
+): Size {
+    var container = d3.select("body").append("svg");
+    let textBlock = container
+        .append("text")
+        .text(text)
+        .attr("x", -99999)
+        .attr("y", -99999);
+    if (styleClass) {
+        textBlock.attr("class", styleClass);
+    }
+    if (rotate) {
+        textBlock.attr("transform", "rotate(" + rotate + ")");
+    }
+    var size = container.node().getBBox();
+    container.remove();
+    return { width: size.width, height: size.height };
+}
\ No newline at end of file
diff --git a/src/rendering.ts b/src/rendering.ts
index 5ddfb83..88e65cf 100644
--- a/src/rendering.ts
+++ b/src/rendering.ts
@@ -12,6 +12,8 @@ import {
     ValueType,
 } from "./data";
 import * as summary from './summary';
+import * as month from './month';
+import * as helper from './helper'
 
 function getTickInterval(datasets: Datasets) {
     let tickInterval;
@@ -77,29 +79,6 @@ function getYTickFormat() {
     return tickFormat;
 }
 
-// Is there a better way to measure text size??
-function measureTextSize(
-    text: string,
-    styleClass: string = "",
-    rotate: string = ""
-): Size {
-    var container = d3.select("body").append("svg");
-    let textBlock = container
-        .append("text")
-        .text(text)
-        .attr("x", -99999)
-        .attr("y", -99999);
-    if (styleClass) {
-        textBlock.attr("class", styleClass);
-    }
-    if (rotate) {
-        textBlock.attr("transform", "rotate(" + rotate + ")");
-    }
-    var size = container.node().getBBox();
-    container.remove();
-    return { width: size.width, height: size.height };
-}
-
 export function render(canvas: HTMLElement, renderInfo: RenderInfo) {
     // console.log("render");
     // console.log(renderInfo.datasets);
@@ -124,7 +103,7 @@ export function render(canvas: HTMLElement, renderInfo: RenderInfo) {
         case OutputType.Summary:
             return summary.renderSummary(canvas, renderInfo);
         case OutputType.Month:
-            return renderMonth(canvas, renderInfo);
+            return month.renderMonth(canvas, renderInfo);
         default:
             return "Unknown output type";
     }
@@ -172,7 +151,7 @@ function renderXAxis(chartElements: ChartElements, renderInfo: RenderInfo) {
     }
     chartElements["xAxis"] = xAxis;
 
-    let textSize = measureTextSize("99-99-99");
+    let textSize = helper.measureTextSize("99-99-99");
 
     let xAxisTickLabels = xAxis
         .selectAll("text")
@@ -406,11 +385,11 @@ function renderYAxis(
 
     // Get max tick label width
     let yTickFormat = d3.tickFormat(yLower, yUpper, 10);
-    let yLowerLabelSize = measureTextSize(
+    let yLowerLabelSize = helper.measureTextSize(
         yTickFormat(yLower),
         "tracker-axis-label"
     );
-    let yUpperLabelSize = measureTextSize(
+    let yUpperLabelSize = helper.measureTextSize(
         yTickFormat(yUpper),
         "tracker-axis-label"
     );
@@ -423,7 +402,7 @@ function renderYAxis(
         yAxisLabelText += " (" + yAxisUnitText + ")";
     }
     let yTickLength = 6;
-    let yAxisLabelSize = measureTextSize(yAxisLabelText);
+    let yAxisLabelSize = helper.measureTextSize(yAxisLabelText);
     let yAxisLabel = yAxis
         .append("text")
         .text(yAxisLabelText)
@@ -783,7 +762,7 @@ function renderLegend(chartElements: ChartElements, renderInfo: RenderInfo) {
     // Get names and their dimension
     let names = datasets.getNames(); // xDataset name included
     let nameSizes = names.map(function (n) {
-        return measureTextSize(n, "tracker-legend-label");
+        return helper.measureTextSize(n, "tracker-legend-label");
     });
     let indMaxName = 0;
     let maxNameWidth = 0.0;
@@ -1199,7 +1178,7 @@ function renderTitle(chartElements: ChartElements, renderInfo: RenderInfo) {
     if (!chartInfo) return;
 
     if (!chartInfo.title) return;
-    let titleSize = measureTextSize(chartInfo.title, "tracker-title");
+    let titleSize = helper.measureTextSize(chartInfo.title, "tracker-title");
 
     // Append title
     let title = chartElements.graphArea
@@ -1498,119 +1477,6 @@ function renderBarChart(canvas: HTMLElement, renderInfo: RenderInfo) {
     setChartScale(canvas, chartElements, renderInfo);
 }
 
-interface DayInfo {
-    date: string;
-    dayInMonth: number;
-    row: number;
-    col: number;
-}
-
-function renderMonthHeader(
-    chartElements: ChartElements,
-    renderInfo: RenderInfo,
-    dataset: Dataset
-) {}
-
-function renderMonthDays(
-    chartElements: ChartElements,
-    renderInfo: RenderInfo,
-    dataset: Dataset
-) {
-    // console.log("renderMonthDays");
-
-    let maxDayTextSize = measureTextSize("30");
-    let dayCellWidth = maxDayTextSize.width * 1.2;
-    let dayCellSpacing = dayCellWidth * 0.1;
-
-    let lastDate = renderInfo.datasets.getDates().last();
-    let monthOfLastDate = lastDate.month(); // 0~11
-    let daysInMonth = lastDate.daysInMonth(); // 28~31
-
-    let daysInThisMonth: Array<DayInfo> = [];
-    const monthStartDate = lastDate.clone().startOf("month");
-    const monthEndDate = lastDate.endOf("month");
-    for (
-        let curDate = monthStartDate.clone();
-        curDate <= monthEndDate;
-        curDate.add(1, "days")
-    ) {
-        let indCol = curDate.day();
-        let indRow = Math.floor(
-            (monthStartDate.day() - 1 + curDate.date()) / 7.0
-        );
-        daysInThisMonth.push({
-            date: curDate.format(renderInfo.dateFormat),
-            dayInMonth: curDate.date(),
-            row: indRow,
-            col: indCol,
-        });
-    }
-
-    // scale
-    let scale = d3
-        .scaleLinear()
-        .domain([0, 8])
-        .range([0, renderInfo.dataAreaSize.width]);
-
-    // streak lines
-
-    // days in this month
-    let dots = chartElements.dataArea
-        .selectAll("dot")
-        .data(daysInThisMonth)
-        .enter()
-        .append("circle")
-        .attr("r", dayCellWidth / 2.0)
-        .attr("cx", function (d: DayInfo) {
-            return scale(d.col);
-        })
-        .attr("cy", function (d: DayInfo) {
-            return scale(d.row);
-        })
-        .attr("class", "tracker-dot");
-
-    // labels
-    let dayLabals = chartElements.dataArea
-        .selectAll("dayLabel")
-        .data(daysInThisMonth)
-        .enter()
-        .append("text")
-        .text(function (d: DayInfo) {
-            return d.dayInMonth.toString();
-        })
-        .attr("transform", function (d: DayInfo) {
-            let strTranslate =
-                "translate(" +
-                scale(d.col) +
-                "," +
-                (scale(d.row) + maxDayTextSize.height / 4) +
-                ")";
-
-            return strTranslate;
-        })
-        .attr("class", "tracker-axis-label");
-}
-
-function renderMonth(canvas: HTMLElement, renderInfo: RenderInfo) {
-    // console.log("renderMonth");
-    // console.log(renderInfo);
-    if (renderInfo.month === null) return;
-
-    let chartElements = createAreas(canvas, renderInfo);
-
-    renderMonthHeader(
-        chartElements,
-        renderInfo,
-        renderInfo.datasets.getDatasetById(0)
-    );
-
-    renderMonthDays(
-        chartElements,
-        renderInfo,
-        renderInfo.datasets.getDatasetById(0)
-    );
-}
-
 export function renderErrorMessage(canvas: HTMLElement, errorMessage: string) {
     let svg = d3
         .select(canvas)

From ffbc18c7e0ad312fe281978a0f37c2bf32c3e7e4 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Wed, 26 May 2021 09:20:40 +0800
Subject: [PATCH 013/402] Prettify the source code

---
 src/collecting.ts |  2 +-
 src/data.ts       |  6 +++---
 src/helper.ts     |  2 +-
 src/main.ts       | 28 +++++++++++++---------------
 src/parsing.ts    |  8 ++------
 src/rendering.ts  |  6 +++---
 6 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/src/collecting.ts b/src/collecting.ts
index 08fbc4a..1d337a3 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -7,7 +7,7 @@ import {
     QueryValuePair,
     TableData,
     SearchType,
-    ValueType
+    ValueType,
 } from "./data";
 import * as helper from "./helper";
 
diff --git a/src/data.ts b/src/data.ts
index 1f9c930..b648507 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -24,7 +24,7 @@ export enum ValueType {
     Date,
     Time,
     DateTime,
-    String
+    String,
 }
 
 export class DataPoint {
@@ -177,7 +177,7 @@ export class Dataset implements IterableIterator<DataPoint> {
     private yMax: number;
     private lineInfo: LineInfo;
     private barInfo: BarInfo;
-    
+
     valueType: ValueType;
 
     private currentIndex = 0; // IterableIterator
@@ -468,7 +468,7 @@ export class RenderInfo {
     accum: boolean[];
     penalty: number[];
     shift: number[];
-    valueType: string[];// number/float, int, string, boolean, date, time, datetime
+    valueType: string[]; // number/float, int, string, boolean, date, time, datetime
 
     dataAreaSize: Size;
     margin: Margin;
diff --git a/src/helper.ts b/src/helper.ts
index 9b01977..69f8f9f 100644
--- a/src/helper.ts
+++ b/src/helper.ts
@@ -59,4 +59,4 @@ export function measureTextSize(
     var size = container.node().getBBox();
     container.remove();
     return { width: size.width, height: size.height };
-}
\ No newline at end of file
+}
diff --git a/src/main.ts b/src/main.ts
index 64ef50a..13f7f7f 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -118,12 +118,7 @@ export default class Tracker extends Plugin {
     }
 
     // To be moved to collecting.ts
-    addToDataMap(
-        dataMap: DataMap,
-        date: string,
-        query: Query,
-        value: number
-    ) {
+    addToDataMap(dataMap: DataMap, date: string, query: Query, value: number) {
         if (!dataMap.has(date)) {
             let queryValuePairs = new Array<QueryValuePair>();
             queryValuePairs.push({ query: query, value: value });
@@ -472,7 +467,7 @@ export default class Tracker extends Plugin {
             let columnXDataset = xDatasetQuery.getAccessor(1);
             if (columnXDataset >= numColumns) continue;
             let xValues = [];
-            
+
             let indLine = 0;
             for (let tableLine of tableLines) {
                 let dataRow = helper.trimByChar(tableLine.trim(), "|");
@@ -496,20 +491,17 @@ export default class Tracker extends Plugin {
 
                     if (date.isValid()) {
                         xValues.push(date);
-                    }
-                    else {
+                    } else {
                         xValues.push(null);
                     }
-                    
-                }
-                else {
+                } else {
                     xValues.push(null);
                 }
                 indLine++;
             }
             // console.log(xValues);
 
-            if (xValues.every(v => v === null)) {
+            if (xValues.every((v) => v === null)) {
                 let errorMessage = "No valid X value found";
                 renderErrorMessage(canvas, errorMessage);
                 el.appendChild(canvas);
@@ -533,7 +525,10 @@ export default class Tracker extends Plugin {
                         if (splitted.length === 1) {
                             let value = parseFloat(splitted[0]);
                             if (Number.isNumber(value)) {
-                                if (indLine < xValues.length && xValues[indLine]) {
+                                if (
+                                    indLine < xValues.length &&
+                                    xValues[indLine]
+                                ) {
                                     this.addToDataMap(
                                         dataMap,
                                         xValues[indLine].format(
@@ -553,7 +548,10 @@ export default class Tracker extends Plugin {
                                 splitted[yDatasetQuery.getAccessor(2)].trim();
                             value = parseFloat(splittedPart);
                             if (Number.isNumber(value)) {
-                                if (indLine < xValues.length && xValues[indLine]) {
+                                if (
+                                    indLine < xValues.length &&
+                                    xValues[indLine]
+                                ) {
                                     this.addToDataMap(
                                         dataMap,
                                         xValues[indLine].format(
diff --git a/src/parsing.ts b/src/parsing.ts
index cdda59a..9ca588f 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -809,7 +809,7 @@ export function getRenderInfoFromYaml(
     if (typeof retMultipleValueSparator === "string") {
         return retMultipleValueSparator; // errorMessage
     }
-    multipleValueSparator = retMultipleValueSparator.map( sep => {
+    multipleValueSparator = retMultipleValueSparator.map((sep) => {
         if (sep === "comma") {
             return ",";
         }
@@ -853,11 +853,7 @@ export function getRenderInfoFromYaml(
     // Create grarph info
     let renderInfo = new RenderInfo(queries);
     let keysOfRenderInfo = getAvailableKeysOfClass(renderInfo);
-    let additionalAllowedKeys = [
-        "searchType",
-        "searchTarget",
-        "separator",
-    ];
+    let additionalAllowedKeys = ["searchType", "searchTarget", "separator"];
     // console.log(keysOfRenderInfo);
     for (let key of keysFoundInYAML) {
         if (
diff --git a/src/rendering.ts b/src/rendering.ts
index 88e65cf..2510e29 100644
--- a/src/rendering.ts
+++ b/src/rendering.ts
@@ -11,9 +11,9 @@ import {
     OutputType,
     ValueType,
 } from "./data";
-import * as summary from './summary';
-import * as month from './month';
-import * as helper from './helper'
+import * as summary from "./summary";
+import * as month from "./month";
+import * as helper from "./helper";
 
 function getTickInterval(datasets: Datasets) {
     let tickInterval;

From 649b6dfd6846685c35cbc9d5308ab7b14240b988 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Wed, 26 May 2021 09:27:42 +0800
Subject: [PATCH 014/402] Add missing month.ts

---
 src/month.ts | 181 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 181 insertions(+)
 create mode 100644 src/month.ts

diff --git a/src/month.ts b/src/month.ts
new file mode 100644
index 0000000..c1dabe4
--- /dev/null
+++ b/src/month.ts
@@ -0,0 +1,181 @@
+import { Moment } from "moment";
+import {
+    Datasets,
+    DataPoint,
+    RenderInfo,
+    Dataset,
+    Size,
+    Transform,
+    ChartElements,
+    OutputType,
+    ValueType,
+} from "./data";
+import * as helper from "./helper";
+import * as d3 from "d3";
+
+interface DayInfo {
+    date: string;
+    dayInMonth: number;
+    row: number;
+    col: number;
+}
+
+function createAreas(
+    canvas: HTMLElement,
+    renderInfo: RenderInfo
+): ChartElements {
+    let chartElements: ChartElements = {};
+    // whole area for plotting, includes margins
+    let svg = d3
+        .select(canvas)
+        .append("svg")
+        .attr("id", "svg")
+        .attr(
+            "width",
+            renderInfo.dataAreaSize.width +
+                renderInfo.margin.left +
+                renderInfo.margin.right
+        )
+        .attr(
+            "height",
+            renderInfo.dataAreaSize.height +
+                renderInfo.margin.top +
+                renderInfo.margin.bottom
+        );
+    chartElements["svg"] = svg;
+
+    // graphArea, includes chartArea, title, legend
+    let graphArea = svg
+        .append("g")
+        .attr("id", "graphArea")
+        .attr(
+            "transform",
+            "translate(" +
+                renderInfo.margin.left +
+                "," +
+                renderInfo.margin.top +
+                ")"
+        )
+        .attr("width", renderInfo.dataAreaSize.width + renderInfo.margin.right)
+        .attr(
+            "height",
+            renderInfo.dataAreaSize.height + renderInfo.margin.bottom
+        );
+    chartElements["graphArea"] = graphArea;
+
+    // dataArea, under graphArea, includes points, lines, xAxis, yAxis
+    let dataArea = graphArea
+        .append("g")
+        .attr("id", "dataArea")
+        .attr("width", renderInfo.dataAreaSize.width)
+        .attr("height", renderInfo.dataAreaSize.height);
+    chartElements["dataArea"] = dataArea;
+
+    return chartElements;
+}
+
+function renderMonthHeader(
+    chartElements: ChartElements,
+    renderInfo: RenderInfo,
+    dataset: Dataset
+) {}
+
+function renderMonthDays(
+    chartElements: ChartElements,
+    renderInfo: RenderInfo,
+    dataset: Dataset
+) {
+    // console.log("renderMonthDays");
+
+    let maxDayTextSize = helper.measureTextSize("30");
+    let dayCellWidth = maxDayTextSize.width * 1.2;
+    let dayCellSpacing = dayCellWidth * 0.1;
+
+    let lastDate = renderInfo.datasets.getDates().last();
+    let monthOfLastDate = lastDate.month(); // 0~11
+    let daysInMonth = lastDate.daysInMonth(); // 28~31
+
+    let daysInThisMonth: Array<DayInfo> = [];
+    const monthStartDate = lastDate.clone().startOf("month");
+    const monthEndDate = lastDate.endOf("month");
+    for (
+        let curDate = monthStartDate.clone();
+        curDate <= monthEndDate;
+        curDate.add(1, "days")
+    ) {
+        let indCol = curDate.day();
+        let indRow = Math.floor(
+            (monthStartDate.day() - 1 + curDate.date()) / 7.0
+        );
+        daysInThisMonth.push({
+            date: curDate.format(renderInfo.dateFormat),
+            dayInMonth: curDate.date(),
+            row: indRow,
+            col: indCol,
+        });
+    }
+
+    // scale
+    let scale = d3
+        .scaleLinear()
+        .domain([0, 8])
+        .range([0, renderInfo.dataAreaSize.width]);
+
+    // streak lines
+
+    // days in this month
+    let dots = chartElements.dataArea
+        .selectAll("dot")
+        .data(daysInThisMonth)
+        .enter()
+        .append("circle")
+        .attr("r", dayCellWidth / 2.0)
+        .attr("cx", function (d: DayInfo) {
+            return scale(d.col);
+        })
+        .attr("cy", function (d: DayInfo) {
+            return scale(d.row);
+        })
+        .attr("class", "tracker-dot");
+
+    // labels
+    let dayLabals = chartElements.dataArea
+        .selectAll("dayLabel")
+        .data(daysInThisMonth)
+        .enter()
+        .append("text")
+        .text(function (d: DayInfo) {
+            return d.dayInMonth.toString();
+        })
+        .attr("transform", function (d: DayInfo) {
+            let strTranslate =
+                "translate(" +
+                scale(d.col) +
+                "," +
+                (scale(d.row) + maxDayTextSize.height / 4) +
+                ")";
+
+            return strTranslate;
+        })
+        .attr("class", "tracker-axis-label");
+}
+
+export function renderMonth(canvas: HTMLElement, renderInfo: RenderInfo) {
+    // console.log("renderMonth");
+    // console.log(renderInfo);
+    if (renderInfo.month === null) return;
+
+    let chartElements = createAreas(canvas, renderInfo);
+
+    renderMonthHeader(
+        chartElements,
+        renderInfo,
+        renderInfo.datasets.getDatasetById(0)
+    );
+
+    renderMonthDays(
+        chartElements,
+        renderInfo,
+        renderInfo.datasets.getDatasetById(0)
+    );
+}

From 40f42fc52fa613ba6b3b258dd5ef7325dd89f297 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Wed, 26 May 2021 17:59:50 +0800
Subject: [PATCH 015/402] Fix yAxis tick label and tool-tip for time values

---
 examples/TestTimeValues.md |  4 +--
 src/rendering.ts           | 66 ++++++++++++++++++++++++++++++++++----
 2 files changed, 61 insertions(+), 9 deletions(-)

diff --git a/examples/TestTimeValues.md b/examples/TestTimeValues.md
index 4d33c08..60f6f2e 100644
--- a/examples/TestTimeValues.md
+++ b/examples/TestTimeValues.md
@@ -9,7 +9,7 @@ line:
     title: "Working Hours"
     yAxisLabel: "Time"
     lineColor: yellow, red
-    showPoint: false
+    showPoint: true
 ```
 
 ``` tracker
@@ -21,5 +21,5 @@ line:
     title: "Sleep"
     yAxisLabel: "Time"
     lineColor: yellow, red
-    showPoint: false
+    showPoint: true
 ```
\ No newline at end of file
diff --git a/src/rendering.ts b/src/rendering.ts
index 2510e29..73f6998 100644
--- a/src/rendering.ts
+++ b/src/rendering.ts
@@ -15,7 +15,7 @@ import * as summary from "./summary";
 import * as month from "./month";
 import * as helper from "./helper";
 
-function getTickInterval(datasets: Datasets) {
+function getXTickInterval(datasets: Datasets) {
     let tickInterval;
     let days = datasets.getDates().length;
 
@@ -67,13 +67,55 @@ function getXTickFormat(datasets: Datasets) {
     return tickFormat;
 }
 
-function getYTickFormat() {
+function getYTickValues(yLower: number, yUpper: number) {
+    // currently used for time value tick only, value in seconds
+    const absExtent = Math.abs(yUpper - yLower);
+    let tickValues = [];
+    if (absExtent > 5 * 60 * 60) {// extent over than 5 hours
+        // tick on the hour
+        yLower = Math.floor(yLower / 3600) * 3600;
+        yUpper = Math.ceil(yUpper / 3600) * 3600;
+
+        tickValues = d3.range(yLower, yUpper, 3600);
+    }
+    else {
+        // tick on the half hour
+        yLower = Math.floor(yLower / 1800) * 1800;
+        yUpper = Math.ceil(yUpper / 1800) * 1800;
+
+        tickValues = d3.range(yLower, yUpper, 1800);
+    }
+
+    return tickValues;
+}
+
+function getYTickFormat(yLower: number, yUpper: number) {
     // currently used for time value tick only
     // return a function convert value to time string
     function tickFormat(value: number): string {
+        const absExtent = Math.abs(yUpper - yLower);
         let dayStart = window.moment("00:00", "HH:mm", true);
         let tickTime = dayStart.add(value, "seconds");
-        return tickTime.format("HH:mm");
+        let format = tickTime.format("HH:mm");
+        if (absExtent > 12 * 60 * 60) {
+
+            let devHour = (value - yLower) / 3600;
+            let interleave = devHour % 2;
+            if (value <= yLower) {
+                format = "";
+            }
+            else if (value >= yUpper) {
+                format = "";
+            }
+            else if ( interleave  > 1.0) {
+                format = tickTime.format("HH:mm");
+            }
+            else {
+                format = "";
+            }
+        }
+
+        return format;
     }
 
     return tickFormat;
@@ -130,7 +172,7 @@ function renderXAxis(chartElements: ChartElements, renderInfo: RenderInfo) {
         .range([0, renderInfo.dataAreaSize.width]);
     chartElements["xScale"] = xScale;
 
-    let tickInterval = getTickInterval(datasets);
+    let tickInterval = getXTickInterval(datasets);
     let tickFormat = getXTickFormat(datasets);
 
     let xAxisGen = d3
@@ -346,9 +388,13 @@ function renderYAxis(
         yAxisGen = d3.axisRight(yScale);
     }
     if (yAxisGen && valueIsTime) {
-        let tickFormat = getYTickFormat();
-        yAxisGen.tickFormat(tickFormat);
+        let tickFormat = getYTickFormat(yLower, yUpper);
+        let tickValues = getYTickValues(yLower, yUpper);
+        yAxisGen
+            .tickValues(tickValues)
+            .tickFormat(tickFormat);
     }
+
     let yAxis = chartElements.dataArea
         .append("g")
         .attr("id", "yAxis")
@@ -588,9 +634,15 @@ function renderPoints(
                 .attr("y", (renderInfo.tooltipSize.height / 5) * 4);
 
             dots.on("mouseenter", function (event: any) {
+                // Date
                 tooltipLabelDate.text("date:" + d3.select(this).attr("date"));
+                // Value
+                let strValue = d3.select(this).attr("value");
+                let dayStart = window.moment("00:00", "HH:mm", true);
+                let tickTime = dayStart.add(parseFloat(strValue), "seconds");
+                let dateValue = tickTime.format("HH:mm");
                 tooltipLabelValue.text(
-                    "value:" + d3.select(this).attr("value")
+                    "value:" + dateValue
                 );
 
                 const [x, y] = d3.pointer(event);

From 3e8ff9b9571d4445a8d699a2d486fe4f7d0e0da1 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Wed, 26 May 2021 18:07:36 +0800
Subject: [PATCH 016/402] Fix tool-tip value for non-time value

---
 src/rendering.ts | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/rendering.ts b/src/rendering.ts
index 73f6998..3599a06 100644
--- a/src/rendering.ts
+++ b/src/rendering.ts
@@ -593,6 +593,7 @@ function renderPoints(
                     return p.value.toFixed(2);
                 }
             })
+            .attr("valueType", ValueType[dataset.valueType])
             .attr("class", "tracker-dot");
         if (lineInfo.pointColor[dataset.getId()]) {
             dots.style("fill", lineInfo.pointColor[dataset.getId()]);
@@ -637,13 +638,21 @@ function renderPoints(
                 // Date
                 tooltipLabelDate.text("date:" + d3.select(this).attr("date"));
                 // Value
+                let valueType = d3.select(this).attr("valueType");
                 let strValue = d3.select(this).attr("value");
-                let dayStart = window.moment("00:00", "HH:mm", true);
-                let tickTime = dayStart.add(parseFloat(strValue), "seconds");
-                let dateValue = tickTime.format("HH:mm");
-                tooltipLabelValue.text(
-                    "value:" + dateValue
-                );
+                if (valueType === "Time") {
+                    let dayStart = window.moment("00:00", "HH:mm", true);
+                    let tickTime = dayStart.add(parseFloat(strValue), "seconds");
+                    let dateValue = tickTime.format("HH:mm");
+                    tooltipLabelValue.text(
+                        "value:" + dateValue
+                    );
+                }
+                else {
+                    tooltipLabelValue.text(
+                        "value:" + strValue
+                    );
+                }
 
                 const [x, y] = d3.pointer(event);
                 if (x < renderInfo.dataAreaSize.width / 2) {

From be8b3733017c107df90d29779e8beaa1576dd656 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Wed, 26 May 2021 19:38:28 +0800
Subject: [PATCH 017/402] Allow retrieving deep values in the front matter

---
 examples/TestFrontmatter.md   | 11 ++++++++
 examples/diary/2021-01-01.md  | 34 ++++++++++++++----------
 examples/diary/2021-01-02.md  | 50 ++++++++++++++++++++---------------
 examples/diary/2021-01-03.md  | 45 ++++++++++++++++++-------------
 examples/diary/2021-01-04.md  | 45 ++++++++++++++++++-------------
 examples/diary/2021-01-05.md  | 47 ++++++++++++++++++--------------
 examples/diary/2021-01-06.md  | 45 ++++++++++++++++++-------------
 examples/diary/2021-01-07.md  | 44 +++++++++++++++++-------------
 examples/diary/2021-01-08.md  | 46 +++++++++++++++++++-------------
 examples/diary/2021-01-09.md  | 47 ++++++++++++++++++--------------
 examples/diary/2021-01-10.md  | 47 +++++++++++++++++---------------
 examples/diary/2021-01-11.md  | 47 +++++++++++++++++---------------
 examples/diary/2021-01-12.md  | 46 +++++++++++++++++---------------
 examples/diary/2021-01-13.md  | 45 +++++++++++++++++--------------
 examples/diary/2021-01-14.md  | 46 +++++++++++++++++++-------------
 examples/diary/2021-01-15.md  | 45 ++++++++++++++++++-------------
 examples/diary/2021-01-16.md  | 45 ++++++++++++++++++-------------
 examples/diary/2021-01-17.md  | 45 +++++++++++++++++--------------
 examples/diary/2021-01-18.md  | 47 ++++++++++++++++++--------------
 examples/diary/2021-01-19.md  | 48 ++++++++++++++++++---------------
 examples/diary/2021-01-20.md  | 48 ++++++++++++++++++---------------
 examples/diary/2021-01-21.md  | 46 +++++++++++++++++++-------------
 examples/diary/2021-01-22.md  | 48 ++++++++++++++++++---------------
 examples/diary/2021-01-23.md  | 47 +++++++++++++++++---------------
 examples/diary/2021-01-24.md  | 46 +++++++++++++++++++-------------
 examples/diary/2021-01-25.md  | 45 ++++++++++++++++++-------------
 examples/diary/2021-01-26.md  | 45 ++++++++++++++++++-------------
 examples/diary/2021-01-27.md  | 47 ++++++++++++++++++--------------
 examples/diary/2021-01-28.md  | 46 ++++++++++++++++++--------------
 examples/diary/2021-01-29.md  | 46 +++++++++++++++++++-------------
 examples/diary/2021-01-30.md  | 45 ++++++++++++++++++-------------
 examples/diary/2021-01-31.md  | 48 +++++++++++++++++++--------------
 examples/example_generator.ts | 10 +++++++
 src/collecting.ts             | 15 ++++++-----
 src/helper.ts                 | 16 +++++++++++
 35 files changed, 861 insertions(+), 612 deletions(-)
 create mode 100644 examples/TestFrontmatter.md

diff --git a/examples/TestFrontmatter.md b/examples/TestFrontmatter.md
new file mode 100644
index 0000000..076117c
--- /dev/null
+++ b/examples/TestFrontmatter.md
@@ -0,0 +1,11 @@
+# Test Frontmatter
+
+
+``` tracker
+searchType: frontmatter
+searchTarget: deepValue.very.very.very.very.very.deep
+folder: diary
+endDate: 2021-01-31
+line:
+    title: Deep Values
+```
diff --git a/examples/diary/2021-01-01.md b/examples/diary/2021-01-01.md
index 183ddf5..b118da9 100644
--- a/examples/diary/2021-01-01.md
+++ b/examples/diary/2021-01-01.md
@@ -7,33 +7,39 @@ bloodpressure2: [184.4, 118.8]
 clock-in: 10:45
 clock-out: 20:51
 sleep: 10:11 pm/7:5 am
+deepValue: 
+    very: 
+        very: 
+            very: 
+                very: 
+                    very: 
+                        deep: 27.4
 ---
 
-#weight:65.7kg
+#weight:74.1kg
 
-#exercise-pushup:44
-#exercise-plank:36sec
+#exercise-pushup:31
+#exercise-plank:109sec
 
 
-⭐⭐⭐⭐⭐
 
 
-#finance/bank1:-2.3USD
+
+#finance/bank1:-3.5USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@gmail.com
-obsidian-tracker@yahoo.com
+obsidian-tracker+1@gmail.com
 
-weightlifting: 15
+weightlifting: 18
 
-dataviewTarget:: 21
-- Make Progress:: 24
-- Make-Progress:: 79
-dataviewTarget1:: 21/24
-dataviewTarget2:: 24 @ 79
-dataviewTarget3:: 24, 79
+dataviewTarget:: 48
+- Make Progress:: 29
+- Make-Progress:: 88
+dataviewTarget1:: 48/29
+dataviewTarget2:: 29 @ 88
+dataviewTarget3:: 29, 88
 
 #sin:0.00000/0.20791/0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452
 
diff --git a/examples/diary/2021-01-02.md b/examples/diary/2021-01-02.md
index 50fc695..e97b2b4 100644
--- a/examples/diary/2021-01-02.md
+++ b/examples/diary/2021-01-02.md
@@ -1,39 +1,47 @@
 ---
 tags: 
-mood: 8
-bloodpressure: 173.8/120.6
-bloodpressure1: 173.8, 120.6
-bloodpressure2: [173.8, 120.6]
-clock-in: 10:37
-clock-out: 17:7
-sleep: 11:10 pm/5:37 am
+mood: 1
+bloodpressure: 180.8/120.6
+bloodpressure1: 180.8, 120.6
+bloodpressure2: [180.8, 120.6]
+clock-in: 9:16
+clock-out: 16:49
+sleep: 9:12 pm/6:41 am
+deepValue: 
+    very: 
+        very: 
+            very: 
+                very: 
+                    very: 
+                        deep: 96.3
 ---
 
-#weight:74.4kg
+#weight:62.8kg
 
-#exercise-pushup:50
-#exercise-plank:41sec
+#exercise-pushup:46
+#exercise-plank:101sec
 
+#meditation
 
-⭐⭐⭐⭐
 
 
-#finance/bank1:-2.0USD
+#clean-up
+
+#finance/bank1:-3.8USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker+1@gmail.com
-obsidian-tracker@yahoo.com
+obsidian-tracker@gmail.com
 
-weightlifting: 14
+weightlifting: 12
 
-dataviewTarget:: 25
-- Make Progress:: 14
-- Make-Progress:: 64
-dataviewTarget1:: 25/14
-dataviewTarget2:: 14 @ 64
-dataviewTarget3:: 14, 64
+dataviewTarget:: 27
+- Make Progress:: 12
+- Make-Progress:: 55
+dataviewTarget1:: 27/12
+dataviewTarget2:: 12 @ 55
+dataviewTarget3:: 12, 55
 
 #sin:0.20791/0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452/0.95106
 
diff --git a/examples/diary/2021-01-03.md b/examples/diary/2021-01-03.md
index 82b3cad..d4d59ce 100644
--- a/examples/diary/2021-01-03.md
+++ b/examples/diary/2021-01-03.md
@@ -1,38 +1,45 @@
 ---
 tags: 
-mood: 3
-bloodpressure: 174.2/119.4
-bloodpressure1: 174.2, 119.4
-bloodpressure2: [174.2, 119.4]
-clock-in: 9:38
-clock-out: 19:22
-sleep: 11:49 pm/5:33 am
+mood: 5
+bloodpressure: 178.2/120.4
+bloodpressure1: 178.2, 120.4
+bloodpressure2: [178.2, 120.4]
+clock-in: 10:22
+clock-out: 20:49
+sleep: 9:33 pm/5:17 am
+deepValue: 
+    very: 
+        very: 
+            very: 
+                very: 
+                    very: 
+                        deep: 49.3
 ---
 
-#weight:65.5kg
+#weight:76.8kg
 
-#exercise-pushup:36
-#exercise-plank:74sec
+#exercise-pushup:45
+#exercise-plank:43sec
 
 
-⭐⭐⭐⭐
+⭐⭐⭐
 
 
-#finance/bank1:-3.8USD
+#finance/bank1:-2.6USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
 obsidian-tracker@gmail.com
 
-weightlifting: 15
+weightlifting: 12
 
-dataviewTarget:: 7
-- Make Progress:: 10
-- Make-Progress:: 90
-dataviewTarget1:: 7/10
-dataviewTarget2:: 10 @ 90
-dataviewTarget3:: 10, 90
+dataviewTarget:: 88
+- Make Progress:: 5
+- Make-Progress:: 56
+dataviewTarget1:: 88/5
+dataviewTarget2:: 5 @ 56
+dataviewTarget3:: 5, 56
 
 #sin:0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452/0.95106/0.86603
 
diff --git a/examples/diary/2021-01-04.md b/examples/diary/2021-01-04.md
index ae0d5da..ba8f3c5 100644
--- a/examples/diary/2021-01-04.md
+++ b/examples/diary/2021-01-04.md
@@ -1,39 +1,46 @@
 ---
 tags: work_log
-mood: 9
-bloodpressure: 173.6/117.2
-bloodpressure1: 173.6, 117.2
-bloodpressure2: [173.6, 117.2]
-clock-in: 8:38
-clock-out: 20:14
-sleep: 10:49 pm/7:41 am
+mood: 3
+bloodpressure: 179.6/121.2
+bloodpressure1: 179.6, 121.2
+bloodpressure2: [179.6, 121.2]
+clock-in: 8:24
+clock-out: 20:58
+sleep: 11:57 pm/7:20 am
+deepValue: 
+    very: 
+        very: 
+            very: 
+                very: 
+                    very: 
+                        deep: 18.0
 ---
 
-#weight:80.3kg
+#weight:70.1kg
 
-#exercise-pushup:48
-#exercise-plank:60sec
+#exercise-pushup:42
+#exercise-plank:109sec
 
 #meditation
 
-⭐⭐
+⭐
 
 
-#finance/bank1:-3.8USD
+#finance/bank1:-2.7USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
 obsidian-tracker@yahoo.com
 
-weightlifting: 13
+weightlifting: 18
 
-dataviewTarget:: 27
-- Make Progress:: 45
-- Make-Progress:: 89
-dataviewTarget1:: 27/45
-dataviewTarget2:: 45 @ 89
-dataviewTarget3:: 45, 89
+dataviewTarget:: 58
+- Make Progress:: 41
+- Make-Progress:: 59
+dataviewTarget1:: 58/41
+dataviewTarget2:: 41 @ 59
+dataviewTarget3:: 41, 59
 
 #sin:0.58779/0.74314/0.86603/0.95106/0.99452/0.99452/0.95106/0.86603/0.74314
 
diff --git a/examples/diary/2021-01-05.md b/examples/diary/2021-01-05.md
index d990407..ea5d52c 100644
--- a/examples/diary/2021-01-05.md
+++ b/examples/diary/2021-01-05.md
@@ -1,39 +1,46 @@
 ---
 tags: work_log
-mood: 7
-bloodpressure: 178/121
-bloodpressure1: 178, 121
-bloodpressure2: [178, 121]
-clock-in: 8:25
-clock-out: 18:29
-sleep: 9:10 pm/7:21 am
+mood: 5
+bloodpressure: 178/119
+bloodpressure1: 178, 119
+bloodpressure2: [178, 119]
+clock-in: 8:10
+clock-out: 20:21
+sleep: 10:1 pm/6:57 am
+deepValue: 
+    very: 
+        very: 
+            very: 
+                very: 
+                    very: 
+                        deep: 11.3
 ---
 
-#weight:72.9kg
+#weight:63.2kg
 
-#exercise-pushup:30
-#exercise-plank:73sec
+#exercise-pushup:32
+#exercise-plank:117sec
 
+#meditation
 
+⭐⭐⭐
 
 
-
-#finance/bank1:-2.3USD
+#finance/bank1:-2.6USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@gmail.com
 obsidian-tracker@yahoo.com
 
-weightlifting: 19
+weightlifting: 20
 
-dataviewTarget:: 38
-- Make Progress:: 13
-- Make-Progress:: 97
-dataviewTarget1:: 38/13
-dataviewTarget2:: 13 @ 97
-dataviewTarget3:: 13, 97
+dataviewTarget:: 66
+- Make Progress:: 12
+- Make-Progress:: 85
+dataviewTarget1:: 66/12
+dataviewTarget2:: 12 @ 85
+dataviewTarget3:: 12, 85
 
 #sin:0.74314/0.86603/0.95106/0.99452/0.99452/0.95106/0.86603/0.74314/0.58779
 
diff --git a/examples/diary/2021-01-06.md b/examples/diary/2021-01-06.md
index 0a105d4..eb0fcd6 100644
--- a/examples/diary/2021-01-06.md
+++ b/examples/diary/2021-01-06.md
@@ -1,38 +1,47 @@
 ---
 tags: work_log
-mood: 10
-bloodpressure: 180.4/119.8
-bloodpressure1: 180.4, 119.8
-bloodpressure2: [180.4, 119.8]
-clock-in: 8:41
-clock-out: 19:51
-sleep: 10:48 pm/6:42 am
+mood: 7
+bloodpressure: 180.4/118.8
+bloodpressure1: 180.4, 118.8
+bloodpressure2: [180.4, 118.8]
+clock-in: 10:23
+clock-out: 19:2
+sleep: 10:47 pm/6:41 am
+deepValue: 
+    very: 
+        very: 
+            very: 
+                very: 
+                    very: 
+                        deep: 44.5
 ---
 
-#weight:61.0kg
+#weight:74.0kg
 
-#exercise-pushup:41
-#exercise-plank:101sec
+#exercise-pushup:40
+#exercise-plank:51sec
 
 #meditation
 
-⭐⭐⭐⭐
+⭐
 
 
-#finance/bank1:-3.3USD
+#finance/bank1:-3.6USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
 obsidian-tracker@gmail.com
+obsidian-tracker@yahoo.com
 
+weightlifting: 12
 
-dataviewTarget:: 80
-- Make Progress:: 44
-- Make-Progress:: 57
-dataviewTarget1:: 80/44
-dataviewTarget2:: 44 @ 57
-dataviewTarget3:: 44, 57
+dataviewTarget:: 25
+- Make Progress:: 47
+- Make-Progress:: 75
+dataviewTarget1:: 25/47
+dataviewTarget2:: 47 @ 75
+dataviewTarget3:: 47, 75
 
 #sin:0.86603/0.95106/0.99452/0.99452/0.95106/0.86603/0.74314/0.58779/0.40674
 
diff --git a/examples/diary/2021-01-07.md b/examples/diary/2021-01-07.md
index de33cd1..3330e10 100644
--- a/examples/diary/2021-01-07.md
+++ b/examples/diary/2021-01-07.md
@@ -1,40 +1,46 @@
 ---
 tags: work_log
-mood: 6
-bloodpressure: 172.8/116.6
-bloodpressure1: 172.8, 116.6
-bloodpressure2: [172.8, 116.6]
-clock-in: 8:55
-clock-out: 18:53
-sleep: 9:58 pm/7:29 am
+mood: 9
+bloodpressure: 173.8/120.6
+bloodpressure1: 173.8, 120.6
+bloodpressure2: [173.8, 120.6]
+clock-in: 10:29
+clock-out: 17:0
+sleep: 10:54 pm/6:53 am
+deepValue: 
+    very: 
+        very: 
+            very: 
+                very: 
+                    very: 
+                        deep: 38.4
 ---
 
-#weight:65.6kg
+#weight:73.7kg
 
-#exercise-pushup:30
-#exercise-plank:75sec
+#exercise-pushup:40
+#exercise-plank:111sec
 
 
-⭐⭐⭐
+⭐
 
 
-#finance/bank1:-2.8USD
+#finance/bank1:-3.0USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@gmail.com
 obsidian-tracker+1@gmail.com
 obsidian-tracker@yahoo.com
 
-weightlifting: 18
+weightlifting: 12
 
-dataviewTarget:: 47
-- Make Progress:: 24
+dataviewTarget:: 29
+- Make Progress:: 38
 - Make-Progress:: 59
-dataviewTarget1:: 47/24
-dataviewTarget2:: 24 @ 59
-dataviewTarget3:: 24, 59
+dataviewTarget1:: 29/38
+dataviewTarget2:: 38 @ 59
+dataviewTarget3:: 38, 59
 
 #sin:0.95106/0.99452/0.99452/0.95106/0.86603/0.74314/0.58779/0.40674/0.20791
 
diff --git a/examples/diary/2021-01-08.md b/examples/diary/2021-01-08.md
index 12f2a96..3c364b1 100644
--- a/examples/diary/2021-01-08.md
+++ b/examples/diary/2021-01-08.md
@@ -1,37 +1,47 @@
 ---
 tags: work_log
-mood: 9
-bloodpressure: 179.2/117.4
-bloodpressure1: 179.2, 117.4
-bloodpressure2: [179.2, 117.4]
-clock-in: 10:17
-clock-out: 19:10
-sleep: 11:5 pm/6:26 am
+mood: 10
+bloodpressure: 170.2/119.4
+bloodpressure1: 170.2, 119.4
+bloodpressure2: [170.2, 119.4]
+clock-in: 9:8
+clock-out: 18:18
+sleep: 9:12 pm/5:1 am
+deepValue: 
+    very: 
+        very: 
+            very: 
+                very: 
+                    very: 
+                        deep: 9.8
 ---
 
-#weight:62.9kg
+#weight:63.9kg
 
-#exercise-pushup:41
-#exercise-plank:57sec
+#exercise-pushup:32
+#exercise-plank:48sec
 
 #meditation
 
-⭐
+⭐⭐⭐
 
 
-#finance/bank1:-2.1USD
+#finance/bank1:-3.4USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
+obsidian-tracker@gmail.com
+obsidian-tracker@yahoo.com
 
+weightlifting: 15
 
-dataviewTarget:: 58
-- Make Progress:: 48
-- Make-Progress:: 84
-dataviewTarget1:: 58/48
-dataviewTarget2:: 48 @ 84
-dataviewTarget3:: 48, 84
+dataviewTarget:: 100
+- Make Progress:: 23
+- Make-Progress:: 79
+dataviewTarget1:: 100/23
+dataviewTarget2:: 23 @ 79
+dataviewTarget3:: 23, 79
 
 #sin:0.99452/0.99452/0.95106/0.86603/0.74314/0.58779/0.40674/0.20791/0.00000
 
diff --git a/examples/diary/2021-01-09.md b/examples/diary/2021-01-09.md
index ac22602..09e8f66 100644
--- a/examples/diary/2021-01-09.md
+++ b/examples/diary/2021-01-09.md
@@ -1,39 +1,46 @@
 ---
 tags: 
-mood: 7
-bloodpressure: 171.6/118.2
-bloodpressure1: 171.6, 118.2
-bloodpressure2: [171.6, 118.2]
-clock-in: 9:17
-clock-out: 20:27
-sleep: 10:11 pm/7:51 am
+mood: 2
+bloodpressure: 177.6/120.2
+bloodpressure1: 177.6, 120.2
+bloodpressure2: [177.6, 120.2]
+clock-in: 10:23
+clock-out: 18:32
+sleep: 11:3 pm/6:35 am
+deepValue: 
+    very: 
+        very: 
+            very: 
+                very: 
+                    very: 
+                        deep: 23.3
 ---
 
-#weight:80.7kg
+#weight:73.1kg
 
-#exercise-pushup:38
-#exercise-plank:76sec
+#exercise-pushup:37
+#exercise-plank:44sec
 
+#meditation
 
-⭐⭐⭐⭐
+⭐⭐
 
-#clean-up
 
-#finance/bank1:-3.1USD
+#finance/bank1:-3.7USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
 obsidian-tracker@gmail.com
-obsidian-tracker@yahoo.com
 
+weightlifting: 19
 
-dataviewTarget:: 23
-- Make Progress:: 20
-- Make-Progress:: 58
-dataviewTarget1:: 23/20
-dataviewTarget2:: 20 @ 58
-dataviewTarget3:: 20, 58
+dataviewTarget:: 62
+- Make Progress:: 44
+- Make-Progress:: 96
+dataviewTarget1:: 62/44
+dataviewTarget2:: 44 @ 96
+dataviewTarget3:: 44, 96
 
 #sin:0.99452/0.95106/0.86603/0.74314/0.58779/0.40674/0.20791/0.00000/-0.20791
 
diff --git a/examples/diary/2021-01-10.md b/examples/diary/2021-01-10.md
index ce5cc33..d8b26df 100644
--- a/examples/diary/2021-01-10.md
+++ b/examples/diary/2021-01-10.md
@@ -1,40 +1,45 @@
 ---
 tags: 
-mood: 9
-bloodpressure: 176/118
-bloodpressure1: 176, 118
-bloodpressure2: [176, 118]
-clock-in: 8:54
-clock-out: 18:37
-sleep: 11:54 pm/6:52 am
+mood: 7
+bloodpressure: 178/118
+bloodpressure1: 178, 118
+bloodpressure2: [178, 118]
+clock-in: 8:31
+clock-out: 17:43
+sleep: 9:7 pm/5:59 am
+deepValue: 
+    very: 
+        very: 
+            very: 
+                very: 
+                    very: 
+                        deep: 8.4
 ---
 
-#weight:72.6kg
+#weight:79.3kg
 
-#exercise-pushup:31
-#exercise-plank:77sec
+#exercise-pushup:38
+#exercise-plank:62sec
 
-#meditation
 
-⭐⭐⭐⭐
+⭐⭐
 
-#clean-up
 
 #finance/bank1:-2.2USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker+1@gmail.com
+obsidian-tracker@gmail.com
 
-weightlifting: 20
+weightlifting: 15
 
-dataviewTarget:: 35
-- Make Progress:: 47
-- Make-Progress:: 70
-dataviewTarget1:: 35/47
-dataviewTarget2:: 47 @ 70
-dataviewTarget3:: 47, 70
+dataviewTarget:: 65
+- Make Progress:: 27
+- Make-Progress:: 77
+dataviewTarget1:: 65/27
+dataviewTarget2:: 27 @ 77
+dataviewTarget3:: 27, 77
 
 #sin:0.95106/0.86603/0.74314/0.58779/0.40674/0.20791/0.00000/-0.20791/-0.40674
 
diff --git a/examples/diary/2021-01-11.md b/examples/diary/2021-01-11.md
index 7be3f2f..359bd58 100644
--- a/examples/diary/2021-01-11.md
+++ b/examples/diary/2021-01-11.md
@@ -1,41 +1,44 @@
 ---
 tags: work_log
 mood: 2
-bloodpressure: 168.4/117.8
-bloodpressure1: 168.4, 117.8
-bloodpressure2: [168.4, 117.8]
-clock-in: 8:6
-clock-out: 18:40
-sleep: 10:31 pm/6:6 am
+bloodpressure: 174.4/115.8
+bloodpressure1: 174.4, 115.8
+bloodpressure2: [174.4, 115.8]
+clock-in: 10:8
+clock-out: 16:2
+sleep: 9:49 pm/7:29 am
+deepValue: 
+    very: 
+        very: 
+            very: 
+                very: 
+                    very: 
+                        deep: 50.7
 ---
 
-#weight:72.0kg
+#weight:71.0kg
 
-#exercise-pushup:30
-#exercise-plank:110sec
+#exercise-pushup:43
+#exercise-plank:95sec
 
-#meditation
 
+⭐⭐⭐
 
 
-#clean-up
-
-#finance/bank1:-2.4USD
+#finance/bank1:-3.6USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@gmail.com
-obsidian-tracker+1@gmail.com
 
-weightlifting: 15
+weightlifting: 20
 
-dataviewTarget:: 64
-- Make Progress:: 36
-- Make-Progress:: 93
-dataviewTarget1:: 64/36
-dataviewTarget2:: 36 @ 93
-dataviewTarget3:: 36, 93
+dataviewTarget:: 18
+- Make Progress:: 31
+- Make-Progress:: 85
+dataviewTarget1:: 18/31
+dataviewTarget2:: 31 @ 85
+dataviewTarget3:: 31, 85
 
 #sin:0.86603/0.74314/0.58779/0.40674/0.20791/0.00000/-0.20791/-0.40674/-0.58779
 
diff --git a/examples/diary/2021-01-12.md b/examples/diary/2021-01-12.md
index 98bb8a5..c740387 100644
--- a/examples/diary/2021-01-12.md
+++ b/examples/diary/2021-01-12.md
@@ -1,39 +1,43 @@
 ---
 tags: work_log
-mood: 6
-bloodpressure: 177.8/118.6
-bloodpressure1: 177.8, 118.6
-bloodpressure2: [177.8, 118.6]
-clock-in: 9:8
-clock-out: 17:59
-sleep: 11:10 pm/6:41 am
+mood: 4
+bloodpressure: 169.8/117.6
+bloodpressure1: 169.8, 117.6
+bloodpressure2: [169.8, 117.6]
+clock-in: 9:31
+clock-out: 17:4
+sleep: 11:22 pm/6:1 am
+deepValue: 
+    very: 
+        very: 
+            very: 
+                very: 
+                    very: 
+                        deep: 1.4
 ---
 
-#weight:67.9kg
+#weight:78.4kg
 
-#exercise-pushup:34
-#exercise-plank:70sec
+#exercise-pushup:45
+#exercise-plank:37sec
 
-#meditation
 
-⭐⭐⭐
 
 
-#finance/bank1:-2.1USD
+
+#finance/bank1:-3.7USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@gmail.com
-obsidian-tracker@yahoo.com
 
 
-dataviewTarget:: 88
-- Make Progress:: 36
-- Make-Progress:: 54
-dataviewTarget1:: 88/36
-dataviewTarget2:: 36 @ 54
-dataviewTarget3:: 36, 54
+dataviewTarget:: 12
+- Make Progress:: 0
+- Make-Progress:: 67
+dataviewTarget1:: 12/0
+dataviewTarget2:: 0 @ 67
+dataviewTarget3:: 0, 67
 
 #sin:0.74314/0.58779/0.40674/0.20791/0.00000/-0.20791/-0.40674/-0.58779/-0.74314
 
diff --git a/examples/diary/2021-01-13.md b/examples/diary/2021-01-13.md
index 2b15abb..9cd34f6 100644
--- a/examples/diary/2021-01-13.md
+++ b/examples/diary/2021-01-13.md
@@ -1,40 +1,45 @@
 ---
 tags: work_log
-mood: 10
-bloodpressure: 167.2/116.4
-bloodpressure1: 167.2, 116.4
-bloodpressure2: [167.2, 116.4]
+mood: 7
+bloodpressure: 176.2/116.4
+bloodpressure1: 176.2, 116.4
+bloodpressure2: [176.2, 116.4]
 clock-in: 10:23
-clock-out: 17:15
-sleep: 10:4 pm/5:0 am
+clock-out: 16:5
+sleep: 11:47 pm/7:19 am
+deepValue: 
+    very: 
+        very: 
+            very: 
+                very: 
+                    very: 
+                        deep: 47.9
 ---
 
-#weight:67.3kg
+#weight:79.5kg
 
-#exercise-pushup:43
-#exercise-plank:110sec
+#exercise-pushup:32
+#exercise-plank:53sec
 
 #meditation
 
-⭐⭐⭐⭐⭐
 
 
-#finance/bank1:-2.4USD
+
+#finance/bank1:-2.0USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker+1@gmail.com
-obsidian-tracker@yahoo.com
 
-weightlifting: 17
+weightlifting: 16
 
-dataviewTarget:: 47
-- Make Progress:: 47
-- Make-Progress:: 55
-dataviewTarget1:: 47/47
-dataviewTarget2:: 47 @ 55
-dataviewTarget3:: 47, 55
+dataviewTarget:: 56
+- Make Progress:: 34
+- Make-Progress:: 58
+dataviewTarget1:: 56/34
+dataviewTarget2:: 34 @ 58
+dataviewTarget3:: 34, 58
 
 #sin:0.58779/0.40674/0.20791/0.00000/-0.20791/-0.40674/-0.58779/-0.74314/-0.86603
 
diff --git a/examples/diary/2021-01-14.md b/examples/diary/2021-01-14.md
index 63fb0d9..ee320fe 100644
--- a/examples/diary/2021-01-14.md
+++ b/examples/diary/2021-01-14.md
@@ -1,38 +1,46 @@
 ---
 tags: work_log
-mood: 3
-bloodpressure: 167.6/115.2
-bloodpressure1: 167.6, 115.2
-bloodpressure2: [167.6, 115.2]
-clock-in: 9:0
-clock-out: 16:2
-sleep: 10:37 pm/6:33 am
+mood: 5
+bloodpressure: 167.6/117.2
+bloodpressure1: 167.6, 117.2
+bloodpressure2: [167.6, 117.2]
+clock-in: 10:7
+clock-out: 16:5
+sleep: 9:9 pm/7:54 am
+deepValue: 
+    very: 
+        very: 
+            very: 
+                very: 
+                    very: 
+                        deep: 46.6
 ---
 
-#weight:74.1kg
+#weight:61.9kg
 
-#exercise-pushup:33
-#exercise-plank:75sec
+#exercise-pushup:39
+#exercise-plank:111sec
 
 #meditation
 
-⭐⭐⭐
 
 
-#finance/bank1:-2.3USD
+
+#finance/bank1:-2.7USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
+obsidian-tracker@yahoo.com
 
-weightlifting: 11
+weightlifting: 20
 
-dataviewTarget:: 91
-- Make Progress:: 23
-- Make-Progress:: 54
-dataviewTarget1:: 91/23
-dataviewTarget2:: 23 @ 54
-dataviewTarget3:: 23, 54
+dataviewTarget:: 61
+- Make Progress:: 41
+- Make-Progress:: 68
+dataviewTarget1:: 61/41
+dataviewTarget2:: 41 @ 68
+dataviewTarget3:: 41, 68
 
 #sin:0.40674/0.20791/0.00000/-0.20791/-0.40674/-0.58779/-0.74314/-0.86603/-0.95106
 
diff --git a/examples/diary/2021-01-15.md b/examples/diary/2021-01-15.md
index 57514b8..3ecd7ef 100644
--- a/examples/diary/2021-01-15.md
+++ b/examples/diary/2021-01-15.md
@@ -1,21 +1,28 @@
 ---
 tags: work_log
-mood: 5
-bloodpressure: 175/117
-bloodpressure1: 175, 117
-bloodpressure2: [175, 117]
-clock-in: 8:53
-clock-out: 17:19
-sleep: 9:40 pm/7:25 am
+mood: 7
+bloodpressure: 168/116
+bloodpressure1: 168, 116
+bloodpressure2: [168, 116]
+clock-in: 8:13
+clock-out: 18:16
+sleep: 9:28 pm/7:25 am
+deepValue: 
+    very: 
+        very: 
+            very: 
+                very: 
+                    very: 
+                        deep: 10.0
 ---
 
-#weight:72.8kg
+#weight:77.4kg
+
+#exercise-pushup:33
+#exercise-plank:32sec
 
-#exercise-pushup:47
-#exercise-plank:63sec
 
 
-⭐
 
 
 #finance/bank1:-2.7USD
@@ -23,16 +30,18 @@ sleep: 9:40 pm/7:25 am
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
+obsidian-tracker@gmail.com
 obsidian-tracker+1@gmail.com
+obsidian-tracker@yahoo.com
 
-weightlifting: 11
+weightlifting: 12
 
-dataviewTarget:: 89
-- Make Progress:: 21
-- Make-Progress:: 55
-dataviewTarget1:: 89/21
-dataviewTarget2:: 21 @ 55
-dataviewTarget3:: 21, 55
+dataviewTarget:: 74
+- Make Progress:: 22
+- Make-Progress:: 73
+dataviewTarget1:: 74/22
+dataviewTarget2:: 22 @ 73
+dataviewTarget3:: 22, 73
 
 #sin:0.20791/0.00000/-0.20791/-0.40674/-0.58779/-0.74314/-0.86603/-0.95106/-0.99452
 
diff --git a/examples/diary/2021-01-16.md b/examples/diary/2021-01-16.md
index edc0e18..12688a7 100644
--- a/examples/diary/2021-01-16.md
+++ b/examples/diary/2021-01-16.md
@@ -1,39 +1,46 @@
 ---
 tags: 
-mood: 9
-bloodpressure: 166.4/114.8
-bloodpressure1: 166.4, 114.8
-bloodpressure2: [166.4, 114.8]
-clock-in: 10:4
-clock-out: 18:20
-sleep: 10:40 pm/7:14 am
+mood: 5
+bloodpressure: 173.4/114.8
+bloodpressure1: 173.4, 114.8
+bloodpressure2: [173.4, 114.8]
+clock-in: 8:32
+clock-out: 17:4
+sleep: 9:51 pm/6:15 am
+deepValue: 
+    very: 
+        very: 
+            very: 
+                very: 
+                    very: 
+                        deep: 61.0
 ---
 
-#weight:71.9kg
+#weight:63.1kg
 
-#exercise-pushup:45
-#exercise-plank:69sec
+#exercise-pushup:43
+#exercise-plank:110sec
 
-#meditation
 
 ⭐⭐
 
 
-#finance/bank1:-2.1USD
+#finance/bank1:-3.1USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
+obsidian-tracker@gmail.com
 obsidian-tracker+1@gmail.com
 
-weightlifting: 10
+weightlifting: 20
 
-dataviewTarget:: 86
-- Make Progress:: 20
-- Make-Progress:: 63
-dataviewTarget1:: 86/20
-dataviewTarget2:: 20 @ 63
-dataviewTarget3:: 20, 63
+dataviewTarget:: 54
+- Make Progress:: 34
+- Make-Progress:: 91
+dataviewTarget1:: 54/34
+dataviewTarget2:: 34 @ 91
+dataviewTarget3:: 34, 91
 
 #sin:0.00000/-0.20791/-0.40674/-0.58779/-0.74314/-0.86603/-0.95106/-0.99452/-0.99452
 
diff --git a/examples/diary/2021-01-17.md b/examples/diary/2021-01-17.md
index 32a9ce7..5b43b54 100644
--- a/examples/diary/2021-01-17.md
+++ b/examples/diary/2021-01-17.md
@@ -1,39 +1,44 @@
 ---
 tags: 
-mood: 7
-bloodpressure: 165.8/117.6
-bloodpressure1: 165.8, 117.6
-bloodpressure2: [165.8, 117.6]
-clock-in: 10:48
-clock-out: 17:8
-sleep: 10:54 pm/6:3 am
+mood: 5
+bloodpressure: 168.8/118.6
+bloodpressure1: 168.8, 118.6
+bloodpressure2: [168.8, 118.6]
+clock-in: 9:25
+clock-out: 17:18
+sleep: 9:42 pm/5:42 am
+deepValue: 
+    very: 
+        very: 
+            very: 
+                very: 
+                    very: 
+                        deep: 15.4
 ---
 
-#weight:79.8kg
+#weight:63.5kg
 
 #exercise-pushup:38
-#exercise-plank:79sec
+#exercise-plank:107sec
 
 
-⭐⭐⭐⭐
+⭐
 
 
-#finance/bank1:-2.8USD
+#finance/bank1:-2.4USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@gmail.com
-obsidian-tracker+1@gmail.com
 
-weightlifting: 13
+weightlifting: 14
 
-dataviewTarget:: 5
-- Make Progress:: 35
-- Make-Progress:: 50
-dataviewTarget1:: 5/35
-dataviewTarget2:: 35 @ 50
-dataviewTarget3:: 35, 50
+dataviewTarget:: 70
+- Make Progress:: 17
+- Make-Progress:: 75
+dataviewTarget1:: 70/17
+dataviewTarget2:: 17 @ 75
+dataviewTarget3:: 17, 75
 
 #sin:-0.20791/-0.40674/-0.58779/-0.74314/-0.86603/-0.95106/-0.99452/-0.99452/-0.95106
 
diff --git a/examples/diary/2021-01-18.md b/examples/diary/2021-01-18.md
index 2f387fd..22baab9 100644
--- a/examples/diary/2021-01-18.md
+++ b/examples/diary/2021-01-18.md
@@ -1,39 +1,46 @@
 ---
 tags: work_log
-mood: 8
-bloodpressure: 165.2/114.4
-bloodpressure1: 165.2, 114.4
-bloodpressure2: [165.2, 114.4]
-clock-in: 9:50
-clock-out: 19:13
-sleep: 9:10 pm/5:3 am
+mood: 5
+bloodpressure: 166.2/118.4
+bloodpressure1: 166.2, 118.4
+bloodpressure2: [166.2, 118.4]
+clock-in: 10:44
+clock-out: 19:39
+sleep: 11:31 pm/5:44 am
+deepValue: 
+    very: 
+        very: 
+            very: 
+                very: 
+                    very: 
+                        deep: 68.6
 ---
 
-#weight:61.2kg
+#weight:64.2kg
 
-#exercise-pushup:38
-#exercise-plank:73sec
+#exercise-pushup:39
+#exercise-plank:99sec
 
 
-⭐⭐
+⭐⭐⭐⭐⭐
 
 
-#finance/bank1:-2.9USD
+#finance/bank1:-2.6USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker+1@gmail.com
+obsidian-tracker@gmail.com
 obsidian-tracker@yahoo.com
 
-weightlifting: 18
+weightlifting: 16
 
-dataviewTarget:: 67
-- Make Progress:: 41
-- Make-Progress:: 76
-dataviewTarget1:: 67/41
-dataviewTarget2:: 41 @ 76
-dataviewTarget3:: 41, 76
+dataviewTarget:: 2
+- Make Progress:: 8
+- Make-Progress:: 93
+dataviewTarget1:: 2/8
+dataviewTarget2:: 8 @ 93
+dataviewTarget3:: 8, 93
 
 #sin:-0.40674/-0.58779/-0.74314/-0.86603/-0.95106/-0.99452/-0.99452/-0.95106/-0.86603
 
diff --git a/examples/diary/2021-01-19.md b/examples/diary/2021-01-19.md
index 6057d79..6edf412 100644
--- a/examples/diary/2021-01-19.md
+++ b/examples/diary/2021-01-19.md
@@ -1,39 +1,45 @@
 ---
 tags: work_log
-mood: 1
-bloodpressure: 171.6/117.2
-bloodpressure1: 171.6, 117.2
-bloodpressure2: [171.6, 117.2]
-clock-in: 8:27
-clock-out: 19:38
-sleep: 11:7 pm/5:53 am
+mood: 9
+bloodpressure: 165.6/118.2
+bloodpressure1: 165.6, 118.2
+bloodpressure2: [165.6, 118.2]
+clock-in: 9:31
+clock-out: 16:13
+sleep: 11:39 pm/6:11 am
+deepValue: 
+    very: 
+        very: 
+            very: 
+                very: 
+                    very: 
+                        deep: 44.1
 ---
 
-#weight:63.5kg
+#weight:80.0kg
 
-#exercise-pushup:46
-#exercise-plank:87sec
+#exercise-pushup:35
+#exercise-plank:55sec
 
 
+⭐⭐⭐
 
 
-
-#finance/bank1:-3.7USD
+#finance/bank1:-3.1USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@gmail.com
-obsidian-tracker@yahoo.com
+obsidian-tracker+1@gmail.com
 
-weightlifting: 16
+weightlifting: 15
 
-dataviewTarget:: 4
-- Make Progress:: 11
-- Make-Progress:: 100
-dataviewTarget1:: 4/11
-dataviewTarget2:: 11 @ 100
-dataviewTarget3:: 11, 100
+dataviewTarget:: 71
+- Make Progress:: 9
+- Make-Progress:: 79
+dataviewTarget1:: 71/9
+dataviewTarget2:: 9 @ 79
+dataviewTarget3:: 9, 79
 
 #sin:-0.58779/-0.74314/-0.86603/-0.95106/-0.99452/-0.99452/-0.95106/-0.86603/-0.74314
 
diff --git a/examples/diary/2021-01-20.md b/examples/diary/2021-01-20.md
index 6af17c5..6556c0e 100644
--- a/examples/diary/2021-01-20.md
+++ b/examples/diary/2021-01-20.md
@@ -1,39 +1,45 @@
 ---
 tags: work_log
-mood: 7
-bloodpressure: 169/114
-bloodpressure1: 169, 114
-bloodpressure2: [169, 114]
-clock-in: 9:57
-clock-out: 17:16
-sleep: 11:37 pm/6:33 am
+mood: 10
+bloodpressure: 163/115
+bloodpressure1: 163, 115
+bloodpressure2: [163, 115]
+clock-in: 9:49
+clock-out: 18:2
+sleep: 10:46 pm/7:45 am
+deepValue: 
+    very: 
+        very: 
+            very: 
+                very: 
+                    very: 
+                        deep: 22.5
 ---
 
-#weight:64.3kg
+#weight:60.6kg
 
-#exercise-pushup:44
-#exercise-plank:45sec
+#exercise-pushup:43
+#exercise-plank:66sec
 
 
-⭐
 
 
-#finance/bank1:-2.4USD
+
+#finance/bank1:-3.9USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@gmail.com
-obsidian-tracker+1@gmail.com
+obsidian-tracker@yahoo.com
 
-weightlifting: 13
+weightlifting: 14
 
-dataviewTarget:: 82
-- Make Progress:: 21
-- Make-Progress:: 52
-dataviewTarget1:: 82/21
-dataviewTarget2:: 21 @ 52
-dataviewTarget3:: 21, 52
+dataviewTarget:: 99
+- Make Progress:: 11
+- Make-Progress:: 53
+dataviewTarget1:: 99/11
+dataviewTarget2:: 11 @ 53
+dataviewTarget3:: 11, 53
 
 #sin:-0.74314/-0.86603/-0.95106/-0.99452/-0.99452/-0.95106/-0.86603/-0.74314/-0.58779
 
diff --git a/examples/diary/2021-01-21.md b/examples/diary/2021-01-21.md
index 4aff3c6..009ce2b 100644
--- a/examples/diary/2021-01-21.md
+++ b/examples/diary/2021-01-21.md
@@ -1,37 +1,45 @@
 ---
 tags: work_log
-mood: 4
-bloodpressure: 170.4/116.8
-bloodpressure1: 170.4, 116.8
-bloodpressure2: [170.4, 116.8]
-clock-in: 10:13
-clock-out: 16:37
-sleep: 10:43 pm/5:10 am
+mood: 5
+bloodpressure: 169.4/117.8
+bloodpressure1: 169.4, 117.8
+bloodpressure2: [169.4, 117.8]
+clock-in: 9:59
+clock-out: 16:39
+sleep: 10:38 pm/5:35 am
+deepValue: 
+    very: 
+        very: 
+            very: 
+                very: 
+                    very: 
+                        deep: 12.5
 ---
 
-#weight:80.1kg
+#weight:61.8kg
 
-#exercise-pushup:38
-#exercise-plank:37sec
+#exercise-pushup:32
+#exercise-plank:105sec
 
 
-⭐⭐
+⭐⭐⭐
 
 
-#finance/bank1:-4.0USD
+#finance/bank1:-2.2USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
+obsidian-tracker@yahoo.com
 
-weightlifting: 17
+weightlifting: 10
 
-dataviewTarget:: 56
-- Make Progress:: 50
-- Make-Progress:: 57
-dataviewTarget1:: 56/50
-dataviewTarget2:: 50 @ 57
-dataviewTarget3:: 50, 57
+dataviewTarget:: 8
+- Make Progress:: 37
+- Make-Progress:: 74
+dataviewTarget1:: 8/37
+dataviewTarget2:: 37 @ 74
+dataviewTarget3:: 37, 74
 
 #sin:-0.86603/-0.95106/-0.99452/-0.99452/-0.95106/-0.86603/-0.74314/-0.58779/-0.40674
 
diff --git a/examples/diary/2021-01-22.md b/examples/diary/2021-01-22.md
index 0c7c474..0d69867 100644
--- a/examples/diary/2021-01-22.md
+++ b/examples/diary/2021-01-22.md
@@ -1,39 +1,45 @@
 ---
 tags: work_log
-mood: 7
-bloodpressure: 167.8/116.6
-bloodpressure1: 167.8, 116.6
-bloodpressure2: [167.8, 116.6]
-clock-in: 8:35
-clock-out: 16:5
-sleep: 9:49 pm/6:38 am
+mood: 5
+bloodpressure: 168.8/115.6
+bloodpressure1: 168.8, 115.6
+bloodpressure2: [168.8, 115.6]
+clock-in: 9:6
+clock-out: 17:57
+sleep: 11:28 pm/6:45 am
+deepValue: 
+    very: 
+        very: 
+            very: 
+                very: 
+                    very: 
+                        deep: 39.0
 ---
 
-#weight:60.2kg
+#weight:77.6kg
 
-#exercise-pushup:31
-#exercise-plank:46sec
+#exercise-pushup:32
+#exercise-plank:48sec
 
-#meditation
 
-⭐⭐⭐⭐
+⭐⭐⭐
 
 
-#finance/bank1:-2.7USD
+#finance/bank1:-3.6USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker+1@gmail.com
+obsidian-tracker@yahoo.com
 
-weightlifting: 15
+weightlifting: 14
 
-dataviewTarget:: 48
-- Make Progress:: 32
-- Make-Progress:: 55
-dataviewTarget1:: 48/32
-dataviewTarget2:: 32 @ 55
-dataviewTarget3:: 32, 55
+dataviewTarget:: 64
+- Make Progress:: 27
+- Make-Progress:: 90
+dataviewTarget1:: 64/27
+dataviewTarget2:: 27 @ 90
+dataviewTarget3:: 27, 90
 
 #sin:-0.95106/-0.99452/-0.99452/-0.95106/-0.86603/-0.74314/-0.58779/-0.40674/-0.20791
 
diff --git a/examples/diary/2021-01-23.md b/examples/diary/2021-01-23.md
index 35b0478..68a1da4 100644
--- a/examples/diary/2021-01-23.md
+++ b/examples/diary/2021-01-23.md
@@ -1,41 +1,46 @@
 ---
 tags: 
-mood: 4
-bloodpressure: 171.2/116.4
-bloodpressure1: 171.2, 116.4
-bloodpressure2: [171.2, 116.4]
-clock-in: 9:38
-clock-out: 19:23
-sleep: 11:8 pm/5:50 am
+mood: 5
+bloodpressure: 167.2/115.4
+bloodpressure1: 167.2, 115.4
+bloodpressure2: [167.2, 115.4]
+clock-in: 8:12
+clock-out: 20:13
+sleep: 9:46 pm/7:12 am
+deepValue: 
+    very: 
+        very: 
+            very: 
+                very: 
+                    very: 
+                        deep: 66.0
 ---
 
-#weight:73.9kg
+#weight:73.5kg
 
-#exercise-pushup:48
-#exercise-plank:104sec
+#exercise-pushup:46
+#exercise-plank:55sec
 
 #meditation
 
-⭐⭐
 
 
-#finance/bank1:-2.8USD
+
+#finance/bank1:-2.7USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@gmail.com
 obsidian-tracker+1@gmail.com
-obsidian-tracker@yahoo.com
 
-weightlifting: 18
+weightlifting: 10
 
-dataviewTarget:: 57
-- Make Progress:: 21
-- Make-Progress:: 61
-dataviewTarget1:: 57/21
-dataviewTarget2:: 21 @ 61
-dataviewTarget3:: 21, 61
+dataviewTarget:: 53
+- Make Progress:: 38
+- Make-Progress:: 81
+dataviewTarget1:: 53/38
+dataviewTarget2:: 38 @ 81
+dataviewTarget3:: 38, 81
 
 #sin:-0.99452/-0.99452/-0.95106/-0.86603/-0.74314/-0.58779/-0.40674/-0.20791/-0.00000
 
diff --git a/examples/diary/2021-01-24.md b/examples/diary/2021-01-24.md
index e82e8f2..f0a44b0 100644
--- a/examples/diary/2021-01-24.md
+++ b/examples/diary/2021-01-24.md
@@ -1,39 +1,47 @@
 ---
 tags: 
-mood: 3
-bloodpressure: 169.6/114.2
-bloodpressure1: 169.6, 114.2
-bloodpressure2: [169.6, 114.2]
-clock-in: 8:46
-clock-out: 20:12
-sleep: 10:38 pm/7:16 am
+mood: 7
+bloodpressure: 165.6/114.2
+bloodpressure1: 165.6, 114.2
+bloodpressure2: [165.6, 114.2]
+clock-in: 8:41
+clock-out: 18:17
+sleep: 10:49 pm/6:41 am
+deepValue: 
+    very: 
+        very: 
+            very: 
+                very: 
+                    very: 
+                        deep: 78.8
 ---
 
-#weight:63.7kg
+#weight:68.8kg
 
-#exercise-pushup:31
-#exercise-plank:59sec
+#exercise-pushup:37
+#exercise-plank:81sec
 
 #meditation
 
+⭐
 
 
-
-#finance/bank1:-2.2USD
+#finance/bank1:-3.0USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
+obsidian-tracker+1@gmail.com
 obsidian-tracker@yahoo.com
 
-weightlifting: 18
+weightlifting: 19
 
-dataviewTarget:: 62
-- Make Progress:: 26
-- Make-Progress:: 68
-dataviewTarget1:: 62/26
-dataviewTarget2:: 26 @ 68
-dataviewTarget3:: 26, 68
+dataviewTarget:: 98
+- Make Progress:: 1
+- Make-Progress:: 60
+dataviewTarget1:: 98/1
+dataviewTarget2:: 1 @ 60
+dataviewTarget3:: 1, 60
 
 #sin:-0.99452/-0.95106/-0.86603/-0.74314/-0.58779/-0.40674/-0.20791/-0.00000/0.20791
 
diff --git a/examples/diary/2021-01-25.md b/examples/diary/2021-01-25.md
index f730597..85adb37 100644
--- a/examples/diary/2021-01-25.md
+++ b/examples/diary/2021-01-25.md
@@ -1,25 +1,31 @@
 ---
 tags: work_log
-mood: 2
-bloodpressure: 167/115
-bloodpressure1: 167, 115
-bloodpressure2: [167, 115]
-clock-in: 8:20
-clock-out: 20:35
-sleep: 11:46 pm/6:22 am
+mood: 1
+bloodpressure: 165/113
+bloodpressure1: 165, 113
+bloodpressure2: [165, 113]
+clock-in: 9:53
+clock-out: 16:33
+sleep: 10:11 pm/6:9 am
+deepValue: 
+    very: 
+        very: 
+            very: 
+                very: 
+                    very: 
+                        deep: 33.4
 ---
 
-#weight:71.9kg
+#weight:74.9kg
 
-#exercise-pushup:35
-#exercise-plank:46sec
+#exercise-pushup:33
+#exercise-plank:91sec
 
-#meditation
 
-⭐⭐
+⭐
 
 
-#finance/bank1:-3.1USD
+#finance/bank1:-2.2USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
@@ -27,13 +33,14 @@ sleep: 11:46 pm/6:22 am
 obsidian-tracker@gmail.com
 obsidian-tracker+1@gmail.com
 
+weightlifting: 12
 
-dataviewTarget:: 21
-- Make Progress:: 1
-- Make-Progress:: 77
-dataviewTarget1:: 21/1
-dataviewTarget2:: 1 @ 77
-dataviewTarget3:: 1, 77
+dataviewTarget:: 85
+- Make Progress:: 36
+- Make-Progress:: 64
+dataviewTarget1:: 85/36
+dataviewTarget2:: 36 @ 64
+dataviewTarget3:: 36, 64
 
 #sin:-0.95106/-0.86603/-0.74314/-0.58779/-0.40674/-0.20791/-0.00000/0.20791/0.40674
 
diff --git a/examples/diary/2021-01-26.md b/examples/diary/2021-01-26.md
index 4321670..ba3b8dd 100644
--- a/examples/diary/2021-01-26.md
+++ b/examples/diary/2021-01-26.md
@@ -1,39 +1,46 @@
 ---
 tags: work_log
-mood: 2
-bloodpressure: 162.4/116.8
-bloodpressure1: 162.4, 116.8
-bloodpressure2: [162.4, 116.8]
-clock-in: 8:33
-clock-out: 17:11
-sleep: 10:9 pm/5:42 am
+mood: 7
+bloodpressure: 168.4/113.8
+bloodpressure1: 168.4, 113.8
+bloodpressure2: [168.4, 113.8]
+clock-in: 10:24
+clock-out: 20:21
+sleep: 9:48 pm/5:2 am
+deepValue: 
+    very: 
+        very: 
+            very: 
+                very: 
+                    very: 
+                        deep: 89.2
 ---
 
-#weight:63.4kg
+#weight:79.1kg
 
-#exercise-pushup:44
-#exercise-plank:107sec
+#exercise-pushup:32
+#exercise-plank:102sec
 
-#meditation
 
-⭐⭐⭐
+⭐
 
 
-#finance/bank1:-3.9USD
+#finance/bank1:-2.9USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
 obsidian-tracker@gmail.com
+obsidian-tracker@yahoo.com
 
-weightlifting: 19
+weightlifting: 12
 
 dataviewTarget:: 71
-- Make Progress:: 14
-- Make-Progress:: 83
-dataviewTarget1:: 71/14
-dataviewTarget2:: 14 @ 83
-dataviewTarget3:: 14, 83
+- Make Progress:: 13
+- Make-Progress:: 66
+dataviewTarget1:: 71/13
+dataviewTarget2:: 13 @ 66
+dataviewTarget3:: 13, 66
 
 #sin:-0.86603/-0.74314/-0.58779/-0.40674/-0.20791/-0.00000/0.20791/0.40674/0.58779
 
diff --git a/examples/diary/2021-01-27.md b/examples/diary/2021-01-27.md
index 8624562..59526d2 100644
--- a/examples/diary/2021-01-27.md
+++ b/examples/diary/2021-01-27.md
@@ -1,39 +1,46 @@
 ---
 tags: work_log
-mood: 9
-bloodpressure: 160.8/116.6
-bloodpressure1: 160.8, 116.6
-bloodpressure2: [160.8, 116.6]
-clock-in: 9:53
-clock-out: 17:3
-sleep: 11:6 pm/5:52 am
+mood: 6
+bloodpressure: 166.8/114.6
+bloodpressure1: 166.8, 114.6
+bloodpressure2: [166.8, 114.6]
+clock-in: 9:12
+clock-out: 19:36
+sleep: 10:2 pm/7:36 am
+deepValue: 
+    very: 
+        very: 
+            very: 
+                very: 
+                    very: 
+                        deep: 58.7
 ---
 
-#weight:79.1kg
+#weight:79.5kg
 
-#exercise-pushup:32
-#exercise-plank:102sec
+#exercise-pushup:38
+#exercise-plank:59sec
 
+#meditation
 
-⭐
+⭐⭐⭐
 
 
-#finance/bank1:-2.9USD
+#finance/bank1:-2.2USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
 obsidian-tracker@gmail.com
-obsidian-tracker@yahoo.com
 
-weightlifting: 12
+weightlifting: 14
 
-dataviewTarget:: 71
-- Make Progress:: 13
-- Make-Progress:: 66
-dataviewTarget1:: 71/13
-dataviewTarget2:: 13 @ 66
-dataviewTarget3:: 13, 66
+dataviewTarget:: 86
+- Make Progress:: 26
+- Make-Progress:: 68
+dataviewTarget1:: 86/26
+dataviewTarget2:: 26 @ 68
+dataviewTarget3:: 26, 68
 
 #sin:-0.74314/-0.58779/-0.40674/-0.20791/-0.00000/0.20791/0.40674/0.58779/0.74314
 
diff --git a/examples/diary/2021-01-28.md b/examples/diary/2021-01-28.md
index 0d35093..5943460 100644
--- a/examples/diary/2021-01-28.md
+++ b/examples/diary/2021-01-28.md
@@ -1,39 +1,45 @@
 ---
 tags: work_log
-mood: 6
-bloodpressure: 166.2/114.4
-bloodpressure1: 166.2, 114.4
-bloodpressure2: [166.2, 114.4]
-clock-in: 9:12
-clock-out: 19:36
-sleep: 10:2 pm/7:36 am
+mood: 7
+bloodpressure: 160.2/116.4
+bloodpressure1: 160.2, 116.4
+bloodpressure2: [160.2, 116.4]
+clock-in: 9:28
+clock-out: 16:58
+sleep: 10:28 pm/5:46 am
+deepValue: 
+    very: 
+        very: 
+            very: 
+                very: 
+                    very: 
+                        deep: 17.7
 ---
 
-#weight:72.2kg
+#weight:76.2kg
 
-#exercise-pushup:49
-#exercise-plank:68sec
+#exercise-pushup:32
+#exercise-plank:58sec
 
-#meditation
 
-⭐⭐
 
 
-#finance/bank1:-2.6USD
+
+#finance/bank1:-2.5USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
 obsidian-tracker+1@gmail.com
 
-weightlifting: 11
+weightlifting: 15
 
-dataviewTarget:: 39
-- Make Progress:: 43
-- Make-Progress:: 76
-dataviewTarget1:: 39/43
-dataviewTarget2:: 43 @ 76
-dataviewTarget3:: 43, 76
+dataviewTarget:: 62
+- Make Progress:: 17
+- Make-Progress:: 81
+dataviewTarget1:: 62/17
+dataviewTarget2:: 17 @ 81
+dataviewTarget3:: 17, 81
 
 #sin:-0.58779/-0.40674/-0.20791/-0.00000/0.20791/0.40674/0.58779/0.74314/0.86603
 
diff --git a/examples/diary/2021-01-29.md b/examples/diary/2021-01-29.md
index 8cfa359..9139fcd 100644
--- a/examples/diary/2021-01-29.md
+++ b/examples/diary/2021-01-29.md
@@ -1,38 +1,46 @@
 ---
 tags: work_log
-mood: 4
-bloodpressure: 164.6/113.2
-bloodpressure1: 164.6, 113.2
-bloodpressure2: [164.6, 113.2]
-clock-in: 10:28
-clock-out: 18:4
-sleep: 11:34 pm/6:12 am
+mood: 2
+bloodpressure: 157.6/115.2
+bloodpressure1: 157.6, 115.2
+bloodpressure2: [157.6, 115.2]
+clock-in: 10:44
+clock-out: 16:41
+sleep: 10:27 pm/5:11 am
+deepValue: 
+    very: 
+        very: 
+            very: 
+                very: 
+                    very: 
+                        deep: 80.6
 ---
 
-#weight:76.3kg
+#weight:79.2kg
 
-#exercise-pushup:33
-#exercise-plank:100sec
+#exercise-pushup:36
+#exercise-plank:90sec
 
-#meditation
 
-⭐
 
 
-#finance/bank1:-2.3USD
+
+#finance/bank1:-3.9USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
+obsidian-tracker@gmail.com
+obsidian-tracker@yahoo.com
 
 weightlifting: 18
 
-dataviewTarget:: 54
-- Make Progress:: 29
-- Make-Progress:: 81
-dataviewTarget1:: 54/29
-dataviewTarget2:: 29 @ 81
-dataviewTarget3:: 29, 81
+dataviewTarget:: 36
+- Make Progress:: 33
+- Make-Progress:: 92
+dataviewTarget1:: 36/33
+dataviewTarget2:: 33 @ 92
+dataviewTarget3:: 33, 92
 
 #sin:-0.40674/-0.20791/-0.00000/0.20791/0.40674/0.58779/0.74314/0.86603/0.95106
 
diff --git a/examples/diary/2021-01-30.md b/examples/diary/2021-01-30.md
index e7f7c71..30adfd6 100644
--- a/examples/diary/2021-01-30.md
+++ b/examples/diary/2021-01-30.md
@@ -1,24 +1,32 @@
 ---
 tags: 
-mood: 4
-bloodpressure: 163/112
-bloodpressure1: 163, 112
-bloodpressure2: [163, 112]
-clock-in: 8:39
-clock-out: 20:44
-sleep: 9:41 pm/6:27 am
+mood: 7
+bloodpressure: 165/114
+bloodpressure1: 165, 114
+bloodpressure2: [165, 114]
+clock-in: 8:16
+clock-out: 17:2
+sleep: 10:51 pm/7:29 am
+deepValue: 
+    very: 
+        very: 
+            very: 
+                very: 
+                    very: 
+                        deep: 65.7
 ---
 
-#weight:60.1kg
+#weight:63.9kg
 
 #exercise-pushup:33
-#exercise-plank:102sec
+#exercise-plank:83sec
 
+#meditation
 
-⭐
+⭐⭐⭐⭐
 
 
-#finance/bank1:-3.2USD
+#finance/bank1:-3.9USD
 #finance/bank2:200USD
 #finance/bank2/transfer:-100USD
 #finance/bank1/transfer:100USD
@@ -26,16 +34,15 @@ sleep: 9:41 pm/6:27 am
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@yahoo.com
 
-weightlifting: 19
+weightlifting: 18
 
-dataviewTarget:: 99
-- Make Progress:: 38
-- Make-Progress:: 64
-dataviewTarget1:: 99/38
-dataviewTarget2:: 38 @ 64
-dataviewTarget3:: 38, 64
+dataviewTarget:: 69
+- Make Progress:: 48
+- Make-Progress:: 94
+dataviewTarget1:: 69/48
+dataviewTarget2:: 48 @ 94
+dataviewTarget3:: 48, 94
 
 #sin:-0.20791/-0.00000/0.20791/0.40674/0.58779/0.74314/0.86603/0.95106/0.99452
 
diff --git a/examples/diary/2021-01-31.md b/examples/diary/2021-01-31.md
index dfa3907..50858f6 100644
--- a/examples/diary/2021-01-31.md
+++ b/examples/diary/2021-01-31.md
@@ -1,38 +1,46 @@
 ---
 tags: 
-mood: 4
-bloodpressure: 163.4/115.8
-bloodpressure1: 163.4, 115.8
-bloodpressure2: [163.4, 115.8]
-clock-in: 9:44
-clock-out: 18:10
-sleep: 9:19 pm/5:35 am
+mood: 8
+bloodpressure: 159.4/113.8
+bloodpressure1: 159.4, 113.8
+bloodpressure2: [159.4, 113.8]
+clock-in: 8:30
+clock-out: 20:24
+sleep: 10:4 pm/7:10 am
+deepValue: 
+    very: 
+        very: 
+            very: 
+                very: 
+                    very: 
+                        deep: 32.2
 ---
 
-#weight:78.1kg
+#weight:76.4kg
 
-#exercise-pushup:46
-#exercise-plank:74sec
+#exercise-pushup:33
+#exercise-plank:44sec
 
+#meditation
 
-⭐
+⭐⭐⭐
 
 
-#finance/bank1:-3.2USD
+#finance/bank1:-3.0USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker+1@gmail.com
+obsidian-tracker@gmail.com
+obsidian-tracker@yahoo.com
 
-weightlifting: 20
 
-dataviewTarget:: 6
-- Make Progress:: 2
-- Make-Progress:: 89
-dataviewTarget1:: 6/2
-dataviewTarget2:: 2 @ 89
-dataviewTarget3:: 2, 89
+dataviewTarget:: 7
+- Make Progress:: 24
+- Make-Progress:: 72
+dataviewTarget1:: 7/24
+dataviewTarget2:: 24 @ 72
+dataviewTarget3:: 24, 72
 
 #sin:-0.00000/0.20791/0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452
 
diff --git a/examples/example_generator.ts b/examples/example_generator.ts
index 6320e92..d206bdb 100644
--- a/examples/example_generator.ts
+++ b/examples/example_generator.ts
@@ -104,6 +104,16 @@ for (
         " am";
     frontmatter += "sleep: " + time_in_bed + "/" + time_out_of_bed + "\n";
 
+    // deep value
+    let deepValue = randomFloatFromInterval(0.0, 100.0);
+    frontmatter += "deepValue: " + "\n";
+    let indent = "    ";
+    for (let ind = 0; ind < 5; ind++) {
+        frontmatter += indent + "very: " + "\n";
+        indent = indent + "    ";
+    }
+    frontmatter += indent + "deep: " + deepValue.toFixed(1) + "\n";
+
     frontmatter += "---\n";
     content += frontmatter;
 
diff --git a/src/collecting.ts b/src/collecting.ts
index 1d337a3..94594a6 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -97,13 +97,13 @@ export function collectDataFromFrontmatterKey(
     dataMap: DataMap,
     xValueMap: XValueMap
 ) {
+    // console.log("collectDataFromFrontmatterKey");
+
     let frontMatter = fileCache.frontmatter;
     if (frontMatter) {
-        if (frontMatter[query.getTarget()]) {
-            // console.log("single value");
-            // console.log(frontMatter[query.getTarget()]);
+        if (helper.deepValue(frontMatter, query.getTarget())) {
             let value = null;
-            let toParse = frontMatter[query.getTarget()];
+            let toParse = helper.deepValue(frontMatter, query.getTarget());
             if (typeof toParse === "string") {
                 if (toParse.includes(":")) {
                     // time value
@@ -126,7 +126,7 @@ export function collectDataFromFrontmatterKey(
             }
         } else if (
             query.getParentTarget() &&
-            frontMatter[query.getParentTarget()]
+            helper.deepValue(frontMatter, query.getParentTarget())
         ) {
             // console.log("multiple values");
             // console.log(query.getTarget());
@@ -135,7 +135,10 @@ export function collectDataFromFrontmatterKey(
             // console.log(
             //     frontMatter[query.getParentTarget()]
             // );
-            let toParse = frontMatter[query.getParentTarget()];
+            let toParse = helper.deepValue(
+                frontMatter,
+                query.getParentTarget()
+            );
             let splitted = null;
             if (Array.isArray(toParse)) {
                 splitted = toParse.map((p) => {
diff --git a/src/helper.ts b/src/helper.ts
index 69f8f9f..f1edb43 100644
--- a/src/helper.ts
+++ b/src/helper.ts
@@ -2,6 +2,22 @@ import { RenderInfo, Size } from "./data";
 import { TFile, TFolder, normalizePath } from "obsidian";
 import * as d3 from "d3";
 
+// http://jsfiddle.net/alnitak/hEsys/
+export function deepValue(obj: any, str: string) {
+    str = str.replace(/\[(\w+)\]/g, ".$1");
+    str = str.replace(/^\./, "");
+    var a = str.split(".");
+    for (var i = 0, n = a.length; i < n; ++i) {
+        var k = a[i];
+        if (k in obj) {
+            obj = obj[k];
+        } else {
+            return;
+        }
+    }
+    return obj;
+}
+
 // String helpers
 export function trimByChar(str: string, char: string) {
     const arr = Array.from(str);

From 89ad5818768281b2e3575c3a7cb3ff3064af39e7 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Wed, 26 May 2021 20:08:40 +0800
Subject: [PATCH 018/402] Fix searchTarget containing accessor with deep value
 parsing

---
 src/helper.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/helper.ts b/src/helper.ts
index f1edb43..bd218a6 100644
--- a/src/helper.ts
+++ b/src/helper.ts
@@ -4,7 +4,6 @@ import * as d3 from "d3";
 
 // http://jsfiddle.net/alnitak/hEsys/
 export function deepValue(obj: any, str: string) {
-    str = str.replace(/\[(\w+)\]/g, ".$1");
     str = str.replace(/^\./, "");
     var a = str.split(".");
     for (var i = 0, n = a.length; i < n; ++i) {

From b08daba198355d41252b22b4b1ef5e172f1e0e84 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Wed, 26 May 2021 20:28:48 +0800
Subject: [PATCH 019/402] Add a parameter valueShift

---
 src/data.ts      | 14 ++++++++++++--
 src/parsing.ts   | 18 +++++++++---------
 src/rendering.ts | 43 ++++++++++++++++++++-----------------------
 3 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/src/data.ts b/src/data.ts
index b648507..c6b22b1 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -253,6 +253,16 @@ export class Dataset implements IterableIterator<DataPoint> {
         return this.yMax;
     }
 
+    public shift(shiftAmount: number) {
+        for (let ind = 0; ind < this.values.length; ind++) {
+            if (this.values[ind] !== null) {
+                this.values[ind] = this.values[ind] + shiftAmount;
+            }
+        }
+        this.yMin = this.yMin + shiftAmount;
+        this.yMax = this.yMax + shiftAmount;
+    }
+
     public setPenalty(penalty: number) {
         for (let ind = 0; ind < this.values.length; ind++) {
             if (this.values[ind] === null) {
@@ -467,7 +477,7 @@ export class RenderInfo {
     ignoreZeroValue: boolean[];
     accum: boolean[];
     penalty: number[];
-    shift: number[];
+    valueShift: number[];
     valueType: string[]; // number/float, int, string, boolean, date, time, datetime
 
     dataAreaSize: Size;
@@ -500,7 +510,7 @@ export class RenderInfo {
         this.ignoreZeroValue = []; // false
         this.accum = []; // false, accum values start from zero over days
         this.penalty = []; // null, use this value instead of null value
-        this.shift = [];
+        this.valueShift = [];
         this.valueType = [];
 
         this.dataAreaSize = new Size(300, 300);
diff --git a/src/parsing.ts b/src/parsing.ts
index 9ca588f..bd13af3 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1094,19 +1094,19 @@ export function getRenderInfoFromYaml(
     renderInfo.penalty = retPenalty;
     // console.log(renderInfo.penalty);
 
-    // shift
-    let retShift = getNumberArrayFromInput(
-        "shift",
-        yaml.shift,
+    // valueShift
+    let retValueShift = getNumberArrayFromInput(
+        "valueShift",
+        yaml.valueShift,
         numDatasets,
-        null,
+        0,
         true
     );
-    if (typeof retShift === "string") {
-        return retShift;
+    if (typeof retValueShift === "string") {
+        return retValueShift;
     }
-    renderInfo.shift = retShift;
-    // console.log(renderInfo.shift);
+    renderInfo.valueShift = retValueShift;
+    // console.log(renderInfo.valueShift);
 
     // fixedScale
     if (typeof yaml.fixedScale === "number") {
diff --git a/src/rendering.ts b/src/rendering.ts
index 3599a06..cfd1216 100644
--- a/src/rendering.ts
+++ b/src/rendering.ts
@@ -71,14 +71,14 @@ function getYTickValues(yLower: number, yUpper: number) {
     // currently used for time value tick only, value in seconds
     const absExtent = Math.abs(yUpper - yLower);
     let tickValues = [];
-    if (absExtent > 5 * 60 * 60) {// extent over than 5 hours
+    if (absExtent > 5 * 60 * 60) {
+        // extent over than 5 hours
         // tick on the hour
         yLower = Math.floor(yLower / 3600) * 3600;
         yUpper = Math.ceil(yUpper / 3600) * 3600;
 
         tickValues = d3.range(yLower, yUpper, 3600);
-    }
-    else {
+    } else {
         // tick on the half hour
         yLower = Math.floor(yLower / 1800) * 1800;
         yUpper = Math.ceil(yUpper / 1800) * 1800;
@@ -98,19 +98,15 @@ function getYTickFormat(yLower: number, yUpper: number) {
         let tickTime = dayStart.add(value, "seconds");
         let format = tickTime.format("HH:mm");
         if (absExtent > 12 * 60 * 60) {
-
             let devHour = (value - yLower) / 3600;
             let interleave = devHour % 2;
             if (value <= yLower) {
                 format = "";
-            }
-            else if (value >= yUpper) {
+            } else if (value >= yUpper) {
                 format = "";
-            }
-            else if ( interleave  > 1.0) {
+            } else if (interleave > 1.0) {
                 format = tickTime.format("HH:mm");
-            }
-            else {
+            } else {
                 format = "";
             }
         }
@@ -126,12 +122,17 @@ export function render(canvas: HTMLElement, renderInfo: RenderInfo) {
     // console.log(renderInfo.datasets);
 
     // Data preprocessing
-
     for (let dataset of renderInfo.datasets) {
         if (dataset.getQuery().usedAsXDataset) continue;
+        // valueShift
+        if (renderInfo.valueShift[dataset.getId()] !== null) {
+            dataset.shift(renderInfo.valueShift[dataset.getId()]);
+        }
+        // penalty
         if (renderInfo.penalty[dataset.getId()] !== null) {
             dataset.setPenalty(renderInfo.penalty[dataset.getId()]);
         }
+        // accum
         if (renderInfo.accum[dataset.getId()]) {
             dataset.accumulateValues();
         }
@@ -390,9 +391,7 @@ function renderYAxis(
     if (yAxisGen && valueIsTime) {
         let tickFormat = getYTickFormat(yLower, yUpper);
         let tickValues = getYTickValues(yLower, yUpper);
-        yAxisGen
-            .tickValues(tickValues)
-            .tickFormat(tickFormat);
+        yAxisGen.tickValues(tickValues).tickFormat(tickFormat);
     }
 
     let yAxis = chartElements.dataArea
@@ -642,16 +641,14 @@ function renderPoints(
                 let strValue = d3.select(this).attr("value");
                 if (valueType === "Time") {
                     let dayStart = window.moment("00:00", "HH:mm", true);
-                    let tickTime = dayStart.add(parseFloat(strValue), "seconds");
-                    let dateValue = tickTime.format("HH:mm");
-                    tooltipLabelValue.text(
-                        "value:" + dateValue
-                    );
-                }
-                else {
-                    tooltipLabelValue.text(
-                        "value:" + strValue
+                    let tickTime = dayStart.add(
+                        parseFloat(strValue),
+                        "seconds"
                     );
+                    let dateValue = tickTime.format("HH:mm");
+                    tooltipLabelValue.text("value:" + dateValue);
+                } else {
+                    tooltipLabelValue.text("value:" + strValue);
                 }
 
                 const [x, y] = d3.pointer(event);

From f239b14ed47a518b1a64add66eca547267e4ad72 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 27 May 2021 11:25:24 +0800
Subject: [PATCH 020/402] Refactoring float parsing

---
 src/collecting.ts | 155 +++++++++++++---------------------------------
 src/helper.ts     |  41 ++++++++++++
 2 files changed, 85 insertions(+), 111 deletions(-)

diff --git a/src/collecting.ts b/src/collecting.ts
index 94594a6..8d50f90 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -11,21 +11,6 @@ import {
 } from "./data";
 import * as helper from "./helper";
 
-let timeFormat = [
-    "HH:mm",
-    "HH:m",
-    "H:mm",
-    "H:m",
-    "hh:mm A",
-    "hh:mm a",
-    "hh:m A",
-    "hh:m a",
-    "h:mm A",
-    "h:mm a",
-    "h:m A",
-    "h:m a",
-];
-
 function addToDataMap(
     dataMap: DataMap,
     date: string,
@@ -102,27 +87,13 @@ export function collectDataFromFrontmatterKey(
     let frontMatter = fileCache.frontmatter;
     if (frontMatter) {
         if (helper.deepValue(frontMatter, query.getTarget())) {
-            let value = null;
             let toParse = helper.deepValue(frontMatter, query.getTarget());
-            if (typeof toParse === "string") {
-                if (toParse.includes(":")) {
-                    // time value
-                    let timeValue = window.moment(toParse, timeFormat, true);
-                    if (timeValue.isValid()) {
-                        query.valueType = ValueType.Time;
-                        value = timeValue.diff(
-                            window.moment("00:00", "HH:mm", true),
-                            "seconds"
-                        );
-                    }
-                } else {
-                    value = parseFloat(toParse);
+            let retParse = helper.parseFloatFromAny(toParse);
+            if (retParse.value !== null) {
+                if (retParse.type === ValueType.Time) {
+                    query.valueType = ValueType.Time;
                 }
-            } else {
-                value = parseFloat(toParse);
-            }
-            if (Number.isNumber(value)) {
-                addToDataMap(dataMap, xValueMap.get(-1), query, value);
+                addToDataMap(dataMap, xValueMap.get(-1), query, retParse.value);
             }
         } else if (
             query.getParentTarget() &&
@@ -153,28 +124,18 @@ export function collectDataFromFrontmatterKey(
                 query.getAccessor() >= 0
             ) {
                 // TODO: it's not efficent to retrieve one value at a time, enhance this
-                let value = null;
                 let splittedPart = splitted[query.getAccessor()].trim();
-                if (toParse.includes(":")) {
-                    // time value
-                    let timeValue = window.moment(
-                        splittedPart,
-                        timeFormat,
-                        true
-                    );
-                    if (timeValue.isValid()) {
+                let retParse = helper.parseFloatFromAny(splittedPart);
+                if (retParse.value !== null) {
+                    if (retParse.type === ValueType.Time) {
                         query.valueType = ValueType.Time;
-                        value = timeValue.diff(
-                            window.moment("00:00", "HH:mm", true),
-                            "seconds"
-                        );
                     }
-                } else {
-                    value = parseFloat(splittedPart);
-                }
-
-                if (Number.isNumber(value)) {
-                    addToDataMap(dataMap, xValueMap.get(-1), query, value);
+                    addToDataMap(
+                        dataMap,
+                        xValueMap.get(-1),
+                        query,
+                        retParse.value
+                    );
                 }
             }
         }
@@ -243,25 +204,18 @@ export function collectDataFromInlineTag(
             if (splitted.length === 1) {
                 // console.log("single-value");
                 let toParse = splitted[0].trim();
-                if (toParse.includes(":")) {
-                    let timeValue = window.moment(toParse, timeFormat, true);
-                    if (timeValue.isValid()) {
-                        query.valueType = ValueType.Time;
-                        tagMeasure = timeValue.diff(
-                            window.moment("00:00", "HH:mm", true),
-                            "seconds"
-                        );
+                let retParse = helper.parseFloatFromAny(toParse);
+                if (retParse.value) {
+                    if (retParse.type === ValueType.Time) {
+                        tagMeasure = retParse.value;
                         tagExist = true;
-                    }
-                } else {
-                    let value = parseFloat(toParse);
-                    // console.log(value);
-                    if (!Number.isNaN(value)) {
+                        query.valueType = ValueType.Time;
+                    } else {
                         if (
                             !renderInfo.ignoreZeroValue[query.getId()] ||
-                            value !== 0
+                            retParse.value !== 0
                         ) {
-                            tagMeasure += value;
+                            tagMeasure += retParse.value;
                             tagExist = true;
                         }
                     }
@@ -270,23 +224,15 @@ export function collectDataFromInlineTag(
                 splitted.length > query.getAccessor() &&
                 query.getAccessor() >= 0
             ) {
-                // TODO: it's not efficent to retrieve one value at a time, enhance this
-                // console.log("multiple-values");
                 let toParse = splitted[query.getAccessor()].trim();
-                if (toParse.includes(":")) {
-                    let timeValue = window.moment(toParse, timeFormat, true);
-                    if (timeValue.isValid()) {
-                        query.valueType = ValueType.Time;
-                        tagMeasure = timeValue.diff(
-                            window.moment("00:00", "HH:mm", true),
-                            "seconds"
-                        );
+                let retParse = helper.parseFloatFromAny(toParse);
+                if (retParse.value) {
+                    if (retParse.type === ValueType.Time) {
+                        tagMeasure = retParse.value;
                         tagExist = true;
-                    }
-                } else {
-                    let value = parseFloat(toParse);
-                    if (Number.isNumber(value)) {
-                        tagMeasure += value;
+                        query.valueType = ValueType.Time;
+                    } else {
+                        tagMeasure += retParse.value;
                         tagExist = true;
                     }
                 }
@@ -389,25 +335,18 @@ export function collectDataFromDvField(
             if (splitted.length === 1) {
                 // console.log("single-value");
                 let toParse = splitted[0];
-                if (toParse.includes(":")) {
-                    let timeValue = window.moment(toParse, timeFormat, true);
-                    if (timeValue.isValid()) {
-                        query.valueType = ValueType.Time;
-                        tagMeasure = timeValue.diff(
-                            window.moment("00:00", "HH:mm", true),
-                            "seconds"
-                        );
+                let retParse = helper.parseFloatFromAny(toParse);
+                if (retParse.value) {
+                    if (retParse.type === ValueType.Time) {
+                        tagMeasure = retParse.value;
                         tagExist = true;
-                    }
-                } else {
-                    let value = parseFloat(toParse);
-                    // console.log(value);
-                    if (!Number.isNaN(value)) {
+                        query.valueType = ValueType.Time;
+                    } else {
                         if (
                             !renderInfo.ignoreZeroValue[query.getId()] ||
-                            value !== 0
+                            retParse.value !== 0
                         ) {
-                            tagMeasure += value;
+                            tagMeasure += retParse.value;
                             tagExist = true;
                         }
                     }
@@ -419,20 +358,14 @@ export function collectDataFromDvField(
                 // TODO: it's not efficent to retrieve one value at a time, enhance this
                 // console.log("multiple-values");
                 let toParse = splitted[query.getAccessor()].trim();
-                if (toParse.includes(":")) {
-                    let timeValue = window.moment(toParse, timeFormat, true);
-                    if (timeValue.isValid()) {
-                        query.valueType = ValueType.Time;
-                        tagMeasure = timeValue.diff(
-                            window.moment("00:00", "HH:mm", true),
-                            "seconds"
-                        );
+                let retParse = helper.parseFloatFromAny(toParse);
+                if (retParse.value) {
+                    if (retParse.type === ValueType.Time) {
+                        tagMeasure = retParse.value;
                         tagExist = true;
-                    }
-                } else {
-                    let value = parseFloat(toParse);
-                    if (Number.isNumber(value)) {
-                        tagMeasure += value;
+                        query.valueType = ValueType.Time;
+                    } else {
+                        tagMeasure += retParse.value;
                         tagExist = true;
                     }
                 }
diff --git a/src/helper.ts b/src/helper.ts
index bd218a6..004935d 100644
--- a/src/helper.ts
+++ b/src/helper.ts
@@ -1,7 +1,23 @@
 import { RenderInfo, Size } from "./data";
 import { TFile, TFolder, normalizePath } from "obsidian";
+import { ValueType } from "./data";
 import * as d3 from "d3";
 
+const timeFormat = [
+    "HH:mm",
+    "HH:m",
+    "H:mm",
+    "H:m",
+    "hh:mm A",
+    "hh:mm a",
+    "hh:m A",
+    "hh:m a",
+    "h:mm A",
+    "h:mm a",
+    "h:m A",
+    "h:m a",
+];
+
 // http://jsfiddle.net/alnitak/hEsys/
 export function deepValue(obj: any, str: string) {
     str = str.replace(/^\./, "");
@@ -53,6 +69,31 @@ export function getDateFromFilename(file: TFile, renderInfo: RenderInfo) {
     return fileDate;
 }
 
+// Parsing
+export function parseFloatFromAny(toParse: any) {
+    let value = null;
+    let valueType = ValueType.Number;
+    if (typeof toParse === "string") {
+        if (toParse.includes(":")) {
+            // time value
+            let timeValue = window.moment(toParse, timeFormat, true);
+            if (timeValue.isValid()) {
+                value = timeValue.diff(
+                    window.moment("00:00", "HH:mm", true),
+                    "seconds"
+                );
+                valueType = ValueType.Time;
+            }
+        } else {
+            value = parseFloat(toParse);
+        }
+    } else if (typeof toParse === "number") {
+        value = toParse;
+    }
+
+    return { type: valueType, value: value };
+}
+
 // Chart helpers
 export function measureTextSize(
     text: string,

From 9bda0fe5cc4eede5a8f075622110ae4a3826234f Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 27 May 2021 12:38:20 +0800
Subject: [PATCH 021/402] Allow using valueShift on time values

---
 examples/TestTimeValues.md |  1 +
 src/helper.ts              | 10 +++++++++-
 src/parsing.ts             |  9 +++++----
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/examples/TestTimeValues.md b/examples/TestTimeValues.md
index 60f6f2e..d0c125f 100644
--- a/examples/TestTimeValues.md
+++ b/examples/TestTimeValues.md
@@ -17,6 +17,7 @@ searchType: frontmatter
 searchTarget: sleep[0], sleep[1]
 endDate: 2021-01-15
 folder: diary
+valueShift: -24:00, 00:00
 line:
     title: "Sleep"
     yAxisLabel: "Time"
diff --git a/src/helper.ts b/src/helper.ts
index 004935d..515df7b 100644
--- a/src/helper.ts
+++ b/src/helper.ts
@@ -74,14 +74,22 @@ export function parseFloatFromAny(toParse: any) {
     let value = null;
     let valueType = ValueType.Number;
     if (typeof toParse === "string") {
+        // time value
         if (toParse.includes(":")) {
-            // time value
+            let negativeValue = false;
+            if (toParse.startsWith("-")) {
+                negativeValue = true;
+                toParse = toParse.substring(1);
+            }
             let timeValue = window.moment(toParse, timeFormat, true);
             if (timeValue.isValid()) {
                 value = timeValue.diff(
                     window.moment("00:00", "HH:mm", true),
                     "seconds"
                 );
+                if (negativeValue) {
+                    value = -1 * value;
+                }
                 valueType = ValueType.Time;
             }
         } else {
diff --git a/src/parsing.ts b/src/parsing.ts
index bd13af3..15dd2c6 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -14,6 +14,7 @@ import {
 import { TFolder, normalizePath } from "obsidian";
 import { parseYaml } from "obsidian";
 import { getDailyNoteSettings } from "obsidian-daily-notes-interface";
+import * as helper from "./helper";
 
 function strToBool(str: string): boolean | null {
     str = str.trim().toLowerCase();
@@ -274,7 +275,7 @@ function getNumberArrayFromInput(
                     let curr = splitted[ind].trim();
                     let prev = null;
                     if (ind > 0) {
-                        prev = parseFloat(splitted[ind - 1].trim());
+                        prev = helper.parseFloatFromAny(splitted[ind - 1].trim()).value;
                     }
                     if (curr === "") {
                         if (prev !== null && Number.isNumber(prev)) {
@@ -283,7 +284,7 @@ function getNumberArrayFromInput(
                             array[ind] = defaultValue;
                         }
                     } else {
-                        let currNum = parseFloat(curr);
+                        let currNum = helper.parseFloatFromAny(curr).value;
                         if (Number.isNumber(currNum)) {
                             array[ind] = currNum;
                             numValidValue++;
@@ -294,7 +295,7 @@ function getNumberArrayFromInput(
                     }
                 } else {
                     // Exceeds the length of input, use prev value
-                    let last = parseFloat(splitted[input.length - 1].trim());
+                    let last = helper.parseFloatFromAny(splitted[input.length - 1].trim()).value;
                     if (numValidValue > 0 && Number.isNumber(last)) {
                         array[ind] = last;
                     } else {
@@ -306,7 +307,7 @@ function getNumberArrayFromInput(
             if (input === "") {
                 // all defaultValue
             } else {
-                let inputNum = parseFloat(input);
+                let inputNum = helper.parseFloatFromAny(input).value;
                 if (Number.isNumber(inputNum)) {
                     array[0] = inputNum;
                     numValidValue++;

From f258bba2e12374884f0cbbd91f9812d6aa7fcb17 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 27 May 2021 12:54:38 +0800
Subject: [PATCH 022/402] Add a parameter 'reverseYAxis'

---
 examples/TestTimeValues.md |  1 +
 src/data.ts                |  2 ++
 src/parsing.ts             | 25 +++++++++++++++++++++++--
 src/rendering.ts           |  9 ++++++++-
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/examples/TestTimeValues.md b/examples/TestTimeValues.md
index d0c125f..1728bd3 100644
--- a/examples/TestTimeValues.md
+++ b/examples/TestTimeValues.md
@@ -8,6 +8,7 @@ folder: diary
 line:
     title: "Working Hours"
     yAxisLabel: "Time"
+	reverseYAxis: true
     lineColor: yellow, red
     showPoint: true
 ```
diff --git a/src/data.ts b/src/data.ts
index c6b22b1..969a9a8 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -549,6 +549,7 @@ export class CommonChartInfo {
     yAxisUnit: string[];
     yMin: number[];
     yMax: number[];
+    reverseYAxis: boolean[];
     allowInspectData: boolean;
     showLegend: boolean;
     legendPosition: string;
@@ -567,6 +568,7 @@ export class CommonChartInfo {
         this.yAxisUnit = []; // "", 2 elements
         this.yMin = []; // null, 2 elements
         this.yMax = []; // null, 2 elements
+        this.reverseYAxis = []; // false, 2 elements
         this.allowInspectData = true;
         this.showLegend = false;
         this.legendPosition = ""; // top, bottom, left, right
diff --git a/src/parsing.ts b/src/parsing.ts
index 15dd2c6..597f1c5 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -275,7 +275,9 @@ function getNumberArrayFromInput(
                     let curr = splitted[ind].trim();
                     let prev = null;
                     if (ind > 0) {
-                        prev = helper.parseFloatFromAny(splitted[ind - 1].trim()).value;
+                        prev = helper.parseFloatFromAny(
+                            splitted[ind - 1].trim()
+                        ).value;
                     }
                     if (curr === "") {
                         if (prev !== null && Number.isNumber(prev)) {
@@ -295,7 +297,9 @@ function getNumberArrayFromInput(
                     }
                 } else {
                     // Exceeds the length of input, use prev value
-                    let last = helper.parseFloatFromAny(splitted[input.length - 1].trim()).value;
+                    let last = helper.parseFloatFromAny(
+                        splitted[input.length - 1].trim()
+                    ).value;
                     if (numValidValue > 0 && Number.isNumber(last)) {
                         array[ind] = last;
                     } else {
@@ -665,6 +669,23 @@ function parseCommonChartInfo(yaml: any, renderInfo: CommonChartInfo) {
     }
     renderInfo.yMax = retYMax;
     // console.log(renderInfo.yMax);
+
+    // reverseYAxis
+    let retReverseYAxis = getBoolArrayFromInput(
+        "reverseYAxis",
+        yaml?.reverseYAxis,
+        2,
+        false,
+        true
+    );
+    if (typeof retReverseYAxis === "string") {
+        return retReverseYAxis; // errorMessage
+    }
+    if (retReverseYAxis.length > 2) {
+        return "reverseYAxis accepts not more than two values for left and right y-axes";
+    }
+    renderInfo.reverseYAxis = retReverseYAxis;
+    // console.log(renderInfo.reverseYAxis);
 }
 
 function getAvailableKeysOfClass(obj: object): string[] {
diff --git a/src/rendering.ts b/src/rendering.ts
index cfd1216..876d1e2 100644
--- a/src/rendering.ts
+++ b/src/rendering.ts
@@ -346,7 +346,14 @@ function renderYAxis(
             yLower = 0.0;
         }
     }
-    yScale.domain([yLower, yUpper]).range([renderInfo.dataAreaSize.height, 0]);
+    let domain = [yLower, yUpper];
+    if (
+        (yAxisLocation === "left" && chartInfo.reverseYAxis[0]) ||
+        (yAxisLocation === "right" && chartInfo.reverseYAxis[1])
+    ) {
+        domain = [yUpper, yLower];
+    }
+    yScale.domain(domain).range([renderInfo.dataAreaSize.height, 0]);
 
     if (yAxisLocation === "left") {
         chartElements["leftYScale"] = yScale;

From 7e66823793bcb3b197e5e90b777d6e8f2582031b Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 27 May 2021 13:06:25 +0800
Subject: [PATCH 023/402] Fix yAxisLabel width for the time value

---
 examples/TestTimeValues.md | 4 ++--
 src/rendering.ts           | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/examples/TestTimeValues.md b/examples/TestTimeValues.md
index 1728bd3..181cf12 100644
--- a/examples/TestTimeValues.md
+++ b/examples/TestTimeValues.md
@@ -7,7 +7,7 @@ endDate: 2021-01-15
 folder: diary
 line:
     title: "Working Hours"
-    yAxisLabel: "Time"
+    yAxisLabel: "Time (24h)"
 	reverseYAxis: true
     lineColor: yellow, red
     showPoint: true
@@ -21,7 +21,7 @@ folder: diary
 valueShift: -24:00, 00:00
 line:
     title: "Sleep"
-    yAxisLabel: "Time"
+    yAxisLabel: "Time (24h)"
     lineColor: yellow, red
     showPoint: true
 ```
\ No newline at end of file
diff --git a/src/rendering.ts b/src/rendering.ts
index 876d1e2..2d184f2 100644
--- a/src/rendering.ts
+++ b/src/rendering.ts
@@ -89,7 +89,7 @@ function getYTickValues(yLower: number, yUpper: number) {
     return tickValues;
 }
 
-function getYTickFormat(yLower: number, yUpper: number) {
+function getYTickFormat(yLower: number, yUpper: number, skip: boolean = true) {
     // currently used for time value tick only
     // return a function convert value to time string
     function tickFormat(value: number): string {
@@ -97,7 +97,7 @@ function getYTickFormat(yLower: number, yUpper: number) {
         let dayStart = window.moment("00:00", "HH:mm", true);
         let tickTime = dayStart.add(value, "seconds");
         let format = tickTime.format("HH:mm");
-        if (absExtent > 12 * 60 * 60) {
+        if (skip && absExtent > 12 * 60 * 60) {
             let devHour = (value - yLower) / 3600;
             let interleave = devHour % 2;
             if (value <= yLower) {
@@ -437,6 +437,9 @@ function renderYAxis(
 
     // Get max tick label width
     let yTickFormat = d3.tickFormat(yLower, yUpper, 10);
+    if (valueIsTime) {
+        yTickFormat = getYTickFormat(yLower, yUpper, false);
+    }
     let yLowerLabelSize = helper.measureTextSize(
         yTickFormat(yLower),
         "tracker-axis-label"

From 78df635a53a0a2c93d72cc4491e7c544e9a4e512 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 27 May 2021 14:46:10 +0800
Subject: [PATCH 024/402] Add output type bullet

---
 src/bullet.ts    | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/data.ts      | 11 +++++++++++
 src/parsing.ts   | 46 +++++++++++++++++++++++++++++++++++++---------
 src/rendering.ts |  4 ++++
 4 files changed, 100 insertions(+), 9 deletions(-)
 create mode 100644 src/bullet.ts

diff --git a/src/bullet.ts b/src/bullet.ts
new file mode 100644
index 0000000..6c3b073
--- /dev/null
+++ b/src/bullet.ts
@@ -0,0 +1,48 @@
+import {
+    Datasets,
+    DataPoint,
+    RenderInfo,
+    Dataset,
+    Size,
+    Transform,
+    ChartElements,
+    OutputType,
+    ValueType,
+} from "./data";
+
+function renderTitle() {
+    // title
+}
+
+function renderBackPanel() {
+    // quantitative range, poor/average/good/...
+    //
+}
+
+function renderBarAndMark() {
+    // bar for actual value
+    // mark line for target value
+}
+
+function renderAxis() {
+    // ticks
+    // tick labels
+    // unit
+}
+
+// Bullet graph https://en.wikipedia.org/wiki/Bullet_graph
+export function renderBullet(canvas: HTMLElement, renderInfo: RenderInfo) {
+    // console.log("renderBullet");
+    // console.log(renderInfo);
+    // if (renderInfo.bullet === null) return;
+
+    // let chartElements = createAreas(canvas, renderInfo);
+
+    renderTitle();
+
+    renderBackPanel();
+
+    renderBarAndMark();
+
+    renderAxis();
+}
diff --git a/src/data.ts b/src/data.ts
index 969a9a8..2ff728b 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -16,6 +16,7 @@ export enum OutputType {
     Summary,
     Table,
     Month,
+    Bullet,
 }
 
 export enum ValueType {
@@ -492,6 +493,7 @@ export class RenderInfo {
     bar: BarInfo | null;
     summary: SummaryInfo | null;
     month: MonthInfo | null;
+    bullet: BulletInfo | null;
 
     public datasets: Datasets | null;
 
@@ -525,6 +527,7 @@ export class RenderInfo {
         this.summary = null;
         this.bar = null;
         this.month = null;
+        this.bullet = null;
 
         this.datasets = null;
     }
@@ -634,6 +637,14 @@ export class MonthInfo {
     }
 }
 
+export class BulletInfo {
+    orientation: string;
+
+    constructor() {
+        this.orientation = "horizontal"; // or vertical
+    }
+}
+
 export class Size {
     width: number;
     height: number;
diff --git a/src/parsing.ts b/src/parsing.ts
index 597f1c5..13d04ac 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -10,6 +10,7 @@ import {
     OutputType,
     LineInfo,
     MonthInfo,
+    BulletInfo,
 } from "./data";
 import { TFolder, normalizePath } from "obsidian";
 import { parseYaml } from "obsidian";
@@ -1173,20 +1174,26 @@ export function getRenderInfoFromYaml(
     if (typeof yaml.month !== "undefined") {
         hasMonth = true;
     }
+    let hasBullet = false;
+    if (typeof yaml.bullet !== "undefined") {
+        hasBullet = true;
+    }
     let sumOutput =
         Number(hasLine) +
         Number(hasBar) +
         Number(hasSummary) +
-        Number(hasMonth);
+        Number(hasMonth) +
+        Number(hasBullet);
     if (sumOutput === 0) {
-        return "No output parameter provided, please place line, bar, month, or summary.";
+        return "No output parameter provided, please place line, bar, month, bullet, or summary.";
     } else if (sumOutput === 1) {
         if (hasLine) renderInfo.output = OutputType.Line;
         if (hasBar) renderInfo.output = OutputType.Bar;
         if (hasSummary) renderInfo.output = OutputType.Summary;
         if (hasMonth) renderInfo.output = OutputType.Month;
+        if (hasBullet) renderInfo.output = OutputType.Bullet;
     } else if (sumOutput >= 2) {
-        return "Too many output parameters, pick line, bar, month, or summary.";
+        return "Too many output parameters, pick line, bar, month, bullet, or summary.";
     }
 
     // line related parameters
@@ -1439,17 +1446,17 @@ export function getRenderInfoFromYaml(
             }
         }
     } // summary related parameters
-    // month related parameters
+    // Month related parameters
     if (renderInfo.output === OutputType.Month) {
         renderInfo.month = new MonthInfo();
 
         if (yaml.month !== null) {
-            let keysOfSummaryInfo = getAvailableKeysOfClass(renderInfo.month);
+            let keysOfMonthInfo = getAvailableKeysOfClass(renderInfo.month);
             let keysFoundInYAML = getAvailableKeysOfClass(yaml.month);
             // console.log(keysOfSummaryInfo);
             // console.log(keysFoundInYAML);
             for (let key of keysFoundInYAML) {
-                if (!keysOfSummaryInfo.includes(key)) {
+                if (!keysOfMonthInfo.includes(key)) {
                     errorMessage = "'" + key + "' is not an available key";
                     return errorMessage;
                 }
@@ -1458,12 +1465,33 @@ export function getRenderInfoFromYaml(
 
         if (yaml.month !== null) {
             if (typeof yaml.month.startWeekOn === "string") {
-                if (yaml.month.startWeekOn === "month") {
-                    renderInfo.month.startWeekOn = yaml.month.startWeekOn;
+                renderInfo.month.startWeekOn = yaml.month.startWeekOn;
+            }
+        }
+    } // Month related parameters
+    // Bullet related parameters
+    if (renderInfo.output === OutputType.Bullet) {
+        renderInfo.bullet = new BulletInfo();
+
+        if (yaml.bullet !== null) {
+            let keysOfBulletInfo = getAvailableKeysOfClass(renderInfo.bullet);
+            let keysFoundInYAML = getAvailableKeysOfClass(yaml.bullet);
+            // console.log(keysOfSummaryInfo);
+            // console.log(keysFoundInYAML);
+            for (let key of keysFoundInYAML) {
+                if (!keysOfBulletInfo.includes(key)) {
+                    errorMessage = "'" + key + "' is not an available key";
+                    return errorMessage;
                 }
             }
         }
-    } // month related parameters
+
+        if (yaml.bullet !== null) {
+            if (typeof yaml.bullet.orientation === "string") {
+                renderInfo.bullet.orientation = yaml.bullet.orientation;
+            }
+        }
+    } // Bullet related parameters
 
     return renderInfo;
 }
diff --git a/src/rendering.ts b/src/rendering.ts
index 2d184f2..da412b6 100644
--- a/src/rendering.ts
+++ b/src/rendering.ts
@@ -10,9 +10,11 @@ import {
     ChartElements,
     OutputType,
     ValueType,
+    BulletInfo,
 } from "./data";
 import * as summary from "./summary";
 import * as month from "./month";
+import * as bullet from "./bullet";
 import * as helper from "./helper";
 
 function getXTickInterval(datasets: Datasets) {
@@ -147,6 +149,8 @@ export function render(canvas: HTMLElement, renderInfo: RenderInfo) {
             return summary.renderSummary(canvas, renderInfo);
         case OutputType.Month:
             return month.renderMonth(canvas, renderInfo);
+        case OutputType.Bullet:
+            return bullet.renderBullet(canvas, renderInfo);
         default:
             return "Unknown output type";
     }

From 25261a6fd3c4fc769016e0ff37b9875289a1ec63 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 28 May 2021 23:24:39 +0800
Subject: [PATCH 025/402] Manage drawing bullet chart

---
 examples/TestBullet.md |  39 +++++
 src/bullet.ts          | 390 +++++++++++++++++++++++++++++++++++++++--
 src/data.ts            |  18 ++
 src/helper.ts          |  24 ++-
 src/parsing.ts         |  75 ++++++++
 src/rendering.ts       |  51 ++----
 styles.css             |   6 +
 7 files changed, 548 insertions(+), 55 deletions(-)
 create mode 100644 examples/TestBullet.md

diff --git a/examples/TestBullet.md b/examples/TestBullet.md
new file mode 100644
index 0000000..4d9c53f
--- /dev/null
+++ b/examples/TestBullet.md
@@ -0,0 +1,39 @@
+# Test Bullet
+Horizontal bullet chart
+``` tracker
+searchType: tag
+searchTarget: meditation
+folder: diary
+endDate: 2021-01-31
+fixedScale: 1
+bullet:
+    title: "Clean Up"
+	dataset: 0
+    orientation: horizontal
+	range: 10, 20, 30
+	rangeColor: '#ccc, #ddd, #eee'
+	value: "{{lastBreaks}}"
+	valueColor: steelblue
+	showMark: false
+	markerValue: 20
+	markerColor: black
+```
+
+Vertical bullet chart
+``` tracker
+searchType: tag
+searchTarget: meditation
+folder: diary
+endDate: 2021-01-31
+bullet:
+    title: "Clean Up"
+	dataset: 0
+    orientation: vertical
+	range: 10, 20, 30
+	rangeColor: '#ccc, #ddd, #eee'
+	value: "{{lastBreaks}}"
+	valueColor: steelblue
+	showMark: false
+	markerValue: 20
+	markerColor: black
+```
\ No newline at end of file
diff --git a/src/bullet.ts b/src/bullet.ts
index 6c3b073..7408c3b 100644
--- a/src/bullet.ts
+++ b/src/bullet.ts
@@ -9,40 +9,394 @@ import {
     OutputType,
     ValueType,
 } from "./data";
+import * as helper from "./helper";
+import * as d3 from "d3";
 
-function renderTitle() {
-    // title
+function createAreas(
+    canvas: HTMLElement,
+    renderInfo: RenderInfo
+): ChartElements {
+    let chartElements: ChartElements = {};
+    // whole area for plotting, includes margins
+
+    let bulletInfo = renderInfo.bullet;
+    if (!bulletInfo) return;
+
+    let svg = d3
+        .select(canvas)
+        .append("svg")
+        .attr("id", "svg")
+        .attr(
+            "width",
+            renderInfo.dataAreaSize.width +
+                renderInfo.margin.left +
+                renderInfo.margin.right
+        )
+        .attr(
+            "height",
+            renderInfo.dataAreaSize.height +
+                renderInfo.margin.top +
+                renderInfo.margin.bottom
+        );
+    chartElements["svg"] = svg;
+
+    // graphArea, includes chartArea, title, legend
+    let graphArea = svg
+        .append("g")
+        .attr("id", "graphArea")
+        .attr(
+            "transform",
+            "translate(" +
+                renderInfo.margin.left +
+                "," +
+                renderInfo.margin.top +
+                ")"
+        )
+        .attr("width", renderInfo.dataAreaSize.width + renderInfo.margin.right)
+        .attr(
+            "height",
+            renderInfo.dataAreaSize.height + renderInfo.margin.bottom
+        );
+    chartElements["graphArea"] = graphArea;
+
+    // dataArea, under graphArea, includes points, lines, xAxis, yAxis
+    let dataArea = graphArea
+        .append("g")
+        .attr("id", "dataArea")
+        .attr("width", renderInfo.dataAreaSize.width)
+        .attr("height", renderInfo.dataAreaSize.height);
+    chartElements["dataArea"] = dataArea;
+
+    return chartElements;
+}
+
+function renderTitle(chartElements: ChartElements, renderInfo: RenderInfo) {
+    // console.log("renderTitle");
+    // under graphArea
+
+    let bulletInfo = renderInfo.bullet;
+    if (!bulletInfo) return;
+
+    if (!bulletInfo.title) return;
+
+    let titleSize = helper.measureTextSize(
+        bulletInfo.title,
+        "tracker-title-small"
+    );
+    let spacing = 6; // spacing between title and dataArea
+
+    if (bulletInfo.orientation === "horizontal") {
+        let title = chartElements.graphArea
+            .append("text")
+            .text(bulletInfo.title) // pivot at center
+            .attr("id", "title")
+            .attr("x", titleSize.width / 2.0)
+            .attr("y", renderInfo.dataAreaSize.height / 2.0)
+            .attr("height", titleSize.height) // for later use
+            .attr("class", "tracker-title-small");
+        chartElements["title"] = title;
+
+        // Expand parent areas
+        helper.expandArea(chartElements.svg, titleSize.width + spacing, 0);
+        helper.expandArea(
+            chartElements.graphArea,
+            titleSize.width + spacing,
+            0
+        );
+
+        // Move sibling areas
+        helper.moveArea(chartElements.dataArea, titleSize.width + spacing, 0);
+    } else if (bulletInfo.orientation === "vertical") {
+        let title = chartElements.graphArea
+            .append("text")
+            .text(bulletInfo.title) // pivot at center
+            .attr("id", "title")
+            .attr(
+                "transform",
+                "translate(" +
+                    renderInfo.dataAreaSize.width / 2.0 +
+                    "," +
+                    titleSize.height / 2.0 +
+                    ")"
+            )
+            .attr("height", titleSize.height) // for later use
+            .attr("class", "tracker-title-small");
+        chartElements["title"] = title;
+
+        // Expand parent areas
+        let xExpand = helper.expandArea(
+            chartElements.svg,
+            0,
+            titleSize.height + spacing
+        );
+        helper.expandArea(
+            chartElements.graphArea,
+            0,
+            titleSize.height + spacing
+        );
+
+        // Move sibling areas
+        helper.moveArea(chartElements.dataArea, 0, titleSize.height + spacing);
+    }
+}
+
+// Render ticks, tick labels
+function renderAxis(
+    chartElements: ChartElements,
+    renderInfo: RenderInfo,
+    dataset: Dataset
+) {
+    // console.log("renderAxis");
+    // console.log(chartElements);
+    // console.log(dataset);
+
+    let bulletInfo = renderInfo.bullet;
+    if (!bulletInfo) return;
+
+    let range = bulletInfo.range;
+    let domain = [0, range[range.length - 1]];
+    let tickLength = 6;
+
+    if (bulletInfo.orientation === "horizontal") {
+        let scale = d3.scaleLinear();
+        scale.domain(domain).range([0, renderInfo.dataAreaSize.width]);
+        chartElements["scale"] = scale;
+
+        let axisGen = d3.axisBottom(scale);
+        let axis = chartElements.dataArea
+            .append("g")
+            .attr("id", "axis")
+            .attr(
+                "transform",
+                "translate(0," + renderInfo.dataAreaSize.height + ")"
+            )
+            .call(axisGen)
+            .attr("class", "tracker-axis");
+
+        let axisLine = axis.selectAll("path");
+
+        let axisTicks = axis.selectAll("line");
+
+        let tickLabelSize = helper.measureTextSize("123456789");
+        let tickLabelHeight = tickLabelSize.height;
+
+        axis.attr("width", renderInfo.dataAreaSize.width);
+        axis.attr("height", tickLength + tickLabelHeight);
+
+        // Expand areas
+        helper.expandArea(chartElements.svg, 0, tickLength + tickLabelHeight);
+        helper.expandArea(
+            chartElements.graphArea,
+            0,
+            tickLength + tickLabelHeight
+        );
+    } else if (bulletInfo.orientation === "vertical") {
+        let scale = d3.scaleLinear();
+        scale.domain(domain).range([0, renderInfo.dataAreaSize.height]);
+        chartElements["scale"] = scale;
+
+        let axisGen = d3.axisLeft(scale);
+        let axis = chartElements.dataArea
+            .append("g")
+            .attr("id", "axis")
+            .attr(
+                "transform",
+                "translate(" + renderInfo.dataAreaSize.width + " ,0)"
+            )
+            .call(axisGen)
+            .attr("class", "tracker-axis");
+
+        let axisLine = axis.selectAll("path");
+
+        let axisTicks = axis.selectAll("line");
+
+        axis.attr("width", tickLength);
+        axis.attr("height", renderInfo.dataAreaSize.width);
+
+        // Expand areas
+        helper.expandArea(chartElements.svg, tickLength, 0);
+        helper.expandArea(chartElements.graphArea, tickLength, 0);
+    }
 }
 
-function renderBackPanel() {
-    // quantitative range, poor/average/good/...
-    //
+// Render quantitative range, poor/average/good/...
+function renderBackPanel(
+    chartElements: ChartElements,
+    renderInfo: RenderInfo,
+    dataset: Dataset
+) {
+    // console.log("renderBackPanel");
+    // console.log(dataset);
+
+    let bulletInfo = renderInfo.bullet;
+    if (!bulletInfo) return;
+
+    let scale = chartElements.scale;
+
+    // Prepare data
+    let range = bulletInfo.range;
+    let rangeColor = bulletInfo.rangeColor;
+    let data = [];
+    let lastBound = 0;
+    for (let ind = 0; ind < range.length; ind++) {
+        data.push({
+            start: lastBound,
+            end: range[ind],
+            color: rangeColor[ind],
+        });
+        lastBound = range[ind];
+    }
+
+    if (bulletInfo.orientation === "horizontal") {
+        let panel = chartElements.dataArea
+            .selectAll("backPanel")
+            .data(data)
+            .enter()
+            .append("rect")
+            .attr("x", function (d: any, i: number) {
+                return scale(d.start);
+            })
+            .attr("y", function (d: any) {
+                return 0;
+            })
+            .attr("width", function (d: any, i: number) {
+                return scale(d.end - d.start);
+            })
+            .attr("height", renderInfo.dataAreaSize.height)
+            .style("fill", function (d: any) {
+                return d.color;
+            });
+    } else if (bulletInfo.orientation === "vertical") {
+        let panel = chartElements.dataArea
+            .selectAll("backPanel")
+            .data(data)
+            .enter()
+            .append("rect")
+            .attr("x", function (d: any, i: number) {
+                return 0;
+            })
+            .attr("y", function (d: any) {
+                return scale(d.start);
+            })
+            .attr("width", renderInfo.dataAreaSize.width)
+            .attr("height", function (d: any) {
+                return scale(d.end - d.start);
+            })
+            .style("fill", function (d: any) {
+                return d.color;
+            });
+    }
 }
 
-function renderBarAndMark() {
-    // bar for actual value
-    // mark line for target value
+// Render bar for actual value
+function renderBar(
+    chartElements: ChartElements,
+    renderInfo: RenderInfo,
+    dataset: Dataset
+) {
+    // console.log("renderBar");
+    // console.log(dataset);
+
+    let bulletInfo = renderInfo.bullet;
+    if (!bulletInfo) return;
+
+    let strActualValue = bulletInfo.value;
+    let actualValue = 25; // TODO
+    let valueColor = bulletInfo.valueColor;
+
+    let scale = chartElements.scale;
+
+    if (bulletInfo.orientation === "horizontal") {
+        let barWidth = renderInfo.dataAreaSize.height / 3;
+        let bar = chartElements.dataArea
+            .append("rect")
+            .attr("x", scale(0))
+            .attr("y", barWidth)
+            .attr("width", scale(actualValue))
+            .attr("height", barWidth)
+            .style("fill", valueColor);
+    } else if (bulletInfo.orientation === "vertical") {
+        let barWidth = renderInfo.dataAreaSize.width / 3;
+        let bar = chartElements.dataArea
+            .append("rect")
+            .attr("x", barWidth)
+            .attr("y", renderInfo.dataAreaSize.height - scale(actualValue))
+            .attr("width", barWidth)
+            .attr("height", scale(actualValue))
+            .style("fill", valueColor);
+    }
 }
 
-function renderAxis() {
-    // ticks
-    // tick labels
-    // unit
+// Render mark line for target value
+function renderMark(
+    chartElements: ChartElements,
+    renderInfo: RenderInfo,
+    dataset: Dataset
+) {
+    // console.log("renderMark");
+    // console.log(dataset);
+
+    let bulletInfo = renderInfo.bullet;
+    if (!bulletInfo) return;
+
+    let markerValue = bulletInfo.markerValue;
+    let markerColor = bulletInfo.markerColor;
+
+    let scale = chartElements.scale;
+
+    if (bulletInfo.orientation === "horizontal") {
+        let markerLength = (renderInfo.dataAreaSize.height * 2) / 3;
+        let mark = chartElements.dataArea
+            .append("rect")
+            .attr("x", scale(markerValue) - 1.5)
+            .attr("y", markerLength / 4)
+            .attr("width", 3)
+            .attr("height", markerLength)
+            .style("fill", markerColor);
+    } else if (bulletInfo.orientation === "vertical") {
+        let markerLength = (renderInfo.dataAreaSize.width * 2) / 3;
+        let mark = chartElements.dataArea
+            .append("rect")
+            .attr("x", markerLength / 4)
+            .attr(
+                "y",
+                renderInfo.dataAreaSize.height - scale(markerValue) - 1.5
+            )
+            .attr("width", markerLength)
+            .attr("height", 3)
+            .style("fill", markerColor);
+    }
 }
 
 // Bullet graph https://en.wikipedia.org/wiki/Bullet_graph
 export function renderBullet(canvas: HTMLElement, renderInfo: RenderInfo) {
     // console.log("renderBullet");
     // console.log(renderInfo);
-    // if (renderInfo.bullet === null) return;
+    let bulletInfo = renderInfo.bullet;
+    if (bulletInfo === null) return;
+
+    let datasetId = parseFloat(bulletInfo.dataset);
+    let dataset = renderInfo.datasets.getDatasetById(datasetId);
+
+    // Set initial dataArea size
+    if (bulletInfo.orientation === "horizontal") {
+        renderInfo.dataAreaSize = { width: 250, height: 24 };
+    } else if (bulletInfo.orientation === "vertical") {
+        renderInfo.dataAreaSize = { width: 24, height: 250 };
+    }
+
+    let chartElements = createAreas(canvas, renderInfo);
 
-    // let chartElements = createAreas(canvas, renderInfo);
+    let retRenderAxis = renderAxis(chartElements, renderInfo, dataset);
+    if (typeof retRenderAxis === "string") {
+        return retRenderAxis;
+    }
 
-    renderTitle();
+    renderTitle(chartElements, renderInfo);
 
-    renderBackPanel();
+    renderBackPanel(chartElements, renderInfo, dataset);
 
-    renderBarAndMark();
+    renderBar(chartElements, renderInfo, dataset);
 
-    renderAxis();
+    renderMark(chartElements, renderInfo, dataset);
 }
diff --git a/src/data.ts b/src/data.ts
index 2ff728b..bb4b826 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -638,10 +638,28 @@ export class MonthInfo {
 }
 
 export class BulletInfo {
+    title: string;
+    dataset: string;
     orientation: string;
+    range: number[];
+    rangeColor: string[];
+    value: string;
+    valueColor: string;
+    showMark: boolean;
+    markerValue: number;
+    markerColor: string;
 
     constructor() {
+        this.title = "";
+        this.dataset = "0"; // dataset id or name
         this.orientation = "horizontal"; // or vertical
+        this.range = [];
+        this.rangeColor = [];
+        this.value = ""; // Can possess template varialbe
+        this.valueColor = "";
+        this.showMark = false;
+        this.markerValue = 0;
+        this.markerColor = "";
     }
 }
 
diff --git a/src/helper.ts b/src/helper.ts
index 515df7b..cec53dd 100644
--- a/src/helper.ts
+++ b/src/helper.ts
@@ -1,4 +1,4 @@
-import { RenderInfo, Size } from "./data";
+import { RenderInfo, Size, Transform } from "./data";
 import { TFile, TFolder, normalizePath } from "obsidian";
 import { ValueType } from "./data";
 import * as d3 from "d3";
@@ -124,3 +124,25 @@ export function measureTextSize(
     container.remove();
     return { width: size.width, height: size.height };
 }
+
+// dom
+export function expandArea(area: any, addW: number, addH: number) {
+    let oriWidth = parseFloat(area.attr("width")) | 0;
+    let oriHeight = parseFloat(area.attr("height")) | 0;
+    let newWidth = oriWidth + addW;
+    let newHeight = oriHeight + addH;
+    area.attr("width", newWidth);
+    area.attr("height", newHeight);
+}
+
+export function moveArea(area: any, shiftX: number, shiftY: number) {
+    let trans = new Transform(area.attr("transform"));
+    area.attr(
+        "transform",
+        "translate(" +
+            (trans.translateX + shiftX) +
+            "," +
+            (trans.translateY + shiftY) +
+            ")"
+    );
+}
diff --git a/src/parsing.ts b/src/parsing.ts
index 13d04ac..9c2b561 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1487,9 +1487,84 @@ export function getRenderInfoFromYaml(
         }
 
         if (yaml.bullet !== null) {
+            // title
+            if (typeof yaml.bullet.title === "string") {
+                renderInfo.bullet.title = yaml.bullet.title;
+            }
+            // console.log(renderInfo.bullet.title);
+
+            // dataset
+            if (typeof yaml.bullet.dataset === "string") {
+                renderInfo.bullet.dataset = yaml.bullet.dataset;
+            }
+            // console.log(renderInfo.bullet.dataset);
+
+            // orientation
             if (typeof yaml.bullet.orientation === "string") {
                 renderInfo.bullet.orientation = yaml.bullet.orientation;
             }
+            // console.log(renderInfo.bullet.orientation);
+
+            // range
+            let numRange = 0;
+            let retRange = getNumberArrayFromInput(
+                "range",
+                yaml?.bullet?.range,
+                3, // TODO
+                null,
+                true
+            );
+            if (typeof retRange === "string") {
+                return retRange; // errorMessage
+            }
+            renderInfo.bullet.range = retRange;
+            numRange = retRange.length;
+            // console.log(renderInfo.bullet.range);
+
+            // range color
+            let retRangeColor = getStringArrayFromInput(
+                "rangeColor",
+                yaml?.bullet?.rangeColor,
+                numRange,
+                "",
+                validateColor,
+                true
+            );
+            if (typeof retRangeColor === "string") {
+                return retRangeColor; // errorMessage
+            }
+            renderInfo.bullet.rangeColor = retRangeColor;
+            // console.log(renderInfo.bullet.rangeColor);
+
+            // actual value, can possess template variable
+            if (typeof yaml.bullet.value === "string") {
+                renderInfo.bullet.value = yaml.bullet.value;
+            }
+            // console.log(renderInfo.bullet.value);
+
+            // value color
+            if (typeof yaml.bullet.valueColor === "string") {
+                renderInfo.bullet.valueColor = yaml.bullet.valueColor;
+            }
+            // console.log(renderInfo.bullet.valueColor);
+
+            // show mark
+            if (typeof yaml.bullet.showMark === "boolean") {
+                renderInfo.bullet.showMark = yaml.bullet.showMark;
+            }
+            // console.log(renderInfo.bullet.showMark);
+
+            // mark value
+            if (typeof yaml.bullet.markerValue === "number") {
+                renderInfo.bullet.markerValue = yaml.bullet.markerValue;
+            }
+            // console.log(renderInfo.bullet.markValue);
+
+            // mark color
+            if (typeof yaml.bullet.markerColor === "number") {
+                renderInfo.bullet.markerColor = yaml.bullet.markerColor;
+            }
+            // console.log(renderInfo.bullet.markValue);
         }
     } // Bullet related parameters
 
diff --git a/src/rendering.ts b/src/rendering.ts
index da412b6..22d2b4b 100644
--- a/src/rendering.ts
+++ b/src/rendering.ts
@@ -233,8 +233,8 @@ function renderXAxis(chartElements: ChartElements, renderInfo: RenderInfo) {
     xAxis.attr("height", tickLength + tickLabelHeight);
 
     // Expand areas
-    expandArea(chartElements.svg, 0, tickLength + tickLabelHeight);
-    expandArea(chartElements.graphArea, 0, tickLength + tickLabelHeight);
+    helper.expandArea(chartElements.svg, 0, tickLength + tickLabelHeight);
+    helper.expandArea(chartElements.graphArea, 0, tickLength + tickLabelHeight);
 }
 
 function renderYAxis(
@@ -487,17 +487,17 @@ function renderYAxis(
     yAxis.attr("width", yAxisWidth);
 
     // Expand areas
-    expandArea(chartElements.svg, yAxisWidth, 0);
-    expandArea(chartElements.graphArea, yAxisWidth, 0);
+    helper.expandArea(chartElements.svg, yAxisWidth, 0);
+    helper.expandArea(chartElements.graphArea, yAxisWidth, 0);
 
     // Move areas
     if (yAxisLocation === "left") {
         // Move dataArea
-        moveArea(chartElements.dataArea, yAxisWidth, 0);
+        helper.moveArea(chartElements.dataArea, yAxisWidth, 0);
 
         // Move title
         if (chartElements.title) {
-            moveArea(chartElements.title, yAxisWidth, 0);
+            helper.moveArea(chartElements.title, yAxisWidth, 0);
         }
     }
 }
@@ -887,9 +887,9 @@ function renderLegend(chartElements: ChartElements, renderInfo: RenderInfo) {
             legendWidth / 2.0;
         legendY = titleHeight;
         // Expand svg
-        expandArea(svg, 0, legendHeight + ySpacing);
+        helper.expandArea(svg, 0, legendHeight + ySpacing);
         // Move dataArea down
-        moveArea(dataArea, 0, legendHeight + ySpacing);
+        helper.moveArea(dataArea, 0, legendHeight + ySpacing);
     } else if (chartInfo.legendPosition === "bottom") {
         // bellow x-axis label
         legendX =
@@ -902,7 +902,7 @@ function renderLegend(chartElements: ChartElements, renderInfo: RenderInfo) {
             xAxisHeight +
             ySpacing;
         // Expand svg
-        expandArea(svg, 0, legendHeight + ySpacing);
+        helper.expandArea(svg, 0, legendHeight + ySpacing);
     } else if (chartInfo.legendPosition === "left") {
         legendX = 0;
         legendY =
@@ -910,9 +910,9 @@ function renderLegend(chartElements: ChartElements, renderInfo: RenderInfo) {
             renderInfo.dataAreaSize.height / 2.0 -
             legendHeight / 2.0;
         // Expand svg
-        expandArea(svg, legendWidth + xSpacing, 0);
+        helper.expandArea(svg, legendWidth + xSpacing, 0);
         // Move dataArea right
-        moveArea(dataArea, legendWidth + xSpacing, 0);
+        helper.moveArea(dataArea, legendWidth + xSpacing, 0);
     } else if (chartInfo.legendPosition === "right") {
         legendX =
             renderInfo.dataAreaSize.width +
@@ -924,7 +924,7 @@ function renderLegend(chartElements: ChartElements, renderInfo: RenderInfo) {
             renderInfo.dataAreaSize.height / 2.0 -
             legendHeight / 2.0;
         // Expand svg
-        expandArea(svg, legendWidth + xSpacing, 0);
+        helper.expandArea(svg, legendWidth + xSpacing, 0);
     } else {
         return;
     }
@@ -1270,11 +1270,11 @@ function renderTitle(chartElements: ChartElements, renderInfo: RenderInfo) {
     chartElements["title"] = title;
 
     // Expand parent areas
-    expandArea(chartElements.svg, 0, titleSize.height);
-    expandArea(chartElements.graphArea, 0, titleSize.height);
+    helper.expandArea(chartElements.svg, 0, titleSize.height);
+    helper.expandArea(chartElements.graphArea, 0, titleSize.height);
 
     // Move sibling areas
-    moveArea(chartElements.dataArea, 0, titleSize.height);
+    helper.moveArea(chartElements.dataArea, 0, titleSize.height);
 
     return;
 }
@@ -1361,27 +1361,6 @@ function createAreas(
     return chartElements;
 }
 
-function expandArea(area: any, addW: number, addH: number) {
-    let oriWidth = parseFloat(area.attr("width")) | 0;
-    let oriHeight = parseFloat(area.attr("height")) | 0;
-    let newWidth = oriWidth + addW;
-    let newHeight = oriHeight + addH;
-    area.attr("width", newWidth);
-    area.attr("height", newHeight);
-}
-
-function moveArea(area: any, shiftX: number, shiftY: number) {
-    let trans = new Transform(area.attr("transform"));
-    area.attr(
-        "transform",
-        "translate(" +
-            (trans.translateX + shiftX) +
-            "," +
-            (trans.translateY + shiftY) +
-            ")"
-    );
-}
-
 function renderLineChart(canvas: HTMLElement, renderInfo: RenderInfo) {
     // console.log("renderLineChart");
     // console.log(renderInfo);
diff --git a/styles.css b/styles.css
index bc74a53..7ccbcf3 100644
--- a/styles.css
+++ b/styles.css
@@ -44,6 +44,12 @@
     font-size: 18px;
 }
 
+.tracker-title-small {
+    fill: var(--color-title);
+    text-anchor: middle;
+    font-size: 16px;
+}
+
 .tracker-axis {
     fill: none;
     stroke: var(--color-axis);

From f525bc149b64de16dccf7ef666feee83f798b21d Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 29 May 2021 16:35:01 +0800
Subject: [PATCH 026/402] Parse bullet info and refine the bullet chart

---
 examples/TestBullet.md |  20 ++--
 src/bullet.ts          |  73 ++++++++-----
 src/data.ts            |   2 +-
 src/expr.ts            | 229 +++++++++++++++++++++++++++++++++++++++++
 src/parsing.ts         |  83 ++++++++++++---
 src/summary.ts         | 224 +---------------------------------------
 6 files changed, 358 insertions(+), 273 deletions(-)
 create mode 100644 src/expr.ts

diff --git a/examples/TestBullet.md b/examples/TestBullet.md
index 4d9c53f..0dd94a7 100644
--- a/examples/TestBullet.md
+++ b/examples/TestBullet.md
@@ -2,7 +2,7 @@
 Horizontal bullet chart
 ``` tracker
 searchType: tag
-searchTarget: meditation
+searchTarget: clean-up
 folder: diary
 endDate: 2021-01-31
 fixedScale: 1
@@ -10,30 +10,30 @@ bullet:
     title: "Clean Up"
 	dataset: 0
     orientation: horizontal
-	range: 10, 20, 30
-	rangeColor: '#ccc, #ddd, #eee'
+	range: 10, 20, 40
+	rangeColor: darkgray, silver, lightgray
 	value: "{{lastBreaks}}"
-	valueColor: steelblue
+	valueColor: '#69b3a2'
 	showMark: false
-	markerValue: 20
+	markerValue: 24
 	markerColor: black
 ```
 
 Vertical bullet chart
 ``` tracker
 searchType: tag
-searchTarget: meditation
+searchTarget: clean-up
 folder: diary
 endDate: 2021-01-31
 bullet:
     title: "Clean Up"
 	dataset: 0
     orientation: vertical
-	range: 10, 20, 30
-	rangeColor: '#ccc, #ddd, #eee'
+	range: 10, 20, 40
+	rangeColor: darkgray, silver, lightgray
 	value: "{{lastBreaks}}"
-	valueColor: steelblue
+	valueColor: '#69b3a2'
 	showMark: false
-	markerValue: 20
+	markerValue: 24
 	markerColor: black
 ```
\ No newline at end of file
diff --git a/src/bullet.ts b/src/bullet.ts
index 7408c3b..7b35d70 100644
--- a/src/bullet.ts
+++ b/src/bullet.ts
@@ -11,6 +11,7 @@ import {
 } from "./data";
 import * as helper from "./helper";
 import * as d3 from "d3";
+import * as expr from "./expr";
 
 function createAreas(
     canvas: HTMLElement,
@@ -107,28 +108,40 @@ function renderTitle(chartElements: ChartElements, renderInfo: RenderInfo) {
         // Move sibling areas
         helper.moveArea(chartElements.dataArea, titleSize.width + spacing, 0);
     } else if (bulletInfo.orientation === "vertical") {
+        // if label width > dataArea width
+        let xMiddle = renderInfo.dataAreaSize.width / 2.0;
+        if (titleSize.width > renderInfo.dataAreaSize.width) {
+            helper.expandArea(
+                chartElements.svg,
+                titleSize.width - renderInfo.dataAreaSize.width,
+                0
+            );
+            helper.expandArea(
+                chartElements.graphArea,
+                titleSize.width - renderInfo.dataAreaSize.width,
+                0
+            );
+
+            helper.moveArea(
+                chartElements.dataArea,
+                titleSize.width / 2.0 - renderInfo.dataAreaSize.width / 2.0,
+                0
+            );
+            xMiddle = titleSize.width / 2.0;
+        }
+
         let title = chartElements.graphArea
             .append("text")
             .text(bulletInfo.title) // pivot at center
             .attr("id", "title")
-            .attr(
-                "transform",
-                "translate(" +
-                    renderInfo.dataAreaSize.width / 2.0 +
-                    "," +
-                    titleSize.height / 2.0 +
-                    ")"
-            )
+            .attr("x", xMiddle)
+            .attr("y", titleSize.height / 2.0)
             .attr("height", titleSize.height) // for later use
             .attr("class", "tracker-title-small");
         chartElements["title"] = title;
 
         // Expand parent areas
-        let xExpand = helper.expandArea(
-            chartElements.svg,
-            0,
-            titleSize.height + spacing
-        );
+        helper.expandArea(chartElements.svg, 0, titleSize.height + spacing);
         helper.expandArea(
             chartElements.graphArea,
             0,
@@ -192,17 +205,15 @@ function renderAxis(
         );
     } else if (bulletInfo.orientation === "vertical") {
         let scale = d3.scaleLinear();
-        scale.domain(domain).range([0, renderInfo.dataAreaSize.height]);
+        scale.domain(domain).range([renderInfo.dataAreaSize.height, 0]);
         chartElements["scale"] = scale;
 
         let axisGen = d3.axisLeft(scale);
         let axis = chartElements.dataArea
             .append("g")
             .attr("id", "axis")
-            .attr(
-                "transform",
-                "translate(" + renderInfo.dataAreaSize.width + " ,0)"
-            )
+            .attr("x", 0)
+            .attr("y", 0)
             .call(axisGen)
             .attr("class", "tracker-axis");
 
@@ -276,11 +287,11 @@ function renderBackPanel(
                 return 0;
             })
             .attr("y", function (d: any) {
-                return scale(d.start);
+                return scale(d.end);
             })
             .attr("width", renderInfo.dataAreaSize.width)
             .attr("height", function (d: any) {
-                return scale(d.end - d.start);
+                return renderInfo.dataAreaSize.height - scale(d.end - d.start);
             })
             .style("fill", function (d: any) {
                 return d.color;
@@ -296,12 +307,18 @@ function renderBar(
 ) {
     // console.log("renderBar");
     // console.log(dataset);
+    let errorMessage = "";
 
     let bulletInfo = renderInfo.bullet;
     if (!bulletInfo) return;
 
     let strActualValue = bulletInfo.value;
-    let actualValue = 25; // TODO
+    strActualValue = expr.resolveTemplate(strActualValue, renderInfo);
+    let actualValue = parseFloat(strActualValue);
+    if (Number.isNaN(actualValue)) {
+        errorMessage = "Invalid paramter 'actualValue'";
+        return errorMessage;
+    }
     let valueColor = bulletInfo.valueColor;
 
     let scale = chartElements.scale;
@@ -320,9 +337,9 @@ function renderBar(
         let bar = chartElements.dataArea
             .append("rect")
             .attr("x", barWidth)
-            .attr("y", renderInfo.dataAreaSize.height - scale(actualValue))
+            .attr("y", scale(actualValue))
             .attr("width", barWidth)
-            .attr("height", scale(actualValue))
+            .attr("height", renderInfo.dataAreaSize.height - scale(actualValue))
             .style("fill", valueColor);
     }
 }
@@ -358,10 +375,7 @@ function renderMark(
         let mark = chartElements.dataArea
             .append("rect")
             .attr("x", markerLength / 4)
-            .attr(
-                "y",
-                renderInfo.dataAreaSize.height - scale(markerValue) - 1.5
-            )
+            .attr("y", scale(markerValue) - 1.5)
             .attr("width", markerLength)
             .attr("height", 3)
             .style("fill", markerColor);
@@ -396,7 +410,10 @@ export function renderBullet(canvas: HTMLElement, renderInfo: RenderInfo) {
 
     renderBackPanel(chartElements, renderInfo, dataset);
 
-    renderBar(chartElements, renderInfo, dataset);
+    let retRenderBar = renderBar(chartElements, renderInfo, dataset);
+    if (typeof retRenderBar === "string") {
+        return retRenderBar;
+    }
 
     renderMark(chartElements, renderInfo, dataset);
 }
diff --git a/src/data.ts b/src/data.ts
index bb4b826..11a8b3d 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -656,7 +656,7 @@ export class BulletInfo {
         this.range = [];
         this.rangeColor = [];
         this.value = ""; // Can possess template varialbe
-        this.valueColor = "";
+        this.valueColor = "#69b3a2";
         this.showMark = false;
         this.markerValue = 0;
         this.markerColor = "";
diff --git a/src/expr.ts b/src/expr.ts
new file mode 100644
index 0000000..668531a
--- /dev/null
+++ b/src/expr.ts
@@ -0,0 +1,229 @@
+import { RenderInfo } from "./data";
+import * as d3 from "d3";
+
+let fnSet = {
+    min: function (renderInfo: RenderInfo, datasetId: number) {
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        return d3.min(dataset.getValues());
+    },
+    max: function (renderInfo: RenderInfo, datasetId: number) {
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        return d3.max(dataset.getValues());
+    },
+    sum: function (renderInfo: RenderInfo, datasetId: number) {
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        return d3.sum(dataset.getValues());
+    },
+    count: function (renderInfo: RenderInfo, datasetId: number) {
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        return dataset.getLengthNotNull();
+    },
+    days: function (renderInfo: RenderInfo, datasetId: number) {
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        let result = dataset.getLength();
+        return result;
+    },
+    maxStreak: function (renderInfo: RenderInfo, datasetId: number) {
+        let streak = 0;
+        let maxStreak = 0;
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        for (let dataPoint of dataset) {
+            if (dataPoint.value !== null) {
+                streak++;
+            } else {
+                streak = 0;
+            }
+            if (streak > maxStreak) {
+                maxStreak = streak;
+            }
+        }
+        return maxStreak;
+    },
+    maxBreaks: function (renderInfo: RenderInfo, datasetId: number) {
+        let streak = 0;
+        let maxBreak = 0;
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+
+        for (let dataPoint of dataset) {
+            if (dataPoint.value === null) {
+                streak++;
+            } else {
+                streak = 0;
+            }
+            if (streak > maxBreak) {
+                maxBreak = streak;
+            }
+        }
+        return maxBreak;
+    },
+    lastStreak: function (renderInfo: RenderInfo, datasetId: number) {
+        let streak = 0;
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        let values = dataset.getValues();
+        for (let ind = values.length - 1; ind >= 0; ind--) {
+            let value = values[ind];
+            if (value === null) {
+                break;
+            } else {
+                streak++;
+            }
+        }
+        return streak;
+    },
+    lastBreaks: function (renderInfo: RenderInfo, datasetId: number) {
+        let breakDays = 0;
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        let values = dataset.getValues();
+        for (let ind = values.length - 1; ind >= 0; ind--) {
+            let value = values[ind];
+            if (value === null) {
+                breakDays++;
+            } else {
+                break;
+            }
+        }
+        return breakDays;
+    },
+    average: function (renderInfo: RenderInfo, datasetId: number) {
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        let countNotNull = dataset.getLengthNotNull();
+        if (countNotNull > 0) {
+            let sum = d3.sum(dataset.getValues());
+            return sum / countNotNull;
+        }
+        return null;
+    },
+    median: function (renderInfo: RenderInfo, datasetId: number) {
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        return d3.median(dataset.getValues());
+    },
+    variance: function (renderInfo: RenderInfo, datasetId: number) {
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        return d3.variance(dataset.getValues());
+    },
+};
+
+export function resolveTemplate(template: string, renderInfo: RenderInfo) {
+    let replaceMap: { [key: string]: string } = {};
+    // Loop over fnSet, prepare replaceMap
+    Object.entries(fnSet).forEach(([fnName, fn]) => {
+        // {{\s*max(\(\s*Dataset\(\s*(?<datasetId>\d+)\s*\)\s*\))?\s*}}
+        let strRegex =
+            "{{\\s*" +
+            fnName +
+            "(\\(\\s*Dataset\\(\\s*((?<datasetId>\\d+)|(?<datasetName>\\w+))\\s*\\)\\s*\\))?\\s*}}";
+        // console.log(strRegex);
+        let regex = new RegExp(strRegex, "gm");
+        let match;
+        while ((match = regex.exec(template))) {
+            // console.log(match);
+            if (typeof match.groups !== "undefined") {
+                if (typeof match.groups.datasetId !== "undefined") {
+                    let datasetId = parseInt(match.groups.datasetId);
+                    // console.log(datasetId);
+                    if (Number.isInteger(datasetId)) {
+                        let strReplaceRegex =
+                            "{{\\s*" +
+                            fnName +
+                            "(\\(\\s*Dataset\\(\\s*" +
+                            datasetId.toString() +
+                            "\\s*\\)\\s*\\))?\\s*}}";
+
+                        if (!(strReplaceRegex in replaceMap)) {
+                            let result = fn(renderInfo, datasetId); // calculate result
+                            let strResult = "{{NA}}";
+                            if (
+                                typeof result !== "undefined" &&
+                                result !== null
+                            ) {
+                                if (Number.isInteger(result)) {
+                                    strResult = result.toFixed(0);
+                                } else {
+                                    strResult = result.toFixed(2);
+                                }
+                            }
+
+                            replaceMap[strReplaceRegex] = strResult;
+                        }
+                    }
+                } else if (typeof match.groups.datasetName !== "undefined") {
+                    let datasetName = match.groups.datasetName;
+                    // console.log(datasetName);
+                    let strReplaceRegex =
+                        "{{\\s*" +
+                        fnName +
+                        "(\\(\\s*Dataset\\(\\s*" +
+                        datasetName +
+                        "\\s*\\)\\s*\\))?\\s*}}";
+
+                    let datasetId = renderInfo.datasetName.indexOf(datasetName);
+                    // console.log(datasetName);
+                    // console.log(renderInfo.datasetName);
+                    // console.log(datasetId);
+                    if (!(strReplaceRegex in replaceMap)) {
+                        let strResult = "{{NA}}";
+                        if (datasetId >= 0) {
+                            let result = fn(renderInfo, datasetId); // calculate result
+                            if (
+                                typeof result !== "undefined" &&
+                                result !== null
+                            ) {
+                                if (Number.isInteger(result)) {
+                                    strResult = result.toFixed(0);
+                                } else {
+                                    strResult = result.toFixed(2);
+                                }
+                            }
+                        }
+                        replaceMap[strReplaceRegex] = strResult;
+                    }
+                } else {
+                    // no datasetId assigned use id 0
+                    // console.log("{{" + fnName + "}}")
+                    let strReplaceRegex = "{{\\s*" + fnName + "\\s*}}";
+                    if (!(strReplaceRegex in replaceMap)) {
+                        let result = fn(renderInfo, 0); // calculate result
+                        let strResult = "{{NA}}";
+                        if (typeof result !== "undefined" && result !== null) {
+                            if (Number.isInteger(result)) {
+                                strResult = result.toFixed(0);
+                            } else {
+                                strResult = result.toFixed(2);
+                            }
+                        }
+
+                        replaceMap[strReplaceRegex] = strResult;
+                    }
+                }
+            } else {
+                // groups undefined
+                // no datasetId assigned use id 0
+                // console.log("{{" + fnName + "}}")
+                let strReplaceRegex = "{{\\s*" + fnName + "\\s*}}";
+                if (!(strReplaceRegex in replaceMap)) {
+                    let result = fn(renderInfo, 0); // calculate result
+                    let strResult = "{{NA}}";
+                    if (typeof result !== "undefined" && result !== null) {
+                        if (Number.isInteger(result)) {
+                            strResult = result.toFixed(0);
+                        } else {
+                            strResult = result.toFixed(2);
+                        }
+                    }
+
+                    replaceMap[strReplaceRegex] = strResult;
+                }
+            }
+        }
+    });
+
+    // console.log(replaceMap);
+    // Do replace
+    for (let strReplaceRegex in replaceMap) {
+        let strResult = replaceMap[strReplaceRegex];
+        let regex = new RegExp(strReplaceRegex, "gi");
+        template = template.replace(regex, strResult);
+    }
+
+    return template;
+}
diff --git a/src/parsing.ts b/src/parsing.ts
index 9c2b561..b393fbe 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1506,19 +1506,78 @@ export function getRenderInfoFromYaml(
             // console.log(renderInfo.bullet.orientation);
 
             // range
-            let numRange = 0;
-            let retRange = getNumberArrayFromInput(
-                "range",
-                yaml?.bullet?.range,
-                3, // TODO
-                null,
-                true
-            );
-            if (typeof retRange === "string") {
-                return retRange; // errorMessage
+            let range: Array<number> = [];
+            if (
+                typeof yaml.bullet.range === "object" &&
+                yaml.bullet.range !== null
+            ) {
+                if (Array.isArray(yaml.bullet.range)) {
+                    for (let r of yaml.bullet.range) {
+                        if (typeof r === "string") {
+                            let v = parseFloat(r);
+                            if (Number.isNumber(v)) {
+                                range.push(v);
+                            } else {
+                                errorMessage =
+                                    "Parameter 'range' accepts only numbers";
+                                return errorMessage;
+                            }
+                        }
+                    }
+                }
+            } else if (typeof yaml.bullet.range === "string") {
+                let splitted = yaml.bullet.range.split(",");
+                if (splitted.length > 1) {
+                    for (let piece of splitted) {
+                        let v = parseFloat(piece.trim());
+                        if (!Number.isNaN(v)) {
+                            // Number.isNumber(NaN) --> true
+                            range.push(v);
+                        } else {
+                            errorMessage =
+                                "Parameter 'range' accepts only numbers";
+                            return errorMessage;
+                        }
+                    }
+                } else if (yaml.bullet.range === "") {
+                    errorMessage = "Empty range is not allowed.";
+                } else {
+                    let v = parseFloat(yaml.bullet.range);
+                    if (Number.isNumber(v)) {
+                        range.push(v);
+                    } else {
+                        errorMessage = "Parameter 'range' accepts only numbers";
+                        return errorMessage;
+                    }
+                }
+            } else {
+                errorMessage = "Invalid range";
+                return errorMessage;
+            }
+            // Check the value is monotonically increasing
+            // Check the value is not negative
+            if (range.length === 1) {
+                if (range[0] < 0) {
+                    errorMessage = "Negative range value is not allowed";
+                    return errorMessage;
+                }
+            } else if (range.length > 1) {
+                let lastBound = range[0];
+                if (lastBound < 0) {
+                    errorMessage = "Negative range value is not allowed";
+                    return errorMessage;
+                } else {
+                    for (let ind = 1; ind < range.length; ind++) {
+                        if (range[ind] <= lastBound) {
+                            errorMessage =
+                                "Values in parameter 'range' should be monotonically increasing";
+                            return errorMessage;
+                        }
+                    }
+                }
             }
-            renderInfo.bullet.range = retRange;
-            numRange = retRange.length;
+            renderInfo.bullet.range = range;
+            let numRange = range.length;
             // console.log(renderInfo.bullet.range);
 
             // range color
diff --git a/src/summary.ts b/src/summary.ts
index 3de3821..0fd0fb9 100644
--- a/src/summary.ts
+++ b/src/summary.ts
@@ -1,112 +1,11 @@
 import * as d3 from "d3";
 import { RenderInfo } from "./data";
+import * as expr from "./expr";
 
 function checkSummaryTemplateValid(summaryTemplate: string): boolean {
     return true;
 }
 
-let fnSet = {
-    min: function (renderInfo: RenderInfo, datasetId: number) {
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
-        return d3.min(dataset.getValues());
-    },
-    max: function (renderInfo: RenderInfo, datasetId: number) {
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
-        return d3.max(dataset.getValues());
-    },
-    sum: function (renderInfo: RenderInfo, datasetId: number) {
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
-        return d3.sum(dataset.getValues());
-    },
-    count: function (renderInfo: RenderInfo, datasetId: number) {
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
-        return dataset.getLengthNotNull();
-    },
-    days: function (renderInfo: RenderInfo, datasetId: number) {
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
-        let result = dataset.getLength();
-        return result;
-    },
-    maxStreak: function (renderInfo: RenderInfo, datasetId: number) {
-        let streak = 0;
-        let maxStreak = 0;
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
-        for (let dataPoint of dataset) {
-            if (dataPoint.value !== null) {
-                streak++;
-            } else {
-                streak = 0;
-            }
-            if (streak > maxStreak) {
-                maxStreak = streak;
-            }
-        }
-        return maxStreak;
-    },
-    maxBreaks: function (renderInfo: RenderInfo, datasetId: number) {
-        let streak = 0;
-        let maxBreak = 0;
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
-
-        for (let dataPoint of dataset) {
-            if (dataPoint.value === null) {
-                streak++;
-            } else {
-                streak = 0;
-            }
-            if (streak > maxBreak) {
-                maxBreak = streak;
-            }
-        }
-        return maxBreak;
-    },
-    lastStreak: function (renderInfo: RenderInfo, datasetId: number) {
-        let streak = 0;
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
-        let values = dataset.getValues();
-        for (let ind = values.length - 1; ind >= 0; ind--) {
-            let value = values[ind];
-            if (value === null) {
-                break;
-            } else {
-                streak++;
-            }
-        }
-        return streak;
-    },
-    lastBreaks: function (renderInfo: RenderInfo, datasetId: number) {
-        let breakDays = 0;
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
-        let values = dataset.getValues();
-        for (let ind = values.length - 1; ind >= 0; ind--) {
-            let value = values[ind];
-            if (value === null) {
-                breakDays++;
-            } else {
-                break;
-            }
-        }
-        return breakDays;
-    },
-    average: function (renderInfo: RenderInfo, datasetId: number) {
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
-        let countNotNull = dataset.getLengthNotNull();
-        if (countNotNull > 0) {
-            let sum = d3.sum(dataset.getValues());
-            return sum / countNotNull;
-        }
-        return null;
-    },
-    median: function (renderInfo: RenderInfo, datasetId: number) {
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
-        return d3.median(dataset.getValues());
-    },
-    variance: function (renderInfo: RenderInfo, datasetId: number) {
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
-        return d3.variance(dataset.getValues());
-    },
-};
-
 export function renderSummary(canvas: HTMLElement, renderInfo: RenderInfo) {
     // console.log("renderSummary");
     // console.log(renderInfo);
@@ -119,126 +18,7 @@ export function renderSummary(canvas: HTMLElement, renderInfo: RenderInfo) {
         return "Invalid summary template";
     }
 
-    let replaceMap: { [key: string]: string } = {};
-    // Loop over fnSet, prepare replaceMap
-    Object.entries(fnSet).forEach(([fnName, fn]) => {
-        // {{\s*max(\(\s*Dataset\(\s*(?<datasetId>\d+)\s*\)\s*\))?\s*}}
-        let strRegex =
-            "{{\\s*" +
-            fnName +
-            "(\\(\\s*Dataset\\(\\s*((?<datasetId>\\d+)|(?<datasetName>\\w+))\\s*\\)\\s*\\))?\\s*}}";
-        // console.log(strRegex);
-        let regex = new RegExp(strRegex, "gm");
-        let match;
-        while ((match = regex.exec(outputSummary))) {
-            // console.log(match);
-            if (typeof match.groups !== "undefined") {
-                if (typeof match.groups.datasetId !== "undefined") {
-                    let datasetId = parseInt(match.groups.datasetId);
-                    // console.log(datasetId);
-                    if (Number.isInteger(datasetId)) {
-                        let strReplaceRegex =
-                            "{{\\s*" +
-                            fnName +
-                            "(\\(\\s*Dataset\\(\\s*" +
-                            datasetId.toString() +
-                            "\\s*\\)\\s*\\))?\\s*}}";
-
-                        if (!(strReplaceRegex in replaceMap)) {
-                            let result = fn(renderInfo, datasetId); // calculate result
-                            let strResult = "{{NA}}";
-                            if (
-                                typeof result !== "undefined" &&
-                                result !== null
-                            ) {
-                                if (Number.isInteger(result)) {
-                                    strResult = result.toFixed(0);
-                                } else {
-                                    strResult = result.toFixed(2);
-                                }
-                            }
-
-                            replaceMap[strReplaceRegex] = strResult;
-                        }
-                    }
-                } else if (typeof match.groups.datasetName !== "undefined") {
-                    let datasetName = match.groups.datasetName;
-                    // console.log(datasetName);
-                    let strReplaceRegex =
-                        "{{\\s*" +
-                        fnName +
-                        "(\\(\\s*Dataset\\(\\s*" +
-                        datasetName +
-                        "\\s*\\)\\s*\\))?\\s*}}";
-
-                    let datasetId = renderInfo.datasetName.indexOf(datasetName);
-                    // console.log(datasetName);
-                    // console.log(renderInfo.datasetName);
-                    // console.log(datasetId);
-                    if (!(strReplaceRegex in replaceMap)) {
-                        let strResult = "{{NA}}";
-                        if (datasetId >= 0) {
-                            let result = fn(renderInfo, datasetId); // calculate result
-                            if (
-                                typeof result !== "undefined" &&
-                                result !== null
-                            ) {
-                                if (Number.isInteger(result)) {
-                                    strResult = result.toFixed(0);
-                                } else {
-                                    strResult = result.toFixed(2);
-                                }
-                            }
-                        }
-                        replaceMap[strReplaceRegex] = strResult;
-                    }
-                } else {
-                    // no datasetId assigned use id 0
-                    // console.log("{{" + fnName + "}}")
-                    let strReplaceRegex = "{{\\s*" + fnName + "\\s*}}";
-                    if (!(strReplaceRegex in replaceMap)) {
-                        let result = fn(renderInfo, 0); // calculate result
-                        let strResult = "{{NA}}";
-                        if (typeof result !== "undefined" && result !== null) {
-                            if (Number.isInteger(result)) {
-                                strResult = result.toFixed(0);
-                            } else {
-                                strResult = result.toFixed(2);
-                            }
-                        }
-
-                        replaceMap[strReplaceRegex] = strResult;
-                    }
-                }
-            } else {
-                // groups undefined
-                // no datasetId assigned use id 0
-                // console.log("{{" + fnName + "}}")
-                let strReplaceRegex = "{{\\s*" + fnName + "\\s*}}";
-                if (!(strReplaceRegex in replaceMap)) {
-                    let result = fn(renderInfo, 0); // calculate result
-                    let strResult = "{{NA}}";
-                    if (typeof result !== "undefined" && result !== null) {
-                        if (Number.isInteger(result)) {
-                            strResult = result.toFixed(0);
-                        } else {
-                            strResult = result.toFixed(2);
-                        }
-                    }
-
-                    replaceMap[strReplaceRegex] = strResult;
-                }
-            }
-        }
-    });
-    // console.log(replaceMap);
-    // Do replace
-    for (let strReplaceRegex in replaceMap) {
-        let strResult = replaceMap[strReplaceRegex];
-        let regex = new RegExp(strReplaceRegex, "gi");
-        outputSummary = outputSummary.replace(regex, strResult);
-    }
-
+    outputSummary = expr.resolveTemplate(outputSummary, renderInfo);
     if (outputSummary !== "") {
         let textBlock = d3.select(canvas).append("div");
         if (outputSummary.includes("\n")) {

From 090805756d45460892a34fb0dfc48a4e95214f16 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 30 May 2021 15:40:22 +0800
Subject: [PATCH 027/402] Refine the bullet chart

---
 examples/TestBullet.md |  22 +++--
 src/bullet.ts          | 211 ++++++++++++++++++++++++++++-------------
 src/data.ts            |  14 +--
 src/parsing.ts         |  15 ++-
 4 files changed, 178 insertions(+), 84 deletions(-)

diff --git a/examples/TestBullet.md b/examples/TestBullet.md
index 0dd94a7..8693bd2 100644
--- a/examples/TestBullet.md
+++ b/examples/TestBullet.md
@@ -5,7 +5,7 @@ searchType: tag
 searchTarget: clean-up
 folder: diary
 endDate: 2021-01-31
-fixedScale: 1
+fixedScale: 0.1
 bullet:
     title: "Clean Up"
 	dataset: 0
@@ -13,8 +13,9 @@ bullet:
 	range: 10, 20, 40
 	rangeColor: darkgray, silver, lightgray
 	value: "{{lastBreaks}}"
+	valueUnit: times
 	valueColor: '#69b3a2'
-	showMark: false
+	showMarker: true
 	markerValue: 24
 	markerColor: black
 ```
@@ -22,18 +23,19 @@ bullet:
 Vertical bullet chart
 ``` tracker
 searchType: tag
-searchTarget: clean-up
+searchTarget: meditation
 folder: diary
 endDate: 2021-01-31
 bullet:
-    title: "Clean Up"
+    title: "Meditation"
 	dataset: 0
     orientation: vertical
-	range: 10, 20, 40
+	range: 30, 60, 100
 	rangeColor: darkgray, silver, lightgray
-	value: "{{lastBreaks}}"
-	valueColor: '#69b3a2'
-	showMark: false
-	markerValue: 24
-	markerColor: black
+	value: "{{lastStreak}}"
+	valueUnit: %
+	valueColor: steelblue
+	showMarker: true
+	markerValue: 80
+	markerColor: red
 ```
\ No newline at end of file
diff --git a/src/bullet.ts b/src/bullet.ts
index 7b35d70..b9d44b0 100644
--- a/src/bullet.ts
+++ b/src/bullet.ts
@@ -78,78 +78,134 @@ function renderTitle(chartElements: ChartElements, renderInfo: RenderInfo) {
     let bulletInfo = renderInfo.bullet;
     if (!bulletInfo) return;
 
-    if (!bulletInfo.title) return;
+    const spacing = 6; // spacing between title and dataArea
 
-    let titleSize = helper.measureTextSize(
-        bulletInfo.title,
-        "tracker-title-small"
-    );
-    let spacing = 6; // spacing between title and dataArea
-
-    if (bulletInfo.orientation === "horizontal") {
-        let title = chartElements.graphArea
-            .append("text")
-            .text(bulletInfo.title) // pivot at center
-            .attr("id", "title")
-            .attr("x", titleSize.width / 2.0)
-            .attr("y", renderInfo.dataAreaSize.height / 2.0)
-            .attr("height", titleSize.height) // for later use
-            .attr("class", "tracker-title-small");
-        chartElements["title"] = title;
-
-        // Expand parent areas
-        helper.expandArea(chartElements.svg, titleSize.width + spacing, 0);
-        helper.expandArea(
-            chartElements.graphArea,
-            titleSize.width + spacing,
-            0
+    if (bulletInfo.title) {
+        let titleSize = helper.measureTextSize(
+            bulletInfo.title,
+            "tracker-title-small"
         );
 
-        // Move sibling areas
-        helper.moveArea(chartElements.dataArea, titleSize.width + spacing, 0);
-    } else if (bulletInfo.orientation === "vertical") {
-        // if label width > dataArea width
-        let xMiddle = renderInfo.dataAreaSize.width / 2.0;
-        if (titleSize.width > renderInfo.dataAreaSize.width) {
+        if (bulletInfo.orientation === "horizontal") {
+            let title = chartElements.graphArea
+                .append("text")
+                .text(bulletInfo.title) // pivot at center
+                .attr("id", "title")
+                .attr("x", titleSize.width / 2.0)
+                .attr("y", renderInfo.dataAreaSize.height / 2.0)
+                .attr("height", titleSize.height) // for later use
+                .attr("class", "tracker-title-small");
+            chartElements["title"] = title;
+
+            // Expand parent areas
+            helper.expandArea(chartElements.svg, titleSize.width + spacing, 0);
             helper.expandArea(
-                chartElements.svg,
-                titleSize.width - renderInfo.dataAreaSize.width,
+                chartElements.graphArea,
+                titleSize.width + spacing,
+                0
+            );
+
+            // Move sibling areas
+            helper.moveArea(
+                chartElements.dataArea,
+                titleSize.width + spacing,
                 0
             );
+        } else if (bulletInfo.orientation === "vertical") {
+            // if label width > dataArea width
+            let xMiddle = renderInfo.dataAreaSize.width / 2.0;
+            if (titleSize.width > renderInfo.dataAreaSize.width) {
+                helper.expandArea(
+                    chartElements.svg,
+                    titleSize.width - renderInfo.dataAreaSize.width,
+                    0
+                );
+                helper.expandArea(
+                    chartElements.graphArea,
+                    titleSize.width - renderInfo.dataAreaSize.width,
+                    0
+                );
+
+                helper.moveArea(
+                    chartElements.dataArea,
+                    titleSize.width / 2.0 - renderInfo.dataAreaSize.width / 2.0,
+                    0
+                );
+                xMiddle = titleSize.width / 2.0;
+            }
+
+            let title = chartElements.graphArea
+                .append("text")
+                .text(bulletInfo.title) // pivot at center
+                .attr("id", "title")
+                .attr("x", xMiddle)
+                .attr("y", titleSize.height / 2.0)
+                .attr("height", titleSize.height) // for later use
+                .attr("class", "tracker-title-small");
+            chartElements["title"] = title;
+
+            // Expand parent areas
+            helper.expandArea(chartElements.svg, 0, titleSize.height + spacing);
             helper.expandArea(
                 chartElements.graphArea,
-                titleSize.width - renderInfo.dataAreaSize.width,
-                0
+                0,
+                titleSize.height + spacing
             );
 
+            // Move sibling areas
             helper.moveArea(
                 chartElements.dataArea,
-                titleSize.width / 2.0 - renderInfo.dataAreaSize.width / 2.0,
-                0
+                0,
+                titleSize.height + spacing
             );
-            xMiddle = titleSize.width / 2.0;
         }
+    }
 
-        let title = chartElements.graphArea
-            .append("text")
-            .text(bulletInfo.title) // pivot at center
-            .attr("id", "title")
-            .attr("x", xMiddle)
-            .attr("y", titleSize.height / 2.0)
-            .attr("height", titleSize.height) // for later use
-            .attr("class", "tracker-title-small");
-        chartElements["title"] = title;
-
-        // Expand parent areas
-        helper.expandArea(chartElements.svg, 0, titleSize.height + spacing);
-        helper.expandArea(
-            chartElements.graphArea,
-            0,
-            titleSize.height + spacing
+    if (bulletInfo.valueUnit) {
+        let unitSize = helper.measureTextSize(
+            bulletInfo.valueUnit,
+            "tracker-tick-label"
         );
 
-        // Move sibling areas
-        helper.moveArea(chartElements.dataArea, 0, titleSize.height + spacing);
+        if (bulletInfo.orientation === "horizontal") {
+            let unit = chartElements.dataArea
+                .append("text")
+                .text(bulletInfo.valueUnit)
+                .attr("id", "unit")
+                .attr("x", -1 * (unitSize.width + spacing))
+                .attr("y", renderInfo.dataAreaSize.height + spacing)
+                .attr("height", unitSize.height) // for later use
+                .attr("class", "tracker-tick-label"); // pivot at corder
+            chartElements["unit"] = unit;
+        } else if (bulletInfo.orientation === "vertical") {
+            let unit = chartElements.dataArea
+                .append("text")
+                .text(bulletInfo.valueUnit)
+                .attr("id", "unit")
+                .attr(
+                    "x",
+                    renderInfo.dataAreaSize.width / 2 - unitSize.width / 2
+                )
+                .attr("y", -(unitSize.height / 2.0 + spacing))
+                .attr("height", unitSize.height) // for later use
+                .attr("class", "tracker-tick-label"); // pivot at corder
+            chartElements["unit"] = unit;
+
+            // Expand parent areas
+            helper.expandArea(chartElements.svg, 0, unitSize.height + spacing);
+            helper.expandArea(
+                chartElements.graphArea,
+                0,
+                unitSize.height + spacing
+            );
+
+            // Move dataArea down
+            helper.moveArea(
+                chartElements.dataArea,
+                0,
+                unitSize.height + spacing
+            );
+        }
     }
 }
 
@@ -167,15 +223,25 @@ function renderAxis(
     if (!bulletInfo) return;
 
     let range = bulletInfo.range;
-    let domain = [0, range[range.length - 1]];
+    let lastRange = range[range.length - 1];
+    let domain = [0, lastRange];
+    let tickFormat = d3.tickFormat(0, lastRange, 7);
     let tickLength = 6;
 
+    let valueUnit = bulletInfo.valueUnit;
+
     if (bulletInfo.orientation === "horizontal") {
         let scale = d3.scaleLinear();
         scale.domain(domain).range([0, renderInfo.dataAreaSize.width]);
         chartElements["scale"] = scale;
 
         let axisGen = d3.axisBottom(scale);
+        axisGen.tickFormat((v) => {
+            if (valueUnit && valueUnit.endsWith("%")) {
+                return tickFormat(v) + " %";
+            }
+            return tickFormat(v);
+        });
         let axis = chartElements.dataArea
             .append("g")
             .attr("id", "axis")
@@ -209,6 +275,12 @@ function renderAxis(
         chartElements["scale"] = scale;
 
         let axisGen = d3.axisLeft(scale);
+        axisGen.tickFormat((v) => {
+            if (valueUnit && valueUnit.endsWith("%")) {
+                return tickFormat(v) + " %";
+            }
+            return tickFormat(v);
+        });
         let axis = chartElements.dataArea
             .append("g")
             .attr("id", "axis")
@@ -265,13 +337,13 @@ function renderBackPanel(
             .enter()
             .append("rect")
             .attr("x", function (d: any, i: number) {
-                return scale(d.start);
+                return Math.floor(scale(d.start));
             })
             .attr("y", function (d: any) {
                 return 0;
             })
             .attr("width", function (d: any, i: number) {
-                return scale(d.end - d.start);
+                return Math.ceil(scale(d.end - d.start));
             })
             .attr("height", renderInfo.dataAreaSize.height)
             .style("fill", function (d: any) {
@@ -287,11 +359,14 @@ function renderBackPanel(
                 return 0;
             })
             .attr("y", function (d: any) {
-                return scale(d.end);
+                return Math.floor(scale(d.end));
             })
             .attr("width", renderInfo.dataAreaSize.width)
             .attr("height", function (d: any) {
-                return renderInfo.dataAreaSize.height - scale(d.end - d.start);
+                return (
+                    renderInfo.dataAreaSize.height -
+                    Math.floor(scale(d.end - d.start))
+                );
             })
             .style("fill", function (d: any) {
                 return d.color;
@@ -329,7 +404,7 @@ function renderBar(
             .append("rect")
             .attr("x", scale(0))
             .attr("y", barWidth)
-            .attr("width", scale(actualValue))
+            .attr("width", Math.floor(scale(actualValue)))
             .attr("height", barWidth)
             .style("fill", valueColor);
     } else if (bulletInfo.orientation === "vertical") {
@@ -337,9 +412,12 @@ function renderBar(
         let bar = chartElements.dataArea
             .append("rect")
             .attr("x", barWidth)
-            .attr("y", scale(actualValue))
+            .attr("y", Math.floor(scale(actualValue)))
             .attr("width", barWidth)
-            .attr("height", renderInfo.dataAreaSize.height - scale(actualValue))
+            .attr(
+                "height",
+                renderInfo.dataAreaSize.height - Math.floor(scale(actualValue))
+            )
             .style("fill", valueColor);
     }
 }
@@ -356,6 +434,9 @@ function renderMark(
     let bulletInfo = renderInfo.bullet;
     if (!bulletInfo) return;
 
+    let showMarker = bulletInfo.showMarker;
+    if (!showMarker) return;
+
     let markerValue = bulletInfo.markerValue;
     let markerColor = bulletInfo.markerColor;
 
@@ -363,7 +444,7 @@ function renderMark(
 
     if (bulletInfo.orientation === "horizontal") {
         let markerLength = (renderInfo.dataAreaSize.height * 2) / 3;
-        let mark = chartElements.dataArea
+        let marker = chartElements.dataArea
             .append("rect")
             .attr("x", scale(markerValue) - 1.5)
             .attr("y", markerLength / 4)
@@ -372,7 +453,7 @@ function renderMark(
             .style("fill", markerColor);
     } else if (bulletInfo.orientation === "vertical") {
         let markerLength = (renderInfo.dataAreaSize.width * 2) / 3;
-        let mark = chartElements.dataArea
+        let marker = chartElements.dataArea
             .append("rect")
             .attr("x", markerLength / 4)
             .attr("y", scale(markerValue) - 1.5)
diff --git a/src/data.ts b/src/data.ts
index 11a8b3d..94a07a2 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -641,11 +641,12 @@ export class BulletInfo {
     title: string;
     dataset: string;
     orientation: string;
-    range: number[];
-    rangeColor: string[];
     value: string;
+    valueUnit: string;
     valueColor: string;
-    showMark: boolean;
+    range: number[];
+    rangeColor: string[];
+    showMarker: boolean;
     markerValue: number;
     markerColor: string;
 
@@ -653,11 +654,12 @@ export class BulletInfo {
         this.title = "";
         this.dataset = "0"; // dataset id or name
         this.orientation = "horizontal"; // or vertical
-        this.range = [];
-        this.rangeColor = [];
         this.value = ""; // Can possess template varialbe
+        this.valueUnit = "";
         this.valueColor = "#69b3a2";
-        this.showMark = false;
+        this.range = [];
+        this.rangeColor = [];
+        this.showMarker = false;
         this.markerValue = 0;
         this.markerColor = "";
     }
diff --git a/src/parsing.ts b/src/parsing.ts
index b393fbe..e79aa6e 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1575,6 +1575,9 @@ export function getRenderInfoFromYaml(
                         }
                     }
                 }
+            } else {
+                errorMessage = "Empty range is not allowed";
+                return errorMessage;
             }
             renderInfo.bullet.range = range;
             let numRange = range.length;
@@ -1601,6 +1604,12 @@ export function getRenderInfoFromYaml(
             }
             // console.log(renderInfo.bullet.value);
 
+            // value unit
+            if (typeof yaml.bullet.valueUnit === "string") {
+                renderInfo.bullet.valueUnit = yaml.bullet.valueUnit;
+            }
+            // console.log(renderInfo.bullet.valueUnit);
+
             // value color
             if (typeof yaml.bullet.valueColor === "string") {
                 renderInfo.bullet.valueColor = yaml.bullet.valueColor;
@@ -1608,8 +1617,8 @@ export function getRenderInfoFromYaml(
             // console.log(renderInfo.bullet.valueColor);
 
             // show mark
-            if (typeof yaml.bullet.showMark === "boolean") {
-                renderInfo.bullet.showMark = yaml.bullet.showMark;
+            if (typeof yaml.bullet.showMarker === "boolean") {
+                renderInfo.bullet.showMarker = yaml.bullet.showMarker;
             }
             // console.log(renderInfo.bullet.showMark);
 
@@ -1620,7 +1629,7 @@ export function getRenderInfoFromYaml(
             // console.log(renderInfo.bullet.markValue);
 
             // mark color
-            if (typeof yaml.bullet.markerColor === "number") {
+            if (typeof yaml.bullet.markerColor === "string") {
                 renderInfo.bullet.markerColor = yaml.bullet.markerColor;
             }
             // console.log(renderInfo.bullet.markValue);

From b1d346a967eaa4481e7107ca06d7501e6e5b1a63 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 30 May 2021 15:43:53 +0800
Subject: [PATCH 028/402] Enable scaling bullet chart

---
 examples/TestBullet.md |  2 +-
 src/bullet.ts          | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/examples/TestBullet.md b/examples/TestBullet.md
index 8693bd2..37f4b22 100644
--- a/examples/TestBullet.md
+++ b/examples/TestBullet.md
@@ -5,7 +5,7 @@ searchType: tag
 searchTarget: clean-up
 folder: diary
 endDate: 2021-01-31
-fixedScale: 0.1
+fixedScale: 1.1
 bullet:
     title: "Clean Up"
 	dataset: 0
diff --git a/src/bullet.ts b/src/bullet.ts
index b9d44b0..d8892ae 100644
--- a/src/bullet.ts
+++ b/src/bullet.ts
@@ -71,6 +71,34 @@ function createAreas(
     return chartElements;
 }
 
+function setChartScale(
+    _canvas: HTMLElement,
+    chartElements: ChartElements,
+    renderInfo: RenderInfo
+) {
+    let canvas = d3.select(_canvas);
+    let svg = chartElements.svg;
+    let svgWidth = parseFloat(svg.attr("width"));
+    let svgHeight = parseFloat(svg.attr("height"));
+    svg.attr("width", null)
+        .attr("height", null)
+        .attr("viewBox", `0 0 ${svgWidth} ${svgHeight}`)
+        .attr("preserveAspectRatio", "xMidYMid meet");
+
+    if (renderInfo.fitPanelWidth) {
+        canvas.style("width", "100%");
+    } else {
+        canvas.style(
+            "width",
+            (svgWidth * renderInfo.fixedScale).toString() + "px"
+        );
+        canvas.style(
+            "height",
+            (svgHeight * renderInfo.fixedScale).toString() + "px"
+        );
+    }
+}
+
 function renderTitle(chartElements: ChartElements, renderInfo: RenderInfo) {
     // console.log("renderTitle");
     // under graphArea
@@ -497,4 +525,6 @@ export function renderBullet(canvas: HTMLElement, renderInfo: RenderInfo) {
     }
 
     renderMark(chartElements, renderInfo, dataset);
+
+    setChartScale(canvas, chartElements, renderInfo);
 }

From b9ff4c33596b006d8b5e67500842ae2f80ec3841 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 30 May 2021 17:33:27 +0800
Subject: [PATCH 029/402] Refine the bullet chart

---
 src/bullet.ts | 63 +++++++++++++++++++++++++++++++--------------------
 1 file changed, 38 insertions(+), 25 deletions(-)

diff --git a/src/bullet.ts b/src/bullet.ts
index d8892ae..fe0047b 100644
--- a/src/bullet.ts
+++ b/src/bullet.ts
@@ -143,6 +143,7 @@ function renderTitle(chartElements: ChartElements, renderInfo: RenderInfo) {
             // if label width > dataArea width
             let xMiddle = renderInfo.dataAreaSize.width / 2.0;
             if (titleSize.width > renderInfo.dataAreaSize.width) {
+                // console.log("expand area for vertical title");
                 helper.expandArea(
                     chartElements.svg,
                     titleSize.width - renderInfo.dataAreaSize.width,
@@ -162,11 +163,13 @@ function renderTitle(chartElements: ChartElements, renderInfo: RenderInfo) {
                 xMiddle = titleSize.width / 2.0;
             }
 
+            let axisWidth = parseFloat(chartElements.axis.attr("width"));
+
             let title = chartElements.graphArea
                 .append("text")
                 .text(bulletInfo.title) // pivot at center
                 .attr("id", "title")
-                .attr("x", xMiddle)
+                .attr("x", xMiddle + axisWidth)
                 .attr("y", titleSize.height / 2.0)
                 .attr("height", titleSize.height) // for later use
                 .attr("class", "tracker-title-small");
@@ -253,10 +256,17 @@ function renderAxis(
     let range = bulletInfo.range;
     let lastRange = range[range.length - 1];
     let domain = [0, lastRange];
-    let tickFormat = d3.tickFormat(0, lastRange, 7);
+    
     let tickLength = 6;
-
     let valueUnit = bulletInfo.valueUnit;
+    let tickFormatFn: any = function(value: any) {
+        if (valueUnit && valueUnit.endsWith("%")) {
+            return d3.tickFormat(0, lastRange, 7)(value) + " %";
+        }
+        return d3.tickFormat(0, lastRange, 7)(value);
+    };
+    let maxTickLabel = tickFormatFn(lastRange);
+    let maxTickLabelSize = helper.measureTextSize(maxTickLabel, "tracker-tick-label");
 
     if (bulletInfo.orientation === "horizontal") {
         let scale = d3.scaleLinear();
@@ -264,12 +274,7 @@ function renderAxis(
         chartElements["scale"] = scale;
 
         let axisGen = d3.axisBottom(scale);
-        axisGen.tickFormat((v) => {
-            if (valueUnit && valueUnit.endsWith("%")) {
-                return tickFormat(v) + " %";
-            }
-            return tickFormat(v);
-        });
+        axisGen.tickFormat(tickFormatFn);
         let axis = chartElements.dataArea
             .append("g")
             .attr("id", "axis")
@@ -279,23 +284,25 @@ function renderAxis(
             )
             .call(axisGen)
             .attr("class", "tracker-axis");
+        chartElements["axis"] = axis;
 
         let axisLine = axis.selectAll("path");
 
         let axisTicks = axis.selectAll("line");
 
-        let tickLabelSize = helper.measureTextSize("123456789");
-        let tickLabelHeight = tickLabelSize.height;
+        let axisTickLabels = axis
+            .selectAll("text")
+            .attr("class", "tracker-tick-label");
 
-        axis.attr("width", renderInfo.dataAreaSize.width);
-        axis.attr("height", tickLength + tickLabelHeight);
+        axis.attr("width", renderInfo.dataAreaSize.width + maxTickLabelSize.width);
+        axis.attr("height", tickLength + maxTickLabelSize.height);
 
         // Expand areas
-        helper.expandArea(chartElements.svg, 0, tickLength + tickLabelHeight);
+        helper.expandArea(chartElements.svg,  + maxTickLabelSize.width, tickLength + maxTickLabelSize.height);
         helper.expandArea(
             chartElements.graphArea,
-            0,
-            tickLength + tickLabelHeight
+            + maxTickLabelSize.width,
+            tickLength + maxTickLabelSize.height
         );
     } else if (bulletInfo.orientation === "vertical") {
         let scale = d3.scaleLinear();
@@ -303,12 +310,7 @@ function renderAxis(
         chartElements["scale"] = scale;
 
         let axisGen = d3.axisLeft(scale);
-        axisGen.tickFormat((v) => {
-            if (valueUnit && valueUnit.endsWith("%")) {
-                return tickFormat(v) + " %";
-            }
-            return tickFormat(v);
-        });
+        axisGen.tickFormat(tickFormatFn);
         let axis = chartElements.dataArea
             .append("g")
             .attr("id", "axis")
@@ -316,17 +318,28 @@ function renderAxis(
             .attr("y", 0)
             .call(axisGen)
             .attr("class", "tracker-axis");
+        chartElements["axis"] = axis;
 
         let axisLine = axis.selectAll("path");
 
         let axisTicks = axis.selectAll("line");
 
-        axis.attr("width", tickLength);
+        let axisTickLabels = axis
+            .selectAll("text")
+            .attr("class", "tracker-tick-label");
+
+        axis.attr("width", tickLength + maxTickLabelSize.width);
         axis.attr("height", renderInfo.dataAreaSize.width);
 
         // Expand areas
-        helper.expandArea(chartElements.svg, tickLength, 0);
-        helper.expandArea(chartElements.graphArea, tickLength, 0);
+        helper.expandArea(chartElements.svg, tickLength + maxTickLabelSize.width, 0);
+        helper.expandArea(chartElements.graphArea, tickLength + maxTickLabelSize.width, 0);
+    
+        helper.moveArea(
+            chartElements.dataArea,
+            tickLength + maxTickLabelSize.width,
+            0
+        );
     }
 }
 

From b6407475b92e14ce1b03990c2d5d02487db8b879 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 30 May 2021 17:44:06 +0800
Subject: [PATCH 030/402] Hide the axis line in the bullet chart

---
 examples/TestBullet.md | 2 +-
 src/bullet.ts          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/TestBullet.md b/examples/TestBullet.md
index 37f4b22..45604d0 100644
--- a/examples/TestBullet.md
+++ b/examples/TestBullet.md
@@ -32,7 +32,7 @@ bullet:
     orientation: vertical
 	range: 30, 60, 100
 	rangeColor: darkgray, silver, lightgray
-	value: "{{lastStreak}}"
+	value: "{{sum}}"
 	valueUnit: %
 	valueColor: steelblue
 	showMarker: true
diff --git a/src/bullet.ts b/src/bullet.ts
index fe0047b..7a61332 100644
--- a/src/bullet.ts
+++ b/src/bullet.ts
@@ -286,7 +286,7 @@ function renderAxis(
             .attr("class", "tracker-axis");
         chartElements["axis"] = axis;
 
-        let axisLine = axis.selectAll("path");
+        let axisLine = axis.selectAll("path").style("stroke", "none");
 
         let axisTicks = axis.selectAll("line");
 
@@ -320,7 +320,7 @@ function renderAxis(
             .attr("class", "tracker-axis");
         chartElements["axis"] = axis;
 
-        let axisLine = axis.selectAll("path");
+        let axisLine = axis.selectAll("path").style("stroke", "none");
 
         let axisTicks = axis.selectAll("line");
 

From f53acd4e5019910beac06ec515461daf9e4bc7d2 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 30 May 2021 17:44:59 +0800
Subject: [PATCH 031/402] Prettify the source code

---
 src/bullet.ts | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/bullet.ts b/src/bullet.ts
index 7a61332..864df72 100644
--- a/src/bullet.ts
+++ b/src/bullet.ts
@@ -256,17 +256,20 @@ function renderAxis(
     let range = bulletInfo.range;
     let lastRange = range[range.length - 1];
     let domain = [0, lastRange];
-    
+
     let tickLength = 6;
     let valueUnit = bulletInfo.valueUnit;
-    let tickFormatFn: any = function(value: any) {
+    let tickFormatFn: any = function (value: any) {
         if (valueUnit && valueUnit.endsWith("%")) {
             return d3.tickFormat(0, lastRange, 7)(value) + " %";
         }
         return d3.tickFormat(0, lastRange, 7)(value);
     };
     let maxTickLabel = tickFormatFn(lastRange);
-    let maxTickLabelSize = helper.measureTextSize(maxTickLabel, "tracker-tick-label");
+    let maxTickLabelSize = helper.measureTextSize(
+        maxTickLabel,
+        "tracker-tick-label"
+    );
 
     if (bulletInfo.orientation === "horizontal") {
         let scale = d3.scaleLinear();
@@ -294,14 +297,21 @@ function renderAxis(
             .selectAll("text")
             .attr("class", "tracker-tick-label");
 
-        axis.attr("width", renderInfo.dataAreaSize.width + maxTickLabelSize.width);
+        axis.attr(
+            "width",
+            renderInfo.dataAreaSize.width + maxTickLabelSize.width
+        );
         axis.attr("height", tickLength + maxTickLabelSize.height);
 
         // Expand areas
-        helper.expandArea(chartElements.svg,  + maxTickLabelSize.width, tickLength + maxTickLabelSize.height);
+        helper.expandArea(
+            chartElements.svg,
+            +maxTickLabelSize.width,
+            tickLength + maxTickLabelSize.height
+        );
         helper.expandArea(
             chartElements.graphArea,
-            + maxTickLabelSize.width,
+            +maxTickLabelSize.width,
             tickLength + maxTickLabelSize.height
         );
     } else if (bulletInfo.orientation === "vertical") {
@@ -332,9 +342,17 @@ function renderAxis(
         axis.attr("height", renderInfo.dataAreaSize.width);
 
         // Expand areas
-        helper.expandArea(chartElements.svg, tickLength + maxTickLabelSize.width, 0);
-        helper.expandArea(chartElements.graphArea, tickLength + maxTickLabelSize.width, 0);
-    
+        helper.expandArea(
+            chartElements.svg,
+            tickLength + maxTickLabelSize.width,
+            0
+        );
+        helper.expandArea(
+            chartElements.graphArea,
+            tickLength + maxTickLabelSize.width,
+            0
+        );
+
         helper.moveArea(
             chartElements.dataArea,
             tickLength + maxTickLabelSize.width,

From dc9ff4c1280732c151810787965fd35e61533cae Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 30 May 2021 21:30:18 +0800
Subject: [PATCH 032/402] Fix missing zero values

---
 src/collecting.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/collecting.ts b/src/collecting.ts
index 8d50f90..388dec1 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -205,7 +205,7 @@ export function collectDataFromInlineTag(
                 // console.log("single-value");
                 let toParse = splitted[0].trim();
                 let retParse = helper.parseFloatFromAny(toParse);
-                if (retParse.value) {
+                if (retParse.value !== null) {
                     if (retParse.type === ValueType.Time) {
                         tagMeasure = retParse.value;
                         tagExist = true;
@@ -226,7 +226,8 @@ export function collectDataFromInlineTag(
             ) {
                 let toParse = splitted[query.getAccessor()].trim();
                 let retParse = helper.parseFloatFromAny(toParse);
-                if (retParse.value) {
+                //console.log(retParse);
+                if (retParse.value !== null) {
                     if (retParse.type === ValueType.Time) {
                         tagMeasure = retParse.value;
                         tagExist = true;

From d32e9468bed0741c707a17c6a596fbea1c614a4b Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 30 May 2021 21:31:52 +0800
Subject: [PATCH 033/402] Update examples

---
 examples/HabitTracker.md   | 2 +-
 examples/TestTimeValues.md | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/examples/HabitTracker.md b/examples/HabitTracker.md
index 1b606d4..9f69a6d 100644
--- a/examples/HabitTracker.md
+++ b/examples/HabitTracker.md
@@ -41,7 +41,7 @@ searchType: tag
 searchTarget: meditation
 folder: diary
 summary:
-    template: "Longest Streak: {{maxStreak}} day(s)\nLongest Break: {{maxBreak}} day(s)\nLast streak: {{lastStreak}} day(s)"
+    template: "Longest Streak: {{maxStreak}} day(s)\nLongest Breaks: {{maxBreaks}} day(s)\nLast streak: {{lastStreak}} day(s)"
 ```
 
 CleanUp
diff --git a/examples/TestTimeValues.md b/examples/TestTimeValues.md
index 181cf12..dc72220 100644
--- a/examples/TestTimeValues.md
+++ b/examples/TestTimeValues.md
@@ -5,12 +5,14 @@ searchType: frontmatter
 searchTarget: clock-in, clock-out
 endDate: 2021-01-15
 folder: diary
+datasetName: Clock-In, Clock-Out
 line:
     title: "Working Hours"
     yAxisLabel: "Time (24h)"
 	reverseYAxis: true
     lineColor: yellow, red
     showPoint: true
+	showLegend: true
 ```
 
 ``` tracker
@@ -19,9 +21,11 @@ searchTarget: sleep[0], sleep[1]
 endDate: 2021-01-15
 folder: diary
 valueShift: -24:00, 00:00
+datasetName: Sleep, WakeUp
 line:
     title: "Sleep"
     yAxisLabel: "Time (24h)"
     lineColor: yellow, red
     showPoint: true
+	showLegend: true
 ```
\ No newline at end of file

From a63fe885cd855d6d7226fdfea4d4c55f589dff8d Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 1 Jun 2021 08:46:52 +0800
Subject: [PATCH 034/402] Allow collecting data from fileMeta

---
 examples/Test FileMeta.md |  11 ++++
 src/collecting.ts         |  79 +++++++++++++++++++++++++
 src/data.ts               |   1 +
 src/helper.ts             |  26 ---------
 src/main.ts               | 117 ++++++++++++++++++++++----------------
 src/parsing.ts            |   6 +-
 6 files changed, 163 insertions(+), 77 deletions(-)
 create mode 100644 examples/Test FileMeta.md

diff --git a/examples/Test FileMeta.md b/examples/Test FileMeta.md
new file mode 100644
index 0000000..a3a6710
--- /dev/null
+++ b/examples/Test FileMeta.md	
@@ -0,0 +1,11 @@
+# Test FileMeta
+
+``` tracker
+searchType: fileMeta
+searchTarget: size
+folder: diary
+line:
+    title: File Size
+	yAxisLabel: Size
+	yAxisUnit: byte
+```
\ No newline at end of file
diff --git a/src/collecting.ts b/src/collecting.ts
index 388dec1..99f16fc 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -11,6 +11,57 @@ import {
 } from "./data";
 import * as helper from "./helper";
 
+export function getDateFromFilename(file: TFile, renderInfo: RenderInfo) {
+    let fileBaseName = file.basename;
+
+    if (
+        renderInfo.dateFormatPrefix &&
+        fileBaseName.startsWith(renderInfo.dateFormatPrefix)
+    ) {
+        fileBaseName = fileBaseName.slice(renderInfo.dateFormatPrefix.length);
+    }
+    if (
+        renderInfo.dateFormatSuffix &&
+        fileBaseName.endsWith(renderInfo.dateFormatSuffix)
+    ) {
+        fileBaseName = fileBaseName.slice(
+            0,
+            fileBaseName.length - renderInfo.dateFormatSuffix.length
+        );
+    }
+    // console.log(fileBaseName);
+
+    let fileDate = window.moment(fileBaseName, renderInfo.dateFormat, true);
+    // console.log(fileDate);
+
+    return fileDate;
+}
+
+export function getDateFromFrontmatter() {
+    let date = window.moment("");
+    return date;
+}
+
+export function getDateFromTag() {
+    let date = window.moment("");
+    return date;
+}
+
+export function getDateFromText() {
+    let date = window.moment("");
+    return date;
+}
+
+export function getDateFromDvField() {
+    let date = window.moment("");
+    return date;
+}
+
+export function getDateFromFileMeta() {
+    let date = window.moment("");
+    return date;
+}
+
 function addToDataMap(
     dataMap: DataMap,
     date: string,
@@ -299,6 +350,34 @@ export function collectDataFromText(
     }
 }
 
+export function collectDataFromFileMeta(
+    file: TFile,
+    query: Query,
+    renderInfo: RenderInfo,
+    dataMap: DataMap,
+    xValueMap: XValueMap
+) {
+    // console.log("collectDataFromFileMeta");
+
+    if (file && file instanceof TFile) {
+        // console.log(file.stat);
+
+        let target = query.getTarget();
+        if (target === "cDate") {
+            let ctime = file.stat.ctime;
+            query.valueType = ValueType.Date;
+            addToDataMap(dataMap, xValueMap.get(-1), query, ctime);
+        } else if (target === "mDate") {
+            let mtime = file.stat.mtime;
+            query.valueType = ValueType.Date;
+            addToDataMap(dataMap, xValueMap.get(-1), query, mtime);
+        } else if (target === "size") {
+            let size = file.stat.size;
+            addToDataMap(dataMap, xValueMap.get(-1), query, size);
+        }
+    }
+}
+
 export function collectDataFromDvField(
     content: string,
     query: Query,
diff --git a/src/data.ts b/src/data.ts
index 94a07a2..02364c1 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -7,6 +7,7 @@ export enum SearchType {
     Text,
     dvField,
     Table,
+    FileMeta,
 }
 
 export enum OutputType {
diff --git a/src/helper.ts b/src/helper.ts
index cec53dd..71b5a45 100644
--- a/src/helper.ts
+++ b/src/helper.ts
@@ -43,32 +43,6 @@ export function trimByChar(str: string, char: string) {
         : str.substring(first, str.length - last);
 }
 
-export function getDateFromFilename(file: TFile, renderInfo: RenderInfo) {
-    let fileBaseName = file.basename;
-
-    if (
-        renderInfo.dateFormatPrefix &&
-        fileBaseName.startsWith(renderInfo.dateFormatPrefix)
-    ) {
-        fileBaseName = fileBaseName.slice(renderInfo.dateFormatPrefix.length);
-    }
-    if (
-        renderInfo.dateFormatSuffix &&
-        fileBaseName.endsWith(renderInfo.dateFormatSuffix)
-    ) {
-        fileBaseName = fileBaseName.slice(
-            0,
-            fileBaseName.length - renderInfo.dateFormatSuffix.length
-        );
-    }
-    // console.log(fileBaseName);
-
-    let fileDate = window.moment(fileBaseName, renderInfo.dateFormat, true);
-    // console.log(fileDate);
-
-    return fileDate;
-}
-
 // Parsing
 export function parseFloatFromAny(toParse: any) {
     let value = null;
diff --git a/src/main.ts b/src/main.ts
index 13f7f7f..76fd0b4 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -212,62 +212,68 @@ export default class Tracker extends Plugin {
             let skipThisFile = false;
             for (let xDatasetId of renderInfo.xDataset) {
                 if (!xValueMap.has(xDatasetId)) {
+                    let xDate = window.moment("");
                     if (xDatasetId === -1) {
                         // Default using date in filename as xValue
-                        let fileDate = helper.getDateFromFilename(
+                        xDate = collecting.getDateFromFilename(
                             file,
                             renderInfo
                         );
-                        // console.log(fileDate);
-                        if (!fileDate.isValid()) {
-                            // console.log("file " + file.basename + " rejected");
-                            skipThisFile = true;
-                        } else {
-                            // console.log("file " + file.basename + " accepted");
-                            if (renderInfo.startDate !== null) {
-                                if (fileDate < renderInfo.startDate) {
-                                    skipThisFile = true;
-                                }
-                            }
-                            if (renderInfo.endDate !== null) {
-                                if (fileDate > renderInfo.endDate) {
-                                    skipThisFile = true;
-                                }
-                            }
-                        }
-
-                        if (!skipThisFile) {
-                            xValueMap.set(
-                                -1,
-                                fileDate.format(renderInfo.dateFormat)
-                            );
-                            fileCounter++;
-
-                            // Get min/max date
-                            if (fileCounter == 1) {
-                                minDate = fileDate.clone();
-                                maxDate = fileDate.clone();
-                            } else {
-                                if (fileDate < minDate) {
-                                    minDate = fileDate.clone();
-                                }
-                                if (fileDate > maxDate) {
-                                    maxDate = fileDate.clone();
-                                }
-                            }
-                        }
+                        // console.log(xDate);
                     } else {
                         let xDatasetQuery = renderInfo.queries[xDatasetId];
                         // console.log(xDatasetQuery);
                         switch (xDatasetQuery.getType()) {
                             case SearchType.Frontmatter:
+                                xDate = collecting.getDateFromFrontmatter();
                                 break;
                             case SearchType.Tag:
+                                xDate = collecting.getDateFromTag();
                                 break;
                             case SearchType.Text:
+                                xDate = collecting.getDateFromText();
                                 break;
                             case SearchType.dvField:
+                                xDate = collecting.getDateFromDvField();
                                 break;
+                            case SearchType.FileMeta:
+                                xDate = collecting.getDateFromFileMeta();
+                                break;
+                        }
+                    }
+
+                    if (!xDate.isValid()) {
+                        // console.log("file " + file.basename + " rejected");
+                        skipThisFile = true;
+                    } else {
+                        // console.log("file " + file.basename + " accepted");
+                        if (renderInfo.startDate !== null) {
+                            if (xDate < renderInfo.startDate) {
+                                skipThisFile = true;
+                            }
+                        }
+                        if (renderInfo.endDate !== null) {
+                            if (xDate > renderInfo.endDate) {
+                                skipThisFile = true;
+                            }
+                        }
+                    }
+
+                    if (!skipThisFile) {
+                        xValueMap.set(-1, xDate.format(renderInfo.dateFormat));
+                        fileCounter++;
+
+                        // Get min/max date
+                        if (fileCounter == 1) {
+                            minDate = xDate.clone();
+                            maxDate = xDate.clone();
+                        } else {
+                            if (xDate < minDate) {
+                                minDate = xDate.clone();
+                            }
+                            if (xDate > maxDate) {
+                                maxDate = xDate.clone();
+                            }
                         }
                     }
                 }
@@ -344,6 +350,17 @@ export default class Tracker extends Plugin {
                     );
                 } // Search text
 
+                // console.log("Search FileMeta");
+                if (query.getType() === SearchType.FileMeta) {
+                    collecting.collectDataFromFileMeta(
+                        file,
+                        query,
+                        renderInfo,
+                        dataMap,
+                        xValueMap
+                    );
+                } // Search FileMeta
+
                 // console.log("Search dvField");
                 if (content && query.getType() === SearchType.dvField) {
                     collecting.collectDataFromDvField(
@@ -477,20 +494,20 @@ export default class Tracker extends Plugin {
 
                     let date = window.moment(data, renderInfo.dateFormat, true);
 
-                    if (!minDate.isValid() && !maxDate.isValid()) {
-                        minDate = date.clone();
-                        maxDate = date.clone();
-                    } else {
-                        if (date < minDate) {
+                    if (date.isValid()) {
+                        xValues.push(date);
+
+                        if (!minDate.isValid() && !maxDate.isValid()) {
                             minDate = date.clone();
-                        }
-                        if (date > maxDate) {
                             maxDate = date.clone();
+                        } else {
+                            if (date < minDate) {
+                                minDate = date.clone();
+                            }
+                            if (date > maxDate) {
+                                maxDate = date.clone();
+                            }
                         }
-                    }
-
-                    if (date.isValid()) {
-                        xValues.push(date);
                     } else {
                         xValues.push(null);
                     }
diff --git a/src/parsing.ts b/src/parsing.ts
index e79aa6e..9692913 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -41,7 +41,8 @@ function validateSearchType(searchType: string): boolean {
         searchType === "frontmatter" ||
         searchType === "wiki" ||
         searchType === "dvField" ||
-        searchType === "table"
+        searchType === "table" ||
+        searchType === "fileMeta"
     ) {
         return true;
     }
@@ -806,6 +807,9 @@ export function getRenderInfoFromYaml(
             case "table":
                 searchType.push(SearchType.Table);
                 break;
+            case "fileMeta":
+                searchType.push(SearchType.FileMeta);
+                break;
         }
     }
     // Currently, we don't allow type 'table' used with other types

From 9bad5d1d027c77de6655c2ad59c307256b1b0035 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 1 Jun 2021 18:18:09 +0800
Subject: [PATCH 035/402] Get date from frontmatter and fileMeta

---
 examples/Test FileMeta.md | 31 ++++++++++++--
 examples/data/data1.md    | 33 +++++++++++++++
 examples/data/data2.md    | 35 ++++++++++++++++
 examples/data/data3.md    | 33 +++++++++++++++
 src/collecting.ts         | 86 +++++++++++++++++++++++++++++++--------
 src/data.ts               |  2 +
 src/main.ts               | 25 +++++++++---
 7 files changed, 220 insertions(+), 25 deletions(-)
 create mode 100644 examples/data/data1.md
 create mode 100644 examples/data/data2.md
 create mode 100644 examples/data/data3.md

diff --git a/examples/Test FileMeta.md b/examples/Test FileMeta.md
index a3a6710..4b0e7f8 100644
--- a/examples/Test FileMeta.md	
+++ b/examples/Test FileMeta.md	
@@ -1,11 +1,34 @@
 # Test FileMeta
-
+Track the size variation of diaries 
 ``` tracker
 searchType: fileMeta
 searchTarget: size
 folder: diary
+endDate: 2021-01-31
 line:
-    title: File Size
+    title: File Size Variation
 	yAxisLabel: Size
-	yAxisUnit: byte
-```
\ No newline at end of file
+	yAxisUnit: bytes
+```
+
+Use file created dates (cDate) as x values
+``` tracker
+searchType: fileMeta, dvField
+searchTarget: cDate, dataviewTarget
+xDataset: 0
+folder: data
+line:
+    fillGap: true
+```
+
+Use date variables from front matter
+``` tracker
+searchType: frontmatter, dvField
+searchTarget: date, dataviewTarget
+xDataset: 0
+folder: data
+line:
+    title: Dataview Inline Field
+```
+
+
diff --git a/examples/data/data1.md b/examples/data/data1.md
new file mode 100644
index 0000000..d1f5380
--- /dev/null
+++ b/examples/data/data1.md
@@ -0,0 +1,33 @@
+---
+date: 2021-01-01
+---
+
+#weight:74.1kg
+
+#exercise-pushup:31
+#exercise-plank:109sec
+
+
+
+
+
+#finance/bank1:-3.5USD
+
+[[todo_family|To-Do @Family]]
+[[todo_work|To-Do @Work]]
+
+obsidian-tracker+1@gmail.com
+
+weightlifting: 18
+
+dataviewTarget:: 48
+- Make Progress:: 29
+- Make-Progress:: 88
+dataviewTarget1:: 48/29
+dataviewTarget2:: 29 @ 88
+dataviewTarget3:: 29, 88
+
+#sin:0.00000/0.20791/0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452
+
+#sinsquare:0.00000/0.04323/0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907
+
diff --git a/examples/data/data2.md b/examples/data/data2.md
new file mode 100644
index 0000000..b9e9102
--- /dev/null
+++ b/examples/data/data2.md
@@ -0,0 +1,35 @@
+---
+date: 2021-01-02
+---
+
+#weight:62.8kg
+
+#exercise-pushup:46
+#exercise-plank:101sec
+
+#meditation
+
+
+
+#clean-up
+
+#finance/bank1:-3.8USD
+
+[[todo_family|To-Do @Family]]
+[[todo_work|To-Do @Work]]
+
+obsidian-tracker@gmail.com
+
+weightlifting: 12
+
+dataviewTarget:: 27
+- Make Progress:: 12
+- Make-Progress:: 55
+dataviewTarget1:: 27/12
+dataviewTarget2:: 12 @ 55
+dataviewTarget3:: 12, 55
+
+#sin:0.20791/0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452/0.95106
+
+#sinsquare:0.04323/0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451
+
diff --git a/examples/data/data3.md b/examples/data/data3.md
new file mode 100644
index 0000000..0aa5108
--- /dev/null
+++ b/examples/data/data3.md
@@ -0,0 +1,33 @@
+---
+date: 2021-01-03
+---
+
+#weight:76.8kg
+
+#exercise-pushup:45
+#exercise-plank:43sec
+
+
+⭐⭐⭐
+
+
+#finance/bank1:-2.6USD
+
+[[todo_family|To-Do @Family]]
+[[todo_work|To-Do @Work]]
+
+obsidian-tracker@gmail.com
+
+weightlifting: 12
+
+dataviewTarget:: 88
+- Make Progress:: 5
+- Make-Progress:: 56
+dataviewTarget1:: 88/5
+dataviewTarget2:: 5 @ 56
+dataviewTarget3:: 5, 56
+
+#sin:0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452/0.95106/0.86603
+
+#sinsquare:0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000
+
diff --git a/src/collecting.ts b/src/collecting.ts
index 99f16fc..8059ed5 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -37,8 +37,24 @@ export function getDateFromFilename(file: TFile, renderInfo: RenderInfo) {
     return fileDate;
 }
 
-export function getDateFromFrontmatter() {
+export function getDateFromFrontmatter(
+    fileCache: CachedMetadata,
+    query: Query,
+    renderInfo: RenderInfo
+) {
+    // console.log("getDateFromFrontmatter");
+
     let date = window.moment("");
+
+    let frontMatter = fileCache.frontmatter;
+    if (frontMatter) {
+        if (helper.deepValue(frontMatter, query.getTarget())) {
+            let strDate = helper.deepValue(frontMatter, query.getTarget());
+            date = window.moment(strDate, renderInfo.dateFormat, true);
+            // console.log(date);
+        }
+    }
+
     return date;
 }
 
@@ -57,8 +73,39 @@ export function getDateFromDvField() {
     return date;
 }
 
-export function getDateFromFileMeta() {
+export function getDateFromFileMeta(
+    file: TFile,
+    query: Query,
+    renderInfo: RenderInfo
+) {
+    // console.log("getDateFromFileMeta");
+
     let date = window.moment("");
+
+    if (file && file instanceof TFile) {
+        // console.log(file.stat);
+
+        let target = query.getTarget();
+        if (target === "cDate") {
+            let ctime = file.stat.ctime;
+            date = window.moment(
+                window.moment(ctime).format(renderInfo.dateFormat),
+                renderInfo.dateFormat,
+                true
+            );
+        } else if (target === "mDate") {
+            let mtime = file.stat.mtime;
+            date = window.moment(
+                window.moment(mtime).format(renderInfo.dateFormat),
+                renderInfo.dateFormat,
+                true
+            );
+            date = window.moment(new Date(mtime));
+        } else if (target === "size") {
+        }
+    }
+
+    // console.log(date);
     return date;
 }
 
@@ -121,7 +168,8 @@ export function collectDataFromFrontmatterTag(
             if (tagExist) {
                 value = tagMeasure;
             }
-            addToDataMap(dataMap, xValueMap.get(-1), query, value);
+            let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
+            addToDataMap(dataMap, xValue, query, value);
         }
     }
 }
@@ -144,7 +192,8 @@ export function collectDataFromFrontmatterKey(
                 if (retParse.type === ValueType.Time) {
                     query.valueType = ValueType.Time;
                 }
-                addToDataMap(dataMap, xValueMap.get(-1), query, retParse.value);
+                let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
+                addToDataMap(dataMap, xValue, query, retParse.value);
             }
         } else if (
             query.getParentTarget() &&
@@ -181,12 +230,10 @@ export function collectDataFromFrontmatterKey(
                     if (retParse.type === ValueType.Time) {
                         query.valueType = ValueType.Time;
                     }
-                    addToDataMap(
-                        dataMap,
-                        xValueMap.get(-1),
-                        query,
-                        retParse.value
+                    let xValue = xValueMap.get(
+                        renderInfo.xDataset[query.getId()]
                     );
+                    addToDataMap(dataMap, xValue, query, retParse.value);
                 }
             }
         }
@@ -215,7 +262,8 @@ export function collectDataFromWiki(
     if (linkExist) {
         linkValue = linkMeasure;
     }
-    addToDataMap(dataMap, xValueMap.get(-1), query, linkValue);
+    let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
+    addToDataMap(dataMap, xValue, query, linkValue);
 }
 
 export function collectDataFromInlineTag(
@@ -300,7 +348,8 @@ export function collectDataFromInlineTag(
     if (tagExist) {
         value = tagMeasure;
     }
-    addToDataMap(dataMap, xValueMap.get(-1), query, value);
+    let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
+    addToDataMap(dataMap, xValue, query, value);
 }
 
 export function collectDataFromText(
@@ -346,7 +395,8 @@ export function collectDataFromText(
     }
 
     if (textExist) {
-        addToDataMap(dataMap, xValueMap.get(-1), query, textMeasure);
+        let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
+        addToDataMap(dataMap, xValue, query, textMeasure);
     }
 }
 
@@ -366,14 +416,17 @@ export function collectDataFromFileMeta(
         if (target === "cDate") {
             let ctime = file.stat.ctime;
             query.valueType = ValueType.Date;
-            addToDataMap(dataMap, xValueMap.get(-1), query, ctime);
+            let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
+            addToDataMap(dataMap, xValue, query, ctime);
         } else if (target === "mDate") {
             let mtime = file.stat.mtime;
             query.valueType = ValueType.Date;
-            addToDataMap(dataMap, xValueMap.get(-1), query, mtime);
+            let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
+            addToDataMap(dataMap, xValue, query, mtime);
         } else if (target === "size") {
             let size = file.stat.size;
-            addToDataMap(dataMap, xValueMap.get(-1), query, size);
+            let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
+            addToDataMap(dataMap, xValue, query, size);
         }
     }
 }
@@ -461,5 +514,6 @@ export function collectDataFromDvField(
     if (tagExist) {
         value = tagMeasure;
     }
-    addToDataMap(dataMap, xValueMap.get(-1), query, value);
+    let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
+    addToDataMap(dataMap, xValue, query, value);
 }
diff --git a/src/data.ts b/src/data.ts
index 02364c1..e3f99dc 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -352,7 +352,9 @@ export class Datasets implements IterableIterator<Dataset> {
     constructor(startDate: Moment, endDate: Moment) {
         this.dates = [];
         this.datasets = [];
+
         let cData = startDate.creationData();
+        // console.log(cData);
         const dateFormat = cData.format.toString();
         for (
             let curDate = startDate.clone();
diff --git a/src/main.ts b/src/main.ts
index 76fd0b4..b706e85 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -208,8 +208,9 @@ export default class Tracker extends Plugin {
             }
 
             // Get xValue and add it into xValueMap for later use
-            let xValueMap: XValueMap = new Map(); // queryId: xValue
+            let xValueMap: XValueMap = new Map(); // queryId: xValue for this file
             let skipThisFile = false;
+            // console.log(renderInfo.xDataset);
             for (let xDatasetId of renderInfo.xDataset) {
                 if (!xValueMap.has(xDatasetId)) {
                     let xDate = window.moment("");
@@ -225,7 +226,11 @@ export default class Tracker extends Plugin {
                         // console.log(xDatasetQuery);
                         switch (xDatasetQuery.getType()) {
                             case SearchType.Frontmatter:
-                                xDate = collecting.getDateFromFrontmatter();
+                                xDate = collecting.getDateFromFrontmatter(
+                                    fileCache,
+                                    xDatasetQuery,
+                                    renderInfo
+                                );
                                 break;
                             case SearchType.Tag:
                                 xDate = collecting.getDateFromTag();
@@ -237,13 +242,17 @@ export default class Tracker extends Plugin {
                                 xDate = collecting.getDateFromDvField();
                                 break;
                             case SearchType.FileMeta:
-                                xDate = collecting.getDateFromFileMeta();
+                                xDate = collecting.getDateFromFileMeta(
+                                    file,
+                                    xDatasetQuery,
+                                    renderInfo
+                                );
                                 break;
                         }
                     }
 
                     if (!xDate.isValid()) {
-                        // console.log("file " + file.basename + " rejected");
+                        // console.log("Invalid xDate");
                         skipThisFile = true;
                     } else {
                         // console.log("file " + file.basename + " accepted");
@@ -260,7 +269,10 @@ export default class Tracker extends Plugin {
                     }
 
                     if (!skipThisFile) {
-                        xValueMap.set(-1, xDate.format(renderInfo.dateFormat));
+                        xValueMap.set(
+                            xDatasetId,
+                            xDate.format(renderInfo.dateFormat)
+                        );
                         fileCounter++;
 
                         // Get min/max date
@@ -280,6 +292,8 @@ export default class Tracker extends Plugin {
             }
             if (skipThisFile) return;
             // console.log(xValueMap);
+            // console.log(`minDate: ${minDate}`);
+            // console.log(`maxDate: ${maxDate}`);
 
             // Loop over queries
             let yDatasetQueries = renderInfo.queries.filter((q) => {
@@ -375,6 +389,7 @@ export default class Tracker extends Plugin {
             await Promise.all(loopQueryPromises);
         });
         await Promise.all(loopFilePromises);
+        // console.log(dataMap);
 
         // Collect data from a file, one file contains full dataset
         let tableQueries = renderInfo.queries.filter(

From a61c52c24b61847e7390b8e85282f5add837d2e7 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 1 Jun 2021 19:28:26 +0800
Subject: [PATCH 036/402] Set version to 1.6.0

---
 manifest.json | 2 +-
 package.json  | 2 +-
 versions.json | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index fb1591c..2179fa0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-tracker",
 	"name": "Tracker",
-	"version": "1.5.1",
+	"version": "1.6.0",
 	"minAppVersion": "0.9.12",
 	"description": "A plugin tracks occurrences and numbers in your notes",
 	"author": "pyrochlore",
diff --git a/package.json b/package.json
index 324368c..4253915 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
diff --git a/versions.json b/versions.json
index 5b3014a..c346c9d 100644
--- a/versions.json
+++ b/versions.json
@@ -9,5 +9,6 @@
 	"1.4.0": "0.9.12",
 	"1.4.1": "0.9.12",
 	"1.5.0": "0.9.12",
-	"1.5.1": "0.9.12"
+	"1.5.1": "0.9.12",
+	"1.6.0": "0.9.12"
 }

From 9b28048157a5027dda4051e9bd6236b96d7bd0d1 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 1 Jun 2021 19:40:19 +0800
Subject: [PATCH 037/402] Fix getDateFromFileMeta for mDate

---
 examples/Test FileMeta.md | 8 ++++----
 src/collecting.ts         | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/examples/Test FileMeta.md b/examples/Test FileMeta.md
index 4b0e7f8..9674291 100644
--- a/examples/Test FileMeta.md	
+++ b/examples/Test FileMeta.md	
@@ -21,14 +21,14 @@ line:
     fillGap: true
 ```
 
-Use date variables from front matter
+Use file modified dates (mDate) as x values
 ``` tracker
-searchType: frontmatter, dvField
-searchTarget: date, dataviewTarget
+searchType: fileMeta, dvField
+searchTarget: mDate, dataviewTarget
 xDataset: 0
 folder: data
 line:
-    title: Dataview Inline Field
+    fillGap: true
 ```
 
 
diff --git a/src/collecting.ts b/src/collecting.ts
index 8059ed5..7820ce9 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -100,7 +100,6 @@ export function getDateFromFileMeta(
                 renderInfo.dateFormat,
                 true
             );
-            date = window.moment(new Date(mtime));
         } else if (target === "size") {
         }
     }

From 7f1e01548a9a54f3373d9612975fe4c4ceb47318 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 1 Jun 2021 23:03:26 +0800
Subject: [PATCH 038/402] Enable getDateFromXXXX; Add examples for testing
 xDataset;

---
 examples/TestXDataset.md        |  55 ++++++++++++++++
 examples/data/Set-FileDates.ps1 |   6 ++
 examples/data/data1.md          |  31 ++-------
 examples/data/data2.md          |  33 ++--------
 examples/data/data3.md          |  31 ++-------
 src/collecting.ts               | 112 +++++++++++++++++++++++++++++++-
 src/main.ts                     |  18 ++++-
 7 files changed, 197 insertions(+), 89 deletions(-)
 create mode 100644 examples/TestXDataset.md
 create mode 100644 examples/data/Set-FileDates.ps1

diff --git a/examples/TestXDataset.md b/examples/TestXDataset.md
new file mode 100644
index 0000000..321637e
--- /dev/null
+++ b/examples/TestXDataset.md
@@ -0,0 +1,55 @@
+# Test X Dataset
+
+Use file created dates (cDate) as x values
+``` tracker
+searchType: fileMeta, dvField
+searchTarget: cDate, dataviewTarget
+xDataset: 0
+folder: data
+line:
+    fillGap: true
+```
+
+Use dates from front matter as x values
+``` tracker
+searchType: frontmatter, dvField
+searchTarget: date, dataviewTarget
+xDataset: 0
+folder: data
+line:
+    title: Dataview Inline Field
+	fillGap: true
+```
+
+Use dates from date-attached tags as x values
+``` tracker
+searchType: tag, dvField
+searchTarget: date, dataviewTarget
+xDataset: 0
+folder: data
+line:
+    title: Dataview Inline Field
+	fillGap: true
+```
+
+Ue dates from Dataview inline fields as x values
+``` tracker
+searchType: dvField, dvField
+searchTarget: date, dataviewTarget
+xDataset: 0
+folder: data
+line:
+    title: Dataview Inline Field
+	fillGap: true
+```
+
+Ue dates from formatted text as x values
+``` tracker
+searchType: text, dvField
+searchTarget: 'Today\sis\s(?<value>([0-9]{4})-([0-9]{2})-([0-9]{2})), dataviewTarget'
+xDataset: 0
+folder: data
+line:
+    title: Dataview Inline Field
+	fillGap: true
+```
\ No newline at end of file
diff --git a/examples/data/Set-FileDates.ps1 b/examples/data/Set-FileDates.ps1
new file mode 100644
index 0000000..1f9bd2b
--- /dev/null
+++ b/examples/data/Set-FileDates.ps1
@@ -0,0 +1,6 @@
+(Get-Item "./data1.md").CreationTime=("25 May 2021 17:00:00")
+(Get-Item "./data2.md").CreationTime=("27 May 2021 17:00:00")
+(Get-Item "./data3.md").CreationTime=("29 May 2021 17:00:00")
+(Get-Item "./data1.md").LastWriteTime=("25 May 2021 17:00:00")
+(Get-Item "./data2.md").LastWriteTime=("27 May 2021 17:00:00")
+(Get-Item "./data3.md").LastWriteTime=("29 May 2021 17:00:00")
\ No newline at end of file
diff --git a/examples/data/data1.md b/examples/data/data1.md
index d1f5380..0e221e2 100644
--- a/examples/data/data1.md
+++ b/examples/data/data1.md
@@ -2,32 +2,9 @@
 date: 2021-01-01
 ---
 
-#weight:74.1kg
+#date:2021-01-01
+date:: 2021-01-01
 
-#exercise-pushup:31
-#exercise-plank:109sec
-
-
-
-
-
-#finance/bank1:-3.5USD
-
-[[todo_family|To-Do @Family]]
-[[todo_work|To-Do @Work]]
-
-obsidian-tracker+1@gmail.com
-
-weightlifting: 18
-
-dataviewTarget:: 48
-- Make Progress:: 29
-- Make-Progress:: 88
-dataviewTarget1:: 48/29
-dataviewTarget2:: 29 @ 88
-dataviewTarget3:: 29, 88
-
-#sin:0.00000/0.20791/0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452
-
-#sinsquare:0.00000/0.04323/0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907
+dataviewTarget:: 50
 
+Today is 2021-01-01
\ No newline at end of file
diff --git a/examples/data/data2.md b/examples/data/data2.md
index b9e9102..e92ab3d 100644
--- a/examples/data/data2.md
+++ b/examples/data/data2.md
@@ -2,34 +2,9 @@
 date: 2021-01-02
 ---
 
-#weight:62.8kg
+#date:2021-01-03
+date:: 2021-01-05
 
-#exercise-pushup:46
-#exercise-plank:101sec
-
-#meditation
-
-
-
-#clean-up
-
-#finance/bank1:-3.8USD
-
-[[todo_family|To-Do @Family]]
-[[todo_work|To-Do @Work]]
-
-obsidian-tracker@gmail.com
-
-weightlifting: 12
-
-dataviewTarget:: 27
-- Make Progress:: 12
-- Make-Progress:: 55
-dataviewTarget1:: 27/12
-dataviewTarget2:: 12 @ 55
-dataviewTarget3:: 12, 55
-
-#sin:0.20791/0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452/0.95106
-
-#sinsquare:0.04323/0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451
+dataviewTarget:: 30
 
+Today is 2021-01-10
\ No newline at end of file
diff --git a/examples/data/data3.md b/examples/data/data3.md
index 0aa5108..ed4b32d 100644
--- a/examples/data/data3.md
+++ b/examples/data/data3.md
@@ -2,32 +2,9 @@
 date: 2021-01-03
 ---
 
-#weight:76.8kg
+#date:2021-01-05
+date:: 2021-01-09
 
-#exercise-pushup:45
-#exercise-plank:43sec
-
-
-⭐⭐⭐
-
-
-#finance/bank1:-2.6USD
-
-[[todo_family|To-Do @Family]]
-[[todo_work|To-Do @Work]]
-
-obsidian-tracker@gmail.com
-
-weightlifting: 12
-
-dataviewTarget:: 88
-- Make Progress:: 5
-- Make-Progress:: 56
-dataviewTarget1:: 88/5
-dataviewTarget2:: 5 @ 56
-dataviewTarget3:: 5, 56
-
-#sin:0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452/0.95106/0.86603
-
-#sinsquare:0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000
+dataviewTarget:: 80
 
+Today is 2021-01-20
\ No newline at end of file
diff --git a/src/collecting.ts b/src/collecting.ts
index 7820ce9..e110795 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -37,6 +37,8 @@ export function getDateFromFilename(file: TFile, renderInfo: RenderInfo) {
     return fileDate;
 }
 
+// Not support multiple targets
+// May merge with collectDataFromFrontmatterKey
 export function getDateFromFrontmatter(
     fileCache: CachedMetadata,
     query: Query,
@@ -58,21 +60,125 @@ export function getDateFromFrontmatter(
     return date;
 }
 
-export function getDateFromTag() {
+// Inline tags only
+// Not support multiple targets
+// May merge with collectDataFromInlineTag
+export function getDateFromTag(
+    content: string,
+    query: Query,
+    renderInfo: RenderInfo
+) {
+    // console.log("getDateFromTag");
+
     let date = window.moment("");
+
+    let tagName = query.getTarget();
+    if (query.getParentTarget()) {
+        tagName = query.getParentTarget(); // use parent tag name for multiple values
+    }
+    // console.log(tagName);
+    let strHashtagRegex =
+        "(^|\\s)#" +
+        tagName +
+        "(\\/[\\w-]+)*(:(?<values>[\\d\\.\\/-]*)[a-zA-Z]*)?([\\.!,\\?;~-]*)?(\\s|$)";
+    // console.log(strHashtagRegex);
+    let hashTagRegex = new RegExp(strHashtagRegex, "gm");
+    let match;
+    while ((match = hashTagRegex.exec(content))) {
+        // console.log(match);
+        if (
+            typeof match.groups !== "undefined" &&
+            typeof match.groups.values !== "undefined"
+        ) {
+            let strDate = match.groups.values;
+            date = window.moment(strDate, renderInfo.dateFormat, true);
+            if (date.isValid()) {
+                break;
+            }
+        }
+    }
+    // console.log(date);
     return date;
 }
 
-export function getDateFromText() {
+// Not support multiple targets
+// May merge with colllectDataFromText
+export function getDateFromText(
+    content: string,
+    query: Query,
+    renderInfo: RenderInfo
+) {
+    // console.log("getDateFromText");
+
     let date = window.moment("");
+
+    let strTextRegex = query.getTarget();
+    // console.log(strTextRegex);
+    let textRegex = new RegExp(strTextRegex, "gm");
+    let match;
+    let textMeasure = 0.0;
+    let textExist = false;
+    while ((match = textRegex.exec(content))) {
+        // console.log(match);
+        if (
+            typeof match.groups !== "undefined" &&
+            typeof match.groups.value !== "undefined"
+        ) {
+            let strDate = match.groups.value.trim();
+            // console.log(strDate);
+            date = window.moment(strDate, renderInfo.dateFormat, true);
+            if (date.isValid()) {
+                break;
+            }
+        }
+    }
+    // console.log(date);
     return date;
 }
 
-export function getDateFromDvField() {
+// Not support multiple targets
+// May merge with colllectDataFromDvField
+export function getDateFromDvField(
+    content: string,
+    query: Query,
+    renderInfo: RenderInfo
+) {
+    // console.log("getDateFromDvField");
+
     let date = window.moment("");
+
+    let dvTarget = query.getTarget();
+    if (query.getParentTarget()) {
+        dvTarget = query.getParentTarget(); // use parent tag name for multiple values
+    }
+    // Test this in Regex101
+    // (^|\s)\*{0,2}dvTarget\*{0,2}(::\s*(?<values>[\d\.\/\-\w,@;\s]*))(\s|$)
+    let strHashtagRegex =
+        "(^|\\s)\\*{0,2}" +
+        dvTarget +
+        "\\*{0,2}(::\\s*(?<values>[\\d\\.\\/\\-\\w,@;\\s]*))(\\s|$)";
+    // console.log(strHashtagRegex);
+    let hashTagRegex = new RegExp(strHashtagRegex, "gm");
+    let match;
+    while ((match = hashTagRegex.exec(content))) {
+        // console.log(match);
+        if (
+            typeof match.groups !== "undefined" &&
+            typeof match.groups.values !== "undefined"
+        ) {
+            let strDate = match.groups.values.trim();
+            date = window.moment(strDate, renderInfo.dateFormat, true);
+            if (date.isValid()) {
+                break;
+            }
+        }
+    }
+    // console.log(date);
     return date;
 }
 
+// Not support multiple targets
+// May merge with colllectDataFromFileMeta
 export function getDateFromFileMeta(
     file: TFile,
     query: Query,
diff --git a/src/main.ts b/src/main.ts
index b706e85..5ac6bbc 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -233,13 +233,25 @@ export default class Tracker extends Plugin {
                                 );
                                 break;
                             case SearchType.Tag:
-                                xDate = collecting.getDateFromTag();
+                                xDate = collecting.getDateFromTag(
+                                    content,
+                                    xDatasetQuery,
+                                    renderInfo
+                                );
                                 break;
                             case SearchType.Text:
-                                xDate = collecting.getDateFromText();
+                                xDate = collecting.getDateFromText(
+                                    content,
+                                    xDatasetQuery,
+                                    renderInfo
+                                );
                                 break;
                             case SearchType.dvField:
-                                xDate = collecting.getDateFromDvField();
+                                xDate = collecting.getDateFromDvField(
+                                    content,
+                                    xDatasetQuery,
+                                    renderInfo
+                                );
                                 break;
                             case SearchType.FileMeta:
                                 xDate = collecting.getDateFromFileMeta(

From 15001141cbd9cb4ca8cb49edb7d04d9539d7f2f5 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 1 Jun 2021 23:23:48 +0800
Subject: [PATCH 039/402] Update examples

---
 examples/ErrorMessages.md                    |  5 ++++-
 examples/HabitTracker.md                     |  6 +++---
 examples/MoodTracker.md                      |  1 +
 examples/Test FileMeta.md                    |  1 +
 examples/TestBarChart.md                     |  2 ++
 examples/TestBullet.md                       |  4 +++-
 examples/TestCalendar.md                     |  4 +++-
 examples/TestDateFormats.md                  |  1 +
 examples/TestDvField.md                      |  4 +++-
 examples/TestFrontmatter.md                  |  2 ++
 examples/TestLegends.md                      |  2 ++
 examples/TestMultipleTargesMultipleValues.md | 12 +++++++++---
 examples/TestScalingAndPositioing.md         |  4 +++-
 examples/TestTable.md                        |  1 +
 examples/TestTimeValues.md                   |  4 +++-
 examples/TestXDataset.md                     |  4 +++-
 examples/diary/2021-01-01.md                 |  3 +++
 examples/diary/2021-01-02.md                 |  3 +++
 examples/diary/2021-01-03.md                 |  3 +++
 examples/diary/2021-01-04.md                 |  3 +++
 examples/diary/2021-01-05.md                 |  3 +++
 examples/diary/2021-01-06.md                 |  3 +++
 examples/diary/2021-01-07.md                 |  3 +++
 examples/diary/2021-01-08.md                 |  3 +++
 examples/diary/2021-01-09.md                 |  3 +++
 examples/diary/2021-01-10.md                 |  3 +++
 examples/diary/2021-01-11.md                 |  3 +++
 examples/diary/2021-01-12.md                 |  3 +++
 examples/diary/2021-01-13.md                 |  3 +++
 examples/diary/2021-01-14.md                 |  3 +++
 examples/diary/2021-01-15.md                 |  3 +++
 examples/diary/2021-01-16.md                 |  3 +++
 examples/diary/2021-01-17.md                 |  3 +++
 examples/diary/2021-01-18.md                 |  3 +++
 examples/diary/2021-01-19.md                 |  3 +++
 examples/diary/2021-01-20.md                 |  3 +++
 examples/diary/2021-01-21.md                 |  3 +++
 examples/diary/2021-01-22.md                 |  3 +++
 examples/diary/2021-01-23.md                 |  3 +++
 examples/diary/2021-01-24.md                 |  3 +++
 examples/diary/2021-01-25.md                 |  3 +++
 examples/diary/2021-01-26.md                 |  3 +++
 examples/diary/2021-01-27.md                 |  3 +++
 examples/diary/2021-01-28.md                 |  3 +++
 examples/diary/2021-01-29.md                 |  3 +++
 examples/diary/2021-01-30.md                 |  3 +++
 examples/diary/2021-01-31.md                 |  3 +++
 examples/example_generator.ts                |  4 ++++
 48 files changed, 141 insertions(+), 13 deletions(-)

diff --git a/examples/ErrorMessages.md b/examples/ErrorMessages.md
index 37535b5..fb2212e 100644
--- a/examples/ErrorMessages.md
+++ b/examples/ErrorMessages.md
@@ -135,4 +135,7 @@ searchTarget: data/Tables[4][0], data/Tables[4][1]
 xDataset: 0
 line:
 	lineColor: none, yellow
-```
\ No newline at end of file
+```
+
+
+Please also check those search targets in markdown files under folder 'diary' and 'data'.
\ No newline at end of file
diff --git a/examples/HabitTracker.md b/examples/HabitTracker.md
index 9f69a6d..7566007 100644
--- a/examples/HabitTracker.md
+++ b/examples/HabitTracker.md
@@ -35,7 +35,7 @@ line:
 ```
 
 ## Summary
-Meditation
+### Meditation
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -44,7 +44,7 @@ summary:
     template: "Longest Streak: {{maxStreak}} day(s)\nLongest Breaks: {{maxBreaks}} day(s)\nLast streak: {{lastStreak}} day(s)"
 ```
 
-CleanUp
+### CleanUp
 ``` tracker
 searchType: tag
 searchTarget: clean-up
@@ -54,7 +54,7 @@ summary:
     template: "Last Break: {{lastBreaks}} day(s)"
 ```
 
-Work log
+### Work log
 ``` tracker
 searchType: tag
 searchTarget: work_log
diff --git a/examples/MoodTracker.md b/examples/MoodTracker.md
index d3434ab..48c83c8 100644
--- a/examples/MoodTracker.md
+++ b/examples/MoodTracker.md
@@ -11,3 +11,4 @@ line:
     lineColor: "#d65d0e"
 ```
 
+Please also check those search targets in markdown files under folder 'diary'.
\ No newline at end of file
diff --git a/examples/Test FileMeta.md b/examples/Test FileMeta.md
index 9674291..d1436a9 100644
--- a/examples/Test FileMeta.md	
+++ b/examples/Test FileMeta.md	
@@ -31,4 +31,5 @@ line:
     fillGap: true
 ```
 
+Please also check those search targets in markdown files under folder 'diary' and 'data'.
 
diff --git a/examples/TestBarChart.md b/examples/TestBarChart.md
index 8af3e97..3fb2478 100644
--- a/examples/TestBarChart.md
+++ b/examples/TestBarChart.md
@@ -52,3 +52,5 @@ bar:
     yMin: 0
     barColor: yellow, red, green, blue, orange, white
 ```
+
+Please also check those search targets in markdown files under folder 'diary'.
\ No newline at end of file
diff --git a/examples/TestBullet.md b/examples/TestBullet.md
index 45604d0..d4eca5d 100644
--- a/examples/TestBullet.md
+++ b/examples/TestBullet.md
@@ -38,4 +38,6 @@ bullet:
 	showMarker: true
 	markerValue: 80
 	markerColor: red
-```
\ No newline at end of file
+```
+
+Please also check those search targets in markdown files under folder 'diary'.
\ No newline at end of file
diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
index cdf2bbd..dac62be 100644
--- a/examples/TestCalendar.md
+++ b/examples/TestCalendar.md
@@ -6,4 +6,6 @@ searchTarget: meditation
 folder: diary
 month:
     startWeekOn: 
-```
\ No newline at end of file
+```
+
+Please also check those search targets in markdown files under folder 'diary'.
\ No newline at end of file
diff --git a/examples/TestDateFormats.md b/examples/TestDateFormats.md
index b529689..6c03e4a 100644
--- a/examples/TestDateFormats.md
+++ b/examples/TestDateFormats.md
@@ -128,3 +128,4 @@ line:
     lineColor: yellow
 ```
 
+Please also check those search targets in markdown files under folder 'diary'.
diff --git a/examples/TestDvField.md b/examples/TestDvField.md
index f78346b..7fb7877 100644
--- a/examples/TestDvField.md
+++ b/examples/TestDvField.md
@@ -84,4 +84,6 @@ endDate: 2021-01-31
 line:
     title: dvField
     lineColor: green, red
-```
\ No newline at end of file
+```
+
+Please also check those search targets in markdown files under folder 'diary'.
\ No newline at end of file
diff --git a/examples/TestFrontmatter.md b/examples/TestFrontmatter.md
index 076117c..c8f547b 100644
--- a/examples/TestFrontmatter.md
+++ b/examples/TestFrontmatter.md
@@ -9,3 +9,5 @@ endDate: 2021-01-31
 line:
     title: Deep Values
 ```
+
+Please also check those search targets in markdown files under folder 'diary'.
\ No newline at end of file
diff --git a/examples/TestLegends.md b/examples/TestLegends.md
index 96a5bde..17fffb2 100644
--- a/examples/TestLegends.md
+++ b/examples/TestLegends.md
@@ -192,3 +192,5 @@ bar:
     showLegend: true
     legendPosition: right
 ```
+
+Please also check those search targets in markdown files under folder 'diary'.
\ No newline at end of file
diff --git a/examples/TestMultipleTargesMultipleValues.md b/examples/TestMultipleTargesMultipleValues.md
index 1a8607c..bd6a330 100644
--- a/examples/TestMultipleTargesMultipleValues.md
+++ b/examples/TestMultipleTargesMultipleValues.md
@@ -36,6 +36,7 @@ Retrieve values from a multiple-values-attached tag
 searchType: tag
 searchTarget: sin[0], sin[1], sin[2], sin[3], sin[4], sin[5], sin[6], sin[7], sin[8]
 folder: diary
+datasetName: Sin1, Sin2, Sin3, Sin4, Sin5, Sin6, Sin7, Sin8, Sin9
 startDate: 2021-01-01
 endDate: 2021-01-31
 line:
@@ -53,6 +54,7 @@ Multiple values separated by slash (/)
 searchType: frontmatter
 searchTarget: bloodpressure[0], bloodpressure[1]
 folder: diary
+datasetName: systolic, diastolic
 startDate: 2021-01-01
 endDate: 2021-01-31
 line:
@@ -66,6 +68,7 @@ Multiple values separated by comma (,)
 searchType: frontmatter
 searchTarget: bloodpressure1[0], bloodpressure1[1]
 folder: diary
+datasetName: systolic, diastolic
 startDate: 2021-01-01
 endDate: 2021-01-31
 separator: comma
@@ -80,6 +83,7 @@ Values from array
 searchType: frontmatter
 searchTarget: bloodpressure2[0], bloodpressure2[1]
 folder: diary
+datasetName: systolic, diastolic
 startDate: 2021-01-01
 endDate: 2021-01-31
 line:
@@ -88,12 +92,12 @@ line:
     showLegend: true
 ```
 
-Values in nested parameters
-Not works yet.
+Values from nested keys
 ``` tracker
 searchType: frontmatter
-searchTarget: blood-pressure[0], blood-pressure[1]
+searchTarget: bp.systolic, bp.diastolic
 folder: diary
+datasetName: systolic, diastolic
 startDate: 2021-01-01
 endDate: 2021-01-31
 line:
@@ -180,3 +184,5 @@ line:
     yAxisLocation: none, left, right
     lineColor: none, yellow, red
 ```
+
+Please also check those search targets in markdown files under folder 'diary' and 'data'.
\ No newline at end of file
diff --git a/examples/TestScalingAndPositioing.md b/examples/TestScalingAndPositioing.md
index b7fc267..626fb36 100644
--- a/examples/TestScalingAndPositioing.md
+++ b/examples/TestScalingAndPositioing.md
@@ -98,4 +98,6 @@ line:
     title: PushUp
     yAxisLabel: Count
     lineColor: "#d65d0e"
-```
\ No newline at end of file
+```
+
+Please also check those search targets in markdown files under folder 'diary'.
\ No newline at end of file
diff --git a/examples/TestTable.md b/examples/TestTable.md
index e88bc8c..4a87434 100644
--- a/examples/TestTable.md
+++ b/examples/TestTable.md
@@ -53,3 +53,4 @@ line:
     lineColor: none, yellow
 ```
 
+Please also check those search targets in markdown file /data/Tables.
diff --git a/examples/TestTimeValues.md b/examples/TestTimeValues.md
index dc72220..66f5506 100644
--- a/examples/TestTimeValues.md
+++ b/examples/TestTimeValues.md
@@ -28,4 +28,6 @@ line:
     lineColor: yellow, red
     showPoint: true
 	showLegend: true
-```
\ No newline at end of file
+```
+
+Please also check those search targets in markdown files under folder 'diary'.
\ No newline at end of file
diff --git a/examples/TestXDataset.md b/examples/TestXDataset.md
index 321637e..288284c 100644
--- a/examples/TestXDataset.md
+++ b/examples/TestXDataset.md
@@ -52,4 +52,6 @@ folder: data
 line:
     title: Dataview Inline Field
 	fillGap: true
-```
\ No newline at end of file
+```
+
+Please also check those search targets in markdown files under folder 'data'.
\ No newline at end of file
diff --git a/examples/diary/2021-01-01.md b/examples/diary/2021-01-01.md
index b118da9..8144865 100644
--- a/examples/diary/2021-01-01.md
+++ b/examples/diary/2021-01-01.md
@@ -4,6 +4,9 @@ mood: 8
 bloodpressure: 184.4/118.8
 bloodpressure1: 184.4, 118.8
 bloodpressure2: [184.4, 118.8]
+bp:
+    systolic: 184.4
+    diastolic: 118.8
 clock-in: 10:45
 clock-out: 20:51
 sleep: 10:11 pm/7:5 am
diff --git a/examples/diary/2021-01-02.md b/examples/diary/2021-01-02.md
index e97b2b4..6a37be3 100644
--- a/examples/diary/2021-01-02.md
+++ b/examples/diary/2021-01-02.md
@@ -4,6 +4,9 @@ mood: 1
 bloodpressure: 180.8/120.6
 bloodpressure1: 180.8, 120.6
 bloodpressure2: [180.8, 120.6]
+bp:
+    systolic: 180.8
+    diastolic: 120.6
 clock-in: 9:16
 clock-out: 16:49
 sleep: 9:12 pm/6:41 am
diff --git a/examples/diary/2021-01-03.md b/examples/diary/2021-01-03.md
index d4d59ce..6ac6973 100644
--- a/examples/diary/2021-01-03.md
+++ b/examples/diary/2021-01-03.md
@@ -4,6 +4,9 @@ mood: 5
 bloodpressure: 178.2/120.4
 bloodpressure1: 178.2, 120.4
 bloodpressure2: [178.2, 120.4]
+bp:
+    systolic: 178.2
+    diastolic: 120.4
 clock-in: 10:22
 clock-out: 20:49
 sleep: 9:33 pm/5:17 am
diff --git a/examples/diary/2021-01-04.md b/examples/diary/2021-01-04.md
index ba8f3c5..73fce11 100644
--- a/examples/diary/2021-01-04.md
+++ b/examples/diary/2021-01-04.md
@@ -4,6 +4,9 @@ mood: 3
 bloodpressure: 179.6/121.2
 bloodpressure1: 179.6, 121.2
 bloodpressure2: [179.6, 121.2]
+bp:
+    systolic: 179.6
+    diastolic: 121.2
 clock-in: 8:24
 clock-out: 20:58
 sleep: 11:57 pm/7:20 am
diff --git a/examples/diary/2021-01-05.md b/examples/diary/2021-01-05.md
index ea5d52c..51dca8b 100644
--- a/examples/diary/2021-01-05.md
+++ b/examples/diary/2021-01-05.md
@@ -4,6 +4,9 @@ mood: 5
 bloodpressure: 178/119
 bloodpressure1: 178, 119
 bloodpressure2: [178, 119]
+bp:
+    systolic: 178
+    diastolic: 119
 clock-in: 8:10
 clock-out: 20:21
 sleep: 10:1 pm/6:57 am
diff --git a/examples/diary/2021-01-06.md b/examples/diary/2021-01-06.md
index eb0fcd6..3cce288 100644
--- a/examples/diary/2021-01-06.md
+++ b/examples/diary/2021-01-06.md
@@ -4,6 +4,9 @@ mood: 7
 bloodpressure: 180.4/118.8
 bloodpressure1: 180.4, 118.8
 bloodpressure2: [180.4, 118.8]
+bp:
+    systolic: 180.4
+    diastolic: 118.8
 clock-in: 10:23
 clock-out: 19:2
 sleep: 10:47 pm/6:41 am
diff --git a/examples/diary/2021-01-07.md b/examples/diary/2021-01-07.md
index 3330e10..4be6c2c 100644
--- a/examples/diary/2021-01-07.md
+++ b/examples/diary/2021-01-07.md
@@ -4,6 +4,9 @@ mood: 9
 bloodpressure: 173.8/120.6
 bloodpressure1: 173.8, 120.6
 bloodpressure2: [173.8, 120.6]
+bp:
+    systolic: 173.8
+    diastolic: 120.6
 clock-in: 10:29
 clock-out: 17:0
 sleep: 10:54 pm/6:53 am
diff --git a/examples/diary/2021-01-08.md b/examples/diary/2021-01-08.md
index 3c364b1..8c4f6c9 100644
--- a/examples/diary/2021-01-08.md
+++ b/examples/diary/2021-01-08.md
@@ -4,6 +4,9 @@ mood: 10
 bloodpressure: 170.2/119.4
 bloodpressure1: 170.2, 119.4
 bloodpressure2: [170.2, 119.4]
+bp:
+    systolic: 170.2
+    diastolic: 119.4
 clock-in: 9:8
 clock-out: 18:18
 sleep: 9:12 pm/5:1 am
diff --git a/examples/diary/2021-01-09.md b/examples/diary/2021-01-09.md
index 09e8f66..cf13e63 100644
--- a/examples/diary/2021-01-09.md
+++ b/examples/diary/2021-01-09.md
@@ -4,6 +4,9 @@ mood: 2
 bloodpressure: 177.6/120.2
 bloodpressure1: 177.6, 120.2
 bloodpressure2: [177.6, 120.2]
+bp:
+    systolic: 177.6
+    diastolic: 120.2
 clock-in: 10:23
 clock-out: 18:32
 sleep: 11:3 pm/6:35 am
diff --git a/examples/diary/2021-01-10.md b/examples/diary/2021-01-10.md
index d8b26df..7f01e58 100644
--- a/examples/diary/2021-01-10.md
+++ b/examples/diary/2021-01-10.md
@@ -4,6 +4,9 @@ mood: 7
 bloodpressure: 178/118
 bloodpressure1: 178, 118
 bloodpressure2: [178, 118]
+bp:
+    systolic: 178
+    diastolic: 118
 clock-in: 8:31
 clock-out: 17:43
 sleep: 9:7 pm/5:59 am
diff --git a/examples/diary/2021-01-11.md b/examples/diary/2021-01-11.md
index 359bd58..847c842 100644
--- a/examples/diary/2021-01-11.md
+++ b/examples/diary/2021-01-11.md
@@ -4,6 +4,9 @@ mood: 2
 bloodpressure: 174.4/115.8
 bloodpressure1: 174.4, 115.8
 bloodpressure2: [174.4, 115.8]
+bp:
+    systolic: 174.4
+    diastolic: 115.8
 clock-in: 10:8
 clock-out: 16:2
 sleep: 9:49 pm/7:29 am
diff --git a/examples/diary/2021-01-12.md b/examples/diary/2021-01-12.md
index c740387..ac51000 100644
--- a/examples/diary/2021-01-12.md
+++ b/examples/diary/2021-01-12.md
@@ -4,6 +4,9 @@ mood: 4
 bloodpressure: 169.8/117.6
 bloodpressure1: 169.8, 117.6
 bloodpressure2: [169.8, 117.6]
+bp:
+    systolic: 169.8
+    diastolic: 117.6
 clock-in: 9:31
 clock-out: 17:4
 sleep: 11:22 pm/6:1 am
diff --git a/examples/diary/2021-01-13.md b/examples/diary/2021-01-13.md
index 9cd34f6..ad01bfc 100644
--- a/examples/diary/2021-01-13.md
+++ b/examples/diary/2021-01-13.md
@@ -4,6 +4,9 @@ mood: 7
 bloodpressure: 176.2/116.4
 bloodpressure1: 176.2, 116.4
 bloodpressure2: [176.2, 116.4]
+bp:
+    systolic: 176.2
+    diastolic: 116.4
 clock-in: 10:23
 clock-out: 16:5
 sleep: 11:47 pm/7:19 am
diff --git a/examples/diary/2021-01-14.md b/examples/diary/2021-01-14.md
index ee320fe..6575a5e 100644
--- a/examples/diary/2021-01-14.md
+++ b/examples/diary/2021-01-14.md
@@ -4,6 +4,9 @@ mood: 5
 bloodpressure: 167.6/117.2
 bloodpressure1: 167.6, 117.2
 bloodpressure2: [167.6, 117.2]
+bp:
+    systolic: 167.6
+    diastolic: 117.2
 clock-in: 10:7
 clock-out: 16:5
 sleep: 9:9 pm/7:54 am
diff --git a/examples/diary/2021-01-15.md b/examples/diary/2021-01-15.md
index 3ecd7ef..729cf3d 100644
--- a/examples/diary/2021-01-15.md
+++ b/examples/diary/2021-01-15.md
@@ -4,6 +4,9 @@ mood: 7
 bloodpressure: 168/116
 bloodpressure1: 168, 116
 bloodpressure2: [168, 116]
+bp:
+    systolic: 168
+    diastolic: 116
 clock-in: 8:13
 clock-out: 18:16
 sleep: 9:28 pm/7:25 am
diff --git a/examples/diary/2021-01-16.md b/examples/diary/2021-01-16.md
index 12688a7..44d6d23 100644
--- a/examples/diary/2021-01-16.md
+++ b/examples/diary/2021-01-16.md
@@ -4,6 +4,9 @@ mood: 5
 bloodpressure: 173.4/114.8
 bloodpressure1: 173.4, 114.8
 bloodpressure2: [173.4, 114.8]
+bp:
+    systolic: 173.4
+    diastolic: 114.8
 clock-in: 8:32
 clock-out: 17:4
 sleep: 9:51 pm/6:15 am
diff --git a/examples/diary/2021-01-17.md b/examples/diary/2021-01-17.md
index 5b43b54..188c795 100644
--- a/examples/diary/2021-01-17.md
+++ b/examples/diary/2021-01-17.md
@@ -4,6 +4,9 @@ mood: 5
 bloodpressure: 168.8/118.6
 bloodpressure1: 168.8, 118.6
 bloodpressure2: [168.8, 118.6]
+bp:
+    systolic: 168.8
+    diastolic: 118.6
 clock-in: 9:25
 clock-out: 17:18
 sleep: 9:42 pm/5:42 am
diff --git a/examples/diary/2021-01-18.md b/examples/diary/2021-01-18.md
index 22baab9..662c4d1 100644
--- a/examples/diary/2021-01-18.md
+++ b/examples/diary/2021-01-18.md
@@ -4,6 +4,9 @@ mood: 5
 bloodpressure: 166.2/118.4
 bloodpressure1: 166.2, 118.4
 bloodpressure2: [166.2, 118.4]
+bp:
+    systolic: 166.2
+    diastolic: 118.4
 clock-in: 10:44
 clock-out: 19:39
 sleep: 11:31 pm/5:44 am
diff --git a/examples/diary/2021-01-19.md b/examples/diary/2021-01-19.md
index 6edf412..1eb4693 100644
--- a/examples/diary/2021-01-19.md
+++ b/examples/diary/2021-01-19.md
@@ -4,6 +4,9 @@ mood: 9
 bloodpressure: 165.6/118.2
 bloodpressure1: 165.6, 118.2
 bloodpressure2: [165.6, 118.2]
+bp:
+    systolic: 165.6
+    diastolic: 118.2
 clock-in: 9:31
 clock-out: 16:13
 sleep: 11:39 pm/6:11 am
diff --git a/examples/diary/2021-01-20.md b/examples/diary/2021-01-20.md
index 6556c0e..ff9c856 100644
--- a/examples/diary/2021-01-20.md
+++ b/examples/diary/2021-01-20.md
@@ -4,6 +4,9 @@ mood: 10
 bloodpressure: 163/115
 bloodpressure1: 163, 115
 bloodpressure2: [163, 115]
+bp:
+    systolic: 163
+    diastolic: 115
 clock-in: 9:49
 clock-out: 18:2
 sleep: 10:46 pm/7:45 am
diff --git a/examples/diary/2021-01-21.md b/examples/diary/2021-01-21.md
index 009ce2b..8d0f391 100644
--- a/examples/diary/2021-01-21.md
+++ b/examples/diary/2021-01-21.md
@@ -4,6 +4,9 @@ mood: 5
 bloodpressure: 169.4/117.8
 bloodpressure1: 169.4, 117.8
 bloodpressure2: [169.4, 117.8]
+bp:
+    systolic: 169.4
+    diastolic: 117.8
 clock-in: 9:59
 clock-out: 16:39
 sleep: 10:38 pm/5:35 am
diff --git a/examples/diary/2021-01-22.md b/examples/diary/2021-01-22.md
index 0d69867..b021ca6 100644
--- a/examples/diary/2021-01-22.md
+++ b/examples/diary/2021-01-22.md
@@ -4,6 +4,9 @@ mood: 5
 bloodpressure: 168.8/115.6
 bloodpressure1: 168.8, 115.6
 bloodpressure2: [168.8, 115.6]
+bp:
+    systolic: 168.8
+    diastolic: 115.6
 clock-in: 9:6
 clock-out: 17:57
 sleep: 11:28 pm/6:45 am
diff --git a/examples/diary/2021-01-23.md b/examples/diary/2021-01-23.md
index 68a1da4..6a79477 100644
--- a/examples/diary/2021-01-23.md
+++ b/examples/diary/2021-01-23.md
@@ -4,6 +4,9 @@ mood: 5
 bloodpressure: 167.2/115.4
 bloodpressure1: 167.2, 115.4
 bloodpressure2: [167.2, 115.4]
+bp:
+    systolic: 167.2
+    diastolic: 115.4
 clock-in: 8:12
 clock-out: 20:13
 sleep: 9:46 pm/7:12 am
diff --git a/examples/diary/2021-01-24.md b/examples/diary/2021-01-24.md
index f0a44b0..1dc610d 100644
--- a/examples/diary/2021-01-24.md
+++ b/examples/diary/2021-01-24.md
@@ -4,6 +4,9 @@ mood: 7
 bloodpressure: 165.6/114.2
 bloodpressure1: 165.6, 114.2
 bloodpressure2: [165.6, 114.2]
+bp:
+    systolic: 165.6
+    diastolic: 114.2
 clock-in: 8:41
 clock-out: 18:17
 sleep: 10:49 pm/6:41 am
diff --git a/examples/diary/2021-01-25.md b/examples/diary/2021-01-25.md
index 85adb37..ad22288 100644
--- a/examples/diary/2021-01-25.md
+++ b/examples/diary/2021-01-25.md
@@ -4,6 +4,9 @@ mood: 1
 bloodpressure: 165/113
 bloodpressure1: 165, 113
 bloodpressure2: [165, 113]
+bp:
+    systolic: 165
+    diastolic: 113
 clock-in: 9:53
 clock-out: 16:33
 sleep: 10:11 pm/6:9 am
diff --git a/examples/diary/2021-01-26.md b/examples/diary/2021-01-26.md
index ba3b8dd..8ebefc0 100644
--- a/examples/diary/2021-01-26.md
+++ b/examples/diary/2021-01-26.md
@@ -4,6 +4,9 @@ mood: 7
 bloodpressure: 168.4/113.8
 bloodpressure1: 168.4, 113.8
 bloodpressure2: [168.4, 113.8]
+bp:
+    systolic: 168.4
+    diastolic: 113.8
 clock-in: 10:24
 clock-out: 20:21
 sleep: 9:48 pm/5:2 am
diff --git a/examples/diary/2021-01-27.md b/examples/diary/2021-01-27.md
index 59526d2..892bba6 100644
--- a/examples/diary/2021-01-27.md
+++ b/examples/diary/2021-01-27.md
@@ -4,6 +4,9 @@ mood: 6
 bloodpressure: 166.8/114.6
 bloodpressure1: 166.8, 114.6
 bloodpressure2: [166.8, 114.6]
+bp:
+    systolic: 166.8
+    diastolic: 114.6
 clock-in: 9:12
 clock-out: 19:36
 sleep: 10:2 pm/7:36 am
diff --git a/examples/diary/2021-01-28.md b/examples/diary/2021-01-28.md
index 5943460..c9eddbc 100644
--- a/examples/diary/2021-01-28.md
+++ b/examples/diary/2021-01-28.md
@@ -4,6 +4,9 @@ mood: 7
 bloodpressure: 160.2/116.4
 bloodpressure1: 160.2, 116.4
 bloodpressure2: [160.2, 116.4]
+bp:
+    systolic: 160.2
+    diastolic: 116.4
 clock-in: 9:28
 clock-out: 16:58
 sleep: 10:28 pm/5:46 am
diff --git a/examples/diary/2021-01-29.md b/examples/diary/2021-01-29.md
index 9139fcd..909d652 100644
--- a/examples/diary/2021-01-29.md
+++ b/examples/diary/2021-01-29.md
@@ -4,6 +4,9 @@ mood: 2
 bloodpressure: 157.6/115.2
 bloodpressure1: 157.6, 115.2
 bloodpressure2: [157.6, 115.2]
+bp:
+    systolic: 157.6
+    diastolic: 115.2
 clock-in: 10:44
 clock-out: 16:41
 sleep: 10:27 pm/5:11 am
diff --git a/examples/diary/2021-01-30.md b/examples/diary/2021-01-30.md
index 30adfd6..9943c26 100644
--- a/examples/diary/2021-01-30.md
+++ b/examples/diary/2021-01-30.md
@@ -4,6 +4,9 @@ mood: 7
 bloodpressure: 165/114
 bloodpressure1: 165, 114
 bloodpressure2: [165, 114]
+bp:
+    systolic: 165
+    diastolic: 114
 clock-in: 8:16
 clock-out: 17:2
 sleep: 10:51 pm/7:29 am
diff --git a/examples/diary/2021-01-31.md b/examples/diary/2021-01-31.md
index 50858f6..cf2c8ac 100644
--- a/examples/diary/2021-01-31.md
+++ b/examples/diary/2021-01-31.md
@@ -4,6 +4,9 @@ mood: 8
 bloodpressure: 159.4/113.8
 bloodpressure1: 159.4, 113.8
 bloodpressure2: [159.4, 113.8]
+bp:
+    systolic: 159.4
+    diastolic: 113.8
 clock-in: 8:30
 clock-out: 20:24
 sleep: 10:4 pm/7:10 am
diff --git a/examples/example_generator.ts b/examples/example_generator.ts
index d206bdb..69f43be 100644
--- a/examples/example_generator.ts
+++ b/examples/example_generator.ts
@@ -79,6 +79,10 @@ for (
     frontmatter +=
         "bloodpressure2: [" + systolic + ", " + diastolic + "]" + "\n";
 
+    frontmatter += "bp:" + "\n";
+    frontmatter += "    systolic: " + systolic + "\n";
+    frontmatter += "    diastolic: " + diastolic + "\n";
+
     // clock-in clock-out, 24hr
     let time_clock_in =
         randomIntFromInterval(8, 10).toString() +

From 713892feea22dfef07786b1f43165b248679a891 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 3 Jun 2021 11:33:36 +0800
Subject: [PATCH 040/402] Add template variables and examples for them

---
 examples/TestTemplateVariables.md | 233 +++++++++++++++++++++
 src/collecting.ts                 |  20 ++
 src/data.ts                       |  40 ++++
 src/expr.ts                       | 323 ++++++++++++++++++++++++++----
 src/main.ts                       |  16 +-
 5 files changed, 589 insertions(+), 43 deletions(-)
 create mode 100644 examples/TestTemplateVariables.md

diff --git a/examples/TestTemplateVariables.md b/examples/TestTemplateVariables.md
new file mode 100644
index 0000000..5380520
--- /dev/null
+++ b/examples/TestTemplateVariables.md
@@ -0,0 +1,233 @@
+# Test Template Variables
+
+### {{min}}
+``` tracker
+searchType: dvField
+searchTarget: dataviewTarget
+folder: /diary
+endDate: 2021-01-03
+summary:
+    template: 'Minimum value: {{min}} <-- should be 27'
+```
+
+### {{max}}
+``` tracker
+searchType: dvField
+searchTarget: dataviewTarget
+folder: /diary
+endDate: 2021-01-03
+summary:
+    template: 'Maximum value: {{max}} <-- should be 88'
+```
+
+### {{startDate}}
+``` tracker
+searchType: dvField
+searchTarget: dataviewTarget
+folder: /diary
+endDate: 2021-01-03
+summary:
+    template: 'Start date: {{startDate}} <-- should be 2021-01-01'
+```
+
+### {{endDate}}
+``` tracker
+searchType: dvField
+searchTarget: dataviewTarget
+folder: /diary
+endDate: 2021-01-03
+summary:
+    template: 'End date: {{endDate}} <-- should be 2021-01-03'
+```
+
+### {{sum}}
+``` tracker
+searchType: tag
+searchTarget: meditation
+folder: /diary
+endDate: 2021-01-04
+summary:
+    template: 'Sum: {{sum}} <-- should be 2'
+```
+
+### {{numTargets}}
+``` tracker
+searchType: tag
+searchTarget: meditation
+folder: /diary
+endDate: 2021-01-04
+summary:
+    template: 'Number of targets: {{numTargets}} <-- should be 3'
+```
+
+### {{numDays}}
+``` tracker
+searchType: tag
+searchTarget: meditation
+folder: /diary
+endDate: 2021-01-04
+summary:
+    template: 'Number of days: {{numDays}} <-- should be 4'
+```
+
+### {{numDaysHavingData}}
+``` tracker
+searchType: tag
+searchTarget: meditation
+folder: /diary
+endDate: 2021-01-04
+summary:
+    template: 'Number of days having data: {{numDaysHavingData}} <-- should be 2'
+```
+
+### {{maxStreak}}
+``` tracker
+searchType: tag
+searchTarget: meditation
+folder: /diary
+endDate: 2021-01-09
+summary:
+    template: 'Maximum streak: {{maxStreak}} <-- should be 3'
+```
+
+### {{maxStreakStart}}
+``` tracker
+searchType: tag
+searchTarget: meditation
+folder: /diary
+endDate: 2021-01-09
+summary:
+    template: 'The start date of maximum streak: {{maxStreakStart}} <-- should be 2021-01-04'
+```
+
+### {{maxStreakEnd}}
+``` tracker
+searchType: tag
+searchTarget: meditation
+folder: /diary
+endDate: 2021-01-09
+summary:
+    template: 'The end date of maximum streak: {{maxStreakEnd}} <-- should be 2021-01-06'
+```
+
+### {{maxBreaks}}
+``` tracker
+searchType: tag
+searchTarget: meditation
+folder: /diary
+endDate: 2021-01-09
+summary:
+    template: 'Maximum breaks: {{maxBreaks}} <-- should be 1'
+```
+
+### {{maxBreaksStart}}
+``` tracker
+searchType: tag
+searchTarget: meditation
+folder: /diary
+endDate: 2021-01-09
+summary:
+    template: 'The start date of maximum breaks: {{maxBreaksStart}} <-- should be 2021-01-07'
+```
+
+### {{maxBreaksEnd}}
+``` tracker
+searchType: tag
+searchTarget: meditation
+folder: /diary
+endDate: 2021-01-09
+summary:
+    template: 'The end date of maximum breaks: {{maxBreaksEnd}} <-- should be 2021-01-07'
+```
+
+### {{currentStreak}}
+``` tracker
+searchType: tag
+searchTarget: meditation
+folder: /diary
+endDate: 2021-01-24
+summary:
+    template: 'Latest streak: {{currentStreak}} <-- should be 2'
+```
+
+### {{currentStreakStart}}
+``` tracker
+searchType: tag
+searchTarget: meditation
+folder: /diary
+endDate: 2021-01-24
+summary:
+    template: 'The start date of current streak: {{currentStreakStart}} <-- should be 2021-01-23'
+```
+
+### {{currentStreakEnd}}
+``` tracker
+searchType: tag
+searchTarget: meditation
+folder: /diary
+endDate: 2021-01-24
+summary:
+    template: 'The end date of current streak: {{currentStreakEnd}} <-- should be 2021-01-24'
+```
+
+### {{currentBreaks}}
+``` tracker
+searchType: tag
+searchTarget: meditation
+folder: /diary
+endDate: 2021-01-22
+summary:
+    template: 'Current breaks: {{currentBreaks}} <-- should be 8'
+```
+
+### {{currentBreaksStart}}
+``` tracker
+searchType: tag
+searchTarget: meditation
+folder: /diary
+endDate: 2021-01-22
+summary:
+    template: 'The start date of current breaks: {{currentBreaksStart}} <-- should be 2021-01-15'
+```
+
+### {{currentBreaksEnd}}
+``` tracker
+searchType: tag
+searchTarget: meditation
+folder: /diary
+endDate: 2021-01-22
+summary:
+    template: 'The end date of current breaks: {{currentBreaksEnd}} <-- should be 2021-01-22'
+```
+
+### {{average}}
+(48+27+88)/3 = 54.33
+``` tracker
+searchType: dvField
+searchTarget: dataviewTarget
+folder: /diary
+endDate: 2021-01-03
+summary:
+    template: 'Average value: {{average}} <-- should be 54.33'
+```
+
+### {{median}}
+``` tracker
+searchType: dvField
+searchTarget: dataviewTarget
+folder: /diary
+endDate: 2021-01-03
+summary:
+    template: 'Median value: {{median}} <-- should be 48'
+```
+
+### {{variance}}
+https://mathworld.wolfram.com/SampleVariance.html
+``` tracker
+searchType: dvField
+searchTarget: dataviewTarget
+folder: /diary
+endDate: 2021-01-03
+summary:
+    template: 'Variance value: {{variance}} <-- should be 960.33'
+```
diff --git a/src/collecting.ts b/src/collecting.ts
index e110795..078f09e 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -258,10 +258,12 @@ export function collectDataFromFrontmatterTag(
                 // simple tag
                 tagMeasure = tagMeasure + renderInfo.constValue[query.getId()];
                 tagExist = true;
+                query.addNumTargets();
             } else if (tag.startsWith(query.getTarget() + "/")) {
                 // nested tag
                 tagMeasure = tagMeasure + renderInfo.constValue[query.getId()];
                 tagExist = true;
+                query.addNumTargets();
             } else {
                 continue;
             }
@@ -297,6 +299,7 @@ export function collectDataFromFrontmatterKey(
                 if (retParse.type === ValueType.Time) {
                     query.valueType = ValueType.Time;
                 }
+                query.addNumTargets();
                 let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
                 addToDataMap(dataMap, xValue, query, retParse.value);
             }
@@ -335,6 +338,7 @@ export function collectDataFromFrontmatterKey(
                     if (retParse.type === ValueType.Time) {
                         query.valueType = ValueType.Time;
                     }
+                    query.addNumTargets();
                     let xValue = xValueMap.get(
                         renderInfo.xDataset[query.getId()]
                     );
@@ -360,6 +364,7 @@ export function collectDataFromWiki(
         if (link.link === query.getTarget()) {
             linkExist = true;
             linkMeasure = linkMeasure + renderInfo.constValue[query.getId()];
+            query.addNumTargets();
         }
     }
 
@@ -414,6 +419,7 @@ export function collectDataFromInlineTag(
                         tagMeasure = retParse.value;
                         tagExist = true;
                         query.valueType = ValueType.Time;
+                        query.addNumTargets();
                     } else {
                         if (
                             !renderInfo.ignoreZeroValue[query.getId()] ||
@@ -421,6 +427,7 @@ export function collectDataFromInlineTag(
                         ) {
                             tagMeasure += retParse.value;
                             tagExist = true;
+                            query.addNumTargets();
                         }
                     }
                 }
@@ -436,9 +443,11 @@ export function collectDataFromInlineTag(
                         tagMeasure = retParse.value;
                         tagExist = true;
                         query.valueType = ValueType.Time;
+                        query.addNumTargets();
                     } else {
                         tagMeasure += retParse.value;
                         tagExist = true;
+                        query.addNumTargets();
                     }
                 }
             }
@@ -446,6 +455,7 @@ export function collectDataFromInlineTag(
             // console.log("simple-tag");
             tagMeasure = tagMeasure + renderInfo.constValue[query.getId()];
             tagExist = true;
+            query.addNumTargets();
         }
     }
 
@@ -489,6 +499,7 @@ export function collectDataFromText(
                     ) {
                         textMeasure += value;
                         textExist = true;
+                        query.addNumTargets();
                     }
                 }
             }
@@ -496,6 +507,7 @@ export function collectDataFromText(
             // console.log("simple-text");
             textMeasure = textMeasure + renderInfo.constValue[query.getId()];
             textExist = true;
+            query.addNumTargets();
         }
     }
 
@@ -521,15 +533,18 @@ export function collectDataFromFileMeta(
         if (target === "cDate") {
             let ctime = file.stat.ctime;
             query.valueType = ValueType.Date;
+            query.addNumTargets();
             let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
             addToDataMap(dataMap, xValue, query, ctime);
         } else if (target === "mDate") {
             let mtime = file.stat.mtime;
             query.valueType = ValueType.Date;
+            query.addNumTargets();
             let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
             addToDataMap(dataMap, xValue, query, mtime);
         } else if (target === "size") {
             let size = file.stat.size;
+            query.addNumTargets();
             let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
             addToDataMap(dataMap, xValue, query, size);
         }
@@ -579,6 +594,7 @@ export function collectDataFromDvField(
                         tagMeasure = retParse.value;
                         tagExist = true;
                         query.valueType = ValueType.Time;
+                        query.addNumTargets();
                     } else {
                         if (
                             !renderInfo.ignoreZeroValue[query.getId()] ||
@@ -586,6 +602,7 @@ export function collectDataFromDvField(
                         ) {
                             tagMeasure += retParse.value;
                             tagExist = true;
+                            query.addNumTargets();
                         }
                     }
                 }
@@ -602,9 +619,11 @@ export function collectDataFromDvField(
                         tagMeasure = retParse.value;
                         tagExist = true;
                         query.valueType = ValueType.Time;
+                        query.addNumTargets();
                     } else {
                         tagMeasure += retParse.value;
                         tagExist = true;
+                        query.addNumTargets();
                     }
                 }
             }
@@ -612,6 +631,7 @@ export function collectDataFromDvField(
             // console.log("simple-tag");
             tagMeasure = tagMeasure + renderInfo.constValue[query.getId()];
             tagExist = true;
+            query.addNumTargets();
         }
     }
 
diff --git a/src/data.ts b/src/data.ts
index e3f99dc..9bb75d8 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -48,6 +48,7 @@ export class Query {
     private accessor: number;
     private accessor1: number;
     private accessor2: number;
+    private numTargets: number;
 
     valueType: ValueType;
     usedAsXDataset: boolean;
@@ -62,6 +63,7 @@ export class Query {
         this.accessor2 = -1;
         this.valueType = ValueType.Number;
         this.usedAsXDataset = false;
+        this.numTargets = 0;
 
         if (searchType === SearchType.Table) {
             // searchTarget --> {{filePath}}[{{table}}][{{column}}]
@@ -161,6 +163,14 @@ export class Query {
     public getSeparator() {
         return this.separator;
     }
+
+    public addNumTargets(num: number = 1) {
+        this.numTargets = this.numTargets + num;
+    }
+
+    public getNumTargets() {
+        return this.numTargets;
+    }
 }
 
 export interface QueryValuePair {
@@ -177,6 +187,9 @@ export class Dataset implements IterableIterator<DataPoint> {
     private id: number;
     private yMin: number;
     private yMax: number;
+    private startDate: Moment;
+    private endDate: Moment;
+    private numTargets: number;
     private lineInfo: LineInfo;
     private barInfo: BarInfo;
 
@@ -192,6 +205,9 @@ export class Dataset implements IterableIterator<DataPoint> {
         this.id = -1;
         this.yMin = null;
         this.yMax = null;
+        this.startDate = null;
+        this.endDate = null;
+        this.numTargets = 0;
         this.lineInfo = null;
         this.barInfo = null;
         this.valueType = query.valueType;
@@ -232,6 +248,14 @@ export class Dataset implements IterableIterator<DataPoint> {
         this.id = id;
     }
 
+    public addNumTargets(num: number) {
+        this.numTargets = this.numTargets + num;
+    }
+
+    public getNumTargets() {
+        return this.numTargets;
+    }
+
     public setValue(date: Moment, value: number) {
         let ind = this.parent.getIndexOfDate(date);
         // console.log(ind);
@@ -244,6 +268,12 @@ export class Dataset implements IterableIterator<DataPoint> {
             if (this.yMax === null || value > this.yMax) {
                 this.yMax = value;
             }
+            if (this.startDate === null || date < this.startDate) {
+                this.startDate = date.clone();
+            }
+            if (this.endDate === null || date > this.endDate) {
+                this.endDate = date.clone();
+            }
         }
     }
 
@@ -255,6 +285,14 @@ export class Dataset implements IterableIterator<DataPoint> {
         return this.yMax;
     }
 
+    public getStartDate() {
+        return this.startDate;
+    }
+
+    public getEndDate() {
+        return this.endDate;
+    }
+
     public shift(shiftAmount: number) {
         for (let ind = 0; ind < this.values.length; ind++) {
             if (this.values[ind] !== null) {
@@ -418,6 +456,8 @@ export class Datasets implements IterableIterator<Dataset> {
                 return dataset;
             }
         }
+
+        return null;
     }
 
     public getXDatasetIds() {
diff --git a/src/expr.ts b/src/expr.ts
index 668531a..506566a 100644
--- a/src/expr.ts
+++ b/src/expr.ts
@@ -1,27 +1,61 @@
 import { RenderInfo } from "./data";
 import * as d3 from "d3";
+import { Moment } from "moment";
 
 let fnSet = {
+    // min value of a dataset
     min: function (renderInfo: RenderInfo, datasetId: number) {
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
         return d3.min(dataset.getValues());
     },
+    // max value of a dataset
     max: function (renderInfo: RenderInfo, datasetId: number) {
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
         return d3.max(dataset.getValues());
     },
+    // start date of a dataset
+    // if datasetId not found, return overall startDate
+    startDate: function (renderInfo: RenderInfo, datasetId: number) {
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        if (dataset) {
+            let startDate = dataset.getStartDate();
+            if (startDate && startDate.isValid()) {
+                return startDate.format(renderInfo.dateFormat);
+            }
+        }
+        return renderInfo.startDate.format(renderInfo.dateFormat);
+    },
+    // end date of a dataset
+    // if datasetId not found, return overall endDate
+    endDate: function (renderInfo: RenderInfo, datasetId: number) {
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        if (dataset) {
+            let endDate = dataset.getEndDate();
+            if (endDate && endDate.isValid()) {
+                return endDate.format(renderInfo.dateFormat);
+            }
+        }
+        return renderInfo.endDate.format(renderInfo.dateFormat);
+    },
+    // sum of all values in a dataset
     sum: function (renderInfo: RenderInfo, datasetId: number) {
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
         return d3.sum(dataset.getValues());
     },
-    count: function (renderInfo: RenderInfo, datasetId: number) {
+    // count --> deprecated
+    // number of occurrences of a target in a dataset
+    numTargets: function (renderInfo: RenderInfo, datasetId: number) {
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
-        return dataset.getLengthNotNull();
+        return dataset.getNumTargets();
+    },
+    // days --> deprecated
+    numDays: function (renderInfo: RenderInfo, datasetId: number) {
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        return dataset.getLength();
     },
-    days: function (renderInfo: RenderInfo, datasetId: number) {
+    numDaysHavingData: function (renderInfo: RenderInfo, datasetId: number) {
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
-        let result = dataset.getLength();
-        return result;
+        return dataset.getLengthNotNull();
     },
     maxStreak: function (renderInfo: RenderInfo, datasetId: number) {
         let streak = 0;
@@ -33,56 +67,267 @@ let fnSet = {
             } else {
                 streak = 0;
             }
-            if (streak > maxStreak) {
+            if (streak >= maxStreak) {
                 maxStreak = streak;
             }
         }
         return maxStreak;
     },
-    maxBreaks: function (renderInfo: RenderInfo, datasetId: number) {
+    maxStreakStart: function (renderInfo: RenderInfo, datasetId: number) {
         let streak = 0;
-        let maxBreak = 0;
+        let maxStreak = 0;
+        let streakStart: Moment = null;
+        let maxStreakStart: Moment = null;
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        if (dataset) {
+            for (let dataPoint of dataset) {
+                if (dataPoint.value !== null) {
+                    if (streak === 0) {
+                        streakStart = dataPoint.date;
+                    }
+                    streak++;
+                } else {
+                    streak = 0;
+                }
+                if (streak >= maxStreak) {
+                    maxStreak = streak;
+                    maxStreakStart = streakStart;
+                }
+            }
+        }
+        return maxStreakStart?.format(renderInfo.dateFormat);
+    },
+    maxStreakEnd: function (renderInfo: RenderInfo, datasetId: number) {
+        let streak = 0;
+        let maxStreak = 0;
+        let streakEnd: Moment = null;
+        let maxStreakEnd: Moment = null;
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        if (dataset) {
+            let arrayDataset = Array.from(dataset);
+            for (let ind = 0; ind < arrayDataset.length; ind++) {
+                let point = arrayDataset[ind];
+                let nextPoint = null;
+                if (ind < arrayDataset.length - 1) {
+                    nextPoint = arrayDataset[ind + 1];
+                }
+                if (point.value !== null) {
+                    streak++;
+                    if (nextPoint?.value === null) {
+                        streakEnd = point.date;
+                    }
+                } else {
+                    streak = 0;
+                }
+                if (streak >= maxStreak) {
+                    // console.log(streak);
+                    // console.log(maxStreak);
+                    maxStreak = streak;
+                    maxStreakEnd = streakEnd;
+                }
+            }
+        }
+        return maxStreakEnd?.format(renderInfo.dateFormat);
+    },
+    maxBreaks: function (renderInfo: RenderInfo, datasetId: number) {
+        let breaks = 0;
+        let maxBreaks = 0;
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
 
         for (let dataPoint of dataset) {
             if (dataPoint.value === null) {
-                streak++;
+                breaks++;
             } else {
-                streak = 0;
+                breaks = 0;
             }
-            if (streak > maxBreak) {
-                maxBreak = streak;
+            if (breaks > maxBreaks) {
+                maxBreaks = breaks;
             }
         }
-        return maxBreak;
+        return maxBreaks;
     },
-    lastStreak: function (renderInfo: RenderInfo, datasetId: number) {
-        let streak = 0;
+    maxBreaksStart: function (renderInfo: RenderInfo, datasetId: number) {
+        let breaks = 0;
+        let maxBreaks = 0;
+        let breaksStart: Moment = null;
+        let maxBreaksStart: Moment = null;
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
-        let values = dataset.getValues();
-        for (let ind = values.length - 1; ind >= 0; ind--) {
-            let value = values[ind];
-            if (value === null) {
-                break;
-            } else {
-                streak++;
+        if (dataset) {
+            for (let dataPoint of dataset) {
+                if (dataPoint.value === null) {
+                    if (breaks === 0) {
+                        breaksStart = dataPoint.date;
+                    }
+                    breaks++;
+                } else {
+                    breaks = 0;
+                }
+                if (breaks >= maxBreaks) {
+                    maxBreaks = breaks;
+                    maxBreaksStart = breaksStart;
+                }
             }
         }
-        return streak;
+        return maxBreaksStart?.format(renderInfo.dateFormat);
     },
-    lastBreaks: function (renderInfo: RenderInfo, datasetId: number) {
-        let breakDays = 0;
+    maxBreaksEnd: function (renderInfo: RenderInfo, datasetId: number) {
+        let breaks = 0;
+        let maxBreaks = 0;
+        let breaksEnd: Moment = null;
+        let maxBreaksEnd: Moment = null;
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
-        let values = dataset.getValues();
-        for (let ind = values.length - 1; ind >= 0; ind--) {
-            let value = values[ind];
-            if (value === null) {
-                breakDays++;
-            } else {
-                break;
+        if (dataset) {
+            let arrayDataset = Array.from(dataset);
+            for (let ind = 0; ind < arrayDataset.length; ind++) {
+                let point = arrayDataset[ind];
+                let nextPoint = null;
+                if (ind < arrayDataset.length - 1) {
+                    nextPoint = arrayDataset[ind + 1];
+                }
+                if (point.value === null) {
+                    breaks++;
+                    if (nextPoint?.value !== null) {
+                        breaksEnd = point.date;
+                    }
+                } else {
+                    breaks = 0;
+                }
+                if (breaks >= maxBreaks) {
+                    maxBreaks = breaks;
+                    maxBreaksEnd = breaksEnd;
+                }
+            }
+        }
+        return maxBreaksEnd?.format(renderInfo.dateFormat);
+    },
+    // lastStreak --> deprecated
+    currentStreak: function (renderInfo: RenderInfo, datasetId: number) {
+        let currentStreak = 0;
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        if (dataset) {
+            let arrayDataset = Array.from(dataset);
+            for (let ind = arrayDataset.length - 1; ind >= 0; ind--) {
+                let point = arrayDataset[ind];
+                if (point.value === null) {
+                    break;
+                } else {
+                    currentStreak++;
+                }
+            }
+        }
+        return currentStreak;
+    },
+    currentStreakStart: function (renderInfo: RenderInfo, datasetId: number) {
+        let currentStreak = 0;
+        let currentStreakStart: Moment = null;
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        if (dataset) {
+            let arrayDataset = Array.from(dataset);
+            for (let ind = arrayDataset.length - 1; ind >= 0; ind--) {
+                let point = arrayDataset[ind];
+                if (ind < arrayDataset.length - 1) {
+                    currentStreakStart = arrayDataset[ind + 1].date;
+                }
+                if (point.value === null) {
+                    break;
+                } else {
+                    currentStreak++;
+                }
+            }
+        }
+
+        if (currentStreakStart === null) {
+            return "absense";
+        }
+        return currentStreakStart?.format(renderInfo.dateFormat);
+    },
+    currentStreakEnd: function (renderInfo: RenderInfo, datasetId: number) {
+        let currentStreak = 0;
+        let currentStreakEnd: Moment = null;
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        if (dataset) {
+            let arrayDataset = Array.from(dataset);
+            for (let ind = arrayDataset.length - 1; ind >= 0; ind--) {
+                let point = arrayDataset[ind];
+                if (point.value === null) {
+                    break;
+                } else {
+                    if (currentStreak === 0) {
+                        currentStreakEnd = point.date;
+                    }
+                    currentStreak++;
+                }
             }
         }
-        return breakDays;
+
+        if (currentStreakEnd === null) {
+            return "absense";
+        }
+        return currentStreakEnd?.format(renderInfo.dateFormat);
+    },
+    currentBreaks: function (renderInfo: RenderInfo, datasetId: number) {
+        let currentBreaks = 0;
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        if (dataset) {
+            let arrayDataset = Array.from(dataset);
+            for (let ind = arrayDataset.length - 1; ind >= 0; ind--) {
+                let point = arrayDataset[ind];
+                if (point.value === null) {
+                    currentBreaks++;
+                } else {
+                    break;
+                }
+            }
+        }
+        return currentBreaks;
+    },
+    currentBreaksStart: function (renderInfo: RenderInfo, datasetId: number) {
+        let currentBreaks = 0;
+        let currentBreaksStart: Moment = null;
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        if (dataset) {
+            let arrayDataset = Array.from(dataset);
+            for (let ind = arrayDataset.length - 1; ind >= 0; ind--) {
+                let point = arrayDataset[ind];
+                if (ind < arrayDataset.length - 1) {
+                    currentBreaksStart = arrayDataset[ind + 1].date;
+                }
+                if (point.value === null) {
+                    currentBreaks++;
+                } else {
+                    break;
+                }
+            }
+        }
+
+        if (currentBreaksStart === null) {
+            return "absense";
+        }
+        return currentBreaksStart?.format(renderInfo.dateFormat);
+    },
+    currentBreaksEnd: function (renderInfo: RenderInfo, datasetId: number) {
+        let currentBreaks = 0;
+        let currentBreaksEnd: Moment = null;
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        if (dataset) {
+            let arrayDataset = Array.from(dataset);
+            for (let ind = arrayDataset.length - 1; ind >= 0; ind--) {
+                let point = arrayDataset[ind];
+                if (point.value === null) {
+                    if (currentBreaks === 0) {
+                        currentBreaksEnd = point.date;
+                    }
+                    currentBreaks++;
+                } else {
+                    break;
+                }
+            }
+        }
+
+        if (currentBreaksEnd === null) {
+            return "absense";
+        }
+        return currentBreaksEnd?.format(renderInfo.dateFormat);
     },
     average: function (renderInfo: RenderInfo, datasetId: number) {
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
@@ -185,10 +430,14 @@ export function resolveTemplate(template: string, renderInfo: RenderInfo) {
                         let result = fn(renderInfo, 0); // calculate result
                         let strResult = "{{NA}}";
                         if (typeof result !== "undefined" && result !== null) {
-                            if (Number.isInteger(result)) {
-                                strResult = result.toFixed(0);
-                            } else {
-                                strResult = result.toFixed(2);
+                            if (typeof result === "number") {
+                                if (Number.isInteger(result)) {
+                                    strResult = result.toFixed(0);
+                                } else {
+                                    strResult = result.toFixed(2);
+                                }
+                            } else if (typeof result === "string") {
+                                strResult = result;
                             }
                         }
 
diff --git a/src/main.ts b/src/main.ts
index 5ac6bbc..0d2f7fe 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -682,6 +682,9 @@ export default class Tracker extends Plugin {
             // We still create a dataset for xDataset,
             // to keep the sequence and order of targets
             let dataset = datasets.createDataset(query, renderInfo);
+            // Add number of targets to the dataset
+            // Number of targets has been accumulated while collecting data
+            dataset.addNumTargets(query.getNumTargets());
             for (
                 let curDate = renderInfo.startDate.clone();
                 curDate <= renderInfo.endDate;
@@ -698,22 +701,23 @@ export default class Tracker extends Plugin {
                         });
                     if (queryValuePairs.length > 0) {
                         // Merge values of the same day same query
-                        let pair = queryValuePairs[0];
-                        let value = 0;
-                        let hasValue = false;
+                        let value = null;
                         for (
                             let indPair = 0;
                             indPair < queryValuePairs.length;
                             indPair++
                         ) {
                             if (queryValuePairs[indPair].value !== null) {
-                                value += queryValuePairs[indPair].value;
-                                hasValue = true;
+                                if (value === null) {
+                                    value = queryValuePairs[indPair].value;
+                                } else {
+                                    value += queryValuePairs[indPair].value;
+                                }
                             }
                         }
                         // console.log(hasValue);
                         // console.log(value);
-                        if (hasValue) {
+                        if (value) {
                             dataset.setValue(curDate, value);
                         }
                     }

From 09c9cbfcb4c95ccedf85e2fa7350b23b02ec7547 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 3 Jun 2021 11:55:32 +0800
Subject: [PATCH 041/402] Allow parsing date wrapped in wiki brackets

---
 examples/data/Tables.md |  6 +++---
 src/collecting.ts       | 22 ++++++++++++++++++----
 src/main.ts             |  6 ++++--
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/examples/data/Tables.md b/examples/data/Tables.md
index 1b568c5..826db9b 100644
--- a/examples/data/Tables.md
+++ b/examples/data/Tables.md
@@ -8,11 +8,11 @@
 | 2021-05-03 | 62.2 | 20.3 | 18.3
 | 2021-05-04 | 62.3 | 20.4 | 18.2 |
  2021-05-05 | 62.2 | 20.2 | 18.4
-| 2021-05-06 | 62.4 | 21.0 | 18.4
+| [[2021-05-06]] | 62.4 | 21.0 | 18.4
 | 2021-05-07 | 62.6 | 20.9 | 18.3 |
 | 2021-05-08 | 62.3 | 20.9 | 18.2
-| 2021-05-09 | 62.2 | 20.3 | 18.5
-| 2021-05-10 | 62.1 | 20.8 | 18.9
+| [[2021-05-09]] | 62.2 | 20.3 | 18.5
+| [[2021-05-10]] | 62.1 | 20.8 | 18.9
 
 
 ## Running Records
diff --git a/src/collecting.ts b/src/collecting.ts
index 078f09e..0350f29 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -11,6 +11,18 @@ import {
 } from "./data";
 import * as helper from "./helper";
 
+export function strToDate(strDate: string, dateFormat: string) {
+    if (
+        strDate.length > 4 &&
+        strDate.startsWith("[[") &&
+        strDate.endsWith("]]")
+    ) {
+        strDate = strDate.substring(2, strDate.length - 2);
+    }
+
+    return window.moment(strDate, dateFormat, true);
+}
+
 export function getDateFromFilename(file: TFile, renderInfo: RenderInfo) {
     let fileBaseName = file.basename;
 
@@ -52,7 +64,8 @@ export function getDateFromFrontmatter(
     if (frontMatter) {
         if (helper.deepValue(frontMatter, query.getTarget())) {
             let strDate = helper.deepValue(frontMatter, query.getTarget());
-            date = window.moment(strDate, renderInfo.dateFormat, true);
+
+            date = strToDate(strDate, renderInfo.dateFormat);
             // console.log(date);
         }
     }
@@ -91,7 +104,7 @@ export function getDateFromTag(
             typeof match.groups.values !== "undefined"
         ) {
             let strDate = match.groups.values;
-            date = window.moment(strDate, renderInfo.dateFormat, true);
+            date = strToDate(strDate, renderInfo.dateFormat);
             if (date.isValid()) {
                 break;
             }
@@ -126,7 +139,8 @@ export function getDateFromText(
         ) {
             let strDate = match.groups.value.trim();
             // console.log(strDate);
-            date = window.moment(strDate, renderInfo.dateFormat, true);
+
+            date = strToDate(strDate, renderInfo.dateFormat);
             if (date.isValid()) {
                 break;
             }
@@ -167,7 +181,7 @@ export function getDateFromDvField(
             typeof match.groups.values !== "undefined"
         ) {
             let strDate = match.groups.values.trim();
-            date = window.moment(strDate, renderInfo.dateFormat, true);
+            date = strToDate(strDate, renderInfo.dateFormat);
             if (date.isValid()) {
                 break;
             }
diff --git a/src/main.ts b/src/main.ts
index 0d2f7fe..cfae891 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -518,8 +518,10 @@ export default class Tracker extends Plugin {
                 let dataRowSplitted = dataRow.split("|");
                 if (columnXDataset < dataRowSplitted.length) {
                     let data = dataRowSplitted[columnXDataset].trim();
-
-                    let date = window.moment(data, renderInfo.dateFormat, true);
+                    let date = collecting.strToDate(
+                        data,
+                        renderInfo.dateFormat
+                    );
 
                     if (date.isValid()) {
                         xValues.push(date);

From d98178d6e3af0e6c2d405baffccafd48961fefbd Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 3 Jun 2021 17:10:07 +0800
Subject: [PATCH 042/402] Allow using a dash to replace a space for dvField
 searchTarget

---
 src/collecting.ts | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/collecting.ts b/src/collecting.ts
index 0350f29..c6b1f79 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -165,12 +165,16 @@ export function getDateFromDvField(
     if (query.getParentTarget()) {
         dvTarget = query.getParentTarget(); // use parent tag name for multiple values
     }
+    // Dataview ask user to add dashes for spaces as search target
+    // So a dash may stands for a real dash or a space
+    dvTarget = dvTarget.replace("-", "[\\s\\-]");
+
     // Test this in Regex101
     // (^|\s)\*{0,2}dvTarget\*{0,2}(::\s*(?<values>[\d\.\/\-\w,@;\s]*))(\s|$)
     let strHashtagRegex =
         "(^|\\s)\\*{0,2}" +
         dvTarget +
-        "\\*{0,2}(::\\s*(?<values>[\\d\\.\\/\\-\\w,@;\\s]*))(\\s|$)";
+        "\\*{0,2}(::\\s*(?<values>[\\d\\.\\/\\-\\w,@;\\s]*))(\r?\n|\r)";
     // console.log(strHashtagRegex);
     let hashTagRegex = new RegExp(strHashtagRegex, "gm");
     let match;
@@ -576,12 +580,16 @@ export function collectDataFromDvField(
     if (query.getParentTarget()) {
         dvTarget = query.getParentTarget(); // use parent tag name for multiple values
     }
+    // Dataview ask user to add dashes for spaces as search target
+    // So a dash may stands for a real dash or a space
+    dvTarget = dvTarget.replace("-", "[\\s\\-]");
+
     // Test this in Regex101
     // (^|\s)\*{0,2}dvTarget\*{0,2}(::\s*(?<values>[\d\.\/\-\w,@;\s]*))(\s|$)
     let strHashtagRegex =
         "(^|\\s)\\*{0,2}" +
         dvTarget +
-        "\\*{0,2}(::\\s*(?<values>[\\d\\.\\/\\-\\w,@;\\s]*))(\\s|$)";
+        "\\*{0,2}(::\\s*(?<values>[\\d\\.\\/\\-\\w,@;\\s]*))(\r?\n|\r)";
     // console.log(strHashtagRegex);
     let hashTagRegex = new RegExp(strHashtagRegex, "gm");
     let match;
@@ -603,7 +611,7 @@ export function collectDataFromDvField(
                 // console.log("single-value");
                 let toParse = splitted[0];
                 let retParse = helper.parseFloatFromAny(toParse);
-                if (retParse.value) {
+                if (retParse.value !== null) {
                     if (retParse.type === ValueType.Time) {
                         tagMeasure = retParse.value;
                         tagExist = true;
@@ -628,7 +636,7 @@ export function collectDataFromDvField(
                 // console.log("multiple-values");
                 let toParse = splitted[query.getAccessor()].trim();
                 let retParse = helper.parseFloatFromAny(toParse);
-                if (retParse.value) {
+                if (retParse.value !== null) {
                     if (retParse.type === ValueType.Time) {
                         tagMeasure = retParse.value;
                         tagExist = true;

From 57b545303e85489d727dbcb7e9d46bf1f8dbf75d Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 3 Jun 2021 17:12:21 +0800
Subject: [PATCH 043/402] Fix missing zero values

---
 src/main.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.ts b/src/main.ts
index cfae891..12604e1 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -719,7 +719,7 @@ export default class Tracker extends Plugin {
                         }
                         // console.log(hasValue);
                         // console.log(value);
-                        if (value) {
+                        if (value !== null) {
                             dataset.setValue(curDate, value);
                         }
                     }

From 4504c984479cfdcd742e620ee245741325dc8d19 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 3 Jun 2021 20:28:11 +0800
Subject: [PATCH 044/402] Remove TestCalendar.md temporarily

---
 examples/TestCalendar.md | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 examples/TestCalendar.md

diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
deleted file mode 100644
index dac62be..0000000
--- a/examples/TestCalendar.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Test Calendar
-
-``` tracker
-searchType: tag
-searchTarget: meditation
-folder: diary
-month:
-    startWeekOn: 
-```
-
-Please also check those search targets in markdown files under folder 'diary'.
\ No newline at end of file

From 05652fa0532a847f5263e30ce599d07a98f005dd Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 3 Jun 2021 21:15:54 +0800
Subject: [PATCH 045/402] Add warning for deprecated template variables

---
 src/expr.ts | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/expr.ts b/src/expr.ts
index 506566a..61d0c11 100644
--- a/src/expr.ts
+++ b/src/expr.ts
@@ -42,13 +42,17 @@ let fnSet = {
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
         return d3.sum(dataset.getValues());
     },
-    // count --> deprecated
+    count: function (renderInfo: RenderInfo, datasetId: number) {
+        return "Deprecated template variable: count";
+    },
     // number of occurrences of a target in a dataset
     numTargets: function (renderInfo: RenderInfo, datasetId: number) {
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
         return dataset.getNumTargets();
     },
-    // days --> deprecated
+    days: function (renderInfo: RenderInfo, datasetId: number) {
+        return "Deprecated template variable: days";
+    },
     numDays: function (renderInfo: RenderInfo, datasetId: number) {
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
         return dataset.getLength();
@@ -200,7 +204,9 @@ let fnSet = {
         }
         return maxBreaksEnd?.format(renderInfo.dateFormat);
     },
-    // lastStreak --> deprecated
+    lastStreak: function(renderInfo: RenderInfo, datasetId: number) {
+        return "Deprecated template variable: lastStreak";
+    },
     currentStreak: function (renderInfo: RenderInfo, datasetId: number) {
         let currentStreak = 0;
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
@@ -349,6 +355,7 @@ let fnSet = {
 };
 
 export function resolveTemplate(template: string, renderInfo: RenderInfo) {
+    //console.log("resolveTemplate");
     let replaceMap: { [key: string]: string } = {};
     // Loop over fnSet, prepare replaceMap
     Object.entries(fnSet).forEach(([fnName, fn]) => {

From 45597eb3665eae3bc6a9c5c6c76f3642d69c9b47 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 3 Jun 2021 21:23:22 +0800
Subject: [PATCH 046/402] Remove graph not completed before renderErrorMessage

---
 src/rendering.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/rendering.ts b/src/rendering.ts
index 22d2b4b..446332c 100644
--- a/src/rendering.ts
+++ b/src/rendering.ts
@@ -1529,6 +1529,9 @@ function renderBarChart(canvas: HTMLElement, renderInfo: RenderInfo) {
 }
 
 export function renderErrorMessage(canvas: HTMLElement, errorMessage: string) {
+    // Remove graph not completed
+    let graph = d3.select(canvas).select("#svg").remove();
+
     let svg = d3
         .select(canvas)
         .append("div")

From 9c2f232341eab6aa18ab8e36c6f3b2494f34d3a6 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 3 Jun 2021 21:40:59 +0800
Subject: [PATCH 047/402] Fix rendering error messages for the bullet value

---
 examples/TestBullet.md |  4 ++--
 src/bullet.ts          |  8 ++++----
 src/expr.ts            | 10 ++++++----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/examples/TestBullet.md b/examples/TestBullet.md
index d4eca5d..733e1f6 100644
--- a/examples/TestBullet.md
+++ b/examples/TestBullet.md
@@ -12,7 +12,7 @@ bullet:
     orientation: horizontal
 	range: 10, 20, 40
 	rangeColor: darkgray, silver, lightgray
-	value: "{{lastBreaks}}"
+	value: "{{currentBreaks}}"
 	valueUnit: times
 	valueColor: '#69b3a2'
 	showMarker: true
@@ -33,7 +33,7 @@ bullet:
 	range: 30, 60, 100
 	rangeColor: darkgray, silver, lightgray
 	value: "{{sum}}"
-	valueUnit: %
+	valueUnit: times
 	valueColor: steelblue
 	showMarker: true
 	markerValue: 80
diff --git a/src/bullet.ts b/src/bullet.ts
index 864df72..b370e6d 100644
--- a/src/bullet.ts
+++ b/src/bullet.ts
@@ -446,11 +446,11 @@ function renderBar(
     let bulletInfo = renderInfo.bullet;
     if (!bulletInfo) return;
 
-    let strActualValue = bulletInfo.value;
-    strActualValue = expr.resolveTemplate(strActualValue, renderInfo);
-    let actualValue = parseFloat(strActualValue);
+    let retActualValue = bulletInfo.value;
+    retActualValue = expr.resolveTemplate(retActualValue, renderInfo);
+    let actualValue = parseFloat(retActualValue);
     if (Number.isNaN(actualValue)) {
-        errorMessage = "Invalid paramter 'actualValue'";
+        errorMessage = "Invalid input value: " + retActualValue;
         return errorMessage;
     }
     let valueColor = bulletInfo.valueColor;
diff --git a/src/expr.ts b/src/expr.ts
index 61d0c11..43969f6 100644
--- a/src/expr.ts
+++ b/src/expr.ts
@@ -43,7 +43,7 @@ let fnSet = {
         return d3.sum(dataset.getValues());
     },
     count: function (renderInfo: RenderInfo, datasetId: number) {
-        return "Deprecated template variable: count";
+        return "deprecated template variable 'count'";
     },
     // number of occurrences of a target in a dataset
     numTargets: function (renderInfo: RenderInfo, datasetId: number) {
@@ -51,7 +51,7 @@ let fnSet = {
         return dataset.getNumTargets();
     },
     days: function (renderInfo: RenderInfo, datasetId: number) {
-        return "Deprecated template variable: days";
+        return "deprecated template variable 'days'";
     },
     numDays: function (renderInfo: RenderInfo, datasetId: number) {
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
@@ -204,8 +204,8 @@ let fnSet = {
         }
         return maxBreaksEnd?.format(renderInfo.dateFormat);
     },
-    lastStreak: function(renderInfo: RenderInfo, datasetId: number) {
-        return "Deprecated template variable: lastStreak";
+    lastStreak: function (renderInfo: RenderInfo, datasetId: number) {
+        return "deprecated template variable 'lastStreak'";
     },
     currentStreak: function (renderInfo: RenderInfo, datasetId: number) {
         let currentStreak = 0;
@@ -465,6 +465,8 @@ export function resolveTemplate(template: string, renderInfo: RenderInfo) {
                         } else {
                             strResult = result.toFixed(2);
                         }
+                    } else if (typeof result === "string") {
+                        strResult = result;
                     }
 
                     replaceMap[strReplaceRegex] = strResult;

From ae81893fa323ef4a66228ff3a26cbeac33d2d945 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 5 Jun 2021 16:19:52 +0800
Subject: [PATCH 048/402] Strip # character if searchTarget for 'tag'
 startsWidth it

---
 src/collecting.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/collecting.ts b/src/collecting.ts
index c6b1f79..956fc0d 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -408,6 +408,9 @@ export function collectDataFromInlineTag(
     if (query.getParentTarget()) {
         tagName = query.getParentTarget(); // use parent tag name for multiple values
     }
+    if (tagName.length > 1 && tagName.startsWith("#")) {
+        tagName = tagName.substring(1);
+    }
     let strHashtagRegex =
         "(^|\\s)#" +
         tagName +

From 2c7eeb0d03e9f62bcc3460250f241796218405b1 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 5 Jun 2021 16:20:34 +0800
Subject: [PATCH 049/402] Update examples

---
 examples/HabitTracker.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/HabitTracker.md b/examples/HabitTracker.md
index 7566007..b517eed 100644
--- a/examples/HabitTracker.md
+++ b/examples/HabitTracker.md
@@ -41,7 +41,7 @@ searchType: tag
 searchTarget: meditation
 folder: diary
 summary:
-    template: "Longest Streak: {{maxStreak}} day(s)\nLongest Breaks: {{maxBreaks}} day(s)\nLast streak: {{lastStreak}} day(s)"
+    template: "Longest Streak: {{maxStreak}} day(s)\nLongest Breaks: {{maxBreaks}} day(s)\nLast streak: {{currentStreak}} day(s)"
 ```
 
 ### CleanUp
@@ -51,7 +51,7 @@ searchTarget: clean-up
 folder: diary
 endDate: 2021-01-31
 summary:
-    template: "Last Break: {{lastBreaks}} day(s)"
+    template: "Last Break: {{currentBreaks}} day(s)"
 ```
 
 ### Work log

From 5067a049366fce046f3702e178802dee69a3f732 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 5 Jun 2021 16:21:05 +0800
Subject: [PATCH 050/402] Update documents

---
 README.md                 | 189 ++------------------------------------
 docs/Commands.md          |   5 +-
 docs/Concepts.md          |  20 ++++
 docs/Examples.md          |  36 ++++++++
 docs/InputParameters.md   | 164 +++++++++++++++++++--------------
 docs/Installation.md      |  11 +++
 docs/Questions.md         |  47 ++++++++++
 docs/ReleaseNotes.md      |  77 ++++++++++++++++
 docs/RoadMap.md           |  37 ++++++++
 docs/Settings.md          |  10 ++
 docs/TargetEvaluation.md  | 120 +++++++++++++++---------
 docs/TemplateVariables.md |  64 +++++++------
 docs/YAML.md              |  65 +++++++++++++
 13 files changed, 526 insertions(+), 319 deletions(-)
 create mode 100644 docs/Concepts.md
 create mode 100644 docs/Examples.md
 create mode 100644 docs/Installation.md
 create mode 100644 docs/Questions.md
 create mode 100644 docs/ReleaseNotes.md
 create mode 100644 docs/RoadMap.md
 create mode 100644 docs/Settings.md
 create mode 100644 docs/YAML.md

diff --git a/README.md b/README.md
index c9c3b86..e373ea0 100644
--- a/README.md
+++ b/README.md
@@ -3,43 +3,9 @@
 
 <img src="https://raw.githubusercontent.com/pyrochlore/obsidian-tracker/master/docs/images/screenshot_v1.3.png" width="800">
 
-This is an [Obsidian](https://obsidian.md/) plugin that helps you do tracking in daily notes and represent the data comprehensively. Here are examples showing what you can track:
+This is an [Obsidian](https://obsidian.md/) plugin that helps you do tracking in notes [over dates](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Questions.md) and represent the collected data comprehensively. 
 
-| From↓ | Track Targets↓  | by Tracker↓ | Get (O)ccurrence/(V)alue |
-|:--------|:-------|:---------|:--:|
-| content | #meditation | searchType: tag<br>searchTarget: meditation | O |
-| frontmatter | ---<br>tags: meditation<br>--- | searchType: tag<br>searchTarget: meditation | O |
-| content | #weight:60.5kg | searchType: tag<br>searchTarget: weight | V |
-| content | #finance/bank1/transfer:100USD | searchType: tag<br>searchTarget: finance/bank1/transfer | V |
-| content | #finance/bank1/transfer:100USD<br>#finance/bank1/income:80USD<br>#finance/bank1/outcome:-120USD | searchType: tag<br>searchTarget: finance/bank1 | V |
-| content | #blood-pressure:180/120 | searchType: tag<br>searchTarget: blood-pressure[0], blood-pressure[1] | V |
-| content | dvTarget:: 20.5 | searchType: dvField<br>searchTarget: dvTarget | V |
-| content | dvTarget:: 20.5/30.5 | searchType: dvField<br>searchTarget: dvTarget[0], dvTarget[1] | V |
-| content | dvTarget:: 20.5, 30.5 | searchType: dvField<br>searchTarget: dvTarget[0], dvTarget[1]<br>separator: 'comma' | V |
-| frontmatter | ---<br>mood: 10<br>--- | searchType: frontmatter<br>searchTarget: mood | V |
-| frontmatter | ---<br>bp: 184.4/118.8<br>--- | searchType: frontmatter<br>searchTarget: bp[0], bp[1] | V |
-| frontmatter | ---<br>bp: 184.4, 118.8<br>--- | searchType: frontmatter<br>searchTarget: bp[0], bp[1]<br>separator: 'comma' | V |
-| frontmatter | ---<br>bp: [184.4, 118.8]<br>--- | searchType: frontmatter<br>searchTarget: bp[0], bp[1] | V |
-| content | [[journal]] | searchType: wiki<br>searchTarget: journal | O |
-| content | ⭐ | searchType: text<br>searchTarget: ⭐ | O |
-| content | love | searchType: text<br>searchTarget: love | O |
-| content | test@gmail.com<br>test@hotmail.com | searchType: text<br>serchTarget: '.+\\@.+\\..+' | O |
-| content | #weightlifting: 50 | searchType: text<br>searchTarget: 'weightlifting: (?\<value\>[\\-]?[0-9]+[\\.][0-9]+\|[\\-]?[0-9]+)' | V |
-| content | I walked 10000 steps today. | searchType: text<br>searchTarget: 'walked\\s+(?\<value\>[0-9]+)\\s+steps' | V |
-| content | myvalues 1/2/3 | searchType: text<br>searchTarget: 'myvalues\\s+(?\<value\>[0-9]+)/([0-9]+)/([0-9]+), myvalues\\s+([0-9]+)/(?\<value\>[0-9]+)/([0-9]+), myvalues\\s+([0-9]+)/([0-9]+)/(?\<value\>[0-9]+)' | V |
-| content | { a table filled with dates and values }<br>[example table](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/data/Tables.md) | searchType: table<br>searchTarget: filePath[0][0], filePath[0][1] | V |
-| content | { a table filled with dates and values }<br>[example table](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/data/Tables.md) | searchType: table<br>searchTarget: filePath[1][0], filePath[1][1][0], filePath[1][1][1] | V |
-
-## Installation
-### Install from Obsidian Settings Panel
-1. From Settings Panel (the icon at the bottom left corner) -> Options -> Community plugins, set 'safe mode' to off.
-2. In the 'Community plugins' section, click 'Browse' and find the obsidian-tracker plugin by the name 'Tracker'.
-3. Press the button 'Install' and wait for the completion of the install.
-4. In the section 'Installed plugins', find and enable the plugin just installed.
-5. Enjoy tracking.
-
-### Manual Installation
-Download the latest [release](https://github.com/pyrochlore/obsidian-tracker/releases). Extract and put the three files (main.js, manifest.json, styles.css) to folder '{{obsidian_vault}}/.obsidian/plugins/obsidian-tracker'.
+[Here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Examples.md) is a simplified table of examples showing what you can track.
 
 ## Usage
 1. Have some targets you want to track in daily notes. Take a look at [Target Evaluation](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TargetEvaluation.md) for what you can track and how targets are evaluated as numbers.
@@ -51,150 +17,13 @@ Download the latest [release](https://github.com/pyrochlore/obsidian-tracker/rel
 
 For more use cases, please open the [examples](https://github.com/pyrochlore/obsidian-tracker/tree/master/examples) folder in obsidian with this plugin installed and enabled.
 
-## Concepts
-This plugin was designed to read code blocks in [YAML format](https://en.wikipedia.org/wiki/YAML). The key-value pairs in the code blocks tell the plugin what data to collect and how to represent the result.
-
-[Here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md) are all the parameters (key-value pairs) defined in this plugin. They are used for collecting data, evaluating targets, data preprocessing, and rendering output.
-
-### Collecting Data
-Providing parameters '**searchType**' and '**searchTarget**' is the minimum requirement for a successful data collection. The value of the key '**searchType**' can be '**tag**', '**frontmatter**', '**wiki**', '**dvField**', '**table**', or '**text**' and the cooresponding '**searchTarget**' should be provided according to the specified type.
-
-#### Multiple Targets
-From version 1.3, you can provide multiple search targets by entering an array of targets separated by a comma. Each of the targets will be identified then the corresponding value will be evaluated and form a dataset indexed by the order in the array (zero-based indexing).
-
-```
-searchTarget: target0, target1, target2, ...... 
-searchType: type0, type1, type2, .....
-line:
-    lineColor: red, blue, yello
-```
-Above is an example of multiple target searching. Multiple targets are provided and separated by a comma. If they have a different searchType, provide the same number of types in the same order. In this case, the second search target 'target1' with index 1 has type 'type1'. Other parameters that accept multiple values (e.g. lineColor) can also be provided and will be applied to the corresponding dataset.
-
-#### Multiple Values
-Multiple values under a target (value tuple) separated by a slash, e.g. #bloodpressure:180/120mmHg, are also got supported in version 1.3.0. To identify a specific value as a target, use an accessor with bracket notation where the value in the bracket is the index by the order of values. In this case, they are bloodpressure[0] and bloodpressure[1]. You can find the example of this [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/BloodPressureTracker.md). You can also use a custom separator by using the parameter '**separator**'.
-
-### Target Evaluation
-Depends on the '**searchType**' and the '**searchTarget**' you provided, the evaluation of a target would be different. Simply speaking, you can track the occurrences of a target or the value attached/embedded in it.
-
-To see the detail about the target evaluation, please check the document [Target Evaluation](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TargetEvaluation.md).
-
-### Rendering Output
-Currently, obsidian-tracker provides three kinds of rendering output, the default one 'line' for a line chart, 'bar' for a bar chart, and 'summary' for a text block. 
-
-For 'line' or 'bar' output, the plugin will generate a customizable chart. For 'summary' output, a text block based on your '**template**' parameter will be generated. You can also use [pre-defined template variables](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TemplateVariables.md) in the template.
-
-Description for the chart and summary related paremeters can be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md#parameters-for-common-chart) and [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md#parameters-for-summary) respectively.
-
-### Plugin Settings
-You can set the default folder location and date format in the plugin's settings panel. You can also override them by key '**folder**' and '**dateFormat**' in the code block respectively.
-
-| Setting Item | Description | Default | 
-|:--------|:-------|:---------|
-| Default folder location | The folder your daily notes reside | Root of the vault |
-| Default date format | The date format of your daily note title | 'YYYY-MM-DD' | 
-
-For more information about the dateFormat settings, check the [TestDateFormats example](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md) and [moment.js string format](https://momentjs.com/docs/#/parsing/string-format/). 
-
-## Release Notes
-### v1.5.1
-- Fixed labels not shown in light theme
-- Enhanced error handling for searchType 'table'
-
-### v1.5.0
-- New searchType 'table', searching records from a given table
-- New searchType 'dvField', searching the inline fields used with Dataview plugin
-- Enhance multiple values extraction
-    - Allow using multiple values in searchType 'text'
-    - Allow using array values in searchType 'frontmatter'
-    - Allow using multiple values in searchType 'dvField'
-    - Allow using multiple values in searchType 'table'
-    - Allow using custom separator for multiple values extraction
-- Improved performance
-- Reduced package size
-
-### v1.4.1
-- Enhanced error handling
-
-### v1.4.0
-- Add a new parameter (fixedScale) for the scaling of the output chart
-- Add a new parameter (fitPanelWidth) to enable/disable the auto-scaling of the output chart
-- Add a new parameter (margin) to help to position the chart
-- Tested in Obsidian mobile app on iPhone and iPad
-- Fixed bugs
-
-### v1.3.0
-- Support reading and rendering multiple targets
-- Support reading and rendering multiple values (a tuple of values) under a target
-- New output type 'bar', rendering bar chart
-- Add a legend for the chart output
-- Fixed bugs
-
-### v1.2.1
-- Fixed files with the specified dateFormat are not recognized
-- Restored the plugin's settings panel for dateFormat and folder
-
-### v1.2.0
-- Enable using regular expression in text searching
-- New search type 'frontmatter', searching for key-value pairs in the front matter
-- New search type 'wiki', searching for wiki links
-- Reduced package size
-
-### v1.1.0
-- New output type 'summary'
-- Add commands help create Tracker code blocks
-- Relaxed the regex for searching tags, allowing tags embedded in sentences
-- Fixed issues
-
-### v1.0.2
-- Fixed the searching of nested tag in frontmatter
-- Reduced the package size by using the module from Obsidian
-
-### v1.0.1
-- Remove dependencies to Node.js modules
-- Add example markdown files
-
-### v1.0.0
-First version released at 2021-03-23
-
-- Track simple tags, value-attached tags, and texts using code blocks
-- Represent the tracked data in a customizable line chart
-- Allow tracking in-line tags and tags in frontmatter
-- Allow tracking nested tags
-
-## Road Map
-- Data Collecting
-    - [x] Support tracking key-value pairs in frontmatter
-    - [x] Support searching text using regular expression
-    - [x] Support multiple targets and multiple values.
-    - [x] Add a parameter xDataset to identify targets to be used as x values
-    - [ ] Allow tracking date and time values
-    - [x] Get data from a table
-    - [x] Collect data from dataview plugin's inline fields
-    - [ ] Allow manual data input, includes template varialbes embeded in
-    - [ ] New search type 'codeblock'
-- Output Type and Graph
-    - [x] New output type 'summary', analyzes the input data and represents it using a user-defined text template.
-    - [x] New output type 'bar', renders bar chart.
-    - [x] New output type 'table', lists the search result in a formatted table.
-    - [ ] New output type 'heatmap', works like Github calendar heatmap.
-    - [x] Add parameters for adjusting the size of the graph.
-    - [ ] Multiple outputs from one code block
-    - [ ] Support graphs showing the correlation between sets of data.
-    - [ ] Add a 'targetDataSet' key to graph, allow the graph drawing selected dataset.
-    - [ ] Evaluate template parameters by predefined function and arithmetics.
-- Helper
-    - [x] Add Commands help create Tracker blocks.
-    - [ ] Add an 'Explode' button to the rendered blocks, it will replace the code block with the rendered result.
-    - [ ] Add a helper panel for adding frequently used tracking targets to article.
-- Data Processing
-    - [ ] Allow arithmetics operation on dataset and generate new datasets
-    - [ ] Add data post-process function, e.g. 'moving average'
-- Performance
-    - [ ] Use PixiJS to do rendering
-
-And more ...
-
-P.S. Features may not be implemented in the order above.
+## More Detail You May Want to Know
+- [Installation](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Installation.md): Install the plugin from Obsidian or install it manually.
+- [Concepts](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Concepts.md): Explain how this plugin works and what to setup
+- [Plugin Settings](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Settings.md)
+- [Release Notes](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/ReleaseNotes.md)
+- [Road Map](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/RoadMap.md)
+- [Frequently Asked Questions](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Questions.md)
 
 ## Support
 - If you like this plugin or want to support further development, you can [Buy Me a Coffee](https://www.buymeacoffee.com/pyrochlore).
diff --git a/docs/Commands.md b/docs/Commands.md
index 9efc36a..0fbb182 100644
--- a/docs/Commands.md
+++ b/docs/Commands.md
@@ -1,6 +1,5 @@
 # Commands 
-To smooth the process of making trackers, obsidian-tracker provides three commands, "Add Line Chart Tracker", "Add Bar Chart Tracker", and "Add Summary Tracker; Just type Ctrl/Cmd+P to activate the command palette, then type "Tracker" to search the commands.
 
-After a command is executed, a code block will be added to the next line below your cursor. The added code block will contain the most frequently used keys. To see the complete list of input parameters and description, please check [this document](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md).
+To smooth the process of making trackers, obsidian-tracker provides three commands, "Add Line Chart Tracker", "Add Bar Chart Tracker", and "Add Summary Tracker; Just type Ctrl/Cmd+P to activate the command palette, then type "Tracker" to search these commands.
 
-Now you can fill the key-value pairs to fit your requirement and then press the preview button to see the wonderful tracking result from your data.
\ No newline at end of file
+After a command is executed, a code block will be added to the next line below your cursor position for you. The added code block will contain the most frequently used keys. To see the complete list of input parameters and description, please check [this document](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md).
\ No newline at end of file
diff --git a/docs/Concepts.md b/docs/Concepts.md
new file mode 100644
index 0000000..aad2975
--- /dev/null
+++ b/docs/Concepts.md
@@ -0,0 +1,20 @@
+# Concepts
+
+This plugin was designed to read code blocks in [YAML format](https://en.wikipedia.org/wiki/YAML). The key-value pairs in the code blocks tell the plugin what data to collect and how to represent the result.
+
+[Here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md) are all the parameters (key-value pairs) defined in this plugin. They are used for collecting data, evaluating targets, data preprocessing, and rendering output.
+
+### Collecting Data
+Providing parameters `searchType` and `searchTarget` is the minimum requirement for a successful data collection. `searchType` can be `tag`, `frontmatter`, `wiki`, `dvField`, `table`, `fileMeta`,or `text`. Then the cooresponding `searchTarget` should be provided according to the specified type.
+
+### Target Evaluation
+Depends on the `searchType` and the `searchTarget` you provided, the evaluation of a target would be different. Simply speaking, you can track the occurrences of a target or the value attached/embedded in it.
+
+To see the detail about the target evaluation, please check the document [Target Evaluation](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TargetEvaluation.md).
+
+### Rendering Output
+Currently, obsidian-tracker provides three kinds of rendering output, the default one 'line' for a line chart, 'bar' for a bar chart, and 'summary' for a text block. 
+
+For 'line' or 'bar' output, the plugin will generate a customizable chart. For 'summary' output, a text block based on your '**template**' parameter will be generated. You can also use [pre-defined template variables](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TemplateVariables.md) in the template.
+
+Description for the chart and summary related paremeters can be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md#parameters-for-common-chart) and [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md#parameters-for-summary) respectively.
\ No newline at end of file
diff --git a/docs/Examples.md b/docs/Examples.md
new file mode 100644
index 0000000..8f9be44
--- /dev/null
+++ b/docs/Examples.md
@@ -0,0 +1,36 @@
+# Examples
+
+The following table lists use cases with information of target location (Location), target to track (Target to Track), simplified tracker block (Tracker), and what kind of data you will get ((((O)ccurence/(V)alue). Various kinds of full examples can also be found in the following section after the table.
+
+## Table of Use Cases
+
+| Location | Target to Track  | Tracker | Get (O)ccurrence/(V)alue |
+|:--------|:-------|:---------|:--:|
+| content | #meditation | searchType: tag<br>searchTarget: meditation | O |
+| frontmatter | ---<br>tags: meditation<br>--- | searchType: tag<br>searchTarget: meditation | O |
+| content | #weight:60.5kg | searchType: tag<br>searchTarget: weight | V |
+| content | #finance/bank1/transfer:100USD | searchType: tag<br>searchTarget: finance/bank1/transfer | V |
+| content | #finance/bank1/transfer:100USD<br>#finance/bank1/income:80USD<br>#finance/bank1/outcome:-120USD | searchType: tag<br>searchTarget: finance/bank1 | V |
+| content | #blood-pressure:180/120 | searchType: tag<br>searchTarget: blood-pressure[0], blood-pressure[1] | V |
+| content | dvTarget:: 20.5 | searchType: dvField<br>searchTarget: dvTarget | V |
+| content | dvTarget:: 20.5/30.5 | searchType: dvField<br>searchTarget: dvTarget[0], dvTarget[1] | V |
+| content | dvTarget:: 20.5, 30.5 | searchType: dvField<br>searchTarget: dvTarget[0], dvTarget[1]<br>separator: 'comma' | V |
+| frontmatter | ---<br>mood: 10<br>--- | searchType: frontmatter<br>searchTarget: mood | V |
+| frontmatter | ---<br>bp: 184.4/118.8<br>--- | searchType: frontmatter<br>searchTarget: bp[0], bp[1] | V |
+| frontmatter | ---<br>bp: 184.4, 118.8<br>--- | searchType: frontmatter<br>searchTarget: bp[0], bp[1]<br>separator: 'comma' | V |
+| frontmatter | ---<br>bp: [184.4, 118.8]<br>--- | searchType: frontmatter<br>searchTarget: bp[0], bp[1] | V |
+| frontmatter | ---<br>clock-in: 10:45<br>clock-out: 20:51<br>--- | searchType: frontmatter<br>searchTarget: clock-in, clock-out | V |
+| content | [[journal]] | searchType: wiki<br>searchTarget: journal | O |
+| content | ⭐ | searchType: text<br>searchTarget: ⭐ | O | 
+| content | love | searchType: text<br>searchTarget: love | O |
+| content | test@gmail.com<br>test@hotmail.com | searchType: text<br>serchTarget: '.+\\@.+\\..+' | O |
+| content | #weightlifting: 50 | searchType: text<br>searchTarget: 'weightlifting: (?\<value\>[\\-]?[0-9]+[\\.][0-9]+\|[\\-]?[0-9]+)' | V |
+| content | I walked 10000 steps today. | searchType: text<br>searchTarget: 'walked\\s+(?\<value\>[0-9]+)\\s+steps' | V |
+| content | myvalues 1/2/3 | searchType: text<br>searchTarget: 'myvalues\\s+(?\<value\>[0-9]+)/([0-9]+)/([0-9]+), myvalues\\s+([0-9]+)/(?\<value\>[0-9]+)/([0-9]+), myvalues\\s+([0-9]+)/([0-9]+)/(?\<value\>[0-9]+)' | V |
+| table content | { a table filled with dates and values }<br>[example table](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/data/Tables.md) | searchType: table<br>searchTarget: filePath[0][0], filePath[0][1] | V |
+| talbe content | { a table filled with dates and values }<br>[example table](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/data/Tables.md) | searchType: table<br>searchTarget: filePath[1][0], filePath[1][1][0], filePath[1][1][1] | V |
+| file meta | meta data from files (size, cDate, mDate) | searchType: fileMeta<br>searchTarget: size | V |
+
+## Full examples
+
+Full tracker code blocks can be found [here](https://github.com/pyrochlore/obsidian-tracker/tree/master/examples) and the corresponding notes can be found under folder 'diary' and 'data'.
\ No newline at end of file
diff --git a/docs/InputParameters.md b/docs/InputParameters.md
index 6f55faa..e8c33bd 100644
--- a/docs/InputParameters.md
+++ b/docs/InputParameters.md
@@ -1,88 +1,116 @@
 # Input Parameters
-Obsidian-tracker parses key-value pairs in YAML format as input parameters. The following sections show a complete list of all the input parameters. 
+Obsidian-tracker parses key-value pairs in your code block in YAML format and uses them as input parameters. The minimum requirements for parameters are `searchType`, `searchTarget` and one output parameter (`line`, `bar`, `frontmatter`, `fileMeta`, `wiki`, `table`, or `text`).
 
-Notice that some of the parameters can accept one value for each target, thus the maximum number of values of the parameters equals the number of targets (NT). If the number of values is less than the number of targets, the plugin will use the previously provided value or use the default value if nothing is provided.
+## Array Input
 
-Also, some y-axis related parameters like yMin, yMax, and yAxisLabel accept one value for each y-axis (left and right). If you only use one axis, or the settings for the two axes are the same, only one value is required. If you need the two axes to have different settings, assign two values to them. The first one will be used for the left axis and the second one for the right axis.
+Some of the parameters can accept more than one value for each target, thus the maximum number of values of the parameter equals the number of targets (NT). If the number of values is less than the number of targets, the plugin will use the previously provided value or use the default value if nothing is provided.
 
-## Root Parameters
-These key-value pairs are placed under the YAML root.
+Also, some y-axis related parameters for chart (`line` or `bar`), like `yMin`, `yMax`, and `yAxisLabel` accept one value for each y-axis (`left` and `right`). If you only use one axis, or the values for the two axes are the same, only one value is required. If you need the two axes to have different values, assign two values to them. The first one will be used for the left axis and the second one for the right axis.
+
+To enter array of values, Use YAML array (e.g. ['value1', 'value2', 'value3']) or simply values separated by comma (e.g. value1, value2, value3). The second method is a syntax surgar of Tracker to simplify the inputs. If YAML special characters are included, be sure to wrap the whole values by single quotes (e.g. 'value1, value2, value3'). Please also check [this](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TargetEvaluation.md) for more information about YAML in Tracker.
+
+## List of Parameters
+
+### Root Parameters
+
+These key-value pairs are placed under the code block root.
 
 | Key | Description | Number of Values | Default |
 |:--------|:-------|:-----------:|:------|
-| **searchType** | The type of searchTarget (tag\|frontmatter\|wiki\|text) | 1~NT | Must provided |
-| **searchTarget** | The target to search<br>[[detail](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TargetEvaluation.md)] | NT (Number of Targets) | Must provided |
-| **folder** | The folder path of your daily notes | 1 | Root of this vault |
-| **dateFormat** | The date format of your file names | 1  | 'YYYY-MM-DD' |
-| **dateFormatPrefix** | A prefix before your dateFormat | 1 | '' |
-| **dateFormatSuffix** | A suffix after your dateFormat | 1 | '' |
-| **startDate** | The start date of collected dataset | 1 | Min date found |
-| **endDate** | The end date of collected dataset | 1 | Max date found |
-| **datasetName** | The name of the dataset collected from the search target | 1~NT | untitled |
-| **separator** | The character to separate multiple values in the search target | 1~NT | '/' |
-| **xDataset** | The id of the searchTarget to be used for searching x values for this target | 1~NT | -1 (use filename as xValue) |
-| **constValue** | The constant value of a target if no value attached | 1~NT | 1.0 |
-| **ignoreAttachedValue** | Use a constant value even if the target has a value attached on (true\|false) | 1~NT | false |
-| **ignoreZeroValue** | Treat zero value as missing value (true\|false) | 1~NT | false |
-| **accum** | Accumulatively sum the values over time (true\|false) | 1~NT | false |
-| **penalty** | The value to use if the search target is missing on the day | 1~NT | |
-| **fixedScale** | The scaling factor apply to the chart | 1 | 1.0 |
-| **fitPanelWidth** | Auto-fit the width of the chart to the container | 1 | false |
-| **margin** | The four margin (top|right|bottom|left) of the graph | 1~4 | 10 |
-| **line** | A container key for parameters related to line-chart | | |
-| **bar** | A container key for parameters related to bar-chart | | |
-| **summary** | A container key for parameters related to summary output | | |
-
-## Parameters for Common Chart
-These key-value pairs should be placed under the key '**line**' or '**bar**'.
+| `searchType` | The type of `searchTarget` (tag\|frontmatter\|wiki\|text\|dvField\|table\|filemeta) | 1~NT | Must be provided |
+| `searchTarget` | The target to search<br>[[detail](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TargetEvaluation.md)] | NT (Number of Targets) | Must be provided |
+| `folder` | The root path of notes to search | 1 | Root of this vault |
+| `dateFormat` | The date format you are using | 1  | 'YYYY-MM-DD' |
+| `dateFormatPrefix` | The prefix before your dateFormat | 1 | '' |
+| `dateFormatSuffix` | The suffix after your dateFormat | 1 | '' |
+| `startDate` | The start date to collect data | 1 | Min date found |
+| `endDate` | The end date of to collect data | 1 | Max date found |
+| `datasetName` | The name of the dataset for a search target` | 1~NT | untitled |
+| `separator` | The character to separate multiple values appearing in the search target | 1~NT | '/' |
+| `xDataset` | The `searchTarget` of this index will be used as xDataset | 1~NT | -1 (use filename as xDataset) |
+| `constValue` | The constant value of a target if no value attached | 1~NT | 1.0 |
+| `ignoreAttachedValue` | Use a constant value even if the target has a value attached on (true\|false) | 1~NT | false |
+| `ignoreZeroValue` | Treat zero value as missing (true\|false) | 1~NT | false |
+| `accum` | Accumulatively sum the values over time (true\|false) | 1~NT | false |
+| `penalty` | The value to use if the search target is missing on the day | 1~NT | |
+| `valueShift` | The amount to shift the collected values | 1~NT | 0 |
+| `valueType` | Not implemented yet | 1~NT | |
+| `fixedScale` | The scaling factor apply to the chart | 1 | 1.0 |
+| `fitPanelWidth` | Auto-fit the width of the chart to the container | 1 | false |
+| `margin` | The four margin (top|right|bottom|left) of the graph | 1~4 | 10 |
+| `line` | A container key for parameters related to the line chart | | |
+| `bar` | A container key for parameters related to the bar chart | | |
+| `summary` | A container key for parameters related to the summary output | | |
+| `bullet` | A container key for parameters related to the bullet chart | 
+
+### Parameters for Common Chart
+These key-value pairs should be placed under the key `line` or `bar`.
 
 | Key | Description | Number of Values | Default |
 |:--------|:-------|:-----------:|:------|
-| **title** | The title of the chart | 1 | '' |
-| **xAxisLabel** | X axis label | 1 | 'Date' |
-| **xAxisColor** | X axis color | 1 | 'white'('black'<sup>*</sup>) |
-| **xAxisLabelColor** | X axis label color | 1 | 'white'('black'<sup>*</sup>) |
-| **yAxisLabel** | Y axis label | 1~2 | 'Value' |
-| **yAxisColor** | Y axis color | 1~2 | 'white'('black'<sup>*</sup>) |
-| **yAxisLabelColor** | The color of labels | 1~2 | 'white'('black'<sup>*</sup>) |
-| **yAxisUnit** | The unit displayed aside y axis label | 1~2 | '' | 
-| **yMin** | The minimum value shown on Y axis | 1~2 |Minimum Y value found | 
-| **yMax** | The maximum value shown on Y axis | 1~2 | Maximum Y value found |
-| **allowInspectData** | Show data value when mouse hovered (true\|false) | 1 | true |
-| **showLegend** | Show legend (true\|false) | 1 | false |
-| **legendPosition** | Legend position (top\|bottom\|left\|right) | 1 | bottom |
-| **legendOrientation** | Legend Orientation (vertical\|horizontal) | 1 | horizontal for bottom and top<br>vertical for left and right |
-| **legendBgColor** | Legend Background Color | 1 | none |
-| **legendBorderColor** | Legend Border Color | 1 | white |
-
-## Parameters for Line Chart
-These key-value pairs should be placed under the key '**line**'.
+| `title` | The title of the chart | 1 | '' |
+| `xAxisLabel` | The label of X axis | 1 | 'Date' |
+| `xAxisColor` | The color of X axis | 1 | 'white'('black'<sup>*</sup>) |
+| `xAxisLabelColor` | The color of X axis label | 1 | 'white'('black'<sup>*</sup>) |
+| `yAxisLabel` | The label of Y axis | 1~2 | 'Value' |
+| `yAxisColor` | The color of Y axis | 1~2 | 'white'('black'<sup>*</sup>) |
+| `yAxisLabelColor` | The color of Y axis label | 1~2 | 'white'('black'<sup>*</sup>) |
+| `yAxisUnit` | The unit displayed aside Y axis label | 1~2 | '' | 
+| `yMin` | The minimum value on Y axis | 1~2 |Minimum Y value found | 
+| `yMax` | The maximum value on Y axis | 1~2 | Maximum Y value found |
+| `reverseYAxis` | Flip the Y Axis or not (true\|false) | 1~2 | false |
+| `allowInspectData` | Show data value when mouse hovered (true\|false) | 1 | true |
+| `showLegend` | Show legend (true\|false) | 1 | false |
+| `legendPosition` | Legend position (top\|bottom\|left\|right) | 1 | bottom |
+| `legendOrientation` | Legend orientation (vertical\|horizontal) | 1 | horizontal for bottom and top<br>vertical for left and right |
+| `legendBgColor` | Legend background color | 1 | none |
+| `legendBorderColor` | Legend border color | 1 | white |
+
+### Parameters for Line Chart
+These key-value pairs should be placed under the key `line`.
 
 | Key | Description | Number of Values | Default |
 |:--------|:-------|:-----------:|:------|
-| **lineColor** | The color of line | 1~NT | 'white'('black'<sup>*</sup>) |
-| **lineWidth** | The width of line| 1~NT | 1.5 |
-| **showLine** |Show/hide line (true\|false) | 1~NT | true |
-| **showPoint** | Show/hide data point (true\|false) | 1~NT | true |
-| **pointColor** | The color of data point | 1~NT | #69b3a2 |
-| **pointBorderColor** | The border color of data point | 1~NT | #69b3a2 |
-| **pointBorderWidth** | The border width of data point | 1~NT | 0 |
-| **pointSize** | The size of data point | 1~NT | 3 |
-| **fillGap** | Connect points over missing data (true\|false) | 1~NT | false |
-| **yAxisLocation** | The corresponding y-axis for a specific dataset (left\|right) | 1~NT | left |
-
-## Parameters for Bar Chart
-These key-value pairs should be placed under the key '**bar**'.
+| `lineColor` | The color of the lines in chart | 1~NT | 'white'('black'<sup>*</sup>) |
+| `lineWidth` | The width of the lines in chart | 1~NT | 1.5 |
+| `showLine` | Show lines (true\|false) | 1~NT | true |
+| `showPoint` | Show data points (true\|false) | 1~NT | true |
+| `pointColor` | The color of data points | 1~NT | #69b3a2 |
+| `pointBorderColor` | The border color of data points | 1~NT | #69b3a2 |
+| `pointBorderWidth` | The border width of data points | 1~NT | 0 |
+| `pointSize` | The size of data points | 1~NT | 3 |
+| `fillGap` | Connect points over missing data (true\|false) | 1~NT | false |
+| `yAxisLocation` | The corresponding Y axis for a specific dataset (left\|right) | 1~NT | left |
+
+### Parameters for Bar Chart
+These key-value pairs should be placed under the key `bar`.
+
+| Key | Description | Number of Values | Default |
+|:--------|:-------|:-----------:|:------|
+| `barColor` | The color of bars in chart | 1~NT | #69b3a2 |
+| `yAxisLocation` |  The corresponding y-axis for a specific dataset (left\|right) | 1~NT | left |
+
+### Parameters for Summary
+These key-value pairs should be placed under the key `summary`.
 
 | Key | Description | Number of Values | Default |
 |:--------|:-------|:-----------:|:------|
-| **barColor** | 'white'('black'<sup>*</sup>) | 1~NT | #69b3a2 |
-| **yAxisLocation** |  The corresponding y-axis for a specific dataset (left\|right) | 1~NT | left |
+| `template` | Text template (you may embed [template variables](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TemplateVariables.md) | 1 | '' |
+| `style` | CSS style applied the rendered text block | 1 | '' |
 
-## Parameters for Summary
-These key-value pairs should be placed under the key '**summary**'.
+### Parameters for Bullet Chart
+These key-value pairs should be placed under the key `bullet`.
 
 | Key | Description | Number of Values | Default |
 |:--------|:-------|:-----------:|:------|
-| **template** | Text template (you may embed [template variables](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TemplateVariables.md) | 1 | '' |
-| **style** | CSS style applied the rendered text block | 1 | '' |
\ No newline at end of file
+| `title` | The title of the chart | 1 | '' |
+| `dataset` | The index of the dataset of your interest | 1 | 0 |
+| `orientation` | Bar orientation (horizontal\|vertical) | 1 | 'horizontal' |
+| `value` | The actual value of interest<br>(you may embed [template variables](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TemplateVariables.md) | 1 | '' |
+| `valueUnit` | The unit of value displayed aside | 1 | '' |
+| `valueColor` | The color of the value bar | 1 | '#69b3a2' |
+| `range` | The ranges of color bands in background | N | [] |
+| `rangeColor` | The color of range bands | N | [] |
+| `showMarker` | Show marker or not (true\|false) | 1 | true |
+| `markerValue` | The value of the markder | 1 | 0 |
+| `markerColor` | The color of the marker | 1 | 'black' |
diff --git a/docs/Installation.md b/docs/Installation.md
new file mode 100644
index 0000000..9d7736e
--- /dev/null
+++ b/docs/Installation.md
@@ -0,0 +1,11 @@
+# Installation
+
+## Install from the Obsidian Settings Panel
+1. From Settings Panel (the icon at the bottom left corner) -> Options -> Community plugins, set 'safe mode' to off.
+2. In the 'Community plugins' section, click 'Browse' and find the obsidian-tracker plugin by the name 'Tracker'.
+3. Press the button 'Install' and wait for the completion of the install.
+4. In the section 'Installed plugins', find and enable the plugin just installed.
+5. Enjoy tracking.
+
+## Manual Installation
+Download the latest [release](https://github.com/pyrochlore/obsidian-tracker/releases). Extract and put the three files (main.js, manifest.json, styles.css) to folder '{{obsidian_vault}}/.obsidian/plugins/obsidian-tracker'.
\ No newline at end of file
diff --git a/docs/Questions.md b/docs/Questions.md
new file mode 100644
index 0000000..285c8e5
--- /dev/null
+++ b/docs/Questions.md
@@ -0,0 +1,47 @@
+# Frequently Asked Questions
+
+- Does Tracker only track data in daily notes (notes named by dates)?
+
+    No. From version 1.6.0, you can use collect date data from file meta data with search type `fileMeta` and use that dataset as `xDataset`. So any notes can be included.
+
+- Does Tracker only track data over dates?
+
+    Yes. The data type of x values should be in the form of date for now. This constrain might be relaxed in future.
+
+- Why my line chart looks broken at some points?
+
+    The plugin only connects adjacent points (by date) by default. To force it connecting points over missing data, set the parameter `fillGap` under `line` to true.
+
+- Why the plugin shows 'No notes found under the given search condition'?
+
+    There are few possibilities for this error messages.
+    1. No files in the given folder
+    2. No files or x data values matched the dateFormat you gave in the given folder
+    3. No files in the date range you gave (from startDate to endDate)
+
+- Why the plugin shows 'Error parsing YAML'?
+
+    There are syntax errors in your code block. Please check [this document](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/YAML.md) for common mistakes.
+
+- Why no data (points or lines) is shown in my chart?
+
+    That means no matched data found in your notes. Please check `searchType` and `searchTarget` in your notes and the document for [target evaluation](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TargetEvaluation.md).
+
+    For example, if you were doing tag search (`searchType` input is `tag`), an additional space between the colon and the value will leads to data missing. If the space in between is a must, you can use `text` search with regular expression instead of `tag`. Here is an example.
+
+    To Track '#tagName: 10' in daily notes. Use
+```
+searchType: text
+searchTarget: 'tagName:\s(?<value>[0-9]+)'
+......
+```
+    More cases can be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TrackUsingRegex.md)
+
+---
+
+Please also check [these trackers](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/ErrorMessages.md) for more cases leading to error messages.
+
+---
+
+Still have problems?? You might encounter bugs.
+Welcome to leave an issue [here](https://github.com/pyrochlore/obsidian-tracker/issues).
\ No newline at end of file
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
new file mode 100644
index 0000000..6e3b31c
--- /dev/null
+++ b/docs/ReleaseNotes.md
@@ -0,0 +1,77 @@
+# Release Notes
+
+### v1.6.0
+- Add a new input type 'file', getting meta data from a file
+- Add a new output type 'bullet', rendering a bullet chart
+- Enhancement
+    - Accept tracking time values
+    - Allow tracking nested values from front matter
+    - Allow using dataset with date values as xDataset
+    - Add more template variables
+    - Allow parsing date in wiki brackets
+- Fixed bugs
+
+### v1.5.1
+- Fixed labels not shown in light theme
+- Enhanced error handling for searchType 'table'
+
+### v1.5.0
+- New searchType 'table', searching records from a given table
+- New searchType 'dvField', searching the inline fields used with Dataview plugin
+- Enhance multiple values extraction
+    - Allow using multiple values in searchType 'text'
+    - Allow using array values in searchType 'frontmatter'
+    - Allow using multiple values in searchType 'dvField'
+    - Allow using multiple values in searchType 'table'
+    - Allow using custom separator for multiple values extraction
+- Improved performance
+- Reduced package size
+
+### v1.4.1
+- Enhanced error handling
+
+### v1.4.0
+- Add a new parameter (fixedScale) for the scaling of the output chart
+- Add a new parameter (fitPanelWidth) to enable/disable the auto-scaling of the output chart
+- Add a new parameter (margin) to help to position the chart
+- Tested in Obsidian mobile app on iPhone and iPad
+- Fixed bugs
+
+### v1.3.0
+- Support reading and rendering multiple targets
+- Support reading and rendering multiple values (a tuple of values) under a target
+- New output type 'bar', rendering a bar chart
+- Add a legend for the chart output
+- Fixed bugs
+
+### v1.2.1
+- Fixed files with the specified dateFormat are not recognized
+- Restored the plugin's settings panel for dateFormat and folder
+
+### v1.2.0
+- Enable using regular expression in text searching
+- New search type 'frontmatter', searching for key-value pairs in the front matter
+- New search type 'wiki', searching for wiki links
+- Reduced package size
+
+### v1.1.0
+- New output type 'summary'
+- Add commands help create Tracker code blocks
+- Relaxed the regex for searching tags, allowing tags embedded in sentences
+- Fixed issues
+
+### v1.0.2
+- Fixed the searching of nested tag in frontmatter
+- Reduced the package size by using the module from Obsidian
+
+### v1.0.1
+- Remove dependencies to Node.js modules
+- Add example markdown files
+
+### v1.0.0
+First version released at 2021-03-23
+
+- Track simple tags, value-attached tags, and texts using code blocks
+- Represent the tracked data in a customizable line chart
+- Allow tracking in-line tags and tags in frontmatter
+- Allow tracking nested tags
\ No newline at end of file
diff --git a/docs/RoadMap.md b/docs/RoadMap.md
new file mode 100644
index 0000000..9b62485
--- /dev/null
+++ b/docs/RoadMap.md
@@ -0,0 +1,37 @@
+# Road Map
+
+- Data Collecting
+    - [x] Support tracking key-value pairs in frontmatter
+    - [x] Support searching text using regular expression
+    - [x] Support multiple targets and multiple values.
+    - [x] Add a parameter xDataset to identify targets to be used as x values
+    - [x] Allow tracking time values
+    - [x] Get data from a table
+    - [x] Collect data from dataview plugin's inline fields
+    - [x] Collect meta information from file
+    - [ ] Allow manual data input (x and y values)
+    - [ ] Allow forced value types
+    - [ ] Allow using non-date x values
+- Output Type and Graph
+    - [x] New output type 'summary', analyzes the input data and represents it using a user-defined text template.
+    - [x] New output type 'bar', rendering a bar chart.
+    - [x] New output type 'bullet', rendering
+    - [ ] New output type for calendar view, including a monthly view or a heatmap.
+    - [x] Add parameters for adjusting the size of the graph.
+    - [ ] Multiple outputs from one code block
+    - [ ] Support graphs showing the correlation between sets of data.
+    - [ ] Allow a graph drawing selected dataset.
+    - [ ] Evaluate template variables by arithmetics and predefined functions.
+- Helper
+    - [x] Add Commands help create Tracker blocks.
+    - [ ] Add an 'Explode' button to the rendered blocks, it will replace the code block with the rendered result.
+    - [ ] Add a helper panel for adding frequently used tracking targets to article.
+- Data Processing
+    - [ ] Allow arithmetics operation on dataset and generate new datasets
+    - [ ] Add data post-process function, e.g. 'moving average'
+- Performance
+    - [ ] Use PixiJS to do rendering
+
+And more ...
+
+P.S. Features may not be implemented in the order above.
\ No newline at end of file
diff --git a/docs/Settings.md b/docs/Settings.md
new file mode 100644
index 0000000..3fc596d
--- /dev/null
+++ b/docs/Settings.md
@@ -0,0 +1,10 @@
+# Plugin Settings
+
+The default folder to search and date format can be defined in the plugin's settings panel. If `folder` and `dateFormat` are not assigned in your code blocks, these default values will be applied automatically.
+
+| Setting Item | Description | Default | 
+|:--------|:-------|:---------|
+| Default folder location | The folder to search | Root of the vault |
+| Default date format | The date format you are using | 'YYYY-MM-DD' | 
+
+For more information about the dateFormat setting, please also check the [TestDateFormats example](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md) and [moment.js string format](https://momentjs.com/docs/#/parsing/string-format/). 
\ No newline at end of file
diff --git a/docs/TargetEvaluation.md b/docs/TargetEvaluation.md
index 806bee5..c878ff4 100644
--- a/docs/TargetEvaluation.md
+++ b/docs/TargetEvaluation.md
@@ -1,78 +1,114 @@
 # Target Evaluation
 
-According to the [input parameters](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md) you provided, the search target will be counted or evaluated as a value. Obsidian-tracker supports four kinds of searchType: 'tag', 'frontmatter', 'wiki', and 'text', dealing with different types of searching condition.
+According to the [input parameters](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md) you provided, the search targets will be counted or evaluated as a value. Obsidian-tracker supports seven kinds of `searchType`: `tag`, `frontmatter`, `wiki`, `text`, `table`, `dvField`, and `fileMeta`, dealing with different types of searching condition.
 
-## tag
+## Multiple Targets
+You can provide multiple search targets by entering an array of targets separated by a comma. Each of the targets will be identified according your search condition then the corresponding value will be evaluated and form a dataset indexed by the order in the array (zero-based indexing).
 
-Simple tags in the format of '*#tagName*' in the file content are evaluated as a constant value (default value 1.0). You can override the value by assigning the key '**constValue**' in the code block. Use the tag name (the name after #) as the value of key '**searchTarget**' or use quoted tag ('**#tagName**') to make it work.
+```
+searchTarget: target0, target1, target2, ...... 
+searchType: type0, type1, type2, .....
+datasetName: dataset0, dataset1, dataset2, ......
+line:
+    lineColor: red, blue, yellow
+```
+
+Above is an example of multiple target searching. Multiple targets are provided and separated by a comma. If they have a different searchType, provide the same number of types in the same order. In this case, the second search target 'target1' with index 1 has type 'type1'. Other parameters that accept multiple values (e.g. lineColor) can also be provided and will be applied to the corresponding dataset.
+
+## Multiple Values
+
+Multiple values under a target (value tuple) separated by a slash, e.g. #bloodpressure:180/120mmHg, are also got supported in version 1.3.0. To identify a specific value as a target, use an accessor with bracket notation where the value in the bracket is the index by the order of values. In this case, they are bloodpressure[0] and bloodpressure[1]. You can find the example of this [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/BloodPressureTracker.md). You can also use a custom separator by using the parameter `separator`.
+
+## Search Target in Detail
+
+## searchType: tag
+
+Simple tags in the format of '*#tagName*' in the file content are evaluated as a constant value (default value 1.0). You can override the value by assigning the key `constValue` in the code block. Use the tag name (the name after #) as the value of key `searchTarget` or use quoted tag (`#tagName`) to make it work.
 
 For tags in frontmatter (e.g. tags: meditation), it works like simple tags and will be evaluated as a constant value. For example, 
-<br>
+
 \-\-\-<br>
 tags: tagName1, tagName2<br>
+......<br>
 \-\-\-<br>
-Set '**searchTarget**' to tagName1 or tagName2 will make the plugin do his work.
 
-In your content, a value can be attached to the tag in the format of '*#tagName:value*'. Note the value should be appended right after your tag and an extra colon without spaces. If a value is attached this way, the obsidian-tracker will automatically use the provided value instead of the constant one. 
+Set `searchTarget` to tagName1 or tagName2 will make the plugin do its work.
+
+In your content, a value can be attached to the tag in the format of '*#tagName:value*'. Note the value should be appended right after your tag and an extra colon **without spaces**. If a value is attached this way, the obsidian-tracker will automatically use the provided value instead of the constant one. 
 
 Nested tags with values attached could be useful for tracking children's data separately and also still see the overall merged data using parent tags.
 
-If you don't want value-attached tags in your content, you can use the '**frontmatter**' as your searchType.
+If you don't want value-attached tags in your content, you can also put data in front matter and use `frontmatter` as your searchType.
+
+## searchType: frontmatter
 
-## frontmatter
 This search type is used to query the key-value pairs in the front matter. If you don't want these values been seen in your article, the front matter would be the best place to record. For example,
-<br>
+
 \-\-\-<br>
 mood: 10<br>
+......<br>
 \-\-\-<br>
 
-## wiki
+## searchType: wiki
 This search type helps you count wiki links in articles. For example,
 [[A]]
 [[B|Link to B]]
 
-## text
-searchType 'text' is the most powerful one among all. If you simply provide text like 'love', the number of occurrences of tags will be counted. You can provide a regular expression to search for a very complicated target by wrapping it in single quotes. If you want to retrieve a value from it, use the group name in the expression. To see more detail, see [this case](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TrackUsingRegex.md).
+## searchType: text
+searchType `text` is the most powerful one among all. If you simply provide text like 'love', the number of occurrences of tags will be counted. You can provide a regular expression to search for a very complicated target by wrapping it in single quotes. If you want to retrieve a value from it, use the group name in the expression. To see more detail, see [this case](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TrackUsingRegex.md).
 
 Multiple values in text search can be achieved by separate regex by comma and wrap them all in single quotes as follows:
-<br>
-\`\`\` tracker<br>
-searchTarget: 'regex1, regex2'<br>
-\`\`\`<br>
 
-## dvField
-From version 1.5.0, the plugin supports retrieving inline fields used with the dataview plugin. To get "targetName:: value" in your article, try the following tracker settings.
-<br>
-\`\`\` tracker<br>
-searchType: dvField<br>
-searchTarget: targetName<br>
-......<br>
-\`\`\`<br>
+```
+searchTarget: 'regex1, regex2'
+......
+```
+
+## searchType: dvField
+
+Tracker supports retrieving inline fields used with the dataview plugin. To get "targetName:: value" in your article, try the following tracker settings.
+
+```
+searchType: dvField
+searchTarget: targetName
+......
+```
 
 If you have multiple values in field, like "targetName:: 123 @ 456", use the following tracker settings.
 <br>
-\`\`\` tracker<br>
-searchType: dvField<br>
-searchTarget: targetName[0], targetName[1]<br>
-separator: '@'<br>
-......<br>
-\`\`\`<br>
+```
+searchType: dvField
+searchTarget: targetName[0], targetName[1]
+separator: '@'
+......
+```
 
 More dvField example can be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestMultipleTargesMultipleValues.md#multiple-values-in-dvfield-dataview-inline-field). 
 
-## table
-This search type is a special one because it does not search over files in the specified folder. Instead, it looks into a given file, finds the specified table, and retrieves data from specified columns. Here is an example,
-<br>
-\`\`\` tracker<br>
-searchType: table<br>
-searchTarget: data/Tables[0][0], data/Tables[0][1], data/Tables[0][2]<br>
-xDataset: 0<br>
-line:<br>
-&nbsp;&nbsp;&nbsp;&nbsp;yAxisLocation: none, left, right<br>
-&nbsp;&nbsp;&nbsp;&nbsp;lineColor: none, yellow, red<br>
-&nbsp;&nbsp;&nbsp;&nbsp;showLegend: true<br>
-\`\`\`<br>
+## searchType: table
+
+This search type is very much different from others because it does not search over files in the specified folder. Instead, it looks into a given file, finds the specified table, and retrieves data from specified columns. Here is an example,
+
+```
+searchType: table
+searchTarget: data/Tables[0][0], data/Tables[0][1], data/Tables[0][2]
+xDataset:
+line:
+    yAxisLocation: none, left, right
+    lineColor: none, yellow, red
+    showLegend: true
+```
 
 In this case, "data/Tables" is the path of the file of interest.  The number in the first brackets after the path ([0]) is the index of the table of interest in the file, starts from 0. And the number in the second brackets is the index of the column containing target data. If there are multiple values in table cells, you can provide a third index to identify them.
 
 More table examples can be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTable.md).
+
+## searchType: fileMeta
+
+With this search type, you can retrieve infomation of files. Currently, three kinds of data you can get.
+
+- cDate: creation date of a file
+- mDate: last modification date of a file
+- size: file size in bytes
+
+`cData` and `mDate` can be used as X dataset and `size` can be used as Y dataset.
\ No newline at end of file
diff --git a/docs/TemplateVariables.md b/docs/TemplateVariables.md
index b8df91c..df6bdf3 100644
--- a/docs/TemplateVariables.md
+++ b/docs/TemplateVariables.md
@@ -1,32 +1,44 @@
 # Template Variables
 
-When you choose 'summary' as the output type (by placing a key 'summary'), you can embed template variables into the 'template' parameter. If you do so, the plugin will do calculations based on the collected dataset refereed, and render the output with variables replaced by calculated results.
+Currently, there are two places you can use template variables. First is the `template` parameter under output type `summary`. The second one is the `value` parameter under output type `bullet`. For each template variable, the plugin will do calculations based on the collected dataset refereed, and render the output with variables replaced by calculated results.
 
-The following table shows all the predefined template variables available for now. The "N" in the table could be the ID (the order of a target in '**searchTarget**' parameter starting from zero) or the name (specified by the parameter '**datasetName**') of a dataset. Examples could be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/BloodPressureTracker.md).
- 
+The following table shows all the template variables available for now. The "N" in the table is the ID (the order of a target in `searchTarget` parameter starting from zero) or the name (specified by the parameter `datasetName`) of a dataset. 
+
+Examples using template variables could be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/BloodPressureTracker.md).
+
+## List of Template Variables
+
+| Template variable | Description |
+|:------------------|:-----------|
+| {{min}}<br>{{min(Dataset(N))}} | Minimum value of first dataset |
+| {{max}}<br>{{max(Dataset(N))}} | Maximum value of first dataset |
+| {{startDate}}<br>{{startDate(Dataset(N))}} | |
+| {{endDate}}<br>{{endDate(Dataset(N))}} | |
+| {{sum}}<br>{{sum(Dataset(N))}} | Summation of values of first dataset |
+| {{numTargets}}<br>{{numTargets(Dataset(N))}} | Total counts of not-null values of specified dataset|
+| {{numDays}}<br>{{numDays(Dataset(N))}} | Days from startDate to endDate of first dataset |
+| {{numDaysHavingData}}<br>{{numDaysHavingData(Dataset(N))}} | |
+| {{maxStreak}}<br>{{maxStreak(Dataset(N))}} | Maximum streak between missing data of first dataset |
+| {{maxStreakStart}}<br>{{maxStreakStart(Dataset(N))}} |  |
+| {{maxStreakEnd}}<br>{{maxStreakEnd(Dataset(N))}} |  |
+| {{maxBreaks}}<br>{{maxBreaks(Dataset(N))}} | Maximum break from missing data of first dataset |
+| {{maxBreaksStart}}<br>{{maxBreaksStart(Dataset(N))}} | Maximum break from missing data of specified dataset |
+| {{maxBreaksEnd}}<br>{{maxBreaksEnd(Dataset(N))}} | Maximum break from missing data of specified dataset |
+| {{currentStreak}}<br>{{currentStreak(Dataset(N))}} | Last streak of first dataset |
+| {{currentStreakStart}}<br>{{currentStreakStart(Dataset(N))}} | Last streak of first dataset |
+| {{currentStreakEnd}}<br>{{currentStreakEnd(Dataset(N))}} | Last streak of first dataset |
+| {{currentBreaks}}<br>{{currentBreaks(Dataset(N))}} | Last breaks of first dataset |
+| {{currentBreaksStart}}<br>{{currentBreaksStart(Dataset(N))}} | Last breaks of first dataset |
+| {{currentBreaksEnd}}<br>{{currentBreaksEnd(Dataset(N))}} | Last breaks of first dataset |
+| {{average}}<br>{{average(Dataset(N))}} | Average value of first dataset |
+| {{median}}<br>{{median(Dataset(N))}} | Median value of first dataset |
+| {{variance}}<br>{{variance(Dataset(N))}} | Variance value of first dataset |
+
+## List of Deprecated Template Variables
 | Template variable | Description |
 |:------------------|:-----------|
-| {{min}} | Minimum value of first dataset |
-| {{min(Dataset(N))}} | Minimum value of specified dataset |
-| {{max}} | Maximum value of first dataset |
-| {{max(Dataset(N))}} | Maximum value of specified dataset |
-| {{sum}} | Summation of values of first dataset |
-| {{sum(Dataset(N))}} | Summation of values of specified dataset |
-| {{count}} | Total counts of not-null values of first dataset |
-| {{count(Dataset(N))}} | Total counts of not-null values of specified dataset|
-| {{days}} | Days from startDate to endDate of first dataset |
-| {{days(Dataset(N))}} | Days from startDate to endDate of specified dataset |
-| {{maxStreak}} | Maximum streak between missing data of first dataset |
-| {{maxStreak(Dataset(N))}} | Maximum streak between missing data of specified dataset |
-| {{maxBreak}} | Maximum break from missing data of first dataset |
-| {{maxBreak(Dataset(N))}} | Maximum break from missing data of specified dataset |
-| {{lastStreak}} | Last streak of first dataset |
-| {{lastStreak(Dataset(N))}} | Last streak of specified dataset |
-| {{average}} | Average value of first dataset |
-| {{average(Dataset(N))}} | Average value of specified dataset |
-| {{median}} | Median value of first dataset |
-| {{median(Dataset(N))}} | Median value of specified dataset |
-| {{variance}} | Variance value of first dataset |
-| {{variance(Dataset(N))}} | Variance value of specified dataset |
+| {{count}}<br>{{count(Dataset(N))}} | Use numTargets instead |
+| {{days}}<br>{{days(Dataset(N))}} | Use numDays instead |
+| {{lastStreak}}<br>{{lastStreak(Dataset(N))}} | Use currentSteak instead |
 
-Notice when doing calculations like sum or average, the missing values are ignored. You can set those missing values to zero by setting the value of key 'penalty'  to zero. Moreover, if the key 'ignoreZeroValue' is assigned true, zero value will be ignored too. You can check these parameters [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md)
\ No newline at end of file
+Notice when doing calculations like sum or average, the missing values are ignored. You can set those missing values to zero by setting the value of key `penalty`  to zero. Moreover, if the key `ignoreZeroValue` is assigned true, zero value will be ignored too. You can check these parameters [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md)
\ No newline at end of file
diff --git a/docs/YAML.md b/docs/YAML.md
new file mode 100644
index 0000000..77ef250
--- /dev/null
+++ b/docs/YAML.md
@@ -0,0 +1,65 @@
+# YAML Related Issues
+
+## Special characters
+
+YAML special characters (e.g. #, [, ], ...) are not allowed for input values in code blocks. You need to wrap the whole input up by single quotes.
+
+### Example 1 - Tag Search
+If we have a bunch of tags (say #tagName) to track.
+This will leads to 'Error parsing YAML' because of the # charactter.
+```
+searchType: tag
+searchTarget: #tagName
+```
+
+Instead, wrapping the input by single quotes will do the work.
+```
+searchType: tag
+searchTarget: '#tagName'
+```
+
+or simply
+```
+searchType: tag
+searchTarget: tagName
+```
+
+### Example 2 - Hex Color Codes
+
+Hex color codes must be wrapped in single quotes.
+```
+searchType: tag
+searchTarget: weight
+line:
+    lineColor: '#F08080'
+```
+
+Wrap the whole input by single quotes.
+```
+searchType: tag
+searchTarget: weight, push-up
+line:
+    lineColor: '#F08080, #008080'
+```
+
+### Example 3 - Text Search with Regex
+
+If we want to track value-attached tags not matched the standard format of Tracker, for example, weightlifting: 20.5kg. We can use search type `text` with regular expression in `searchTarget`.
+```
+searchType: text
+searchTarget: 'weightlifting:\s(?<value>[\-]?[0-9]+[\.][0-9]+|[\-]?[0-9]+)'
+```
+The whole input should be wrapped in single quotes because of the special characters.
+
+## Array input
+Tracker accepts two types of array input.
+
+- YAML Array
+
+A YAML array input can be represented as: ['value1', 'value2', 'value3']. 
+
+- Value Separated by Comma
+
+Use values separated by comma: value1, value2, value3
+Or single quoted string: 'value1, value2, value3'
+

From e941cf118782e8eb1aad47f1bb68b6c84d2a4032 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 5 Jun 2021 17:16:50 +0800
Subject: [PATCH 051/402] Update screenshot

---
 README.md                       |   2 +-
 docs/images/screenshot_v1.6.png | Bin 0 -> 184423 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 docs/images/screenshot_v1.6.png

diff --git a/README.md b/README.md
index e373ea0..a764bbc 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Obsidian Tracker Plugin
 ![GitHub release](https://img.shields.io/github/v/release/pyrochlore/obsidian-tracker)
 
-<img src="https://raw.githubusercontent.com/pyrochlore/obsidian-tracker/master/docs/images/screenshot_v1.3.png" width="800">
+<img src="https://raw.githubusercontent.com/pyrochlore/obsidian-tracker/master/docs/images/screenshot_v1.6.png" width="800">
 
 This is an [Obsidian](https://obsidian.md/) plugin that helps you do tracking in notes [over dates](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Questions.md) and represent the collected data comprehensively. 
 
diff --git a/docs/images/screenshot_v1.6.png b/docs/images/screenshot_v1.6.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d2d55fb22c6ae23c1968644c8c1aed60c5e2ca4
GIT binary patch
literal 184423
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
C<(VG<

literal 0
HcmV?d00001


From 8ebc68526058f9e8e79388c00327af2b1278fcdb Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 5 Jun 2021 23:03:59 +0800
Subject: [PATCH 052/402] Update documents

---
 README.md            | 17 ++++++++++++++---
 docs/ReleaseNotes.md |  2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index a764bbc..3006f0d 100644
--- a/README.md
+++ b/README.md
@@ -7,19 +7,30 @@ This is an [Obsidian](https://obsidian.md/) plugin that helps you do tracking in
 
 [Here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Examples.md) is a simplified table of examples showing what you can track.
 
+## What's New
+Version 1.6.0
+1. Add a new input type 'fileMeta', getting meta data from a file ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/Test%20FileMeta.md))
+2. Add a new output type 'bullet', rendering a bullet chart ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestBullet.md))
+3. Accept tracking time values ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTimeValues.md))
+4. Allow tracking nested values from front matter
+5. Allow using dataset with date values as xDataset ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestXDataset.md))
+6. Add more template variables ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestXDataset.md))
+7. Allow parsing date in wiki brackets
+
 ## Usage
 1. Have some targets you want to track in daily notes. Take a look at [Target Evaluation](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TargetEvaluation.md) for what you can track and how targets are evaluated as numbers.
 2. Add a new note for displaying the tracker.
-3. Add tracker code blocks manually or using commands. See [Commands](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Commands.md) for more detail.
+3. Add tracker code blocks manually or using commands. See [Commands](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Commands.md) for more details.
 4. Switch the document view mode to 'Preview', then the code block will get rendered.
 
     <img src="https://raw.githubusercontent.com/pyrochlore/obsidian-tracker/master/docs/images/usage_v1.3.gif" width="400">
 
 For more use cases, please open the [examples](https://github.com/pyrochlore/obsidian-tracker/tree/master/examples) folder in obsidian with this plugin installed and enabled.
 
-## More Detail You May Want to Know
-- [Installation](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Installation.md): Install the plugin from Obsidian or install it manually.
+## More Details You May Want to Know
+- [Installation](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Installation.md): Install the plugin from Obsidian or install it manually
 - [Concepts](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Concepts.md): Explain how this plugin works and what to setup
+- [Examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Examples.md)
 - [Plugin Settings](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Settings.md)
 - [Release Notes](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/ReleaseNotes.md)
 - [Road Map](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/RoadMap.md)
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index 6e3b31c..56b490d 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,7 +1,7 @@
 # Release Notes
 
 ### v1.6.0
-- Add a new input type 'file', getting meta data from a file
+- Add a new input type 'fileMeta', getting meta data from a file
 - Add a new output type 'bullet', rendering a bullet chart
 - Enhancement
     - Accept tracking time values

From 98b6765bdf80607247e80b9744b0dbf220491566 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 7 Jun 2021 22:14:06 +0800
Subject: [PATCH 053/402] Allow multiple outputs

---
 examples/TestMultipleGraphs.md |  24 ++
 src/bullet.ts                  |  63 ++--
 src/data.ts                    |  74 ++---
 src/month.ts                   |  16 +-
 src/parsing.ts                 | 556 ++++++++++++++++-----------------
 src/rendering.ts               | 233 +++++++-------
 src/summary.ts                 |  18 +-
 7 files changed, 519 insertions(+), 465 deletions(-)
 create mode 100644 examples/TestMultipleGraphs.md

diff --git a/examples/TestMultipleGraphs.md b/examples/TestMultipleGraphs.md
new file mode 100644
index 0000000..d2262dd
--- /dev/null
+++ b/examples/TestMultipleGraphs.md
@@ -0,0 +1,24 @@
+# Test Multiple Graphs
+
+``` tracker
+searchType: tag
+searchTarget: weight
+endDate: 2021-01-31
+fixedScale: 0.5
+line:
+
+line1:
+    
+```
+
+<!--
+``` tracker
+searchType: tag
+searchTarget: weight
+endDate: 2021-01-31
+line:
+
+summary:
+    template: "{{average}}"
+```
+
diff --git a/src/bullet.ts b/src/bullet.ts
index b370e6d..4bbc8a5 100644
--- a/src/bullet.ts
+++ b/src/bullet.ts
@@ -2,6 +2,7 @@ import {
     Datasets,
     DataPoint,
     RenderInfo,
+    BulletInfo,
     Dataset,
     Size,
     Transform,
@@ -15,13 +16,13 @@ import * as expr from "./expr";
 
 function createAreas(
     canvas: HTMLElement,
-    renderInfo: RenderInfo
+    renderInfo: RenderInfo,
+    bulletInfo: BulletInfo
 ): ChartElements {
     let chartElements: ChartElements = {};
     // whole area for plotting, includes margins
 
-    let bulletInfo = renderInfo.bullet;
-    if (!bulletInfo) return;
+    if (!renderInfo || !bulletInfo) return;
 
     let svg = d3
         .select(canvas)
@@ -99,12 +100,15 @@ function setChartScale(
     }
 }
 
-function renderTitle(chartElements: ChartElements, renderInfo: RenderInfo) {
+function renderTitle(
+    chartElements: ChartElements,
+    renderInfo: RenderInfo,
+    bulletInfo: BulletInfo
+) {
     // console.log("renderTitle");
     // under graphArea
 
-    let bulletInfo = renderInfo.bullet;
-    if (!bulletInfo) return;
+    if (!renderInfo || !bulletInfo) return;
 
     const spacing = 6; // spacing between title and dataArea
 
@@ -244,14 +248,14 @@ function renderTitle(chartElements: ChartElements, renderInfo: RenderInfo) {
 function renderAxis(
     chartElements: ChartElements,
     renderInfo: RenderInfo,
+    bulletInfo: BulletInfo,
     dataset: Dataset
 ) {
     // console.log("renderAxis");
     // console.log(chartElements);
     // console.log(dataset);
 
-    let bulletInfo = renderInfo.bullet;
-    if (!bulletInfo) return;
+    if (!renderInfo || !bulletInfo) return;
 
     let range = bulletInfo.range;
     let lastRange = range[range.length - 1];
@@ -365,13 +369,13 @@ function renderAxis(
 function renderBackPanel(
     chartElements: ChartElements,
     renderInfo: RenderInfo,
+    bulletInfo: BulletInfo,
     dataset: Dataset
 ) {
     // console.log("renderBackPanel");
     // console.log(dataset);
 
-    let bulletInfo = renderInfo.bullet;
-    if (!bulletInfo) return;
+    if (!renderInfo || !bulletInfo) return;
 
     let scale = chartElements.scale;
 
@@ -437,14 +441,14 @@ function renderBackPanel(
 function renderBar(
     chartElements: ChartElements,
     renderInfo: RenderInfo,
+    bulletInfo: BulletInfo,
     dataset: Dataset
 ) {
     // console.log("renderBar");
     // console.log(dataset);
     let errorMessage = "";
 
-    let bulletInfo = renderInfo.bullet;
-    if (!bulletInfo) return;
+    if (!renderInfo || !bulletInfo) return;
 
     let retActualValue = bulletInfo.value;
     retActualValue = expr.resolveTemplate(retActualValue, renderInfo);
@@ -485,13 +489,13 @@ function renderBar(
 function renderMark(
     chartElements: ChartElements,
     renderInfo: RenderInfo,
+    bulletInfo: BulletInfo,
     dataset: Dataset
 ) {
     // console.log("renderMark");
     // console.log(dataset);
 
-    let bulletInfo = renderInfo.bullet;
-    if (!bulletInfo) return;
+    if (!renderInfo || !bulletInfo) return;
 
     let showMarker = bulletInfo.showMarker;
     if (!showMarker) return;
@@ -523,11 +527,14 @@ function renderMark(
 }
 
 // Bullet graph https://en.wikipedia.org/wiki/Bullet_graph
-export function renderBullet(canvas: HTMLElement, renderInfo: RenderInfo) {
+export function renderBullet(
+    canvas: HTMLElement,
+    renderInfo: RenderInfo,
+    bulletInfo: BulletInfo
+) {
     // console.log("renderBullet");
     // console.log(renderInfo);
-    let bulletInfo = renderInfo.bullet;
-    if (bulletInfo === null) return;
+    if (!renderInfo || !bulletInfo) return;
 
     let datasetId = parseFloat(bulletInfo.dataset);
     let dataset = renderInfo.datasets.getDatasetById(datasetId);
@@ -539,23 +546,33 @@ export function renderBullet(canvas: HTMLElement, renderInfo: RenderInfo) {
         renderInfo.dataAreaSize = { width: 24, height: 250 };
     }
 
-    let chartElements = createAreas(canvas, renderInfo);
+    let chartElements = createAreas(canvas, renderInfo, bulletInfo);
 
-    let retRenderAxis = renderAxis(chartElements, renderInfo, dataset);
+    let retRenderAxis = renderAxis(
+        chartElements,
+        renderInfo,
+        bulletInfo,
+        dataset
+    );
     if (typeof retRenderAxis === "string") {
         return retRenderAxis;
     }
 
-    renderTitle(chartElements, renderInfo);
+    renderTitle(chartElements, renderInfo, bulletInfo);
 
-    renderBackPanel(chartElements, renderInfo, dataset);
+    renderBackPanel(chartElements, renderInfo, bulletInfo, dataset);
 
-    let retRenderBar = renderBar(chartElements, renderInfo, dataset);
+    let retRenderBar = renderBar(
+        chartElements,
+        renderInfo,
+        bulletInfo,
+        dataset
+    );
     if (typeof retRenderBar === "string") {
         return retRenderBar;
     }
 
-    renderMark(chartElements, renderInfo, dataset);
+    renderMark(chartElements, renderInfo, bulletInfo, dataset);
 
     setChartScale(canvas, chartElements, renderInfo);
 }
diff --git a/src/data.ts b/src/data.ts
index 9bb75d8..238a297 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -18,6 +18,7 @@ export enum OutputType {
     Table,
     Month,
     Bullet,
+    Unknown,
 }
 
 export enum ValueType {
@@ -224,21 +225,6 @@ export class Dataset implements IterableIterator<DataPoint> {
     public setName(name: string) {
         this.name = name;
     }
-    public getLineInfo() {
-        return this.lineInfo;
-    }
-
-    public setLineInfo(lineInfo: LineInfo) {
-        this.lineInfo = lineInfo;
-    }
-
-    public getBarInfo() {
-        return this.barInfo;
-    }
-
-    public setBarInfo(barInfo: BarInfo) {
-        this.barInfo = barInfo;
-    }
 
     public getId() {
         return this.id;
@@ -414,13 +400,6 @@ export class Datasets implements IterableIterator<Dataset> {
         dataset.setId(query.getId());
         if (renderInfo) {
             dataset.setName(renderInfo.datasetName[query.getId()]);
-
-            if (renderInfo.line) {
-                dataset.setLineInfo(renderInfo.line);
-            }
-            if (renderInfo.bar) {
-                dataset.setBarInfo(renderInfo.bar);
-            }
         }
 
         this.datasets.push(dataset);
@@ -531,12 +510,12 @@ export class RenderInfo {
     fixedScale: number;
     fitPanelWidth: boolean;
 
-    output: OutputType;
-    line: LineInfo | null;
-    bar: BarInfo | null;
-    summary: SummaryInfo | null;
-    month: MonthInfo | null;
-    bullet: BulletInfo | null;
+    output: any[];
+    line: LineInfo[];
+    bar: BarInfo[];
+    summary: SummaryInfo[];
+    month: MonthInfo[];
+    bullet: BulletInfo[];
 
     public datasets: Datasets | null;
 
@@ -565,12 +544,12 @@ export class RenderInfo {
         this.fixedScale = 1.0;
         this.fitPanelWidth = false;
 
-        this.output = OutputType.Line;
-        this.line = null;
-        this.summary = null;
-        this.bar = null;
-        this.month = null;
-        this.bullet = null;
+        this.output = [];
+        this.line = [];
+        this.summary = [];
+        this.bar = [];
+        this.month = [];
+        this.bullet = [];
 
         this.datasets = null;
     }
@@ -584,7 +563,11 @@ export class RenderInfo {
     }
 }
 
-export class CommonChartInfo {
+export class OutputInfo {
+    constructor() {}
+}
+
+export class CommonChartInfo extends OutputInfo {
     title: string;
     xAxisLabel: string;
     xAxisColor: string;
@@ -602,8 +585,10 @@ export class CommonChartInfo {
     legendOrientation: string;
     legendBgColor: string;
     legendBorderColor: string;
+    chartType: OutputType;
 
     constructor() {
+        super();
         this.title = "";
         this.xAxisLabel = "Date";
         this.xAxisColor = "";
@@ -621,6 +606,11 @@ export class CommonChartInfo {
         this.legendOrientation = ""; // horizontal, vertical
         this.legendBgColor = "";
         this.legendBorderColor = "";
+        this.chartType = OutputType.Unknown;
+    }
+
+    public GetChartType() {
+        return this.chartType;
     }
 }
 
@@ -649,6 +639,10 @@ export class LineInfo extends CommonChartInfo {
         this.fillGap = []; // false
         this.yAxisLocation = []; // left, for each target
     }
+
+    public GetChartType() {
+        return OutputType.Line;
+    }
 }
 
 export class BarInfo extends CommonChartInfo {
@@ -660,13 +654,18 @@ export class BarInfo extends CommonChartInfo {
         this.barColor = []; // #69b3a2
         this.yAxisLocation = []; // left, for each target
     }
+
+    public GetChartType() {
+        return OutputType.Bar;
+    }
 }
 
-export class SummaryInfo {
+export class SummaryInfo extends OutputInfo {
     template: string;
     style: string;
 
     constructor() {
+        super();
         this.template = "";
         this.style = "";
     }
@@ -680,7 +679,7 @@ export class MonthInfo {
     }
 }
 
-export class BulletInfo {
+export class BulletInfo extends OutputInfo {
     title: string;
     dataset: string;
     orientation: string;
@@ -694,6 +693,7 @@ export class BulletInfo {
     markerColor: string;
 
     constructor() {
+        super();
         this.title = "";
         this.dataset = "0"; // dataset id or name
         this.orientation = "horizontal"; // or vertical
diff --git a/src/month.ts b/src/month.ts
index c1dabe4..896c204 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -3,6 +3,7 @@ import {
     Datasets,
     DataPoint,
     RenderInfo,
+    MonthInfo,
     Dataset,
     Size,
     Transform,
@@ -22,7 +23,8 @@ interface DayInfo {
 
 function createAreas(
     canvas: HTMLElement,
-    renderInfo: RenderInfo
+    renderInfo: RenderInfo,
+    monthInfo: MonthInfo
 ): ChartElements {
     let chartElements: ChartElements = {};
     // whole area for plotting, includes margins
@@ -77,12 +79,14 @@ function createAreas(
 function renderMonthHeader(
     chartElements: ChartElements,
     renderInfo: RenderInfo,
+    monthInfo: MonthInfo,
     dataset: Dataset
 ) {}
 
 function renderMonthDays(
     chartElements: ChartElements,
     renderInfo: RenderInfo,
+    monthInfo: MonthInfo,
     dataset: Dataset
 ) {
     // console.log("renderMonthDays");
@@ -160,22 +164,28 @@ function renderMonthDays(
         .attr("class", "tracker-axis-label");
 }
 
-export function renderMonth(canvas: HTMLElement, renderInfo: RenderInfo) {
+export function renderMonth(
+    canvas: HTMLElement,
+    renderInfo: RenderInfo,
+    monthInfo: MonthInfo
+) {
     // console.log("renderMonth");
     // console.log(renderInfo);
     if (renderInfo.month === null) return;
 
-    let chartElements = createAreas(canvas, renderInfo);
+    let chartElements = createAreas(canvas, renderInfo, monthInfo);
 
     renderMonthHeader(
         chartElements,
         renderInfo,
+        monthInfo,
         renderInfo.datasets.getDatasetById(0)
     );
 
     renderMonthDays(
         chartElements,
         renderInfo,
+        monthInfo,
         renderInfo.datasets.getDatasetById(0)
     );
 }
diff --git a/src/parsing.ts b/src/parsing.ts
index 9692913..56fa386 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -882,6 +882,34 @@ export function getRenderInfoFromYaml(
     let keysOfRenderInfo = getAvailableKeysOfClass(renderInfo);
     let additionalAllowedKeys = ["searchType", "searchTarget", "separator"];
     // console.log(keysOfRenderInfo);
+    let yamlLineKeys = [];
+    let yamlBarKeys = [];
+    let yamlSummaryKeys = [];
+    let yamlMonthKeys = [];
+    let yamlBulletKeys = [];
+    for (let key of keysFoundInYAML) {
+        if (/line[0-9]*/.test(key)) {
+            yamlLineKeys.push(key);
+            additionalAllowedKeys.push(key);
+        }
+        if (/bar[0-9]*/.test(key)) {
+            yamlBarKeys.push(key);
+            additionalAllowedKeys.push(key);
+        }
+        if (/summary[0-9]*/.test(key)) {
+            yamlSummaryKeys.push(key);
+            additionalAllowedKeys.push(key);
+        }
+        if (/bullet[0-9]*/.test(key)) {
+            yamlBulletKeys.push(key);
+            additionalAllowedKeys.push(key);
+        }
+        if (/month[0-9]*/.test(key)) {
+            yamlMonthKeys.push(key);
+            additionalAllowedKeys.push(key);
+        }
+    }
+    // console.log(additionalAllowedKeys);
     for (let key of keysFoundInYAML) {
         if (
             !keysOfRenderInfo.includes(key) &&
@@ -892,6 +920,16 @@ export function getRenderInfoFromYaml(
         }
     }
 
+    let totalNumOutputs =
+        yamlLineKeys.length +
+        yamlBarKeys.length +
+        yamlSummaryKeys.length +
+        +yamlBulletKeys.length +
+        yamlMonthKeys.length;
+    if (totalNumOutputs === 0) {
+        return "No output parameter provided, please place line, bar, month, bullet, or summary.";
+    }
+
     // Get daily notes settings using obsidian-daily-notes-interface
     let dailyNotesSettings = getDailyNoteSettings();
 
@@ -1161,66 +1199,23 @@ export function getRenderInfoFromYaml(
     );
     // console.log(renderInfo.margin);
 
-    // Determine outputType
-    let hasLine = false;
-    if (typeof yaml.line !== "undefined") {
-        hasLine = true;
-    }
-    let hasBar = false;
-    if (typeof yaml.bar !== "undefined") {
-        hasBar = true;
-    }
-    let hasSummary = false;
-    if (typeof yaml.summary !== "undefined") {
-        hasSummary = true;
-    }
-    let hasMonth = false;
-    if (typeof yaml.month !== "undefined") {
-        hasMonth = true;
-    }
-    let hasBullet = false;
-    if (typeof yaml.bullet !== "undefined") {
-        hasBullet = true;
-    }
-    let sumOutput =
-        Number(hasLine) +
-        Number(hasBar) +
-        Number(hasSummary) +
-        Number(hasMonth) +
-        Number(hasBullet);
-    if (sumOutput === 0) {
-        return "No output parameter provided, please place line, bar, month, bullet, or summary.";
-    } else if (sumOutput === 1) {
-        if (hasLine) renderInfo.output = OutputType.Line;
-        if (hasBar) renderInfo.output = OutputType.Bar;
-        if (hasSummary) renderInfo.output = OutputType.Summary;
-        if (hasMonth) renderInfo.output = OutputType.Month;
-        if (hasBullet) renderInfo.output = OutputType.Bullet;
-    } else if (sumOutput >= 2) {
-        return "Too many output parameters, pick line, bar, month, bullet, or summary.";
-    }
-
     // line related parameters
-    if (renderInfo.output === OutputType.Line) {
-        renderInfo.line = new LineInfo();
-
-        if (yaml.line !== null) {
-            let keysOfLineInfo = getAvailableKeysOfClass(renderInfo.line);
-            let keysFoundInYAML = getAvailableKeysOfClass(yaml.line);
-            // console.log(keysOfLineInfo);
-            // console.log(keysFoundInYAML);
-            for (let key of keysFoundInYAML) {
-                if (!keysOfLineInfo.includes(key)) {
-                    errorMessage = "'" + key + "' is not an available key";
-                    return errorMessage;
-                }
+    for (let lineKey of yamlLineKeys) {
+        let line = new LineInfo();
+        let yamlLine = yaml[lineKey];
+
+        let keysOfLineInfo = getAvailableKeysOfClass(line);
+        let keysFoundInYAML = getAvailableKeysOfClass(yamlLine);
+        // console.log(keysOfLineInfo);
+        // console.log(keysFoundInYAML);
+        for (let key of keysFoundInYAML) {
+            if (!keysOfLineInfo.includes(key)) {
+                errorMessage = "'" + key + "' is not an available key";
+                return errorMessage;
             }
         }
 
-        let retParseCommonChartInfo = parseCommonChartInfo(
-            yaml.line,
-            renderInfo.line
-        );
+        let retParseCommonChartInfo = parseCommonChartInfo(yamlLine, line);
         if (typeof retParseCommonChartInfo === "string") {
             return retParseCommonChartInfo;
         }
@@ -1228,7 +1223,7 @@ export function getRenderInfoFromYaml(
         // lineColor
         let retLineColor = getStringArrayFromInput(
             "lineColor",
-            yaml?.line?.lineColor,
+            yamlLine?.lineColor,
             numDatasets,
             "",
             validateColor,
@@ -1237,13 +1232,13 @@ export function getRenderInfoFromYaml(
         if (typeof retLineColor === "string") {
             return retLineColor; // errorMessage
         }
-        renderInfo.line.lineColor = retLineColor;
-        // console.log(renderInfo.line.lineColor);
+        line.lineColor = retLineColor;
+        // console.log(line.lineColor);
 
         // lineWidth
         let retLineWidth = getNumberArrayFromInput(
             "lineWidth",
-            yaml?.line?.lineWidth,
+            yamlLine?.lineWidth,
             numDatasets,
             1.5,
             true
@@ -1251,13 +1246,13 @@ export function getRenderInfoFromYaml(
         if (typeof retLineWidth === "string") {
             return retLineWidth; // errorMessage
         }
-        renderInfo.line.lineWidth = retLineWidth;
-        // console.log(renderInfo.line.lineWidth);
+        line.lineWidth = retLineWidth;
+        // console.log(line.lineWidth);
 
         // showLine
         let retShowLine = getBoolArrayFromInput(
             "showLine",
-            yaml?.line?.showLine,
+            yamlLine?.showLine,
             numDatasets,
             true,
             true
@@ -1265,13 +1260,13 @@ export function getRenderInfoFromYaml(
         if (typeof retShowLine === "string") {
             return retShowLine;
         }
-        renderInfo.line.showLine = retShowLine;
-        // console.log(renderInfo.line.showLine);
+        line.showLine = retShowLine;
+        // console.log(line.showLine);
 
         // showPoint
         let retShowPoint = getBoolArrayFromInput(
             "showPoint",
-            yaml?.line?.showPoint,
+            yamlLine?.showPoint,
             numDatasets,
             true,
             true
@@ -1279,13 +1274,13 @@ export function getRenderInfoFromYaml(
         if (typeof retShowPoint === "string") {
             return retShowPoint;
         }
-        renderInfo.line.showPoint = retShowPoint;
-        // console.log(renderInfo.line.showPoint);
+        line.showPoint = retShowPoint;
+        // console.log(line.showPoint);
 
         // pointColor
         let retPointColor = getStringArrayFromInput(
             "pointColor",
-            yaml?.line?.pointColor,
+            yamlLine?.pointColor,
             numDatasets,
             "#69b3a2",
             validateColor,
@@ -1294,13 +1289,13 @@ export function getRenderInfoFromYaml(
         if (typeof retPointColor === "string") {
             return retPointColor;
         }
-        renderInfo.line.pointColor = retPointColor;
-        // console.log(renderInfo.line.pointColor);
+        line.pointColor = retPointColor;
+        // console.log(line.pointColor);
 
         // pointBorderColor
         let retPointBorderColor = getStringArrayFromInput(
             "pointBorderColor",
-            yaml?.line?.pointBorderColor,
+            yamlLine?.pointBorderColor,
             numDatasets,
             "#69b3a2",
             validateColor,
@@ -1309,13 +1304,13 @@ export function getRenderInfoFromYaml(
         if (typeof retPointBorderColor === "string") {
             return retPointBorderColor;
         }
-        renderInfo.line.pointBorderColor = retPointBorderColor;
-        // console.log(renderInfo.line.pointBorderColor);
+        line.pointBorderColor = retPointBorderColor;
+        // console.log(line.pointBorderColor);
 
         // pointBorderWidth
         let retPointBorderWidth = getNumberArrayFromInput(
             "pointBorderWidth",
-            yaml?.line?.pointBorderWidth,
+            yamlLine?.pointBorderWidth,
             numDatasets,
             0.0,
             true
@@ -1323,13 +1318,13 @@ export function getRenderInfoFromYaml(
         if (typeof retPointBorderWidth === "string") {
             return retPointBorderWidth; // errorMessage
         }
-        renderInfo.line.pointBorderWidth = retPointBorderWidth;
-        // console.log(renderInfo.line.pointBorderWidth);
+        line.pointBorderWidth = retPointBorderWidth;
+        // console.log(line.pointBorderWidth);
 
         // pointSize
         let retPointSize = getNumberArrayFromInput(
             "pointSize",
-            yaml?.line?.pointSize,
+            yamlLine?.pointSize,
             numDatasets,
             3.0,
             true
@@ -1337,13 +1332,13 @@ export function getRenderInfoFromYaml(
         if (typeof retPointSize === "string") {
             return retPointSize; // errorMessage
         }
-        renderInfo.line.pointSize = retPointSize;
-        // console.log(renderInfo.line.pointSize);
+        line.pointSize = retPointSize;
+        // console.log(line.pointSize);
 
         // fillGap
         let retFillGap = getBoolArrayFromInput(
             "fillGap",
-            yaml?.line?.fillGap,
+            yamlLine?.fillGap,
             numDatasets,
             false,
             true
@@ -1351,13 +1346,13 @@ export function getRenderInfoFromYaml(
         if (typeof retFillGap === "string") {
             return retFillGap;
         }
-        renderInfo.line.fillGap = retFillGap;
-        // console.log(renderInfo.line.fillGap);
+        line.fillGap = retFillGap;
+        // console.log(line.fillGap);
 
         // yAxisLocation
         let retYAxisLocation = getStringArrayFromInput(
             "yAxisLocation",
-            yaml?.line?.yAxisLocation,
+            yamlLine?.yAxisLocation,
             numDatasets,
             "left",
             validateYAxisLocation,
@@ -1366,29 +1361,30 @@ export function getRenderInfoFromYaml(
         if (typeof retYAxisLocation === "string") {
             return retYAxisLocation; // errorMessage
         }
-        renderInfo.line.yAxisLocation = retYAxisLocation;
-        // console.log(renderInfo.line.yAxisLocation);
+        line.yAxisLocation = retYAxisLocation;
+        // console.log(line.yAxisLocation);
+
+        renderInfo.line.push(line);
     } // line related parameters
-    if (renderInfo.output === OutputType.Bar) {
-        renderInfo.bar = new BarInfo();
-
-        if (yaml.bar !== null) {
-            let keysOfBarInfo = getAvailableKeysOfClass(renderInfo.bar);
-            let keysFoundInYAML = getAvailableKeysOfClass(yaml.bar);
-            // console.log(keysOfBarInfo);
-            // console.log(keysFoundInYAML);
-            for (let key of keysFoundInYAML) {
-                if (!keysOfBarInfo.includes(key)) {
-                    errorMessage = "'" + key + "' is not an available key";
-                    return errorMessage;
-                }
+    // console.log(renderInfo.line);
+
+    // bar related parameters
+    for (let barKey of yamlBarKeys) {
+        let bar = new BarInfo();
+        let yamlBar = yaml[barKey];
+
+        let keysOfBarInfo = getAvailableKeysOfClass(bar);
+        let keysFoundInYAML = getAvailableKeysOfClass(yamlBar);
+        // console.log(keysOfBarInfo);
+        // console.log(keysFoundInYAML);
+        for (let key of keysFoundInYAML) {
+            if (!keysOfBarInfo.includes(key)) {
+                errorMessage = "'" + key + "' is not an available key";
+                return errorMessage;
             }
         }
 
-        let retParseCommonChartInfo = parseCommonChartInfo(
-            yaml.bar,
-            renderInfo.bar
-        );
+        let retParseCommonChartInfo = parseCommonChartInfo(yamlBar, bar);
         if (typeof retParseCommonChartInfo === "string") {
             return retParseCommonChartInfo;
         }
@@ -1396,7 +1392,7 @@ export function getRenderInfoFromYaml(
         // barColor
         let retBarColor = getStringArrayFromInput(
             "barColor",
-            yaml?.bar?.barColor,
+            yamlBar?.barColor,
             numDatasets,
             "",
             validateColor,
@@ -1405,13 +1401,13 @@ export function getRenderInfoFromYaml(
         if (typeof retBarColor === "string") {
             return retBarColor; // errorMessage
         }
-        renderInfo.bar.barColor = retBarColor;
-        // console.log(renderInfo.bar.barColor);
+        bar.barColor = retBarColor;
+        // console.log(bar.barColor);
 
         // yAxisLocation
         let retYAxisLocation = getStringArrayFromInput(
             "yAxisLocation",
-            yaml?.bar?.yAxisLocation,
+            yamlBar?.yAxisLocation,
             numDatasets,
             "left",
             validateYAxisLocation,
@@ -1420,122 +1416,107 @@ export function getRenderInfoFromYaml(
         if (typeof retYAxisLocation === "string") {
             return retYAxisLocation; // errorMessage
         }
-        renderInfo.bar.yAxisLocation = retYAxisLocation;
-        // console.log(renderInfo.bar.yAxisLocation);
+        bar.yAxisLocation = retYAxisLocation;
+        // console.log(bar.yAxisLocation);
+
+        renderInfo.bar.push(bar);
     } // bar related parameters
+    // console.log(renderInfo.bar);
+
     // summary related parameters
-    if (renderInfo.output === OutputType.Summary) {
-        renderInfo.summary = new SummaryInfo();
-
-        if (yaml.summary !== null) {
-            let keysOfSummaryInfo = getAvailableKeysOfClass(renderInfo.summary);
-            let keysFoundInYAML = getAvailableKeysOfClass(yaml.summary);
-            // console.log(keysOfSummaryInfo);
-            // console.log(keysFoundInYAML);
-            for (let key of keysFoundInYAML) {
-                if (!keysOfSummaryInfo.includes(key)) {
-                    errorMessage = "'" + key + "' is not an available key";
-                    return errorMessage;
-                }
+    for (let summaryKey of yamlSummaryKeys) {
+        let summary = new SummaryInfo();
+        let yamlSummary = yaml[summaryKey];
+
+        let keysOfSummaryInfo = getAvailableKeysOfClass(summary);
+        let keysFoundInYAML = getAvailableKeysOfClass(yamlSummary);
+        // console.log(keysOfSummaryInfo);
+        // console.log(keysFoundInYAML);
+        for (let key of keysFoundInYAML) {
+            if (!keysOfSummaryInfo.includes(key)) {
+                errorMessage = "'" + key + "' is not an available key";
+                return errorMessage;
             }
         }
 
-        if (yaml.summary !== null) {
-            // template
-            if (typeof yaml.summary.template === "string") {
-                renderInfo.summary.template = yaml.summary.template;
-            }
-            if (typeof yaml.summary.style === "string") {
-                renderInfo.summary.style = yaml.summary.style;
-            }
+        // template
+        if (typeof yamlSummary?.template === "string") {
+            summary.template = yamlSummary.template;
         }
+        if (typeof yamlSummary?.style === "string") {
+            summary.style = yamlSummary.style;
+        }
+
+        renderInfo.summary.push(summary);
     } // summary related parameters
+
     // Month related parameters
-    if (renderInfo.output === OutputType.Month) {
-        renderInfo.month = new MonthInfo();
-
-        if (yaml.month !== null) {
-            let keysOfMonthInfo = getAvailableKeysOfClass(renderInfo.month);
-            let keysFoundInYAML = getAvailableKeysOfClass(yaml.month);
-            // console.log(keysOfSummaryInfo);
-            // console.log(keysFoundInYAML);
-            for (let key of keysFoundInYAML) {
-                if (!keysOfMonthInfo.includes(key)) {
-                    errorMessage = "'" + key + "' is not an available key";
-                    return errorMessage;
-                }
+    for (let monthKey of yamlMonthKeys) {
+        let month = new MonthInfo();
+        let yamlMonth = yaml[monthKey];
+
+        let keysOfMonthInfo = getAvailableKeysOfClass(month);
+        let keysFoundInYAML = getAvailableKeysOfClass(yamlMonth);
+        // console.log(keysOfSummaryInfo);
+        // console.log(keysFoundInYAML);
+        for (let key of keysFoundInYAML) {
+            if (!keysOfMonthInfo.includes(key)) {
+                errorMessage = "'" + key + "' is not an available key";
+                return errorMessage;
             }
         }
 
-        if (yaml.month !== null) {
-            if (typeof yaml.month.startWeekOn === "string") {
-                renderInfo.month.startWeekOn = yaml.month.startWeekOn;
-            }
+        if (typeof yamlMonth?.startWeekOn === "string") {
+            month.startWeekOn = yamlMonth.startWeekOn;
         }
     } // Month related parameters
+    // console.log(renderInfo.month);
+
     // Bullet related parameters
-    if (renderInfo.output === OutputType.Bullet) {
-        renderInfo.bullet = new BulletInfo();
-
-        if (yaml.bullet !== null) {
-            let keysOfBulletInfo = getAvailableKeysOfClass(renderInfo.bullet);
-            let keysFoundInYAML = getAvailableKeysOfClass(yaml.bullet);
-            // console.log(keysOfSummaryInfo);
-            // console.log(keysFoundInYAML);
-            for (let key of keysFoundInYAML) {
-                if (!keysOfBulletInfo.includes(key)) {
-                    errorMessage = "'" + key + "' is not an available key";
-                    return errorMessage;
-                }
+    for (let bulletKey of yamlBulletKeys) {
+        let bullet = new BulletInfo();
+        let yamlBullet = yaml[bulletKey];
+
+        let keysOfBulletInfo = getAvailableKeysOfClass(bullet);
+        let keysFoundInYAML = getAvailableKeysOfClass(yamlBullet);
+        // console.log(keysOfSummaryInfo);
+        // console.log(keysFoundInYAML);
+        for (let key of keysFoundInYAML) {
+            if (!keysOfBulletInfo.includes(key)) {
+                errorMessage = "'" + key + "' is not an available key";
+                return errorMessage;
             }
         }
 
-        if (yaml.bullet !== null) {
-            // title
-            if (typeof yaml.bullet.title === "string") {
-                renderInfo.bullet.title = yaml.bullet.title;
-            }
-            // console.log(renderInfo.bullet.title);
+        // title
+        if (typeof yamlBullet?.title === "string") {
+            bullet.title = yamlBullet.title;
+        }
+        // console.log(bullet.title);
 
-            // dataset
-            if (typeof yaml.bullet.dataset === "string") {
-                renderInfo.bullet.dataset = yaml.bullet.dataset;
-            }
-            // console.log(renderInfo.bullet.dataset);
+        // dataset
+        if (typeof yamlBullet?.dataset === "string") {
+            bullet.dataset = yamlBullet.dataset;
+        }
+        // console.log(bullet.dataset);
 
-            // orientation
-            if (typeof yaml.bullet.orientation === "string") {
-                renderInfo.bullet.orientation = yaml.bullet.orientation;
-            }
-            // console.log(renderInfo.bullet.orientation);
+        // orientation
+        if (typeof yamlBullet?.orientation === "string") {
+            bullet.orientation = yamlBullet.orientation;
+        }
+        // console.log(bullet.orientation);
 
-            // range
-            let range: Array<number> = [];
-            if (
-                typeof yaml.bullet.range === "object" &&
-                yaml.bullet.range !== null
-            ) {
-                if (Array.isArray(yaml.bullet.range)) {
-                    for (let r of yaml.bullet.range) {
-                        if (typeof r === "string") {
-                            let v = parseFloat(r);
-                            if (Number.isNumber(v)) {
-                                range.push(v);
-                            } else {
-                                errorMessage =
-                                    "Parameter 'range' accepts only numbers";
-                                return errorMessage;
-                            }
-                        }
-                    }
-                }
-            } else if (typeof yaml.bullet.range === "string") {
-                let splitted = yaml.bullet.range.split(",");
-                if (splitted.length > 1) {
-                    for (let piece of splitted) {
-                        let v = parseFloat(piece.trim());
-                        if (!Number.isNaN(v)) {
-                            // Number.isNumber(NaN) --> true
+        // range
+        let range: Array<number> = [];
+        if (
+            typeof yamlBullet?.range === "object" &&
+            yamlBullet?.range !== null
+        ) {
+            if (Array.isArray(yamlBullet.range)) {
+                for (let r of yamlBullet.range) {
+                    if (typeof r === "string") {
+                        let v = parseFloat(r);
+                        if (Number.isNumber(v)) {
                             range.push(v);
                         } else {
                             errorMessage =
@@ -1543,102 +1524,119 @@ export function getRenderInfoFromYaml(
                             return errorMessage;
                         }
                     }
-                } else if (yaml.bullet.range === "") {
-                    errorMessage = "Empty range is not allowed.";
-                } else {
-                    let v = parseFloat(yaml.bullet.range);
-                    if (Number.isNumber(v)) {
+                }
+            }
+        } else if (typeof yamlBullet?.range === "string") {
+            let splitted = yamlBullet?.range.split(",");
+            if (splitted.length > 1) {
+                for (let piece of splitted) {
+                    let v = parseFloat(piece.trim());
+                    if (!Number.isNaN(v)) {
+                        // Number.isNumber(NaN) --> true
                         range.push(v);
                     } else {
                         errorMessage = "Parameter 'range' accepts only numbers";
                         return errorMessage;
                     }
                 }
+            } else if (yamlBullet?.range === "") {
+                errorMessage = "Empty range is not allowed.";
             } else {
-                errorMessage = "Invalid range";
-                return errorMessage;
-            }
-            // Check the value is monotonically increasing
-            // Check the value is not negative
-            if (range.length === 1) {
-                if (range[0] < 0) {
-                    errorMessage = "Negative range value is not allowed";
-                    return errorMessage;
-                }
-            } else if (range.length > 1) {
-                let lastBound = range[0];
-                if (lastBound < 0) {
-                    errorMessage = "Negative range value is not allowed";
-                    return errorMessage;
+                let v = parseFloat(yamlBullet?.range);
+                if (Number.isNumber(v)) {
+                    range.push(v);
                 } else {
-                    for (let ind = 1; ind < range.length; ind++) {
-                        if (range[ind] <= lastBound) {
-                            errorMessage =
-                                "Values in parameter 'range' should be monotonically increasing";
-                            return errorMessage;
-                        }
-                    }
+                    errorMessage = "Parameter 'range' accepts only numbers";
+                    return errorMessage;
                 }
-            } else {
-                errorMessage = "Empty range is not allowed";
+            }
+        } else {
+            errorMessage = "Invalid range";
+            return errorMessage;
+        }
+        // Check the value is monotonically increasing
+        // Check the value is not negative
+        if (range.length === 1) {
+            if (range[0] < 0) {
+                errorMessage = "Negative range value is not allowed";
                 return errorMessage;
             }
-            renderInfo.bullet.range = range;
-            let numRange = range.length;
-            // console.log(renderInfo.bullet.range);
-
-            // range color
-            let retRangeColor = getStringArrayFromInput(
-                "rangeColor",
-                yaml?.bullet?.rangeColor,
-                numRange,
-                "",
-                validateColor,
-                true
-            );
-            if (typeof retRangeColor === "string") {
-                return retRangeColor; // errorMessage
+        } else if (range.length > 1) {
+            let lastBound = range[0];
+            if (lastBound < 0) {
+                errorMessage = "Negative range value is not allowed";
+                return errorMessage;
+            } else {
+                for (let ind = 1; ind < range.length; ind++) {
+                    if (range[ind] <= lastBound) {
+                        errorMessage =
+                            "Values in parameter 'range' should be monotonically increasing";
+                        return errorMessage;
+                    }
+                }
             }
-            renderInfo.bullet.rangeColor = retRangeColor;
-            // console.log(renderInfo.bullet.rangeColor);
+        } else {
+            errorMessage = "Empty range is not allowed";
+            return errorMessage;
+        }
+        bullet.range = range;
+        let numRange = range.length;
+        // console.log(renderInfo.bullet.range);
+
+        // range color
+        let retRangeColor = getStringArrayFromInput(
+            "rangeColor",
+            yamlBullet?.rangeColor,
+            numRange,
+            "",
+            validateColor,
+            true
+        );
+        if (typeof retRangeColor === "string") {
+            return retRangeColor; // errorMessage
+        }
+        bullet.rangeColor = retRangeColor;
+        // console.log(bullet.rangeColor);
 
-            // actual value, can possess template variable
-            if (typeof yaml.bullet.value === "string") {
-                renderInfo.bullet.value = yaml.bullet.value;
-            }
-            // console.log(renderInfo.bullet.value);
+        // actual value, can possess template variable
+        if (typeof yamlBullet?.value === "string") {
+            bullet.value = yamlBullet.value;
+        }
+        // console.log(bullet.value);
 
-            // value unit
-            if (typeof yaml.bullet.valueUnit === "string") {
-                renderInfo.bullet.valueUnit = yaml.bullet.valueUnit;
-            }
-            // console.log(renderInfo.bullet.valueUnit);
+        // value unit
+        if (typeof yamlBullet?.valueUnit === "string") {
+            bullet.valueUnit = yamlBullet.valueUnit;
+        }
+        // console.log(bullet.valueUnit);
 
-            // value color
-            if (typeof yaml.bullet.valueColor === "string") {
-                renderInfo.bullet.valueColor = yaml.bullet.valueColor;
-            }
-            // console.log(renderInfo.bullet.valueColor);
+        // value color
+        if (typeof yamlBullet?.valueColor === "string") {
+            bullet.valueColor = yamlBullet.valueColor;
+        }
+        // console.log(bullet.valueColor);
 
-            // show mark
-            if (typeof yaml.bullet.showMarker === "boolean") {
-                renderInfo.bullet.showMarker = yaml.bullet.showMarker;
-            }
-            // console.log(renderInfo.bullet.showMark);
+        // show mark
+        if (typeof yamlBullet?.showMarker === "boolean") {
+            bullet.showMarker = yamlBullet.showMarker;
+        }
+        // console.log(bullet.showMark);
 
-            // mark value
-            if (typeof yaml.bullet.markerValue === "number") {
-                renderInfo.bullet.markerValue = yaml.bullet.markerValue;
-            }
-            // console.log(renderInfo.bullet.markValue);
+        // mark value
+        if (typeof yamlBullet?.markerValue === "number") {
+            bullet.markerValue = yamlBullet.markerValue;
+        }
+        // console.log(bullet.markValue);
 
-            // mark color
-            if (typeof yaml.bullet.markerColor === "string") {
-                renderInfo.bullet.markerColor = yaml.bullet.markerColor;
-            }
-            // console.log(renderInfo.bullet.markValue);
+        // mark color
+        if (typeof yamlBullet?.markerColor === "string") {
+            bullet.markerColor = yamlBullet.markerColor;
         }
+        // console.log(bullet.markValue);
+
+        renderInfo.bullet.push(bullet);
     } // Bullet related parameters
+    // console.log(renderInfo.bullet);
 
     return renderInfo;
 }
diff --git a/src/rendering.ts b/src/rendering.ts
index 446332c..e2fea3c 100644
--- a/src/rendering.ts
+++ b/src/rendering.ts
@@ -10,7 +10,12 @@ import {
     ChartElements,
     OutputType,
     ValueType,
+    CommonChartInfo,
+    LineInfo,
+    BarInfo,
+    SummaryInfo,
     BulletInfo,
+    MonthInfo,
 } from "./data";
 import * as summary from "./summary";
 import * as month from "./month";
@@ -140,34 +145,46 @@ export function render(canvas: HTMLElement, renderInfo: RenderInfo) {
         }
     }
 
-    switch (renderInfo.output) {
-        case OutputType.Line:
-            return renderLineChart(canvas, renderInfo);
-        case OutputType.Bar:
-            return renderBarChart(canvas, renderInfo);
-        case OutputType.Summary:
-            return summary.renderSummary(canvas, renderInfo);
-        case OutputType.Month:
-            return month.renderMonth(canvas, renderInfo);
-        case OutputType.Bullet:
-            return bullet.renderBullet(canvas, renderInfo);
-        default:
-            return "Unknown output type";
+    for (let lineInfo of renderInfo.line) {
+        let ret = renderLineChart(canvas, renderInfo, lineInfo);
+        if (typeof ret === "string") {
+            return ret;
+        }
+    }
+    for (let barInfo of renderInfo.bar) {
+        let ret = renderBarChart(canvas, renderInfo, barInfo);
+        if (typeof ret === "string") {
+            return ret;
+        }
+    }
+    for (let summaryInfo of renderInfo.summary) {
+        let ret = summary.renderSummary(canvas, renderInfo, summaryInfo);
+        if (typeof ret === "string") {
+            return ret;
+        }
+    }
+    for (let bulletInfo of renderInfo.bullet) {
+        let ret = bullet.renderBullet(canvas, renderInfo, bulletInfo);
+        if (typeof ret === "string") {
+            return ret;
+        }
+    }
+    for (let monthInfo of renderInfo.month) {
+        let ret = month.renderMonth(canvas, renderInfo, monthInfo);
+        if (typeof ret === "string") {
+            return ret;
+        }
     }
 }
 
-function renderXAxis(chartElements: ChartElements, renderInfo: RenderInfo) {
+function renderXAxis(
+    chartElements: ChartElements,
+    renderInfo: RenderInfo,
+    chartInfo: CommonChartInfo
+) {
     // console.log("renderXAxis");
 
-    let chartInfo = null;
-    if (renderInfo.output === OutputType.Line) {
-        chartInfo = renderInfo.line;
-    } else if (renderInfo.output === OutputType.Bar) {
-        chartInfo = renderInfo.bar;
-    } else {
-        return;
-    }
-    if (!chartInfo) return;
+    if (!renderInfo || !chartInfo) return;
 
     let datasets = renderInfo.datasets;
     let xDomain = d3.extent(datasets.getDates());
@@ -240,6 +257,7 @@ function renderXAxis(chartElements: ChartElements, renderInfo: RenderInfo) {
 function renderYAxis(
     chartElements: ChartElements,
     renderInfo: RenderInfo,
+    chartInfo: CommonChartInfo,
     yAxisLocation: string,
     datasetIds: Array<number>
 ) {
@@ -248,15 +266,7 @@ function renderYAxis(
     // console.log(renderInfo);
     // console.log(datasetIds);
 
-    let chartInfo = null;
-    if (renderInfo.output === OutputType.Line) {
-        chartInfo = renderInfo.line;
-    } else if (renderInfo.output === OutputType.Bar) {
-        chartInfo = renderInfo.bar;
-    } else {
-        return;
-    }
-    if (!chartInfo) return;
+    if (!renderInfo || !chartInfo) return;
 
     let datasets = renderInfo.datasets;
     if (datasetIds.length === 0) {
@@ -342,7 +352,7 @@ function renderYAxis(
         yUpper = yMax + yExtent * 0.2;
     }
     // if it is bar chart, zero must be contained in the range
-    if (renderInfo.output === OutputType.Bar) {
+    if (chartInfo.GetChartType() === OutputType.Bar) {
         if (yUpper < 0.0) {
             yUpper = 0;
         }
@@ -505,16 +515,14 @@ function renderYAxis(
 function renderLine(
     chartElements: ChartElements,
     renderInfo: RenderInfo,
+    lineInfo: LineInfo,
     dataset: Dataset,
     yAxisLocation: string
 ) {
     // console.log(dataset);
     // console.log(renderInfo);
 
-    if (renderInfo.output !== OutputType.Line) return;
-
-    let lineInfo = renderInfo.line;
-    if (!lineInfo) return;
+    if (!renderInfo || !lineInfo) return;
 
     let yScale: any = null;
     if (yAxisLocation === "left") {
@@ -560,16 +568,14 @@ function renderLine(
 function renderPoints(
     chartElements: ChartElements,
     renderInfo: RenderInfo,
+    lineInfo: LineInfo,
     dataset: Dataset,
     yAxisLocation: string
 ) {
     // console.log(lineInfo);
     // console.log(dataset);
 
-    if (renderInfo.output !== OutputType.Line) return;
-
-    let lineInfo = renderInfo.line;
-    if (!lineInfo) return;
+    if (!renderInfo || !lineInfo) return;
 
     let yScale: any = null;
     if (yAxisLocation === "left") {
@@ -697,6 +703,7 @@ function renderPoints(
 function renderBar(
     chartElements: ChartElements,
     renderInfo: RenderInfo,
+    barInfo: BarInfo,
     dataset: Dataset,
     yAxisLocation: string,
     currBarSet: number,
@@ -706,10 +713,7 @@ function renderBar(
     // console.log(barInfo);
     // console.log("%d/%d", currBarSet, totalNumOfBarSets);
 
-    if (renderInfo.output !== OutputType.Bar) return;
-
-    let barInfo = renderInfo.bar;
-    if (!barInfo) return;
+    if (!renderInfo || !barInfo) return;
 
     let barGap = 1;
     let barSetWidth = renderInfo.dataAreaSize.width / dataset.getLength();
@@ -791,18 +795,14 @@ function renderBar(
     }
 }
 
-function renderLegend(chartElements: ChartElements, renderInfo: RenderInfo) {
+function renderLegend(
+    chartElements: ChartElements,
+    renderInfo: RenderInfo,
+    chartInfo: CommonChartInfo
+) {
     // console.log(renderInfo.legendPosition);
     // console.log(renderInfo.legendOrientation);
 
-    // Get chart info
-    let chartInfo = null;
-    if (renderInfo.output === OutputType.Line) {
-        chartInfo = renderInfo.line;
-    } else if (renderInfo.output === OutputType.Bar) {
-        chartInfo = renderInfo.bar;
-    }
-
     // Get chart elements
     let svg = chartElements.svg;
     let graphArea = chartElements.graphArea;
@@ -954,7 +954,7 @@ function renderLegend(chartElements: ChartElements, renderInfo: RenderInfo) {
     let firstLabelY = firstMarkerY;
 
     if (chartInfo.legendOrientation === "vertical") {
-        if (renderInfo.output === OutputType.Line) {
+        if (chartInfo.GetChartType() === OutputType.Line) {
             // lines
             legend
                 .selectAll("markers")
@@ -979,9 +979,7 @@ function renderLegend(chartElements: ChartElements, renderInfo: RenderInfo) {
                 })
                 .style("stroke", function (name: string, i: number) {
                     if (xDatasetIds.includes(i)) return;
-                    return datasets
-                        .getDatasetById(i)
-                        .getLineInfo().lineColor[i];
+                    return (chartInfo as LineInfo).lineColor[i];
                 });
 
             // points
@@ -1000,19 +998,16 @@ function renderLegend(chartElements: ChartElements, renderInfo: RenderInfo) {
                 })
                 .attr("r", function (name: string, i: number) {
                     if (xDatasetIds.includes(i)) return;
-                    if (datasets.getDatasetById(i).getLineInfo().showPoint[i]) {
-                        return datasets.getDatasetById(i).getLineInfo()
-                            .pointSize[i];
+                    if ((chartInfo as LineInfo).showPoint[i]) {
+                        return (chartInfo as LineInfo).pointSize[i];
                     }
                     return 0.0;
                 })
                 .style("fill", function (name: string, i: number) {
                     if (xDatasetIds.includes(i)) return;
-                    return datasets
-                        .getDatasetById(i)
-                        .getLineInfo().pointColor[i];
+                    return (chartInfo as LineInfo).pointColor[i];
                 });
-        } else if (renderInfo.output === OutputType.Bar) {
+        } else if (chartInfo.GetChartType() === OutputType.Bar) {
             // bars
             legend
                 .selectAll("markers")
@@ -1031,7 +1026,7 @@ function renderLegend(chartElements: ChartElements, renderInfo: RenderInfo) {
                 .attr("height", nameHeight)
                 .style("fill", function (name: string, i: number) {
                     if (xDatasetIds.includes(i)) return;
-                    return datasets.getDatasetById(i).getBarInfo().barColor[i];
+                    return (chartInfo as BarInfo).barColor[i];
                 });
         }
 
@@ -1056,21 +1051,21 @@ function renderLegend(chartElements: ChartElements, renderInfo: RenderInfo) {
             .style("alignment-baseline", "middle")
             .attr("class", "tracker-legend-label");
 
-        if (renderInfo.output === OutputType.Line) {
+        if (chartInfo.GetChartType() === OutputType.Line) {
             nameLabels.style("fill", function (name: string, i: number) {
                 if (xDatasetIds.includes(i)) return;
-                return datasets.getDatasetById(i).getLineInfo().lineColor[i];
+                return (chartInfo as LineInfo).lineColor[i];
             });
-        } else if (renderInfo.output === OutputType.Bar) {
+        } else if (chartInfo.GetChartType() === OutputType.Bar) {
             nameLabels.style("fill", function (name: string, i: number) {
                 if (xDatasetIds.includes(i)) return;
-                return datasets.getDatasetById(i).getBarInfo().barColor[i];
+                return (chartInfo as BarInfo).barColor[i];
             });
         }
     } else if (chartInfo.legendOrientation === "horizontal") {
         let currRenderPosX = 0.0;
         let currRenderPosX2 = 0.0;
-        if (renderInfo.output === OutputType.Line) {
+        if (chartInfo.GetChartType() === OutputType.Line) {
             // lines
             legend
                 .selectAll("markers")
@@ -1113,9 +1108,7 @@ function renderLegend(chartElements: ChartElements, renderInfo: RenderInfo) {
                 .attr("y2", firstMarkerY)
                 .style("stroke", function (name: string, i: number) {
                     if (xDatasetIds.includes(i)) return;
-                    return datasets
-                        .getDatasetById(i)
-                        .getLineInfo().lineColor[i];
+                    return (chartInfo as LineInfo).lineColor[i];
                 });
 
             // points
@@ -1144,19 +1137,16 @@ function renderLegend(chartElements: ChartElements, renderInfo: RenderInfo) {
                 .attr("cy", firstMarkerY)
                 .attr("r", function (name: string, i: number) {
                     if (xDatasetIds.includes(i)) return;
-                    if (datasets.getDatasetById(i).getLineInfo().showPoint[i]) {
-                        return datasets.getDatasetById(i).getLineInfo()
-                            .pointSize[i];
+                    if ((chartInfo as LineInfo).showPoint[i]) {
+                        return (chartInfo as LineInfo).pointSize[i];
                     }
                     return 0.0;
                 })
                 .style("fill", function (name: string, i: number) {
                     if (xDatasetIds.includes(i)) return;
-                    return datasets
-                        .getDatasetById(i)
-                        .getLineInfo().pointColor[i];
+                    return (chartInfo as LineInfo).pointColor[i];
                 });
-        } else if (renderInfo.output === OutputType.Bar) {
+        } else if (chartInfo.GetChartType() === OutputType.Bar) {
             // bars
             currRenderPosX = 0.0;
             legend
@@ -1189,7 +1179,7 @@ function renderLegend(chartElements: ChartElements, renderInfo: RenderInfo) {
                 .attr("height", nameHeight)
                 .style("fill", function (name: string, i: number) {
                     if (xDatasetIds.includes(i)) return;
-                    return datasets.getDatasetById(i).getBarInfo().barColor[i];
+                    return (chartInfo as BarInfo).barColor[i];
                 });
         }
 
@@ -1221,33 +1211,29 @@ function renderLegend(chartElements: ChartElements, renderInfo: RenderInfo) {
             .style("alignment-baseline", "middle")
             .attr("class", "tracker-legend-label");
 
-        if (renderInfo.output === OutputType.Line) {
+        if (chartInfo.GetChartType() === OutputType.Line) {
             nameLabels.style("fill", function (name: string, i: number) {
                 if (xDatasetIds.includes(i)) return;
-                return datasets.getDatasetById(i).getLineInfo().lineColor[i];
+                return (chartInfo as LineInfo).lineColor[i];
             });
-        } else if (renderInfo.output === OutputType.Bar) {
+        } else if (chartInfo.GetChartType() === OutputType.Bar) {
             nameLabels.style("fill", function (name: string, i: number) {
                 if (xDatasetIds.includes(i)) return;
-                return datasets.getDatasetById(i).getBarInfo().barColor[i];
+                return (chartInfo as BarInfo).barColor[i];
             });
         }
     }
 }
 
-function renderTitle(chartElements: ChartElements, renderInfo: RenderInfo) {
+function renderTitle(
+    chartElements: ChartElements,
+    renderInfo: RenderInfo,
+    chartInfo: CommonChartInfo
+) {
     // console.log("renderTitle")
     // under graphArea
 
-    let chartInfo = null;
-    if (renderInfo.output === OutputType.Line) {
-        chartInfo = renderInfo.line;
-    } else if (renderInfo.output === OutputType.Bar) {
-        chartInfo = renderInfo.bar;
-    } else {
-        return;
-    }
-    if (!chartInfo) return;
+    if (!renderInfo || !chartInfo) return;
 
     if (!chartInfo.title) return;
     let titleSize = helper.measureTextSize(chartInfo.title, "tracker-title");
@@ -1361,25 +1347,30 @@ function createAreas(
     return chartElements;
 }
 
-function renderLineChart(canvas: HTMLElement, renderInfo: RenderInfo) {
+function renderLineChart(
+    canvas: HTMLElement,
+    renderInfo: RenderInfo,
+    lineInfo: LineInfo
+) {
     // console.log("renderLineChart");
     // console.log(renderInfo);
-    if (renderInfo.line === null) return;
+
+    if (!renderInfo || !lineInfo) return;
 
     let chartElements = createAreas(canvas, renderInfo);
 
-    renderTitle(chartElements, renderInfo);
+    renderTitle(chartElements, renderInfo, lineInfo);
 
-    renderXAxis(chartElements, renderInfo);
+    renderXAxis(chartElements, renderInfo, lineInfo);
     // console.log(chartElements.xAxis);
     // console.log(chartElements.xScale);
 
     let datasetOnLeftYAxis = [];
     let datasetOnRightYAxis = [];
     let xDatasetIds = renderInfo.datasets.getXDatasetIds();
-    for (let ind = 0; ind < renderInfo.line.yAxisLocation.length; ind++) {
+    for (let ind = 0; ind < lineInfo.yAxisLocation.length; ind++) {
         if (xDatasetIds.includes(ind)) continue;
-        let yAxisLocation = renderInfo.line.yAxisLocation[ind];
+        let yAxisLocation = lineInfo.yAxisLocation[ind];
         if (yAxisLocation.toLowerCase() === "left") {
             datasetOnLeftYAxis.push(ind);
         } else if (yAxisLocation.toLocaleLowerCase() === "right") {
@@ -1390,6 +1381,7 @@ function renderLineChart(canvas: HTMLElement, renderInfo: RenderInfo) {
     let retRenderLeftYAxis = renderYAxis(
         chartElements,
         renderInfo,
+        lineInfo,
         "left",
         datasetOnLeftYAxis
     );
@@ -1402,15 +1394,16 @@ function renderLineChart(canvas: HTMLElement, renderInfo: RenderInfo) {
             let dataset = renderInfo.datasets.getDatasetById(datasetId);
             if (dataset.getQuery().usedAsXDataset) continue;
 
-            renderLine(chartElements, renderInfo, dataset, "left");
+            renderLine(chartElements, renderInfo, lineInfo, dataset, "left");
 
-            renderPoints(chartElements, renderInfo, dataset, "left");
+            renderPoints(chartElements, renderInfo, lineInfo, dataset, "left");
         }
     }
 
     let retRenderRightYAxis = renderYAxis(
         chartElements,
         renderInfo,
+        lineInfo,
         "right",
         datasetOnRightYAxis
     );
@@ -1423,36 +1416,40 @@ function renderLineChart(canvas: HTMLElement, renderInfo: RenderInfo) {
             let dataset = renderInfo.datasets.getDatasetById(datasetId);
             if (dataset.getQuery().usedAsXDataset) continue;
 
-            renderLine(chartElements, renderInfo, dataset, "right");
+            renderLine(chartElements, renderInfo, lineInfo, dataset, "right");
 
-            renderPoints(chartElements, renderInfo, dataset, "right");
+            renderPoints(chartElements, renderInfo, lineInfo, dataset, "right");
         }
     }
 
-    if (renderInfo.line.showLegend) {
-        renderLegend(chartElements, renderInfo);
+    if (lineInfo.showLegend) {
+        renderLegend(chartElements, renderInfo, lineInfo);
     }
 
     setChartScale(canvas, chartElements, renderInfo);
 }
 
-function renderBarChart(canvas: HTMLElement, renderInfo: RenderInfo) {
+function renderBarChart(
+    canvas: HTMLElement,
+    renderInfo: RenderInfo,
+    barInfo: BarInfo
+) {
     // console.log("renderBarChart");
     // console.log(renderInfo);
-    if (renderInfo.bar === null) return;
+    if (!renderInfo || !barInfo) return;
 
     let chartElements = createAreas(canvas, renderInfo);
 
-    renderTitle(chartElements, renderInfo);
+    renderTitle(chartElements, renderInfo, barInfo);
 
-    renderXAxis(chartElements, renderInfo);
+    renderXAxis(chartElements, renderInfo, barInfo);
 
     let datasetOnLeftYAxis = [];
     let datasetOnRightYAxis = [];
     let xDatasetIds = renderInfo.datasets.getXDatasetIds();
-    for (let ind = 0; ind < renderInfo.bar.yAxisLocation.length; ind++) {
+    for (let ind = 0; ind < barInfo.yAxisLocation.length; ind++) {
         if (xDatasetIds.includes(ind)) continue;
-        let yAxisLocation = renderInfo.bar.yAxisLocation[ind];
+        let yAxisLocation = barInfo.yAxisLocation[ind];
         if (yAxisLocation.toLowerCase() === "left") {
             datasetOnLeftYAxis.push(ind);
         } else if (yAxisLocation.toLocaleLowerCase() === "right") {
@@ -1464,6 +1461,7 @@ function renderBarChart(canvas: HTMLElement, renderInfo: RenderInfo) {
     let retRenderLeftYAxis = renderYAxis(
         chartElements,
         renderInfo,
+        barInfo,
         "left",
         datasetOnLeftYAxis
     );
@@ -1483,6 +1481,7 @@ function renderBarChart(canvas: HTMLElement, renderInfo: RenderInfo) {
             renderBar(
                 chartElements,
                 renderInfo,
+                barInfo,
                 dataset,
                 "left",
                 currBarSet,
@@ -1496,6 +1495,7 @@ function renderBarChart(canvas: HTMLElement, renderInfo: RenderInfo) {
     let retRenderRightYAxis = renderYAxis(
         chartElements,
         renderInfo,
+        barInfo,
         "right",
         datasetOnRightYAxis
     );
@@ -1511,6 +1511,7 @@ function renderBarChart(canvas: HTMLElement, renderInfo: RenderInfo) {
             renderBar(
                 chartElements,
                 renderInfo,
+                barInfo,
                 dataset,
                 "right",
                 currBarSet,
@@ -1521,8 +1522,8 @@ function renderBarChart(canvas: HTMLElement, renderInfo: RenderInfo) {
         }
     }
 
-    if (renderInfo.bar.showLegend) {
-        renderLegend(chartElements, renderInfo);
+    if (barInfo.showLegend) {
+        renderLegend(chartElements, renderInfo, barInfo);
     }
 
     setChartScale(canvas, chartElements, renderInfo);
diff --git a/src/summary.ts b/src/summary.ts
index 0fd0fb9..0a13865 100644
--- a/src/summary.ts
+++ b/src/summary.ts
@@ -1,19 +1,23 @@
 import * as d3 from "d3";
-import { RenderInfo } from "./data";
+import { RenderInfo, SummaryInfo } from "./data";
 import * as expr from "./expr";
 
 function checkSummaryTemplateValid(summaryTemplate: string): boolean {
     return true;
 }
 
-export function renderSummary(canvas: HTMLElement, renderInfo: RenderInfo) {
+export function renderSummary(
+    canvas: HTMLElement,
+    renderInfo: RenderInfo,
+    summaryInfo: SummaryInfo
+) {
     // console.log("renderSummary");
     // console.log(renderInfo);
-    if (renderInfo.summary === null) return;
+    if (!renderInfo || !summaryInfo) return;
 
     let outputSummary = "";
-    if (checkSummaryTemplateValid(renderInfo.summary.template)) {
-        outputSummary = renderInfo.summary.template;
+    if (checkSummaryTemplateValid(summaryInfo.template)) {
+        outputSummary = summaryInfo.template;
     } else {
         return "Invalid summary template";
     }
@@ -30,8 +34,8 @@ export function renderSummary(canvas: HTMLElement, renderInfo: RenderInfo) {
             textBlock.text(outputSummary);
         }
 
-        if (renderInfo.summary.style !== "") {
-            textBlock.attr("style", renderInfo.summary.style);
+        if (summaryInfo.style !== "") {
+            textBlock.attr("style", summaryInfo.style);
         }
     }
 }

From 62231d1fac9e10869c59d1f97f4f1200f89050ea Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 12 Jun 2021 21:09:59 +0800
Subject: [PATCH 054/402] Add targets for word counting to type fileMeta

---
 examples/TestFileMeta.md     | 35 +++++++++++++++++++++++++
 examples/TestWordCounting.md | 35 +++++++++++++++++++++++++
 src/collecting.ts            | 17 +++++++++---
 src/helper.ts                | 50 ++++++++++++++++++++++++++++++++++++
 src/main.ts                  |  8 ++++++
 5 files changed, 142 insertions(+), 3 deletions(-)
 create mode 100644 examples/TestFileMeta.md
 create mode 100644 examples/TestWordCounting.md

diff --git a/examples/TestFileMeta.md b/examples/TestFileMeta.md
new file mode 100644
index 0000000..d1436a9
--- /dev/null
+++ b/examples/TestFileMeta.md
@@ -0,0 +1,35 @@
+# Test FileMeta
+Track the size variation of diaries 
+``` tracker
+searchType: fileMeta
+searchTarget: size
+folder: diary
+endDate: 2021-01-31
+line:
+    title: File Size Variation
+	yAxisLabel: Size
+	yAxisUnit: bytes
+```
+
+Use file created dates (cDate) as x values
+``` tracker
+searchType: fileMeta, dvField
+searchTarget: cDate, dataviewTarget
+xDataset: 0
+folder: data
+line:
+    fillGap: true
+```
+
+Use file modified dates (mDate) as x values
+``` tracker
+searchType: fileMeta, dvField
+searchTarget: mDate, dataviewTarget
+xDataset: 0
+folder: data
+line:
+    fillGap: true
+```
+
+Please also check those search targets in markdown files under folder 'diary' and 'data'.
+
diff --git a/examples/TestWordCounting.md b/examples/TestWordCounting.md
new file mode 100644
index 0000000..ba9ac03
--- /dev/null
+++ b/examples/TestWordCounting.md
@@ -0,0 +1,35 @@
+# Test Word Counting
+
+``` tracker
+searchType: fileMeta
+searchTarget: numWords, numChars
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-03
+line:
+    title: Word Counting
+	yAxisLocation: left, right
+	yAxisLabel: Words, Characters
+	lineColor: red, yellow
+	yMin: 99, 850
+```
+
+``` tracker
+searchType: fileMeta
+searchTarget: numWords
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-03
+summary:
+    template: 'Total number of words: {{sum}}'
+```
+
+``` tracker
+searchType: fileMeta
+searchTarget: numChars
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-03
+summary:
+    template: 'Total number of characters: {{sum}}'
+```
\ No newline at end of file
diff --git a/src/collecting.ts b/src/collecting.ts
index 956fc0d..0f353f0 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -540,6 +540,7 @@ export function collectDataFromText(
 
 export function collectDataFromFileMeta(
     file: TFile,
+    content: string,
     query: Query,
     renderInfo: RenderInfo,
     dataMap: DataMap,
@@ -551,23 +552,33 @@ export function collectDataFromFileMeta(
         // console.log(file.stat);
 
         let target = query.getTarget();
+        let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
+
         if (target === "cDate") {
             let ctime = file.stat.ctime;
             query.valueType = ValueType.Date;
             query.addNumTargets();
-            let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
             addToDataMap(dataMap, xValue, query, ctime);
         } else if (target === "mDate") {
             let mtime = file.stat.mtime;
             query.valueType = ValueType.Date;
             query.addNumTargets();
-            let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
             addToDataMap(dataMap, xValue, query, mtime);
         } else if (target === "size") {
             let size = file.stat.size;
             query.addNumTargets();
-            let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
             addToDataMap(dataMap, xValue, query, size);
+        } else if (target === "numWords") {
+            let numWords = helper.getWordCount(content);
+            addToDataMap(dataMap, xValue, query, numWords);
+        } else if (target === "numChars") {
+            let numChars = helper.getCharacterCount(content);
+            query.addNumTargets();
+            addToDataMap(dataMap, xValue, query, numChars);
+        } else if (target === "numSentences") {
+            let numSentences = helper.getSentenceCount(content);
+            query.addNumTargets();
+            addToDataMap(dataMap, xValue, query, numSentences);
         }
     }
 }
diff --git a/src/helper.ts b/src/helper.ts
index 71b5a45..1ab2589 100644
--- a/src/helper.ts
+++ b/src/helper.ts
@@ -120,3 +120,53 @@ export function moveArea(area: any, shiftX: number, shiftY: number) {
             ")"
     );
 }
+
+//---------------------------------------------------------------------------------------------------------
+function cleanText(text: string) {
+    // Thanks to torantine
+    // code snippet from https://gist.github.com/torantine/af639cba3c32762576d64c34effaf614
+    text = text.replace(/(^\\s\*)|(\\s\*$)/gi, ""); // remove the start and end spaces of the given string
+    text = text.replace(/\[ \]{2,}/gi, " "); // reduce multiple spaces to a single space
+    text = text.replace(/\\n /, "\\n"); // exclude a new line with a start spacing
+    return text;
+}
+
+// Thanks to lukeleppan for plugin 'better-word-count'
+// Code from https://github.com/lukeleppan/better-word-count/blob/master/src/stats.ts
+export function getWordCount(text: string) {
+    text = cleanText(text);
+
+    // Thanks to liamcane
+    var spaceDelimitedChars =
+        /A-Za-z\u00AA\u00B5\u00BA\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0-\u08B4\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D5F-\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16F1-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2183\u2184\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005\u3006\u3031-\u3035\u303B\u303C\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6E5\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AD\uA7B0-\uA7B7\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA8FD\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC/
+            .source;
+    var nonSpaceDelimitedWords =
+        /[\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u4E00-\u9FD5]{1}/
+            .source;
+    var pattern = new RegExp(
+        [
+            "(?:[0-9]+(?:(?:,|\\.)[0-9]+)*|[\\-" + spaceDelimitedChars + "])+",
+            nonSpaceDelimitedWords,
+        ].join("|"),
+        "g"
+    );
+    return (text.match(pattern) || []).length;
+}
+
+export function getCharacterCount(text: string) {
+    return text.length;
+}
+
+export function getSentenceCount(text: string) {
+    text = cleanText(text);
+
+    // Thanks to Extract Highlights plugin and AngelusDomini
+    // Also https://stackoverflow.com/questions/5553410
+    var sentences =
+        (text || "").match(
+            /[^.。!！?？\s][^.。!！?？]*(?:[.!?](?!['‘’"“”「」『』]?\s|$)[^.。!！?？]*)*[.。!！?？]?['’"”」』]?(?=\s||$)/gm
+        ) || [];
+    var sentencesLength = sentences.length;
+    return sentencesLength;
+}
+//---------------------------------------------------------------------------------------------------------
diff --git a/src/main.ts b/src/main.ts
index 12604e1..5351528 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -178,6 +178,7 @@ export default class Tracker extends Plugin {
             let fileCache: CachedMetadata = null;
             let needFileCache = renderInfo.queries.some((q) => {
                 let type = q.getType();
+                let target = q.getTarget();
                 if (
                     type === SearchType.Frontmatter ||
                     type === SearchType.Tag ||
@@ -194,6 +195,7 @@ export default class Tracker extends Plugin {
             let content: string = null;
             let needContent = renderInfo.queries.some((q) => {
                 let type = q.getType();
+                let target = q.getTarget();
                 if (
                     type === SearchType.Tag ||
                     type === SearchType.Text ||
@@ -201,6 +203,11 @@ export default class Tracker extends Plugin {
                 ) {
                     return true;
                 }
+                else if (type === SearchType.FileMeta) {
+                    if (target === "numWords" || target === "numChars" || target === "numSentences") {
+                        return true;
+                    }
+                }
                 return false;
             });
             if (needContent) {
@@ -380,6 +387,7 @@ export default class Tracker extends Plugin {
                 if (query.getType() === SearchType.FileMeta) {
                     collecting.collectDataFromFileMeta(
                         file,
+                        content,
                         query,
                         renderInfo,
                         dataMap,

From 71bb64a32f378ffdd052f6abf24fcae0b782d646 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 12 Jun 2021 21:22:14 +0800
Subject: [PATCH 055/402] Update documents and examples

---
 docs/Examples.md          |  2 +-
 docs/TargetEvaluation.md  |  3 +++
 examples/Test FileMeta.md | 35 -----------------------------------
 3 files changed, 4 insertions(+), 36 deletions(-)
 delete mode 100644 examples/Test FileMeta.md

diff --git a/docs/Examples.md b/docs/Examples.md
index 8f9be44..8732407 100644
--- a/docs/Examples.md
+++ b/docs/Examples.md
@@ -29,7 +29,7 @@ The following table lists use cases with information of target location (Locatio
 | content | myvalues 1/2/3 | searchType: text<br>searchTarget: 'myvalues\\s+(?\<value\>[0-9]+)/([0-9]+)/([0-9]+), myvalues\\s+([0-9]+)/(?\<value\>[0-9]+)/([0-9]+), myvalues\\s+([0-9]+)/([0-9]+)/(?\<value\>[0-9]+)' | V |
 | table content | { a table filled with dates and values }<br>[example table](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/data/Tables.md) | searchType: table<br>searchTarget: filePath[0][0], filePath[0][1] | V |
 | talbe content | { a table filled with dates and values }<br>[example table](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/data/Tables.md) | searchType: table<br>searchTarget: filePath[1][0], filePath[1][1][0], filePath[1][1][1] | V |
-| file meta | meta data from files (size, cDate, mDate) | searchType: fileMeta<br>searchTarget: size | V |
+| file meta | meta data from files <br>(size, cDate, mDate, numWords, numChars, numSentences) | searchType: fileMeta<br>searchTarget: size | V |
 
 ## Full examples
 
diff --git a/docs/TargetEvaluation.md b/docs/TargetEvaluation.md
index c878ff4..cc1d80a 100644
--- a/docs/TargetEvaluation.md
+++ b/docs/TargetEvaluation.md
@@ -110,5 +110,8 @@ With this search type, you can retrieve infomation of files. Currently, three ki
 - cDate: creation date of a file
 - mDate: last modification date of a file
 - size: file size in bytes
+- numWords: number of words in a file
+- numChars: number of characters in a file (including spaces)
+- numSentences: number of setences in a file
 
 `cData` and `mDate` can be used as X dataset and `size` can be used as Y dataset.
\ No newline at end of file
diff --git a/examples/Test FileMeta.md b/examples/Test FileMeta.md
deleted file mode 100644
index d1436a9..0000000
--- a/examples/Test FileMeta.md	
+++ /dev/null
@@ -1,35 +0,0 @@
-# Test FileMeta
-Track the size variation of diaries 
-``` tracker
-searchType: fileMeta
-searchTarget: size
-folder: diary
-endDate: 2021-01-31
-line:
-    title: File Size Variation
-	yAxisLabel: Size
-	yAxisUnit: bytes
-```
-
-Use file created dates (cDate) as x values
-``` tracker
-searchType: fileMeta, dvField
-searchTarget: cDate, dataviewTarget
-xDataset: 0
-folder: data
-line:
-    fillGap: true
-```
-
-Use file modified dates (mDate) as x values
-``` tracker
-searchType: fileMeta, dvField
-searchTarget: mDate, dataviewTarget
-xDataset: 0
-folder: data
-line:
-    fillGap: true
-```
-
-Please also check those search targets in markdown files under folder 'diary' and 'data'.
-

From 2ee572c1a907617b36f16d7038f442429cb0c0b3 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 12 Jun 2021 21:33:22 +0800
Subject: [PATCH 056/402] Update documents

---
 README.md            |  5 ++++-
 docs/ReleaseNotes.md | 27 +++++++++++++++------------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 3006f0d..a545048 100644
--- a/README.md
+++ b/README.md
@@ -8,8 +8,11 @@ This is an [Obsidian](https://obsidian.md/) plugin that helps you do tracking in
 [Here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Examples.md) is a simplified table of examples showing what you can track.
 
 ## What's New
+Version 1.6.1
+1. Add new targets 'numWords', 'numChars', and 'numSentences' for input type 'fileMeta' ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestWordCounting.md))
+
 Version 1.6.0
-1. Add a new input type 'fileMeta', getting meta data from a file ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/Test%20FileMeta.md))
+1. Add a new input type 'fileMeta', getting meta data from a file ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestFileMeta.md))
 2. Add a new output type 'bullet', rendering a bullet chart ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestBullet.md))
 3. Accept tracking time values ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTimeValues.md))
 4. Allow tracking nested values from front matter
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index 56b490d..3ac740c 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,6 +1,9 @@
 # Release Notes
 
-### v1.6.0
+## v1.6.1
+- Add new targets 'numWords', 'numChars', and 'numSentences' for input type 'fileMeta'
+
+## v1.6.0
 - Add a new input type 'fileMeta', getting meta data from a file
 - Add a new output type 'bullet', rendering a bullet chart
 - Enhancement
@@ -11,11 +14,11 @@
     - Allow parsing date in wiki brackets
 - Fixed bugs
 
-### v1.5.1
+## v1.5.1
 - Fixed labels not shown in light theme
 - Enhanced error handling for searchType 'table'
 
-### v1.5.0
+## v1.5.0
 - New searchType 'table', searching records from a given table
 - New searchType 'dvField', searching the inline fields used with Dataview plugin
 - Enhance multiple values extraction
@@ -27,48 +30,48 @@
 - Improved performance
 - Reduced package size
 
-### v1.4.1
+## v1.4.1
 - Enhanced error handling
 
-### v1.4.0
+## v1.4.0
 - Add a new parameter (fixedScale) for the scaling of the output chart
 - Add a new parameter (fitPanelWidth) to enable/disable the auto-scaling of the output chart
 - Add a new parameter (margin) to help to position the chart
 - Tested in Obsidian mobile app on iPhone and iPad
 - Fixed bugs
 
-### v1.3.0
+## v1.3.0
 - Support reading and rendering multiple targets
 - Support reading and rendering multiple values (a tuple of values) under a target
 - New output type 'bar', rendering a bar chart
 - Add a legend for the chart output
 - Fixed bugs
 
-### v1.2.1
+## v1.2.1
 - Fixed files with the specified dateFormat are not recognized
 - Restored the plugin's settings panel for dateFormat and folder
 
-### v1.2.0
+## v1.2.0
 - Enable using regular expression in text searching
 - New search type 'frontmatter', searching for key-value pairs in the front matter
 - New search type 'wiki', searching for wiki links
 - Reduced package size
 
-### v1.1.0
+## v1.1.0
 - New output type 'summary'
 - Add commands help create Tracker code blocks
 - Relaxed the regex for searching tags, allowing tags embedded in sentences
 - Fixed issues
 
-### v1.0.2
+## v1.0.2
 - Fixed the searching of nested tag in frontmatter
 - Reduced the package size by using the module from Obsidian
 
-### v1.0.1
+## v1.0.1
 - Remove dependencies to Node.js modules
 - Add example markdown files
 
-### v1.0.0
+## v1.0.0
 First version released at 2021-03-23
 
 - Track simple tags, value-attached tags, and texts using code blocks

From 88cb0140daaba6999d57904cc174185b707227a4 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 12 Jun 2021 21:34:43 +0800
Subject: [PATCH 057/402] Set version to 1.6.1

---
 manifest.json | 2 +-
 package.json  | 2 +-
 versions.json | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index 2179fa0..9f94019 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-tracker",
 	"name": "Tracker",
-	"version": "1.6.0",
+	"version": "1.6.1",
 	"minAppVersion": "0.9.12",
 	"description": "A plugin tracks occurrences and numbers in your notes",
 	"author": "pyrochlore",
diff --git a/package.json b/package.json
index 4253915..78d944e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
diff --git a/versions.json b/versions.json
index c346c9d..00ceaac 100644
--- a/versions.json
+++ b/versions.json
@@ -10,5 +10,6 @@
 	"1.4.1": "0.9.12",
 	"1.5.0": "0.9.12",
 	"1.5.1": "0.9.12",
-	"1.6.0": "0.9.12"
+	"1.6.0": "0.9.12",
+	"1.6.1": "0.9.12"
 }

From dcb66e07279f7de07ce67d9d0b646caba14ab466 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 12 Jun 2021 21:47:33 +0800
Subject: [PATCH 058/402] Update TestWordCounting.md

---
 examples/TestWordCounting.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/examples/TestWordCounting.md b/examples/TestWordCounting.md
index ba9ac03..babab64 100644
--- a/examples/TestWordCounting.md
+++ b/examples/TestWordCounting.md
@@ -5,13 +5,14 @@ searchType: fileMeta
 searchTarget: numWords, numChars
 folder: diary
 startDate: 2021-01-01
-endDate: 2021-01-03
+endDate: 2021-01-05
+datasetName: words, chars
 line:
     title: Word Counting
 	yAxisLocation: left, right
 	yAxisLabel: Words, Characters
 	lineColor: red, yellow
-	yMin: 99, 850
+	showLegend: true
 ```
 
 ``` tracker
@@ -19,7 +20,7 @@ searchType: fileMeta
 searchTarget: numWords
 folder: diary
 startDate: 2021-01-01
-endDate: 2021-01-03
+endDate: 2021-01-05
 summary:
     template: 'Total number of words: {{sum}}'
 ```
@@ -29,7 +30,7 @@ searchType: fileMeta
 searchTarget: numChars
 folder: diary
 startDate: 2021-01-01
-endDate: 2021-01-03
+endDate: 2021-01-05
 summary:
     template: 'Total number of characters: {{sum}}'
 ```
\ No newline at end of file

From 9e7ecc371fdad7ed35077aa30fd3bce0b292d011 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 12 Jun 2021 23:33:45 +0800
Subject: [PATCH 059/402] Fix NaN values

---
 src/main.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main.ts b/src/main.ts
index 5351528..5f1680c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -717,11 +717,12 @@ export default class Tracker extends Plugin {
                             indPair < queryValuePairs.length;
                             indPair++
                         ) {
-                            if (queryValuePairs[indPair].value !== null) {
+                            let collected = queryValuePairs[indPair].value;
+                            if (Number.isNumber(collected) && !Number.isNaN(collected)) {
                                 if (value === null) {
-                                    value = queryValuePairs[indPair].value;
+                                    value = collected;
                                 } else {
-                                    value += queryValuePairs[indPair].value;
+                                    value += collected;
                                 }
                             }
                         }

From 323a248a02b0ab20091986638d1a538ef72ac88a Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 14 Jun 2021 19:14:24 +0800
Subject: [PATCH 060/402] Update TestWordCounting.md

---
 examples/TestWordCounting.md | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/examples/TestWordCounting.md b/examples/TestWordCounting.md
index babab64..eba4518 100644
--- a/examples/TestWordCounting.md
+++ b/examples/TestWordCounting.md
@@ -1,5 +1,6 @@
 # Test Word Counting
 
+## Word counts of daily notes
 ``` tracker
 searchType: fileMeta
 searchTarget: numWords, numChars
@@ -33,4 +34,15 @@ startDate: 2021-01-01
 endDate: 2021-01-05
 summary:
     template: 'Total number of characters: {{sum}}'
-```
\ No newline at end of file
+```
+
+## Word counts of any notes
+Use file creation dates as x values then sum the counts up
+```
+searchType: fileMeta
+searchTargtet: cDate, numWords
+xDataset: 0
+folder: /
+summary:
+    template: "Total word count: {{sum}}"
+```

From ef524b3d9d0f60d7833b9cc897ed94df1ee8312a Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 17 Jun 2021 21:45:29 +0800
Subject: [PATCH 061/402] Render month view

---
 examples/TestCalendar.md |  21 +++++
 package.json             |   1 +
 src/data.ts              |  14 ++++
 src/month.ts             | 174 +++++++++++++++++++++++++++++++++------
 src/parsing.ts           |  14 ++++
 5 files changed, 200 insertions(+), 24 deletions(-)
 create mode 100644 examples/TestCalendar.md

diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
new file mode 100644
index 0000000..911066f
--- /dev/null
+++ b/examples/TestCalendar.md
@@ -0,0 +1,21 @@
+# Test Calendar
+
+``` tracker
+searchType: tag
+searchTarget: exercise-pushup
+folder: diary
+month:
+    startWeekOn:
+	valueColor: red
+```
+
+``` tracker
+searchType: tag
+searchTarget: meditation
+folder: diary
+month:
+    startWeekOn: 
+	valueColor: steelblue
+```
+
+Please also check those search targets in markdown files under folder 'diary'.
\ No newline at end of file
diff --git a/package.json b/package.json
index 78d944e..8951d1f 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
   },
   "dependencies": {
     "d3": "^6.5.0",
+    "d3-interpolate": "^3.0.1",
     "obsidian-daily-notes-interface": "^0.9.1"
   }
 }
diff --git a/src/data.ts b/src/data.ts
index 238a297..e9cfbbf 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -242,6 +242,14 @@ export class Dataset implements IterableIterator<DataPoint> {
         return this.numTargets;
     }
 
+    public getValue(date: Moment) {
+        let ind = this.parent.getIndexOfDate(date);
+        if (ind >= 0 && ind < this.values.length) {
+            return this.values[ind];
+        }
+        return null;
+    }
+
     public setValue(date: Moment, value: number) {
         let ind = this.parent.getIndexOfDate(date);
         // console.log(ind);
@@ -673,9 +681,15 @@ export class SummaryInfo extends OutputInfo {
 
 export class MonthInfo {
     startWeekOn: string;
+    valueColor: string;
+    yMin: number;
+    yMax: number;
 
     constructor() {
         this.startWeekOn = "Sun";
+        this.valueColor = "#69b3a2";
+        this.yMin = null;
+        this.yMax = null;
     }
 }
 
diff --git a/src/month.ts b/src/month.ts
index 896c204..5491088 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -19,6 +19,7 @@ interface DayInfo {
     dayInMonth: number;
     row: number;
     col: number;
+    value: number; // 0~1
 }
 
 function createAreas(
@@ -80,50 +81,162 @@ function renderMonthHeader(
     chartElements: ChartElements,
     renderInfo: RenderInfo,
     monthInfo: MonthInfo,
-    dataset: Dataset
-) {}
+    dataset: Dataset,
+    curDate: Moment
+) {
+    // console.log("renderMonthHeader")
+
+    if (!renderInfo || !monthInfo) return;
+
+    let curDate_month = curDate.month(); // 0~11
+    let curDate_daysInMonth = curDate.daysInMonth(); // 28~31
+    let curDate_year = curDate.year();
+
+    let maxDayTextSize = helper.measureTextSize("30", "tracker-axis-label");
+    let dotRadius = Math.max(maxDayTextSize.width, maxDayTextSize.height) * 1.2;
+    let dayCellSpacing = dotRadius * 0.1;
+
+    let titleText = curDate.format("YYYY MMM");
+    let titleTextSize = helper.measureTextSize(titleText, "tracker-title");
+    let titleHeight = Math.max(titleTextSize.height, dotRadius * 2);
+
+    let headerHeight = 0;
+
+    // Append title
+    let monthTitle = chartElements.graphArea
+        .append("text")
+        .text(titleText) // pivot at center
+        .attr("id", "title")
+        .attr(
+            "transform",
+            "translate(" +
+                (dayCellSpacing + dotRadius / 2.0 + titleTextSize.width / 2.0) +
+                "," +
+                titleHeight / 2.0 +
+                ")"
+        )
+        .attr("height", titleHeight) // for later use
+        .attr("class", "tracker-title");
+    chartElements["title"] = monthTitle;
+    headerHeight += titleHeight;
+
+    // Append two arrow buttons
+
+    // week day names
+    let weekdayNames = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
+    let weekdayNameSize = helper.measureTextSize(
+        titleText,
+        "tracker-tick-label"
+    );
+    let weekDays = chartElements.graphArea
+        .selectAll("weekDays")
+        .data(weekdayNames)
+        .enter()
+        .append("text")
+        .text(function (n: string) {
+            return n;
+        })
+        .attr("transform", function (n: string, i: number) {
+            let strTranslate =
+                "translate(" +
+                (i * (dayCellSpacing + 2 * dotRadius) + dotRadius / 2) +
+                "," +
+                headerHeight +
+                ")";
+
+            return strTranslate;
+        })
+        .attr("class", "tracker-tick-label");
+    chartElements["weekDays"] = weekDays;
+    headerHeight += weekdayNameSize.height;
+
+    // Horizontal line
+    let horizontalLineHeight = 3;
+    chartElements.graphArea
+        .append("rect")
+        .attr("x", 0)
+        .attr("y", headerHeight)
+        .attr("width", renderInfo.dataAreaSize.width)
+        .attr("height", horizontalLineHeight)
+        .attr("class", "tracker-bar");
+    headerHeight += horizontalLineHeight;
+
+    // Expand parent areas
+    helper.expandArea(chartElements.svg, 0, headerHeight);
+    helper.expandArea(chartElements.graphArea, 0, headerHeight);
+
+    // Move sibling areas
+    helper.moveArea(chartElements.dataArea, 0, headerHeight);
+}
 
 function renderMonthDays(
     chartElements: ChartElements,
     renderInfo: RenderInfo,
     monthInfo: MonthInfo,
-    dataset: Dataset
+    dataset: Dataset,
+    curDate: Moment
 ) {
     // console.log("renderMonthDays");
 
-    let maxDayTextSize = helper.measureTextSize("30");
-    let dayCellWidth = maxDayTextSize.width * 1.2;
-    let dayCellSpacing = dayCellWidth * 0.1;
+    if (!renderInfo || !monthInfo) return;
 
-    let lastDate = renderInfo.datasets.getDates().last();
-    let monthOfLastDate = lastDate.month(); // 0~11
-    let daysInMonth = lastDate.daysInMonth(); // 28~31
+    let curDate_month = curDate.month(); // 0~11
+    let curDate_daysInMonth = curDate.daysInMonth(); // 28~31
 
+    let maxDayTextSize = helper.measureTextSize("30", "tracker-axis-label");
+    let dotRadius = Math.max(maxDayTextSize.width, maxDayTextSize.height) * 1.5;
+    let dayCellSpacing = dotRadius * 0.1;
+
+    // Get min and max, null values will be treated as zero here
+    let values = dataset.getValues().map(function (v) {
+        if (v === null) {
+            return 0;
+        }
+        return v;
+    });
+    let yMin = d3.min(values);
+    if (monthInfo.yMin !== null) {
+        yMin = monthInfo.yMin;
+    }
+    let yMax = d3.max(values);
+    if (monthInfo.yMax !== null) {
+        yMax = monthInfo.yMax;
+    }
+    // console.log(`yMin:${yMin}, yMax:${yMax}`);
+
+    // Prepare data for graph
     let daysInThisMonth: Array<DayInfo> = [];
-    const monthStartDate = lastDate.clone().startOf("month");
-    const monthEndDate = lastDate.endOf("month");
+    const monthStartDate = curDate.clone().startOf("month");
+    const monthEndDate = curDate.endOf("month");
+    let indCol = 0;
+    let indRow = 0;
     for (
         let curDate = monthStartDate.clone();
         curDate <= monthEndDate;
         curDate.add(1, "days")
     ) {
-        let indCol = curDate.day();
-        let indRow = Math.floor(
-            (monthStartDate.day() - 1 + curDate.date()) / 7.0
-        );
+        indCol = curDate.day();
+        indRow = Math.floor((monthStartDate.day() - 1 + curDate.date()) / 7.0);
+        let curValue = dataset.getValue(curDate);
+
+        let scaledValue = 0;
+        if (yMax - yMin > 0) {
+            scaledValue = (curValue - yMin) / (yMax - yMin);
+        }
         daysInThisMonth.push({
             date: curDate.format(renderInfo.dateFormat),
             dayInMonth: curDate.date(),
             row: indRow,
             col: indCol,
+            value: scaledValue,
         });
     }
 
+    let totalWidth = 2 * (indCol + 1) * dotRadius + indCol * dayCellSpacing;
+    let totalHeight = 2 * (indRow + 1) * dotRadius + indRow * dayCellSpacing;
+
     // scale
-    let scale = d3
-        .scaleLinear()
-        .domain([0, 8])
-        .range([0, renderInfo.dataAreaSize.width]);
+    let scale = d3.scaleLinear().domain([-0.5, 7]).range([0, totalWidth]);
 
     // streak lines
 
@@ -133,14 +246,22 @@ function renderMonthDays(
         .data(daysInThisMonth)
         .enter()
         .append("circle")
-        .attr("r", dayCellWidth / 2.0)
+        .attr("r", dotRadius / 2.0)
         .attr("cx", function (d: DayInfo) {
             return scale(d.col);
         })
         .attr("cy", function (d: DayInfo) {
             return scale(d.row);
         })
-        .attr("class", "tracker-dot");
+        // .attr("class", "tracker-dot")
+        .style("fill", function (d: DayInfo) {
+            // console.log(d.value);
+            return d3.interpolateLab("white", monthInfo.valueColor)(d.value);
+            // return color;
+        })
+        .style("opacity", function (d: DayInfo) {
+            return d.value;
+        });
 
     // labels
     let dayLabals = chartElements.dataArea
@@ -171,21 +292,26 @@ export function renderMonth(
 ) {
     // console.log("renderMonth");
     // console.log(renderInfo);
-    if (renderInfo.month === null) return;
+    if (!renderInfo || !renderMonth) return;
 
     let chartElements = createAreas(canvas, renderInfo, monthInfo);
 
+    let today = window.moment();
+    let lastDataDate = renderInfo.datasets.getDates().last();
+
     renderMonthHeader(
         chartElements,
         renderInfo,
         monthInfo,
-        renderInfo.datasets.getDatasetById(0)
+        renderInfo.datasets.getDatasetById(0),
+        lastDataDate
     );
 
     renderMonthDays(
         chartElements,
         renderInfo,
         monthInfo,
-        renderInfo.datasets.getDatasetById(0)
+        renderInfo.datasets.getDatasetById(0),
+        lastDataDate
     );
 }
diff --git a/src/parsing.ts b/src/parsing.ts
index 56fa386..fd31551 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1469,6 +1469,20 @@ export function getRenderInfoFromYaml(
         if (typeof yamlMonth?.startWeekOn === "string") {
             month.startWeekOn = yamlMonth.startWeekOn;
         }
+
+        if (typeof yamlMonth?.valueColor === "string") {
+            month.valueColor = yamlMonth.valueColor;
+        }
+
+        if (typeof yamlMonth?.yMin === "number") {
+            month.yMin = yamlMonth.yMin;
+        }
+
+        if (typeof yamlMonth?.yMax === "number") {
+            month.yMax = yamlMonth.yMax;
+        }
+
+        renderInfo.month.push(month);
     } // Month related parameters
     // console.log(renderInfo.month);
 

From 9f146a80cc976497cd6e02814fbd9243008ffb8f Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 19 Jun 2021 22:06:06 +0800
Subject: [PATCH 062/402] Fix streaks in month view

---
 examples/TestCalendar.md |   9 +-
 package.json             |   1 -
 src/data.ts              |  22 ++--
 src/month.ts             | 228 ++++++++++++++++++++++++++++++---------
 src/parsing.ts           |  38 +++++--
 5 files changed, 228 insertions(+), 70 deletions(-)

diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
index 911066f..c3e9d59 100644
--- a/examples/TestCalendar.md
+++ b/examples/TestCalendar.md
@@ -6,7 +6,9 @@ searchTarget: exercise-pushup
 folder: diary
 month:
     startWeekOn:
-	valueColor: red
+    threshold: 40
+    dotColor: pink
+    dimDotsNotInMonth: false
 ```
 
 ``` tracker
@@ -15,7 +17,8 @@ searchTarget: meditation
 folder: diary
 month:
     startWeekOn: 
-	valueColor: steelblue
+    dotColor: steelblue
 ```
 
-Please also check those search targets in markdown files under folder 'diary'.
\ No newline at end of file
+Please also check those search targets in markdown files under folder 'diary'.
+
diff --git a/package.json b/package.json
index 8951d1f..78d944e 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,6 @@
   },
   "dependencies": {
     "d3": "^6.5.0",
-    "d3-interpolate": "^3.0.1",
     "obsidian-daily-notes-interface": "^0.9.1"
   }
 }
diff --git a/src/data.ts b/src/data.ts
index e9cfbbf..306f74b 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -242,8 +242,8 @@ export class Dataset implements IterableIterator<DataPoint> {
         return this.numTargets;
     }
 
-    public getValue(date: Moment) {
-        let ind = this.parent.getIndexOfDate(date);
+    public getValue(date: Moment, dayShift: number = 0) {
+        let ind = this.parent.getIndexOfDate(date) + Math.floor(dayShift);
         if (ind >= 0 && ind < this.values.length) {
             return this.values[ind];
         }
@@ -680,16 +680,22 @@ export class SummaryInfo extends OutputInfo {
 }
 
 export class MonthInfo {
+    dataset: string;
     startWeekOn: string;
-    valueColor: string;
-    yMin: number;
-    yMax: number;
+    showDot: boolean;
+    threshold: number;
+    dotColor: string;
+    dimDotsNotInMonth: boolean;
+    showStreak: boolean;
 
     constructor() {
+        this.dataset = "0";
         this.startWeekOn = "Sun";
-        this.valueColor = "#69b3a2";
-        this.yMin = null;
-        this.yMax = null;
+        this.showDot = true;
+        this.threshold = 0.0; // if value > threshold, will show dot
+        this.dotColor = "#69b3a2";
+        this.dimDotsNotInMonth = true;
+        this.showStreak = true; // a streak connects neigbor dots
     }
 }
 
diff --git a/src/month.ts b/src/month.ts
index 5491088..c64e92f 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -14,12 +14,16 @@ import {
 import * as helper from "./helper";
 import * as d3 from "d3";
 
+let logToConsole = false;
 interface DayInfo {
     date: string;
     dayInMonth: number;
+    isInThisMonth: boolean;
     row: number;
     col: number;
-    value: number; // 0~1
+    showDot: boolean;
+    streakIn: boolean;
+    streakOut: boolean;
 }
 
 function createAreas(
@@ -82,21 +86,21 @@ function renderMonthHeader(
     renderInfo: RenderInfo,
     monthInfo: MonthInfo,
     dataset: Dataset,
-    curDate: Moment
+    curMonthDate: Moment
 ) {
     // console.log("renderMonthHeader")
 
     if (!renderInfo || !monthInfo) return;
 
-    let curDate_month = curDate.month(); // 0~11
-    let curDate_daysInMonth = curDate.daysInMonth(); // 28~31
-    let curDate_year = curDate.year();
+    let curMonth = curMonthDate.month(); // 0~11
+    let curDaysInMonth = curMonthDate.daysInMonth(); // 28~31
+    let curYear = curMonthDate.year();
 
     let maxDayTextSize = helper.measureTextSize("30", "tracker-axis-label");
     let dotRadius = Math.max(maxDayTextSize.width, maxDayTextSize.height) * 1.2;
     let dayCellSpacing = dotRadius * 0.1;
 
-    let titleText = curDate.format("YYYY MMM");
+    let titleText = curMonthDate.format("YYYY MMM");
     let titleTextSize = helper.measureTextSize(titleText, "tracker-title");
     let titleHeight = Math.max(titleTextSize.height, dotRadius * 2);
 
@@ -174,76 +178,184 @@ function renderMonthDays(
     renderInfo: RenderInfo,
     monthInfo: MonthInfo,
     dataset: Dataset,
-    curDate: Moment
+    curMonthDate: Moment
 ) {
     // console.log("renderMonthDays");
 
     if (!renderInfo || !monthInfo) return;
 
-    let curDate_month = curDate.month(); // 0~11
-    let curDate_daysInMonth = curDate.daysInMonth(); // 28~31
+    let curMonth = curMonthDate.month(); // 0~11
+    let curDaysInMonth = curMonthDate.daysInMonth(); // 28~31
 
     let maxDayTextSize = helper.measureTextSize("30", "tracker-axis-label");
     let dotRadius = Math.max(maxDayTextSize.width, maxDayTextSize.height) * 1.5;
     let dayCellSpacing = dotRadius * 0.1;
 
-    // Get min and max, null values will be treated as zero here
-    let values = dataset.getValues().map(function (v) {
-        if (v === null) {
-            return 0;
-        }
-        return v;
-    });
-    let yMin = d3.min(values);
-    if (monthInfo.yMin !== null) {
-        yMin = monthInfo.yMin;
-    }
-    let yMax = d3.max(values);
-    if (monthInfo.yMax !== null) {
-        yMax = monthInfo.yMax;
-    }
-    // console.log(`yMin:${yMin}, yMax:${yMax}`);
-
     // Prepare data for graph
-    let daysInThisMonth: Array<DayInfo> = [];
-    const monthStartDate = curDate.clone().startOf("month");
-    const monthEndDate = curDate.endOf("month");
+    let daysInMonthView: Array<DayInfo> = [];
+    const monthStartDate = curMonthDate.clone().startOf("month");
+    const startDate = monthStartDate
+        .clone()
+        .subtract(monthStartDate.day(), "days");
+    const monthEndDate = curMonthDate.clone().endOf("month");
+    const endDate = monthEndDate
+        .clone()
+        .add(7 - monthEndDate.day() - 1, "days");
+    // console.log(monthStartDate.format("YYYY-MM-DD"));
+    // console.log(startDate.format("YYYY-MM-DD"));
     let indCol = 0;
     let indRow = 0;
+    let ind = 0;
     for (
-        let curDate = monthStartDate.clone();
-        curDate <= monthEndDate;
+        let curDate = startDate.clone();
+        curDate <= endDate;
         curDate.add(1, "days")
     ) {
         indCol = curDate.day();
-        indRow = Math.floor((monthStartDate.day() - 1 + curDate.date()) / 7.0);
+        indRow = Math.floor(ind / 7);
+
+        // is this day in this month
+        let isInThisMonth = true;
+        if (
+            curDate.diff(monthStartDate) < 0 ||
+            curDate.diff(monthEndDate) > 0
+        ) {
+            isInThisMonth = false;
+        }
+
+        // scaledValue
         let curValue = dataset.getValue(curDate);
+        let showDot = false;
+        if (curValue !== null) {
+            if (curValue > monthInfo.threshold) {
+                showDot = true;
+            }
+        }
 
-        let scaledValue = 0;
-        if (yMax - yMin > 0) {
-            scaledValue = (curValue - yMin) / (yMax - yMin);
+        // if (curDate.format("YYYY-MM-DD") === "2021-12-16") {
+        //     logToConsole = true;
+        // }
+
+        // streakIn and streakOut
+        let nextValue = dataset.getValue(curDate, 1);
+        let prevValue = dataset.getValue(curDate, -1);
+        let streakIn = false;
+        if (curValue !== null && curValue > monthInfo.threshold) {
+            if (prevValue !== null && prevValue > monthInfo.threshold) {
+                streakIn = true;
+            }
+        }
+        let streakOut = false;
+        if (curValue !== null && curValue > monthInfo.threshold) {
+            if (nextValue !== null && nextValue > monthInfo.threshold) {
+                streakOut = true;
+            }
         }
-        daysInThisMonth.push({
+        // if (logToConsole) {
+        //     console.log(`preValue: ${prevValue}, curValue: ${curValue}, nextValue: ${nextValue}`);
+        //     console.log(monthInfo.threshold);
+        //     console.log(`streakIn: ${streakIn}, streakOut: ${streakOut}`);
+        //     logToConsole = false;
+        // }
+
+        daysInMonthView.push({
             date: curDate.format(renderInfo.dateFormat),
             dayInMonth: curDate.date(),
+            isInThisMonth: isInThisMonth,
             row: indRow,
             col: indCol,
-            value: scaledValue,
+            showDot: showDot,
+            streakIn: streakIn,
+            streakOut: streakOut,
         });
+
+        ind++;
     }
+    // console.log(daysInMonthView);
+    // console.log(daysInMonthView.filter(function (d: DayInfo) {
+    //     return d.streakIn;
+    // }));
+    // console.log(daysInMonthView.filter(function (d: DayInfo) {
+    //     return d.streakOut;
+    // }));
 
     let totalWidth = 2 * (indCol + 1) * dotRadius + indCol * dayCellSpacing;
     let totalHeight = 2 * (indRow + 1) * dotRadius + indRow * dayCellSpacing;
 
     // scale
-    let scale = d3.scaleLinear().domain([-0.5, 7]).range([0, totalWidth]);
+    let scale = d3.scaleLinear().domain([-0.5, 8.5]).range([0, totalWidth]);
 
     // streak lines
+    let streakWidth = 10;
+    let streakHeight = 3;
+    if (monthInfo.showStreak) {
+        chartElements.dataArea
+            .selectAll("streakIn")
+            .data(
+                daysInMonthView.filter(function (d: DayInfo) {
+                    return d.streakIn;
+                })
+            )
+            .enter()
+            .append("rect")
+            .attr("x", function (d: DayInfo) {
+                let x = scale(d.col) - dotRadius / 2.0 - streakWidth;
+                return x;
+            })
+            .attr("y", function (d: DayInfo) {
+                return scale(d.row) - streakHeight / 2.0;
+            })
+            .attr("width", streakWidth)
+            .attr("height", streakHeight)
+            .style("fill", function (d: DayInfo) {
+                if (d.showDot) {
+                    return monthInfo.dotColor;
+                }
+                return "none";
+            })
+            .style("fill-opacity", function (d: DayInfo) {
+                if (monthInfo.dimDotsNotInMonth && !d.isInThisMonth) {
+                    return 0.2;
+                }
+                return 1.0;
+            });
+
+        chartElements.dataArea
+            .selectAll("streakOut")
+            .data(
+                daysInMonthView.filter(function (d: DayInfo) {
+                    return d.streakOut;
+                })
+            )
+            .enter()
+            .append("rect")
+            .attr("x", function (d: DayInfo) {
+                let x = scale(d.col) + dotRadius / 2.0;
+                return x;
+            })
+            .attr("y", function (d: DayInfo) {
+                return scale(d.row) - streakHeight / 2.0;
+            })
+            .attr("width", streakWidth)
+            .attr("height", streakHeight)
+            .style("fill", function (d: DayInfo) {
+                if (d.showDot) {
+                    return monthInfo.dotColor;
+                }
+                return "none";
+            })
+            .style("fill-opacity", function (d: DayInfo) {
+                if (monthInfo.dimDotsNotInMonth && !d.isInThisMonth) {
+                    return 0.2;
+                }
+                return 1.0;
+            });
+    }
 
-    // days in this month
+    // dots
     let dots = chartElements.dataArea
         .selectAll("dot")
-        .data(daysInThisMonth)
+        .data(daysInMonthView)
         .enter()
         .append("circle")
         .attr("r", dotRadius / 2.0)
@@ -253,20 +365,23 @@ function renderMonthDays(
         .attr("cy", function (d: DayInfo) {
             return scale(d.row);
         })
-        // .attr("class", "tracker-dot")
         .style("fill", function (d: DayInfo) {
-            // console.log(d.value);
-            return d3.interpolateLab("white", monthInfo.valueColor)(d.value);
-            // return color;
+            if (d.showDot) {
+                return monthInfo.dotColor;
+            }
+            return "none";
         })
-        .style("opacity", function (d: DayInfo) {
-            return d.value;
+        .style("fill-opacity", function (d: DayInfo) {
+            if (monthInfo.dimDotsNotInMonth && !d.isInThisMonth) {
+                return 0.2;
+            }
+            return 1.0;
         });
 
     // labels
     let dayLabals = chartElements.dataArea
         .selectAll("dayLabel")
-        .data(daysInThisMonth)
+        .data(daysInMonthView)
         .enter()
         .append("text")
         .text(function (d: DayInfo) {
@@ -282,6 +397,12 @@ function renderMonthDays(
 
             return strTranslate;
         })
+        .style("fill-opacity", function (d: DayInfo) {
+            if (monthInfo.dimDotsNotInMonth && !d.isInThisMonth) {
+                return 0.2;
+            }
+            return 1.0;
+        })
         .attr("class", "tracker-axis-label");
 }
 
@@ -297,21 +418,24 @@ export function renderMonth(
     let chartElements = createAreas(canvas, renderInfo, monthInfo);
 
     let today = window.moment();
-    let lastDataDate = renderInfo.datasets.getDates().last();
+    let lastDataMonthDate = renderInfo.datasets.getDates().last();
+
+    let datasetId = parseFloat(monthInfo.dataset);
+    let dataset = renderInfo.datasets.getDatasetById(datasetId);
 
     renderMonthHeader(
         chartElements,
         renderInfo,
         monthInfo,
-        renderInfo.datasets.getDatasetById(0),
-        lastDataDate
+        dataset,
+        lastDataMonthDate
     );
 
     renderMonthDays(
         chartElements,
         renderInfo,
         monthInfo,
-        renderInfo.datasets.getDatasetById(0),
-        lastDataDate
+        dataset,
+        lastDataMonthDate
     );
 }
diff --git a/src/parsing.ts b/src/parsing.ts
index fd31551..27f5245 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1466,21 +1466,47 @@ export function getRenderInfoFromYaml(
             }
         }
 
+        // dataset
+        if (typeof yamlMonth?.dataset === "string") {
+            month.dataset = yamlMonth.dataset;
+        }
+        // console.log(month.dataset);
+
+        // startWeekOn
         if (typeof yamlMonth?.startWeekOn === "string") {
             month.startWeekOn = yamlMonth.startWeekOn;
         }
+        // console.log(month.startWeekOn);
+
+        // showDot
+        if (typeof yamlMonth?.showDot === "boolean") {
+            month.showDot = yamlMonth.showDot;
+        }
+        // console.log(month.showDot);
+
+        // threshold
+        if (typeof yamlMonth?.threshold === "number") {
+            month.threshold = yamlMonth.threshold;
+        }
+        // console.log(month.threshold);
 
-        if (typeof yamlMonth?.valueColor === "string") {
-            month.valueColor = yamlMonth.valueColor;
+        // dotColor
+        if (typeof yamlMonth?.dotColor === "string") {
+            month.dotColor = yamlMonth.dotColor;
         }
+        // console.log(month.dotColor);
 
-        if (typeof yamlMonth?.yMin === "number") {
-            month.yMin = yamlMonth.yMin;
+        // dimDotsNotInMonth
+        if (typeof yamlMonth?.dimDotsNotInMonth === "boolean") {
+            month.dimDotsNotInMonth = yamlMonth.dimDotsNotInMonth;
         }
+        // console.log(month.dotColor);
 
-        if (typeof yamlMonth?.yMax === "number") {
-            month.yMax = yamlMonth.yMax;
+        // showStreak
+        if (typeof yamlMonth?.showStreak === "boolean") {
+            month.showStreak = yamlMonth.showStreak;
         }
+        // console.log(month.showStreak);
 
         renderInfo.month.push(month);
     } // Month related parameters

From f2d5715f3f85c4ad709cd29ca4e04cc270ce2ac7 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 20 Jun 2021 00:15:09 +0800
Subject: [PATCH 063/402] Refine element's position in month view

---
 examples/TestCalendar.md |  2 +-
 src/month.ts             | 42 +++++++++++++++++++++-------------------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
index c3e9d59..b0d2be4 100644
--- a/examples/TestCalendar.md
+++ b/examples/TestCalendar.md
@@ -7,7 +7,7 @@ folder: diary
 month:
     startWeekOn:
     threshold: 40
-    dotColor: pink
+    dotColor: tomato
     dimDotsNotInMonth: false
 ```
 
diff --git a/src/month.ts b/src/month.ts
index c64e92f..53dadd1 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -15,6 +15,9 @@ import * as helper from "./helper";
 import * as d3 from "d3";
 
 let logToConsole = false;
+let ratioCellToText = 2.5;
+let ratioDotToText = 1.5;
+
 interface DayInfo {
     date: string;
     dayInMonth: number;
@@ -97,12 +100,12 @@ function renderMonthHeader(
     let curYear = curMonthDate.year();
 
     let maxDayTextSize = helper.measureTextSize("30", "tracker-axis-label");
-    let dotRadius = Math.max(maxDayTextSize.width, maxDayTextSize.height) * 1.2;
-    let dayCellSpacing = dotRadius * 0.1;
+    let cellSize =
+        Math.max(maxDayTextSize.width, maxDayTextSize.height) * ratioCellToText;
 
     let titleText = curMonthDate.format("YYYY MMM");
     let titleTextSize = helper.measureTextSize(titleText, "tracker-title");
-    let titleHeight = Math.max(titleTextSize.height, dotRadius * 2);
+    let titleHeight = Math.max(titleTextSize.height, cellSize);
 
     let headerHeight = 0;
 
@@ -114,7 +117,7 @@ function renderMonthHeader(
         .attr(
             "transform",
             "translate(" +
-                (dayCellSpacing + dotRadius / 2.0 + titleTextSize.width / 2.0) +
+                (0.5 * cellSize + titleTextSize.width / 2.0) +
                 "," +
                 titleHeight / 2.0 +
                 ")"
@@ -142,11 +145,7 @@ function renderMonthHeader(
         })
         .attr("transform", function (n: string, i: number) {
             let strTranslate =
-                "translate(" +
-                (i * (dayCellSpacing + 2 * dotRadius) + dotRadius / 2) +
-                "," +
-                headerHeight +
-                ")";
+                "translate(" + (i + 0.5) * cellSize + "," + headerHeight + ")";
 
             return strTranslate;
         })
@@ -188,8 +187,11 @@ function renderMonthDays(
     let curDaysInMonth = curMonthDate.daysInMonth(); // 28~31
 
     let maxDayTextSize = helper.measureTextSize("30", "tracker-axis-label");
-    let dotRadius = Math.max(maxDayTextSize.width, maxDayTextSize.height) * 1.5;
-    let dayCellSpacing = dotRadius * 0.1;
+    let cellSize =
+        Math.max(maxDayTextSize.width, maxDayTextSize.height) * ratioCellToText;
+    let dotRadius = ((cellSize / ratioCellToText) * ratioDotToText) / 2.0;
+    let streakWidth = (cellSize - dotRadius * 2.0) / 2.0;
+    let streakHeight = 3;
 
     // Prepare data for graph
     let daysInMonthView: Array<DayInfo> = [];
@@ -279,15 +281,15 @@ function renderMonthDays(
     //     return d.streakOut;
     // }));
 
-    let totalWidth = 2 * (indCol + 1) * dotRadius + indCol * dayCellSpacing;
-    let totalHeight = 2 * (indRow + 1) * dotRadius + indRow * dayCellSpacing;
-
     // scale
-    let scale = d3.scaleLinear().domain([-0.5, 8.5]).range([0, totalWidth]);
+    let totalDayBlockWidth = (indCol + 1) * cellSize;
+    let totalBlockHeight = (indRow + 1) * cellSize;
+    let scale = d3
+        .scaleLinear()
+        .domain([-0.5, 6.5])
+        .range([0, totalDayBlockWidth]);
 
     // streak lines
-    let streakWidth = 10;
-    let streakHeight = 3;
     if (monthInfo.showStreak) {
         chartElements.dataArea
             .selectAll("streakIn")
@@ -299,7 +301,7 @@ function renderMonthDays(
             .enter()
             .append("rect")
             .attr("x", function (d: DayInfo) {
-                let x = scale(d.col) - dotRadius / 2.0 - streakWidth;
+                let x = scale(d.col) - cellSize / 2.0 - streakWidth;
                 return x;
             })
             .attr("y", function (d: DayInfo) {
@@ -330,7 +332,7 @@ function renderMonthDays(
             .enter()
             .append("rect")
             .attr("x", function (d: DayInfo) {
-                let x = scale(d.col) + dotRadius / 2.0;
+                let x = scale(d.col) + cellSize / 2.0;
                 return x;
             })
             .attr("y", function (d: DayInfo) {
@@ -358,7 +360,7 @@ function renderMonthDays(
         .data(daysInMonthView)
         .enter()
         .append("circle")
-        .attr("r", dotRadius / 2.0)
+        .attr("r", dotRadius)
         .attr("cx", function (d: DayInfo) {
             return scale(d.col);
         })

From 4594229701e2bd5b5d9b09d416b1719e5262a70a Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 20 Jun 2021 03:44:08 +0800
Subject: [PATCH 064/402] Refine month view

---
 examples/TestCalendar.md |   6 +-
 src/data.ts              |  12 +++-
 src/month.ts             | 141 +++++++++++++++++++++++++++++++--------
 src/parsing.ts           |  32 +++++++--
 styles.css               |  16 +++++
 5 files changed, 173 insertions(+), 34 deletions(-)

diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
index b0d2be4..ee63dc1 100644
--- a/examples/TestCalendar.md
+++ b/examples/TestCalendar.md
@@ -7,7 +7,8 @@ folder: diary
 month:
     startWeekOn:
     threshold: 40
-    dotColor: tomato
+    color: tomato
+	titleMonthColor: orange
     dimDotsNotInMonth: false
 ```
 
@@ -17,7 +18,8 @@ searchTarget: meditation
 folder: diary
 month:
     startWeekOn: 
-    dotColor: steelblue
+    color: steelblue
+	titleMonthColor: green
 ```
 
 Please also check those search targets in markdown files under folder 'diary'.
diff --git a/src/data.ts b/src/data.ts
index 306f74b..7af9917 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -684,18 +684,26 @@ export class MonthInfo {
     startWeekOn: string;
     showDot: boolean;
     threshold: number;
-    dotColor: string;
+    color: string;
     dimDotsNotInMonth: boolean;
     showStreak: boolean;
+    dotColor: string;
+    titleYearColor: string;
+    titleMonthColor: string;
+    dividingLineColor: string;
 
     constructor() {
         this.dataset = "0";
         this.startWeekOn = "Sun";
         this.showDot = true;
         this.threshold = 0.0; // if value > threshold, will show dot
-        this.dotColor = "#69b3a2";
+        this.color = null;
         this.dimDotsNotInMonth = true;
         this.showStreak = true; // a streak connects neigbor dots
+        this.dotColor = null;
+        this.titleYearColor = null;
+        this.titleMonthColor = null;
+        this.dividingLineColor = null;
     }
 }
 
diff --git a/src/month.ts b/src/month.ts
index 53dadd1..4a95061 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -102,37 +102,98 @@ function renderMonthHeader(
     let maxDayTextSize = helper.measureTextSize("30", "tracker-axis-label");
     let cellSize =
         Math.max(maxDayTextSize.width, maxDayTextSize.height) * ratioCellToText;
+    let dotRadius = ((cellSize / ratioCellToText) * ratioDotToText) / 2.0;
 
-    let titleText = curMonthDate.format("YYYY MMM");
-    let titleTextSize = helper.measureTextSize(titleText, "tracker-title");
-    let titleHeight = Math.max(titleTextSize.height, cellSize);
+    let titleYearText = curMonthDate.format("YYYY");
+    let titleMonthText = curMonthDate.format("MMM");
+    let titleYearSize = helper.measureTextSize(
+        titleYearText,
+        "tracker-month-title-year"
+    );
+    let titleMonthSize = helper.measureTextSize(
+        titleMonthText,
+        "tracker-month-title-month"
+    );
+
+    let titleHeight =
+        Math.max(titleYearSize.height, titleMonthSize.height) * 1.5;
+    let titleSpacing = 8;
 
     let headerHeight = 0;
 
     // Append title
-    let monthTitle = chartElements.graphArea
+    let titleGroup = chartElements.graphArea
+        .append("g")
+        .attr("height", titleHeight);
+
+    // title year
+    let titleYearColor = null;
+    if (monthInfo.titleYearColor) {
+        titleYearColor = monthInfo.titleYearColor;
+    } else {
+        if (monthInfo.color) {
+            titleYearColor = monthInfo.color;
+        }
+    }
+    let titleYear = titleGroup
         .append("text")
-        .text(titleText) // pivot at center
-        .attr("id", "title")
+        .text(titleYearText) // pivot at center
+        .attr("id", "titleYear")
         .attr(
             "transform",
             "translate(" +
-                (0.5 * cellSize + titleTextSize.width / 2.0) +
+                (titleYearSize.width / 2.0 + cellSize / 4.0) +
                 "," +
-                titleHeight / 2.0 +
+                titleYearSize.height / 2.0 +
                 ")"
         )
-        .attr("height", titleHeight) // for later use
-        .attr("class", "tracker-title");
-    chartElements["title"] = monthTitle;
-    headerHeight += titleHeight;
+        .attr("class", "tracker-month-title-year");
+
+    if (titleYearColor) {
+        titleYear.style("fill", titleYearColor);
+    }
+
+    // title month
+    let titleMonthColor = null;
+    if (monthInfo.titleMonthColor) {
+        titleMonthColor = monthInfo.titleMonthColor;
+    } else {
+        if (monthInfo.color) {
+            titleMonthColor = monthInfo.color;
+        }
+    }
+    let titleMonth = titleGroup
+        .append("text")
+        .text(titleMonthText) // pivot at center
+        .attr("id", "titleMonth")
+        .attr(
+            "transform",
+            "translate(" +
+                (titleYearSize.width +
+                    titleMonthSize.width / 2.0 +
+                    cellSize / 4.0 +
+                    titleSpacing) +
+                "," +
+                titleMonthSize.height / 2.0 +
+                ")"
+        )
+        .attr("class", "tracker-month-title-month");
+
+    if (titleMonthColor) {
+        titleMonth.style("fill", titleMonthColor);
+    }
+
+    // arrow left
 
-    // Append two arrow buttons
+    // arrow right
+
+    chartElements["title"] = titleGroup;
+    headerHeight += titleHeight;
 
     // week day names
     let weekdayNames = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
     let weekdayNameSize = helper.measureTextSize(
-        titleText,
+        weekdayNames[0],
         "tracker-tick-label"
     );
     let weekDays = chartElements.graphArea
@@ -146,23 +207,36 @@ function renderMonthHeader(
         .attr("transform", function (n: string, i: number) {
             let strTranslate =
                 "translate(" + (i + 0.5) * cellSize + "," + headerHeight + ")";
-
             return strTranslate;
         })
-        .attr("class", "tracker-tick-label");
+        .attr("class", "tracker-tick-label")
+        .attr("text-anchor", "middle");
     chartElements["weekDays"] = weekDays;
     headerHeight += weekdayNameSize.height;
 
-    // Horizontal line
-    let horizontalLineHeight = 3;
-    chartElements.graphArea
+    // dividing line
+    let dividingLineHeight = 1;
+    let dividingLineColor = null;
+    if (monthInfo.dividingLineColor) {
+        dividingLineColor = monthInfo.dividingLineColor;
+    } else {
+        if (monthInfo.color) {
+            dividingLineColor = monthInfo.color;
+        }
+    }
+    let dividingLine = chartElements.graphArea
         .append("rect")
         .attr("x", 0)
         .attr("y", headerHeight)
-        .attr("width", renderInfo.dataAreaSize.width)
-        .attr("height", horizontalLineHeight)
-        .attr("class", "tracker-bar");
-    headerHeight += horizontalLineHeight;
+        .attr("width", 6.5 * cellSize + weekdayNameSize.width)
+        .attr("height", dividingLineHeight)
+        .attr("class", "tracker-month-dividing-line");
+
+    if (dividingLineColor) {
+        dividingLine.style("fill", dividingLineColor);
+    }
+
+    headerHeight += dividingLineHeight;
 
     // Expand parent areas
     helper.expandArea(chartElements.svg, 0, headerHeight);
@@ -311,7 +385,12 @@ function renderMonthDays(
             .attr("height", streakHeight)
             .style("fill", function (d: DayInfo) {
                 if (d.showDot) {
-                    return monthInfo.dotColor;
+                    if (monthInfo.dotColor) {
+                        return monthInfo.dotColor;
+                    } else if (monthInfo.color) {
+                        return monthInfo.color;
+                    }
+                    return "#69b3a2";
                 }
                 return "none";
             })
@@ -342,7 +421,12 @@ function renderMonthDays(
             .attr("height", streakHeight)
             .style("fill", function (d: DayInfo) {
                 if (d.showDot) {
-                    return monthInfo.dotColor;
+                    if (monthInfo.dotColor) {
+                        return monthInfo.dotColor;
+                    } else if (monthInfo.color) {
+                        return monthInfo.color;
+                    }
+                    return "#69b3a2";
                 }
                 return "none";
             })
@@ -369,7 +453,12 @@ function renderMonthDays(
         })
         .style("fill", function (d: DayInfo) {
             if (d.showDot) {
-                return monthInfo.dotColor;
+                if (monthInfo.dotColor) {
+                    return monthInfo.dotColor;
+                } else if (monthInfo.color) {
+                    return monthInfo.color;
+                }
+                return "#69b3a2";
             }
             return "none";
         })
diff --git a/src/parsing.ts b/src/parsing.ts
index 27f5245..54f40f1 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1490,11 +1490,11 @@ export function getRenderInfoFromYaml(
         }
         // console.log(month.threshold);
 
-        // dotColor
-        if (typeof yamlMonth?.dotColor === "string") {
-            month.dotColor = yamlMonth.dotColor;
+        // color
+        if (typeof yamlMonth?.color === "string") {
+            month.color = yamlMonth.color;
         }
-        // console.log(month.dotColor);
+        // console.log(month.color);
 
         // dimDotsNotInMonth
         if (typeof yamlMonth?.dimDotsNotInMonth === "boolean") {
@@ -1508,6 +1508,30 @@ export function getRenderInfoFromYaml(
         }
         // console.log(month.showStreak);
 
+        // dotColor
+        if (typeof yamlMonth?.dotColor === "string") {
+            month.dotColor = yamlMonth.dotColor;
+        }
+        // console.log(month.dotColor);
+
+        // titleYearColor
+        if (typeof yamlMonth?.titleYearColor === "string") {
+            month.titleYearColor = yamlMonth.titleYearColor;
+        }
+        // console.log(month.titleYearColor);
+
+        // titleMonthColor
+        if (typeof yamlMonth?.titleMonthColor === "string") {
+            month.titleMonthColor = yamlMonth.titleMonthColor;
+        }
+        // console.log(month.dotColor);
+
+        // dividingLineColor
+        if (typeof yamlMonth?.dividingLineColor === "string") {
+            month.dividingLineColor = yamlMonth.dividingLineColor;
+        }
+        // console.log(month.dividingLineColor);
+
         renderInfo.month.push(month);
     } // Month related parameters
     // console.log(renderInfo.month);
diff --git a/styles.css b/styles.css
index 7ccbcf3..053c4a3 100644
--- a/styles.css
+++ b/styles.css
@@ -106,4 +106,20 @@
 
 .tracker-bar {
     fill: var(--color-bar-fill);
+}
+
+.tracker-month-title-year {
+    fill: var(--color-title);
+    text-anchor: middle;
+    font-size: 22px;
+}
+
+.tracker-month-title-month {
+    fill: var(--color-title);
+    text-anchor: middle;
+    font-size: 22px;
+}
+
+.tracker-month-dividing-line {
+    fill: var(--color-bar-fill);
 }
\ No newline at end of file

From d73edd5f88a559f4452af2cb7550587b259a60ad Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 20 Jun 2021 03:51:31 +0800
Subject: [PATCH 065/402] Add arrows to month view

---
 src/month.ts | 26 ++++++++++++++++++++++++++
 styles.css   |  6 ++++++
 2 files changed, 32 insertions(+)

diff --git a/src/month.ts b/src/month.ts
index 4a95061..c6d67f6 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -184,8 +184,34 @@ function renderMonthHeader(
     }
 
     // arrow left
+    let arrowLeft = titleGroup
+        .append("text")
+        .text("<") // pivot at center
+        .attr("id", "arrowLeft")
+        .attr(
+            "transform",
+            "translate(" +
+                (5.5 * cellSize) +
+                "," +
+                titleMonthSize.height / 2.0 +
+                ")"
+        )
+        .attr("class", "tracker-month-title-arrow");
 
     // arrow right
+    let arrowRight = titleGroup
+        .append("text")
+        .text(">") // pivot at center
+        .attr("id", "arrowLeft")
+        .attr(
+            "transform",
+            "translate(" +
+                (6.5 * cellSize) +
+                "," +
+                titleMonthSize.height / 2.0 +
+                ")"
+        )
+        .attr("class", "tracker-month-title-arrow");
 
     chartElements["title"] = titleGroup;
     headerHeight += titleHeight;
diff --git a/styles.css b/styles.css
index 053c4a3..50698e8 100644
--- a/styles.css
+++ b/styles.css
@@ -122,4 +122,10 @@
 
 .tracker-month-dividing-line {
     fill: var(--color-bar-fill);
+}
+
+.tracker-month-title-arrow {
+    fill: var(--color-title);
+    text-anchor: middle;
+    font-size: 22px;
 }
\ No newline at end of file

From bf18613404fcd8080af85052bc2a1c94814e18b5 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 20 Jun 2021 12:47:39 +0800
Subject: [PATCH 066/402] Add refresh event to arrow buttons in month view

---
 src/month.ts | 82 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 76 insertions(+), 6 deletions(-)

diff --git a/src/month.ts b/src/month.ts
index c6d67f6..908485b 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -30,11 +30,20 @@ interface DayInfo {
 }
 
 function createAreas(
+    chartElements: ChartElements,
     canvas: HTMLElement,
     renderInfo: RenderInfo,
     monthInfo: MonthInfo
 ): ChartElements {
-    let chartElements: ChartElements = {};
+    // clean areas
+    d3.select(canvas).select("#svg").remove();
+    var props = Object.getOwnPropertyNames(chartElements);
+    for (var i = 0; i < props.length; i++) {
+        // d3.select(chartElements[props[i]]).remove();
+        delete chartElements[props[i]];
+    }
+    // console.log(chartElements);
+
     // whole area for plotting, includes margins
     let svg = d3
         .select(canvas)
@@ -85,6 +94,7 @@ function createAreas(
 }
 
 function renderMonthHeader(
+    canvas: HTMLElement,
     chartElements: ChartElements,
     renderInfo: RenderInfo,
     monthInfo: MonthInfo,
@@ -191,12 +201,22 @@ function renderMonthHeader(
         .attr(
             "transform",
             "translate(" +
-                (5.5 * cellSize) +
+                5.5 * cellSize +
                 "," +
                 titleMonthSize.height / 2.0 +
                 ")"
         )
-        .attr("class", "tracker-month-title-arrow");
+        .attr("class", "tracker-month-title-arrow")
+        .on("click", function () {
+            // console.log("left arrow clicked");
+            let prevMonthDate = curMonthDate.clone().add(-1, "month");
+            refresh(
+                canvas,
+                chartElements,
+                renderInfo,
+                monthInfo,
+                prevMonthDate);
+        });
 
     // arrow right
     let arrowRight = titleGroup
@@ -206,12 +226,22 @@ function renderMonthHeader(
         .attr(
             "transform",
             "translate(" +
-                (6.5 * cellSize) +
+                6.5 * cellSize +
                 "," +
                 titleMonthSize.height / 2.0 +
                 ")"
         )
-        .attr("class", "tracker-month-title-arrow");
+        .attr("class", "tracker-month-title-arrow")
+        .on("click", function () {
+            console.log("right arrow clicked");
+            let nextMonthDate = curMonthDate.clone().add(1, "month");
+            refresh(
+                canvas,
+                chartElements,
+                renderInfo,
+                monthInfo,
+                nextMonthDate);
+        });
 
     chartElements["title"] = titleGroup;
     headerHeight += titleHeight;
@@ -273,6 +303,7 @@ function renderMonthHeader(
 }
 
 function renderMonthDays(
+    canvas: HTMLElement,
     chartElements: ChartElements,
     renderInfo: RenderInfo,
     monthInfo: MonthInfo,
@@ -523,6 +554,42 @@ function renderMonthDays(
         .attr("class", "tracker-axis-label");
 }
 
+function refresh(
+    canvas: HTMLElement,
+    chartElements: ChartElements,
+    renderInfo: RenderInfo,
+    monthInfo: MonthInfo,
+    curMonthDate: Moment
+) {
+    // console.log("refresh");
+    // console.log(renderInfo);
+    if (!renderInfo || !renderMonth) return;
+
+    chartElements = createAreas(chartElements, canvas, renderInfo, monthInfo);
+
+    let datasetId = parseFloat(monthInfo.dataset);
+    let dataset = renderInfo.datasets.getDatasetById(datasetId);
+
+    // render
+    renderMonthHeader(
+        canvas,
+        chartElements,
+        renderInfo,
+        monthInfo,
+        dataset,
+        curMonthDate
+    );
+
+    renderMonthDays(
+        canvas,
+        chartElements,
+        renderInfo,
+        monthInfo,
+        dataset,
+        curMonthDate
+    );
+}
+
 export function renderMonth(
     canvas: HTMLElement,
     renderInfo: RenderInfo,
@@ -532,7 +599,8 @@ export function renderMonth(
     // console.log(renderInfo);
     if (!renderInfo || !renderMonth) return;
 
-    let chartElements = createAreas(canvas, renderInfo, monthInfo);
+    let chartElements: ChartElements = {};
+    chartElements = createAreas(chartElements, canvas, renderInfo, monthInfo);
 
     let today = window.moment();
     let lastDataMonthDate = renderInfo.datasets.getDates().last();
@@ -541,6 +609,7 @@ export function renderMonth(
     let dataset = renderInfo.datasets.getDatasetById(datasetId);
 
     renderMonthHeader(
+        canvas,
         chartElements,
         renderInfo,
         monthInfo,
@@ -549,6 +618,7 @@ export function renderMonth(
     );
 
     renderMonthDays(
+        canvas,
         chartElements,
         renderInfo,
         monthInfo,

From 2c23c641b2119560d2962cf9747c35f6fd7b3087 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 20 Jun 2021 13:42:29 +0800
Subject: [PATCH 067/402] Fix streaks position

---
 src/month.ts | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/month.ts b/src/month.ts
index 908485b..b05c67f 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -215,7 +215,8 @@ function renderMonthHeader(
                 chartElements,
                 renderInfo,
                 monthInfo,
-                prevMonthDate);
+                prevMonthDate
+            );
         });
 
     // arrow right
@@ -240,7 +241,8 @@ function renderMonthHeader(
                 chartElements,
                 renderInfo,
                 monthInfo,
-                nextMonthDate);
+                nextMonthDate
+            );
         });
 
     chartElements["title"] = titleGroup;
@@ -365,7 +367,7 @@ function renderMonthDays(
             }
         }
 
-        // if (curDate.format("YYYY-MM-DD") === "2021-12-16") {
+        // if (curDate.format("YYYY-MM-DD") === "2021-11-02") {
         //     logToConsole = true;
         // }
 
@@ -431,8 +433,11 @@ function renderMonthDays(
             )
             .enter()
             .append("rect")
+            // .attr("id", function(d: DayInfo) {
+            //     return "in" + d.date.format("YYYY-MM-DD");
+            // })
             .attr("x", function (d: DayInfo) {
-                let x = scale(d.col) - cellSize / 2.0 - streakWidth;
+                let x = scale(d.col) - dotRadius - streakWidth;
                 return x;
             })
             .attr("y", function (d: DayInfo) {
@@ -467,8 +472,11 @@ function renderMonthDays(
             )
             .enter()
             .append("rect")
+            // .attr("id", function(d: DayInfo) {
+            //     return "out" + d.date.format("YYYY-MM-DD");
+            // })
             .attr("x", function (d: DayInfo) {
-                let x = scale(d.col) + cellSize / 2.0;
+                let x = scale(d.col) + dotRadius;
                 return x;
             })
             .attr("y", function (d: DayInfo) {

From 08e44d6e159077169621e545da849f9cf71995bd Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 20 Jun 2021 13:54:06 +0800
Subject: [PATCH 068/402] Set cursor styles in month view

---
 src/month.ts | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/month.ts b/src/month.ts
index b05c67f..8621e64 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -157,7 +157,8 @@ function renderMonthHeader(
                 titleYearSize.height / 2.0 +
                 ")"
         )
-        .attr("class", "tracker-month-title-year");
+        .attr("class", "tracker-month-title-year")
+        .style('cursor', 'default');
 
     if (titleYearColor) {
         titleYear.style("fill", titleYearColor);
@@ -187,7 +188,8 @@ function renderMonthHeader(
                 titleMonthSize.height / 2.0 +
                 ")"
         )
-        .attr("class", "tracker-month-title-month");
+        .attr("class", "tracker-month-title-month")
+        .style('cursor', 'default');
 
     if (titleMonthColor) {
         titleMonth.style("fill", titleMonthColor);
@@ -217,7 +219,8 @@ function renderMonthHeader(
                 monthInfo,
                 prevMonthDate
             );
-        });
+        })
+        .style('cursor', 'pointer');
 
     // arrow right
     let arrowRight = titleGroup
@@ -243,7 +246,8 @@ function renderMonthHeader(
                 monthInfo,
                 nextMonthDate
             );
-        });
+        })
+        .style('cursor', 'pointer');
 
     chartElements["title"] = titleGroup;
     headerHeight += titleHeight;
@@ -268,7 +272,8 @@ function renderMonthHeader(
             return strTranslate;
         })
         .attr("class", "tracker-tick-label")
-        .attr("text-anchor", "middle");
+        .attr("text-anchor", "middle")
+        .style('cursor', 'default');
     chartElements["weekDays"] = weekDays;
     headerHeight += weekdayNameSize.height;
 
@@ -532,7 +537,8 @@ function renderMonthDays(
                 return 0.2;
             }
             return 1.0;
-        });
+        })
+        .style('cursor', 'default');
 
     // labels
     let dayLabals = chartElements.dataArea
@@ -559,7 +565,8 @@ function renderMonthDays(
             }
             return 1.0;
         })
-        .attr("class", "tracker-axis-label");
+        .attr("class", "tracker-axis-label")
+        .style('cursor', 'default');
 }
 
 function refresh(

From 6cf5bf10b2049fade51854b4c2a791127dd25928 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 20 Jun 2021 15:21:12 +0800
Subject: [PATCH 069/402] Dim the day out of data range in month view

---
 src/month.ts | 43 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/month.ts b/src/month.ts
index 8621e64..a9e5888 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -22,6 +22,7 @@ interface DayInfo {
     date: string;
     dayInMonth: number;
     isInThisMonth: boolean;
+    isOutOfDataRange: boolean;
     row: number;
     col: number;
     showDot: boolean;
@@ -158,7 +159,7 @@ function renderMonthHeader(
                 ")"
         )
         .attr("class", "tracker-month-title-year")
-        .style('cursor', 'default');
+        .style("cursor", "default");
 
     if (titleYearColor) {
         titleYear.style("fill", titleYearColor);
@@ -189,7 +190,7 @@ function renderMonthHeader(
                 ")"
         )
         .attr("class", "tracker-month-title-month")
-        .style('cursor', 'default');
+        .style("cursor", "default");
 
     if (titleMonthColor) {
         titleMonth.style("fill", titleMonthColor);
@@ -220,7 +221,7 @@ function renderMonthHeader(
                 prevMonthDate
             );
         })
-        .style('cursor', 'pointer');
+        .style("cursor", "pointer");
 
     // arrow right
     let arrowRight = titleGroup
@@ -247,7 +248,7 @@ function renderMonthHeader(
                 nextMonthDate
             );
         })
-        .style('cursor', 'pointer');
+        .style("cursor", "pointer");
 
     chartElements["title"] = titleGroup;
     headerHeight += titleHeight;
@@ -273,7 +274,7 @@ function renderMonthHeader(
         })
         .attr("class", "tracker-tick-label")
         .attr("text-anchor", "middle")
-        .style('cursor', 'default');
+        .style("cursor", "default");
     chartElements["weekDays"] = weekDays;
     headerHeight += weekdayNameSize.height;
 
@@ -341,6 +342,8 @@ function renderMonthDays(
     const endDate = monthEndDate
         .clone()
         .add(7 - monthEndDate.day() - 1, "days");
+    const dataStartDate = dataset.getStartDate().clone();
+    const dataEndDate = dataset.getEndDate().clone();
     // console.log(monthStartDate.format("YYYY-MM-DD"));
     // console.log(startDate.format("YYYY-MM-DD"));
     let indCol = 0;
@@ -362,6 +365,11 @@ function renderMonthDays(
         ) {
             isInThisMonth = false;
         }
+        // is this day out of data range
+        let isOutOfDataRange = false;
+        if (curDate.diff(dataStartDate) < 0 || curDate.diff(dataEndDate) > 0) {
+            isOutOfDataRange = true;
+        }
 
         // scaledValue
         let curValue = dataset.getValue(curDate);
@@ -402,6 +410,7 @@ function renderMonthDays(
             date: curDate.format(renderInfo.dateFormat),
             dayInMonth: curDate.date(),
             isInThisMonth: isInThisMonth,
+            isOutOfDataRange: isOutOfDataRange,
             row: indRow,
             col: indCol,
             showDot: showDot,
@@ -462,7 +471,10 @@ function renderMonthDays(
                 return "none";
             })
             .style("fill-opacity", function (d: DayInfo) {
-                if (monthInfo.dimDotsNotInMonth && !d.isInThisMonth) {
+                if (
+                    d.isOutOfDataRange ||
+                    (monthInfo.dimDotsNotInMonth && !d.isInThisMonth)
+                ) {
                     return 0.2;
                 }
                 return 1.0;
@@ -501,7 +513,10 @@ function renderMonthDays(
                 return "none";
             })
             .style("fill-opacity", function (d: DayInfo) {
-                if (monthInfo.dimDotsNotInMonth && !d.isInThisMonth) {
+                if (
+                    d.isOutOfDataRange ||
+                    (monthInfo.dimDotsNotInMonth && !d.isInThisMonth)
+                ) {
                     return 0.2;
                 }
                 return 1.0;
@@ -533,12 +548,15 @@ function renderMonthDays(
             return "none";
         })
         .style("fill-opacity", function (d: DayInfo) {
-            if (monthInfo.dimDotsNotInMonth && !d.isInThisMonth) {
+            if (
+                d.isOutOfDataRange ||
+                (monthInfo.dimDotsNotInMonth && !d.isInThisMonth)
+            ) {
                 return 0.2;
             }
             return 1.0;
         })
-        .style('cursor', 'default');
+        .style("cursor", "default");
 
     // labels
     let dayLabals = chartElements.dataArea
@@ -560,13 +578,16 @@ function renderMonthDays(
             return strTranslate;
         })
         .style("fill-opacity", function (d: DayInfo) {
-            if (monthInfo.dimDotsNotInMonth && !d.isInThisMonth) {
+            if (
+                d.isOutOfDataRange ||
+                (monthInfo.dimDotsNotInMonth && !d.isInThisMonth)
+            ) {
                 return 0.2;
             }
             return 1.0;
         })
         .attr("class", "tracker-axis-label")
-        .style('cursor', 'default');
+        .style("cursor", "default");
 }
 
 function refresh(

From 1f39eb9f3faed8a21018bf72d2452c109ad58db2 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 20 Jun 2021 16:17:54 +0800
Subject: [PATCH 070/402] Refine container sizes in month view

---
 src/month.ts | 45 +++++++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/month.ts b/src/month.ts
index a9e5888..ff71541 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -126,17 +126,15 @@ function renderMonthHeader(
         "tracker-month-title-month"
     );
 
+    let headerHeight = 0;
+    // Append header group
+    let headerGroup = chartElements.graphArea.append("g");
+
+    // title
     let titleHeight =
         Math.max(titleYearSize.height, titleMonthSize.height) * 1.5;
     let titleSpacing = 8;
 
-    let headerHeight = 0;
-
-    // Append title
-    let titleGroup = chartElements.graphArea
-        .append("g")
-        .attr("height", titleHeight);
-
     // title year
     let titleYearColor = null;
     if (monthInfo.titleYearColor) {
@@ -146,7 +144,7 @@ function renderMonthHeader(
             titleYearColor = monthInfo.color;
         }
     }
-    let titleYear = titleGroup
+    let titleYear = headerGroup
         .append("text")
         .text(titleYearText) // pivot at center
         .attr("id", "titleYear")
@@ -174,7 +172,7 @@ function renderMonthHeader(
             titleMonthColor = monthInfo.color;
         }
     }
-    let titleMonth = titleGroup
+    let titleMonth = headerGroup
         .append("text")
         .text(titleMonthText) // pivot at center
         .attr("id", "titleMonth")
@@ -197,7 +195,7 @@ function renderMonthHeader(
     }
 
     // arrow left
-    let arrowLeft = titleGroup
+    let arrowLeft = headerGroup
         .append("text")
         .text("<") // pivot at center
         .attr("id", "arrowLeft")
@@ -224,7 +222,7 @@ function renderMonthHeader(
         .style("cursor", "pointer");
 
     // arrow right
-    let arrowRight = titleGroup
+    let arrowRight = headerGroup
         .append("text")
         .text(">") // pivot at center
         .attr("id", "arrowLeft")
@@ -249,8 +247,6 @@ function renderMonthHeader(
             );
         })
         .style("cursor", "pointer");
-
-    chartElements["title"] = titleGroup;
     headerHeight += titleHeight;
 
     // week day names
@@ -275,7 +271,6 @@ function renderMonthHeader(
         .attr("class", "tracker-tick-label")
         .attr("text-anchor", "middle")
         .style("cursor", "default");
-    chartElements["weekDays"] = weekDays;
     headerHeight += weekdayNameSize.height;
 
     // dividing line
@@ -299,12 +294,10 @@ function renderMonthHeader(
     if (dividingLineColor) {
         dividingLine.style("fill", dividingLineColor);
     }
-
     headerHeight += dividingLineHeight;
 
-    // Expand parent areas
-    helper.expandArea(chartElements.svg, 0, headerHeight);
-    helper.expandArea(chartElements.graphArea, 0, headerHeight);
+    headerGroup.attr("height", headerHeight);
+    chartElements["header"] = headerGroup;
 
     // Move sibling areas
     helper.moveArea(chartElements.dataArea, 0, headerHeight);
@@ -588,6 +581,22 @@ function renderMonthDays(
         })
         .attr("class", "tracker-axis-label")
         .style("cursor", "default");
+
+    // Expand areas
+    let svgHeight = parseFloat(chartElements.svg.attr("height"));
+    let graphAreaHeight = parseFloat(chartElements.graphArea.attr("height"));
+    let totalHeight =
+        7 * cellSize + parseFloat(chartElements.header.attr("height"));
+    if (totalHeight > svgHeight) {
+        helper.expandArea(chartElements.svg, 0, totalHeight - svgHeight);
+    }
+    if (totalHeight > graphAreaHeight) {
+        helper.expandArea(
+            chartElements.graphArea,
+            0,
+            totalHeight - graphAreaHeight
+        );
+    }
 }
 
 function refresh(

From ba5c5f09c48b4f8f78d9d0c396832f8102e22f39 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 20 Jun 2021 19:37:22 +0800
Subject: [PATCH 071/402] Add today circle to month view

---
 examples/TestCalendar.md |  3 ++-
 src/data.ts              |  4 ++++
 src/month.ts             | 31 ++++++++++++++++++++++++++++++-
 src/parsing.ts           | 12 ++++++++++++
 styles.css               |  6 ++++++
 5 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
index ee63dc1..5887b34 100644
--- a/examples/TestCalendar.md
+++ b/examples/TestCalendar.md
@@ -8,8 +8,9 @@ month:
     startWeekOn:
     threshold: 40
     color: tomato
-	titleMonthColor: orange
+	titleMonthColor: tomato
     dimDotsNotInMonth: false
+	todayCircleColor: orange
 ```
 
 ``` tracker
diff --git a/src/data.ts b/src/data.ts
index 7af9917..d7d7ce9 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -687,10 +687,12 @@ export class MonthInfo {
     color: string;
     dimDotsNotInMonth: boolean;
     showStreak: boolean;
+    showTodayCircle: boolean;
     dotColor: string;
     titleYearColor: string;
     titleMonthColor: string;
     dividingLineColor: string;
+    todayCircleColor: string;
 
     constructor() {
         this.dataset = "0";
@@ -700,10 +702,12 @@ export class MonthInfo {
         this.color = null;
         this.dimDotsNotInMonth = true;
         this.showStreak = true; // a streak connects neigbor dots
+        this.showTodayCircle = true;
         this.dotColor = null;
         this.titleYearColor = null;
         this.titleMonthColor = null;
         this.dividingLineColor = null;
+        this.todayCircleColor = ""; // white in css tracker-month-today-circle
     }
 }
 
diff --git a/src/month.ts b/src/month.ts
index ff71541..5768ada 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -236,7 +236,7 @@ function renderMonthHeader(
         )
         .attr("class", "tracker-month-title-arrow")
         .on("click", function () {
-            console.log("right arrow clicked");
+            // console.log("right arrow clicked");
             let nextMonthDate = curMonthDate.clone().add(1, "month");
             refresh(
                 canvas,
@@ -551,6 +551,35 @@ function renderMonthDays(
         })
         .style("cursor", "default");
 
+    // today circles
+    let today = window.moment().format(renderInfo.dateFormat);
+    if (monthInfo.showTodayCircle) {
+        let todayCircles = chartElements.dataArea
+            .selectAll("todayCircle")
+            .data(
+                daysInMonthView.filter(function (d: DayInfo) {
+                    return d.date === today;
+                })
+            )
+            .enter()
+            .append("circle")
+            .attr("r", dotRadius)
+            .attr("cx", function (d: DayInfo) {
+                return scale(d.col);
+            })
+            .attr("cy", function (d: DayInfo) {
+                return scale(d.row);
+            })
+            .attr("class", "tracker-month-today-circle") // stroke not works??
+            .style("cursor", "default");
+
+        if (monthInfo.todayCircleColor !== "") {
+            todayCircles.style("stroke", monthInfo.todayCircleColor);
+        } else {
+            todayCircles.style("stroke", "white");
+        }
+    }
+
     // labels
     let dayLabals = chartElements.dataArea
         .selectAll("dayLabel")
diff --git a/src/parsing.ts b/src/parsing.ts
index 54f40f1..813952a 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1508,6 +1508,12 @@ export function getRenderInfoFromYaml(
         }
         // console.log(month.showStreak);
 
+        // showTodayCircle
+        if (typeof yamlMonth?.showTodayCircle === "boolean") {
+            month.showTodayCircle = yamlMonth.showTodayCircle;
+        }
+        // console.log(month.showTodayCircle);
+
         // dotColor
         if (typeof yamlMonth?.dotColor === "string") {
             month.dotColor = yamlMonth.dotColor;
@@ -1532,6 +1538,12 @@ export function getRenderInfoFromYaml(
         }
         // console.log(month.dividingLineColor);
 
+        // todayCircleColor
+        if (typeof yamlMonth?.todayCircleColor === "string") {
+            month.todayCircleColor = yamlMonth.todayCircleColor;
+        }
+        // console.log(month.todayCircleColor);
+
         renderInfo.month.push(month);
     } // Month related parameters
     // console.log(renderInfo.month);
diff --git a/styles.css b/styles.css
index 50698e8..9c691de 100644
--- a/styles.css
+++ b/styles.css
@@ -128,4 +128,10 @@
     fill: var(--color-title);
     text-anchor: middle;
     font-size: 22px;
+}
+
+.tracker-month-today-circle {
+    fill: none;
+    stroke: "white";
+    stroke-width: 1.5px;
 }
\ No newline at end of file

From be7fc09fdb24a987d196a81c81f0a05609022d56 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 20 Jun 2021 22:07:31 +0800
Subject: [PATCH 072/402] Show selected circle

---
 examples/TestCalendar.md |  2 +-
 src/data.ts              | 12 +++++-
 src/month.ts             | 87 +++++++++++++++++++++++++++++++++++-----
 src/parsing.ts           | 18 +++++++++
 styles.css               |  6 +++
 5 files changed, 114 insertions(+), 11 deletions(-)

diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
index 5887b34..414b4f8 100644
--- a/examples/TestCalendar.md
+++ b/examples/TestCalendar.md
@@ -8,7 +8,7 @@ month:
     startWeekOn:
     threshold: 40
     color: tomato
-	titleMonthColor: tomato
+	titleMonthColor: orange
     dimDotsNotInMonth: false
 	todayCircleColor: orange
 ```
diff --git a/src/data.ts b/src/data.ts
index d7d7ce9..aab362c 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -688,11 +688,16 @@ export class MonthInfo {
     dimDotsNotInMonth: boolean;
     showStreak: boolean;
     showTodayCircle: boolean;
+    showSelectedValue: boolean;
+    showSelectedCircle: boolean;
     dotColor: string;
     titleYearColor: string;
     titleMonthColor: string;
     dividingLineColor: string;
     todayCircleColor: string;
+    selectedCircleColor: string;
+
+    selectedDate: string;
 
     constructor() {
         this.dataset = "0";
@@ -703,11 +708,16 @@ export class MonthInfo {
         this.dimDotsNotInMonth = true;
         this.showStreak = true; // a streak connects neigbor dots
         this.showTodayCircle = true;
+        this.showSelectedValue = true;
+        this.showSelectedCircle = true;
         this.dotColor = null;
         this.titleYearColor = null;
         this.titleMonthColor = null;
         this.dividingLineColor = null;
-        this.todayCircleColor = ""; // white in css tracker-month-today-circle
+        this.todayCircleColor = ""; // white
+        this.selectedCircleColor = "firebrick";
+
+        this.selectedDate = "";
     }
 }
 
diff --git a/src/month.ts b/src/month.ts
index 5768ada..272e6e0 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -15,8 +15,8 @@ import * as helper from "./helper";
 import * as d3 from "d3";
 
 let logToConsole = false;
-let ratioCellToText = 2.5;
-let ratioDotToText = 1.5;
+let ratioCellToText = 2.8;
+let ratioDotToText = 1.8;
 
 interface DayInfo {
     date: string;
@@ -94,6 +94,18 @@ function createAreas(
     return chartElements;
 }
 
+function clearSelection(chartElements: ChartElements, monthInfo: MonthInfo) {
+    let circles = chartElements.svg.selectAll("circle");
+    // console.log(circles);
+    for (let circle of circles) {
+        // console.log(circle);
+        let id = d3.select(circle).attr("id");
+        if (id && id.startsWith("tracker-selected-circle-")) {
+            d3.select(circle).style("stroke", "none");
+        }
+    }
+    monthInfo.selectedDate = "";
+}
 function renderMonthHeader(
     canvas: HTMLElement,
     chartElements: ChartElements,
@@ -157,7 +169,10 @@ function renderMonthHeader(
                 ")"
         )
         .attr("class", "tracker-month-title-year")
-        .style("cursor", "default");
+        .style("cursor", "default")
+        .on("click", function (event: any) {
+            clearSelection(chartElements, monthInfo);
+        });
 
     if (titleYearColor) {
         titleYear.style("fill", titleYearColor);
@@ -188,7 +203,10 @@ function renderMonthHeader(
                 ")"
         )
         .attr("class", "tracker-month-title-month")
-        .style("cursor", "default");
+        .style("cursor", "default")
+        .on("click", function (event: any) {
+            clearSelection(chartElements, monthInfo);
+        });
 
     if (titleMonthColor) {
         titleMonth.style("fill", titleMonthColor);
@@ -208,8 +226,9 @@ function renderMonthHeader(
                 ")"
         )
         .attr("class", "tracker-month-title-arrow")
-        .on("click", function () {
+        .on("click", function (event: any) {
             // console.log("left arrow clicked");
+            clearSelection(chartElements, monthInfo);
             let prevMonthDate = curMonthDate.clone().add(-1, "month");
             refresh(
                 canvas,
@@ -235,8 +254,9 @@ function renderMonthHeader(
                 ")"
         )
         .attr("class", "tracker-month-title-arrow")
-        .on("click", function () {
+        .on("click", function (event: any) {
             // console.log("right arrow clicked");
+            clearSelection(chartElements, monthInfo);
             let nextMonthDate = curMonthDate.clone().add(1, "month");
             refresh(
                 canvas,
@@ -270,7 +290,10 @@ function renderMonthHeader(
         })
         .attr("class", "tracker-tick-label")
         .attr("text-anchor", "middle")
-        .style("cursor", "default");
+        .style("cursor", "default")
+        .on("click", function (event: any) {
+            clearSelection(chartElements, monthInfo);
+        });
     headerHeight += weekdayNameSize.height;
 
     // dividing line
@@ -563,7 +586,7 @@ function renderMonthDays(
             )
             .enter()
             .append("circle")
-            .attr("r", dotRadius)
+            .attr("r", dotRadius * 0.9)
             .attr("cx", function (d: DayInfo) {
                 return scale(d.col);
             })
@@ -580,6 +603,28 @@ function renderMonthDays(
         }
     }
 
+    // selected circles
+    if (monthInfo.showSelectedCircle) {
+        let selectedCircles = chartElements.dataArea
+            .selectAll("selectedCircle")
+            .data(daysInMonthView)
+            .enter()
+            .append("circle")
+            .attr("r", dotRadius)
+            .attr("cx", function (d: DayInfo) {
+                return scale(d.col);
+            })
+            .attr("cy", function (d: DayInfo) {
+                return scale(d.row);
+            })
+            .attr("id", function (d: DayInfo) {
+                return "tracker-selected-circle-" + d.date;
+            })
+            .attr("class", "tracker-month-selected-circle") // stroke not works??
+            .style("cursor", "default")
+            .style("stroke", "none");
+    }
+
     // labels
     let dayLabals = chartElements.dataArea
         .selectAll("dayLabel")
@@ -608,17 +653,38 @@ function renderMonthDays(
             }
             return 1.0;
         })
+        .attr("date", function (d: DayInfo) {
+            return d.date;
+        })
         .attr("class", "tracker-axis-label")
-        .style("cursor", "default");
+        .on("click", function (event: any) {
+            clearSelection(chartElements, monthInfo);
+            // show new selected circle
+            let date = d3.select(this).attr("date");
+            monthInfo.selectedDate = date;
+
+            if (monthInfo.showSelectedCircle) {
+                chartElements.dataArea
+                    .select("#tracker-selected-circle-" + date)
+                    .style("stroke", monthInfo.selectedCircleColor);
+            }
+        })
+        .style("cursor", "pointer");
 
     // Expand areas
+    let svgWidth = parseFloat(chartElements.svg.attr("width"));
     let svgHeight = parseFloat(chartElements.svg.attr("height"));
+    let graphAreaWidth = parseFloat(chartElements.graphArea.attr("width"));
     let graphAreaHeight = parseFloat(chartElements.graphArea.attr("height"));
     let totalHeight =
         7 * cellSize + parseFloat(chartElements.header.attr("height"));
+    let totalWidth = 7 * cellSize;
     if (totalHeight > svgHeight) {
         helper.expandArea(chartElements.svg, 0, totalHeight - svgHeight);
     }
+    if (totalWidth > svgWidth) {
+        helper.expandArea(chartElements.svg, totalWidth - svgWidth, 0);
+    }
     if (totalHeight > graphAreaHeight) {
         helper.expandArea(
             chartElements.graphArea,
@@ -626,6 +692,9 @@ function renderMonthDays(
             totalHeight - graphAreaHeight
         );
     }
+    if (totalWidth > graphAreaWidth) {
+        helper.expandArea(chartElements.svg, totalWidth - graphAreaWidth, 0);
+    }
 }
 
 function refresh(
diff --git a/src/parsing.ts b/src/parsing.ts
index 813952a..95a1bfb 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1514,6 +1514,18 @@ export function getRenderInfoFromYaml(
         }
         // console.log(month.showTodayCircle);
 
+        // showSelectedValue
+        if (typeof yamlMonth?.showSelectedValue === "boolean") {
+            month.showSelectedValue = yamlMonth.showSelectedValue;
+        }
+        // console.log(month.showSelectedValue);
+
+        // showSelectedCircle
+        if (typeof yamlMonth?.showSelectedCircle === "boolean") {
+            month.showSelectedCircle = yamlMonth.showSelectedCircle;
+        }
+        // console.log(month.showSelectedCircle);
+
         // dotColor
         if (typeof yamlMonth?.dotColor === "string") {
             month.dotColor = yamlMonth.dotColor;
@@ -1544,6 +1556,12 @@ export function getRenderInfoFromYaml(
         }
         // console.log(month.todayCircleColor);
 
+        // selectedCircleColor
+        if (typeof yamlMonth?.selectedCircleColor === "string") {
+            month.selectedCircleColor = yamlMonth.selectedCircleColor;
+        }
+        // console.log(month.selectedCircleColor);
+
         renderInfo.month.push(month);
     } // Month related parameters
     // console.log(renderInfo.month);
diff --git a/styles.css b/styles.css
index 9c691de..f4fb0da 100644
--- a/styles.css
+++ b/styles.css
@@ -133,5 +133,11 @@
 .tracker-month-today-circle {
     fill: none;
     stroke: "white";
+    stroke-width: 3px;
+}
+
+.tracker-month-selected-circle {
+    fill: none;
+    stroke: "red";
     stroke-width: 1.5px;
 }
\ No newline at end of file

From f73e07d97eb8a83639d965caa5bb8ecd947449d9 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 20 Jun 2021 23:20:51 +0800
Subject: [PATCH 073/402] Add value monitor to month view

---
 examples/TestCalendar.md |  2 ++
 src/month.ts             | 42 +++++++++++++++++++++++++++++++++++++++-
 styles.css               | 10 ++++++++--
 3 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
index 414b4f8..3655644 100644
--- a/examples/TestCalendar.md
+++ b/examples/TestCalendar.md
@@ -11,6 +11,7 @@ month:
 	titleMonthColor: orange
     dimDotsNotInMonth: false
 	todayCircleColor: orange
+	selectedCircleColor: steelblue
 ```
 
 ``` tracker
@@ -21,6 +22,7 @@ month:
     startWeekOn: 
     color: steelblue
 	titleMonthColor: green
+	selectedCircleColor: orange
 ```
 
 Please also check those search targets in markdown files under folder 'diary'.
diff --git a/src/month.ts b/src/month.ts
index 272e6e0..77a0986 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -20,6 +20,7 @@ let ratioDotToText = 1.8;
 
 interface DayInfo {
     date: string;
+    value: number;
     dayInMonth: number;
     isInThisMonth: boolean;
     isOutOfDataRange: boolean;
@@ -105,6 +106,8 @@ function clearSelection(chartElements: ChartElements, monthInfo: MonthInfo) {
         }
     }
     monthInfo.selectedDate = "";
+
+    chartElements.monitor.text("");
 }
 function renderMonthHeader(
     canvas: HTMLElement,
@@ -212,6 +215,24 @@ function renderMonthHeader(
         titleMonth.style("fill", titleMonthColor);
     }
 
+    // value monitor
+    let valueMonitor = headerGroup
+        .append("text")
+        .text("")
+        .attr("id", "valueMonitor")
+        .attr(
+            "transform",
+            "translate(" +
+                3.5 * cellSize +
+                "," +
+                titleMonthSize.height / 2.0 +
+                ")"
+        )
+        .attr("class", "tracker-month-title-monitor")
+        .style("cursor", "pointer")
+        .style("fill", monthInfo.selectedCircleColor);
+    chartElements["monitor"] = valueMonitor;
+
     // arrow left
     let arrowLeft = headerGroup
         .append("text")
@@ -424,6 +445,7 @@ function renderMonthDays(
 
         daysInMonthView.push({
             date: curDate.format(renderInfo.dateFormat),
+            value: curValue,
             dayInMonth: curDate.date(),
             isInThisMonth: isInThisMonth,
             isOutOfDataRange: isOutOfDataRange,
@@ -656,18 +678,36 @@ function renderMonthDays(
         .attr("date", function (d: DayInfo) {
             return d.date;
         })
+        .attr("value", function (d: DayInfo) {
+            return d.value;
+        })
+        .attr("valueType", function (d: DayInfo) {
+            return ValueType[dataset.valueType];
+        })
         .attr("class", "tracker-axis-label")
         .on("click", function (event: any) {
+            // clear circles
             clearSelection(chartElements, monthInfo);
             // show new selected circle
             let date = d3.select(this).attr("date");
             monthInfo.selectedDate = date;
-
             if (monthInfo.showSelectedCircle) {
                 chartElements.dataArea
                     .select("#tracker-selected-circle-" + date)
                     .style("stroke", monthInfo.selectedCircleColor);
             }
+            // show value on monitor
+            let strValue = d3.select(this).attr("value");
+            let valueType = d3.select(this).attr("valueType");
+            let valueText = "";
+            if (valueType === "Time") {
+                let dayStart = window.moment("00:00", "HH:mm", true);
+                let tickTime = dayStart.add(parseFloat(strValue), "seconds");
+                valueText = tickTime.format("HH:mm");
+            } else {
+                valueText = strValue;
+            }
+            chartElements.monitor.text(valueText);
         })
         .style("cursor", "pointer");
 
diff --git a/styles.css b/styles.css
index f4fb0da..c42a653 100644
--- a/styles.css
+++ b/styles.css
@@ -130,14 +130,20 @@
     font-size: 22px;
 }
 
+.tracker-month-title-monitor {
+    fill: var(--color-title);
+    text-anchor: middle;
+    font-size: 22px;
+}
+
 .tracker-month-today-circle {
     fill: none;
     stroke: "white";
-    stroke-width: 3px;
+    stroke-width: 4px;
 }
 
 .tracker-month-selected-circle {
     fill: none;
     stroke: "red";
-    stroke-width: 1.5px;
+    stroke-width: 2px;
 }
\ No newline at end of file

From 46b465791511a4a148a35f3ee458c5444d916bff Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 20 Jun 2021 23:23:50 +0800
Subject: [PATCH 074/402] Enable show/hide selected value

---
 examples/TestCalendar.md |  1 +
 src/month.ts             | 25 +++++++++++++++----------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
index 3655644..f4c55d2 100644
--- a/examples/TestCalendar.md
+++ b/examples/TestCalendar.md
@@ -12,6 +12,7 @@ month:
     dimDotsNotInMonth: false
 	todayCircleColor: orange
 	selectedCircleColor: steelblue
+	showSelectedValue: true
 ```
 
 ``` tracker
diff --git a/src/month.ts b/src/month.ts
index 77a0986..9c2f620 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -697,17 +697,22 @@ function renderMonthDays(
                     .style("stroke", monthInfo.selectedCircleColor);
             }
             // show value on monitor
-            let strValue = d3.select(this).attr("value");
-            let valueType = d3.select(this).attr("valueType");
-            let valueText = "";
-            if (valueType === "Time") {
-                let dayStart = window.moment("00:00", "HH:mm", true);
-                let tickTime = dayStart.add(parseFloat(strValue), "seconds");
-                valueText = tickTime.format("HH:mm");
-            } else {
-                valueText = strValue;
+            if (monthInfo.showSelectedValue) {
+                let strValue = d3.select(this).attr("value");
+                let valueType = d3.select(this).attr("valueType");
+                let valueText = "";
+                if (valueType === "Time") {
+                    let dayStart = window.moment("00:00", "HH:mm", true);
+                    let tickTime = dayStart.add(
+                        parseFloat(strValue),
+                        "seconds"
+                    );
+                    valueText = tickTime.format("HH:mm");
+                } else {
+                    valueText = strValue;
+                }
+                chartElements.monitor.text(valueText);
             }
-            chartElements.monitor.text(valueText);
         })
         .style("cursor", "pointer");
 

From 27e72e3ee2cb87f55d36be1f198a19d369691449 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 21 Jun 2021 09:50:36 +0800
Subject: [PATCH 075/402] Set version to 1.7.0

---
 manifest.json | 2 +-
 package.json  | 2 +-
 versions.json | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index 9f94019..1cd0dd9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-tracker",
 	"name": "Tracker",
-	"version": "1.6.1",
+	"version": "1.7.0",
 	"minAppVersion": "0.9.12",
 	"description": "A plugin tracks occurrences and numbers in your notes",
 	"author": "pyrochlore",
diff --git a/package.json b/package.json
index 78d944e..28b5fcc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.6.1",
+  "version": "1.7.0",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
diff --git a/versions.json b/versions.json
index 00ceaac..d31b61b 100644
--- a/versions.json
+++ b/versions.json
@@ -11,5 +11,6 @@
 	"1.5.0": "0.9.12",
 	"1.5.1": "0.9.12",
 	"1.6.0": "0.9.12",
-	"1.6.1": "0.9.12"
+	"1.6.1": "0.9.12",
+	"1.7.0": "0.9.12"
 }

From db3b491e87660941863852e89773cfaea1538efd Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 21 Jun 2021 13:14:27 +0800
Subject: [PATCH 076/402] Fix startWeekOn for month view

---
 src/data.ts  |  4 ++--
 src/month.ts | 27 +++++++++++++++++++++------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/data.ts b/src/data.ts
index aab362c..f1d813f 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -682,8 +682,8 @@ export class SummaryInfo extends OutputInfo {
 export class MonthInfo {
     dataset: string;
     startWeekOn: string;
-    showDot: boolean;
     threshold: number;
+    showDot: boolean;
     color: string;
     dimDotsNotInMonth: boolean;
     showStreak: boolean;
@@ -702,8 +702,8 @@ export class MonthInfo {
     constructor() {
         this.dataset = "0";
         this.startWeekOn = "Sun";
-        this.showDot = true;
         this.threshold = 0.0; // if value > threshold, will show dot
+        this.showDot = true;
         this.color = null;
         this.dimDotsNotInMonth = true;
         this.showStreak = true; // a streak connects neigbor dots
diff --git a/src/month.ts b/src/month.ts
index 9c2f620..5618e49 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -292,6 +292,9 @@ function renderMonthHeader(
 
     // week day names
     let weekdayNames = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
+    if (monthInfo.startWeekOn.toLowerCase() === "mon") {
+        weekdayNames.push(weekdayNames.shift());
+    }
     let weekdayNameSize = helper.measureTextSize(
         weekdayNames[0],
         "tracker-tick-label"
@@ -372,13 +375,17 @@ function renderMonthDays(
     // Prepare data for graph
     let daysInMonthView: Array<DayInfo> = [];
     const monthStartDate = curMonthDate.clone().startOf("month");
-    const startDate = monthStartDate
+    let startDate = monthStartDate
         .clone()
         .subtract(monthStartDate.day(), "days");
+    if (monthInfo.startWeekOn.toLowerCase() === "mon") {
+        startDate = startDate.add(1, "days");
+    }
     const monthEndDate = curMonthDate.clone().endOf("month");
-    const endDate = monthEndDate
-        .clone()
-        .add(7 - monthEndDate.day() - 1, "days");
+    let endDate = monthEndDate.clone().add(7 - monthEndDate.day() - 1, "days");
+    if (monthInfo.startWeekOn.toLowerCase() === "mon") {
+        endDate = endDate.add(1, "days");
+    }
     const dataStartDate = dataset.getStartDate().clone();
     const dataEndDate = dataset.getEndDate().clone();
     // console.log(monthStartDate.format("YYYY-MM-DD"));
@@ -391,8 +398,16 @@ function renderMonthDays(
         curDate <= endDate;
         curDate.add(1, "days")
     ) {
-        indCol = curDate.day();
-        indRow = Math.floor(ind / 7);
+        if (monthInfo.startWeekOn.toLowerCase() === "mon") {
+            indCol = curDate.day() - 1;
+            if (indCol < 0) {
+                indCol = 6;
+            }
+            indRow = Math.floor(ind / 7);
+        } else {
+            indCol = curDate.day(); // 0~6
+            indRow = Math.floor(ind / 7);
+        }
 
         // is this day in this month
         let isInThisMonth = true;

From 17ff9bdea8fcd51bad5e3682a1031492be0bf928 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 21 Jun 2021 15:58:36 +0800
Subject: [PATCH 077/402] Rename parameters

---
 examples/TestCalendar.md |  6 +++---
 src/data.ts              | 16 ++++++++--------
 src/month.ts             | 24 ++++++++++++------------
 src/parsing.ts           | 32 ++++++++++++++++----------------
 4 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
index f4c55d2..25a34f5 100644
--- a/examples/TestCalendar.md
+++ b/examples/TestCalendar.md
@@ -10,8 +10,8 @@ month:
     color: tomato
 	titleMonthColor: orange
     dimDotsNotInMonth: false
-	todayCircleColor: orange
-	selectedCircleColor: steelblue
+	todayRingColor: orange
+	selectedRingColor: steelblue
 	showSelectedValue: true
 ```
 
@@ -23,7 +23,7 @@ month:
     startWeekOn: 
     color: steelblue
 	titleMonthColor: green
-	selectedCircleColor: orange
+	selectedRingColor: orange
 ```
 
 Please also check those search targets in markdown files under folder 'diary'.
diff --git a/src/data.ts b/src/data.ts
index f1d813f..b701889 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -687,15 +687,15 @@ export class MonthInfo {
     color: string;
     dimDotsNotInMonth: boolean;
     showStreak: boolean;
-    showTodayCircle: boolean;
+    showTodayRing: boolean;
     showSelectedValue: boolean;
-    showSelectedCircle: boolean;
+    showSelectedRing: boolean;
     dotColor: string;
     titleYearColor: string;
     titleMonthColor: string;
     dividingLineColor: string;
-    todayCircleColor: string;
-    selectedCircleColor: string;
+    todayRingColor: string;
+    selectedRingColor: string;
 
     selectedDate: string;
 
@@ -707,15 +707,15 @@ export class MonthInfo {
         this.color = null;
         this.dimDotsNotInMonth = true;
         this.showStreak = true; // a streak connects neigbor dots
-        this.showTodayCircle = true;
+        this.showTodayRing = true;
         this.showSelectedValue = true;
-        this.showSelectedCircle = true;
+        this.showSelectedRing = true;
         this.dotColor = null;
         this.titleYearColor = null;
         this.titleMonthColor = null;
         this.dividingLineColor = null;
-        this.todayCircleColor = ""; // white
-        this.selectedCircleColor = "firebrick";
+        this.todayRingColor = ""; // white
+        this.selectedRingColor = "firebrick";
 
         this.selectedDate = "";
     }
diff --git a/src/month.ts b/src/month.ts
index 5618e49..f04a144 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -230,7 +230,7 @@ function renderMonthHeader(
         )
         .attr("class", "tracker-month-title-monitor")
         .style("cursor", "pointer")
-        .style("fill", monthInfo.selectedCircleColor);
+        .style("fill", monthInfo.selectedRingColor);
     chartElements["monitor"] = valueMonitor;
 
     // arrow left
@@ -613,9 +613,9 @@ function renderMonthDays(
 
     // today circles
     let today = window.moment().format(renderInfo.dateFormat);
-    if (monthInfo.showTodayCircle) {
-        let todayCircles = chartElements.dataArea
-            .selectAll("todayCircle")
+    if (monthInfo.showTodayRing) {
+        let todayRings = chartElements.dataArea
+            .selectAll("todayRing")
             .data(
                 daysInMonthView.filter(function (d: DayInfo) {
                     return d.date === today;
@@ -633,17 +633,17 @@ function renderMonthDays(
             .attr("class", "tracker-month-today-circle") // stroke not works??
             .style("cursor", "default");
 
-        if (monthInfo.todayCircleColor !== "") {
-            todayCircles.style("stroke", monthInfo.todayCircleColor);
+        if (monthInfo.todayRingColor !== "") {
+            todayRings.style("stroke", monthInfo.todayRingColor);
         } else {
-            todayCircles.style("stroke", "white");
+            todayRings.style("stroke", "white");
         }
     }
 
     // selected circles
-    if (monthInfo.showSelectedCircle) {
-        let selectedCircles = chartElements.dataArea
-            .selectAll("selectedCircle")
+    if (monthInfo.showSelectedRing) {
+        let selectedRings = chartElements.dataArea
+            .selectAll("selectedRing")
             .data(daysInMonthView)
             .enter()
             .append("circle")
@@ -706,10 +706,10 @@ function renderMonthDays(
             // show new selected circle
             let date = d3.select(this).attr("date");
             monthInfo.selectedDate = date;
-            if (monthInfo.showSelectedCircle) {
+            if (monthInfo.showSelectedRing) {
                 chartElements.dataArea
                     .select("#tracker-selected-circle-" + date)
-                    .style("stroke", monthInfo.selectedCircleColor);
+                    .style("stroke", monthInfo.selectedRingColor);
             }
             // show value on monitor
             if (monthInfo.showSelectedValue) {
diff --git a/src/parsing.ts b/src/parsing.ts
index 95a1bfb..139d79c 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1508,11 +1508,11 @@ export function getRenderInfoFromYaml(
         }
         // console.log(month.showStreak);
 
-        // showTodayCircle
-        if (typeof yamlMonth?.showTodayCircle === "boolean") {
-            month.showTodayCircle = yamlMonth.showTodayCircle;
+        // showTodayRing
+        if (typeof yamlMonth?.showTodayRing === "boolean") {
+            month.showTodayRing = yamlMonth.showTodayRing;
         }
-        // console.log(month.showTodayCircle);
+        // console.log(month.showTodayRing);
 
         // showSelectedValue
         if (typeof yamlMonth?.showSelectedValue === "boolean") {
@@ -1520,11 +1520,11 @@ export function getRenderInfoFromYaml(
         }
         // console.log(month.showSelectedValue);
 
-        // showSelectedCircle
-        if (typeof yamlMonth?.showSelectedCircle === "boolean") {
-            month.showSelectedCircle = yamlMonth.showSelectedCircle;
+        // showSelectedRing
+        if (typeof yamlMonth?.showSelectedRing === "boolean") {
+            month.showSelectedRing = yamlMonth.showSelectedRing;
         }
-        // console.log(month.showSelectedCircle);
+        // console.log(month.showSelectedRing);
 
         // dotColor
         if (typeof yamlMonth?.dotColor === "string") {
@@ -1550,17 +1550,17 @@ export function getRenderInfoFromYaml(
         }
         // console.log(month.dividingLineColor);
 
-        // todayCircleColor
-        if (typeof yamlMonth?.todayCircleColor === "string") {
-            month.todayCircleColor = yamlMonth.todayCircleColor;
+        // todayRingColor
+        if (typeof yamlMonth?.todayRingColor === "string") {
+            month.todayRingColor = yamlMonth.todayRingColor;
         }
-        // console.log(month.todayCircleColor);
+        // console.log(month.todayRingColor);
 
-        // selectedCircleColor
-        if (typeof yamlMonth?.selectedCircleColor === "string") {
-            month.selectedCircleColor = yamlMonth.selectedCircleColor;
+        // selectedRingColor
+        if (typeof yamlMonth?.selectedRingColor === "string") {
+            month.selectedRingColor = yamlMonth.selectedRingColor;
         }
-        // console.log(month.selectedCircleColor);
+        // console.log(month.selectedRingColor);
 
         renderInfo.month.push(month);
     } // Month related parameters

From 2ae32e70effe333daeef2c12bcc999b9f7de72f2 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 21 Jun 2021 17:18:45 +0800
Subject: [PATCH 078/402] Rename parameters

---
 examples/TestCalendar.md | 13 +++++++++--
 src/data.ts              |  8 +++----
 src/month.ts             | 50 ++++++++++++++++++++--------------------
 src/parsing.ts           |  8 +++----
 4 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
index 25a34f5..7a3ddf9 100644
--- a/examples/TestCalendar.md
+++ b/examples/TestCalendar.md
@@ -8,7 +8,7 @@ month:
     startWeekOn:
     threshold: 40
     color: tomato
-	titleMonthColor: orange
+	headerMonthColor: orange
     dimDotsNotInMonth: false
 	todayRingColor: orange
 	selectedRingColor: steelblue
@@ -22,9 +22,18 @@ folder: diary
 month:
     startWeekOn: 
     color: steelblue
-	titleMonthColor: green
+	headerMonthColor: green
 	selectedRingColor: orange
 ```
 
+``` tracker
+searchType: tag
+searchTarget: exercise-pushup
+folder: diary
+month:
+    startWeekOn:
+    threshold: 40
+```
+
 Please also check those search targets in markdown files under folder 'diary'.
 
diff --git a/src/data.ts b/src/data.ts
index b701889..9ccc1c8 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -691,8 +691,8 @@ export class MonthInfo {
     showSelectedValue: boolean;
     showSelectedRing: boolean;
     dotColor: string;
-    titleYearColor: string;
-    titleMonthColor: string;
+    headerYearColor: string;
+    headerMonthColor: string;
     dividingLineColor: string;
     todayRingColor: string;
     selectedRingColor: string;
@@ -711,8 +711,8 @@ export class MonthInfo {
         this.showSelectedValue = true;
         this.showSelectedRing = true;
         this.dotColor = null;
-        this.titleYearColor = null;
-        this.titleMonthColor = null;
+        this.headerYearColor = null;
+        this.headerMonthColor = null;
         this.dividingLineColor = null;
         this.todayRingColor = ""; // white
         this.selectedRingColor = "firebrick";
diff --git a/src/month.ts b/src/month.ts
index f04a144..04709a9 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -130,14 +130,14 @@ function renderMonthHeader(
         Math.max(maxDayTextSize.width, maxDayTextSize.height) * ratioCellToText;
     let dotRadius = ((cellSize / ratioCellToText) * ratioDotToText) / 2.0;
 
-    let titleYearText = curMonthDate.format("YYYY");
-    let titleMonthText = curMonthDate.format("MMM");
-    let titleYearSize = helper.measureTextSize(
-        titleYearText,
+    let headerYearText = curMonthDate.format("YYYY");
+    let headerMonthText = curMonthDate.format("MMM");
+    let headerYearSize = helper.measureTextSize(
+        headerYearText,
         "tracker-month-title-year"
     );
-    let titleMonthSize = helper.measureTextSize(
-        titleMonthText,
+    let headerMonthSize = helper.measureTextSize(
+        headerMonthText,
         "tracker-month-title-month"
     );
 
@@ -147,28 +147,28 @@ function renderMonthHeader(
 
     // title
     let titleHeight =
-        Math.max(titleYearSize.height, titleMonthSize.height) * 1.5;
+        Math.max(headerYearSize.height, headerMonthSize.height) * 1.5;
     let titleSpacing = 8;
 
     // title year
-    let titleYearColor = null;
-    if (monthInfo.titleYearColor) {
-        titleYearColor = monthInfo.titleYearColor;
+    let headerYearColor = null;
+    if (monthInfo.headerYearColor) {
+        headerYearColor = monthInfo.headerYearColor;
     } else {
         if (monthInfo.color) {
-            titleYearColor = monthInfo.color;
+            headerYearColor = monthInfo.color;
         }
     }
     let titleYear = headerGroup
         .append("text")
-        .text(titleYearText) // pivot at center
+        .text(headerYearText) // pivot at center
         .attr("id", "titleYear")
         .attr(
             "transform",
             "translate(" +
-                (titleYearSize.width / 2.0 + cellSize / 4.0) +
+                (headerYearSize.width / 2.0 + cellSize / 4.0) +
                 "," +
-                titleYearSize.height / 2.0 +
+                headerYearSize.height / 2.0 +
                 ")"
         )
         .attr("class", "tracker-month-title-year")
@@ -177,14 +177,14 @@ function renderMonthHeader(
             clearSelection(chartElements, monthInfo);
         });
 
-    if (titleYearColor) {
-        titleYear.style("fill", titleYearColor);
+    if (headerYearColor) {
+        titleYear.style("fill", headerYearColor);
     }
 
     // title month
     let titleMonthColor = null;
-    if (monthInfo.titleMonthColor) {
-        titleMonthColor = monthInfo.titleMonthColor;
+    if (monthInfo.headerMonthColor) {
+        titleMonthColor = monthInfo.headerMonthColor;
     } else {
         if (monthInfo.color) {
             titleMonthColor = monthInfo.color;
@@ -192,17 +192,17 @@ function renderMonthHeader(
     }
     let titleMonth = headerGroup
         .append("text")
-        .text(titleMonthText) // pivot at center
+        .text(headerMonthText) // pivot at center
         .attr("id", "titleMonth")
         .attr(
             "transform",
             "translate(" +
-                (titleYearSize.width +
-                    titleMonthSize.width / 2.0 +
+                (headerYearSize.width +
+                    headerMonthSize.width / 2.0 +
                     cellSize / 4.0 +
                     titleSpacing) +
                 "," +
-                titleMonthSize.height / 2.0 +
+                headerMonthSize.height / 2.0 +
                 ")"
         )
         .attr("class", "tracker-month-title-month")
@@ -225,7 +225,7 @@ function renderMonthHeader(
             "translate(" +
                 3.5 * cellSize +
                 "," +
-                titleMonthSize.height / 2.0 +
+                headerMonthSize.height / 2.0 +
                 ")"
         )
         .attr("class", "tracker-month-title-monitor")
@@ -243,7 +243,7 @@ function renderMonthHeader(
             "translate(" +
                 5.5 * cellSize +
                 "," +
-                titleMonthSize.height / 2.0 +
+                headerMonthSize.height / 2.0 +
                 ")"
         )
         .attr("class", "tracker-month-title-arrow")
@@ -271,7 +271,7 @@ function renderMonthHeader(
             "translate(" +
                 6.5 * cellSize +
                 "," +
-                titleMonthSize.height / 2.0 +
+                headerMonthSize.height / 2.0 +
                 ")"
         )
         .attr("class", "tracker-month-title-arrow")
diff --git a/src/parsing.ts b/src/parsing.ts
index 139d79c..94a958a 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1533,14 +1533,14 @@ export function getRenderInfoFromYaml(
         // console.log(month.dotColor);
 
         // titleYearColor
-        if (typeof yamlMonth?.titleYearColor === "string") {
-            month.titleYearColor = yamlMonth.titleYearColor;
+        if (typeof yamlMonth?.headerYearColor === "string") {
+            month.headerYearColor = yamlMonth.headerYearColor;
         }
         // console.log(month.titleYearColor);
 
         // titleMonthColor
-        if (typeof yamlMonth?.titleMonthColor === "string") {
-            month.titleMonthColor = yamlMonth.titleMonthColor;
+        if (typeof yamlMonth?.headerMonthColor === "string") {
+            month.headerMonthColor = yamlMonth.headerMonthColor;
         }
         // console.log(month.dotColor);
 

From faf1504ce377288caef1275b1df2336103cdc86e Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 21 Jun 2021 17:34:45 +0800
Subject: [PATCH 079/402] Rename parameters and fix showCircle in month view

---
 examples/TestCalendar.md |  3 +-
 src/data.ts              | 12 +++---
 src/month.ts             | 92 ++++++++++++++++++++--------------------
 src/parsing.ts           | 32 +++++++-------
 4 files changed, 71 insertions(+), 68 deletions(-)

diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
index 7a3ddf9..5e14bf2 100644
--- a/examples/TestCalendar.md
+++ b/examples/TestCalendar.md
@@ -9,7 +9,7 @@ month:
     threshold: 40
     color: tomato
 	headerMonthColor: orange
-    dimDotsNotInMonth: false
+    dimNotInMonth: false
 	todayRingColor: orange
 	selectedRingColor: steelblue
 	showSelectedValue: true
@@ -26,6 +26,7 @@ month:
 	selectedRingColor: orange
 ```
 
+Use default colors
 ``` tracker
 searchType: tag
 searchTarget: exercise-pushup
diff --git a/src/data.ts b/src/data.ts
index 9ccc1c8..6762f01 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -683,14 +683,14 @@ export class MonthInfo {
     dataset: string;
     startWeekOn: string;
     threshold: number;
-    showDot: boolean;
+    showCircle: boolean;
     color: string;
-    dimDotsNotInMonth: boolean;
+    dimNotInMonth: boolean;
     showStreak: boolean;
     showTodayRing: boolean;
     showSelectedValue: boolean;
     showSelectedRing: boolean;
-    dotColor: string;
+    circleColor: string;
     headerYearColor: string;
     headerMonthColor: string;
     dividingLineColor: string;
@@ -703,14 +703,14 @@ export class MonthInfo {
         this.dataset = "0";
         this.startWeekOn = "Sun";
         this.threshold = 0.0; // if value > threshold, will show dot
-        this.showDot = true;
+        this.showCircle = true;
         this.color = null;
-        this.dimDotsNotInMonth = true;
+        this.dimNotInMonth = true;
         this.showStreak = true; // a streak connects neigbor dots
         this.showTodayRing = true;
         this.showSelectedValue = true;
         this.showSelectedRing = true;
-        this.dotColor = null;
+        this.circleColor = null;
         this.headerYearColor = null;
         this.headerMonthColor = null;
         this.dividingLineColor = null;
diff --git a/src/month.ts b/src/month.ts
index 04709a9..d714f55 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -26,7 +26,7 @@ interface DayInfo {
     isOutOfDataRange: boolean;
     row: number;
     col: number;
-    showDot: boolean;
+    showCircle: boolean;
     streakIn: boolean;
     streakOut: boolean;
 }
@@ -425,10 +425,10 @@ function renderMonthDays(
 
         // scaledValue
         let curValue = dataset.getValue(curDate);
-        let showDot = false;
+        let showCircle = false;
         if (curValue !== null) {
             if (curValue > monthInfo.threshold) {
-                showDot = true;
+                showCircle = true;
             }
         }
 
@@ -466,7 +466,7 @@ function renderMonthDays(
             isOutOfDataRange: isOutOfDataRange,
             row: indRow,
             col: indCol,
-            showDot: showDot,
+            showCircle: showCircle,
             streakIn: streakIn,
             streakOut: streakOut,
         });
@@ -513,9 +513,9 @@ function renderMonthDays(
             .attr("width", streakWidth)
             .attr("height", streakHeight)
             .style("fill", function (d: DayInfo) {
-                if (d.showDot) {
-                    if (monthInfo.dotColor) {
-                        return monthInfo.dotColor;
+                if (d.showCircle) {
+                    if (monthInfo.circleColor) {
+                        return monthInfo.circleColor;
                     } else if (monthInfo.color) {
                         return monthInfo.color;
                     }
@@ -526,7 +526,7 @@ function renderMonthDays(
             .style("fill-opacity", function (d: DayInfo) {
                 if (
                     d.isOutOfDataRange ||
-                    (monthInfo.dimDotsNotInMonth && !d.isInThisMonth)
+                    (monthInfo.dimNotInMonth && !d.isInThisMonth)
                 ) {
                     return 0.2;
                 }
@@ -555,9 +555,9 @@ function renderMonthDays(
             .attr("width", streakWidth)
             .attr("height", streakHeight)
             .style("fill", function (d: DayInfo) {
-                if (d.showDot) {
-                    if (monthInfo.dotColor) {
-                        return monthInfo.dotColor;
+                if (d.showCircle) {
+                    if (monthInfo.circleColor) {
+                        return monthInfo.circleColor;
                     } else if (monthInfo.color) {
                         return monthInfo.color;
                     }
@@ -568,7 +568,7 @@ function renderMonthDays(
             .style("fill-opacity", function (d: DayInfo) {
                 if (
                     d.isOutOfDataRange ||
-                    (monthInfo.dimDotsNotInMonth && !d.isInThisMonth)
+                    (monthInfo.dimNotInMonth && !d.isInThisMonth)
                 ) {
                     return 0.2;
                 }
@@ -577,39 +577,41 @@ function renderMonthDays(
     }
 
     // dots
-    let dots = chartElements.dataArea
-        .selectAll("dot")
-        .data(daysInMonthView)
-        .enter()
-        .append("circle")
-        .attr("r", dotRadius)
-        .attr("cx", function (d: DayInfo) {
-            return scale(d.col);
-        })
-        .attr("cy", function (d: DayInfo) {
-            return scale(d.row);
-        })
-        .style("fill", function (d: DayInfo) {
-            if (d.showDot) {
-                if (monthInfo.dotColor) {
-                    return monthInfo.dotColor;
-                } else if (monthInfo.color) {
-                    return monthInfo.color;
+    if (monthInfo.showCircle) {
+        let dots = chartElements.dataArea
+            .selectAll("dot")
+            .data(daysInMonthView)
+            .enter()
+            .append("circle")
+            .attr("r", dotRadius)
+            .attr("cx", function (d: DayInfo) {
+                return scale(d.col);
+            })
+            .attr("cy", function (d: DayInfo) {
+                return scale(d.row);
+            })
+            .style("fill", function (d: DayInfo) {
+                if (d.showCircle) {
+                    if (monthInfo.circleColor) {
+                        return monthInfo.circleColor;
+                    } else if (monthInfo.color) {
+                        return monthInfo.color;
+                    }
+                    return "#69b3a2";
                 }
-                return "#69b3a2";
-            }
-            return "none";
-        })
-        .style("fill-opacity", function (d: DayInfo) {
-            if (
-                d.isOutOfDataRange ||
-                (monthInfo.dimDotsNotInMonth && !d.isInThisMonth)
-            ) {
-                return 0.2;
-            }
-            return 1.0;
-        })
-        .style("cursor", "default");
+                return "none";
+            })
+            .style("fill-opacity", function (d: DayInfo) {
+                if (
+                    d.isOutOfDataRange ||
+                    (monthInfo.dimNotInMonth && !d.isInThisMonth)
+                ) {
+                    return 0.2;
+                }
+                return 1.0;
+            })
+            .style("cursor", "default");
+    }
 
     // today circles
     let today = window.moment().format(renderInfo.dateFormat);
@@ -684,7 +686,7 @@ function renderMonthDays(
         .style("fill-opacity", function (d: DayInfo) {
             if (
                 d.isOutOfDataRange ||
-                (monthInfo.dimDotsNotInMonth && !d.isInThisMonth)
+                (monthInfo.dimNotInMonth && !d.isInThisMonth)
             ) {
                 return 0.2;
             }
diff --git a/src/parsing.ts b/src/parsing.ts
index 94a958a..61cffde 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1478,11 +1478,11 @@ export function getRenderInfoFromYaml(
         }
         // console.log(month.startWeekOn);
 
-        // showDot
-        if (typeof yamlMonth?.showDot === "boolean") {
-            month.showDot = yamlMonth.showDot;
+        // showCircle
+        if (typeof yamlMonth?.showCircle === "boolean") {
+            month.showCircle = yamlMonth.showCircle;
         }
-        // console.log(month.showDot);
+        // console.log(month.showCircle);
 
         // threshold
         if (typeof yamlMonth?.threshold === "number") {
@@ -1496,11 +1496,11 @@ export function getRenderInfoFromYaml(
         }
         // console.log(month.color);
 
-        // dimDotsNotInMonth
-        if (typeof yamlMonth?.dimDotsNotInMonth === "boolean") {
-            month.dimDotsNotInMonth = yamlMonth.dimDotsNotInMonth;
+        // dimNotInMonth
+        if (typeof yamlMonth?.dimNotInMonth === "boolean") {
+            month.dimNotInMonth = yamlMonth.dimNotInMonth;
         }
-        // console.log(month.dotColor);
+        // console.log(month.dimNotInMonth);
 
         // showStreak
         if (typeof yamlMonth?.showStreak === "boolean") {
@@ -1526,23 +1526,23 @@ export function getRenderInfoFromYaml(
         }
         // console.log(month.showSelectedRing);
 
-        // dotColor
-        if (typeof yamlMonth?.dotColor === "string") {
-            month.dotColor = yamlMonth.dotColor;
+        // circleColor
+        if (typeof yamlMonth?.circleColor === "string") {
+            month.circleColor = yamlMonth.circleColor;
         }
-        // console.log(month.dotColor);
+        // console.log(month.circleColor);
 
-        // titleYearColor
+        // headerYearColor
         if (typeof yamlMonth?.headerYearColor === "string") {
             month.headerYearColor = yamlMonth.headerYearColor;
         }
-        // console.log(month.titleYearColor);
+        // console.log(month.headerYearColor);
 
-        // titleMonthColor
+        // headerMonthColor
         if (typeof yamlMonth?.headerMonthColor === "string") {
             month.headerMonthColor = yamlMonth.headerMonthColor;
         }
-        // console.log(month.dotColor);
+        // console.log(month.headerMonthColor);
 
         // dividingLineColor
         if (typeof yamlMonth?.dividingLineColor === "string") {

From 8a83b4d57da408c0c7756f4eff4a5c5d6492bdcf Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 21 Jun 2021 20:32:51 +0800
Subject: [PATCH 080/402] Update documents

---
 README.md                | 24 +++++++++---------------
 docs/Commands.md         |  2 +-
 docs/Concepts.md         | 15 ++++++++++++---
 docs/Examples.md         | 28 +++++++++++++++++++++++++++-
 docs/InputParameters.md  | 22 ++++++++++++++++++++++
 docs/ReleaseNotes.md     | 15 +++++++++------
 docs/RoadMap.md          | 11 ++++++-----
 docs/Settings.md         |  4 ++--
 docs/TargetEvaluation.md | 24 +++++++++++++-----------
 9 files changed, 101 insertions(+), 44 deletions(-)

diff --git a/README.md b/README.md
index a545048..d7d2938 100644
--- a/README.md
+++ b/README.md
@@ -3,36 +3,30 @@
 
 <img src="https://raw.githubusercontent.com/pyrochlore/obsidian-tracker/master/docs/images/screenshot_v1.6.png" width="800">
 
-This is an [Obsidian](https://obsidian.md/) plugin that helps you do tracking in notes [over dates](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Questions.md) and represent the collected data comprehensively. 
+This is an [Obsidian](https://obsidian.md/) plugin that helps you do tracking in notes and represent the collected data comprehensively. 
 
 [Here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Examples.md) is a simplified table of examples showing what you can track.
 
 ## What's New
-Version 1.6.1
-1. Add new targets 'numWords', 'numChars', and 'numSentences' for input type 'fileMeta' ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestWordCounting.md))
-
-Version 1.6.0
-1. Add a new input type 'fileMeta', getting meta data from a file ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestFileMeta.md))
-2. Add a new output type 'bullet', rendering a bullet chart ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestBullet.md))
-3. Accept tracking time values ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTimeValues.md))
-4. Allow tracking nested values from front matter
-5. Allow using dataset with date values as xDataset ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestXDataset.md))
-6. Add more template variables ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestXDataset.md))
-7. Allow parsing date in wiki brackets
+Version 1.7.0
+- Add a new output type 'month', rendering a month view for a given dataset ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestCalendar.md))
 
 ## Usage
-1. Have some targets you want to track in daily notes. Take a look at [Target Evaluation](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TargetEvaluation.md) for what you can track and how targets are evaluated as numbers.
+1. Have some targets you want to track in daily notes.
 2. Add a new note for displaying the tracker.
-3. Add tracker code blocks manually or using commands. See [Commands](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Commands.md) for more details.
+3. Add tracker code blocks manually or using [commands](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Commands.md).
 4. Switch the document view mode to 'Preview', then the code block will get rendered.
 
     <img src="https://raw.githubusercontent.com/pyrochlore/obsidian-tracker/master/docs/images/usage_v1.3.gif" width="400">
 
-For more use cases, please open the [examples](https://github.com/pyrochlore/obsidian-tracker/tree/master/examples) folder in obsidian with this plugin installed and enabled.
+For more use cases, please download and open the [examples](https://github.com/pyrochlore/obsidian-tracker/tree/master/examples) folder in obsidian with this plugin installed and enabled.
 
 ## More Details You May Want to Know
 - [Installation](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Installation.md): Install the plugin from Obsidian or install it manually
 - [Concepts](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Concepts.md): Explain how this plugin works and what to setup
+    - [Target Evaluation](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TargetEvaluation.md)
+    - [Input Parameters](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md)
+    - [Template Variables](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TemplateVariables.md)
 - [Examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Examples.md)
 - [Plugin Settings](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Settings.md)
 - [Release Notes](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/ReleaseNotes.md)
diff --git a/docs/Commands.md b/docs/Commands.md
index 0fbb182..b40905b 100644
--- a/docs/Commands.md
+++ b/docs/Commands.md
@@ -1,5 +1,5 @@
 # Commands 
 
-To smooth the process of making trackers, obsidian-tracker provides three commands, "Add Line Chart Tracker", "Add Bar Chart Tracker", and "Add Summary Tracker; Just type Ctrl/Cmd+P to activate the command palette, then type "Tracker" to search these commands.
+To smooth the process of making trackers, obsidian-tracker provides three commands (There will be more in the future release), "Add Line Chart Tracker", "Add Bar Chart Tracker", and "Add Summary Tracker; Just type Ctrl/Cmd+P to activate the command palette, then type "Tracker" to search these commands.
 
 After a command is executed, a code block will be added to the next line below your cursor position for you. The added code block will contain the most frequently used keys. To see the complete list of input parameters and description, please check [this document](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md).
\ No newline at end of file
diff --git a/docs/Concepts.md b/docs/Concepts.md
index aad2975..bf56509 100644
--- a/docs/Concepts.md
+++ b/docs/Concepts.md
@@ -5,16 +5,25 @@ This plugin was designed to read code blocks in [YAML format](https://en.wikiped
 [Here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md) are all the parameters (key-value pairs) defined in this plugin. They are used for collecting data, evaluating targets, data preprocessing, and rendering output.
 
 ### Collecting Data
+
 Providing parameters `searchType` and `searchTarget` is the minimum requirement for a successful data collection. `searchType` can be `tag`, `frontmatter`, `wiki`, `dvField`, `table`, `fileMeta`,or `text`. Then the cooresponding `searchTarget` should be provided according to the specified type.
 
 ### Target Evaluation
+
 Depends on the `searchType` and the `searchTarget` you provided, the evaluation of a target would be different. Simply speaking, you can track the occurrences of a target or the value attached/embedded in it.
 
 To see the detail about the target evaluation, please check the document [Target Evaluation](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TargetEvaluation.md).
 
 ### Rendering Output
-Currently, obsidian-tracker provides three kinds of rendering output, the default one 'line' for a line chart, 'bar' for a bar chart, and 'summary' for a text block. 
 
-For 'line' or 'bar' output, the plugin will generate a customizable chart. For 'summary' output, a text block based on your '**template**' parameter will be generated. You can also use [pre-defined template variables](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TemplateVariables.md) in the template.
+Currently, obsidian-tracker provides five kinds of rendering output: `line`, `bar`, `summary`, `bullet`, and `month`. You have to provide at least one output parameter in a code block.
+
+With output set to `line` or `bar`, Tracker plugin will generate a customizable chart. These charts are very good at seeing the variation of collected number in the notes. 
+
+With the `summary` output, a text block based on your '**template**' parameter will be created. You can use [pre-defined template variables](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TemplateVariables.md) like '{{sum}}' or '{{maxStreak}}' in the template parameter, to get a statistical summary of collected data.
+
+`bullet` output creates a [bullet chart](https://en.wikipedia.org/wiki/Bullet_graph) and could serve as a gauge showing the status (level, performance, progress) of a dataset.
+
+`month` output creates a month view with circled dates exceeding the given threshold and streaks showing how long it persisted.
 
-Description for the chart and summary related paremeters can be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md#parameters-for-common-chart) and [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md#parameters-for-summary) respectively.
\ No newline at end of file
+Detailed description for all parameters of the output types can be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md).
\ No newline at end of file
diff --git a/docs/Examples.md b/docs/Examples.md
index 8732407..e4dcd77 100644
--- a/docs/Examples.md
+++ b/docs/Examples.md
@@ -33,4 +33,30 @@ The following table lists use cases with information of target location (Locatio
 
 ## Full examples
 
-Full tracker code blocks can be found [here](https://github.com/pyrochlore/obsidian-tracker/tree/master/examples) and the corresponding notes can be found under folder 'diary' and 'data'.
\ No newline at end of file
+Full tracker code blocks can be found in [this folder](https://github.com/pyrochlore/obsidian-tracker/tree/master/examples) and the corresponding notes can be found under folder 'diary' and 'data'.
+
+List of all examples
+- [Bloodpressure Tracker](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/BloodPressureTracker.md)
+- [Error Messages](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/ErrorMessages.md)
+- [Finance Tracker](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/FinanceTracker.md)
+- [Habit Trakcer](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/HabitTracker.md)
+- [Mood Tracker](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/MoodTracker.md)
+- [Star Tracker](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/StarTracker.md)
+- [Bar Chart](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestBarChart.md)
+- [Bullet Chart](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestBullet.md)
+- [Calendar](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestCalendar.md)
+- [Date Formats](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md)
+- [Dataview Inline Field](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDvField.md)
+- [File Meta](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestFileMeta.md)
+- [Legends](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestLegends.md)
+- [Multiple Targets / Multiple Values](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestMultipleTargetsMultipleValues.md)
+- [Scaling and Positioning](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestScalingAndPositioning.md)
+- [Table](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTable.md)
+- [Template Variables](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTemplateVariables.md)
+- [Time Values](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTimeValues.md)
+- [Word Counting](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestWordCounting.md)
+- [X Dataset](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestXDataset.md)
+- [Regular Expression](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TrackUsingRegex.md)
+- [Weight Tracker](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/WeightTracker.md)
+- [Wiki](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/WikiTracker.md)
+
diff --git a/docs/InputParameters.md b/docs/InputParameters.md
index e8c33bd..77b3479 100644
--- a/docs/InputParameters.md
+++ b/docs/InputParameters.md
@@ -114,3 +114,25 @@ These key-value pairs should be placed under the key `bullet`.
 | `showMarker` | Show marker or not (true\|false) | 1 | true |
 | `markerValue` | The value of the markder | 1 | 0 |
 | `markerColor` | The color of the marker | 1 | 'black' |
+
+### Parameters for Month View
+These key-value pairs should be placed under the key `month`.
+
+| Key | Description | Number of Values | Default |
+|:--------|:-------|:-----------:|:------|
+| `dataset` | The index of the dataset of your interest | 1 | 0 |
+| `startWeekOn` | First day of a week ('Sun'\|'Mon') | 1 | 'Sun' |
+| `threshold` | The threshold to determine showing a circle on a day or not | 1 | 0 |
+| `showCircle` | Circle the day label if the collected value reach the threshold (value > threshold) | 1 | true |
+| `color` | Main color (can be override by other color parameters) | 1 | null |
+| `dimNotInMonth` | Dim the color for days not in current month | 1 | true |
+| `showStreak` | Show streaks between circles | 1 | true |
+| `showTodayRing` | Show a ring on the label today | 1 | true |
+| `showSelectedValue` | Show the value on the selected day | 1 | true |
+| `showSelectedRing` | Show a ring on the label of the selected day | 1 | true |
+| `circleColor` | The color of circles | 1 | '#69b3a2' |
+| `headerYearColor` | The color of year text in header | 1 | 'white' |
+| `headerMonthColor` | The color of the month text in header | 1 | 'white' |
+| `dividingLineColor` | The color of the dividing line | 1 | '#69b3a2' |
+| `todayRingColor` | The color of the ring on today | 1 | 'white' |
+| `selectedRingColor` | The color of the ring on the selected day | 1 | 'firebrick' |
\ No newline at end of file
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index 3ac740c..7bb2be1 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,16 +1,19 @@
 # Release Notes
 
+## v1.7.0
+- Add a new output type 'month', rendering a month view for a given dataset ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestCalendar.md))
+
 ## v1.6.1
-- Add new targets 'numWords', 'numChars', and 'numSentences' for input type 'fileMeta'
+- Add new targets 'numWords', 'numChars', and 'numSentences' for input type 'fileMeta' ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestWordCounting.md))
 
 ## v1.6.0
-- Add a new input type 'fileMeta', getting meta data from a file
-- Add a new output type 'bullet', rendering a bullet chart
+- Add a new input type 'fileMeta', getting meta data from a file ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestFileMeta.md))
+- Add a new output type 'bullet', rendering a bullet chart ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestBullet.md))
 - Enhancement
-    - Accept tracking time values
+    - Accept tracking time values ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTimeValues.md))
     - Allow tracking nested values from front matter
-    - Allow using dataset with date values as xDataset
-    - Add more template variables
+    - Allow using dataset with date values as xDataset ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestXDataset.md))
+    - Add more template variables ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTemplateVariables.md))
     - Allow parsing date in wiki brackets
 - Fixed bugs
 
diff --git a/docs/RoadMap.md b/docs/RoadMap.md
index 9b62485..25112dd 100644
--- a/docs/RoadMap.md
+++ b/docs/RoadMap.md
@@ -3,7 +3,7 @@
 - Data Collecting
     - [x] Support tracking key-value pairs in frontmatter
     - [x] Support searching text using regular expression
-    - [x] Support multiple targets and multiple values.
+    - [x] Support multiple targets and multiple values
     - [x] Add a parameter xDataset to identify targets to be used as x values
     - [x] Allow tracking time values
     - [x] Get data from a table
@@ -13,11 +13,12 @@
     - [ ] Allow forced value types
     - [ ] Allow using non-date x values
 - Output Type and Graph
-    - [x] New output type 'summary', analyzes the input data and represents it using a user-defined text template.
-    - [x] New output type 'bar', rendering a bar chart.
+    - [x] New output type 'summary', analyzes the input data and represents it using a user-defined text template
+    - [x] New output type 'bar', rendering a bar chart
     - [x] New output type 'bullet', rendering
-    - [ ] New output type for calendar view, including a monthly view or a heatmap.
-    - [x] Add parameters for adjusting the size of the graph.
+    - [x] New output type 'month', rendering a month view
+    - [ ] New output type 'heatmap', rendering a heatmap like Github activity chart
+    - [x] Add parameters for adjusting the size of the graph
     - [ ] Multiple outputs from one code block
     - [ ] Support graphs showing the correlation between sets of data.
     - [ ] Allow a graph drawing selected dataset.
diff --git a/docs/Settings.md b/docs/Settings.md
index 3fc596d..32b2c6f 100644
--- a/docs/Settings.md
+++ b/docs/Settings.md
@@ -1,10 +1,10 @@
 # Plugin Settings
 
-The default folder to search and date format can be defined in the plugin's settings panel. If `folder` and `dateFormat` are not assigned in your code blocks, these default values will be applied automatically.
+The default folder to search and the date format can be defined in the plugin's settings panel. If `folder` and `dateFormat` are not assigned in your code blocks, these default values will be applied automatically.
 
 | Setting Item | Description | Default | 
 |:--------|:-------|:---------|
 | Default folder location | The folder to search | Root of the vault |
 | Default date format | The date format you are using | 'YYYY-MM-DD' | 
 
-For more information about the dateFormat setting, please also check the [TestDateFormats example](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md) and [moment.js string format](https://momentjs.com/docs/#/parsing/string-format/). 
\ No newline at end of file
+For more information about the dateFormat setting, please also check the [TestDateFormats example](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md) and [moment.js string format](https://momentjs.com/docs/#/parsing/string-format/).
\ No newline at end of file
diff --git a/docs/TargetEvaluation.md b/docs/TargetEvaluation.md
index cc1d80a..e5653ab 100644
--- a/docs/TargetEvaluation.md
+++ b/docs/TargetEvaluation.md
@@ -1,9 +1,9 @@
 # Target Evaluation
 
-According to the [input parameters](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md) you provided, the search targets will be counted or evaluated as a value. Obsidian-tracker supports seven kinds of `searchType`: `tag`, `frontmatter`, `wiki`, `text`, `table`, `dvField`, and `fileMeta`, dealing with different types of searching condition.
+From the [input parameters](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md) you provided, the search targets dispersed in the notes will be counted or evaluated as a value. Tracker plugin supports seven kinds of `searchType`: `tag`, `frontmatter`, `wiki`, `text`, `table`, `dvField`, and `fileMeta`, dealing with different types of searching condition.
 
 ## Multiple Targets
-You can provide multiple search targets by entering an array of targets separated by a comma. Each of the targets will be identified according your search condition then the corresponding value will be evaluated and form a dataset indexed by the order in the array (zero-based indexing).
+You can provide multiple search targets in code block by entering an array of targets separated by a comma under parameter `searchType` and `searchTarget`. Each of the targets will be identified in order and then the  values in notes will be evaluated and form a dataset indexed by that order in the array (zero-based indexing).
 
 ```
 searchTarget: target0, target1, target2, ...... 
@@ -13,15 +13,17 @@ line:
     lineColor: red, blue, yellow
 ```
 
-Above is an example of multiple target searching. Multiple targets are provided and separated by a comma. If they have a different searchType, provide the same number of types in the same order. In this case, the second search target 'target1' with index 1 has type 'type1'. Other parameters that accept multiple values (e.g. lineColor) can also be provided and will be applied to the corresponding dataset.
+Above is an example of multiple targets searching. In the code block, multiple targets are provided and separated by a comma. If they have a different searchType, provide the same number of types in the same order. In this case, the second search target 'target1' with index 1 has type 'type1' and name 'dataset1'. 
+
+Many other parameters that accept multiple values (e.g. lineColor) can also be provided and the value given will be applied to the corresponding dataset.
 
 ## Multiple Values
 
-Multiple values under a target (value tuple) separated by a slash, e.g. #bloodpressure:180/120mmHg, are also got supported in version 1.3.0. To identify a specific value as a target, use an accessor with bracket notation where the value in the bracket is the index by the order of values. In this case, they are bloodpressure[0] and bloodpressure[1]. You can find the example of this [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/BloodPressureTracker.md). You can also use a custom separator by using the parameter `separator`.
+Multiple values under a target (value tuple) separated by a slash, e.g. #bloodpressure:180/120mmHg, are supported after version 1.3.0. To identify a specific value as a target, use an accessor with bracket notation where the value in the bracket is the index by the order of values. In this case, they are bloodpressure[0] and bloodpressure[1]. You can find the example of this [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/BloodPressureTracker.md). You can also use a custom separator by using the parameter `separator`.
 
 ## Search Target in Detail
 
-## searchType: tag
+### searchType: tag
 
 Simple tags in the format of '*#tagName*' in the file content are evaluated as a constant value (default value 1.0). You can override the value by assigning the key `constValue` in the code block. Use the tag name (the name after #) as the value of key `searchTarget` or use quoted tag (`#tagName`) to make it work.
 
@@ -40,7 +42,7 @@ Nested tags with values attached could be useful for tracking children's data se
 
 If you don't want value-attached tags in your content, you can also put data in front matter and use `frontmatter` as your searchType.
 
-## searchType: frontmatter
+### searchType: frontmatter
 
 This search type is used to query the key-value pairs in the front matter. If you don't want these values been seen in your article, the front matter would be the best place to record. For example,
 
@@ -49,12 +51,12 @@ mood: 10<br>
 ......<br>
 \-\-\-<br>
 
-## searchType: wiki
+### searchType: wiki
 This search type helps you count wiki links in articles. For example,
 [[A]]
 [[B|Link to B]]
 
-## searchType: text
+### searchType: text
 searchType `text` is the most powerful one among all. If you simply provide text like 'love', the number of occurrences of tags will be counted. You can provide a regular expression to search for a very complicated target by wrapping it in single quotes. If you want to retrieve a value from it, use the group name in the expression. To see more detail, see [this case](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TrackUsingRegex.md).
 
 Multiple values in text search can be achieved by separate regex by comma and wrap them all in single quotes as follows:
@@ -64,7 +66,7 @@ searchTarget: 'regex1, regex2'
 ......
 ```
 
-## searchType: dvField
+### searchType: dvField
 
 Tracker supports retrieving inline fields used with the dataview plugin. To get "targetName:: value" in your article, try the following tracker settings.
 
@@ -85,7 +87,7 @@ separator: '@'
 
 More dvField example can be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestMultipleTargesMultipleValues.md#multiple-values-in-dvfield-dataview-inline-field). 
 
-## searchType: table
+### searchType: table
 
 This search type is very much different from others because it does not search over files in the specified folder. Instead, it looks into a given file, finds the specified table, and retrieves data from specified columns. Here is an example,
 
@@ -103,7 +105,7 @@ In this case, "data/Tables" is the path of the file of interest.  The number in
 
 More table examples can be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTable.md).
 
-## searchType: fileMeta
+### searchType: fileMeta
 
 With this search type, you can retrieve infomation of files. Currently, three kinds of data you can get.
 

From 07d160a6c3b0af1f541e8bfeb54b08d5a0c89838 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 21 Jun 2021 21:14:36 +0800
Subject: [PATCH 081/402] Update screenshot image

---
 README.md                       |   2 +-
 docs/images/screenshot_v1.7.png | Bin 0 -> 255737 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 docs/images/screenshot_v1.7.png

diff --git a/README.md b/README.md
index d7d2938..57317d1 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Obsidian Tracker Plugin
 ![GitHub release](https://img.shields.io/github/v/release/pyrochlore/obsidian-tracker)
 
-<img src="https://raw.githubusercontent.com/pyrochlore/obsidian-tracker/master/docs/images/screenshot_v1.6.png" width="800">
+<img src="https://raw.githubusercontent.com/pyrochlore/obsidian-tracker/master/docs/images/screenshot_v1.7.png" width="800">
 
 This is an [Obsidian](https://obsidian.md/) plugin that helps you do tracking in notes and represent the collected data comprehensively. 
 
diff --git a/docs/images/screenshot_v1.7.png b/docs/images/screenshot_v1.7.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d672ebf599c222c482b65379397da2bf1fee6bf
GIT binary patch
literal 255737
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%0D_;!8lcmaAfd<|#1gR-jK?F}S7@S;di5_9%L>
zt=O>1&(H6zQya~*JEh@t_aIrouH8G;-9A@q)%NubYgRBA{Y6gxBi9aK@N#-G?4`KJ
zE&bMqkp7l8{gp_wN?MisdrSEBhZSO4nR|)-Y)oZ^R*avPL}LWA%g?1SsJ1YE93--}
zbpoo(K?BUo?K761!^}6Prt%OorVAQ$DQlC-hr8}tXRbhG>p-rMj{)rH3(6LCun~#{
zA87E#@{6fpLB6W;Prb!wiH7MWFRO;gV@jF_?xAB$<;lD-TJ)}rMjV`cvX?kCZg>-^
zaUjq^U&TkJk|2PtsWoPbFdkc5CYT*4q-s@;0;~xjF+%NFx7GzZM7`q98UPdxXHACO
zs&d>WZM<O(P2#v@@-6^n@lS$N3+vd3hiseQ)7ST{{=4^m@hjK?lTeS0=VWEBp<S1u
zVM_DsoZa^Wo^#wT0@a}If<n!;ThUX8KSz4%SQ<<hRSHLT83^65mN3J^MOA`bG_<0W
zUbD8JSs{eD7x`o1l*!_@xjUwU#h>!#s+t0l)Qe%-Ze^dwgc1`&im$J&zN%Xx1-ybe
z{@DF?9C6AeF;HFDcfi#zljJ}i4c<5m&92T6d;cdhMSB@{Y{3qRAa^U6&EecYLUILR
zAKaSjnX-mYfzT-pcR=1J$nrIse15hTRAM03Ju@-V<3hL^*KGxbjuOM{Jki5}%S!#r
z6T=t_B_=anK@eWDj@&Hz&O1M#U-0TfD5}^oLk1X7jrN9L`FStbb(2qEeMP&-6(;n|
zx@Xkw5jqEH`~&AyLb|Sl=t=EUR8Gkn4__>o@2N;FS2|ZP@t-*}e>9$K=7<7U$Aqw}
z?dQxs_gUvZm@|*s|9uNsc6~)1oaar|LV{)Z>eODq0#<qI%3A^Kp~6oq;BumP$0(d!
z0*>{=zRF*Z-{3qGS=l{0>!z%3$jh&u#gF0(TS>TF?6w2tTs9V2?>H{t(E0Gized1R
z_Q_0Eu`F2=NxTy|<ZO-RMfRv)ci|3YKDe-%qjrkUQldW1@?G?@u=)$jo+6-_!aZ8v
zLuH)vEA?3E0-#O4`wbf2Yi9hyyOdK~eNujp<=sb<2tK(9PK|=;kr07Q5+e68)!0<N
zh98d6wk<h`7sGEWJ~cl1O_6W;TFTsYO(`J9T>>(Xu|{xUq9pmWwF=jBcJZEM1JJZk
z%~<74he7S1W}|rzgb70M<c~eF@AV(LjAGnpUpZOvOSq<eFRAaX<xFX1wOn%CsP$(3
zY;rAc+&?6490QktSS$yl+p*4(ZXcz_Hpg3CC#ylJ@>6PT3DIut80wf=C1ZPX)i@6w
z29U`x+pZK2*yC|1WTa`(ypySVm4$F>smP@+Ub4g`-PkYeRGjscJ&viaqr!9T>@ZxF
z?_K$Zj9|TH{?X;3of^LX>;Rz~x%_O6<i-Bd><Bg4h=y$=48~&p3C+R6p$@O&v&lal
zLJHRk6#KV_&lF2*z5uKtXWQYP>sqAb0;SN^45O`M(!hH?Zy8vX4k=qJa3Z-L)nPpa
z9n7xmVFrR-u8}*sCS28F<}5o+9A86;@kQP=r&XgFz$eTPq!8XK>pwaH<`?b|B`S=K
zKcXnNQqTH2?^vqArj3RsuW+3KKVw4$tva+|eI3)6xLx`SjBJ5MeP)OI?{O{C>KpFS
zd6nqY1JP{1Ha}Q{X(X;S-Mcry15xf=pJO8xR*^if0h?74HgaEed&u8wj}YeCo+XZz
z5%2SIk^KZF<G_bl)GH~1{5^WFnwO|*L*dTfc|H4cI)UeohWwCuh?8VtkGt!+GL3U1
zaQDia*PrIfJ~BfOPb%L{fB3>FD8?H>Ex2m}3XYZPhHh(fKH^2U#Rc|XbHOpH#NCK5
zse4}kIG!(Z{KG0xHhXJFDr{DBIOP6JlOwBy#JGJC$9?>>t?pxaAtAzfZfKhg)R{r2
zx<ub=j?^mxrcP<${A245mACK6cAg=m{oH{#rSmnXq0N_>vIZb=>}t)>7|^AI4j0k{
z{%bCfP!E6&LLoh}xY*!r{#7XCafqREnjW+7kCq??>h7f9GkL^(#~O1B)tK84Xc@J(
zxc6hE?d;J0I-J7d5=Fwl-dEXAY6@9StCjaaE)4=+G&QNz13TXT3#>zn@7UG%--V(8
zCDSQy3-qyuQFnh`z~%2*vHtt>jL?2p;Noqyso58uC2d=*_kW1ka<_faAz<RKk_FWy
zv;ds}J(n>>If$HriYzDl#^(u6I>5IIEAq+J!*#01Z1LNOR$H8*L-SvpR6mb9xmc4i
zSLL#k$5RVf-;B{sPutDr3@!$uFXRpLs0rJJOZHI%(ghe+2C*hs__#v;6W}=N@^{7q
zv%xuYIgi(lr)S1q`1oF_Li$z25*5q|L0*j^0kRkQ|4BUJmVYH4@GUS?nYq*`6D(cG
zCQPx7<Zr<QD<p05M{ZHg;uWe`?N0}jBtm_#r;;VJq=c@T_TSpxby_r{-L<u|Lx|bn
zbG=hJ=Kr3T?wqD7*j(?N$`<rWUtOD~YGMSCd_gfcu>ymtE;Dg=&^sYYZS~W&<m!|l
zY8EluQ>l(gtr>Kzw9XV=QqB5Aw$rMcH%%qpksS<Q5J%f&x7YzcHm*-mcdjlH6_%mY
z#T#*|*(T!BlsuJLvtS}+APzXVOy!$(Rb-g|`)7T&-{3YV0;aDo*!S2v#Y_5HxUc!m
z4K;j4k@vT{%QuYjUk61%>WMgDZsD=ncufM^IK;M;2?kg7n;(ZrN2(L#Khk?)*X|gd
z4CRtX;<v!h&N;&4e*8(Hz8v`?Yl2%`cbsCsul2{?#+eg_nU1m*S(eM27tlt<9#F?=
zJzdli(0$cWa=P*P@hjHhLv-+j%I$jIzMjUl8Fev+KDLQ9;v%0(JulkO_Osi;N|Q0X
zt}X6|YB$}KywIXLSUlNZ5YHFp(K5S-kj1tB6d?K401@H#aUlax$kt*`*M&cbN=?7`
zAVRb#Q>jUCEQtjQspErWsz$_`>3hwu=J_v9<|)+#F}OaG(FwSh;2(1ojI~Ww?c7qQ
ztMf=aHgA7#<H~O2yr<?}!$EFr{5S&>`(uASlxC8tIUxR9QrVa5fP6nv^|MfM+BH(>
z$3ZiynS--erlO@Vo7{cken-$6^bA!9k&^m()#pP%MAcGjT=FMZ6LmiY{%nbJjLA$X
z)+tNFsmuE()VoeonVnSj?CvIE9-1Tn4t|W3Kds2L19S^U@plGf;ry11+MW+S06`QH
z{?dX2MA0(an!VDE!DXoyHf_5G#+F@kO#34jK|1StBxX_>&vHm-!5Rw2#zS&G`?P5g
zW~$~x$#b4<TnQZz@$a{`R}*7-k`(mRbc#!EZEI52)iel}Kf?icSpCL|vS>vCV%9vw
z(}$pXZW+8ZL0x5X5v(?RaQNg^;?n1V<DkmLD9r=5&;w_7Y4t{4RwBj6c6sL<H87%%
z{`yuX$(WrM`1n>%*3s(7uFJ;#+2m=8GG$i_Pd8<q-jDd!I1_BJ<Tn3PC55C8w#AEw
zQdl>p2PePWCLj@raIu)**#euyTx$sy<yI!KKZl2&C2eE)Q!bt(r<u}``<}}@xhPDQ
zkXSL33mw=t4;k7<D0<FAl+R(*>;+Yyrp1`$_dBIW*YjPKd+Io;6$FL4iaRgH<68_X
z>Y)X`L8^RG%aZ}^JV-x9#{#TY>)UMa{JqppV6@uH$1od5SNyecB(5F4;?vN#o$@$k
z*&p$DoJ%ak4&HhNj0Wr}g|1-}HE<zYpM2MY7A8E%dzw@(cpGs7??lnEVQ~75?M84#
zFU@^COZqX{@&J(g4B50uj6t<x-L~(#2|9BcboYN!bGK{eT+a6BZrd<h@Fw046ePM@
z+h%HvAev|p0hfMq6ObkOU$7bFfZfY=TNCqSPK%t;0W7<)^2^TEFljjYVl6UTeDbW9
z7b5VP@MN5_9E;kw=sjQW90x%I^%j;rJ<{PSAG6F6E|W@67zZN1eAd|G{;ao{_y|4c
z4bOR4lnnCN`r=(5sKJ;l1dsWfmKj*qE)9>c!BvqzoF(TMdEPWnZF<^os>R<aN;|$@
z6sH;i<NS-%4~V73>`UgYTh;%q_Og79?Zwy}o`T`73ZAqH*={!AHzjXxWxZXQL)`G~
zxse?{hp!ELLQMTytIry!Ntk?H%=%)W05V#Xm85Njvy@^INy4TGP#>vu=|d#LT&R__
zI6N{7q!CcvA@4S!PiV#_vBYf%(U;yE*stwBZy*$%Y(5~8&ssm*F3Lv<qPgmWiAaqI
zShStmvj6%IKLlp^6u7Kr?=Tt)n;(g{+q2L~pO@)=?=`fIeS{(^eK2h&g^kkyWxHY~
zSbVno7a6d(>_P|R(=imFEy#%dMIHw=txuzj7p8YniX`wES`;flZR&Y!XZdn0rV;z3
zHtqoz$aC&vGW*X!erqC+uYsLs3@>~6HD@B@^|%@VlM`T;dY-HHmM#+3C6nEGCQ|dY
z^|G~9tuV)Df;8~!!GD6pP#Q=avR)Ru(GT?;+G!=sEpsd3#*}*6*20Il8T)^S*sL_z
zxbsrv+WwrmdX}7=u-jE`hfLg7^PZt_&r9WQrE%jjrcTJy(VsQp%?QWI&dF32@jkSF
z*irf!!=ub>ndtK_DKYObz0iGD?f%zqep5fbzep-G$Do$)_l|+#`RKoH|3~r}I7bid
zPvH>1gbk7Fae2E)%RSk&Z+Wl@O<9JUX92aWN3N6uYVVRRsW1h(mF@i82_ZZ}Xl$^r
z%L;f_!1te;d~tl}{;rY*@RIk1X2a7&i*Xm~?MLxG`q!G;czBnLEiB!>uT^A8-F#r>
zKAm3TD0l^fyvRdMgKtbnzZF0j+v604`r%8vg9g1NaY46Y^@fF2hejq}>|WfHUm0cW
z>r7`IRAg(R)vv>RS^Z~VP2a}oCeDoWG1ybeeB1eXT(;eWE`1rD!?$K<by4*Du;5fk
ziCv5^AVfhT9JMdIN|>A3vuJe<L)@xrLi~7AkyQgOUJXZql_20_R#ITD*a8Tr{G3^~
z|D%iYgrf}8@Y?*=c!hQMXX<X<dUfNB4YTt3#Sv(2!Jv=lTp3|8dPKm<t`p#?FRD7G
z@iIQvNBul#{E%%n&|Un|#8whUo-EHWskl9o7#GsAy4Q~~%<2)>Z~ggGg={(_V{z4&
zmOo~aLW$LnYRn&8Tbo3F-A-B12ZT>~F*Z|+U*LsN0VmnZpZx_BZN@G1XtoH{&f&8w
zvk@+br3Kk}(Dmw1op$m_^OMiF%YM0OWIw>S8P061p_Hs{x7IXNu^8H52TyM6$#AxO
zuI_9hOybp5!JM3jU{bA+<@F5L2d39fxHZ?}R_MKQ<~>pHl~Z8xN{eHFL^W!yyNRQ@
zFL{mJUVSjO6Xv3r4E0dbB$W5G!3aT!3H(GCtN&J}r|)_hZ}IP9$Bhi|(h0q{yVG?g
z=LsKmg*$U+_`PeMrVA0LC}VpY6O92PyG2U3(Z3Lq`@MZ5qQo&b6%~~#UxaiB_ECY|
zNFd>wpTdomctzmsONUGEyZ;|5n*3q#OkeOl;l$i6)$0{of*GTmHy;e9y%4d2k5j*&
zYw>U51qaj##@CEH9(+<JzW)w<kiIij-~4@~E|K2rRN`;l^ql&9M-n3kV6cPQu!))U
z-!$j3z|}yy{@xqu)AD%;`Z}?B%J~vE^(`{;{+$QSDk*N?vueKkYk1&SA9TNL-NdfL
z`>qRHZ|&TeYN&?<hK@UR=_KVkM_O6AAK#5A1D*nxu&-wak2BUR(J5tZ9+WY{G)cWI
z7N7I)3zIc+Sk=J9u4-CH$!2)3XA!2BiyB#(sRxXvKt3>bXo5)sIt9q&=j;raIYg5b
zAD&{yKqXEwJxkyrm;Hvb?K@FGWL=aKWl@R@N>6ZW#Ji7u9En?eFEi$lfb;*cqbr~<
z3VYhBSmm~a5rs&D-1p8=OM_Oa(?<9`Ywqnp(v4+`|DJGpm-SN20=tk-_>{DCt-Epr
zVjJNDcBm)u#CPwQ3-oEiK;u8gUv#0Q*!es5`3Z}Y#xAX;)jcuxv6skP&d1zr@Qls`
zeW>`KnleU)YuoOyH`=21ahniX$PJZ?kN?3IT7ewhICD{u&gDV>m#j=T(EmUj)`axB
zX>U&eSB|q~vX_Clb!4XN)1`06P6>T@)tTffS<B7OZAG<RI;Ca}y*@H=6k-BN+fl_6
zZvDgRHGI5NbvNM&gN}Ohkb=;m9~G%d^Msqw>;9d_>$1)q&6{xkCj=y3R)uDRMQLtc
zCx>6=H>yE^x~(Ha8`uz#)~`^A^ZED?E=<t3AKMG)0kLoC>%rwOQIUS--HY6+*oXdu
zF~QGjN0o1*eBno>*Zq)Dw7v@xTIkb;+&Olkl`ZTcO!e(IcPlo*;ZR5q4K7E9mI6PX
zy`oZo4}RjqZ%@xCe$_XF@H5!x@QGj^h2!0~U~#duI5a%o@$Rq}been2po9{Vl&;Rv
zSXXeiaCv!QyNwA;XCcKgK&SKz*XTIao>#x_%a|<ab?QVA8_nR811#!Fcryn@3e}jB
zfg2ku%Cm3PYgwP%U}~P3vY%GI#>H4R*lsFSG!|8dJ+5P$V&4e>0mR@%C8|FxsyP?A
z+^Y7f6sqb`WxagHZonB6>v;9Z7)3hCj>_eLD~}5rQ5O*DT$K+S1Y-l|nh}j^mM*}P
z@ApG^sm60Q40Z=)Ap5dvwigx14eWXb>2)ZbnzS4P_^@mFp~I<Ab6184FkxqprsSo2
z!dp+;w=%+Kgy&MW+FssaaS1y0GFuHq7aqxaHvX){@EpSGT<@(azI8C(m{y*`y)g(8
z-c+RfMeo?qUzZ`3ix>Cc`{%F#X{BSR?DRe<SQtR<Y5z)vJi|i}c&=!NI2pN<yk}R3
z@{UNW%rVVNeoAdyJSY}P7zn~iWYZwNig+`z;PzB5cjZA*%>bU|+C9pCxMEF6OcM>_
zuHOsxAKc0458|<&;`1V;tFaCpemU_$p4j>dyIfg|0xm&B{KvEUtYwbM&O`HOs|RRi
zvgbE(fb+`o{dQGNmFOg$ZREIBnPyzlul>*|$@xlBaS-8d{h@jq-2bb{yx_6^6ivIc
z{L!_F%EwTx6-t%ylPX5$YpGF54iR6bCN}2^xribD_*CJW8Z}c~ZM1kp1>Q7;i!*p8
zk=c`K=wkUp{JVEP4fizaljA3?G}ZX}SqcfyyyYEa7iQw4;zDAiBb$@a0*EQlGr?W8
zwbOSZ|68D&z(;BW@{)v9sx0|gbeFY;1W1A0vA=-?zCl{x5nYrf+pGj&4~nmK@7kLh
zvU}a;oY`5TTnw%{g9>O9Y_6-+p%o*E>Mw!}713YjH$32bqNy=(Y0y5;`fN2*p5$5l
zd)<OHIk2wFt0j$r+;9F*>>UXF`QE&aUqqMni*W2DZ~TMrng>6)UA?NohoL*E)M7uq
z4R$Urx-#B&2)LO=G=9^bP9U6yaHrTa&LLefv;Y_5ODOBLd6nt>rtFzwUZGbBhYd4B
zU!$^xvox$gpnfL2SAXSWZOh5brFIJ*H6|`9o8BF}2h}@0VOlO-7yB*H#ap<ZuHs{+
z8{RO8i6O~OvJVt;+gfd?foqUH#LX-YYOCrwW>;g$M4W;Duu^5`9W<<#BNu4=-_h+(
z`t9wXf4A)AxfoUBLPNGol0n1+RCe^YIrGWSjmC$g)yiKfNLc8pRmb7|&;6txWu}fT
z%04nx{%XtNyFGb={2iauHY#Ow%R``*@X$LUkh*&ytvkP{YHfd=rItG7=F{R3KB|OS
z`i{EGJ2%2lRYLb<!Qf=0-q?;1dDu@AIdr%v(Dr;<p8pZdeCulEVvhP|qP1Pro+fmr
z&wOunD9CH=mfLyRbFng+pop?2b_4WifTK<oO`k5!W>1Wdw|4;^bQo96BqLT55!)m1
z8pHrP3zoh!&ZHwaLvsN7tUBtn93lN5T$}opM~+XEls)9I7qJ+)jokh2OeQe7JeDTN
zD<7NtDoNjJKYNP2SRa2u9`wQB_l`t1d$JVlx&U|hqMxF_HZ_j3<5?UfA0V^jzgA0?
zNybS@%|m8(mKY_kewJ1hoKqSG5Xxetalsxv6W2@t9N##f5Xx3DJT$7JeBz@VXqOrr
zynvH`x~EkG4s&f*$f}J41LeSZ-a`O+9A%Y#Y~p!|1`asgOn<l+WJn8F<|hyxG-}3;
ze#viLzVRBbTnuikRR@f{&BM#2ii}s-7{@h=ydH$7m!_<ctT2SL_j@iSJaT7s<}&x}
z%-nhS_%Th3Ie}i{H2w~50~r}Y!aEMlwl=j+;Ys}I+uy?&o_IX{p~>n~Q^CrvIi1VY
z9j~@~!XQhnq#1m`{EwE4(6l`0Fl+6}O>d1Zl*J_)cJ`MXow=ulzEeW}X4waYDG=-u
zY?R_NLJWk(T+ZKL6bR#c|4C4hL41kwE|_;SG#f=V8iMaMiC89IyR>%of8}A^wqGZl
zA|o}y+=s=iVu&%xZcUw44PCv-jEmDWgmkcDYgLzDeRCs^u>%}*z*#C}@#@08T!Qua
zbY)*Yjh4-zZMR{jZ<?y{?}xY9bl}d;EBHXZ#DvN}^=cY7<EV!D@+A2A`ox9gJFl8j
zwvv6^ZMUr6TN>LHjQv;xTCBO@CjK%7evI>h-ZxrYQ)*ii(@|fh_>!)GpO&DNk2k`Y
zDDt}q=e?GK!62@)-PJT=M(!y;23cj7i&P2%GEV{f^KL}C?ku4+IFja`+f6<TChW0j
zgaZ<V&cK4`_m(4+-wb@r!6!^wepJD>PF)#eO`?~@-GD#VfG32-L2qBHTklgE7Diiy
z2ww_9EXy`=uPKRp+`3`JY5BhfyTzIWcR^B}z(mZ};XpktLGxP2909FXKB5msT`0*0
z*@ZGB$+3hFDF$6~qQrAl#>5?Mt;^Si^wds)!{3FV{Nv-)PrIgpdkFm+eIMVKf%)`R
z3N=eJOIwHcPS6xUju88RMum%R;t1)gv?U^L7B{K-DZGJS{6ybL?R5d(bi*am_(Z6r
zBwwr{KWtAk8y*YxS9T3YjqaPa1T5YQrf!+<q{rK7b;Zf^+%VldG|`DYMMN=%$W~tl
zOiPQ4v$l9tjf!Tapa5}-D1Tbb^&dtYw$Kl-KHF-I$RYO9rD6*lIXGVHH@FZ2%REu%
z%G1{F1RheV>+Ra>vpwVWw%yXq?Ib-?_6ulFb4QgXvFvCbZi>??aYsZL<|C%=>EGyG
zIcg7~g4+n$JOOVzCqPm;V#Dcn9|SD;MSZ)Uk2rs>1SX&G)n5#Hjm+A47uYVL4z(zl
zx~k63$CK~Y$&G!w7Qk{2ckiI(U;+B(iM<!A{~}~OtYT1whThd9s(m-Pr|7reI{8A~
zC)M)f@97%vo`4!Oh{W=Q`3}`TW!O=~l4PVTPE(!o7n1l0MR5ircNQMdjiu;$`j9?3
z?@C*K&Nn1pH%WaX_Td*EH4AWiB-1%8;*_f7pw{ywq`}nXyotU8>N!g3cb)MUpLG7e
zl!im9Zu8>@vo#YPQA!+t5cnUmG<qp~yFOm0NOe>7w5Mrv!LnAAVUrMzG5hWRN}fBx
z)DF$rTk#`r)_bnuf9j7g`WXwpW&5@GvmD*cf6$E7Gfck(-VhrU5=W!%0@d6E52u`|
zIy5^Cec_0jaHgqf0&OK>FXlakzhH!qpFLDMb$___rZ%TuB|U^>Zr;d8XWeP#NLLO9
zvH3HgPlXORUVby=d3f5EeJf_F2-2(iXHt<S+C@C&$E0vX4!v3RSKE~UvfE@~PvsI}
z>>!NB&P6i}c}P0WXp`sU;BC+WnpOSuxJQfOco&MU7(0pv(pa{mdvnBXhUjO4N3>o_
z;?UHKaREAbmpV8q_!q59k;ABk<qwBOOxEj&7ac|`!E>zi5NTt`GzMx0jfwpIX4f_%
zy1d_;Cq<S~{F1JU>aKQfR(zn{+Cj;(xH?!*U|9ao2FYV8Rb!S+?c*D`K)*qX5?$ff
ze<u30eeP>SkgCYJqy6M;3v8wJ@09P1VHyxWJ;`oDa6|P^r)fOlj1xx_D%f|SYDP^@
z2_|1wcqe95>}ES<pv`HF`v~J(7R?@j5MPX4M<Z0|6kNzEH2P!c?j-T#6QpRiGF{<`
ze<u91vx<0e@83H^HXxP>=0HSG_4p11xU_Y%by=oc0k^EZbI&PLV$T%TRY=cGH4xBb
zI|`2Zbv`^9m6rjEUSt;eU+w#w&ijAZ>`|4FTT<aOVX=;e7x_;AuOzb+;o!o%j$i{$
zlqs&{`a^89+FU1q5q9HUv76oRE&dPN*to^yh<o?H9@1_WjB{%u`)s#nQdlW!k)DfM
z`gF)R{LPu9rp<zl-^A+wVAjMl*uNF{N5Pmq!`vI{O&-r55z?85b}D-XhWG%jaX}BL
zJ+LKj^5`Yz3pD9O-EzuhkRUIrhd#|o2xX`BdKP<9hp4clW-{S?Y9j56h4_6TIgW1b
zq}Oc4+vcvPj4mer8JMrwNNdCRdS^|O_9jNXyCr+ph)lzfKD3X5WTblU(3%ybOG-+3
z<eX3S#PSy%`L)uR5OEHU1O}4+#fzT^OJy?Vskx^`*dk!sC-2+h$Jw%I6HXTt6{#|{
z`TZWt@oT96GDOB4^si%aaYthXMny9U!XR8E<BJ#hRwe+nR*dfYn?xV8NM2^61^Yj1
z0TF0R`LJF$ous&~ANA%*jwAS<wl*i~*lM4dptG2ERQSA%(J>Q5>*zeKQ_SeI(p;@0
zKu=qnA#+r73JSY?)W2bjl5&W+{XvP=`5|%*G@~!5L2C(VWNe?Docua81m9mBp{3uo
z0|I0{5^WKzoX+4?mS0Ps5W&uzIhy2>M;EHs^6WK{pidS{v7<bnv<oYPO1ea8qK4D?
zfBPU#>+(BSavfKot$pMBB#I}w>fdL+%|V@&^FOgEc->SoabJ~e*0I$xd{J%KxGY2l
zk#INmg5KY2O(`nDwCCxKyWsV5{}D^RV&uke(MXqUC12CJpeI0K1)FWBtIM8k#*}{X
zxd-b6aFM06tY0GRR3cVK1gd3^iO5HYC6r+7*0zrh*Ag&m$sAlUk#dIP$4${zWp_CB
zJ?(41dm;6&c)zvZaGY)>V8&4GhxH_xZ7@zZS*1v&-Zgwwf!Pjx^z5Yvnfc3AmrQh{
zK$mYt!XyZ`mPUoyRbrl>E#TZGvf5F!(>IPZq#aW)krGnSj(B^dC#=tg)4TlEWoRpS
zoHF`cKQ;H1n#8kMofWsDsdhT0nwLkrur|(sELVx=>AVHCoTT-Lb!;^yMTfJ6a{c>b
zA5XZ!+djN`!>F=4;Gl|2p-lzVUuzcWf5<2#k9oxGn0Kr8j_al4qN&^F$6+kX=a{(2
z5+Q7~37SD0pF@ws-u~N((KJ?DJM7)8Kpjn&IFH>)ny>&wTNM=A6q~##bdf>tmR#ZV
z|G>c!Ao}a{84M-+iSi|NcY*nH`|?MNd@JJnk}Whz<25XB+j``1&OCun>%&*t#rdVI
zUygdy#ZLd(J~6lWBsZ#=HU7{8)!yB6%)GUL+uKB@A<Pa#?GRH5#{iy02Eq_>ccs_H
z26L#*udib3u0OydpVxd&Z)o{e9rNaK;vexDpWuIB%rCAKa`H%YjWsQR4#;rPc6}(C
zdE=EW<(Jr?mCtYj{eY^|i+f8Xh3AzGn!Svyyl-!5MMgP2(t00(0Tq1q&-q7p|6LO0
zuKR6}&QaBdgGVwdF&|-qGB#ZgYAs)v%RA2;yO9Zta9h@r-K)Q;3h^ThRpuh?a9=>6
z#}pX<vgCYqC6~FGK?sJ~b*ApDkz^v#<6euiSk!r|fY+SuQxs}$(2l2}IlA7ka(jDg
z$aFqhOMD@;<K5KVj#YhvwV5(t$bod0c4#bM;c|iR^IPQC(ci1wxM{$rJ$x|pqS^TD
zY@E^4)dks3aTh)5Qbc)2n!KCs__+PwoKt7Su)6!SR*om`uAOf<x48FOr-Xm7@+*GI
zf0k?^#QxvU<>jakSDYj$#l^CVYkK&b2W)c9^4zhclu@+>WW&@#+l*{Ao^7-EW5-sO
z-&Orec28QPl3IS7^%)4SUW-XU_YNAq^IePmjvD0MF^guDpkOrqa5aTM81o?a0iG*|
zkP-27=q*1qDy!rio+V;bhuNS%66QL&43zJ~uJ$l^PrAsLnZIrhj}%#jO~0>|$5icf
zJb0oWth7L1#hj_=KJjKv-YwI0yaItNKQ>1Lei=SxWj`Z7Gy&f=OP$T9T(Gq^38zs_
z&j<VzgH{?VJhwBwjeThJ#}INH{jY;hH}86~A!$aCc~}{KtWR<9q*L!=v0w9{=h@2O
zXH3s$mC@zCOM)9ay5`@THcnN7KN)f{wl&0BZ`o*@Bw#I$UHaOJ4XkhqlBz6@6}Ihh
za&Yzvo1Il{@avp@^kPc1axP+T`neYgjcM?2ci+>o2?n^KE6P@?1mL+`<{IPQW?^q)
z2Z4)ERKSAu9{liTN41oLamt%w$R9zf(FB>*8ieh2m6ykORW&Mq`lT)*vuP3hTi_Q%
z>4`g}p61N9Cw#Bs+fZdgbji3sqNL$pD|m`+5E#Z_Um^=Ncnx#)gD?ja_;hCg%bZVY
zKAXF#-Sus7(BQI2Q3KE<9#LT(e^%6B?q_deD0Y8;W$2carM<dAafxPr^wnhhp)7Ta
zD*Fp{o~W?cbOnd4wvYv3Q*4?HjgeR;T)Zn5&Haygetgs?$a&(AA-YuxD`%>baK{RJ
z@##y$P?+gLnVDeHIggpfaGDf5y7yANv089S_*M%dTCbk6VFUM-zSO$*ITYZ)bwbsd
zu^ENO?>A2s%2c9jb{epxo<@(E_Az~K@10?@=~2a}BzdJZr8r+Ego-Wv2gq)u&Z=wq
zSWVli((DEvvaov)-9TPqoqi<uPP6gtBd~)4M*z)bz4sq@xRCVi>Lb%fpBf8}?{Q1E
z_b>^MiV_1@UUVgx-=#0l<fVpsU+V=nGr!OzQln3S9Zdn9fIG+AuO|1en$t}$)37x9
zZJIGAa?$C>MuEa2V6HtCM917?bClRv4we_zHJbNnjh?)fKz)97M)8uTp#vH6)_|9m
zDh6UDB+)Y7-nH6~mMSc@AP`U1b>qYErXair1zSCCUY)Q7Xgg-ITi6JU7ya*2?U1;M
z!PM`cHXTT7#m<`9gf=mZJwClILLQ?w2eeHYL-@EgN9z|pWw)CG7ADUusW{{K^l$OY
zg?rkS-dIC+Em&nxsjL+Pt;GsB#F)~t4J69bN6ijo#QtHcWo*7QZ`EI4-K`?FEC#5<
zQ=a^xZg!+$?oE6FG)n9|Emnv^oD#7sX}RsB>1+oL?P64iSTqLKw*B?&@-DOZi(0uZ
zl%ZXDH!O4J4LB&*;E>om`GBypR?kcADQ=5^y=8vEJt)PdLdQmPXr^>6pFc^i&{??N
zFK4+-wr#Fs#Ee4_G#WL7g%o{7vVwHBqG7qPp6mGfn}ob~8dtPbVH>kBdgDHwvi3kL
zhXnt)hejLs9|%`~HS=mXL0BviQ%cP##UT$<OW_idk2D!DIR8)o)t--PF0#6KEw)<6
zSyuLdpKCO|9YHcnVq0FplDEfAz3keuA(?XP>I?qmksX5tSwIJfF3<X%A5U!#`=Qy6
z)?s;>9{P8m&!v^_&EHvG{~PaXZMLwhYc*qS{t#oNLvx_NZT!x+Ec0R;(c#}WHy0~%
zxVv_eO!PEBXM?xTc#ubAc7{-3Az|2f1yD0;$bd77bX@C?vo@mly5}AGklyS2Jgx9N
z*X^q>K)+oh{#ej6zvoL6twDjQv=r)q4yQHyTwPnM$8>n+-|m|U!r4FmKeWAPSd-h@
zHEKf?5kwHAi&zjTO7AELh=BB7A|hRSlM=E-ib_*y(nS<dN(2N#4Lwpr4<!)kB|vB)
zkdW{_;97gR_I~$w-gB<&{8E2_$t-snW87o<mIvcNWdo)72{;(oBh~L^Wv}K>MX-u$
z=)l3%NL0e4Fi;IXj%&24e%_yCcgfa5LDfl5@3W_HpBEmi8q*cup>j7P^5x5qN&#NO
zF*e#Cb#C05&2Y64OOo|H<6avIuYi6Wtb{knyg*sm*_zIc`0x2?%XSn#FZfRTePV*w
z-hH<V3tOiMqAAOCtM8ANe@>^;2B9QORxboK-tHg}`-|Mi(prMlIGY}F>IY=pV>$;E
zaLvx)?@k$56+3n$zMQ|HcjV?SxL=+qf?TSDJ29`}=wdz4q>4qW!aXb({>9a@w;_yA
zfx+-2Qf^CE<RdsoB96d7hbskuaSKi(*AfGH#jg!fou`a`sdCD^ADXxntEKC4JBCYs
z6dJhwReV`iMz*EI-8~d8dpPxc_L1JObJ7~v@qthu4tLjT`X--~XWQ7$xjw|_b`sz8
z(4)uW9em%H^<g+^%`|b#BIt?0q8Zvx-Pi^(8+d`<ml!uf5&8IDLvTZ#Vx#fWzAPoE
zt@dK;rIeTVuN+jC#n*K&4p=m6T?nYN56`nc1&MR^P|=zvFNp9*C)Y}Lo7%A}W+|B?
zJhn*Ws`PxeTHKdY#w1*~3pxmQvIy?aS}Skw-Zj)cGt&<%%7|nTNbS(dEEdpMdEc@u
z)qS?jyf$rDgXzj|E9o;<{{AdP3s^wlx@p|4c2SHEfmC{HZhp(faWvt$^>~U&#a9l>
zCh}<r0HbTC-Qo&#J`P8C!vVCFs$Re3`fJ;X`#_8<=AwKZDb+|4RCaMGG~vplE%X|x
z_Jf)*(=Ej=ZgU<Efu9t)v0SFHTqnkDBU!h6%9Wi9(M-a=DbAxBF$Z~vR#nH^bY8TE
z-)4VPHpbBWaBTDiiFuI6t82PjN0LDCM1n))QLtGUbjZU(e{B-SJr&DV7Xn@WP86X;
zik_nA2MIz#fdS0kJJ<ePO?O|sMRUvM`0&;EFYfpa#J3YglfbI>5_5cYE;KJ`s9>6H
zH@Rva=n4<Kb*-Jq7w!+5UvV`aIf|%#wnA7)82z$9*cnX9^F7hvis)OIEP*YHGT;vi
z@+om;^%MNiyu!lBu{A=4w&B#=VA5JI!Kz0Nw?Vero8oqRHb77XZfY+4@XXaciQ_p9
zdBFpmxR!vO>cS$rR0)^X5S7U0jXMbmNmva<4co~Nl=rJZ>&75@j9u+YmTj|p!TF9?
zFZtL$eM1SoCH2LZaLGRtG=a17>KE94xnH|4t!6st)Zu%T-G+PX{6>tZ(qwDytyP5%
zU#(m757G&++hYXV88n<@dWayoN45!)H|NvVYW#3@pA$56{HJ0A>iTIPpfR|0kdFZX
zBP5#|O7#3O6i8xo;?NMOPPC@e-ocuL?9#dB+XSMGQ7}xAS%4|YlYCmkG?I6()}y<m
zt7M#ua?OuTLmuuTaCF@9M*n*aWe}v1Vz#V=8$-E&woh`AWuSThG#u+GSyzrB9(;Za
z*ZRy<Puyr}m<-q<t>=%smIf*Y<F6<Hxs<5avx=YnHq8Ddnkh{u6b=SvtLY!h?~RwZ
zuy3!9MUYBLfCVcwhu2|_dV+54MW@;FhW~WxyEOip;cjOR>+ONc{lUqmSs9*$Pz@dh
zP{&%}+R(RZ&UfJ|*N&9exspXr05TPXG}dPqeX5d<;i>{~BqPJ>#N_neW<`7vo~rwz
zx9g;d&QHKO-A(Zc+*bbK(pT;VIrU{|CH(DdtZWFHy5O#>`#f9e>IJ4%shFq&+WF~k
zq402qt012f^*$iPtt|8npA+v|uUg;BT#Zhf8Ab^1T)X_5{-C9KH3m8#HuBX9-DCW)
zE;`lC>K@^_*}#zB&&~ua%=W1t70j9j(sea?kjt$+ARbj$#Qef&fBX*AHhFI5qi76S
zp)zK|cW~8AOdf3LT;UOG6}XdH(^1^~ov7_pTDm9US~D7bZRJ@Rb(P1iy!?aKuFb)6
z;yot5zpnhpgoFA;n7<Re->Mi84o@mWByj^An({?TE9^Zzq{3A>Fi;j?*<Q~+zbGeg
zn#9h2`>Nkp6D~R;x4t6uW)r5zL_Fx5=uVK$GxtfTs8sa*9a&np(5;}RUS}?CNhYnw
zwdYC?mic1tuVo$qlyMIA?|@8VvY^q#%WaeBcgeZyA;BH>g(-Q=a5#X&Mqo_MP%fAH
zTO7-r`I6Zul=VBBi185g&+dd2INBxA9o7UY(?iI!@9X3fuI}x6X9cxOt`CkXHgczQ
z+{?H9<P3l9wqwFC^JT|*2PaF3)Wx9ZksjKK7MXm$@!5-E&amCy3zJ>DCVi3EOmzJ$
zV_ErCwHxsV;K2C`puC5NxBy}E?N-%(E*V_?tiG!60jv>o4B;{G6wRnqDII4#&N6Id
z1YY8IHA|(mxL81l-(kz8B^~!6ZkFpJkrhCX8vPBmo9WxhKA*bdmyyT)XN7+GrI8g6
z)wjC5TZ9*c;A;Y;8a>eV?zAy?0|F}l8nnL>x3dsvkGIXlR5#dWW<Q^Fi;Bdr`EAY#
zN)4l<teezc&OW~n%=u@>D!h&#5G$7B032@UnlMkq&cac<90O0MOqJ5#WF}2QwSfS8
zznHrA9k9yTQ+2iPKPsUMWpDSDj5E{+q&DQoUoL$(=ub1<sy=&6c)sKeWG6L>!4{Ge
z@f~D(djK5RX1tyN9=*LyW}rNo&YVW(i#hKP6uayvtq-0@LZ)dg_i|%Mr*R}2ig#f#
zvQ<%{+{54Twc+eAe#;QO*ZHi;GA;Rn1_$Bez`j0D+uH}>$E_~`L0Iw;N#mnV3aAj7
zVJJ~_F7bJc>1^K6SS>@sP;vuV*Wgt&@pithPy(ZF=6!I*6)VyBd*`$#af+7kIfl7l
z4~HuXb>5vW65skk+(0&}LKW6Y9wZ~6;<hM=fNN=K4Oh9auX4)W6QFPY@!i|o*Z1-8
z%O}7(5jPM9g9+`^&jHYoPVwDEii`l)Z4ND7)kh&ZbLTQP14Mh8w1Ecx(|v2GrNGwb
zw@I&VJ6jFC7*d}dNnDwuwZt?O@qPl+B?pHXQM=7=FuhunlqO+!Y%X-W)==|yx-1f=
z@~g{S&iYMeoKCE24|SVD8jP$$rzX5Rd^e@ej{1%{&staoU?tx?8F|QLNtFklqH#63
zW<DN_6RE0b3Et5O{=kA#@YIs6_QF=V<Z$4Vw&uQ#*B@d&Q!oBXF}>|KKOGrjk>3N)
zM>J|qK&J^>gryFJK!+-X5lR*ak{sdi+d@N4n2ZcA0gD<Ffini{oykOQK|Df(pPt$c
zqB%Id*LWE$Q9_P&bRs$cGQRf0;DSTMPwjjY=FaWC=qtakgG9-e)JCe+UF&hHF)(;`
zHhG13zAr#ADfeY4ybbuy{O`-q1WCuqOeYeBhf<(P@r%mdqer(>%dcH^Nllu~j*D~0
ziHI}quwU#;BAsLm3u7W$-E+3+lJeqnlX{U)`@HF(W^}!D2t=(b{h1d+9A<%n4hxK_
zEAA~4<Qg$RsXGa>l79u+#R_RdGwN9c+g$OrZvn^y2v^fnJbUS4wy#Z?^TeG|j|Z2i
zn@il=+R|U2W#`^Hl{QF@py!bK13(3C$=QC|j9mn#n91UT>GFvG>sNmgUaWFhf&}_I
zG=VU{rl$jDJk%yDBzqV_rWED$&L$C;WJE7gezpbW>qJ^6@t+*Qo^OddHjn{(dK!%T
zIV8KzN*w)iZl|48Bu461L-ll=gMkhL%}KLE;8pvtz;NmsR4RDy8GIAyiSR06a5%9I
z^V2T^0qa^N6LO8Fvh#%}<K`tNG2O1-#F-W|^t1irfQbgpL7X<BhiGqaEp$j|*gn7b
zsmuprldV89=BG~@q&Kjh{HQX8O_B3tVoOc==1L9#95H5hSeJ*h$UNzsy(4W|hwxSG
zCx=kDv)Yx(fi)gjyx1vYA7yvzom(92w~zIQ5?5!=`6_L=lix#G5kbnbb6#e<W)<Mt
zp3#2UpuE-ip_9fVr#M8*2~N;{!_AsefTfYC04wpnU-MdhX|0+Xp4B!iVH8NGCJ2qJ
z$}I*f#(k}}lx_7gBTEWEfq4Vp!m~DE;Go;Fxo}_N`pM~cLv{MR;WouOn6JV}NaCiy
zYzE0FE5@<deT9m$CxCh}YhU*u9Tey~w;ofuqI{3c6ISb6+>@lL*$rgpAS#t;B#-EI
z!#u`D+e~sshyJ}rP^@ic#3a_o33H^N79|xkzij>S{btDK!%7(bp>WFF8J{VOhH_U6
zN>AG9Aa-N=ANU`NKn+xVbnp;IXZ<T(5>t%7mzRfMIY6mE3U2BR(BM5wbkL@4&=#4+
zvZyW;GE^7bEB2$Xjt1}yRHbghT+9uAJD4jya9wUdIQWu*WtsMsM$B9yvu0<;C+hl!
zi+-3B-rnAq07=XG&ZG!GSd1nzvPDFNe0RLsjoZm-$eOS^PQ30gCAedFh`haJYFqP5
zFha4S1LDL^<OYR<GbV9d9bRkR!dCrDU3jUOuvuvs{A5!v)>lAyPY(A8kabjTvqtHU
zP6L$@?3i=h@DPK;`Yszk;pf-PM}xK}%IR6USM1IS?ZObAAAt4VF7-;czm>6}=cnX(
zJ|J$@gR4KzC{c_lFcfSFEIvhs4x!J5@UGe3pxhfU23jDNGhoMiGs`VZyiv8n7*eet
z=h5XznA=y2BI;(JuQ9QINY#6ds9fIT)ZMlZctc9Kpd9UDw?hK0WAX>|x)eG^2>?~%
z@gWN(jwM7M;H8hL>I2qD89v)MLvQFi>^sOosdPN&kOWZv6H;K<x(d~aTU0tMV6?UT
z05G($5uRx}Ezv}PfCK3jh`~@UikbZh$V6J_n&g9nivsxFEN0H>SQn*qv7a(DUJ->f
zD6PNG`jp7-5U{`_x7Bl$L+aT%K|w(WY47{{Gi{T+YCS_k;oIB3a(in{3(L#R#Wsi@
z{10B@yA#*7GX|2Pi%cu5K&4hP!LZJB_z`wVg}jJay-JbGwpX@s7$_v9)wtH=klTp;
zbUzFp7*6jw*gtO58Sm{b%)ZQf#Frjo9Q`dkkq{s~F;0v^nNF=Aj7-m`xzwOM<xu|K
z3K@Rih@6zFu#e1KE{4cnu198>nRtKacj3FqT7`Cq(d}X`B!D}`&t_^|LV~E^Mf8l%
z=!3_xH~1ICGc#8z^OLKsKyJ=JQHE%~l?;$OeCodvoVBFg@e<$sM|j&O2}C-Ze^p$O
zvu%q$?>{AaP7H>KeW{`URU3r5JvGGFg(?bryO8FX%eoLHNUoEUNIz%NGQ~@Xq<LFt
zJu!Ih9deTAAjw}M9*|m6e`06n?|wf(dd{}O<@KXu;bYOU`$Pr;iR?5sv7ZZ?@>4^+
zCXJ{AbO2Djdn_?>@HZQlJ|iiGwZ4TZuDtm)c~RnWB`Dkp@g|1zp;M*fpzoJXAujv9
zlt1sot2MtA^K<^Oz8O~vHu7>4ua}30tE*cjo-7ZAtH0pDU`xZ~?cWypoFT6^IFD{J
zCT*9=QRAR@mjNL`SuD-fguAd$WrM~hV>8SHbbZ~kyE0!*OIhA^$`BSreG6xe#>QhL
zFCtGPyfTj##mrk3q1HF|2KA6o>Db%%Wn=9*Bd%C@4tZGwZljutpTO{=n-WbUGK}a`
z!ExbJd9kdW_XZUIydx&jrqQotiRW79$}ee$RgZBiebrGY+4Ep>nx&#I*yh7-Rz7Xy
zq+Ao+!|f<rx32cs?i-E~=si#z!esrWQ&IPQFuu4^Meoob{o@s~QS~2a#La=U`gkms
zPliT^)O<nX6fOE!IiY>Z;;@_$NqTm26<rk*Nefn11=6h0<RKF$b?q0d`LC^EiO@SF
z5)K%J4<VBnMQ<o9GaZ20=>P+Y6MvoHP`FmNDO};0$@nR`Sz1==Z1Vz})7H@eb&0RI
zu*~NJD!H8-!{F_;N0%khB}^szsNUVZxNz%axJ+=&e7QxbZ%uT$CkUyy_EVBoEg}_(
z#FQmPG20(m7W`Q*czo55Sqx~VnYKq;lt63}H)dPUcM0>_TYunDmuOX3IA!gHt5^{&
zri<JDDl!=iznk7+IoycZvWEH1W=_HLe)?fDe`4dF&Jw_k``}EYp*2IaGpJqW>S;m&
z>7DN~fUww`l(SHz>k48jrjfTDqHL>0+F;PN7^rogkF4%Mf(@$Q*ke<a_bvd8l3j(J
zTB?da9yfNaR00Kg9%qR)_;{y4qv0JubZIOca(>-^a(=v2-+HeA=u#747x(;-DCBLE
zza^H`xN=6+qJM{0MePyx<z!<N$j_M^p0PUVcIi3ZsN-G#WAX`F$e?F?UC6_m;+thH
zh^JN&3{tbSa}gia^ZFm3Hv2qMv#R=G?EKbP(u3{oz3W>%J6gVH3TnHqRFrg{f5>*t
zB7bNNH5S1Lh)oV40cK*~+7Go>ViNvVS>C#><{18?G2=?9ak_>iJS3!w>q+6_ouR7S
zTUz4?W129Mmrx`n0uFhp=(IyqSJMA+GM1whEDnKfBG;mCY*5s_D4h&*t3ZkWeF?iW
zw;bq>Y=llCmne}om{F*W!)u>RhKt`f;4(3_xY+f<tC(i_Qur&VG5JQ_$B-E^sMR=<
zywCoEPey=eZ6)8~0=D_J75dQvyYF9(FThYM0-5!eGV8NXM<h}{N$9!%i&GB1QW*g!
zGll33Ko%U&LTWo_@Q+T@em2cNeUV~y%007w_Y6d^!J$uQd7Tf(zPLN~0tA6ZVlNVi
zbgu+s=p<u>EzO7Kf0)AWy}k6SItW+0AyOgRXaH&c=7VO_EC@6O(Cz}`U)bDusVf9&
zy8zj_3Cv;z*<v#%oxLJ1w+YtZ;|<n)_D1N`hOwjjv1`{22?67N3ux$6EdCp67QVbA
z8YG|DAl&l8Q%t^>b6ON)?m>KI7G7t4068VW$hONndlkkiiqFXAj}IJL|6(8aF|N{~
z(I*F)f0gWqq`zJSxBAeVLJX1hbvN5>4y38wdD2<Pak`&-Cz61#eX>gXQmYd*vkFpj
z^I3vblXa18TGJZO5yEUWnHv6D{D%ue`_-b&3Es3O`8~X3Wco{@HcjBl<1FE5$HmHv
z(n8$42)p*#R}Pxz-?d6dtubCqRlSIhYZckL`f-Q%03oA@1Q;9<0JI>NMgBb6o2Yy^
z&&lH652Kg=?SQkDP?dz1P;0oe-CvkLbw1Ah>5k5p)4Y*}nk=E>?eV&wO2f?d=N2lP
zZ#97;97mCMq?gvu9*{;XdXlyzaL=7tp8mllh4reug=X73S@o$*d<~8$(X8Y)v)lx<
zZLdE5`OyJa)7RI2(L=q!{d)Ow?=8{wv}pWu`&L+>&EsvT(+j7_e~(jPaK?9WYZmVa
zA5eFx+`#X5$0E*^znX*^=YOAvv<2Yo-j<<7_beqoW}@Ck<13$4N&Yc!U#sYLaQsv<
ze+3{w^uVO`i*?S9IDo%*d4KWOaWs~L1!E4O^-F0>Xxd=q*ncS|)bxPb&eV)^{$2e;
z!jx0rBa4d)Ovtm^N*ymJiM7wj)bD8_wWsYeb0(E8L6ISxAyzB)UQYMUr>I8VDbD;{
zIv;a!3auzG>Gp1jxx!@>**ouLpz$)*hkEjzLVt~0%<a9auVsG0QviL>m-0)^ph|y0
zPHw0jGWajgQ~wsQ*COCR9Y{Ml@UFJ0M@&g@|0#67CwEQq#%VA4_N%--D^Huwag-*}
z_Z*~9K8Uc8BeH`eAAcO~wlSy^0atJOHaI*X288mma`}brlVQL&{q$$~0C4`jhZr?*
zW)8scw~GHE3kkjwCcjsfc>St%aV<K>Z4#&Rl)#r{qAY8jd6bPJaaJ<PvyM7Rb%!)U
zI-@U0m^~{MPv|Cj6_+=8>|;z5$pt|Z^U{34S-7nA>lpu+v%vJRx#91~djmb`2EtKQ
zBScF3-F9S`t>jql{E!|hj8=bd2Nk{41j0UDxYMYM6=~Pokv*nu8iQKVU3FYPRfevx
zX~RXAi-3@}%cnGY<d(T=a>$*Zl4piK=YclaU8zI<Uw?hTu6Zmsu;JR|JAZ-beZb?{
zPomf-XF(oziL(?s>2}JloXAL7LrI7ZX_HM8GqWpf<0Z{jxtE<)i(ZIpa)o4<dqR*c
zWQ9ILfPbAj?9q@qTL^Qkr|gACm~0Gg=L<tqn0wOyhfk%&WqnpFLIyX!q#pKtPNbRc
zXc)Y;6M32oAJ5=WJkDz*2e~r|6@R}?dsA8PJn**yurg_+4QefN4c7JDux4D@4>n8b
zt_v0_4<yi(79aN)au)Qd2?Ok_!*@-tp*PLe_jHZ|2l4&^V+0^jfNbTX`T;XUw%s~>
zS^xs{y^XYCd>+8R9y~hWE%)xz0NAD6F+@RD(d~TC<Z^IPmg9~NZ%-|?+m*^=>hMY2
znsrgVlp|kEv^%F4_N6uKC-XJZ`*Aj%oqW6YDsEiJ(5h9}mp1}8mW6=N9QXlDU*rU}
zkDL`x%O|Hjl#Z3YPa1jeQyT`~X02o+&rcEk11T2aKi|8j-O23G#UigbUK|P-D2C)c
zItN??uj*NUSNa_@pfzD~{8hjKIviaw^+OFn6xV^+V<z@cOY*mD>mY(p(nBs_qjYcs
zdJX2}@Zg~}KiCQdIzhX^8GiC2<*QfZyxz(=EVZ!6B=p?S>w%K?CczH-Kzc|5(4L)e
z*R%yXufFd3%t%t%Rbfea3sCn+!SvWAZo*q&4C;UQBwN|D{I1g{13rt)qR*P_S9?6n
zo2L4&5#dKD{B?@TQpzCqVOOhns4qoX5%3;&Vb7=jLl2f~cb*;(fujCs0wF5pG9rBG
za2=<quj@@hMLKNe@>TlI*)SL2C)(<oK(;_@m{Hm}<(o^k7+5y9R@4V&M3ShFaCB&C
zSnu(#%<rY3&h1#aC}Layil52<KNfK7E`2cmK1yR}EI+}dee2S&n$FYT;`=}DG~>wd
z41<a6<<o-UISjly0t07S#lWXQC=Yr2Kf)6$pStIba=Q$npa4HYru>*#9T{VB+I85R
zFHAI#*~Wg($i=c5AiY8n@)582BmjJG{LX>)?PbBQ_!*EzU0LCQPs>b(yBb{N*jWbs
zm#sa}WF690z(m$Tvh1UWbSRiF`nXLyMe1AwXqtQXC;(^~`X73`e@K|fr=<2=S_a4J
zS0v5l+w1TSaW8+%F8?OL`-kpii}%ACieYbxY?URzO1<sE1muIum;du79mwAPp{oeq
zISb(=>?YXl5&v_EyFY)*u~yo?qM4lXOPBaB{TVHUv%S}wBI7z<_d+&vyaA9%{M;%(
zmSq(s<4z^1SRIz1u4L*-T{KbkA{8om+P3)1B0iOfZ0OgrkiLXtlx5B)jLX72>iSAn
z#EKkILwFVel!2~r5yba+ZDgm+bBD%+*vtEDY5r<NQ$Cc3>P=%s=(DQ2v@Hxf$!lYS
zxNXtIiEf+?$P#cm>~7FI&Ar=W+#p2D@mVE#?OE}%ybR%_w|)mnnj?@nDY}QR8}PdH
zAK9p-xYq{3Bk7iMKjAMG-^)p82^Mc&e;wsMcSroIvs3T-k`}tsi!(QJhIm^IB5Fy(
zjf?VqOSm8hwoEudwhItrDj0q_N;DgvrGK89#DPH#x!tqn*wf?}9zQWrDqtL-L=~|#
z?=@Psa(ZRn6A*57A&%-c{BW^wdE4HoMimx=0)-7%c&x<l!q{fb{IRJO(@R9pK8Ty^
zREbC7ZcXcJr{3}YPl}+}622QfMOm_b-?uB=1}LsB_xk%$?xaX_Sl=a7#S)ks=J8O7
z7k6-WrM9=44&KWEN5h@%Kz1bI9_K@%{?AI~*I7!_D-HbIgL?3ns*o0P0eR^Y8>evE
zT`WHyOf3ZWW994?>6j*3Sp=4uXM+96wd^p;9IKcLZ<>MIdx$T41rFV;QrngDz+!KW
z&J{Cc(pb51ycS06K8t>aV-w2E^EugCChQO!=;T3c_bFVKDN-1lVYsH2f<UU)&bi^M
zl=Ml{yIKoi{j&Y=X?w=#OvF+ACM?`_x|l`{7v$Y<le%d?mEUDH(ozwXX*j=_7YY~h
z+*y7mlpBpz4Wyg5<oQySQ&g*iEpUc#7;^E%M^5`SJX-;+^pub6)7{IoU$FWkN1vs4
zg%(l<x0#17K~i07d|1a@olbH>C+Z84f5>v@uOwnPH#83A3CIN?s{ix0GUX0zbnE?e
z{`|N2;{n3l&wYM6U#kC-VDeYHt0VR|SYr*JdC$|i*7Zlm93O{mOmhAtTN%h;RbM(G
zR`Owa^0DT|zLn*Y77c~SqREo0SNNqqjs~4USuNbrN7|xcU~0*3L#%DUegFAuMOa&7
zcl|&afW}V}j**L9Lp>`h?3?~*WI?_ccy_{bPfiG)E1yaDxVCwJwY3b{`Q|&bvFlM(
z=B@HY4VruxKlhc;?OLb=OM0u%3Q?q^C@3!h%mBC&e0N?V?z(y}pqSjThHCZB^nCKi
zJNPyjC^Eq;u9K|^k+9+H;M`>h^+)JNLTddAJM7sfy`49zR|7Em5L8iCMJ+SuyqlD<
z=<uKy1M0i;#?aWPS75m~4V-)Z|F(XIYSrJ)8Ru8vH~?xY=go;qKm-S~Yuh~wDZKlH
zd;v|Il6fc#tl9`2@3Of4^`)$BbI!zit*#R%UF#m7_LhZC#uUfOzt1=9ur^QPj|r&@
zh4a%^+gK9K!g4dm8x#1@x%jQ>`a+a*nS=wXgJl%2H#6+J`EGlZ#j;sznr&my4!pZS
z2o$uncb8WMYCa!*_laKDFP#*ruUl)zq=brzO+vb8K(f88jqu)}J#mS^kIHCfS+bfn
z?scx6$L&4nI6t(iC@Vzb;P^#`|Dy>2B+S>EFe<Yx2LtE6PidmQ=5N1^u{}@<TLA@f
z`T@z535c>UQbrR{-X92s<}k1MlL7dv@uYJU)ti?*%WaZu5*PcaRCN|$`?)uNyla#-
zPL)3f^^#2EvHHGsb<c3cnCHEC=L>&f_0r%_ri;Mu6uzlYRe&stFW+@4wLfwr0{WKG
zWXHMIb=fupdE+(kwJ2cxQ+t7MxDeG%-z?G~JIrO*{m$KKRtvD2pk$Gyu^$@30<@88
z|KlBa*|t`Z3%;HK-r|w-c?`J&K-IC{0yhEa@cILw{Qg_^DJfmaF^Fdu6rG7b1`c12
zW*H!?Gf~(y8iJoOR7XMW>K9IxM6Ip9v;}nt7=RAGjrd-4@*|HyTlC(POi>*ear^i%
zdV56NqWJ0NpdC^q9L{qAHR*PgUlR2(ppN8QJC1Sdt25RJ$F$;eQ=?>nZ3u@qyajNV
z>0!}-Yc?K>?5!x29G8_SJl}BzFpTH{dq<eq{SW(ajlI;?t<DT<VO8;HOa(1w*CnHr
zIR+d0lBh3ur_ii#i1zv8TYEm8JBFh7qgm@mC7j=U7N#Nx3xCCf&uobx-waE+0!vH%
zeV*8&WigO6D}>639SYv8#A=v;5RRhf@)uk1u|-o`dea{Fq*w80Dr{3Y3B+12L`j!%
zs$p`<bE|2-n^IZw<((5zHFW@2iSe@ll`S=0*pzkGBEv3H!tWgIt~rDDpBHQIa%sh4
zcWRAS27|Su=*yVItQrKdofyIZI2rhzIrRrMsK+v^{6RJHgZmId;qknfo)NQrI+=*O
zC-ucE&r9890SZWYuo4A5aOfCJ4}$i|o9H@iXm9h`3g~Cg-UCXq+~0!T-Dz9&4sAWB
z&B(a$>d)5C*LZ1#0NtQu7PD3hOMM{@<kKA=-3B~ja?HwPm5gP6a-nRhUCpdAposY3
z8_J{g6wCDGJ*}eFWIxyZ%<$>?tvR0#FUeq|Ig$2JR4TNhYBibNdI@i!7~z^Z7F1?>
zlSC0jmGp3fS_cW!H-Vp&et}&=d?v5{>^^HT80<?6QT{Y1R<y`{%iV&Th{>&ZSgkN@
zUF!=7I<-2GMIYwbfd8jWElJl|{@U&@wUqtuy+zBdCvtWM@t15~>M*OfeYvlp@wS8L
zbe~2~HTUw3QREG}yjw<Op?i8#$9^8@911MMTdSOwCrU=OY`|qkzHnfX+|H%MPK|SO
zxA1(4nhKF$NXWxZOpE|?5pQ1r7{S^2y6-hP%w?l+K=`+K-lXAmbY7uuY4YsGPEO)R
zOhsmPtOOGJ@Mq=)d=jO4x!Ak*uBB}1&Ft-?FYg_qEye%*ygIPc>GJ8rCVcTKI(CLP
z1L&Z4b99F60Y8(`0~6k?DD=I@t<ZFt+<`<2a9Ihx<(9)`_@iVJp5EXQDseF2;?vLN
zUqlQKK6ggYL-tE@5u$pmEmQzt@Yg)YKg!8}v@p%g;qcz9VEW}m7o3uDuAzKl@@$;_
zBmAlnV!Mg-&H8Q;f>PCjUs!nB8qTVetm>ozX@0U}E+tN#pwV7zZ+^kot*~{y$?40y
z**IV*<6cw76<dzG*Tk%L2OwWg(L$y(fF=98{5p^mUiuIGLbppNT>GBC)^WDj@@x-;
zOuY7ek@k0Qj4Lm&v&_SmuCdtIu3R&ifh|4h21TT6tvEP4-RatUb@AyCr)7A`=;t3D
zX%Q*4T?=S~^FI}^x17JPn>ddZd<`gcNtc58F(zKfVME-)ve=B|)JhHaM#-ldeds|W
zS+XtT)Gj<SbzvNhk+8P!l6ykuH@JQZf=A_X1*UMW<neRj3Q{EkIhPV2syvva8CXPq
z;p%uTk~W($>GpNI%C#}^>*G)FeeUN5)1zlU5bIAb7j~+7JiozGX=kcWKkCHt@tG$x
z&AgkEx!+9*%?eK5YFeKa%Y}d$zVgJ;c3M4iB9Ki$whd{IYkXHPa!DIRCXb$Rbj{Sg
zbwQ;+=Ytf4-?Q}k(%5BAiXF-g!R`iX%;knZ*H*0hqXJ%gvZHguMR4cN7-e<ja)*M7
z6rtRRkk0&6v_k8K3IU`L0fKyTK`rgi)y}Ui@qYf{yIRWW<~)W8E;u!gS!r?G^1@F=
zKU{(7Gf$!Eg)WW>{fvlJC)s|O?DUF};f9BU_CGM3)$f#HyRkPI6F4fDRHuE0uJBvD
zbBS~LPs7bhNYH5<W%eY>EB7TJ>XH3x9_X+)p$P>f44kBnzss#F@vILruOxjaQl@ga
zsiOelI&iTZ8IMVk%MR*e`wrM@jYuJ;+puH3rG9T2%yJ&7x?B&48L~+(ck^$N5&LR0
zsOhtuACUoUy=!ahgF-nF)yGx^POZEzJ>^}X=yWd9`@4(J1Y~<&bd#~)!Cr5Sb)gY~
zhH)G&m9oxMbiRHci|xKlY}=L<E-X$&Qe{VZx<z??m#Fyou*{jFH?WKv^>#R05=Gho
z-cwV4UHrMfH|F)!V<w}ggH~}52NGmfPcP?<y;e1JtqTY4s@`(20>bM-<BYf&c*P=4
z&{|YF4|Cj4^jle%xr6!hTK;80PnUc&>P749kPN{(*oAtu+<++cFeC!LTN&p*<t`t?
zi4Nb+>4H6*J7pELcP<0#*oZb&;Y*V_4Fy-95l)kN>4lLA?Gk?rpLg4)xbCTvBJjDm
zjK-VxY#yt^nN4mAy<G6xu~T=|vev7ilbaAQ&A94t)!LTV&Q?XzS}R4j)#J7M+=}FP
z$Om{hecf1y*QkdTxwt%bdnZDzQ>J>o$TtHM^z1ZzcU`ye;hEr_jM4dH3eV=n0nPDX
z@MyUoCt}ySblPGr7#>VGra)ehuK8NAeq)aaf=+GHSNA#qj}5K)wLhp?&oY_^3IB``
zb|R%ozxGqqi!GC}J5r-0Tkgv-?*&<p4@PV6yS}&z3<kdaUz`&I)(0S40}1m+i;i;n
z$Tv^qd{5Sy=Jz_CHAZ|{8)Pm|8GBcT!}s+2?pqm7Ow+{qm_~l{7}I;Qh%tZBC$hZk
z=oeO-^8K{*{o6|YtYb0RF0~A7>{~8&Z<eEjW4M-0pC+rwJ>hp6Eps_j_`Hafl5>d{
z!Y>l_$RxR@j#0iWCb=_UJVxtBX*_bY_r<jNYtGnoWE*WTiU$e0BY)=$u*-yO-D)e}
zr+I4Ab>QLZ!t<rqQ*C3C;ezaTQg+8!3_ccjNNoBIUHk6yv}x}th{qGybX!rHHDU$#
zUGsiBxjwT9p|0hrV=JV9y}=RRr(aB8vpf{fwgdbw_lJ*?C*V%-A7Sv>XLzu45B3ds
zhDo99<TrhZpAp=k7Pq?U^CLsJF0frv_Vifpno~9F7Jq9ou)OQT3{%0B?3E&N&Z)7J
ztcd+?B?4JNA&d^IiMenXB^pd^{7;zgRIfBr5k45-9;GZ|iWmsG%nE%W#<DCTd(p@K
z7YRctE^Et>hI!erG?-J=K3zg0I~Q=;O2uy_L(><Q7aAI7i)Lfum~n&l<gX(|MP$jz
zN7}hIbKlJ0IFHQN(|lr$m4~eWUaMpMS$1?uJZ?%~o&6W?>g)D<a6~&7%x6T{%F5tB
zm{Fku_{OqVa07psCVCZgip9=;IA$sO&F2inNBw@X&L5_mNgti!%)-rNCt^f|eWG1d
zE2o116DZ}eA=6k>+TdC}IJN6F;pUui{BV^gmmLyF596E*(j}*7M^ycFskWU^pQq;o
zk42!8%(gS1YpGRzb1t4H9p$9dZR@dgZ^?z`R<rw@v17?5E%>H^myZ}>6piU2^tiE5
z`@j?(c(EQv`0=D$7>y35o<4TCgM()gDjY9UVXL^oq(EMwsv&2i)^^nrSt~-8sZ>nh
zUS}qZL|rfwE>HbJVccoOCz}b=XA8UC>H^`hE-_?-;pMN{QH_;;0tmk|o?dJ1)k8l=
zK2PH&>gRFXEdh9#zI?9a8W!i;P);@Et1AXTS-*7}z^o<Jq57WunOo4<gI%)cW&&#f
zCSo0P0778z{|gs6tsdTIKV7_`6B`^mT4h%KxoFK#hrgXYCR;76B+(ScdegkOf8xrr
zIq;N3Vaz$o5=pGnOJVyF#vX9MM}l5NFJ&|!fQMYH!*j3ZVHIMAP9nWfgYnXhvoi*t
zqPxG{YP2D9v@So{tYLG0gk@fc;qOmsHA4E>1G(EU-nt=Y8!*;$8d*3g=DYo&tlg8|
z)-yYpKImp+c++)`=dRmI%S$q^IU_eXZS~u~;qS9-3w8B!Ck=f6=sd4v13$_ExRhiP
z290b`iPY{6NLBe$!As4-X%2;I>bhJs-#3&4hp=~X*(+yF^rb-u`-9^`yhAQ=51l9I
z3^C*dQ^q9Mws|w|E|zrLJR>NVJt-~TzYd+$FB2;j+yfKTvBA$H;HxC*g$~{POJ?%E
zXCR!2Zwf4ua|%xC*fX^|TZ}d&I2+--kVpE9%WD5<jeeU{1oylE;WG(q6?m<}R)GC9
zj75&GnW7%nD)RotuU)yq`rw@1!1jm!a_<sLJx6&NS!{8^S5tcFF4ELQp^INC&(rIn
za6cBe77vnwvfi61=1w!fbvmB{KFPnG+HpfR1S=oO*&#-F6-;O2TjEu1!|aWHfatVy
z{*YR35jfFx^UY*|vj7R53t$TmiSqHX#igAkGh)&}_>vrv=Iitet;`u575{)i`K>=p
za~KO9Ni0cg2QQ4|x|-&%QlnomT3RkFc>~4;6UEJXm`i1!6(95Om6=&6=z~W6LE~n?
zBO$Lt&}~(XU-Z3I{PnjGUtOCUG3ki4R7_pC<n|d`-_+PC6#pf|yNj~Xt{wL<wY%@F
zwo|z)KG@iEy^db7pBP#S=i4jmR+3mmphiCm_bxM2ga&W~thD)Xs;-Gi?fKlUz|(LD
z(^zu=)5BjaOQ8J$5=#gC;~!(JRttAmT`c711LvSA_&`#Z(X<EDh!N(|U78X47sC4P
z%@e+cALbF|t40R1*QB}V+wSbfJmi21dxaJg-y!G79@m$iJ7e2lsahhyp5`b`A0b4V
zM8(l`1opPZc#<&<M1EVnaVEvc80Ivt28NE>bxUv+tpu8MrTL^OstEFo15SdyMH~Es
zb%Uy;nqFk@iwtGwTO%;Yw~19(RPD?0W8)<!x4ye6W#|%CJ5`3WYp>l6gMZcR3LYBm
zn$46y*cmEusl6Wx1wyyD@&k8#6+@S9D4F^y7~vG3mv@PNN0{;n{7@_IR~jhu`{1gp
zK$A|O1zyeQ<G#&GNo1b2o?L!hV5S#iY0llF{BxcQ{6h=3XjiK_7>kyNRQz1gE}B9?
zOkKyUV!|UVcvi<>yyhqkHsq^PqiS{gIetCT0v{GQFJq4Zc7?n*&P=HHZ}+WT=?*BD
z@ZP^KhzsiEZ5}W8x|+x;8W?FTa8Iq2<b_n|zbVJ^`ow?B8(U5DCCEZpz!=-M3|DpI
zBh25CNGtq&+JXJ$%IaODN7;8T`WWufP*&Ajrm)ZYa5bpcP`-lK;Q1eR-OA(EE|}G6
zsUq&|3+(o6rDmVkj4}2MzUBE~THvNXnt-6nwTCvYc{};U_{oe8RYJm?=hi<M%os|y
zca>MH6ek8+r`gyT)=m#QNjt7cOOF+LobisBc{CEd;-drAN;0a*<}ysRm~;g-fd*Gi
zmnNDM*OEB~aL+B(2Nk^2q@EXbGmat``FsW1d=d;-Ra3V`<+AJuPChazP8NjYzM_95
zfhFX(*Iezt$?__)M7G;K0_u55r&NA@pUW&1I^abBmhTV~c(@<3pjpX>8}rUHjZ&>K
zT7Kr4Pic0yi2S+QP|58)L^el<;6Bz%O5d6zcQ-y5ho-Ls!+CG{a`Adk;&PqT=inCE
z6}JN$9@K2am^~&Qvof__wx|CPo!k!J_26a0lXmSMjkW0$MNsg%pQnN<$e*3Ew`*c%
z7D^-V({=frglT=LCtMMiRsUPyBCoMhM(v61leo4b`OE*JLX;A+P6!{qlk&Kl-u1)D
z*!DYSW|+iBLj+daPN{7b5VM(cYQ={EP-VJ!RGE<UN^DhxJ9j28KAI^1#@1h8|Eaj3
zB1?aBkL0ai{SIc8S5~LOI?UwSt0z18O1;Vu$4Xq`M%&dIaNqlp>c^53WK{mn7EVGc
z(by>GX+6E-P<d_b*!$@G)%3ulnJFY^1@gLU&3QoMX(&Z*B^6CWC{UI)C$Dg4MeA)3
zkImabAIkbGW9K9lhgVbX%GvUClXt``Hjs(|bn{E{I7iLN>wqw1smhpB4)8DVKWJWl
z84mnn__laYh(cn;+%9|}*cBW+6ux{Q)vclp+uM-fP5vkpsFXvgKBvBv_UG3*c#Lhk
z7kHcd75S*HPvEHEYedOAHpUuSfia!e_`w*{Z=Rfr4>rD8$+jLRYMN)s@eTEujHg!M
zTm-DLR!Xye+%7fclN_rJ4!f$E^Ag}q|HoEJLop~EUNaB0&tV5sM@pGlZ;X>~_6+xi
z+Ro|qGl{C^=3?Pz-hS%7aS*FT_ACvoqS8~1A0u+=^Qz8t44#djolgGLdWFle_14wP
z|NX{l?~D<1QkDWQ6fUhx%M<ZtsF;7n(C2Yk=XP@%hwpbDF`7T62Ka(L*<lybvpEku
z*Y{lMzn`m9kiq4NgK6-u*>?Lf6fex`-^zvK*8wkvAX*4xjE(dX@V*i2)$_l7INhmG
zxQZ6^9E0wATj8;*l(Sr?e(@i_VHhVL0-h8*Kxk>X@!L-_*dIJk`e$AAKXA{l_5TTj
z{cUCNPju}82Y|Ir#s4obj82_j8Vsqcho|e83&lU^xZiawfAX9U{|OrZ|MHQ4SOTOI
z4~5Xei4MThIz`Tqm8Q^VSMF7Kl&SEQE`mYgOD6-uL?WyT4M;eEV~he${5Mq0@9q=-
zhJhb=g{1x6^j88_vwrT=?J5>>IM3O1^HHP18Gs!*Lkc?qNCEN=y1w5p*l&CHmz#;l
z-$?UJHv{Ft(WlQvFV+n?3ZG#B0+B8+u%gQvjQ1bV=;^7p+cNo&A}?PRx7_DXM4a)l
zbVTyn&hS;HT^6!6U{n3-tihN4^Vh)s|I_~jydUpa`8DB4g%#9CE_hpJHOQCI7;uy4
zgoUI6yeHniaIE7O5o)v<QMO+PdohNyycg%g>L|J=uNNumHr}`*%wdQ-Pzln<o5x&u
zvV(o<CjJoa-@mexBs(6fE!G3n>YSuLsf2eSZx?Oe$_SltWb}NSD1LTvgzBLq<K`Qg
z;Pa}{Z38bZuU}-+%l6W^?XfN~<GQRA++@lmUOV-PD}RNN1?7addqqOL-cnb2|LqZD
zPC?+sUD-^ZK(4UBfVZTdr=N_&8EwwYy&~y5e2(c*olB#Bvw24}XHfC^M>30rVk{Wb
z`hB$j{r9h@rynFb!*SCsHg68K)yu-!*;vRP{az+X&ts(nH1q|bC$Fy3QVa9d8bd|`
zFL!iI1p|Vp-^u3RuZ|y>22$HKAigv%H9tB8yn3dRPoB7d(CagHUGQ1!wMB{awXVAc
zd$aqwS|TnKPRvS{1q9p=WK43lK%C*<6OY}m^PL-$bjQCNiqSCkP<H#liGG&VSEATk
zfBA6Jr#0Gt7(}tjGAx?zx>`dOza+=q77<jIyM{-CXPr5+(ym^?Ux%)qc7c~ot$(yd
zch0`A+Wj<a<z|p4Z#`)jr8!@A!O144Tj?R5XWfTj+xJzK>}Mr&&HtB!i-?TDaHQhS
z@myfyeDtB!0eJO*<CmamMnp!QbA(X@kBM~GMHtV&?Z$xq84G@-L)ZLJ3Fc-aoEEay
zPtP3i`-WwcO_6-x2J(X@*#Ih%p)fMag}BavFCbhHlJd}kW4?)c51rtqIPH(uy*9!|
zO<yhqXF7~2R)^DhvG*SNb<(F1c~K-erSZB4U7eGfKhLq6f4@)f@%f05PXAJ7^YCJ1
z^R!y~d-Qp*1azS8&KK5(Y5T(SvD#o!&(3F>W+Qxc-Qc%n-m-eCo~%1}{?x4;7z_c1
z3jk+uPh6Q*fnio0pO-%#x}mw^VRxGU0iwg_Rih?V$r6D_uaV)1D4;m|EkgR)?F6nE
z2s&Z4IHhd52Wow&sym5C0WKrP9ltH^-B~eED%v=L)do7@yQ_e{A$<(cH%-*cNH<m7
z5iUJ3cJFu;5J8KDqmT2dEoK!m&7E|fSt#D9<hx|5vD92IXafAvvKeY_w`*1`-=Nn)
zzggGc(D5U6x_H1BqB%}{U-#e-Zz0cLd)6n5fKLuWtc=+DSh+a{_cslZfD`)V%QT@t
zV*Hqt_2k222)zse+E2{&f1f6I(LYtDx4-hV|6}mSH5x(`NY+Q;3n%$NIrdxhMN2n=
zcHy$zmLBwO$LSz(x`l({tJ{%d+?e{ZoAy1rHr2?Yis{pLT_K6!x`1Xg<fZS)4wrs~
zwqilxE!|*k(2e>PVeuv%nd`d}j)TgNdxk*L`SdU6&m_INkahN(Rwa9k^^?(y>uEFN
zuqm2#{4z8|e*V_A3In<8mA~Ru{Ngli*|FGwg8ga>N<|F?7qp34Q&<`~IF^733Ao}D
zoV8v4Ma0hu9%YrUnxhEo%U|gTkL;5TRGIvj{2Frq0_qc8{5QW@gKk#IRQLEi<CYNk
z;e*Nja7>oYFY9y84{-HeCp8El!1~7)Z**eJ3^YW2Ys1Q{LIyU%T`hvKCtb%SY#zDb
z{JNi^Hzhx;5#-Bweyka%$k(qWos<I7tqq8+Nl!H#c>E^%@e%a(IDW#bqvm;<W|bg0
zw>&Kqn7SM!Z>9)$4yjQRwO2WXy~xjhWRCU`<`)CdZjgsHYeTHN`5+;IvUX${?Bc#E
zVFTyK{;$KjC8_N1-lfOkIQntqX(<(ZnTTU%wOUeEPWjP7OL+%py$%K8mM1QOz_W&V
z`8SkPN@L2w21gSIC9+l=7?=1X-%2!lrtz@y6`(@_-eA;&O-COfaY~=|7#Iu`H5GVF
z>spnvP|Kzi=h|_JM3`@*K3yoRZw07?rxTIU+tbuK4__&hg`Oo?hF5J1dCPk;nQL^d
zh<;nV&tf)&RGyp>VCu$%map0kFiEv{IH&YxS^5RiduO?9(xQq5KKX6|s!YXIR=JBV
zvwqWS%WjW{bt>t82XN54Rr644QOz>sr?Xe?3w~``^fM@wg$+4A#VYTNZGjb6#6}-k
z@{f81{hZr9MyP6MMBzn{S94#TJo#(+tMw4t=Z}x+XsB}vW@MtrCH>Mb7KDw0H-{qU
z=@UF!G@3WV&9+M{r*_*cmtX=+%K>+T&MK<|t{DnCm&=|5v@nuksj8K_{0-`I4{IYp
zzX5aR=YSA+T0;4DA+)I8S=i^5gn=+Kp;A_wT67Lt-yOrnftI45-8{2ZFIoEaf_wz(
zlKx<u*^8kJqwlM3N?Kt?xsN&7WCMFDKMzZFAA<53*?1F)>Wg8e#x}7=6IGrcb*;hy
z(#yfcRn_vd41#8Wb8v~<<T-7vg)GQcG@!~ndgJr(a6tmjbcXf~e&gZvp3{EQ>TJBp
z04_vw(^<Bs{PTJ9F@Z_k468|rC)aC1yb)l;Fzty4GZ?w$H7~ajtheW~X(3H_ouU+9
zgwwYA83Drq_WPipT`5qT-sZqt&(<y#yM71?R%(V7?`F(B<Um)SHr!54iOqOTL+-z^
z;(#vh_Sp2&kX8hXxc?2fq478N<fl%VxLFq0IhsG>Xxf<T{%Qnn#SLD6nuUGk42-RJ
z2Y>-<0a;GcL~psYJ)Nv!HUV5aa6#av>P}>=(Af5u))xA*6_5oY`7+k`<8x)8a2`%-
z&3T)Rh`j3}l{eC&$Nod5_MzSfW}(G6nik(J)Q{fjH*l=~dfMcza)+#8I?rSa@cp2b
zMjq!yy5h6VYm(2llj|m$KrI~FQp%4~ZCqsKYNX|<|HTrYNX>c=ypEhjTA+*lSyAnh
zYjtg9`e)^Gsr}9v@Dgv)Ms){UPk-5kFyi!;PcuxHoa6K59M`S3ILur^tNHg<?%Jq)
zEk%2D+6k~1f)ziVFt3WS>Cnv9R2OP(9~FQ9)-JIk`x;Wu)wQGSX?AE<Fw4DCiL62!
z_Bnf`J3Yk3)81(M4oW#MW2!EF((V2I=ye1eWoesC#by3XGMqjROPbzfyaKQ;D&WT|
z<HI$ui(wbcdq>A#RrN6;D60PED>O`VGmnh47-eMHZ*}Zsw`yn73jC_yOXIFz#u1qS
z<AI-}_GUilhOP>s>8afg7_qK=-`)?cJpK`|z_2ft^r##+c~C{Z?3$+!_BdXf9~A)j
ze+lwzrkkTYX2V>?1|_pdVK-sH8tIy{edgnQ-?-EiDV%7^z0C;~?*$Drzn@cqG1F*D
z-QFBy@129uf@KXG?e-sU?{}okG4zEq;`Xs)GvW~~w*)P&LFF%(XTuG4uBQuIY?R9j
zmA~K+p_z+>noE7b_<a#Po_<J=X{dh?g}98>0zjR=cXfnh<RLx+`E~b-Q>>(@Fl8s;
zOQc1W%Ey)m@5~w**jBc4j<Mb92r5v2&~bMX@M$;Fk4^7NFCs^;p~xAHPN^Q9H9ia8
zC)<u02G^W694+oh=O|4e2uPH$Ki~sWM4XM|yk#UOCUVkk@!EGslo|3B-LmD1zZ)Qa
zw7x9f$_>boPW^!y+c+C<H^I9)oq*AP^XZTx5h(S!4n<M!4<<@+u|s;=(`U`d>eFvO
zac%ZrKOS?~AWbaKy!ugH7Y1+RbEt`84>+>CgX>l^_8`UsKoC{5>aa5zSDFgzGhLOj
z%4`IE=FpmV`?<~XwPypvQsFTj#MnN*<kUIM?btGC9`iM3fA!~F0v(cg@AymL*Ps1f
zCkD2-c1=4y{6?I}ZB;()hg>f@)%9<=j50m3k6~zUax-WJb4?bE?}UhG-ZX!`_f8t7
z&8LkNy1QL)_5E!>h8(8ObM51wwK^Hc&imSkyiJ!q+wWQWR$7&>VxX;~tr_N>CD*B{
zoxv0CaMXWU&B1?H&E$H*?(KkfO`s}a6ZZ{y#sx`K#5337vq6(18V&NX9->LFR$hG%
zxxn7LzNM1ph<Vw5(Ujqe-}LQu@iQ-jUC1Y@xf$DoewYqkDYyL)cPM4iXYP@Q$TwPH
zL_-S?Y(#)A6_D^Z*zp;?I7#2It#xyKR09FL)mWzW72Ahg^Se)H^i|y#VP2eD&Ly6(
zsRIje`#I_6C?610bT_fIQ#HY_>~XH|vP^2q2<wId6AB2Cmg-tJt9*sTxJb#n=HJix
z0Q`oZW6YTEpL-0N#1#MqFGb<*M-8R+&|{q`a3;glrQW=u42<p^pQs&Wo5S^vp~~%&
zK7maB$z1J|9RF&qbsh2~ALP$>*c#1>w{~LKG#19(sPfQHIsCjnlb(WZn!}bIG?r_M
zHJG%38!G8e?DN)4QJ~(ObKDOX5LVko`@c6f3aQc5Nbi)3k9QoKcbYZhH1z9^`trkD
z_TkQ#OGY#foOYMobj6vW1r3euWhQxG%bLd*a#&24m;_b)KbM0)8x;-e`pgTP{ju(f
zSQirk7Yt{(x22hdh~T|+6k|Q{RX`Ewlw;4iGXJwc-|DsFP^Re#&9CU2;SP1RF=`Zw
z;u<#`RmHbQE%eGKsG|sdz5Ke#l2v1$e@!5#JaL8jkNrI)Mw!IDgMqi~mg-sJJS908
z#~7ul9Kht9x_~y$ve&PQo!Sz3d()4~2I#%r380$e7b3%nEn)Of_1U`UDNV?s%Lhkb
z`xbpNu{H@RwrPCo71i&_wU}KdNGfB|b>Iu`v&<@ymBQ@SvR+j9-a6SJSD3`%up=8l
zMYp}&67s~^|2!aGk-0WuTQt;dE1Y{TCzu6o_{hzV{-L)|R(}6v==w9n`NAMiq1T(^
zFD4q7?6#Hx*QC}pNzG5KJB)q6Ff=&ii2>`9Oh8ZnL}+?hs*a&<I92MXB_Qw)x=eEu
zWo@r78{^Dkti9><<cs2+y{)!C4my#gstUjDdt&v^(oHoFWJ8jVh<$CMx(ZO*mbkuX
zmt?;8;`Eyja%8ZYg1uZw{`wO(zK+Du%bh94G0Ab!Huvs4SaP`i-Y2E({2Ak-h5|h=
z2^>c!FryrqWN<NdKFizxEVEE8cbpd|DJrv)W7D`u#WWemTK{GG`YRWj$aN~Bvw4bJ
zc<thQ9kDZ;?e>pLO1s74yVD~~cNyOlxpg#u@AK?TwPfnOQ}>7v`S_2yaqTr?A?A1{
zB%GV_KroxZVkf`*X4!QUeMz6l`Sm3?g$Br!A8dOG+gi>&iN`o-&rcJ^u~d%+U;@Qj
z488tZ;~d9~)2-d4AHuz;ch)ZRulVpfG=3DEa=!3#){Vlvzq^ZD<KAbr*paP!5;mOk
zT=P&-r;Qs}1|c9rkhpx)|3lkbhDEu4Z^I}mN~(ZJg8@oPNtZ~cbdO32NOugQAR#SC
zw{#BOFwzRrG4u#X$IwFz!+Q_z{QrK>|9RgJ?{Vy7f7r_AzOVbb&b6-dJl9%Z54%dv
zFDD!nVyhi4a`p$~gwjz-N!iieA_qKZErc6V+P@wG^%N<<;R_sjP><7wkj&RDt-(tX
zUSjOM9yz?kuY1|7f48M>ExB0N(uVXQ;X%Vs4g&wH$B$g~gX#~7N7%b%=S+(m)2{{6
zPXvx$l{o{Zip)X)HM4>93~=3Gzq$z#1W|M>bVs=n&kv8}_WH@<GU)@$o}|Iy#@5;!
zb$-no6~O!;Ozlblg^7tQ2{A|iPvDp{{66MQ70h2Q1<Y}N!WMa7e01qYDO^OPMN_+q
zT+pJs(feJbYP=S7-ND6|RvwVW^-5Vb9}A$-9LFNog54BALcU(@LGp4ZSm9Sbk|55c
zgpSyto9~$1n*CB4h2C)cQ~!?k$MLb^SM|nhqJv*Ng^~@2b}iuByej1`yY95qD>?YQ
zr}~LPe*#B<MRSuM9I~TWDe?sj*%Yr7W2pt&<%!nmzSRMR(TJ*uG^;}PxWv$-(1F)8
zIjQ~U7|=?YEy34XO2rOW>DKvJp4y|gg<b=Nn9Y}cnxRqCco8Ac7*GWIe#!YVa%V2$
z{1zPJW<Q5~z;U)A`G-OB!qR`yn5~pj;rsxV3d@f#lP^RJ`z-+N1BYiqW2~u8Zepx7
zUwTVS=@h~<nPzD1WRzbO6gF!cSHXrI!WRlugb&&J9bz<|y?_xkdvKf@s#lTFT0Jf0
zVy(6Dx*A+jd<yg_r_SfXO!K%une0Y(&IuygOEVl(z8)W6kxw|p%LkM022daHP`rxJ
zUz)fMjF#M0*(8~Kl<B=Mva!K^{$>Y=yJ3G3lW%ZVfsl(dlCo=3li~de@QO2EHx-9J
z<(i-9n`2a1IEF1^ge))xPaJK3`N}+G=aD5gZ%TZ>s>sFzvB=YFHf}{M#(b-K8=V!Z
zL_S6Cvl<SEsC?qNIcD)XZX9>@+qK<<3hm%Iy{`aLg{M_1VAub9%0oJsopIN3L{%<n
z`wv7>_QC6hFPT6)GDJ&?o2nNq`}q~JEiXOqVs8Lg&-aCY@}Gy!D8v1TA$!=Y$dciA
zMC1|Lm_z35p9gp`Ar_+Rps;Ne1>ywea4w2EGPMa2M<Jk_3vJ_NZ5?Mocjj{}AOAMs
zHcvqAJsW41Ye4f0g|YBgO*1(uEJ&o_qosU=|4YCs*uiVCLVf+>s?R^<4IrQ#acn{w
z-Re-c(AtY^v9kH(W9#E9in$ASi<1;0Ukg6{cczau@t#B_fPx)Q35WLC$Uc8=*g6)j
zA>^?^r4!YRoH}->jU{aW+kCFu>T}<d8o^kwaj84w7SDPD3TWJoclw0ergFSw`@7Uf
z2XVyiL`S?;T^h1d{Z#2~$1O}B3ysAT9i1NeRQopD%QHeq?g))Ez}tCud!*}4+wxf+
zT-rGTml=3*oPQKPn!8#z9ru0oJv)+08?WSNPW>{H;%f?u^Gm*59w}qK33D(sTD%8z
z2AUk*r)<texCtHsEqwdc8?JHxVPbBh!}KK|lcQUJ;I{_(;nqt?`~Y1=H?_qK+M4?D
zvtR5K*1i{yO+fvzwN0;?q!@$CFI=TkS$TW%n=29V_>jWb{x*VK;(1|C=lM@#LO<BP
z9pqKKRN<mSj{Czwo>y{(TuoloiAd|;<72V{R=gdNs~D<Uy24K#*L}PieM$0P8UdUd
zECZc7GmrV5AapOkG{=ycswVpSQaY)X0DIOEA)Y+MwDd8f$kf~N;hiGG!ocyv%{`s5
zmpi+7YR#2Y1X{G4)(mrY3i<)qg>L<fzD)LuBBN62>R0J_(;tngORVT#e&h^|@k9?Q
z==a`TvK3&mt-;Ug`%IKFe<&gNtP8QwW-WfZ=j?^eXJbT={%A1IGUxn!wsoxsUhUZy
zrKaM+JqDY3%^jEBO`#I-HSgUJn42guH(E<wCi|leb>1I}#NPy4yJ5gHvWJ<&!v}~!
zxfjdPlY{hJ<QOr?8qQKLOKWIrzI(|sPJzx3H`cVLg48MOQ`-Z5RgWHbOD!B$35*$r
zpdU}z9y9{YkjbDMlF;XW7jQgWCB;|MHxAeHpOCAG4deV;<gxfD!HS4{m`kho%Au~O
zfcIr0NEZbnVz;|0UKm2xNwBy&yu=9EI*aGByRnOJ{&Kg~ip{uuq$0KVTTmeE&Z@_w
zgu+;7S2SVHj}hZj^;2u{t2{kbLc>K<trkPUZvtUP^R9*OS`h~=fv_IXiG}ykF>+_8
zf40RjL*!;1bwfLx--@c_=N(&YE!3S$YbZm{6mQG(4%(j;s@oeq;*ud-V8e67fDgwc
z$^vl{we#>HA2)q^5XJA}9iUUnpUfSg1=Qt9Je}rwH@eey3(W#78DPeVqeH8FPkl$B
zT9b}xiLqTg)?k|R*XY%)vHFCmH6MMp?^AeH+9P^q&Ex)mdhk8JB?k;ScD+@v`KdE#
zf!qIV&>gk81b)M;TkWqg`2i;u{500Vxb)5Yn`n;b-=nnR=Un>{f{*mH{p$8C4647&
z<b>UtBDYHL=m5fB?_s@=`9a^~#B_0$e$I}@x`*F*%rCDq_3s;&2!}Fhk9=$az_Dq=
ziMl*?Yg^tQHso6Poo{n~=S=97)%&RKkPx%#InV;-_UL`Ja}f3+ToLZDFiJdi2=svS
z;fAM`+J+>*SSW9Ye~(kFsl4WOiX4NsgBz_H8LF-S!b$7_1^lyr)KIo-9!>2GXg9hS
zP+HIfq{CTjTi#UdbY|aSSj@@LfGQm#f`U#w2pC{1vgZC@)~BA5M~~!AkGWFk-Fy*`
za<R<HMpLTtPJ!yM1kDe6lhuOKde!xF(L!Qf_aj|+Y#7ZakgMzFPjfhnTjtGrJ_##}
za!79Z;+2*<lH)sVx`<|nDgdFw(K86>l`1{a*>6Hv9%5dH*RUF{*KEd<``Q=(U07Pi
z31wIX9cw5sf2L!bO$~rPo@LFCn`?!kmW%T{V9$-^6YjS2ox(Je6wO(@2^5lSiu^_l
zbb7?+8c;^{QJ*Z&M!HJi?9k?CpG$K17#O0Vt~TQS!n^n~1-iW7!$tMmCe_#fIFlDG
z-+?Vv;Dy#^PYT>5DS4i<)XF1Uin-Lq1~OaAV*By<@jwj{3i880kVk!g&wgA4^pg+9
zW<dXN%WIzy&U)-!$&NQ4kxz>ZjN(S^mPd)0>W7osW_GIFl+x3f{lcePw6(lGcS(tV
zom}hXSb0@Rc{iS#zEInOuB)ZqCxcmi_Iy!B=oK?3cBtDi8<}d=Y@psu+QhA|NiIdG
zE8!moH5C2`3SGZqgMpRN+^mlZM=JJ<pQ%_k?1K<#5%nZhBPHJ+$#%sg)$aKZdLJNw
zYMyajhLN!3d;`yRIEy`SUIn$-UngDT-XogZ*m(PEdD-M-e-%5y#=KdNZBucs16x&p
z`PJbf=Fi2M%>Rk1lTA`<cqK@@r5_QOD)3=;7;k5j*?<dLDK~x5rvC4ukY9*pSQE=h
z%R1urI_a$!=-*_xFIPhR6RzPN!ntkr9uCEpw@*4LKEHB&@llsao>pA`twwFw_vCjs
z5}M<Zv|YHvC?`IBj^e)Ue`<UOx3Y8!Lic_0INSB=eY>fJT@L_vTgl3lKWV+|?yVZH
zy;q+BeQdqzx>FVWL9O?Z>Vvi3pN}<ig3hwObdQ7ngc8wT2Laeh%%D}E`Em=ghHfH|
zg3hiJXu_;!REHDcw$T~gg?eS)qUk^nw8y>K!TRUbR%82j4+Lyag!eXG&Af+M7Rsb;
z6ZX`6p2@NXk0_(H>2Kmz+V^<;Odn5usccv&EuvbRPg$bwbxnw`(7?0l9-}_}evlc^
zLVHA3zYG@oM@V?Q67ze7=`pS})4@E<Nx%REU#F>k%jli`k7sWtDq5=8?eOs(osuIS
zs+$DO$NZVqJ$A?57;gveFI52|;&`->>zBKI0nyFBoD_n`Q{Qvsoh}AQ$Y2ZsdO{&7
zk~NiiTA*j7A>V+G98_VSXgI?HkPaF>!iwN5a=?uJM_TJ^e1iv&pKlG%LF>Dq_&#oS
z;IElQu5I{+?m1c{;G{M9&-sK*0oS}cA<KRHdDc<bKm;hlDi?vM#RRCJ`z(;f55=;U
zsh>aPzm}j@$>esYJ>oW#io2WTuejAI+wQur(^nv~<2@Gz+tUNDzRhR<9J=$crvuKO
z-1)2T_7wL({^_a0e|@fnIpp(X$Vn;P{$$TnZFWi3Q(_Tsd)8F14IH{!2nSUSv;#2t
z(YYx9Z%f6?V&Z#uC_rkmU8L{iz~sls#OugA945O<L7OYkkssgZk6X>WEwceG_4|yy
z62PUt8Y*A{xKs>x>>p~2B=n-7H|W?bje4EteTn|s#B@$GWcL$z#S-x`Gc0Ml{r>5}
zX7=#jHo(^;A8h=O&4h*Ohs1rR!FHA?<y&o&YSam_i~vJ##-2}sTcy^cUvC76BhxzC
z4^#O^91HZ@_o5s2H=gYr5LBT9mY-ND<&0l@eKZAXLbe?tpO#dAb0O0aEnZ4`&o0?_
zadH{2Hr>7$s<G6H_|o`2J~gcnA`WroN)>6Q;1roH>c^SYuOI{lncE+h;R?*u;qegU
zzJ4*G)CgEyt>B!pJzEC?9?pSXT>o_;@sO|XB7h8sQPet7R+n1AaI4M^%WGb<&fu=g
zQ3m84GwAsJRB_GS>Xi9F{F9f{Kejo~levnOMEC{e&N69F74-n$!TTwl!2-IphD$%M
zdD^&$tUW|oRe9reF#Q&I{yG`t7yy+cEb37UF+8$6+buS=&egP4)Ulb3SvV0i1#QO`
z#0wMAVFIV)QowO}fv`|Gyt08Py8{)O3IJx!zrt*+(sl94{}ZrtfBsf;f$1dk)Z^L!
zTWbK&5n29^aa3r9Ux+Y!<X%30ye`~fUkn@Bg+0z+o%d)1HbEe;b>Wru%#p4LQ$VUS
zGM}K@IUw}M3Mo!eAs53?KIcy~mgqIIj9j%%u7FzuHQnz4vg8kLXMpu$Mhak;JR2)B
z8rOkcD~yd@*vR+Ot??`~sH?}@9+B6}(-)(U18uZpPO5aP?Vs-EDz#RApZGS~U39Sd
zU$+roZ3?$p@DWorfOK)4V&noj%HPOwr(cG3|J;R2DpGz-#v=}9G$?h{rhmTs?ZxhK
zs~kHQJ3xJ~e5LCkA-}>t!t;*674{A*!qt6C8Ic8Mx_r)4gJYd}UL31M&*rFW3(U`{
z&VhLffRg&q>)Sff1xRQBAOV5`leNL;`yasqleH6>;p(sqb<o;zS@;Yv1Q(Bb?BoAo
z?>oIKG{-4?m_91{jvO0yh<&obk2|xnuzU;Gw@m`_dl5?1_tX4N9#j-jNuTzIWEgy<
z;{4gX%QwGs-^_4F{miHI_36pW`T64coqW3yWIq02HoTUTNr(Q~TJ75%nqTr*?F6K-
z!2<^S!zLj}ln`BwVTaADiREgkDmovvNFr+npzUl>(1WFMI6ZJ!h=Hv9lPIIcdCGNW
z7h)HVe4;aQ4Z!i1DLgn<dleYydtmSOYJxCA$jTMTGow6SQLF$lY<ewb>^Xlkn1BX#
z<4_tH|I_%V_XYEAfy>>Mu%7n(z{Z0eyQe=&QEgy_ZcZ!8m64rjk!MDbAtsfMZ(M-o
zLVa5%EahF%soM%;3E5W<joNeHYD8ar!o$MYq|{pb3NZ~$D=25Q_ERf3oOh>|tPucA
zE|;FndFw3zQ#nk@IBrJB&jL4l;B3i*%rTzfI-3V7&Re_NnUoqYiA?WPVvNxtoUc}n
zGQ{+zkeuigKC37Afy4(^8{1#o=31ZG(2HjQH|X0jykjvBlmfU#$So}&JL&}y(#5>5
zd?EijK}%i#ntIeCcd#-`s1{%+BMZk7$Z17*WJ|xXp7b5=ay6McS&UESYsn0+@3PZT
zWDmC-VVi4m85MBIniVt|$Ih|&J3+t=q1>;(HoVrX*r%$MHY^?zW?Tbq{3Cv}lmHR!
zC@a>Nj*p2HaCJ1zlIr&EYE}5l=2!%Er4PKQ$nT0NlIX+j{f2OmAzU0eOfE1Fg|BsN
z^*^|3lB>gDp>-cHxI7k%@HOf;>7LB|maO4F;$S#0INkXxcCE)rb!Nz~wKIfHJfaoM
zc^}oX5MTR-Kt`42c7!D6_ZsT`M4^cuJUArlHA{o>ZJgife|55Z4VBP>0lJQ2IExJh
zBJw%skc&MKw$!#thXwxje=MH**t^s=>&VA3{@;pdMOP+XFvYIQkf&Qgm_0o`2lV+~
zlt^(szRlyaIU<-{y)Uce4@@+0+jI0rH0b!ZBZR7TKujkSsWL_RhL6T7qW>9U#Um@5
zJ*aCCI%%0t+dxwilRZ)TvsgM27)16G@MT&0%2DRywLZ>I{FHyfJ@{HQIOuaFmt2D#
z{!m5EDrnRs-?&JF$5(^LiKbr)9RG4(po~sBs0{4|#6s{>2n!NQ!wqD$T^RM8&dgdc
z;PfktAfa17m=;T?8NVAd2Mq-rf1iXci&#Ha5iX{-NZBJJGwx|IZDxkJ9wjwgE1nU3
zGgC=L9Rbvg@UNl1{=;=JajaWitT#35U($A}reSNE%wsk1rFx=rgskq6PtImFBAx)!
zCU2$0rlxqseog$~uS5rrP;`9s8oc@)|G=eMtZVzleB`wTSKMY!fJME8Z3#6F^2~*b
zWS?6QId3Y88m!A#_?ZzxfPX#)P0O1Y$rqVDA}P@ezOQV+n`Be{GE*CPUY=G&(GQQj
ziK)=OrKWLRz0gX=t%IRp?UxJTOqH}Yt$m5v->A%Dm8GROg?>=+(=GCOIh1BndRZ+o
zI@MZ(BDR4BYEu?1Sr4X-YRP&WN23NvU%152*)_g^;TfC7Wt21#7)8)@jH$y99|~95
zD33l$i}IWAm>L+H2__oWI-?=G^DA@Q^4inN{hwdgXiy7QS=E3e0C6`Rqjm*@$8c3I
zdoMDMF=kK#Yj#@0Hp6-Uj41U$vf@dD4#~Swi23!mdneg+*z(OU?TkdOo7X(CL%AMc
z)kn@uzkh!!GqB55W3PP0$_&r4+6Z8j3vKZm(diF~!5)v&V3%EF0X;sG@Ucuv=wk26
zs;#V%86|#5PpP9SvnO%!Q*(m2R~D+w`bkMuj&O`9o;E|<ID#EbD@r0PEL`Sf8?aDD
z+J<n?@*!zV08PEGW{(-4G`|6<K+2k+0A=@eG29<8sV7IIbk}5LVwK;iYU_)a{SW(t
z3giHoQjBgH*JJwUi(iuLUEz!CbtHh`8XVSHjXwLwOFLs<I_u(o5jWVft<woW`nMDS
z!~kLYLr-MZ184e~xm#%0n$3}(EU+`6SX;^}r<zUWNskW~+w{1I(220%c?jm0>;kNL
zE;%dDs0lgdFukl*J+<muv1qUE)5)E2N(>b+q^M)T$R!168G8S~iy^V<hK;AaFwj(O
zwA!uGruD7$%;M=l1#IX*H_mU3$zu$94=~#TEFssMZ!f(qM)`Ljhv!#k|4F-FW4e)0
z0Z%W<r?pW&(AAD#qr?FH0d^BTH!Qc>TbckN#tJj1)<eXbUR5ZIs42-IwDdt`Jpa=|
zihlpK-ZXX{HdT9K<TY+h;CF`2;eqVCrDR583){<v4C?}cP}2VMC;+6jfHG&YFH+wZ
zba1x+#jva-8XwY7{bj($3mEc^t<s8}sQaG(jU_d3x7#IeYB01f70{ORxn+;m#V)DZ
z@brXjyFqYWU9GwdH`%Anj;JF5LwqjfxN{ak!yVyfHv)*(Km*c8(MTB(ktcBH>N<-+
z>rV;t*#TP>oW%O5a0*4?{&sHWu9#8@QdJu$Y8GPeA)>LBDLf$g8u|L|Am*j>7AO$k
z21iS`jJ$XzC685ku$w0`ceA2G>eR3N#T1MePu>URATIup_|N+piGYs<=9-V{!+*qC
z03F_|T%ZH?`bUW+liY@Mb+GiX%73b<S*?gn>qxUH<Jq6xugbN7a-xV#7igks&E>_8
z!h-}DU}kKXDyxuO6eWsZYy_2(|K9N%3Re1qRZbZ@<99H9GXW*{snuTRr&T!fdlDCQ
z@&f%WHR-p-)^)J87=)0s?dy;*oTDaogoNdi=)9P5em3sN&}F(FBHcCwndvW8>43$h
zg=o0jm)z=hcQ&@u4L5p)ziRU7?L}f;w>pSyzFA->R*FDC=e0ke@b}a{tUdhjKhMCF
zS}}=xPQ#1b=D4-m!8kBb;re}S6DX@2^s84t0CQD4({{xs#5$TxECbWlfZ>;;-6d;2
zEx=lQw*WfHV|V+{lFMEVUiM!K35-&RnM1pTW8W-Z6r`xIRZMr)n1WeV1lnGQrRf1v
z;9@Z^kJbYL^P@JX4FT8<_H}I;t`Zzhp5r`VG<$Z*ycZN)pnUK~lb@8|j*i10C?L(a
zz$`4ndE?Xlg=T-u()&*|1H4BcKTJ=vrD!ezRWdW8E7M#gmYxhrAHG|U5Y7}o8le~F
zjuj<ex;>Ep%>Wt$jN-P6h*ngC=X0mhD1!ax>_mV9z^!sM-N=a7x&C?9NQs#*-efA;
zi{W0!)ixY1BmE8ZVMh8Mb#<`wzg|dIE)L95EUVfjq*QHF!@+Nl%Htk!c>@ucOe(E#
zB`sj-E`6!dfZT>7#Xbl9$9))^&s<Dk#CoUC%$%Q~W3cxRN9HgWthUc3>kkWrr%&rn
z9=p4dcnT$!zKtqW>HeYoMr$fUxSOQJ(By{O>0Jy<^w>(x{Inq4QT0^-%t8K)?#SHW
zQ15%;*YIl6lea%fnd=ACO|G;k;8XzP{r)^}r{=xzvN!XhcSYPIb>Yw-qi;4XJIe>h
zHp3UM{Se2o?5Pr$!xn|H@yFU9-ol(90&jo%pBw}4IN;{HnD_|%$#3!k=+N=}`Bqk0
z37}y<%pp>h*4Ga<%+c1MO?m%$PMwlSa}C9yTjx<1Z?1=_<NTj+pM2qVQ~B9xGI8nD
z5qE8vIaU>tr<#o|f;z@ycDi-wtS>G-e;q;{r!OWs|MxKf>b%ad{i+^0$oU!lX&uLA
zy;ur^6`Mc)QlVN`@a+X0_wt7yl+N53qb{;6AhgO+Yx#x+dL{P|IgiC=ybgSbrj7D5
zI~5)r#)^0PP2rxJHdZbKjvC!-gZZ%!o*?OIzKVTz|Nrzkxqvzd>A{tK=ik5h9CC=c
zDp0WggQ6MXS*S9~kMuy0GABewC&+WZr+H*5fBn+sE4QDm_+GgTG<A&h|4{b9K=;!n
z`B>ANa@Qnr)kp64D0IQc%NEAVO#+of7LuPVcqjNR9JMnqq9POSvX}@{>U0aH;&bTO
z--h(pq&0aJx<P$h5u6PT=Z<H=TVSIm)Ryt=8L}!?GuE8}tsH&zxI;4@CYPLRaJxYG
zGId!IE~O&AmzMX8BDq*Q@f;_P#9^eZt5%-kB^(AgkPG7<n0YdwV;Ip_ajrj@SyxDo
z&A`bb2rSEgbLq#aoXmF5P0VG}M~^qOc3e2Mj&2HnfZ^awNYzhhWpG@@d1nZe)3A)h
zt-jyZ3D~B<VTg2wvPuSAjuid>@23uzN<JZxLPlcuIZd)TAvP+>xzCPRrH%-2Zpzie
zV;H0^eWSY$xx@|BZ4?~U$FX<^(YAtc-fb|>Y!s-)UB;0p0f3ZzO)=p#X8k#wGdd|v
z+$$!iWGJ~@2?tEMNdk1zz`kQy^p?xRZ)!N@c&(s!gg{VcY2M1lr+*!YeN8Vp{sxwj
zY#f}(^{i4I{}c7jVs|KP{!ldSz9<I#)Lro08_=uK<k(dWO8LL9Nw1+Id~~Q_NlJ6f
zBj70whDwV_Omeghkrj3pF?1rOp*ble*TcV=)99N$e-f#Cl@<Qt``B4!$-)Dhm8P_(
zvuCxgVyQ#ti_0QSrt3C9i?I`&NHO*C!e`*e4#SJ<W2JESEfPQ61WB%Xa4fst8GOHk
z4^&xI`<0$JkN`5{B_^c|Lcf+9D-RqR$zrDusHDS@V39}F-!^@O1B7@^i2&f%OAbP*
z`;(MmS2|KOE6Ip_ZRkf-oEuLJFI`r5CdrG<aku;GJSVjJa0lPmlEPaxH+J-l8$!n1
zAkrd-u4D8k!PT?24qiBsp1+^$g~3U{bx6Nq&U*7!#%3#m$D~OT1B<c#Mipu9baV=#
zI~DIZi~n*1a=sjgQ970NdYicny=O-$B6OnXK%c{$)+ldCg2ND#<z;k(o9x}j`)vva
zDPTtjL%s4_1IMvz|BY^_w*=qCa!I%BSi8vuO2#B(wb^X)S*KQMTI_kCfw2>T^{RlZ
z)fpoRd5q2N8WNm*!21Gh=qNb@%<lfW^Kt0TGzS`Ne`p$cK3Mv`DC1!($OHszFPzK&
zZ<eRDdf~%ey3Q|aTV0kD0mbt^4BQXHjONS2$ZM8j4{>qwfguLKZz~V#L@#Q?Cil}}
z*Xw=yvTf6DVJ_petNh=$v(Qwpf6u(Fk(Gt?jIl%7&B?@ApB?wkLTBW=T5%jXV6Kr?
zM)T)7&|FTlj9Z^#>S!h?Q6u)ns~;dr?4cO{zrTdKg`)PhHA~6F<1GqP>q8py2$L_L
ztM`Ekbnkv)H^rKwmuGz8`Ei5mQ~gT@X{U_8vE={Fu6HS^+Pwc-B3_P<xmo#Y;aJFN
zpag6625H2rFU8YC99#4_Q9!A+Rvzat?i`dJcwQW@p{9~6l=u>d5=R7)8Nku&fH!H*
zNo@dVgJVjvYOdp7Ka!w5QWM<rlDi0r3D&)~&8l0bP12pc5ch_UIW5;WX1(1JN5T;>
z_5KFF1MGHwsrq}RgA50UvMXI(K4O|bl0*BaK2_6m0$4x^R482ls864uQ$h)=k=1d-
z?7ezSu(18{&42#tkGpwR+tjb0#Iv#1Y>;+e%5gcB?O2FqYZT9?!HJ}~*!BqkIGtgC
zX#6+8a7(<PtvVo9gMfs!IPNS-DcHa4LB>6om%$1B=YH;Ix2^X!YFIA+0Nc{3yaC{r
zL7JWTSk!~4?V2D+S>~suOA@BrV!oPKa2GU++gkb3{9a6&f=|9DM@`-&?(X#f*N@kl
zPnnvIDj?aisV5mv#4Ed-1KZ29R7hQ}rVvP}dR3Krud%VuJff?xuTS&zOGVS$4M%e}
zE6lW_?eVM56c**HnBZihJFPUmbjWn8SIwELNQYI?Vk5g;bIYxr{7Mk$R^euP>U+Ai
zJfc+iuc2AilAQF_n}WbDoSWqVV!{dbP?j<SVJ0$T{Cnn5fO!F1>{7Nm-+_B0?;u=7
zncYS69tUpzO}h{fxt;2ys>r|MNZkj&*>$+UEFZ2hvEO|XFRhGLgzx;lNf*qOIu5a%
zg)R|g{X00O?(~u@^85|JC<;YkWA8xUa{$~+-?C`Yf#nEsZD!p3eb7jHQZSkey#GnY
z>uAt!HpgVBoRLh&hN35$3T?u7%$Z216!ofiwxMIe45{Tghrp!A&4|$Nx192#K35hs
z4UI{biR2GUJHcu*VBysCv+2~3A-YDlgz0BTD<Y%3hrWmBU54fdqMM$+CEFy-=UGim
zn=Y2naG*(|nI7Duo~}^|xsv<r7=oVUsy`w)(@B30U%EW@eg(TRQK>*Yg_8iW`km;i
zv5qfcM<3Oi$Z~dujHNLP-%uo6IVF2YMDC#vRE{Ol(Aml{@fu1$2ktiTGvRUKq0(?2
zDaWLdWr79cCNo_)34|a1HodRf+-jov;k_wptB%bl`A={X{@&9A4PMO(PM2oH_TqAN
zR=I012WJlprk0ny@Ro5|NmZj`ui{Y7%0?;xP|6awuHKYO7<iRQdflpn;RzX%^IT$o
z&hEQcn%$%ZEXPfp$rBaUBiR#BUb65(H>a{r`4o~UK9kNGkyB%~)Y-z^zF@W<gSZ7o
zGa7krMeU%Q(}p52DJz*Z=YsANHwyw%$$Ef75<}03l}@dC_YpU=b=S(GTa~;xWPFbO
z-Ra7F6}7%3A|np8K<^G*s)$YAe6Hb8PvdOg@;qdjNq1X$7*`isp|rC+l2$St1F3&~
zd=BpYDqY{rxu?T9yl!U+y)kEJ2p~ty9xBz+_g~8_UH)GGB;dQ~X7<OjOKWa?>KRX)
z><#!2YP2<W4sC_RwlY$Cn-?jd8BFkZVw?MNoGwp`_U#JuJ{f|GHB&*#HeeH8hgYE|
z!fSc<8FtNfXT>SFyq+z(u;QGr@y3G+XN}=*0n=?5$L+?}N!K+>O6LBf>jzifM)b@o
z8^Dhb-O5vf!Rr#<M@_f$d?&Y>B~Yp~nS&L^R5Qy-&8`$PJfhO5%F&_D1M(4|GoNxA
zEV}w?ahk~-a%qid-)}i*wLw*70OI8;RHTSV&8Z9Q>agL;f1*;#0E^#^Jxb*?ls{lM
z$QwTiz`L0TC|uYu*-wsM938c&>XMv;9$NTZdJu~D!^)cFIdHK25IzqcRnA)umE$n9
zonBX$2XekeN2Bh8H}wWF1===lA0^Y9toN6?=z(><o-B5p2^tO&M_Ycaw0}zMBgLjs
zzcPpR;v5!jZPc7AiOV)2?@oZ!N$#H_qTt-hBr6Cn;g@xCY(@qTV_A=dR<c1ikP)Y#
zTxv-DGZKSb!M?jjjr$*N0dow`b>7~9*m-@N&7j_|?=p;?k>Z5qrlcx@V=eo3wo#y*
zeA-EqgY#8YqpY~JjbT4`(E*twY6<{!7EhWi>KV{~W4wT%lziIjg6TmODGg(xnPDYm
zBC|@lB;%n~CgiUNDRju}YT9Ow42rSAR}pa{%nkX{r{|f8vG;$a9;iX2Qp<{m{C*wQ
ze+N5;8nRDT>(^U;juSUro`Ne_37ZumG__=6*l~He)^qw?CL8CitR@E)bDQX>)=EET
znj|;UAr31Y57YLdP)D}i!!=#({-V4NEy_|U#e3^ln#F>y!gMb4MX#3_Y1X)syCehS
z1P?fboF=6W*m{Um5Q;{NOHSgJ;yd=vM_xb2Hh~Ymm3daIT)7upUrJnQlY4$RU0KV{
zMBaI$n%MLEOkJnD@vtJ@CeefjX(P=$fNj0VhSAAiLFOMXL4`V@Tuh}Wi!)W{D32F;
z+o-SnFe)<r9bQX4oX9!wmHY=ly6jlPvB`5e4U(7{hp1K1fjIbch>OM^?)dcBin9m2
zt2RcngVWDY^SE{cAuu#;(?Jr+N-wBc870cVM*ZG*v9QB2J6THqtYo@eRYZmHOf)T;
zWL0*L9ReL#r@!5F&M8h{{4_MiV6wyUVcHJnW*Z1|{zD_yQY9w<7GZqDduyTH7{_-U
zogU4I4g*^B7dW2G@`U{}j3g&#Wa-$~^m`r&k1EED$#@g&<<(kANwhWZO402e+Hj?=
z&q1Tkc!{IkPOgux^a~cH@B;38bnB?u=bCZv66e!Kdji_j)CW4*f(Y(n-?Y75V=9}S
zD!PCVbEx2yciTEu-=&vx@ZQus!A2t*a!hPo39-FrZBnY|o8)jht6VQ)`t-5}WO~JY
zQC^R=M>CKuTTlD7yP{%VQK@6G9+(}ceK$nnm*wWIJ2kyotsnOMuM)iZvbyJNJGHz5
z^N}}ZGQI>P*dKl;GgV*uAD+aCNJ7y5k+%-l*nJPo7PsLldD}J3HLQ;+t;8G~YT0nU
zWub0iaXBc?xuURprrtT21J<v#EbP1(6StDB6S^a5XPA`9;cz@MZa>Zne5l%xxd^c=
zH}MB2KbsH$;KJ=zixJk)o=GBSvfwehJ3TR08qgUzuR>6@IqKDpfWPZUCdlD?uETP>
z9|)jlH}pkB%a5@Q!F#c+<XeNo2zZ!w?nx!b=DE1XPd&kR&JXy|i_1VxGF2ZcLjr*u
z+;(|1OnY_CP8~?cS>lkQ!#Dnsz&#ive0VzX0k%x6F8|f>?XAV)lAK~;{rrl!2D`&3
zx6;A*W$R<=C+1KwoA~Or{;*isY`(+V>YJ?Y(W{kT4OMbKz+z^8B~WJe(N3?yO)J&K
zngb1}spsrYx>)+e(8gsZ)R+>R^!v-XRUYImd%QzF^K-xkm+Tki^?DV#B@U^f+Y);!
ztYFf{LAB8o7C=IOef8)Q2h}R_3kB?e++j+IMM(f;So;pMRoy>$j{F50U@d`V%~&@}
z5Zv*8Vfd6gB+qn8a*aM|<TPkmYzns()Pz9UPU`<M@Oi~G>byS`*^GWtr{C?Ze3&p`
zaXK$F**~lu-*cA*MWohGeC5Z)^S|=R7tMtDZ<^8}tK`RV&Ka#BZ7*3oBJrmxxDlxt
zfnC+Z!(o^tYn&iLSVXubGV@bc*Fo11H_k_fi@U5oAxsH*)#XN#zLp>2rj&#M6p}u=
zr%<SFYkA_8ddH}yzo^zTP`BiB{pOchKD&B@v+}Cb@Q+=OKZ6nH>`mu8UHh0RSPnDD
z8_4x0PWLhNReL*2<POJbW7YH&Ju$bdZ0pgft`29bLQQ)ih5NIC&-srKk1#OqP2g6B
zs9)JA3%!M5!a|E0C<nMFi(@a&hroSIzKBxcFyslk*Dee5nA3x~>rEasPRM}D(gJBp
zHU~9-#TA1TcoRA&+$On=W7EqYr_+iExU{R%Pz5GZgSA!_kJkXx|4e_Pf@!(XMpF_^
z%Uii08>lYl8pxe~49sjrEPzvZo#8h1q_}vi^U)OFM$4ixm{sTiDX1ZiE{&EPtdYbI
zu1+)Wn^h+9Hq)Jc8jVjH&W9dNIU?|U317C{fyBg-<bD<>yL|GJp1J0*g^M0@%^T;)
zXVu}=yUFU&7roWE&eNIf4G2Pq<KDu<3F9KDQ+*qE<Wba&v-cS3IGUatXm0rjq~7<Y
zG_|4Ju)9iQT)Q1-WO=IU{ACTA*RVmb7m>Y)^OX+f7SBt<@Z#dqtj?NQ6Y3m(rpI^m
z;qK*0?gn6*=g)oJu6QHk21Pa<7QyUMP6N2uJvwHuxYeO^rjr#!$)H%zKKT61ZU2^A
zzfHoOk5!YHY{zUB(wT*n%n(k)EapBpwF8`UiF>tErd{f7pr)y{pS%4S)y>4ytM%YM
zv;T7QC^LUF!CAgtV~-H<=$gtO=T=4@3Knd`x$RzYRVD8a{XoZmRX8$mlrV7n;L5Qh
zO5(fCuXoh+nppr{JdmS2{2atHsvD~z|NDCs99S>&*%f9Z!A?>2lWqe}5uqBxu~r4e
zYy{<&CY0a>Of;|e(NoV|YZK?A@Tb4e7?5*t;$S-FU|#~FID^*5hop3~Ne;bJ%_%S(
zUmDA;SW?c-x-RQiT6}1<AUP6~2<3-PS~N6=F8Wyva%>)(^2Zp&zW;$`png*`6v{_E
z5%e}kp_s;!BSp!cOYcO1fiJ1Z^V@g~gTUHr^^Ij0lMMI3+*6jW6%AV)l<8$24{CnV
zIuvCCKyu3~Y4%IRYBx#oFy~+h@)mf%ke_|{o`#`E2yliR)Cxh`lb$v1$s3f#C5SUn
z9B%G9;~CM(&R(qLt)FL#iwgevNKiH_f{5m6)_R9qGD5UGh6*#*XW1WAB4XRroU@Mt
z3qkg8-2z6GVfmzKum3zVfND9YZL4gpL<;Z^M@`X9nwH^%2IU5JKPVi4m$RrkUW$i>
z@JIGc+N%*kV7d~*vW>qe-{w36y=hEu9q;r3Qvwq@Tao0#z!=%9RYb~z`yUOYuECUk
z2QM+yww~uwi-V{3DQYW~_@u>Y*!k5y$4N^CT`%HIj&xk*;?~NzG{XBQ8Q<FivWtL4
z%7UJuvN`Gjm-ds)+H?;i(jAYibv1Qm_=FSld-)`!7U+5cgL{*7ND_K&fNlo1XYby<
z#qt_|d=%hETSip@mKR}-;eE#T?os?4GCb<)y!X53*t=?-K^#@Fx1C{w9BMm0r;3)h
z#|SoCtKd|V-;>jKvIPxdOm9-;MQwFGr*Bqu>NgrnJs-Gh7mGUwiHs#Fwm-O5W|%*p
zr41{}+DUg$e&+GZhHeApwm<LY^G3<*C(+5^`O<p`L@K(we6Gl<UJ5v1&i3{vxo#`j
z8p<boIU1aU!u-jkKV+X1LE<#2i@gz$6gshPXy(Tpn(gL@>#c|^EX%Pa`Y#Rw8^S1l
z@exN_j42v}n(qg|2zv51vjQ89IeV3;jh?z4TJ=Z|?$$UX;+xYb`$L;)`@g%gq}UM^
z1;7%~R%^Vd?=#Q)RfcxJX0eL^gyO<<Hm-bt6?g4Bk*-{(wY+W^_{YJDUAi_oQ>(`>
z=t==LS$beIS(|#uYm<=1VL4S5*6eN12|g`zsx0#^uC-wzXG;Fydin!gs(Q8Ns|{84
z4M-J9$l1bV$CHJeg=tkUS)Ngv((1J;$lk6%D`^Q)GlP5b<Y%sTjC+5xX42FcZepnW
zWL+Zcx-K!!1|!=4f>Nk6jMJtE`<56opCba113k;b)Nf<9Xm3h=jok9`<2YL)X{N|H
z1EcXg*DdU>I1AH!8bk(}DNw={!>tZ_Vzp-P(HE+1ojz{bwu{|sfzV^ZjolS=pN7td
zg}ts*&kUjS@$U~pB31cUQWR}1B0>uB@gaOwww}j2d(hw&nG*!+mgG^ACIDouO}V1y
zky5*S1;dC43{1{zLIMz^09N*EDnPV;<deG85p|h`?ML*o^y^o2i{#`QsS~~ew;TJv
zT-Imk_4}}ZQuy-6;?@`7&r~aG?GKEI@;V>At4;pJnj1cVJ1I0I60I3;Uo?mOci?Ah
zA~|%hVl7ueNR&KI+OFBU-m65PadHfD%`*}TJX-8Dx0(5FTQIk%TBVU8^k;<7Vf6}9
z1>%AM%JJo>&Q9ICRT}iYZ<m7z-J-*{Dbyt|xOAguqnn~5%iQ|>Ia9ldDX*{J{dCGP
zyfVGGA_bzibzzHn9JfeL_OXkFTRh98|NL{fC_`_^4}kn@cg)tb!8;&yei6;f8NIpU
z_~Vpr2rx|mw3(T$ttjM-yY9Gd-;aRSt<E;Vw!!ep2bd3*zuW+*zbIWEvUk9QK7jD@
zktdr?txR(lU_qyN9T9@}-g_OCq^5c86WZA2-HOw&(X9z+KKN+~WJ$M|lm3~<ZpHQw
zLe8QZm40cfPd&D#-w4S={}k}p1Srj}iu)t413HdJe+jLJv7ygi)6%9MMs_V^FEq>_
z#oQ2x{Ud^U2N~6F!{06zUel(*hd_@t_9thP2F`dS?k=4M=@|^-K1c)--DgH?Y#zt{
znohe{xvnc!M;Qopa4**H3ipL{u}*X&YZ+qkaBlzc=F@Aa6V|1ppPjXna|Q=8^)#&@
z)_)`?_`vtmuh)bCbH6WGCLphW$~Ur7Z#PvOvDi@69L&<A&}KDJCQVOY3r4ZeyDF={
zQs;mW93<~Wxw!_In>YPhwa$u_Y~X?r<fWc|KsnOy@JtFVRG$B||1gKV%p(44aEvk|
zMe)~h<iy`J<!d5H!bIZEVDb6GH*`2h*t7NNLW@bUFggvodyUBeQ+~Tlq|Wv@M|6Hi
zp_<&qt78{OVjei2_y^hTcf}F(^Hlw3uS&yi&cqi2_n?Q|=$ZPZ;r+Vqet**~R>Pyy
zh_mxg#6DY2j0sctxz&e?&fDqLD%XcRac}_Yw4Dp!POts^`gHcr*G3<1U(izCHoOwN
z&U6ys_BnMsHOuZtcmN;j8>Q!f6UnG{Y{(RkyuW<hpOO-Vsl(f|s<;Lw%cYe&4s@ni
zcKNp|)ZpF<>Xf|GkK{P@6`;qtiFvm6TOsMw(5-(#h#Q^1KgL+b_A*c8B;9>FD!UxX
zSoRkq`uK&xw#;qJBqxt2S}hV%q$@o(0L*eKgSxjNI9<>QwIstJtyAO+V9KO;9s7QB
zYUAVG*cKX$73+lOdht0!2_6muz$jvcD~SynN=$j|61#KzsQLOzhAY*|YI@7;)Jor!
z!G4)<_NK19|96>?U~P4IBmO!I=I>gJoVW?tJ@Z>1<Cxu!6CFNETb=VtvOI_Py+}fd
zjLr@+a^USOnDlhr?Gmg2NGDlpvHKjjk=HM@g?yfvSs}In-|uQXyEKaw3qse;JZ!8C
z&N&bx_hNBzqJS0;z)^fSSdHde8m<z2HGA80qeVj!vs@i!N_6`chU)a$pVHMYbwD}W
zq@l(z`Dw<#)m(Lqwy;V*sezI$OSwk=rN1aXKbrFX<?3kU%_af1i>qa8507{p?qt4J
zc$AD0n|CNb?z;W=9YILLSn`$)%~AbbLZ->?;?oXpiS!FrI_^y)z2!Mhq{weECdB&(
z$i#S@BZGY9Z~~wn0k-{ur*(V`=xMJ1*3+<um9RK=`P5EC3$OWjG+iw!SH9=jhJ7+m
z+=QqQ9_%`VG2wTvyR5H0$PnQ7QFHPs+ZMI&;v&URK%4Q70F%Pv9CY>c(;*4Y_uq;O
zH;Q$71O<TAafRo;qEk2bCl@?+sS9KWh|oXC^8ZldC^*o3QmmG#t3PY#Z{R=lNUUUQ
zC+-4RdSqt8N&k?w*Zp(uD-8O-zf=V~;&bCxKo9XW>lWz-`RAg{?q=Ec1xhHOvZ=Rp
zyUhDsVyFX7tN+OmT@8j0Q!>2Bv*c{My6)w(RDSsANY$2+=K94&7J!mJHG}^tHX7Xn
zMm>As`8|_QWnw2NYjfx`TsnOeg(8&@`C~~8jGO!lBE(s*1(ZDtL5weQf~3erhvyx_
zw50pNnx$Vfr|EGXVA+npE>*ztUj(=RqO3MN{{Xw%AzitS{&*}=zRudU4-j@Yg~f7k
zQAGXp7Gg^ReF*@+kQICZpox_DIx!k`*3SruGhYDvwfODIP1L2q$2Ls{BAtWtn{rcl
z??wQx75Q4v{_m*zzpQ;+&^BDNvi^hd=E>!h!easlvG#}t!X=X*S;s$>BA$8&G{e!4
z*8oJo_~?Tw<qU}#jDM?f=6Zk{S0J*Re)nF0hUYrNB1K%#l>azcF*JAAZ@GPeR^_;5
zPgB#F)0P599V=e{r2zeJ>kdTNu18=G6my41lm*p!g-Rmc&P2@;^x$Wt)bmQZUbdyv
z*RtO)pH1(;h8%HrqAq}!XSh5ptg`w{Kx+mV$H7*f7~Ma7A_dCO3N!i)dz)QLD;L_z
zM{U`=bzjrt$a=o+$qt&&D_rf>s*Hm$P9)tw?^X8zY2*K-PXW+17*Mw|_SB>H;1S-A
zKxYEp-{0hTH$-QZUC!g}&-uiZ$|6T<@{)p^asI!0SRZ}Kwl1`s=w#9_Nr`y93G(rA
zVhk|Hv1b8**GwP0>a!@60MSVs%@OsASvfItB<K+WWIf;({=aURK$!Wu<_Ck1RU(iw
zAHzCDn-8#rE^qo#a)`XR8(QpBEbaxb^vnn!2d54&SZO6_g8Gc^g9g@fdf?zWsNmV8
z;lQp+zy){yCr(6W00JEFdH&MM#M(Iq=b)78juMZ11IOb{Ivm~KT-!kF>fcH3IuUC<
z#f`!e%72*%3V!5sF0Zf{<@Q({IlMe-`1QlgrcW!8K)<W*g71?CKoZL={5Pfdp%B_k
zgvq9IUE+;-TtE7*5uQaV{BSm_W^$?PZz#gS`Q`$AukPd%?&n86M&kF;DS_KMvm{sn
zFhS<G0C*kxW>sCkq5e4p)*e#RHWhtH`Y!<xcqz&`&Ok#NSNS~#&oPd)W5HI$4-+Eq
zTbO6ufaLVICm=@tAX{wKPOYY&2H!dw<bcPHG`$f1{@f-HthqmTT-DT#XYN;w{4>Jx
z+W{GC%;?})0pI5u-FOnpKtFw-v<Ld!mtX#KZGHL%8<5<P8QMpa4k^IiD!ZaJ#u1!-
zd^4pvxPP_F2|Rf3?Bc<|^c}l?`0wQY{b&vc*|XjJ+nmF`pnreFawaKD8YX0&pXR+@
z#mHhm<6YvX!F$f@!~?5(oW1TMzjl5^x{WD|CK3EHV>EeC&;bpuVcq2Xm)!zA{TiKU
z&=5mH4C$rD@CL$Y)OS5;^cD6Pg@6lS<!ns#ak7+)ShL6>)J4#q;{z;`<pLER<KX-P
z=9~g@wGyz8fD{#wz%S&l`AWh?0)jh3AWn2t(6apc$`BpKmI0m>H=Sa(H@sU-GW=uz
zR>2KjVs0XstgqI<mK5_!vPEJJbC+dlrnat3g~huZkp*XqrYEZR|L3zBwi<aF!8$XA
z^5;0+*0ax+-^Id0yK+<V&x-^|?paV|b$J>y0J`O~f`1u4VgwJe2b(I+=sVGTfZmO2
z15`?hoKJvZM5RZq*}F8RFM@V#I$J<VbW+5UHiZ+-&Th#B|0dwkDVvv@8IDhJjRP1x
zt|IDpp%(=h7HcNj^-W2zgJ&vTIuxuN!v<FK9fY>5a&9ZadnM;Mk%|Tu%R*cDlQlk{
zAjkcXvQGhxwrgxvDt=0B$Xla#;*xUuXXP7Md)_SM7>z)D5@qyzF2@;6$(=<H^MVmq
zg@#@x*fRdlmru@cLlw<563mD>x%E#M$C1{9&9ShJaexCDdQ-5f$AT2t-5J#*o$=$5
zO2AiQSzcEMj*&;wQ=8kkpu!(e&bqEg9(fGR|BlnZA`rV&4UnWJ-I<xFk~Ng=nnQk0
znqKbwHaeuFEIgTi?i(lK7xsDCAjchGpDdX3VVR$-)~GDc9Y{R->9(uxETxZ0ZS6SN
zG(*71d{>skV)~nyJAA{DT~bn0Az{l=y|M$l`~=%x&qrNRyhK|E;?Py9-2BY2OFbJa
zNnbv;(K?%62H0mgfB7nD{|-%E(_6fcj_!32=P-kDw%<wihk^BbVrri2i4E_pYZ+&1
zm4~}M$AxtP(@23t(17*Cu&reatBP42_4GqQOf`0tkI~?LYm+ag{xH{!htFj<cPBn<
z^E>64@a}mmEU!8KreqzP08bQ7UO@qNb&B#hJ#-lm;4cE=GAE+B7z!c7aA!f_7V^)%
z{h6?%(thw>V$+kmWavH>!qvSj7iSubCy<$1Cd9&$!uzd;Swfcyc6;*5e{f$z-nMCm
zE1xPJ2?oLdoucdqr>LAQQlRQsf3GhP=>3d3N{zvoX&p}<iWmzuakg_u-Z~P!tunRE
zo3dK4t2#BQNU9-g*){12kVN;$nX1OrmIXJZBu{@{e<CPhu-riQL`*k;s(AgOqy!Ar
zDK_fpp;E2kQ7*NjIVisE2g-b`*Co9173uJ2Hkw9y)Hy@wg4>Gt3UZ$EhoMqyHON@d
zVHR)ooMyJlIfM2X8`ZiZbMK>j2>~RI!IE$)aKJZ(lUQX94}K5T(jJL3?|(7Wcz5T?
z^S$@nh|I~i;zNs?|ANYPN=k)vWxn-Qn4T}lr!l|!nV~D4#U;t&w;}nPWO${qV|9x7
zd6gvzi9+@H5c_12y%}yrN+Q)gx2Yls65=?1-G!v6j4fAJS0=>**ML@PX&xo_i0@Qo
zVE@?IO5a+gFn4xu*twr>fvXkq;1hndzRc13R;Bk{HnyA`NfM6;WRCPn<-R}c(y3vi
z<hfd+V10);yTJ-<NM8B;<T_-y>%7o%9pO@sMjQngABB{zFRRT#sr04Snc33@8fs&f
zB;CC?j*d9{QHcGdCpnHwY6w}Hr9G$0;6T$04$KhnrQtj&A%R0doB_?D%VtvGe1sHJ
z?INdLbRac%D)j=<dXq*+Z8HAf>1R`a)j}xY!vP8kwyXv()G$fvDK)M55|IAw37pp2
zM=HduDz{<Y<~WPHor*|peF7BiDh-X9OHGS*nsdmF2Sh{--`6RtdABOI&BRj|8uE21
z?e21u!elo_HiTt{Q%Of&tfu8e;E7cBplIgohJeGw&WJWczxuVBt#DRH)?NbW;7`Jg
z<Ff`^Y_0TZr?s5Fhucz7C1rgqd*!&PD@Aa5i8K9bA$5L5|J}w$SZ3lb5UPq^eLW{g
z_#)$YP^F$NDCY^K#1EWs8@y&Uh$oGTX=>+=fX}!_o>aMnNy4ifkC(`8*T=-1sq^i9
zCa!AE3Q3gMbaFcF9~X~mHZ~=NM|kB~RM^#(b}5*UVyLD#GrPkt*_?4%?ZvpXSkV>D
z@RxcaB@0O0i4wmES*`Oe*Jy;9F`&}7`CtBY+w=(9ootq&|ML<nD0_DgZVKOpt8lj=
zunFX>O&Kpq>jGD_$A+mT9lZflFRsN4gzQc;6zAFRYdh9Lnc#A-24{&Q-GlIDXM~5o
z`DmO>Da*O^?2MynE&Q={khKUZuyK%sg7B{|*I(4r<{%SrdqXjVVwm4t)&)q4m~brU
zXKzhXKB-*1=BVtE4|`7!ADmmI6ncBsJOkf!(wu{0njr5F<GTpN<gzbag3dU9Gey(g
za)9@xdgT|+3N`u5m^V3}@AE2q5u#304Z5yBl|K!^YejsHYDGwEP6%5fcHO?;S%Zsx
zW;&V7x5RUkd?G<wLANQ@O#|hRSUasG`9y#_(z(~$(sNpURGq8m7CAjBlv$z;rnUjw
z3W3LH^^SyvB@WQKBudPduf3B!-6Qu{h+oBkYn+E4#f?_A=t43M8P~YFjWx7o42(>E
zm7(!v=rw0}WJ+j9HT6de;-+Twa{5_UD`We=(&sIe4KJ&z46W`MgAp+ulib~9R&!?#
z;+V1Kvjl+0pF+KvawehAilsHk`^*|xfB)AGRaZ$)Nw_}o9;Zj8$!l$z>`iBVueSPL
z@Zm0JKxJ?TiV9HTTz;aSERuunLzl7FN-PB}zHBOYWbJClT4m@z(CU&D2H<x50w@WI
z3*;WysD|%yk$dF(XaZKbJa+fZXEWbo8<w~HBz@GXqr_}s{;AEYOtgV8{;C;MMIuO=
zkG?^FC&|_sY`KQDjvsk`2ldK~9ac$FxQs!Q&ig1qeAb!U!SO|N&`NM2r29N#UQFrO
z3zJz(5>16sIDO)9#Jbr=W`q5=f`0#gb`0oCzb)pi+>obhIOMQ`ai(!qJOub_9!oVY
zh6c<ZmTS<=fZ>sy8WUYh!s-Nan?2S6{+Fs-jq=lhmdlAr?VAP(r~1v_WdK#u<aSO0
z{N)DmbI`?qemx{sM5lXT=^&n?#g_&=>d89y`4fww!{RI_b9UCOSWP#@<WCvjSXdNX
zh8h`YFnx|XJ-wQFcu;`HV}L**AFTG5WmKFRJ2o!Yzhfb>+%v(4R4t=LVO?o9Kafa6
zw?o3h8$v!2S0>iJ@T3wrn-&T|KU)<P=Go42tfeJ?!OUoBYLsw<Z1ZyfBw7#u5;8PU
zL_=(NGH^hSHKq@8{fbZN%B7#~!sG_k(KUe96FrHCC(e&Y1)58v7jXBW+Z5T#{wUQf
zp{)a`9hHtB@F8`IzH^k2N5#l4DN(*yGj03rRT3fG90!2{D36lz9_;P+%y}19%TGu_
zh=d9aulP;A4(mK##G7NP7Z*N(SWqvSTWGYKshb4i_@wgq<qY%lqjk{<s&N!1Dn?W9
z6>ZSW2|>nHO^CD1DwS}A6)~Zjg&)^lwD&^>LNr}T<B)ab--cL4^P`YRVEAUexA}Dl
zPoPkzorsAg?uYvq8tsMOcuf|tNy=xjd)_zL%J1q6em0YNS=V8lrONc_SzzX16^+lj
zI2tcXpC<{!Y2!8IqcpaS`p#^ZXxGAaEdTvH`z%wm`b9a9b0Mn#=@p<^wL-OzE4Q=t
zW^_k}LBP3q&AIsA>HPmg*;~d%-F98Wm?#n!AuWhV3@9zBA|)v;sUp%K-3&@em$Y<u
z4GcX>DkELe(#_B?FbvNzc%JulopHbK^L+H@hv9$J-h1t}*51(2{yyl3xI8|6%zu*H
z4VkExsH^7O>q|B@B;PYQj1eOlPdn+V6^AdveGz?qP>%JcotcjJ3qh`|CDEkHvU#;k
zo!^wMe;Haai7Yl-h<m~5oZXsZkqC{e>!_cdU*c}X^c|6CHICnF(w{f;%;v}RZsS`t
z(C3_?eRC6Re_rOqc4M`ub$$tZjk^M6?)_XtZ$#2#eKx(pH20iEh<(QyL?Io!vy1e~
zgcT7Tuf&>N{JF`r3$Tw~zsm8?Hcox{ihNk`Ikm}t5Z$o*X=6xejU;oIq}jG!)#_sH
zlb3l`GmUr^vBeTY`B5DPFumOh%x)4@R%f&zD}+azjcO+vF@it6G~qC!RpGnEj`-kz
z4?`4dMV;?2nr^>cM{7Z+(vUI+vXcsrmkDI#N-}Ec9z`xyE9PrIDHfzeE7c`a*oiQ-
z4RyT_O8&FCSL_WEKbFckyAvZaoL{0U>iK=B`^cxP=9QZCefKZi2|UGBPAla+I<?MX
zPI3Ev^W)lQw$q2DGJCNI!YR(DAZV9@GIGR#>Jqd(=J$QO^K<$vtE$aqgv2KeRq8NV
zJnu$S_?z%Oa!~xR7;?{BJ(ATmJE)D=OCF%Lg0myZ__|KoGn^0!bxj@bw|TK&k#MDx
z0!}b>qg=%4hyMC}iqcU@UoPE8uuv#ho1nv^iyvT%#S-OCL<4pd24`2^Zymh%6kWf<
z7M~m0hTQ$J`1l<(z2`OG;l_}F`VE7xhD#{3;D?wFGiv%!bxYc=D#Sj0h54ww2>Flg
zrZ$HNK?s6Ed1<si`ZDc-h?_GQEUc14WyS&v7~GE+^9kd6HpcJ?gyZPcx5$?!v;tQe
z^`)6k3As1%@N5!Q#Q>VsK34qh#sqS9exYkQyoiEBs^;_g|7Cgb1cpWim=2Hb^f=Y_
zVyEA4@MoGgPI5*+UvNt?CW4YHbxhrgf2d>hLS1E8p4OIqqK1)&+uhr=VEbInUA`xh
z>7*slxGnJ{Fg$%MTbe-5S?*<pT4DQ$;pVj9a!)&{5}Dc6F+oYaNwdr5apoKNBR2Q7
zCKs3#AMFqFF%U!DAvr=HYTfxlq8^+aBz;M7d+hOG4&8cw&x+g0bN}6(#KDT(cVg%@
zWyw%&3^rr##<Z{sLnl#&ukHa7MYO{6yS4d;#$q=efcGMn17;W;y76OatY+wN%(8j|
zl$9A*Px0S;kxKA|t}^y;km?e6+LA(a^AL*Hga0V5RagbUOphvGQ{s@mpoa=Yl+Ef6
zea!_4f^0#h@5B&J=j@YqBiabP$#G?IWrr7)@%sjO`wbiY{r03+rmS2^oH+v0*}ImB
zGlWpDy?RdqI7y_@ThB_4!M!H;6>aU>ttxomyvGlNSGUfO8(tP-gAEm~6=zp!jw;ed
zRT_^Dv{SQUhy>MzEjLsA-d?0!KxPM~&2cIwEEXo|Bb>S}IkUGtqk|6Hm<JCDi2Ly$
z4JA)z32wN?ZZTl&v)%x_iA_D|h^qRXt|&Lanr3=@yA~n83j4Y(_)qUodrJ-MWs8;;
zKm}PX>J!>)$6(k_L~1~ii59f&0;>g8R+RR>%G5G}wXSp>kU+rdT<{Ag?8&2O1mssp
zoMGG6bcHA^LE$Jg;#s^74md2j^8IUDZN?Ju@xiupcUM~??J;J<nYGAruqy#p6bVR&
z;!MGbup;-Twd4ui`cgi79-JsaSu?FeW6*l}geZ8bGbBTxp|+STn+YdgNme;rh{6hv
z9WML~=&(>Nu_>(Lcq$3*`z<y7Wr*1t_WJ0WEh|07NBTB~ch6@-!`1xU6yP!~Tl#Zz
z-NZARN#T1A@pKmYe#zq&$jG?PD%x)>#BIJZeQ@s4?T?TN(U*jxoiOJcUbVSDN75=Y
z;tri_=eZ)AVCBtRCxI7KCs+9Pc+)$QDN_m|U&lqIXs~5y_oIsn$<``eZ_`)iJ&$eR
zog;|#2}na}Fz?EUiCw_ZX7B^*`-?SD-BtqzIHB)lDDQTgY3t9)A1{zqEm`*(C(&Go
zddb-+`d#DVA!q?XPH)SU2&VzN<A|Eb38h!13C)47D{WrgC1@hc@Dyqb({jjn$STU*
z>Gvqy4*laQ_AN2XB0%N7GvJ7Vxg5IHhRL+?{UPrB3{g@Il1y;Bo`|}HmbJ%j(Q4+I
zWuuCLZF<Tg7<txlp+^^(45#<#MS+Z^C%*nzHIv3@=|FanMnD3|XHE)_;Xq5U8SjSB
zjtFenm;Q(V9lpM;c-`r}Udf{|mg>w%RuZT@d%5?ySJ=-t;P|&?cGFpHmu2~N=V_yN
zH|>MlT7TBG3e;k)9k~G~>Eq4cij9gkKJYhl=B`HzFp8h?eER4h;XxybXy-T)`Fz6d
zGEaPdPS#827ZT_X8`dr=?5{b7^OjU<s#0W)J>RBb(;q_me=#JiuJ>^s5na<aFfNVK
zI0XxAFOc|0u5QHC*BwQ=tVo&A9uyAi$U^&G<k4}OG?4l&xmgP6#LQ>kKoH;Uu>GJK
z19~eN5jfhOPmP`Pn&rsP{Su1krys=IA`0RDqrQs}$hh<zewTlnpfdH@g*oz%qkfCC
z<DZM^6oF7Bpo=+K!{jIz=F*m^YCG**8WjF3`m4gF^6Dt70j1g7b$MHh;;`3!wAQ2a
zk;_tQ^ZhaJ$04>F$nE!>@JoDc;~n&%3|9s!RrlMN0oqZp2=y5?+7akm1bDGrcQNCm
zV~?Om{mzF8+)^gmx>2HQgNZ~t`&~LIMzo^hieh&0^Ry4eq5D5nyKC<LH;Wtqqy545
zX=hp28)Iv^qUYc5i4~9<!cgxogFcnq(9z;U_jp)=e{IkF#*oaoNq(^xou4aB?x&(H
z85ARI%=Znhpc>YTDH?Z_Bb0jmRkvkA2c|Pd@-*ws=o-+=w6tQSj9;{nS&LnbOWW1X
zDMMY`JZMdujUH_|zC-2Mr)O<6TX@(sRaBUHd}p*nHgLD=R<2y>uP(rty($N8YMhGx
zMPDGDD7vAWz&)Q>UC{9u-W68=_xJZyT=MPXhNJE7#lu5)=EaFr%fp0C(ZfOU>|D?Z
zhSlaK&4Z;FUCz&Sm~k;3Qx@+M7Ur<@lJPn74aZKHUeU|jxb2X830jM6NWs@#2_*C1
z23W`y=7n=II5Iu&!v~n)Ir|Ldnsz{1IAv8En(4aOP5~=pWtOY{`0$)2r!S>1`g%EO
z`<x1MM%mU$o@hTGVxaAEvSxd20{vcAkoG<=R0I;uM7v^Ht1+fucC$#U7}_9h=-&pk
zVxO|zX`daP7X$T-p|bn;LidGp`m$#FB9|nQ`rlsved|9EUZ8gs5XFp_6nz?Fb}`w*
zgwbwTvg^w_(wJvv(+P?jh3qdvJo4GvcMY9I#WdirA_&ff<^HFqt$YnT2s#HOH3H|O
z=ND>(^qhF^eVPR*#9d}zL}^`!>N5>=)xZ&sPZA3xf)Nq`^*1!ojd$GcP_<r|{P<X!
z!F=^ZkhI_)={`{zFT{PiRPLsoH5JV|fv#YPe?%T$RZc;Ose+p}yEwxq8Udzt{+_Lv
zVt>=1Y2!`J1&Uf>9^99zyPE`|%z}1Tu6XT=K?8rueb^vp@YxvpN#3ZxR!ZcJ7{(>I
zI6WVZJ}6JcwnIMzGnsL*S(}vT5_5>wN}!sLsm*K%Xh2t}@Cd&1o7jS<RzA~D(#EqT
z?;f<!`sW4@15#6};|Y5Q(*B4pf%vrhSn%C{%8I?1F{)QhR8*0APb+&(dwb~64*Sa6
zUhq*J4*%jC%p7~INbu;o$#G&QTG+NG!UDh904IV%h|3PC<3vzCnQE%}G@MHUca_U(
zJsYZxFIZ4J$&EQO6b{>}jzJmJcJ83sShG|w497hKXS-@&j?No#mBky;+5ntsLoMhr
z9eT>+kkfV{pf-4HzwdKF>h{5Dg(Y;49J;+!_PfPZ+Ki6|wes@rr57jBrP(sO=B8)*
zH=G3dB{?q=iX8tk5xIn|HELk6O!)hk6F>pSj_`P<NHJjBMt64&e$gia2yX_Pb&YME
zerjw!wDu5e-V#)1(VdHI)MxhH52L|-cjZ7P8+_vKMY``{0ZRA!NQ-iBhU#*ux;aa-
zpF5woSgk1R@x26Qm#*pi^qx={hR!)QAipxuQ2IQUI(#pV5F<{QOBe<L!21ZliuS(m
z|L6W1(ca3g93M4afY{rubQbQcG8*l)*{hNA@GYig(@_t#VcZ*qB(+UhO=b=&>|C|W
zCx~{A7uK_qM)#HTE0bV=OLdW6<v*+_pPJI>n*3l=zfaT-kS=}p&Mx~7xMk**a;b0j
zQ<hqYS{WTlCZB+%R>Os%uLnSLl@VFt7EZh1grj)iI*r4sF%xyLSa59_eQCd!*;zzs
zlHLDgUyW0T0Y%{JhhLOzWV3P92+XgCrPP}sRUzAtVW$carjKUS^U0)YIcAdG-F&!a
zYg4Tmt;0MJn)f4zbKDLs*m0r@ZGo^yI{#ZbdHS5aQ$0Wyx;u~QdHfg`*tR8xqS1%F
z1N{}naSfvG5hD&3=^^#Ob`BYSNe9cZ>ntc1LEGt0&$Zl)M!Yw;PU9aG4<-IVe?sz(
zlEB*9C~(m=8^1hFN`5+RBXOjq{GC0Shx1m(_M6JFR)L>k#<*TV!gB9G?fUg|p>J4g
z*Yrx+OT44ics{nV$L0AUSfVcws);KGv_awmSg)VV6suP1@fH5;<v4xQsBY{>$(cFO
zks%{iG7g_dS?|u3OA5U_Mu8TmEb`5zf1LHV?)469;4J5*$tUnF9XwDhA6)3&@5T#r
z1~H9SEjmhh&DX|d6&vZ|*nQ++m0q(<uxxIY#oQp67ka~7cj6f<;iIho)O@mP2S_JZ
ze^Z&y76$^`oBmmbc4=LTY456IBWp7F;%*B?&NEYnE+LO1Ja)eHB|2g0%j5W~Qs1cP
zYVl$|Q8=8hMsWp;o=_5vWp^Ikrg7brci9|(X7#jjuxzi+72hL8M%q=-^mBKM(^M?i
znJ!nE1td95U5>BG_sTmrpQ+Gnz&V;k(#J#@d&H6$S1WhajDD|fKEWK#Od7A_-oHSw
zD)S_nFGVR@#wRLaw0VYU$>W*OgyQjirzD4>yU-mz-QEetHd>|mVd)*sa)}lGz@uxq
zLxbmvd*c==hRE*p?;7PCY#qOLejSBy3$CII*IU=f)lTdzM&Y02C5K9jmFKOaqcxL$
zAG1Qv!ov65<+8^ASauzaVtqu?^78Ui;jV(NOjPO_`fb1;bH|pJ+o8e&B@YFcCLWWE
zoKz)rCSuC4pA%P6X#mgLF;pbBThe_L6GORTSv35p%Y9rPzCK1)BG2}>lp<=%ilOal
zC*RuxwvO_d=8bO3BEbhgVbPqVx?u@Nky?+1b}1geE%z|7VAfvlm9Bj+vNs8pMPb8X
z2(j)Js8!s4|L6{x;>k?gPLC9w8Hs3?<H_8!r>_iTW*(Qyeed7>W$3bS5kWi`h|%J&
z$FNznCR=s~lkh?rYBuv@zSG>i%B-R1aeLr1Cd8?(z`V<EVDcnd^p}LkiT2jBZPK}-
z%cXKMYC@9a&?#AsqK+5y_T91wuDke{3+$1UbB>?MLp3~)CQ@V(Xs_q3`xC^maMTgv
zL1)yQ$kyOW@kMq<%K98#64@56mNdYRauy@l90Bdf2(ZvY$rnOjL84g5!tKAh`>!7j
z<L{iIvs}~NNHa{b6P-BLw|cr0r>0X6WL6xwL=Uu4j5y3HTGiqs=O0r1BkQ#sXY*-L
zuOr0Cq^IgO9DhnM9w+kf&8Ct60L4mY-2(p7Q)o=X>YlHb%i-6)!=H#TCcCDr;8SMg
z0~d{M903lG>rW98;OntAO=_O))VU^mf4%wsIBs7S7s#sKqB9=x^*jMYEfe&4tw!-i
z8GXI{vP_QPJ6Bz1W1#eh2PDAGa<T{i%&RWLnjM6{s0+$Ma9-PCa{uAGy2oN36NrXH
zo1qI}bGUZf?bF0`v)NAUe2UnnQ2l27A14s2B(9FaavGv{To!6+wvic6tOp!6HD3%T
zljJA&go@E0{t~wszSN{IVqW)9pIt+lP$wgQ<kdph@h)8YvO_SLqegNCdor;zzaPm=
z@<|2u+{aMtF~6OJs~Eu5G!}O!%@(F&uyjwUkK!C&_4wH>QO$Gh9kktgUHw{Vc>iM+
zN&dGYNE04@BNRi^;bVeEUVoTncW@t@ZMRe(T2baME#{FBTEUAs&fRQqI!a#9KIeF{
zKiMO7Eh)6ZqUm*<O&mZ%xZn*>K`ut~mt3sM)re)IV%iW#qzDaK-g`mv{z!1QO^wuW
zXZJ|4dua;fq2=y7KbmI1zZJS^;A`>vdQ5)}Q^Vt$w)xV;h1ZAei*MCsGT0$`aHMOI
zk&Ro{Ni@u$7jM3077;DOyp4Y;w}x2U2caMg4MS&e7OM>_$5<}b>k~dKnD@X^xp>#+
z4QNMbol8yb4YYzj5<A2{DSP{KcW`CUq-@!s3ov`5{SYTy@@w6+E0C%J{aMuQ{TcEl
z|LymWQDeMmE5%jkvY1Afb?c`~%gV&)Jle2BeoyJJ(RI|_5|miefOa6mW@^a|+}VnB
zciA6tD>&CQ`LJf$v&7J3`0l2_1*grSotYtzJil7bhU|J`vxB2{)JIX5WZDPGD;|=H
z*i{P`t`Bt58@u#TY+C%}g;(Ll0kb1q6sYa}lR2Ztx|fFd*ZEr=cSR<z?@#St)IE%W
zW^z+MTY*FuPN8^RwheZ-mn>Y^<hm{L786O4pOC-fj3GfAW<cy{2XQsoad68R+Jm`w
z@$U!~c_@nQ!k?EZyc9HMbX+msj-NvI?VtBWQ;uj_+R49^`fEffuPr4e)oN)c{M0jG
zQKA_Vc%!Kav_}_<eZ0)E8d`S~LGZ4OY^YN=l+|rNQ*hJfW8=jq@hFV%L}<wzCsJP>
z2(NNKH0r-M3n`kYdaOYU*mumA{oeFiUms2k&GwK-c@)T>V3`;(0Sp-3=g@r3qBmCv
zp!j-O`>+!Zv12Y>bc<TeVXI-hP}Je3N6gR~X=o%3FQy(fLif>Qo6jC`z*mp8qU+X1
zplRx{ViT8Wy#^)GG~_w&1`fjl`1u0*3Ztz?7%eB&WA|Nn3O!!Th2uBdydc$>U{HXw
z2HXjP1HLxr%EDqgw3ZJ_9AbiWyE$c+D;j-h*_Nn)tG}M>YiXmi=KaJh*Ml1gV|G0?
zmeu2-mka<W`SU+P(wlogA&&R7=ubM%WOKmK0-&db#(?bokL+&eOHA9k`(8NrY>fpR
z``Mbjdx3X;TQ_(Y26yI;iYX$4XaA*ES)krUPTs-f2?7ewk=}OpRVS7~a!79|FMf8f
zn~(w_NyobZ!uRM38Du6>?$~Ho{d*}jN)uTAPQ>su+y{8(#U-Q}cxf~F7Xr`t6@s}D
z?%>5B0dLs8*3%iIvc>_b*)k>-P&}^o3LVBGg!fPbsF0;X<pIM8ljGFlk8Lt{l0r3t
zi>jczS=Pj9gisCM@!QdC!yg(aW!9*V{TC05i@N8?_0y0;0#QAk-^=}1L<O#o>6Y4k
zUd@?8jn$6P?D*|`ZG)!3J<uG-i!rSNutCcd@nInHQ-F`W8`5Z5QYRJJ_wTdtaVtLI
z)<xgj0>TK>#mm+;1Ff}m<k{Ldsfz-f^d{Dn)+thNA@Yj>cG=*>Lt4ybQ~8(6?OA{~
z3_UA~SeA;~UXdl%L~~Zu6P@4Vc=hQv=GZ6$dF!7^=Hue?x1L?RmzQ2Sab_81mfhac
z=q7!c*c^Qvaqs&jPa0Azc6{tkhlq`&)#lNUCZoknBViZ3A6>&&LX-RAx|}C)RY?UE
zTl3!%&gvG7J={4m`Ln(nGaF{^fr9?1Yoq|DMvF^9wS8e<jXGb`<QrYFO|Ekq9NMf}
zDG6<iBhGlG5x7evt{WeNP$lFy_aXGw%OrRHEWd6l&^YK>Py)(}$_#>QSclKh4;&5e
z!u4F%XllOBoD)kLDJh-qL|hAvlop^ncOq`mLSX@Tw$khxWfvTes8^F@Q6@t}D?Cg;
zWTVwabpg#b-4}6aYkB#E=7g&!D6oEN<J`1ezI5Xxk$%#(>`{VEJvyhErW~!~vOL$M
z>)F~8WLRH1xWFT&gM4>|W67h>hsXFkGa4sxotR(xOKl)U*mHpyGEi)v^89~q0+5|B
zEmzIAZkIqp7?-LW&;I=_in+P-f9<63d0=aQ%6ddyqtFpOrlg%Iwm|j;^LbooG3`Mx
z`tySIr5~Z0f8PV|+Tj|HV5!LRT4#kH#d(pW6V<K6&rxu?6rp+A42vd5f8=buQlYrG
z^=l{N=<ntopT9jwzXABBZ-j7nrLsR$x#|^?@9N=gku9XyRrdqY4w1~xD~0dWsx^x;
z0ydD_u6iD!5h4@m0k!C;kVt6}x_#Yr{uAk)K`OCy?yi&mF9s)AJt596gygwv-u3{r
zeO(;^i2ywdD^w5iTw~oGmg+f&O@ZO(P5PV&PVBKRWeNL@j;f!+clqHCL_SUWCN+Ro
z3#)S1u0-uF0tI9+@F<8zn$CO~YFT16IjZd6*r%Jw4qd!>eD9a-vf5z}3YJ+^|0?b+
zCnxIdrq*{g<>Q?8aaYB1iPEiX=wR-Ce7HAa54l6vAn*MTh=ITbKn$w|shzfZl%}76
zu>~WM^LYOY)($V#>HUC=wC@txce7326&t#^;}a#trI~c`BnnNXjYma0lL47(_zMH<
zp8fI+HonW5wo(6^+Mj@utuJ<N3a}w}=d3<>s3it%#5Cy*wX~h3#|sfTZwJ;MCW-xo
zjYUQWc=A%7RINn140YwQYUkL_HgDs{DIRWVMM3OM23{VlYcBY|?`C5BH63mH{33$A
z_&!nL;)mq}7MG<3jU}c~!&|NOo|q*95%a|8H!FgY%`<nDyZo?Y>xu+hA0Wl!5b#{}
zZ#Z^&arO-i&F6HL{fIcyUkFKNT#sV97Cp3j{WPqMw@uARq52}D4NXyhis~SJ<^>jF
z;JMS1mE{i@g&W?$w)QT^SRb&12=090`JQ@;FQOOSy|}P8Zg!^c4z4_$Yd6HLKH63B
zISc{~MmvZ_IIkz%V8B%(#M&orZOMLj3XK*T#7?%ufFc!DtEkNkWK>+Z{|ENc^y1;>
zDbWqDY!qEhUYmO!>ISRk$a9Vj${+uQK7t0#;qSaDib5j2vWY}&$D^#KcQo|bq82n%
zv?nR#btuxYA%d(riwP)gsM!Kuu-^Sat9+LGSsE~9vErG;+xsO5YT@FN%0w5**6-Y+
zPejg)&XhU!4ca#xCz@x!o)o-F=TUq<FQu}Uv-|i)oAFLTjO0E#t9V>uUrw<{#G(Rb
z?S6sReq6S10hM9#c*V&1010uYg7+_;xev!n0&1L!wFU`j=Q@o|PkmDndO=teM5F&Y
z92cNpb0&>PFV=-)wgkh*gYCIK<Q7%qdo}6<3VMQU6;s}=Sji^;snp@JXgVQlHzV#H
zcW3yuv$DuL$~m?$s}B8@?d5=D{i}G*vcHeYlFLvAh0VtgXH#YE=8fpOrRbp2F-brp
zAlKLWzO9*yNmuE3@-g`&L)yN6wqL0FN?%^6s9Z5Z(QameB-?ImGN(1R;_~9zcRxub
z;9VxSyk6Ys-_j71;$K|8vab}mR|jmUIJVITE!6h0$c#r{S=X@20tycOKm-(g{I$5K
z=N7RX-N7y0>Gd8lko1)n7%{&xxX=8?4fPW|sJ)f0vo<X$WhX1sqEAf^j)L|3YBB1F
zy{uxUy1iR_?MEZm>G~3iy-x_WCyz-><*IQ2aJ2`@#7}G=v!9UalE^hLVQXaygck}e
z5dTcPo;O6$Cg-iJgtH%>k~ZoC8c7KwFj#+cFXI2nD?%uV7b5jdWF-~rD{P>hiT{1g
zKJsXmqFM`PQ2{tIoY1OHcyUy}L%Sv-H!p})`=asdLHWcLm~+cOKP){)!BvE({}qc=
zn}D-O!<xz5s@MV(YIFQkwpFM$fvfTKhXh|i?S-MsZthpFfCFWEcSyH3$8wEzS>V-W
z=!&l0JS?zMGn(piLrhJ3$ASk=_FnJ+njF`AZZexrSiVb`M}c#>t8I5-72P(rv)0zt
zDYj5@kc+R-lNBs!HuWx}F{7hVxLsRUUK_5aB9n^hKsg28E6#}}Sexa%J}BeKbU`(C
z)&Q1M0_;S-ZGZmlAd?^E-uX*ics?fZ^#RqP#(>*73n?wyDXZm;s`^sz3<VM>T0c8j
z#@rV%XmdBRf(gd@LN{OB@{eS<#$_R<B~1M0%}dr-B+)1@eZ9*%8YPw|Iht7+k;^AE
zDmz=nmIu$QFuEr#5|sHB?2%_B3=^6Sn4Y~m&<0?OW|r!u^}Xu&!=$<=Lnm)OU%}Sm
zD)+?c?XP(iGYmAGG9ca#@52#Ua1X1xi^r&ay6#Lwu#z$25D)KUN9O5c)z!A^5_9&i
z<6b}Su}!Wb34donGsDqrV7!aO8A%xiT!30iA6?CzD$Y8h^AJaQy!lLUjG75u8i!Ut
zIbuitd{LjT@kbS|FzM?1rRi!13FOOu&g-s=Jty~u+t+DH>Bp~P888)=z@xxL=5cYe
z^{oJd^NvRaeh3vH@U^I@y&oEo&!<#ssD-{w;(Sy|(Y3oV1gI@obg~uTV*`3~PqMA1
zkcoGF1KKAadC#g8t+TY}JVhobEFx3%%(lT$>w?(ATs_aow3!Iu<t8BiJu_8o8X4Fr
zPttAq>JMF?JYVkpr7(DP%vibJR%d6Jk*ROp2vxUhQOxr8+}sU6Xl9wuGXvs>!6aAe
z>mt5NzDhh;qRUtyzH5zVJJU2eUM(4G<OMZ}oY!xcK6P0$lSr1`;UxFM{^0byagx9M
z=6vAd-ix;vBYNwUKL51&)TBo&j4thKG!a$MNdo0g20MnR0wC34guO9CdFHvYfrA49
zx20GMa?GwFKdJu#iJ4rwB~OLI`a0D`Sm;W<uAxvU01#PzXpMvPwz7eR>rGv2zY<jG
zknv9GH|=k>F{{eXuPgG<VO7bh-}Eb$*;UwamC8D!mYZnj58aS^JG_tqQO-=RIWEvA
znA@s162Q8utdK+;B=zs>oRlhWB#%820FcQ$R-A64a8&XjK~K4x&05)anw@W|IQ9iQ
z7v=Gqab~C9dc$x;!hsg{V$g8DB2`x5p>6tHv7_l{7eUHg8~Zbm`!RhiQ&xuj&Tm_D
zZ1LfTytfKJg`%cf?Ie>Tv84g!BtYf+(-&bzwfGHfVxcFoAsh@8m%y~K!hR&dc~HDf
zd+=bgDsV^%dCG&9e*NY9ClbG^=Bu%--@>OjPZ*eU4GI1ft9f)@HbzIDX2(@CC2)Wc
z<?N4=&>svGaB5}HEdU{a|28fy`!@H$%iKdA<K~Q=PMPcd>QeXlDz?>j{miN~4x7p4
z81EKhyGZk0)qV9=I}&*V8My+CK3HkX-)L99N&p}ryx?^{*o)xebGgE$teVvdV~S-_
z<DwkV%(Mgh!jN^gIKHtt(%(?6k89V?WALi_Y>-bC+m8ZjtSm^0LcS|eGdFJVBf<}}
z>t++F(^DJtmd#Bv66+(Mdn4ijLAzll<$*7X5dZ5rn0-S}N(73BFwAkJaLvr~khI96
zrQuJF^v5aG$i-z5M=|-afvW=JPk^fZDmF{?)UcpAmFVmC&inzlT~()(-bA}qH&@>3
zFMYqD=i2^O)j0kqO=_RYj9nc((KNuV&wb}>J$~@lMnAy5H}$x`=;g0{@w`>Vr`tdH
z3~gRg_B~qI-u9~)5|l~z8t;dVO#0Y$<Fk-_oN)CPT=}t1K=%B<$*v{mR~jDov&qJP
zZ=s8=Z{Q$1d#{-3$Cs5uv;I9pkCMto-FpY~E%&Qx)*f;XfBsE5Emq%q_?;4acS&R5
zyLrVDj4XBOrlKcRSIzgvxd%=9*->3uw6x&8a&%YL;RtW^`7t<i0cZ|!Hz!Y4!_x9b
zQ^=bq`?-4r>YoAts?O??)l%m9J~Y&BEW*D@E0=xqV;*w${0pGJ1E4wveS3{9?i563
z8UhV-oX42g207pp1Et?e<uz;;u9N^gK!N9PrmUtKthYjr5c@_h@UG`Rh-l|4!NMkQ
zJ>*_8VIU7v3Wc5sS-84L93-#<vy~gvSasvRER(e2I8%0HZpLvlpgyod%m*jT-@8}h
zZ`N1CfgKU|Lz(p{um0B#13DuL*+wEf%ccWBK)q{1cfWijVU(PVY}*gHdS};>M_FE%
zaSdL1S5H}Tcks;D{DT;}DY%IuF?5%t-WXp{zf9spB1km3_O8HvIodV*SoZ;Zw=j;0
zM~Oxi$FyU=t~hPyG$^_zl3(08Uh>K?8;yU5ZnQXVvW>XgTAhC$xk8*$M>gqKGX7;H
zaL^((i*`*@k?2T2olhkC>wtI?cUCf8p}G6oA=+eVZZ3HHPZBBJYa>U4j;Wu>+Q=Ir
zw=ugj93Rn|@7R<~Jnku6(TL;y!J}QdWu_V<i*F`7tE%e-y6gj|u$p>|B@Sx;6;6n=
z^91A-(CR74VyY;F##oqNN1pKo0{Cfb*=SzZ!)BZ2{CD;~Rfsn)9DjY%3~>T#N#%j=
z$Z65Y)F(%7pW4p=E(UOL6#yxUH)7C&5hKqDvRnZMaqBybViXp;Mps@V_17VGWihNB
z4_ss&`m7ai0#~=07Zwe1bdZThMV^F`m;YlLk!0mv`Tyq`0d7~sZZP#lKg2|2VZ*O(
zC8*uqoPiS24stt=Z-8#ih5R)x3nL+4YkCRwudX|sy6Taz_rx3VoY+q9M{4d?U~GhL
zy<Ju24<~bvu=ua2RMQjd7hk7xuB#{X?R@zhTFv#*<tht?h<Bp~RlVCJ()x9vDUn;0
zoLj1}Flswz{tKQx-_4JIL>rP#9F9h=)zU;LoXDeYQPX_mi68{S+txo<`mw`Afq=iT
zO;BwLW#(#?X3Gn`-D!Y1cLkg31FTobPVY@Vh&Wbc;-POepHH$zpJCtH$^m?dX)s|F
z_~Lvw^u#k8UB4EppJuTNxJ#B`QkFPFhUw~Le7I5W%Q>x5LjNzxjJ+O_sm8}-rG%av
zLrYh&A5?B*Bo55R`5Gs8B0lK(GjiSZYX=;<t^!9<#;Z+}K8F1cz2bVsF>kYiITD0i
zE9TOS(b_dua+6&_Mv{{u3vYy?Iu}^KqKWq-MoiWtYyFcFGiHv0bbx!()`n|~!lQ#x
z7dbKh_Z;2fzF+KPe+LYvNvi7altCliP5Rs7kKyliRJeIu!nC6fD~L?3R>Q|#*p%I?
zLAs`u-LbNmh5c&1b>594hmQD~rOHhPjGEYvox{1rg(ZZ-!+J&2aI<c>^Q&0jPE$IE
zbHQicAEb#ey5#HEw`>Tf`;^l*KcmZeJR6Nj74`ONoOHUV0T(f9ML(!LtMQ-yXeJ}Z
z{&nDhoil8Td#8S0(SMs^D&w7+U@>OofLAL<Hpb2yG1aNaHE9%<aC$8?V~T(o2chWo
zT-dIq_2kupoH_+zU;kzZ<@QztInUb!qWbSvw-M&YZ>=Z&n`btj9VukYCG34XQn-T^
z4&O_Z&abR(cK3SxKi%(NKr(U-s|5$_?)r=rjp>hsOjPVFDUDC`i?d5LW2KxWT0R+7
z(ubT!mFIjBqrQ8G6rpil{&)Q7CtFV5^@(W2NcfCUjSPvozB@p!9Ja2gT|}+pTmUQO
zmOR$4Yihss&i<{SAkB3@pz=t-9_OcBf{GK{H2|9CZf~~(a*Mz{L60Puc&k_swxwOu
z!7)+X(N{^O>JcnTW|h}CNrA6H;@)|H`RRCr<CLC0&`vw;1^(n|k<O{c7S)JOGp^!v
z;}^(?yupS4c|){fiiRVBa2Y5gimMb$;BI}Eo0@kU0VO74go~SM)9FW)J4s+0Hz>f@
z$@UZ8Ir9SztIF$J*Hbe}Whbnz7mNbP<My>d*q!X7HFJi6P@MG)$v-n5N#C=-+{`p$
z7J>ih)Ee-}z{v;N(+j=0dAP@@yIs^`fFMcx!_+S@CSE33J!76HUl3%VfbplDg|4|;
zNdj%M;QsWjY4Y8<#3AaW+o8R?Fsy78M&i(5g-;e;Y7|=;KQ3&$C^#TLH}8_C>VtSd
zR7AV}nN(#o_t$ng{p3No=l?iD(0~gSz+V^ac>HvFJ!xRO-EhWaaIUw-MLv6(lF-p3
zD0(uPY~f7v6I{jGVZQ`=4X>|WC$WQ2*G@0fsB&*vY*w`fXk!=-f{F0I_*<UQ0eq=b
z8(Yp7Tb3LtWkuz$ou^A}RxGBm5hiO5&5qye-wx?cH_(TH7R@_UoaiO!*WAD6?KpDg
z_9;12|GE#H8Q5!Hf~r6e;l9Fp@r!0z%KA!G#=6|Q`oG>+10V|D4{_yQXsy5=p^8el
zRs6$?>t~1|!FbzFfy3@LXVhq?$;wR+R#KC+7*&Z7^0p!}HzCl6_lS7AoelZr-vv$(
z=vTX)i%VYD%oQUUo2L{hNfJ}PQentkVM9H3e=_s&)ZVMDAB5fN6Z$}~lB<^&hjO_M
zf>={>dCIm*znpl(7tK?O8qWB;bG<eGT<#l(p_PnoF5Tz_&cRS|{g#Dhbojeo>rWr_
zY$*}yD?4`YULUa0aC<tPriS$#a~#_Fz6cgyhUd5Hr2(Ta;K=hE;B90C2%SiZwmzRu
z32M6uY>dO%<hv=p01Z0~&^M|=Rey!4uxh}Zf|k<)3a3StQvpjW_wA0*>*2KLyqKGi
zVzX=eXTE}l%m11!;&I{OS8i6~&F@BD!vHjANvRhA^1)|n?Z?)v^tnm3ThB%}>WfgX
z@?6C1byBP-Qty)-B;qQY250UOMD{+Ns@CCQ&8>O&B-4HS6>67+J#bN*i0q13Cb;Ep
z=v-_yq!<%{3V*0vy3!5kQKCs&FAfB@R`xopa*b@?mztLW(h%<&9e=x^n4UGESH7Q^
z(Foc)n5tNoUp!lPz-0sShq&Z4FQDOo1!$DPlP_Pt_6SD?=21Z*mSmY(zR9V5qrAMr
z8xvq-9n)J!VtEbHVFYe<5AF%9R>Cnt1d1N;4z1B;eu&_*9=)0nVF6be_;q7?lh{wZ
zbvjsn+Tk`|3l&wx45juxg!KlM%S#pu{(*pY)7&~FB%1s4a=4MnZYQmEZLWHb`$WMg
zRGHoA&a?fALicqDIh+Vr@c`pp_kV_|bU;h}c%^aDPK$bme(W|rM(^fpy-THp477zM
z=MvjA9q87H9~QmuzrnQpb%4=n{1DBOA`z{mcY2^WubrBzPwqTuOVkC*{?Bxm&CCYv
zB0tD+<IN43CMFRNnsHn!ENb$<^HTEQivL}A=fd{P8XiQIH?R$r=pV3{>%lkKEvg0G
zB^PV$FbcM1?Oecn$$N<Y;6y7o=HjZ`CatCYX8uE3z(uVg(I;x+soKbGG^?1Co)8os
zFe(F2v*(4qMUBHsPgY)|3!Q%aiW((W((_2IDzszOQ7eKHtI;|uvDcD1zHcyfh3`G|
zJ4)A-{@>DG>NwyWBKH@k;j6WFJ_t?}Hp4)xAWN3vgBY_9!c7!im)95R4v~05;2No0
z1h9VT=rbREcjhWsHCB`@N#TH)r*1hcl^;)Rx}Fk6M5C(Xe5Enc?i(^a&AtMbW?4K@
z&*!&8{cZE0)F+>9)}B81z>h>&fjb#rl+I1>08o_Mktyqy&T@;>d26a=yL@Z*V~+tn
z$i-L})-VzNzL*B9qm|_@y18%@s<*j72K9i9c6+KfT&Dlu-t>QSi~wJzKmh6UX;Y1E
z>@^lx5*Uf{(Kp~~3k~tUS;m0zF~0-$>ksumh_AqW0hks1E$RGMm;K2dndS%JJ%O<W
z-e|w)Qvi-S6^;P#hwDC01%v#T^6+0w_L;{uvl+r{p3uiyx&?I&V0;8PmFut|ue-jG
z89)Be{>iQVLbTbj(>6u(JPgGPWzB^|R0o<&Fgrd3S1gypmBJ<vY|DQuyI}l|!EVr@
zrL9}ex7gg#X13G9m;Vt0|Ci;WzO*Hp;avSeA6f@dbav0CmZ}|^@#cDFD7{B=mBD@7
zp^fM?!~9eJ51zI|<$2)F(6f80cF<!=%jd~vzwt<4@(9=syukZQ)%9=I3A$6oH_m>w
zd)EKJ0j%eh2P)PgK8!TX06PiBJs$t9EC|xx)PuIHxr$1;V2;c;Y_RANs4@D=3(ze3
zuhQ;ceuNmHQPSgA+ZtusdN`VAhrVqe@aAtT8)jk4ced6QFUr|IJ3!7&Z^>-qr7`{O
zNH766@^Q*NoEgzOdhUCYfJ+PcORPL)p8d_Gy_Xa#$wh0*C#z~~X30F>W(|A_>Zu(J
zhPH%RC=^Ip7UlOeo5Pc4-uQKgY5(OjSshno(|N7BlW8aNAnxMc2qTU@d;R@xhbb#m
z;?dK8MCyP0^$e;NT+2O`6yIgJ?x~E#m(@4Qvi+I@a{|6>QZ?G}XJ^dP&N>PGX<TBR
z1j;PwJD`n4x{MRO+k;L77^mP51HuP{LQEG$7Z_Q95?#3lEX}j0zwmxCZk&uvJ~o%`
z@kKBznyw5xnK~|}-1;s3iIX_(4E@8t2Ap$dp_>K@mmz&j&)+AjgcwxWWC;D5C2KG}
z_`JFz+&g6M-Hc0fp5lOcpPK*D(lAhN$7mm$_IY6$Ru4f(`^)v3+}*nm3V2?C{A(SP
zk07`NQTxp>>0k$V*1sHWFw0}<>#IACLhK!ZzNf$aZX^B&M|9Iv*`~ck;{2x#eo_?w
zHyTho{q1D?BpgzXKjd^)5A`rncp>TY0D30PZ)3=FgM3vQ*AOOnl#-SyYqGX{{kT4y
zu+Cz_4~7C<$P3?;{_JSoc32{SItOV@_>EJP4l58a8cczo8>8r4A{NM;NnAAm<mleV
zfBWc>z9yaHuE~n>9)h2TV}MEjXa^9uL3E=5b?_Sr-?Dd1190=yX`e>n?|*o}Jyw`e
zik`fY8y18|ftzEY?4@@ZH^(B`cE=KS)~aBRYGVVOOD>i$<b}73RaU_#cNx`%Ik>F?
z+f1V8v!7L&`RcQEDN0G}YG9Z)orEBmiYuLG(r*9lKH#26yhi;SzdHvJ1>clRUB1uk
zDk%ovS5(5eOXEB>ek5q<$e%h+$K$_Xi-UNm)p6z$ZvN$#ERgZ*4&p0q`PG%$)f+}w
z7E}vOC&Szrj9t>Kf00@p)Y{G2<c-0#+d?x9H8YTzPtv@)pHjCu`CNhCxaA~;<e05U
zNV*s9u$H)L^T;wBbi@C!SOF0N%xM9b58f28K<E4!{y|TM<L$j`K8WC^shIZ#O(;L5
zJz}|@9TRekQU!f&2@A*C<37+<Xyumg3*asq@dRe#fB$2z6T1}a&k$E&ra0k;^;po>
zBXopI*zFE~*<F?99}KV53?j$>u^Hs5U1NB|UUVDp51W3-;G8m(juItgLcIpe?eVxD
zR%A2clmDGqm(jicI|u$O+28IRE*n2{6&wG@US}|izYv$NuZNZQixuK5+V|Hhy$j8Z
zjZoK2S++&=3kqi_vwE&X@(BKvm(M5fC_X~tB<J>hgA9|~oE&KpG~+xxd@?r-&h@LS
zJen&!H#?$U(8b?0*&gq(JQTed6dGoB)Q(<TGVIB6%^v6J=YIqtop-oBx_R_<a4(&Q
zS44haai^Ehc0`>#F)luhyKOzw#P)E6D=)Vwt;TuRZs8VZqM#BPOdc%RJDmgVQp?~@
z?g=R|C(HOGmtT4#<1lBB8vpD~VLjg%-fY=Xp1+W+ZG9)kw?VrXSaBI&29&qp1?+tR
zn4K?Tb3NOB{)bzNS<P{Nc5d~X$9PFu9BnJlM&*2f-PK)~p?%F0wS4JL!@5_{f*&Qi
z%jyr~+5lvf;e|_5{&4R&eaQa4plss9f{RR!3zU=F!Xpo-nTo-Xfw%NJE@5LpmR|kT
zweHQ8T}5Yr@+HPQ@Tdfu1qqi&&gQ{5R`lVYnsmEBlPkVrZZ!8~OrW|8y`Sxe=%cks
zUd<x2aFwUQS)v2WzaVQ*^1{(4@**>{iIiD<79NJBR$^hh2gmeUqdB@><crc$obsBD
zlaM1+#<>L9+=AQhTs*VDV%vXmC?HB=j=D`7LI8c(ecZm3zVmJ8k_fuO)no&CWU?M!
zzT@o})bK!v(lcA+xce66>bT-$fApMv7R=t6s<$#umBLf*&k;Ui8t<;?i_8*Tf(}GC
z*c`Z`{DmaqsIhtPi~PNK*i3HSwcsYb?(T->ef#7fVR49tg&Pw!&$RthqTGV{v-me+
z9Fn9{48|wn;Yyf8E|6WHrN{ZeTo3}!tc-?lneos^g!Y_IFb|KAoOly3;^;C?)ULAn
zT*p|u`@k_!D5%Z3!9GrOt?GdoJw~?-)YM+DqPzM&Z8+w|u#z9fu!zmxM!igj(%2n+
zjs(kNBIx!$>yUCyTyJy(9#qphtB#Ok6~~#86OXq%UT3LU*jU>c`2I@pLAOMgs7<s2
zF?E0Ti^NqiX+<%CBF^oUg;>t>qM26WBfthZ(ln4DFt_BM=EQ4f^wYlmWUHl%k1MJk
zu_>N`l)3$U&;2K=({))m8ddRd#+ncUr8^#py%*Uu=}uyLQl5UkCXqyO5pu84DZYlf
zm<_BK&N60q5Ybzw>4tM}G;T6#cFw*2y?S=&M={{y$bn2S23J$s)Zh$Kx^bEKuHhj)
z=E9=`Gth-~0EkUQC83YF7Vt8$*66U8GJgAppVWrF0KY*}_9f#bK3c_{iseF&g(Zk>
zZSH5dArX|V_B&4Sd3MjpoRJ=*_CeR3vT^cr8_JKK$g$Vk=;NLZa@@E{f1Nd6`#7)9
zJ%g*c$$APkv!C2gw?96tkhICj<DM0|oHvLMLH0S(ayB8ic=Q|>i$*_0^8(YuLf(Go
zkXrUjeEs(z$;J)GW^_)wd{dUyX3A`#nX(t&vHwYoulCeFzIbx$%)6`*G?f)am4~B>
zQVz23wJwL+b()>bWjCKKU}o9qutd%3EuW>-#{44HOm{P8#{#82g9s<QFvWQ%0CzdT
zWQ}(rjl5AX8>FaK`NE~b6^hidQArbvQ4yGn6bay7$X`GXeO!5LGs~%8NVBgCdnSZ+
zqutr=5lu^`6IGP0*k&rk{~jKrFAY?5>1y)$xiI^%!8NhmdPN0OU||CMGINaqo+k3~
z^QjsahXCPuBkp=5UP^)NWC^Jhkh}INCIk#bj&I_Y>_)!7j}Lc|{bg;c{S{f5acoq7
z__O}lJ#X;W2K?0*Is$DTB1VkQ#=-H`oal97A^H8)O_5MmOkoPg8YSFp7x~AEM@~Gb
zaoivl6zP}G_SFG011TuSlye;+C$g(Le-WIF<Kv<1criD=qXLo=oEQH*8mQ>spW;Bk
zIn`(yZ_qq0|9;z=TDBBp${gyt4Wd!r9gOW-u)Z>Nuaa|IQ|kIG(-VfqFKWD0OJ8l_
zy*=ThJHRD9XknA9&OB!>0y3g>|GL5@DC1>LG%uLKOPGQFetr4i&dN{gKwFPOOfirC
zocG`;P^o~-I!-0#NhOPBbqHvJJ)^>JP^d7NBr<D?F#?wFYp~gQH*43c*>wpOGp?Sj
zuo-q5=l~!@>}+c&Dc`jsnO4^smz&cy%5~UDb0RJ<l}t*vhX?nT5oxzrJU0H<cb8kd
zr`CaXH7kjQJK@)(pW;QGj64RH^;VARW*@?CzZ}OK+<@mKD%b|T77^InG{njGs6E8a
z8;eLz3?G?{a9hMSOzyjRjuaqermSNBco-<KNoj3w6<WQA>>c1;Q%#dwgJ*0k*l_MB
zl=b%|Etp2|Co3(NtqQZI*MOb*n7BxSJCajRT)ya)MYRm&fG9<Rx^}JY#BWC`UEYe_
z;GSk+V7#|>vQxG9Sg^CJ!;r{j@-Q-zC)F2mdq16}cW;gobk`ctT5*LdmTR*^)2V%o
z^&q%jEwOxMA+$?qI@hPS5|$tJY#Xv-N>*TbH^#~XD#bge22)1lhZ8Ksym-naRAXW+
z$F~3TezikE>V@dtrZut1->*?cnPb+~DXULY1=5$HaR|eb4i5`lesSK}KMe3Kow2Xo
zsoY7EZ!7>Gj2Zh3bnaD)dldd}F2weHoQ;=hH4AM9B6SO@0zoE>ed9y#ReF%VwSTU;
zS=Iuif;ex|2VVl74s58nm`R!7V3<~g<Em$ELf6ekeJi$WbjJ9eS`D{Kj&!>soC+A9
zug9lk0uq9S7mio*yFC7{+z<Bl9`#74%Q>y(<=X{(7LA6NUD;|)a7+)<hM?E49`F*m
z7{5*F`E~)=3zLIpRhRfgxs<WlEfT~FNl4rH>}K;-tirCce1Pxzd81$Z;+|UsdHF?K
zqwb%w?uPbGEED9FaFE}``da<IVx{AvZH<e256hb-afWSj3K6ac^cAZ=pJd9q(eaJI
z`ey3;E7Rjx11k(;%u}%}>yr)Ri$e_tkB+*xm7re3X>edBMjK!CD=W2A-PH76x<tb<
z$=W87o!+bQ{b#0B`@Ksc4i+M^2l=bnExeMnEA&fORu)V4UVYy-Yi~DZ>)I#mQx|C-
zsLa*vPl_DxKOKUiBWW?Z5@a8U9ugj@JQSkL%_<7tqgx=EK8Gb4vB$her9O}8@q=n7
zCnzLWcu*XP)^QRpwq@pKCP-EnY)3s_JT}64!JR6PLQ?T-uVLa0_5~kh`5}6|&3i7|
zd=L9LR50Bgc1{6IM2bD*c4tT~1IeVE<Bo$b7{TV+xaktS$gFa~S0fT(xv1Ww1&BZ}
z!QdP4h9UtTCfZ43H6mzafSE(U(fe=K@Xp@N;0unUkhOCkaJ|uggr*6?mTw$yiHFeH
zo3ZtJp<;m>EI_k;zJ;6Hg)^Jm$TfGuT$Kzc@5snh>dk`gW(m*6QD$S;*m6zow{JMU
zx&@F#7ggR?+C9!I!-10|w<Si_Y|j^Z#Hso^y)i!!dgu_lzB)#AAEMGY8CTw91Kpt{
zhSoD{vviduVPA2B!6wnxF1serR>tc@#%zW#hJ?S}zbfr^LH2$n2fIkvK|Ma5tnn2Q
zi!&W|5;^fRux_goEvcyxK7`E(|E$^5Ik``hm4z;wd%jr{1(Sw$j>Z#S(!Qb*^E?Sf
z&h^`0Oj*?Zr6d0u=hOnw)K|saJzMkcUN^o$^2vR@9);}cAA^I9^Drii@D7$c@lTw7
z;d0N`(5v2C*t-lt!EdSjf9ls&39W&O<;iFA{5R*@dp^!rZQ0~5Dvt&1-(tncOTMFB
zs~|%i4B_3yF+}J4GsBjiQPwtlveK&Uy9MGTVn<%xKr-&1Ur|g$8>2o#=j{N*v09TN
zEI<#7Yh|pHoc*_5ng(WA%BOs#tsQFm^Rij5zx8on+{Z?>+j&01ct|sWRQ%hw4Y=Xa
z+rv?2=Ecf-`7?doOqgB5L#>t0{3KMXCJD3<!P;~F<gj`ET>ENM!^dQ*DNg))tRZHq
zSZtMde)G|?B!xK<H27F<=N80jVK?ZgR)6Ead`Ms+Oy;n<U4>v3MJYzLB92R|5pfWf
zlwLuL1e)=FF#&}nw7V7kP(L9}(G?w!YxrXg2B~5V_a8w9%hnbLLf)gzQZDT!fBmhl
z)fyIe;}XFHzoj0269lI!d;{C~k+H!)0MTi(zmim7&~`MlCOOjLRMT}E%)UFtDWrYW
z<Q+eLRb}Y^?3M%uyIkA9QkJ&mlJ{`aV$<nvW8NBvHG&?A<V@LhR0wS2y4DWn_^gv-
z{w<LO4pkA-lA^yvRi%8!=*?fzl3EEpxuI8~q3Zeav`6Hx`paF$@S~KZH)1X`e}Qhu
zQb$ogfjUj4smRk%GYd5QYTSwGutm7cfd@8@2(o-t&QwKo1G|NvJkhcJ%tC~Ab`0~S
z+!xX6aksUg@ROG|+jdnAFHLJzE%(@X<G~qLUg-1klGt`f>Wrjt>#ZN}t_uBHx$bf%
zYJI^n+31@{nnl-ug1kLGaDHiR0Cp(m?_!9PC)eq8>YWe{I(OT=%ZQW$(Ni?9PvUSk
zrf%c;QS}B(Gg~9aEf43d&gSwD0(JJ%ZB@r%^0QgY;=s7qSe#prkMwILjpeurKi0f}
ziv=?`l+;dEG}RtmU_id+(C1Ek+ZC6|a^-RO1mTqS55k_^S$`%7MN?XzT+MkTq@d=d
z__6Ilc(mDq?ugiVwpw=`(AZQ3lOw9E?*Ciji#xYp11goes(M6V6B0XsFi6>L&+V-N
zv&+RMNne<V0nY?Zp{=Yf1C+`k@s<6HU5K%Y7}{zp@8x{9v(X0CH?W6V%UVYWqcME!
zD&D|KSCbFoig6D|dcq<l*0JG=39yp!Tn0JC<wchlFV_TLS<~#wy*O-ucWP_OL6|!{
zj#d^ob_i)E%;Qiid&55+OR@RXBA@vd%&Kaa(FQ&De_6dZZ*w?_Uiu$@*M{w?B`#(J
zG3Dq`h>HP@d>DE0)AJoYzHjS*{JBHc=gq3v_}AOXViRJ?iY5(edB}Lcje<dZe)EpF
zvN?R@KIzv5oGN0U`>T6weAc{pNp)h54D{azsFVA=-sTeif}6T-X|?1>TbW)%;^lD8
z@H)!Z4h@_<A+ev;SJ2)fg;xau2buo_-|I$TU}@*qRC6wEyzNR{^Qg@a0d&81n8mf7
zMuUaL#l$1y^>FKvaZS3CAeNX$ePS2pw}7Et`pv1~w~vaE=ubjAtcRY}X8xMhplq9C
z+&C}3FXHjh3r#tBFWUH9#{IQQdfftYdR-+5UW@14L?)yC`(J0yY}d@k)@t3--7cQI
zhukFF*5JFK>MZS=812q!N<kl5iJh`ARMk|K%Y-n_?m1!FUZ+;p%UHPL^Z#&M(5Z5d
z73Mw%i>kH0R1KYk5#IfyJ3JA`<@jS#)fW-8PpU}KZjjkfC$trvAw0o>TV%fS(WR&G
zypX$Y^1j9&6v_+2?fMcgO@+vpJsC1?np8!g=v{FD{OM|gX|diEPneMH9TqqaN*Y#u
zvx*5>bDWM7AD5(kGL=Ly($>ED>9jusyThr-E?WeIg@2!uyXsOwpvlpGWB}}FFG1x2
z@EY=)H-z_y;muQcSJcW-Z}>W&3-$qjF!98-ZX%c(cnRK;pHqKJf6MwHAH>Z^mg{fh
zOh#iV#^hVJA-as0puBTMGFu8@kb>tfI~We+A;vAae+d^>JsMVK&*q`#y44fbAI#Uf
z!j+P&#(UijfVn>J0<fm+a=Z+>evTfsW4b#_$M{}*x<9++)5$^j-RfRycw5MhwM^bM
zd={UZ9J*9cN`wkZaN#5WQA}t0=Yt?i+OSOl#*vA#b=XGBkwDXF#Q6pcI<=Tqezw+*
zGhij6CF9BcjX!j1wo@vi8>1i-21YpNW?XXtc#bH4<H0HR&!}?YbTvTJ93@3}Jye?u
zqN~9eeIdGgr1I5fER%}NjaGx`)2p8uq`iHpy=jxfHom`g{BBju7xc#fkpw6SaKI_f
z{Ri*P2Ox2JoUjp7s9zgTTx*%>JMzq0)Yju5f$(>9tIEt55PR-+^n#(IkDVi>5zMu?
zb0PoA_LEN!<j_%TkP+@D6Xp1Bx~fNzZ=6|;Ps(@87-q5DF{dG0|Nk)d)?ra?Z}_*0
zf{K8Gf=F42A}~iOX^?KEVF&@~j-g>tL`7OkN$F-JhGs@VLAn_lk!FCQa~R$=c;b7`
z@2!8mE-z;9z4qGAdY=2fKQ}dYRW9!;TFim&hM@WN5A#}C#mS}rrD*a+gZ1RMT+2}b
z(kr2?X+Femt?d*TwJ0RA$!iH*-#Oj{bGej13{x)B&!>jz!3=3&%Ayi<Dao1M!}&3u
z9cp9alIr1|-AlP#*3`2QT{UGUcja!HVH<iE-g6sK4gkb!vU_<N)ylIU0MDd@Z;~>3
zi+|{3_K4{aK4OO{Zd?{_{H&2Y-BXmLUdpqxdwFY6Uud#Z*O}-;U`B`o5C#M#4?*pB
z^6U??8lz-{=yne0m%HX#P3#VwiiMj8rmv+BWv6_~tr5)8`yl2ZOSeU_`4mHGY)Cz(
zucL%ar~7Vdjs#ND`AF>vfWf+41oy)UAE__b8E+BI+Z-0fPCp+29s|+9CZKEdI+O5Y
z$b)$_llx6Q0A)_l91yyexy4-xCEJjO_XAOmyWZ1~qn?3sWD0e_Q;_w?ERa@cVVW}s
zIdw{nI8C@rY*RackbiH`yBQxFF=imh+yq_6CCysU9kQs&%^I9{_Ue8oBPhI(c~1Mo
zgSRfP{w}m0_?@&nVsj6Tp<JMZ3tSIo3-PtXDL;ixwY3taihk4tsbp9}17z3-Tn2n_
zKYc!16VZ*SQVcmRy0^~ZX`YHw8cP!E2CPUd3%!(=J_xZSdZknh;;$M|8D_cLJC5a-
zi91`tcvX*jDXP~}Q77tlR9CuEpXzBu9i)u+wl>YwuCXnD-MYW|s<lL^Fu~AI+nd75
zkF&pN?%Qg!^~4VFUc(EntcJ7n%EJ2yheWe)K0+_HN^0kDiDchDE|qFty0zM^MX>Yj
zjQq8Y;VNTh9K&V@D|RjHXJV%K(DKx;wfJMtb_$6o9n0FuqYvYUareuB&7@cxZjnen
zvT>!rd|DSgTOxaP)#%8l)&ak0=1g`t7y!H4Y7Ng_NwqMOeB)7z=Zf5kf66DyvVU*y
z5H}x~&C!Zq_1%{<s^8xs^E$+Fww{f(8@v;HFOC==gjrM+OYk1DaoO0oNe*v^mCX^|
z)Q*md&$P9J&w{yu^<j(~3;UV$J2txv9qZqNN&b1D$D_~=>%HJrx&m+j@WoYjCjpe5
zYjVa@3@v-xd;5f`zgmwhCfVaUZ1+Ev(J0E9U$J`@yNI#4g0n%=*!X*{j)b2M%m+Cd
z;MFtI&S+&z^O@W>3u~waBZ=3LOE-N(wYm*kPf!!9X0HBB_0eDRs+ffqF@vWlSJWHe
zqMC0+2KUX8zs-|1%G#MHHSp{+=JXdq*kty!_>FUD(;4^#zx7+etqjiFO~c~Xk<SZ6
zJB>;vK4EaGV>Y_w#`#wT&+J=NuV3mWLvNCWH2H1c=x#!%3mopLF7$Y_&>XHw?yrpu
zZ=P+Kh^LvLZH;DR+FwIE*@ad6^oC3wGS><Jgx-1S5__Ka7Dz8@b^OS6=#UmZ?wt^}
zm*w=w(F?707BL)jmI0mRzF_Kwg>f&{Nm=+6CB=o0XUqCv2X(bRR(~#@s=-;ZO|!Ru
zob)QZBva>}3$YwpltpxfG7M+G*nX(SL|6~MoMFm~V|g@qNK!}eEj_cHzb}yHj@XOy
zJS0g22L0OEjkAST3v|C-y@B4U@;sdI!mXm(QAIi&9q7}_asEz9F{eE?2?1U_=qrbB
zjj2rR4_7k(YWxMI3h6CQuLvG7|F`QMXp;K&fOB*!Hm9f7<AcFHSq4Vt-C6B`dQIT8
zVNfWW>zb$D>-{C1FBJ`WU&4CJHFW#K=jYKR&f&)`zQrD3nl8EYHjgvR9`H=N8w8F@
zY`5X#a-QOJv2(1|`@@V|y4fJiA1|rc)<Z;OZj4bL;aU4PzjfZrM3})gZai>3zuCE&
zK2fU*iJwecvGcM)&HQ3;T`(fVbU4zLGdfFOC6r{^sPlH%vb5K^#Tc&ZWZyHE8+3{F
zQB=(THZ{GY?zOf|H7|SgEXgg<@JOT^ia1CXJ0fzS`K_G&P_sCJ>y&UqE!_O2)|d;v
zVAiRP7Q6C?@{z==p<i7Zt+*Hl*R2Iz)>?(oyi~UD#3wPHSuyUH&_Vn|h#lba2cG^T
z{8`OSrC_sT0~a7RajZW8{kI@9FvU?L|IbX67|0W!cOG=HPu6YOb9js?GhqIE>*tCW
z*lh@%Rb!&rf{dX&XQRLMSVzUpz&s4B{2sD$j|Q8KY}FY^OtOQ7C5phB?yxNEvK*p#
z_Etrcf#?b?UccSw?S@kGBS`Tp^ynF{hklGFs-%g^F#(v>soY82iHdb(x!l9~N!&r4
zRolaM&**0uAI|Jkaru6eNzt!EvD@MAQq><F7#=2N&LE_tCvoqp>j1dQ<U{9+%o&G>
zzBg;F{K&UW_cDm4?TT_dg>&;+7O`FBXV*D&D&R^S+SXS&4@jT{Eru7XP`cdvccT?h
z!pu1BM=GfXX>{ZLMGT6q69UV7vPauC)tlR7n*$D_pYDsndv}YazIc7j!+Gj)Xdg#C
zs0_qi`ok+>wI70SpiS@|@n<ofZ#{#laRYOR4BFpeXWYTZ#!!G{kPSpP|0~R<lM!#G
zKFwd38?my=pM3beXUwU<;C7P@n8o{|$IOf_&NT&BFe&=$0up7YuxQZ~Xr)d{)!>L^
z0qp97$k~Ksd%TO6hpkW*vom(a23x18&lN4#LW?aXXMNwLdqwftg-^#WTt9<r0iTLV
zLmlV$ZPfdobD4%s#n*q~p*83<%w%BXp*+Z1Kq&A2N<v#6t-|6pv)P*WSLDI^Zswm|
zIyhP{{ptDiHJUZF`^e+o4FE9R39`rIjYl5D26X72j~?y0$IJ%ZG3bUyz&BTr{tw_3
zM+y$>SIdU0_UGNvnF83WWqboH`|os$rZ)m>`HQ+5VjsXmi>fA4<2H*@)maF%MS2kC
z>?eS$`6B#L$WfTUa?1So2}_4yvGGq8;{*x=uMPK2(eMU5z*{p&oTvr8-(uS;V%`!c
z1!UerkFLQ7sx_AvhpP2maRQ(o&ix%XHPLqS*gJM&h=e$B{wr1{<>_v#4w-Lp$SObY
z`#Pg>H;$88^a@St<(4~4&BcEp$nA5PR2`Y+hx~fhgL3q^WN!|e)&sls&0{TI8ds>+
zlU<uv61c;lx8v|PMTXwt_V|U@1VmJWkqgH}ey85cjwh22=ZzG<C&6!#s+6~V?tVCH
z>wmXlLbLr12wTvmYd7H53$EdmNRRR8P<z(z7Uz-p9MKajJWyiyc9+|0-2$DZD0V<m
zx8+Ug52xX?EvV!c8N0wBQL}BB!s76e{^X%|+{&7ms?%-_(D?xl;?*e#v<X`7Gywt?
z!liI1C*5QRCl}*LopOCv5Kxp@0AT_m6mjd{p@{sYpu+t>g&7u?Yamv=Qgy|A)y4#k
zFJ;dkN{U(;KANo-o-O1tG6@TBEmY0iYc?r&3(YF%{&|9XI5w;8f{AWky%BdCQi#ml
zeSCl`V$ZV-(dlD1S$#%TX8zjp17k*UmtbQnX7LPSQ(yOKoQ&dGI810IbtoIs^PMjF
zy1O^;mI0uQ)3rQGrF`nUdDEcIDPY{wiQ{u%u7F?h`mms(4_l^z4#Hje?Te^+fGN-1
z5zPuG?9{lX7`&a|jYTW-eCJdm(gFvdQKY3J7WY0Y2r>6Ko!^!O=^4(1)x)=Xn*-xJ
z2tddd=2~U-M0M`3^i|;P)-7=xAlC%La-o)XWpW4UmTXS8pQF0-M_o};wYy;-b4~oI
zSmoGy&6!_L@0Yw+Fq;D`Vj#E%!|?e2(ldxPq;r_JEQ!^VKiI7G*qq$F-*e;t_TB#%
zGUQHo4a(WEbwZ;;G{oY<xK6;7&dVx~?|K7r-@V2QKxo+u4~{7=?i!ablaInr9ufsW
zr)P?5MK_Rv<VaHyx75Kp)RXtVq2l%tzb*FHke^oF-x=<Izfyhm;s>{GMf5N6yX9P~
zQ7stOtu5`*$8RmmOnh)=rJA>}pMo8%j?j_y56m&kV)sZ@zSbijZUuR@P0$wWHygWg
z`ozrIzMSZq<Jcp5x0tiVQ4f5Ma+oY`>@xW-S8NW9IP`w>Um)hQ&=9H7NG0+{Q*l7t
zjD5mcP&n2>diZfF^3G7Z;w{Dv4Ccx{8M^l7X|zLECj7wPZ<A`kDsDmc$ex3x()LrH
zHwy5^kBdGwtl}G@_CoLfRVCBWFvT=<c#bo?=kC~~L&nLZ+XJ6DVxMst`Y1&Wr3nsf
zm@_x%gv%Gqg@*@f7=oZ3J4mcnabzs#fGM2<M-%q|mi~*vUtgLtfoLX~>zny;mbPSK
z4r#?Wv?PDD(_<#%rs#1qyDz)n-f`K_cuz5TEnKcJDab<6`4~)Otse1f+2Lp<!CleH
zLc>#-J;mc4E|~!-2uKkt`nJI|Ayy|z7p_-BTmJTEA}iE*(Ec@~`(ui)IEyd-hJjZ{
z))kysttv}*)8<O&#3y^-VX6gG3Opx7@;)@F-o7%Fc0dYO+eK&GmAr4CGSv9h;cb)k
zILT3gdm!QK$kCF}cwVc_{Rt|#qN-@)+|nDK=D7%hIO3?Ttky_c)vJ2a?buoO+;`#P
z|J~;uWN`Xl_@@GnYo2r{FjL;Lc|ID?`|%)Ti}&M;TNPzUw^GJjolcgxnD8K2d=+P|
z_nc03dl-+>%(FeB1uBs)SO+S(@u9Jn**%!Eo$T!^VnxM<Rm&Z*z%;n-Y4ckWa1HMB
zGyYDGlO!CB*$KLDBIeWB#y@lHWMf@t*81E6Y75dNE+n18i-eo9AJuJDm)KsObZGxk
zYVz@Y1A)wMv?VSsXep7^2;{7-dC-sFv1jBu+=E6Mrg0+<!$fxn`2&s!yEp0x6AdAf
z`S<b$*<<g~+d{X8x67iES1Xpbdw&%_TqykfU99!s=L>ii%TdkDD<43_+~{AOGi^^!
z|1<vQx3>KMsDmy@E5`K@Lyx_0e)M2DRtAC5ctq+yQHwoHgvM*p#X7C=i<lp~yp262
zd}_t0JCvfHwLf(*;m8qt-VZZR;=nILhJ~>{597gyx>m`3zxKANn%O@F+^_R6t51vD
z$<d()ABh2EF50qs)%525P05!6vY$^qQD#>yBB$e%Nk7O<>G_!Lceg`*4R$?-4O2K+
zt14{x!1Jf3Ah)|f+JhImPo)ENvh?r#Eh@T>{GFtkpbJL%FE4zzm{iDf7<&AjJkayw
zZwhBunvx%dRlP9>nojK={Yl_p_rH)yT1Smq>2Dct&WL3(&yUd2f%2WUZ?gRQ3@?po
zPxmry=e#a(u}npgkFwU}oJ`e>B}bvAz_bQ5=?+cB^fcyb>xb&dcgU?g`u)agzk;v1
z!|!(hTu~ZsPj_>}x!aI!^yP;DJ1e4+@5ddYZbK<w@rFx*9Rn@6UZ`QII)`e}{i5+3
z%!udr?MlPMD6$gBgL7u5$$vdi%nCgWe>c<oTlROXmibTN>hrh43!)y)e7gb&W-{xA
z&)&O2)OD!>|J}cIT|$wU@Ofhg^af`dFP{+0FZ8tQ*clxR8!|{@KA*7RQFXWaiiSf$
zI>jLMjRD`rYQwY!l%v|E#qay^ZL9nPTc!q`UP^5%VGV&(jMFk34W~Dd@*4%zz9Qee
zP*YZCsGc2HTxtgAKblz$I+@cT*5?CEbiX|DoIVM<d^F+w95H8NpIBkXh*$Q$vCr*f
z%DsQO{{JZ(pI>@~elWEo5z%5^z40m`OQe^_cjfe0RcZZ0^h-AuL5Vq!<R;~G5T{_Q
zTd{1PY|krh7rS@o|F~q;XO9@Jw>S<^0u{$w+p_&6s_0B73P}(;tB-Vd?Mi*q(eq<!
zs_d{!)aj$t+b!NT!O_Qju@7Ln1qU;xUz;-KCQCP0>)I~`mPNj<%94vy-PEZm2CYy`
z@JxIdol&;k_=cb#2Per#qD~N0^7o#nA(xxJpJ3M|I=5#|G=LhN=&ge--vT|(2(%Ax
zf1-z>uv@b~2n+asxcZ*>RF308I2e@wwtjj=I*i}UTYB_Z#JdIG%9Wdb=v&vPHfxmi
zT$Z0ARJrHdpY!V366w(CMVri)_vX%_AyL`xim$M)M8TO$p)FL1tgOUyep3#D?7zHQ
zZp>vQYgc#6)yq0DY^Pj3w94=<%K3ltCT?hR$8c;z)GG@Uh@lmhx`<kszy8R(!&Z&5
zYlzkgf{%8;`7U&7L^Q5l@F<ueC)2@SkG*Z~TB#Cht`ViBwzh3AD7xakj3oG4-1lQS
zop%hlnSH|DA04OG9%dN-fr(8U`2aqWMEAp+aCf<oGxOarAV-ZW&gmmju+|)G-yu)W
zQ)yU#);oX4!P_yc!0B@GVf5e4D0#PChDzVMm^Grn*^_>7eP?E@+nv|Wjf7EAyQP>k
zsXGt1e3KYavdUvM<nbL$eX5H|V@H?E#~#(WWlZ$|f~AvgzNL|A#@NdyngNAhRj9U&
z8|{j*8iv^sKE!vmEm!dd%?t!8-`}7bB%zTO<DLwL054kXS?IusK+|eY1g;yTL%Is>
zA7o`lKi4rVRpcP~gmM-9PbvPs%<QgW`IDpQxMT2%EH|>U@dvjM@Xb%)VPwrBLMnFm
zL*{1Q+-VjnNm$?9`aO~dER?Lmk-i?~^jb~~si}d;>7<OHHK)aeu32p-j|HfOb%;La
za2XSs<y}jr(*7j{YoQs|&SrbNv4?rK^q+!s?ZySuIZ_~Y*}bLA*I>v+GY70ol)Kw2
zx7mZ)k+tOpk(DezE=-t~b5dW6>-P1S{Zqs5RqUX1lxjg{bzqY3>|XRB8N<{at`3)F
ziizc2#Cnr5gifV7z+Vf`wP6NT4(V#AMNkQ}3nSJUHxO~JuN{u?4bW#5qULHLow|h~
z!!{0+rXybwW9fzIuO@U~PmrB#!CK)6=6R(`LXJI(=?A+`B1|7YWD%ALo@P*QE9<nl
z@`X-M!Z9w)L6Th&c&kr6zx&r5UL|_fKE-#o=@MVV_#eFuPLFpP?1EKjRiDMpf9~vf
z;o!%6S7Qpa9M|5l;*nv}j5cu%#fddK;fiIPuAW13MKe-HRK<zp>KSG#8Gk=yr98zO
z+?gf?Lm-w%h5wdi$XT*=1~O)vaMPPtOqXWf7J}%|wX1h};$uafCZ0w7Z6Wwq(FQbk
zYNHSA&$)2+&ITwb{)Bq@j}AD(&b&b=3|gx|(?kYHl+Eyl$+)dI&DA|)eJ*7&3R_JB
zt8tP&^6<g@d-?`4o+#StEm;f8Ul9<V?e6T45+zK&EQW%pCh82XQSl;qyWt|?L(j@p
z?G&+5VKLl>qL$jic~gTmn6_J#h3F`N8*iz&sqgvNOrD9Zu=w_2);l?L*Y~2r_gOAM
zUS9~TaBhxqMWs8kFxKo5z*c;sJlref$uqDCaHs5=52E35E(<6JG<#%33pD^h{6kSh
zskf7r#G*Z38r_H6O#G<!MQtC6LLTqlheVwvLm$dL$!YA(Fq^v4YNLh;ni*|!UNI5j
zGWWbik#oyeq?obh$**&8Q-S0)g&ElSW;UYgrL6k$L-l6Pir^O-H#JyN(uqoz!<V)T
z)p~iN+aVspG{CN<;)H&N_|+Bd!9im@MtJI!@)HEk{wW{6j(mhaRGPAQ{JY^z;7%!q
zEg}e|SL@?JloH<4uI}PR!Ymi)tO1d3b9&OP(M61<fDpnWu~t1c!pWG4Y1`um_e^H*
zfmR0s{kGu;If+bbpJ$!xF!q5SCE4k!SeOcu%r%?w`ZFeCyuv#uCBNFt;wkt}ml1dp
zx%AgWEXUlrkrZB=pW*{-L_Td<V>>qj^HIJ_kOviJcg3btKQ_Sjr{3xjtN}rYIU~0E
zVawF#5q&L>u@{r}uO=N*hLp=Y-;cQ_25iVxmv=nDi(cg2>^Ys%aFA^|?LSnw!9MKd
z`Yx-fI^;=3ZL+>;@37}~AbO@IXJ_yP)6j&{2p@kGcJQ)i=Z;#h-UJ_KMhVgK{*IHK
zBdb2`*(^kQ-MWnGZOH{oK6ItH57V8Et=q#dee4eQ%#8?D%70q&{8S#+xKp0@j`?FS
zyFBah^SWXc*R!;_I;RjGjaIzSs&&4My`U0o-<U+I-bP)(FYsE;jOJojr-+(HJ%M4D
zrl#uyQ`A=U?ON@TiBp!bp;B3a=(R*DN9I4J05LI82bzFf4_ih&>6I8v5Rg^8YvFqu
z<A%?ex)x3hoj#PX^xQk60Y<MLN>jx}BvV|nkN;LQiEr!af7ZERtZWTB-l|7Sou^Le
zUa6m0Vm(v$e)IX=`&LJ~5akexC-9UOF~ZUuT1Q;DfqQyJytn6k1rbvcWm;d2TC)wj
zsA1GJY@(G}^yeg>nHlQds5qW`ayYMoXZ-PDDfcup<@gR>r%tht@jD$e_FxsM!nc#(
zO)~LS=4c9l)Xcvw3R?FzDa@KqfmP#cdW#$(^v7uE=Mjrc&C=rJk}-}3T)>kMC*N$V
z3}oAf^72?p#v1XRPUk;-UXVg-EL~AEh&&)sbQc>dW%EeZh$TjD<P!Cr@Ucs69#L1+
zTjiJcnzas$k{(G<eclyRI>~bFT*lGxx1Gs2>|f>g+^M=u9I|R}&IMC;w9}WO$O%83
zI{9V_U;tx3b0qtRu2pw~&z@in>|_;smdf8fNlXHOd4E5+k4;^S34F0XAH+`mXz~x2
z=4c9RdZW_#2o+Sz{Huzu_Yz3t5dGpw>{V3h$30%W;$WK*N@7GOnP*vuo;n2(!M9e(
zZmNG`LLcMK`SnI)HXknI6@YpvrhGG~iJ$h^4=w%&F#M&W%CaYd7vWz;RQBk1avP0u
zW?mAl7luGO_>?HLExM42Qaw*k!bu!UTlfzPHf@RbG1Bd93~&0=*0bL`4FVpx7X`^T
z?n17AK)yz!;9E^HuT9H3cwb_tynPHfWhE!xAYkiw*Yqo8-stWUU5C_yS7_yi7n2C2
zExEOKvuSxtjG?=DWouz<45P)EMEnyd5Gef73288p?WBBC2h)q4+>tmIwymG36Xi7+
zhItf7!)uH4Uh?Td*PY2HOSw!#ej?2@(hIOGkVg@}pV_@zcnS{}bCQLC+wuSkD}Njd
z0HlGpOErtk;=9k336eUx;`xV$jlK+`8g=Stjd%<cZ{cI+np%Zp=d1}Y-)Y6oXUtHu
z#=2xPH)sT+vvk79$<U+2I`I})me=0S!E!<#`Y9yRQ5r!I%XRXJaZ01t2>nHn`Q75O
z3(t?^9~*&SiFbXSd}~cM^D{g3s2*%);P6-Z4Ziyff;o#TP2Z=Of_OO(U0uGa0Yhh<
z*%gX1LWHdFK;&J(7YVfCdpAN#jDQ6&9DD<nRcGLVVboDmOKMyc5JUg-h{`WymL%LE
z3KJ%=Yc79l2G5#qaiz4cIbr5s<a?tbrfZ>5SkX#jl+bMba>MjT`cH+ULb=ffrwdEp
zwiwv2hgGOQ5UVI^2(Pj=x0(7rTpb%C%R+(yh%9sdAH#SRu89|a&_|%CAOO0V;cNuS
z^QyAoG`*y4*(7~mR@JUpYgU-uZgOuHMMux+LdG!Hq`)=$K#9Awp)7{Pcmam(ZFA%g
zcVph^X#*fH%LAh)`m#k%_Ji54(1uhLc9`wXULQpJ6gE~6x^{3~92wj(=KhjW;~*JP
zm`1{e%XWDaQj{|C8kZf^Ktb?i%UVcm#c-BYuM8M2>+v^{Q~s_x)!BV^p#c1MSlEcr
zKVJdEhHqF8=fZ8(aQmM^C*}uWv<Sc<Ji)}W)3p!@Vr5o$+*!K!hu=sM^I3Z4sG@9|
z;`gYUf6UrsP*GE$X))y>7Ut@wZgSH;EfXc9&($CGegCY)nKQg5Ha(?beFHWf4%ycf
zkJcn69nLxAC%6@DXkOS~`)N;k$IA6{LcA8V`Yo4rU#wlGg5jGQ%X!WH{LVlAayBtZ
zql=MyW~HK#b*-x02tbx4vmHIJ5l?r{&>dLoe${$7De6(KnoyiDHFh&&TJWe0F**V$
zfd@y40Zo>jk~bxL<)pj{H#L1!jJSI2ztZdp{<5lLX!X8vsclD8aqEDE`Z%TS5;*T<
z;%D-$04XI;ct7Imv)lo9)$Vtk2jA=@ObWn}U8uw8QaJiu=g4A`QP!ztVTF;GyPWy8
zfdgZFGQ=U>+?PD--Ftd9xDVq=6=j@fm5(=nGseYzxUDVztiUcoYcYv^eSnCQE&&{c
z<N0+4x8!dT2cLW6Jj!F%7SfM3xDWXh-@xn}Vkq*#3>z&@B-m6n^$*d<cUMeiCAXte
zdF@JqJL8tJQsoVsESx{M#R~+Ms4So!h`1)LT{YWCwB4x?CYYSmbi20EUZToa(NQru
zBC9&*Uu?IcqUWu=F*9)Gi7x^=k%gK-$yn2uO)Ks}bDDOlw^nirv5E+2$}E+;7`iA)
zCOgE=+oH+pX#2~a7cI9>#J0=bC2zYI2oa&R194>L#%X1%xdp$@vhli&Z)2Pq7UkQ8
zwy9swEngkuSMJ@JKy>Cm#q?*Xg0^ee#+hrQ&<A3j3dfajmd5TX=9>LA-|8Bx&F2-O
z&pd+_4=%2G%{wMJcuqhJg@ug{9E+?3(tPJVbI@Ps&95)*8?~kHi!KMa5YGz2SNBd{
z>lt67;VKP2Gl3_v76W1`T(K;qggsF{mQVW-)jMo})*)U-)b5VL>qO61y^%2})JTu1
zn)$3H(|Mvl!FMFCyw_^EeQL!9LniC6z=RpUc&n^;N8&F$?s{t!D>Nsi)uN~s;qKNm
z0eflKAs>Hr?&}Z|qn=4R34Dk|9UPFoxLoD0O06IBH&PJt2b5o(MqDV{Gt;#qmX>tr
zQ82+vZS3Xy9eQQ|T;>4FfF`N%7>09{6`m=RMctN0iWy__vNw}$?gN+V9<$Qc-m7oK
zI5z<_SD^kA9W|L&{^e9np_PmtC>aP=@Xm3?ohY=f4v4k0O-qR5qQeACS9)3%j|XzI
zz(uL{_qsaBi3SEh0}8@QtY417U^&MzKz*NS*D$<yHLJgds<(x6xy;odw31SaD8<Nu
zur3}JQLpPs4L{Za9Ej`Q0J9)PG_>t=M-zE!N}er`DkJqGjFbWcyJ24o5K#_R;^wkA
zTD|)Th#3364b1_i@53{$7fd|IB0rlys14WYRLq*(d6D#qE4gq$`-yVZ9|qdj`VLF~
zeD=|o2px$`v1CUBrvr~O+xA$`bn@><VUlfF&VScr$QgWy#z(xV^_2-8_>4tZX7`Sg
z)eeQ8xId;WA`8v!OLRDAIER_E8sPVO3o!K%z8a=3PF?w!D};e&^NICCipGuobZ#D(
zzTunvf6@lmf@AikrpW!macd6wm8SZ*fbnWE-(e>s^rn}9NT2#tN=ox_Z6cz*+VLIj
zL%9)beyH8K20KcW8(^?0MP>+)+U9+u7Hp#VT<n3VFnw+5!vO{<-ws0A@Vo*2a*|kA
zyv`TfNk*<uA$(HG(_0ri%iFMQ@hp#Tzx1rt;lW&dM4Vc;>=E&p;?6{wggdtN%Z<R<
zqfM?v;GNo@gmAwW?IGCu;e8GWNg$Q;#1J{r&hlFkHhnfh>AQS^t|pf*5vUHypvI~H
zev`o6^db$7&E2@x65^<4>MKdl=}rPBp4n$=CuyIKFIo>*r^g6-S9#C;z+lKOi1mxI
z2<LC^fk-E<2EzJwj}_wKMbDg7?R`fbeQ{RJ(7rzB2(SG{kfz9}lNj)mUa@uhnan3)
zB}ryT66HMq#MKMFX^4I`E#=Ni_?MjvyW*j*|88V_#%{ONf1Pxw)?;d<zUf@iGOAq6
z1EFrd3XLHV8aGdS{LNCDVRUVM!1O8r#?I8TKE93M9(Hn1q9$ZvKg1jOmwJqANB9vf
zvUA5^<7P1W0!O9ya!>+$uU)k-;SKsAo+u&N2Ho5s;%E?P6a~^=)#z_i#Vkl|)g_0p
z2y)Yc=I<gdP~(@cg4uEG%Dc>wIpBEkOCN79c6SbWz3-J<ni=V~ts+zFx8}FJ=D2|u
zjuAB)aTC99mJ)luwdCn5v}dRc%eJteBOE7TJyf3H#r0tl2cm6~Hh20VT@|^U+&l#_
z?c7SxIVdZlkIZY%DKwyU<lQRftH*`gQ`+6d?W#y63NWTWAqgxKzSV0Wg^;7akWaar
znFi)r$}lGf<;=dH6LMQWl+QoZZSTpiJ>$pK;Z`@pNiyCLyYVzcqqP5XkRA<WgSt|t
z1k%8|ROs1!VjBVQ4<qgpWA#ADOoSg}V^-RkKXA9`zd|H;6V!qz;N&}@QSPG;yQ*Yx
z+XD4lp7=5PQq6+qVYE+!Kf2%c?xi>A?;tr-G5eUy2d3PFHIWyGz0iZG9fwkJ?}EC4
zQnER+s|ei2`?-jR%*CMP`(_;$#d^BdYZd!R3*81hukPH1q>*5jUCZ8$=pSWvPvU4-
z4YX`5M3Q@@3ls&3zK;B*l}Aj^1vJ018|F8mFJ)aWXqs0H<f6h*7`)Zt@B=+1xSl@g
z!(%%o_wnUUNB+Lt=caoKobZOt2(uUevm+hz-{e3h?Y)?vvA}6NowSsx;Bs*d96v{C
zzVDOsM*u@v=T{2U*Kc%Bs}vI)NLwT}=$`x)?SlO>^Rx^<V?|TfzcF%uocl2|f}X(j
zNqEJ27*ui6D42)s1b_tB4xtHnK49<gTi&V`Y7Lo-8RL17ACq3sFMd#OVtsA1t4%z;
zSnL%#%=~oS3wR`<M<52I0G3#u;x2_f7e1+5HZ}6vgw!pP6wyqr{L>0kA5HR{QoFEs
zDFf^EV28ol);gI*89O3{q8(Ssz?9q`-!e5`;f`!N*&|78y~-bN5f6V$97T@mijXkK
z(OEs;m80NUL!#~af7kwrh_fIyhyCj$uKuC5(83J_Mv=RB*h`(HZwQ;h;^wPWlJNQt
z5@z9h=Z%#`5WwBX@u;J<%yCN>+E?-P{9CqMtDP2LwWk<0`3@aa%q<AXi41SIuf{<)
zwW=FKeHYB<%ktybeXwM9E=lD$T~LZb22$uixP7usYg^mZrWsJOBp65n^V;dp<2o)n
zjbpUXxoicV7uq+$|95A|x901aZE)}6l%?#6A`9N?;?cPJ@qEx(c>0h`^~-v>4yMlV
zJL1aIHbHI^T0RCM9xGacg3bv9KymIa;KcR9RBkvCPjdeg(s1l`{9WGj*$v-*U8hwW
zLL>tcSH{pY`IA>@N!?-?Ial<m{+Pg+XnpDocVW>AK7VK+5bQIi3R#COFeXV4R~wh7
zocVnoMW(&k)dll{a|G&8N$_G?%TN;nX*&4^aQ4St*D^QTD{;!1IxnHTpTn|7jO=f;
zrB?7jKHj8H_%J6+^X1ON%@DVVI}6oBkzmksU&yx&)CmjXWcR;z@!ucU++(KweZxEX
z+?V|sfs6dQ<nQBGZvC4<0akn{Yi0DT^sRvi`-y-ki5pBnhNGM*#n@mOX2)}&SoTDW
z_ATodB@O<cYav4kMc5XvS`z`cpB%((vk&0lBZ!=zKfSciAtHE@HTWQCBOdM^?TXn-
zGZ6gn#pTHW;?+?CI6n{m!esobQzrTi<XLP2?0VP73^Vn6@l*AMZkb%DDqc>9Tkp9F
zlDz7^Q9rxGz8PX6)WiEd!;GfcYfPucUn?%4jpzpZZ{Ep?+bt<$dln}1HYKmola7PI
zs~CaGB15!a-PQev$rgX{g&64weD=Ai-eIFEhwkOFW*La6#XSDE|M7F*aQk?baL3x#
zgtF@9vh{EtY*y)scoS&cf#11`S@DpiF_dxXpbqU!7_$k@yy767TBs>JB9DP(8uH_>
z0@!Q`K-`f152l*P`#KSEmxz<qHFCiku8e<d+A+g_$kxTWEO=X<_#qrd4j0%>^4{g~
z-Ku{QVZqFt-DIIks=T8@*;`7LlIdFmV1xfQo!@X%IR_VL^9G{QU&5McE%aD7g$moW
z4h!ZFRP%tTM0}zeZ_qv{lXIOkUu{#{rjGJ9(gY~8JRU>yJ<8J!waMnxTny-^gyGf%
z0RW;OFuU&Z0dSE%0ne{LktOt300A|~wj;tZ&mH4vDpxDe*#=aunV#G$C$FKf+n*L<
zW^5Mn=g4x+4rV`jYW-V-m$cOwFPZO(+*Oovq%ZU+FSU^rZBNQcCvmsU&b%KN+?t`s
z(-aX`N^XCvj<UzI?$vqSbnqjkVD5~nyREx=)yRBZbouVJs91TPE#Hfs2d8>e0g~>&
z%l^c_ek5^A|DOeKX0m$#QtsF?%+k7lt@Zw@b!;mNG^N;ke?!AYM>EHTX#sX|!MWL_
z0#1oEU7!`dgkXz*5G5%;Q>+Pf-0<j%EUzb<`v)QakDJL~O5!(>@i&%_8=rJF?H$tQ
z<tPr75XOWOvGjsT(|dMOfqFOb=HC%ib09e*zKi4O%(UHVd4}iYw^I8Oso}-w24lmp
z@G72^nnMcAdavz0n~G2k56>O8txsx6%r>o>ej;mz+CkM^ONP*gIf#)U44;(B|L3ik
z{IR<8@lB)EcKtK3tOO;)C&Uy==a6%>jI?4KKk30|Uj46@ndDL;H9@A=z#c3n)gRx#
z>T?t-M&0W%y=q@2SKliKAYb}2xifBjuh4D?&h9prQ?7Bo#(vkp(upj){{QO+J;Wb2
zF3AgeSsGnT?l49O)*ZDnZH6AmULrhJiL5ugLQMLgDsC-X)jpqZaz&ZHIZubA@%g*W
ztFNJ9H76)B%MKX_3U_KgZLzq2AF$@TG{^IF(jl#!Cd`#N$<h9X+kfcr|MS`biZh7R
zx%w`aD-)ToxVa<sa81<1NR9qijHfAqxtw8xZcJ3t{-58#?NC5NpVxS^=gYmwuNuN5
z?|7dnWyu+Z({l{NikakBuXYwIUM>x^2G;OXSsOfl6a!X~j%vF$VfPAA<x){$H^5!d
zC&iXT&;yp<|0dELkEX9b{flk-P*S(@{UWsd$=YLMW^roAtF54_RFFB5*gfemvkxot
zwc%X0&ddJj;;ueYRCuyA|CsW|J0G(OgJ|wv6xwJM95Xh|m~^?>O5a)TQKxeX+%H$g
zamSOH207MO+OM`Zo6xDPmw^x|kd!0C!mS%m7pigQvm54dLDR**UM034t&ohgtpuy@
zvA$(_RS7^%nhKn0U0@(vR#v8<Pj=$^(|>k+@ihEQ7Wx9%3oDKwM-ShYF=o65_ZP%+
z^=-ay0ttE7h?kO)_8swV=N=eEhFyTOtTSdq7xP~Vuf`aQ;0twXUROJeNHTGT5>bEi
z0_`u#%@-Gj6=&-C{speW>pyT0ojoc-{|fUkybJa_-P<qJg$;P~P3)GJreh-`85<m@
zuE;ub4hFu?%|aP&j7oW{=mKMylx@T1=Bf}n_ccxfa^cXq+}^KyM5tjACNo0RlYc@9
zwErvt<K@Znpt~d(q+BShu?u;ZAOFqn<cV*R$7j}tM=l?WdWnFpy<OZ>MDGmu`a^24
zji0y}_IojLbWM=Gk5A&dCIVU!$yS2y_0l!>Ll>a>Q~PD&Q?3?u575i@u<;W}-Ey1v
zU`{0a8cml{D-JRqn5P|5;y-zZxppTddC%`Pb##-5S1mLn!WIoZd|sjs=RE}ni`7TD
zqW%}%Irqu}L2Zz*A(GN-Um8>-YSZR|b~dO<K`E{5c}7m?Tj+uKi>?Q;{_W?QT2yW$
z*!0Ee<?klXZ(O`@Z)W4mxt5q9RhuRC8og+vNLsUg=NGJCNIySnR$^U_za}rSNb!bU
zrKSTgRhx7%bi5wdWd}kFd%6?XX^(yI^e>t5>nR{c(=ohdr^NWB$^E}?MbF37%UWgc
zZJs9z(=}TD=wHIkR^>$M`;L_%e}G_TLGdEH`?((8{J&d%_SSlJcb`E|to;Onh1Wt>
zFG<Fju4p_pl&GOHx{h1m%A4}U-p?tjZb5vNwlK$K7H!qq)5DUgQ)C1=Hu8~nIU^VV
zPJMH$VS+4sCAFQG;iU)L>-oWMF2Sy0If$^^i~SYb>>(HTD2v)~8JsBiC%>>^_YwC)
zj{jwEbxPy!Tc-yi61a@QSK|7#K(R;#PonlwxalbpdD?rjyrJ-MlH-NS1T$v%kWaGm
zBw~N~{iJt$3T-PxCsya_Q<($i57)uG+!cJp<y#;BlIO1hl~II(BBsCV_4vW}C;WO?
zK@~MaiPTD#6aJRJOKl2~AN?z0DHLPt7&yA6lLTJNNC`q6PMnnmtW&GjCyQYb7H;qN
zg%)$l3L^E{M5gI&GlY}1L8yx%KP>iIt3A`^`?;k@Nh>zlSxoJH1N`#iLm=+Kc!*h?
zao6`#p5>r4nVZI5cH#1;r?_*ApE*pACu959d^@oVKfZxM@x|IiVvFRVecJ^0&gT3L
zoTU2Bd}q~}Rd;3~)ofCO%|bGj-i={lD}#TFkVOU(Ec|?8xHcg9zVKq#gEoV!E~{6p
z6EV+&Z#ydVeaO2rPV1l^Z_!kgug`XtZup_$9sM}eWc6Vv8>7-~-p`>H946U;=%Bl*
zk7|7vyn-wyY9NV;RDR09KtW6W`-2{+p^LJj>JKx#95AY5_Xy9+u8%YvWjO&fp~uB$
zNCXH+riv~!Myv_<9BBNr{$f(2U8|dgMwe2`pR>jk{orN>lJ%YE`IjzW2cFCcK$6C_
zm%J$f)q~}gmcqzNWn5MhWtR+We4oVC8r2V}iIJ(B;_(2akmN@aw`7GZp;cy{<Uk$c
z_<R?e#F*8xj+9stgI6#UM0bAZ?l&%7HMlCIG~tOC_T6cgzgBZV>9v^Zy)Y!(`F6zY
ze~TZyewuqqCR^=*eKJxE02vSO2v@Q?&e_#S&4$9*UuHSpJl8=@UsSA99ykB+w%Tp8
zQgVDjy&c>8!;F{1J^aboN0)FfFx%tNpNpNRtiChetFgI}42<IB;iQ4+f897@KJx2|
zpwDY7O_xrPi0gwJ7E`m8i6f{TCa}Ex!S;MNzkD+W<iQk%65Bq%x3HerRL52$MBHcq
zS#D-g$a<{Kto$S~#|GsPU*n?ug~wlK?chsCc@0;Dc8wM;MOell;pH4|J|QhP-8|n&
zd5>#Rgil;{o4>cby?t7cPkMZ#uCI*GQREJB&nJh6@3{ArQYEDhZ3IZnf`V3E@=cD-
zgo+n|VQxM-J;@d4$Uo*?p@`ewt7;nSEB8*Q{LiA3COnAVZ5+O~-NHW*XSn(9B0&Z%
zvht39c%VL)dS&aw)SffBt`(};()iHIi8*+tk~Kh3)JYiQbhBQ|(CECn>80ku*0r-+
zUhT;zOay3;p}%m?_%e>$$pGjLP7uxIM1`RpP44;+%v}hJfjEh{?VoGybQ%6ITahXl
z^g>REKLT)Gd5hO2&tOc*s@GPV^&!kfN#jQ5Z6F-*UL!7`OCi_3^J)AlV|w`>Eh=6C
z*^kKh*8uYo7rqcNE`9*mt+C4q0cFd>3V=vG-$CL%UxlbyAo4xhB(oP1sFKqhfMuAl
zoj~I{|Ha;^Mu}Z14-Bd)@iXtNjG1SyT<N;$a(%-w_VN>Bznm9s<T=i=+%dC?8$7|t
zt>AZdGn}*oK_fSpdGFYaRLLIqj-mJW6SKmR-}px&$8<)V)OLl`kA^;*COXs8^q0I}
zE3ZUm@pMwg-FSM^C@qlO>=wnN1_LUe<Xs>64YhVJ<yD(-By?3ST={Mgimw2aeUIzL
zJ;J1qDZ>9+gU?%Ps{Hx3#n?&9gUW$*RfqJ1zvEvo?j)oU4-OU6;1D6N$9-9mtK?I8
zobb4l_5Ge?aIU{Rweun`t>m5csmEjIos+hE<nrNqPx6h*%R{X5T25s#JzB`@_Kh|3
z0i%163gnPMS&qvnHyD|(k{zqw9vhhtI~4kE1}X=&)_J%g{<@mzxBBjbuiB#1r!FIV
z<_p{|AwT$z(W%dbacWqTc7`_WLoAmr@b1Sd=Ez)A7%q1S|Fge{*Z)+piF8GN=kJ}}
z@b~n(%Q(7R$^^1RBcor;u|3oe-iB>__)+UqqG#H8UlWv`osz-@2!T;76>IXB-st%$
z>Q3xAw!YmTpyUX&xnZA;tb4)L#@s#DuL<EIX}&SGl;>Q<6*zr=Oz1i(vRO@kj3buh
z#P!R^W8e$7ly<SWTm^5@qlTHEGq=GM=fri!+?7~jdRoStisY}2drm&&?iYI7mj1At
z5eJQ$jH_rW4Hy^y7`!B4v27(jU&wM(lz+_1?a&spSTQU;w<07#mgn19vEB1Z8T$<E
zX+H*6`Dww8x*s^{aFNo`uAF5C1+x42BmX)C%$*lm<vp5h!c!#EEkN?<>nG+7-EW?%
ze|{e0HSANT_S53Z3hd6l@V5Y?(jhOQOQ22X$<ZDzl@_kZ!P$H3%F1x~9P-20_12oC
z-p9h)#M%O+Z{6@buT?}tGW>iP&?{ok{By~7@tSXLm5is$5T>33-1vzT^^stW3_py<
zbN0D(D2@-&ueYtD?H7mipZ)c=UAM8x#eR!+vm00KO+G-vAzjaG`td%+{fN%k4jLX9
z+N`eb$}eX%-Cr+O`7_hV;p8?WxfYHgcep~jBl3Aaky~)%+w-lm3B_R4!f*!@##{D<
z|7ZiKRXBY~`qWZIxByQorJM<Oq3R7;4jR^gcXKrX3FAaWRDWM1Hkk;Cs(mukbEW?&
z6n8c$`C9f=-Lgi*829|f%Z3RM(bEUF<d2CrkQgb-Uv^I@x3xi{I@X-RwNCEN&D{J;
zpLJZjf8@My>k3zhg3Ri*Wxn=@ugO(=Sw|mS;Gej>Qn^~I6Yy24wES6Uh5lNBL;3k|
zHeszm>m&w<slLSlSBXGnD9qM|vJl?0e$MyM(V$Aw1XLk;`uU3aBi@#aYXb2i{nE<y
zJ_FP7X>5jFu>#`~{q;T;mT5(Q+H=dap;_AMO$NSw{MQ|Mbz>D#U=nU3&hYa;7GK1I
z-y((AI=og{6}8I_Bj3>c&Y*rENYR?}e9UXOGBr^_i{r{HB-M;{Mne}FIS^O$DHHsm
z)w-}ytd(8!Lt~WL$BT%5`q-X#nm%p!bA4hC9~fzs#A}V9w6cF;%7-VL#7c=3(r?Jc
zpKG9+JNnGtcMY8nY#k(WSNvE8sjHpBl&l7~e(QG>q?rk{I0iP{KNJeFl^eJr5{+L_
zLn?S@)xu`gN$ZhrC1uVrp2bPK1JcJ8q=kwtIexN`q-`(D97$+-%hLH_*$Z$_Un*sN
z$KEFv_j!4vyKmZgRXY2k%92z%t!L(KvhNh?bJo@3&o1|o{Q9z5;dt<er*K2xbJE)V
zY9JJ}I_Mp+!}c0Z;j2*?VFCH<ChskbzU~qfBKtoLHxNtF6%xQz^X0+tCqC+Kd+wf9
z9)tRraHz5KUAFep^H(zNObLH$&||K7D9fI_73HM=zF1kka>qwF<=kwwxknw!GP08K
z__NiLR9zN7dbF85K0e?0hJU^>rE;?SidVgvK~`|G$CTI4hd6^f?u9UVGROAreg=KH
z!Vo<HBpGn+RzPz28u#grI2xog9s^E=$s?QLox_Qq0~VW^eIjz11ql};kksuh=Es@=
z3?pHg%Bx#!Uk>^@?(nB?yf?d}P#%cKdN(5<|30*@t52z2S-CI6%HBS$5Q*h5Ha%xI
zTHlL2xNK-%Q@+FrE3?lvV^DdbCJ()aEV1J^lI7;L&&_xr(aQ5wQd9n?TjH|?!Mw4o
zm`-gK(OKmYYm)H29;8NH=2Li5I|Ty?#=Yb{g+>!1v{Q9V(3Adc{NE|>f9{HpZb_b$
zLmVIGAG5ECW*)1$6zC^$Z9~S3IEJ%4OIh@aCu**vL)cq=3>ZGM)+|)=!Qnw``c#iO
zzvdJH!G=e?Xc1z#B{n7hBqH2yx7Cys+Vbg~cG2-{&ovlM0C`WxNQ+fL!bAG62raD%
zui0vvH>aSi*k1ico<m;MEwxOu)gArc`45@rSxn|Y<cofn+3SYUdbM~Ka+j3I@&VU+
zr}M1(y9~;Eo<bi%Dy9T)1>X$ZlqoxQsBTv7_EhEVG~QAs`$&d7#aTy#w{J|6sj|Z(
zlR}9n){ef+WXuAoJGbY!E$fIhk>QpiCX7}h3zzVi0>0Z9j)j*p#y#w;{XTADyIOsx
zh8badS(+(xMSK(KaYsi>hoMk?OwwF1;oMwXn{P+mPSw=6_Y~BZ<Qn-RKSyklo<5iA
zFAkBCxt<@XU(zo{{p`gBYN^NUx))ncck?dCMtMZLjywtqVN-By>fOB^D%fq6=tQ>T
z@uZq*G-}0IW}!>A)0nz_qwb)>D9^2Mzn@&QW*pwL;h8gRvy8-yd)v|Gi*7;l)!S{1
z6PxP2Ek2fg`)uD!snxc>2W=y${xl-k)4pl5gB;>TSJ8gKPWL;PC#-R}sXAP(MeWhB
z(Nq)qBw-Fg7~lxV#xF70CQ&!g+(qQdjuqL7%2&IYUa`ia-?mUR9`v+8(optvEtrI-
z@ir-sXYB1#7CEghpKMEP+E?i7!x+!qfhXJ5EIu_-58KL;;v7Pe!?t*HIEvRZ$P(Q8
zQc(kU23ba4E>?T>MT;5NPCO|h_ol8FLT+?i-K&wefqKieXfIG3P9t0#57Xa;h^W8$
zVI*<!^bKnLiS|flO6iMgt<^}IEsGl;yB<_ke+&3Akzw+~sFVH{JD-27y@$rhn(B+0
zn$d2IOctc4dSI8lQt72pB|+?ojP&1|*}axS@LM>CThHstzwp{Jr8Hb_v6$B<bM&Ya
zX&<b>eOQjS<VjllGE!p{F36Xb6uy@p;=-u1o%f_>PSEFu+e3MR40S?r31ijv;Xa&Z
zL!+|!dJnH&hi}%s7ga9Guckxj-kE1vy_+hei;?VkuNW+qRz%)^?-F)a#(Jk%)Zy}s
z;(=~Gf3gib2aEmZ{P*0xxfawe?v35{6EY>33Ufc9EL#6PcRl>VHBQLHmv2~m#?N+&
zoXc0y+;8N=eG_iDOBSv<$Sv#YtD2nNn8PNUelJKte-A%eV7B+|L@jIYo<=vcQHAcr
z5jLn-kMQmuz6-c72kvMRTE7`@mUn3s&>=5@PA}V$V)7VK2?bjzO*;`cyKIc=d>X%8
zk4PO2%sa36JBl;2ps9DHb*=1P0maf>>RJYSK#-b-Uoo>$fxg2?to6HMCq;pBdmd>-
zbGbqJ!RKPe7$^q2o>XoT0up(0k-YI~!<GCu;Yk5l7R~2N9|ffd=U-kw8~JnJK5WzR
z?#l=-xyC!UPJIZAJiDg&7O%|St$LvE^&v}<Ik2XJhN;NBPm`(pmMzJ&gS+oDdaAh8
ztvps+np^M&O#U?{Q%TFQtCis_=}NeMdsl-y=L~~S8C_epDUvUck*=|ZHFK`>U)0=m
z{_~mjfM=%1&C4{6b6(GSDc9W{O<VYuy#J2e;!}YIo)}1f)S}e4TSil!l+>*7sa*BD
z91;v%3W5V$ulup$uxyBO4p4G@p>Wf5u7Gehg@!LhqNhHj|M;o6eAU~X)P<$fc%|cZ
zqsj=TS6RI}`}4(z>->99(cjeD>k6VNno?8LG7y~WJ8u9H_vOKEF=XAHmV4)g_tD<m
z$pa_hwLlWvy7%?36@0qs_G%2{(hI;5M!H{Sq?|`G{Mq<a_%p-0%xha)HJ_E6D~j{@
z4rg*jdEJ@vDo!IJYdE8(5mb?Am4>Zw_J`X_OgG_YBrd*^bM)nx^?Gz!;$ousw1ZlZ
z79svpt&rWq>}Jc!b@$yze7Xze!i|^Pf+En7i<%)><c6D!XZ53#XssbnveOLH>nL^7
zcjXyTjI{`+Nc0QG679fY5zHicu_;BtE#;F59CFtJ-{;@vOxH!YRY@^?%#q>Ax)pi)
zc_lXg@$zIx9AW3va?tzLwP*c7Z!PpzJ)~?3N_eP)D#s&-&s|bxrbMC!yt5I(UmA$F
z6bTX8A7G4?`{0%^B1rK<@Ti$Ome%|M%;kJ3x#Ejn@$6eXyjvoL@hk@X7(7MBOwwM4
z>>+hRa!rfEPy~JfvD%E&EIwd<?MHy@>!AnY(MRhG6H}}QemCy!ncRmWUX>0+IB(xe
z+OkTqaX0BT)k0C*j!4^-XJzBZ^z4e}pgYnUcEyErHNJ5VVoEq6sjU-ZF&>YHk|~8X
zbxjjnlLeR9;qQ{ny%WGL^#8D!uRnSLHX-UlJn#Az4{gFi;NX5OgJHs_e(CuSbadf%
zU(dIcmRyDLNUsN)U&bCdu44jdVmxQP8J@OI{McfD)J2ZSW`JSad<Xi|TiHTLTH8kY
z&vkw%N6_D6EOQ{xmKhEdVJ=O11>q@PMb)wQtyEDOy=Ag_rtJLsc4&OEZGHc(OP3;~
z%4Qnb8{W%T3d+zdTd_sEUO<Y(=yd;B8@Qj$7n_59|5grbInWt)If&(aJbPl+&+>7L
zdY33=#{h#E{UyavUgx+!b_SjvZ7Y^3$K-s)p30_^ec<PQu9BaE|GxX1ExDoR#5-@~
z5g1d#VJ?L`(%;qe9~9YKfj8A1ZJ`};+DHBlWBV5;_V+|aZ%N>d%t>}Ec6|;vZ0o3l
z@4=RB+Np29LhFR@iy(7y#{(ffdZnA($}<iNv(C{D5Lq)=A(#Js{`l^a$!P~=&ufK7
zOLIY?&`_75rvZY?``ROB<;{GN=$E7zvAiFH+_1O!E2kwc-u${X#<(!~<g|q2sYtXu
z>%LVAxm)>Hk=a0Z*URa*J*ij%M4YwhQY|Rcvc}R?8<ae2wTC~OhH9FBuI<mZ9VkCj
zc!d#(57mbloUI`Z*`E*jm6ku6IQ}u0Ch3jpuJu9rc7tiGDvW8#N@hXf7UIW*_@g1P
z%#*RJfrFR!7<{XO-YvPlcTBUZqUMTrRg&Esab7t+j5=r%tf@h_%?6QD#}%tQP0YcX
zj8)7i3_40dwOdL@C&*n7`{wS&I=>qHNm|2RH4qn@lKf?~hkDjw>waVj&+-PfdC^dX
z)t*Dg$iNvDw#7euyf0Pq2Vig9j8ea{r6}x+&j*{!FB^F14lRL>Fn6@ei`wS(9_AT8
zVEJ-{N4Puvh&}2uBG4Yu9KD2=+cBmfgc=9#I|;v5zAXV>1jTbHhSi=4TsN&ahmrez
zU0>DjX4BaeBZn`hR}c1Q=TR1I^a^307$p(b``&(`jKz$A4g8w^QO-@%&b}M#+80kt
zygiL^cgc7odFk}mb5evXUeCKa+95A}xY`>RA73sszUf6Hb9qZo_tVThspNb1ae*j@
z%X3LnzjqVZ>Pwf51pJ}jA$s5pV_a-bZtjAI249>x+f(OG`Fd#^E^Wf=7KgJvaHh|k
zF%e5JWgl*ToimQYJC7ol16p9~dl^<8>A5x>O*7l6+wb2(?9YBBuH(c-MT4mi&{MPy
zH6QQ24@El7IUrBlx<@@bbfxAjx692Q&Cwpbm#a><rD*F@o)S~?0)M#z+(5@8bOXb6
zzaZT<yx126`~g#?ff1R<Irx^y2;XZqH^%4Kn5zTVx)HFN&!Lyl3GD8v)xuADVl?_P
zFdEIQ(5ISpG$RFDzRH^$`zEXdy$8sV&-o}rU4C~Ow}Jkt;25mkh+6v{4K3W`nLB1e
z(p<RQM%n|uP&=?;|6h!KbzGF&_PzlEqNtS8QUX%a4Uz*6Ap+73(%pkF(hY)2cO%`+
z5YnAPBi-E$48IpW_nvd^x!?Qw{mmcDyZ2seJ?nX%wfDmUsA71r(Z=I*dUVg{VxF6|
zJgmbh=$?%?tIUe~C-fMSLHY(Y%P5lM^cagh8>LT3H=-5Mq}k+83(>%$j%b-lQv__@
zqtDO5Q&n~0{uPYYKT55rn%(Fq@Kfvky6fR7lhS1+s{ViA4wIIm2F{&@1l<vvbwZ;#
z^;?lEEG{XsuG*oIW^IZChr1~E=SSX!p2XRyKwgCf3@=O92)|5o4>)$c{`{@PeYV{U
zddm0ny4nwpj0Qu|3a<k35m$_s^;ZqW+hIaK!miO6FA;Lj-W`0;V?^9hXI@neI-YV$
zv6Oq*1)s{uPNK12SMll!30vPKn^Fmgt>G0<%_J0E7#mewptG~kOG~731o!frh0tmT
zT8{OP20Ol3ze=yqQ#?fJGTX2?)(9!ztklUW!7pw7KeEEYTNHBFn^h&aPvfeTJ!41G
z@R*Oi=mmkK-iyg{9ULj{2{DJI^bd7n^xIYI=ELD{;dJ;so!`ne$fJ#i#E~ypDJE(8
zD%P`kelH)D+xkV08HV~)S_tn`JwKwY?@MpAzk|9;u2){|bUWd~t@`ylr9Dnefw#(u
z%fEer7(+~vWa8|bE-%~P5dtw=0oeXa1dq_QkaIL_9})|%I4qIyxfu0c=qWTP4r)s8
zm$Gm<rJ}jVQ=!$TFV-@~cGjwaQK2}R-1lZm!7sKe#H3PUXYyEGUeinnEk997{jFYq
zr6c7_C;0i{Nce~>O@PJ0cxEHSbmV>1A{|1l=f(dKwf>?{ytjmx3ZEO$#&0R5IQBc7
ziEIrtLaK*v(?q<D=nkY!cQ76;bH*sI$iKflpKe<7<a;8!;YmN?b!GDQeDWo3xyhWw
zX?rK_h_j9D<f`+SgH{2pCf2^BNvQGEfi0z@=qOu4gHFUY5R`c9V4e-@vP0tzbX{^*
z)FgGUz(X!op4yMI?ch0tSsgBgh|2Q%s@8|iueM`?9uW_zorA$(8dCbE3(4bjergFS
zJ2ic+Lz-vn^yrRNNO|##?!RWB|N1RJZh1%@hOOFe-1UMbp6(!UqcfmhWr?a%F8e?M
zqf;yJgjx>|CdR+b5V=XjC=2S7aD5~y5SEgB_z3Tczx-M|V>Ies2_AsZDco{C({c(<
zwRcU39scMu8ovOd)Y}t4wdt_G0xmxQZ*`CYNm9hOxl;?z^i;!-`A2BS+*+6H(td(3
z6_NP)_bL7GFVlkdBtRtdiu0fH{QBP#4Ss4-QIsR>eJN)_ZXc&8jS&gVSG(r1KZ&Px
zl*KRJk;~^zm3e(D4KSFBf%cDy1FaD8O(MQBL}41_JwM67#htycQKqxQ_(Bf-PneBm
z1E6dHph|i_@cB1rNRSSP?Mt^41sG?hhd7$9*+2j4oqmz4zzy=OB|FkuvU(Np73Qq~
zcjH;Dn%;a;5E^szz>xKi-x2=xs_7QJ366N@)9X+9e$UZGxPNcQtF;AX<r?xO=6q!<
z@UXb`Gx@ydf0l^<dxQK%q;#{;Y4ZKW$mXP)JLi_WM33vDa5!QEREAyKv30@n`Q6_(
zyPN2$>*AS#C%kG7C1D`!YRk%>H_<1l{gNsowO=SC@X)F>b<Bhlws&70?HB$9`o^Ou
z@&WN3ip;sd$LB=1I)ARELB;>wg8bLDAt6+uVg2q{?Tsy&6A3GOZ<1XuJ^WA>n+dcq
zArFrYp*kz^khCDjE#7&`$Zo+ZliQQQ=(j8g9!!incBRrV*u9C4&%+{^eK);AIx`-2
z@0VIN71d2Dyw!#vpz#`C#Qc@uZ;npz>vWT(?KPLDEN%f(`hUs&KY-NV1oXH2BNy0L
zF_KjF4|wsF{hXitBadknJa|KuvP99@Bi5z-G7g0~N`f2DA?86<P1{S0(JMVhnlH(R
zV9>dlK-Rvyl-Ck{K4x!*jklVpnonwCj=M%Is(`*Mx;Z)fAG=GCHwTUQRv{~|q18_c
z)OT`1U~{RR5MatTTx)YP`;8yvyS2G8pL(=T?If4oMK~7!1%a8YzkM$lKoT-atJRr~
zA#&$A0k~g;Rm%Go{>|?Wd<o(CBmc%wL2>A`DZeEd7q3!L%^Tm>LsY0_<kygv5MsoK
z{D2hV%t+|f`@QUTi%jh$lWDMzHGHl<4?v`$sQaCIR}CoWKN~RkwW`Ae5`ptqcEb=H
zMLqF<gCtzwk|d71+`9glAPyupbkD~a1-mPfV83^R_rd_YjVB%Zoa&Q-*yZ;>SOab0
zj<<h8IVrAlur)TL+HE}g`7UKt<C>NkIWu*Jp<Z{Pq5OO*Ph(0=r7bw!6Yfzgx&uy)
zueE_J%jYoN;VrS!m163mQit9(`%ixy$}cpzaq<(ZJ%o+wvR5o)-`qR|LZ72I+y1-&
z;jJ@MK9)xkKKY^X!;0$f!CE8&#o~T>QZwLWh(ek8M1yCw8JXX9VhaD%!1(!gT~Ujq
z6+~WUQ|wE=24(@%{!N7a8y;M0=w22G&PO7dN1m(o<1ECD630+LaTv#%HScCoFnvLF
zV%ne9k4TAR2+oR^CXZw$RKycX)s7Ma%c!w&Md*Z}jN0+^zhgiB$fFl~(CUgMVqDc!
z@TTB2L*#&tVZu8E#8f20rN+4>)EUVLtS#mr38=YiZa_f*<n<SZ=8fOGvh(K}^>_C)
zwn0(3vqHUxHELCpVQC){_T7h@WUCy70u}_?2ibl$wazYPt0x)J(?6oF4NFObq9=N2
z#T(OsJeWgh#Z1yH<|1h17dONfKTsxg?Q&POM#8wCC(wR3Zwp|%dN#5Nd7NQ(X(Dme
zRaBmV<E92t2#BdDxG!T-U&YP;DY4>%V)QCyI@u91O7SM@gNOl(@!;M#PW|i7+&wM+
zz?W}aA#C5ffCs{tn=^_Ff36LeSrLS4Rr${1t3#^a`>HkEQ;u@}8+>q=-5ZOS*&v)t
zO>_<F6upk5gGSZfGftgf8nN{mwZ)*R3XO7;kfUsB&&VR0t{xD0VPiap&*(@%7=qqo
zuNMyMyzqR@;82PKKC)(4;9y?8Togbf=Lh1CIt%fRJR@&P(I<p)^{vfLZQf6%iLrB;
zytz|DT)_qpMmZoJ-~Udw=qR1qglSBA7ZKm^FPV)m34y)`U{*w^sv6=b4Y4vdaQXE`
z*Nk&SOjH>)Rt5Irb2!p1)>*3REz2SaUCjEN=d1ZY1#S0cn`MI(5RdEh?;1mzC7A`;
zZxv>d75LhIwG{FX&DE+>@9xpZ(*f0@&E_T;51r(j@rMfLGn^JZ)htII)K3<NT>iLM
zrnR57xxDF+FD|ach;?ebtSRV;%?8tgrI1$vJ6fDVn2}q)ozYvxy&{~nnXGD5`Cfwg
zWHP<@v*3VTa)}FEkl18=XYNE1^P+BbK(AYW&>HfrWxIR@LBh@9jF;tzx~ee0f&B=8
z$>gH*28H*_T?<<J#c7+l_Tom^$H$QEkI&;QStSx2;W_J;ExJ-Nvet&NdrJnI{HM`7
zs4{rw^|D#a_o+Np3Y1Egn8kbAhVk`tjMx$0uI`Gq^Oz_(-oIluJ>K&Ue}y5Jp!PLC
zXGMJbaKC2ja62rpB+c?Gr$d^-DVff;0^Vf<u+UhI0NFC6or(3AWmm$=NFRM@<x~%y
z+MtoY5cAlN4TsGhqFD^q`Nr2fXOBk-I`>4>6Sfk)t!WE>;GRnGwBB7lFD;6!{!+6z
z^MQKz{j2rd(=<@-+&uQ8oAuRuo%VJ42ZB~%FE}f!?^I%}-xffdr)%9=ZSV|7QjTY4
z3b>&>{RoguY-_`l(=ktZ2c33^A##;Er!Umqi8M49{toV{LDox!)L!~ACp@Gq(dZ)=
zKPd7d!BzSLU)y7-_^a&#R!OG}HTjnf?mJG9FwRegeNoZ7UUzUYhfo=-Z7h$m#oDR&
zMcvWM@p>%qyIkB5vhev|3GHwEEUTYLI82Lq+9))o`1=D?Tt>4Dn**-beS}lf`9w!>
z34;Q(r&F==rEYicA6%W2e&6;z?PAgXS|CiIRw%&?b$I_Ywd^~o17rK3&4<^yu2mNn
z9%jzCZtZ24xEAI^_HB2qcHNiG4=~p62%x2mUoGeEnOYoA4uH8Ye10DJp6EVEsz`O`
z;M^9S0w-`gRFT#?jkO#Py{cobOxek4yh8tH;%s)CihpfpLuhHnCzET~@Q4~ZSG#QZ
z<lOA>&a-t#H;SeN%=$2g1SMB0n@r6h6@O}04h@7&gmV~<*$CsdD8km{2k=H0UME=r
zKe;22Gy{(^Zo;wPhLih`WAY8lu=V04dv(pAlY?TE+0#dHgSFjXVPb<Tkg_2_=E~1w
zdBkfPA~}PHfDoJ$(K=Cf&JDFtMS<pbw#EE%2^^F_M;&tm$GH+{%e!L-mGo7n@=M(`
z>6k~v-dVUxXtMePhuE<npEMAvk7jF!zNxcbChQ|cmtFj42-#!gVct~p-tuo{+bK&{
zo23X9R$-)CxMzTdT~t@5{y^~v`y^>Dw+w3h^I%ZLL^rsyA_86SN%~-3&?fHwbhk=h
zh`)W$^4L1!_?mZfO8)x|kpWa`;Nz>Y0FFiy`Zv<|EAQ8DNI3n=sh=t9F>sSz{m-zI
zl0dAJ7Czhict;HzxDw@XKJ)dqvR?P<+I5$(cMSrpRrhH?5;nG3-!gS&5yUm_atnKg
z%n+>TVHHf1M*?Us<0>sd;-5xl9>B$!A&)L9QN^#Y<-VopxvDl+P_EXm@fmdMH;+;S
zsQg7tU8)|gs$GxW($iF9P4a^+*eC4UBv~DoKBcjtIio?;@(!J%9`D^7%P^Zue*Vfd
z<)!_qvqLoQZQSBl@2H9{n7eY4hUJmpH)Gpg0?|Y3QLa(^%~bImtbj6%P=QNV1no=L
z;uk*#yMo^nQIBvGM~UY3L%3DV%EJ~7lXQo9)(BvS8P^FiI166CvkuTnEb;!Xq<?My
z-z~m9u-Dz-QP@<csmx9xO4FaoCTA{YI5!hpuTjtEfF2fgE}wu91=DxnpCjGPG2gEN
zl;dP(M%ekX6{$E{*iovD8!2fQvqbA5?z&k9(ef!f;U?xLLa1<?EX5rat&CM*CYv%w
zX6m3a`MBhL7$v7JWBS7*;%r5e?X}5sd_~n^j;PAyT{Fu%9hocQmm8JSKJ?mrew52A
zh*-`CzW!J%zfRPb!2NEI1{3VPZET`A4bj^$25esocUL!Ihr;*Fkz%76_?l|xW6Vmr
z=l|l6SMNa53uV@P1NTA<d*|$NAm1gykt&M?UN7IV-3FhivGxVn6%{;m3MqM5V`-n*
z9l$OJtfgeLI}ABjWD@SLg!G+aj^y~LU)?5R|BJZX0RxmbipOtk^&hFIB$JS)BQ7|k
zneC0x40rKx^mmtua2QeCAXnZp!Lg3LG=gV3EHeaI*I@r<xXQUoP)BXm?|o#-dR_Y}
zXynK<!NPjDAuSDZ{`3)<sIvFPdPG$@8L6GnOQ)hNf{XyHTey0jiC)hWzyBDtYf+1<
z_I=XNvAwDk&r>xM)hBTkt5})Xvd1yyu07ea@;e5<1kypv{c4TKa8_U?gft*pf$9S;
z<Jw9hjt$3lfKFuo)s7cBo>Y4?Ip#x8IH05asxP2)UE!%D+b-BmzZ!7=E(2+v1oW*_
z#iiW?|7A#y1!wpVJBGlD5X1Y2*5Nh9BQ&$d_P>BVH5~B{SRUd3vOK1KC3-T&(261M
z0QS4|8Bg;v;T~oe5}@GH*a8NB3nB8H0lUZ89|%|1XhW*Veqo_F#b9l!r)c+nk{C-A
zM-<4>y<+zkRzj{=y-sKtKYx7DM+_p7;nA52bD#LiP7G3pRail}G#(Q5m;i=5744w0
z6ZZ#N+aM5_=YAwLv@*H)irbVkGA*Esd$-V4-jGc;o~3KsmPBlw5aCX^`F%hvDEHB$
z<g9!Gys?pc!IzA)cElw8yP%xoZsw&1VA#;i<x%7&;^=|1b+cf<duZdYzWXFp%RkBf
zD{SK;r&xlX>FEx4=U0fV9xQ8&=SL|iqvliWJ;grT%+p@6Ax&i4p%2O=bEJ{L^tqcG
z{5nMr=#hLV6W4Qn27WUaH+qVO-#@y2KwkN3fD?3yR}zyo7PSWSIw|_L4gqKY1>Jfn
zZmS~%Y4iO#X)foAEpt~(!`uWb`o+(b(b2VMCwfKo1P%|6v(46j{ES8;sm-%$#Qhh_
zN<H%ZV6So9JggPMpSu;({&VbP-Hv3W+t}1;alvp(<J3{*9Gp7l)s$;#Uv6r+^>VnI
zNl@%?=21#o20orrIrnth=;FZ>Xv{Cf<ujG%s!z1M+p4Ac7_DnARbXase6=2a`Y^8)
zs%`guBZXXp*m$_#)vUN$8>{KxoP{iJm$p(v#yjK-`i*gut<w<<7Ad$-SJ7OQIW_({
zQSPk}RI?Dxh(-+vt=>!+I+qNajIhjVp=B7#_Tf_m>+ZxGr~h3A1&H62xV%eR;d$!S
zjgshK2H*JG@?A4VkYs^aAT^Uo73bXdq$~?w&}~G)YL*mJy^m3w{X+F|>fx((WUq&D
zkVk%F<IA?UPfna!&Mxtx7cD;HQ=6KZm&d7vgYial2CcEI=8UBl>iHzfxriHNHNa!)
zki$I`Fs4}+rVaFr%6v|CLS}P~ym3<+ZJbv%4=Q!du=<1g|6Gk19on&$oCHri?H?#f
zP=opTLaq{rTn4|6nI;04x**@hoFF3d-+HqrtlDN$$vW~C&&?SJh?}Z=PjN-oJbv#j
zBy+nr1GBj4Hzfcl7PcfegfEiyKLrf(<Ilk|5-6`oD4#4u0kBrlTmk*epfLQs%@B5m
z<GFe=SnYJ4ruRx_jAM}kW6pv8Gl=5s;ECb=bv<^?y@iDoz3pTCDqoOINmrufPNnpD
zx2#*yjS`L<{_#c%|G7V!AXGr6K%2Bac0$lNe|*BOKi8m-+qsps9*j0Sdj%OOW`b5<
ztUmse61<#)Ri$7?tEAq>@p&1m_YK_b6Dr(ZVin{NGNPy-6)x*9wK+My3p}_n&AIx6
zLkkPnux@%$b+ER$<GopkmP41-rfSIYsUKcI{PwUv4bg8t4QS3kZ~pGwb435rt3UFi
zK=;JC5ra?87xPULlYWTO=i1o*2plQzo};ljD~W`LmBTu_AliuwEtbx;n|FsfHfrjv
zD=i1Kl+*Nk?!w0!kNi#;jC!@TkddUBCh>m*PTFZZ_S58LmJg=e!{jqhO}T2y?2h7d
z#DQ+}WVCC0tjj{#dNftCoAN+;$?CgG-65#vlN3!#mW0;Oref!u0m+of7V8iOi%C8k
z_(!Rub!O2tV&~?gi=|_F%6FF=HNQA}vkE_1k2zZowD<j=C4Q&{pm~0xP(Z)D`MEIf
zf(TxZqhHIiGBv8b<e>DFdmn>{GZ(<>SD|qn*!-^WjD*MMzH1FB&!%`g6T|}Dfb#x$
zlF{&CBKNWto@{9FLb@B%N4rU*v>k~foBrEo7J6QIW`Xj_Aik+CjkNlc&v{I2hXfAq
zPs@LQn<VHQtddHX=<p^gh?+a!L1r<)RGPz)Kx*}Ip-yQ5YEy<0k$vJi162P>^}g(N
zZ@{Fp4=Zp>GFvnlNAG`Qm%n^i@}-+(*x7M2-wN>hCfNR7mo|32m;NN8*QE_{$!MG*
zsR~9fyn!%Jcl6bZMCODZ#f4VSAIFRMRFhinr`+Cl<JuS_*i|+c^bMM1S^NTPt3F~^
zdsqEfJqaFamRsAvS-f5KC_fhzCHD+1GNv*Yhm=>2?H#wV_F>%&h&EPriTQU{Gc{uV
z0jlZN2J^m1bKfXtAc(hwzaUgRuO$xeEZ)v>cqXKrQF_wZKEXeMB9kjUSgt_`D#=2d
zt27L8XHMi%BRjtGSAJ`UXjlKRTk!FU|GV0WkHDihQxIdAEK?cG`F{i78@I!6fjG58
zJ4B{{+!-XR>qlqmwNxmvpD0@;HHNLle6N2CRLl&MkP_f6vpu%g%O-LKo3B55ss|zp
zP-T_?l^@N^j<B~0ZQC{Vai(ddr9B&U*W&*uo#RSgQFHHzJ<T$$YV9RgmJ=3J=~wT9
ze+!p|NltQXZ+Z^_8t#BgDLwbHJoSMRd7R{kek;*v^czWycVZdk?{hhP92vg8hu+S&
zLb7P!%#EbL%R;*27=hc_hd4r&i$Iu~2>r!w7}*GEBxRXW9;e})#84bX;PzCi&&H(&
z?yB&VZT?m3U9NGZ@CHQyZge>Olc)c;QuyJ)zm>vInTkwm`V#2BQF#gh`4(>Y=J7z+
z9Y#3-qBrxZ9l23{O-lPyGn_`~CNUN0X_m6ds~q%V7j>!_z1KA3o;9&m2ymE*|GbI@
zVm|*7hib8S@B#DY0N0c4j}4kCjJa;Q1e8nf@FRbQF{Nsm<vJS2#WGJ#Y4iW@GQYwH
zxF{I@gVpa7az{9S8jyObc;3A%h2j`fu5mkBRt4URah@B<g~?=9Q8evpWyKZXTl*9x
z3QnOV56<q_tFs8=L-Xt^Ygs0*VnscFr4Fpq<5Z8|(1M@JMWNp!1g2O)?GGIbEtPE7
zAM(z2NuDX4qh3!Ov{`f3P;>m8ULm)gI4Kmh!fhYFG|RSg8u!^5V0}c11D_lGog)Db
z&XU!0dj|05tJVf6-r?7ZoVFT3MsudfdQ{JgOEqgu6vd^UOxJGmMxQC9W!4f~hT*g&
zfcbW|;al&I{J>8Q8{71Pod2(7>ikNl@TG8JVg<t4Yr+Iw?mk;ITODW5nyAmc13QDw
z>I`Ey2_a`574PRP@w3fc4U?B8@%Lo%JS6c8ZO`C&s3}wvs-Z@47RLwmWgb&3GLaSi
z{dMd|{KIy=8Pou=mE#4-p#UW=a`HF26EI>8DIp{5sn2Vs(R-YW$(UnA`b}=OBOo&C
z6pq@-HQBb@iyvt>^F5Gk@Q`$JPnC1VqzYkEl;PWJCXD@ULsF>v$oOsdb79i{vbDjA
zTn%&R{vWjc-)nRTSvaik`2m~&I0ONo{>QITJ782g;F<t_NA|4Z^)CF{3^c}w{MgF5
z#eW`;RljmzfYS|Fb^J${0ocTx$m?rG;wl~X4(qAM=8vdbBROda&YWo$%GG1Y1&{w$
zJBWk;Hx)qZumQ9?_H96V|L?j=?JrTi3GQ@7W}Ybanl&gi=6=d5)%&XeXH-q5h@As?
z=&`s@A^Z|HVc(2#4t`4zd6@yny~<sA@(%OA1u&Pp7?Kwtc#Qxql<E$^sXqqF^u!J0
z`&a(_ycStf_SGvgucSNEK!*fQryBWE4B6Ih>uvdcnOV0S{;LIE$Hc`&?aN?9d+F5$
zfoN)tFJk2U*Lw2*`LRGg>+V+Um~)1+$#9%((hSCQ8}W!Z@wnh%2(+_bu?46y^#-g?
zzogOZQ$_zrMa}?#$n$h&z*a~OxC$@x)NAqO@|g#dg2aTEhi$4B+k^h&BRf&fry9=Z
zN?ZWyAShJoN$9$>W@@YZRRmpssn2qUOm45Yx*Zq6=c5c}hB|q~_5C-LbX&mYN;q9Y
zk4jhtSOw$$kTU)xN$7yzfWD3i?59DgsA_TMGjX$n@v?!X6dg^L`v=wR<Z<NW;C|5(
z$v?D|-&%HVLj7a1nCH;6C)TpMLYAy>LRpkC7b=BBBTV3sty77Z5PtX`^zyRWqF5(^
zUI4I>U*pArBpLrf-l2lB&6_ZkNs?ZOftH`Wm?deGXJTyOLCo^6%sG^r08*zPaOO)U
zQbywUn_V*_WiVwJYwEP@M{P|+IKQm<Yvb{fDu?}@CkJHq^_S3m4)FlRPHh?k)t6GO
z$K5YdE$&7>ULJaPJ3#fjoYFq!g)0qwwS4J7dkdjVKthnz`_D{_{p~9H%=roUG>RRc
z1!{z?KZ6mGF<IPJP@WbK2HyhB#kODvL%~V1O`4snb|_O08g+az<NEoeZAV#l(U2>K
zjd6P;;9KtOb)u+6vuDvkT?jEBl@Xoj;B#R^9&)_2(uoW$XZPDTim?ar1QL;%ZhM6~
zSz+P0ElZQGW*<uHx`(SZI6{IjqurbyY-7|UF1z7G*MeX|>^r^s5`1G5_XMq`t9)4;
zg&TUpnQm-%oP4<9ux8t2BjJpi44f!miB}6YX}jkT#ptOxt#pf*3C8y)t)4~6a;0wM
zG}<y&K>+{iUn9xRXTP?MtpCVrzhZkTWiojPX|<Ezc-6e06o!NjJIbg;NTXExnxsD0
z{Xhc8P>p<(cL?a4ME2XP^2nj1VfL%T)6MG;<m82j7tZ$cxCY|z{9iQ5?r)mpceTN4
zal$V?YkGL(RFURpOg!xLP`~VKALSwepSwR)KXeIx<<e6(n51HJzJ;<9werfQhB%jg
zip9nW156f7EzOT8TzvIHNVU0Hu0VgGk9b8evB`U}WP|pF(5MwoQQ4=7ILorn<F)p8
zaT3#{k<QQBdakH@oYx$9F0A@=<)cc2qG4_`x+&QtW;RcTNf#mEit$$*7{}raAG6Cr
ze#^^)>W4KW4elT_BC;?VMa#-Mwy+Gj7c6-KM*5ZIMq7(g8cDIElkE(d4Lf^JDe@}h
zv=_3?JrJ7P<0J1$8Fbp#^<z%WSB~Aw%vL!s+t^oj2)6ZiKHN#%2M-TGMQ7q#46tF6
z6ni)OWlG$2Z=}3j*D439KDe{EW;_*!t)5tKku{+5p`jmsV&jmuyYY+Jn1LYd`_u=<
z-HADfx(7#Q!<r6zX~!ziI_DxFRb?MtxqRd91FXMpSblNIGdxC%HG;jLdWDf%2UMmS
z3C7dr-IVD9M+_*|$(WQan#SiM1QixDsLI#q_q4}TfGfLeNR*a2V`+Cy*o{r5uo}F>
z!wVag6nuN-h!7$6+n7w+Ub!Itzp42`G|!t{ou)q)K2$4*aXst=7p}gt>^FjvdDusC
z3kh5hkT5ZZtF-spo0ukmzQa>{71t(@KNf$IDHV00WsZt`$sh&R-r{aZds~=<he7;E
z(RZ`}%i@gTk34asN!?IK1HZYWFCIk0L5I<AsjOT|)x-2;#Ke}y(Qpa)ym(l-shDu^
z!m~rV?=}?82>777vYVW8XIfU1V7sq4ly!{>;XLQz4d~=MRDl%vuY*r6v0ks1z6#ld
zzi=zDkgv@=tW-O@WDyy{##G?Wt!KKvV2H$DeZ^w%QC`PUxYkGZ%`oQhB#(59Od)-t
zzGDE&LXmr3j9k<w*AKCj(eDt1Zag~DP=V9P;f3k`Gfi-^nWF3``>o~#DQW3mJz>6b
zpVPj3+c<1$2=$A-8Vhxv7lNvdM{pVz*wUU$MDUe?NO;|{v5Sicv@IcOgYn`i*@_Tr
z0a4ircfuNT1UmUVU|Ck=!No4!8GE>bxU;o=+`Q?KHj3Sx(f;$~L~qx0`*_3D{(&pY
z_-t^EFJz?LUeCJ6D^wG81xaNt@T_h_LU~hoWc#IPqRWG%OHJi4rZ6;3*T7ykk(7=(
z|8}O4&_$0^Q<_-X`hD(;f~xtklkm0q9?wKnzR`l)8n#LomD}4tB(I;CS1hy8whX#6
zGnHA6%~i&y!3~i|S!x4Zj#!M+N6i13h25D%<Qs2$Ns&3S5XS&~m{03w(eARHwaiBa
zKdoU-rou1T?G|;DabFjCWxf|^S3KT62A^(ztp0#HeZ3>zzLAw^b*Lk!mQbkkPh3P$
zrn7*fuR%mCtZeD8=Ga4oMkOIc!J-uE7*`cvE3jjpzE3o1gP&<Wn7SRUcIyL7wy@jg
zDvg?9hTvp14D;m_^Qi1}s)NCm=Qab0ija{5%sClR>VK}@X0xG{#F2^XUgYibsNF%8
zsILEj2aK&rZ-;y@RAAN~=QhKsSuALAa3_=Z?rA{6rkYDow7V+by?~W4%kjx&d1>Ti
z4Rn84WP9N2<WXW~oYqLF00N?ivUmKb{KU~oB&;Z_Lp!3h!S1j}XML9a!s2{Uq}K6y
zz>XQhe!B;_*j3xJs$d6)9@o%(hK)leYNHRj-;}Qj^EsU?hdZo6_3s@5PtzoI{CP0G
z*16U1Y4LmzyC}#LhpTYa)YMlwcYH1t_q+FVd!`UP9r2#4?ydxTVL7x3c&RXDaXcNy
z<!zy@pTeB5*Qu>=c|z>W`aFT=EmDI2WM%Og@n-8R2f%Dqm`)jNtOa`|`dBLp?Y4CU
z9XFXcWU-h_Tn)KKz}y%s>?2^ax!mR56}{g7NDZgxl+MQ{#;MnLxk#3+u9W-EP`=zW
zMZ8kqLpRwcY)Nw{CO4yY;4X8hurr5L_jUIM&)fe%e^m2BZ580gh4wGc(&!>AOqRJ;
z6QUw#xLzGv>clua?dgyO!M{0dHk<7*LaEHJ<?xSll9X#-uw3hq;$TT|eBqC;#1wE<
zqbQ&h9yVrvXYa^k`B9ANkYS^2lka%e0hGqrEjQQ5AZ{w8@@|P<oS%;lcw;b@>~lw4
ztH^8DWIM$$GCuo+0{Z5IwOlsA!R<5q=7P=WOitNlv+beJQ6FMSTLpX^U6EDRo7(mR
zX?j*NdKWm`E9a@1>xtq*3YzTC%*@RC)jogB@Yi4Ut{3m_p5&R?s<b$Sh8qkPGuxvN
zHUjQpIy+iGdTr<Xl<6>eL$++sgi&BO*X(gncszV!Ugt>m{>OIB2aU3m)lAc|f#uzE
zOM92Hl28@-w(z1Tyz_AvDo<wiw2nmN9)1<o0oP)(5jhoy#j~S$(eC#g7Hpwfdkf7^
zpy|66l-eGr%fn~ys!xzP+h^|(O3va)-bcy=!X1kLGNRaFTtucI`(s0CZ(WG0f%O_l
zG*ydZs7aQ0i+3CFsbYY(4KDT0K_ja(@=y|Q`q&le3O_b##j;R1%ouiXtRdmnO#J-p
zAN=c!a9?-*SR=v}cV4d?xZmJz!Vlv7WvSr>TZ93{k@z-(Ejpb;OK3qn|I0}A<e>Zf
zy$?IoJG?_R<w0b<8)kL90^&}$zHL{z8}<3`<pF?EZSLDx1mLL!RbSe?b!v)cRj~>?
z%J9a#0wyA`f`ZtdfvpXU5{%x|Mh^6M7fWj31s-X}wl57}#GjQEOO)X?Z4=|-@r6u;
zt-i_yjYg%lI@~b=ut8@Nv+9V6;SglF!SzJv$)QuGwSLFB>-*V{cR&eRej5ImH=dpZ
zQ96lXR6q#CO<q{aCWlC&hXJG!DF*+iOd8s`FWes|f(it>ko22_%W*GwgD**lM3gIu
zwB)!<w+5@pi*NR<)vvsy7u^t=$Xcd_cOGXlP}=zJ@J@k7ZJ+{&^kiaVwzgOA`1Nw3
zj&tzj+$$#jInPkxa9C)IlEh<Hygw|tml|SGjkoWNKZYS4JnmK_xaKhRcCIfXnTjX5
zuGJlr6m6EKpt%3sGd^TnG?E&FuS}*lN)|q`?)cN*MMUqPB+~1b2o}eD0ZI2EHP~XM
z5zFbOI0F)brJ((&4+m#1b{HNg(>56o642Mp3==dH6Vtn`Fr#t7YV%NkON1n;0`h>Z
z>;;{SiQBM;<j~{Op1=cp%ll@j#8+?;xfIt=nbKoOMmOG&O(wzq5}iVQl0FCxi=ET$
zpi`5CH9DhEyaV3JWM<K6V!PyRznaix>$%kRvK%)CUBKN6LV=7|T;GxD&zmWAEv=gG
zaIn``gGR0q=dG8R<j>hiL%IEYS^+qhH^XMg=`qe7xF5Ezn+lyghJ?jsYDuErOme;P
zOO@OHxWX;_Kpi{Ey9ljdOyOC1ruW!$9)3v4OC9Z4wF$Pd0Fn#Ds{>{2L%2rN=>f~v
zf(Jb~(mJY7!er#TDYJ@Nw03ZC2^bEzhJm2-&+kv}x5FcG4LSaJ7bEn7n$v0~G*G7E
zqnwFhu>Cx^f*)T);6IEJJOP3~i!-}fGCj0*Ad(NM>Fv+K05hOioVIQJ*&x+ILyJag
z)F$DDdLN~dnCsQh6)&GA%w9;l=?||L(7gRi!M&5R?kUATlhiJa?Y*@z+7g}Oz_T7*
z#<?m}Ny^x<8uG|2lgX0MEVa%G+m0-l59d6a`8@rqmdmeGQiMgTdA8K{D<4Ea{gt~i
zA3gw<unJpy!a3oCCK0YAl;v(T1P!JBty3)*$GL|Ckj}$sdy$uHWp!+Yg;CPj^_NE|
zE0K{UW)hwce1UfD-NxHDVNEiF;Vom6^(%z6lNG{ne5jzBs8dhK*dO$3{gzKVjUi>H
z_VyKkUYzT!D<e^tFeK>c7mB&o2AdKSKbUK32d5q@SwD3CN$})Xj67}}lZYoF6rLlO
zy)-S7hqX;M!uu+dMWEV&zF(AChRT_rhoSz$A#oH3fn9G0-{xLn)Bd>sLO}4~ZILWu
z89R_;g_$NxRntE;^^Ty7_3yztWj=(4@U`e9{%G#?lS0@dfl)gufZoCW)?c37i72_@
zPN+N;N#G_W%lz-e%izp2g{8v)SUJR7YB9fosQ&kUODe^|Zm$Qwvb8DZQyF-TZQA4W
z&R+KN&P~Qc#I{Br#yhC_3z+4t@*(E$(7w0c-(hd_N_~@%iuxt#&LJ6q6opju(&D~A
z`U`s31}E8^j=gl}Tg2{*SBHjvE~}7B^61rXcIv$}lU3hsx0G4*#Th&%T%0VAbDy|I
zGWgU$?ORT%JxZ-)bPo&(h_Y^&63KkgiBDtnvyB~Uf!~iIKPOH5EAO<r@;;Q8cCLTM
zUrN^6U_3>;#9SP1PzpdoW5)T$I(N_R`%v=`fFS2*yVYNWmY7>_oKFky2QOKD5bpO(
z$czd`kTmKLIc~0h94YKmsNHLBed1ggqO)WMe`P!9Q<L?T|HZF!ZdIbH5P~z=vO_XT
z>VARx>U%xuPTMTd-7MGwXjEavR~xI1IU~8vSofNG_4x&tjk&@r^nibPg@u#{d<u{I
zV-F@SBEKI1P3X@nr6JW{4%+Tt-gk)h%Nyz<OyK0%6lf9<w3-H_-;-&=wW84OtGc<p
zeF2R>f>nM(oqL)YvaV|+NG)FO?Q<F*UlRRe1VC@)@P}8xP-7T%?2e-@C%Jsa5%vBr
zkX6>U@nD6nnMYoPCFeAl!obKz(^b<Q^5Dx@>;MLKpe;$lb5#o%+3;!PD@08`Qagzn
z5#$H~`VJqo!)R;cha3B0ImS~X>j{btHZsb}TI~$tcU&*eeU@$}g-jOTrZ%I0qVHH8
zio7jOY=_la>H7*4t&b){U5{Fz%gpPTGv#CNn}`aUC?mj=W1F(DKK8#+bu(_cy4C?+
zI#Bp-)NAsJit70r4g6bS#guS>=|}yxnHmo%JAA<6_j~=eNdSHZaIFbHF2VeZ=!J`q
zU*eWdvd)YnefqGc4t%EvmcQdkXCM?~{XxyZ=b-B+@Fv*~OYkud0mj6g(|i+YjUtO&
z^Y-ytU{z8VBeIv5rKIO>5DaFkI0!yJD!C!R7ewUr;$hQ=d7Qw$00GSEP}$FQ6>|s2
zstmJicPZ@KSo~b11=R~c@A+!(9cM@}F!bq8JLNw(=eM)q2%U|U8{efTXZ<}|OYPNJ
z*xaf62twHX8HA*PJyw78NXI_!sjD)*i%;1~&N21H;b#Vbi@r&tR_`Y6z#ro*z-k`w
z5q8O^*E3DJ5tCer?uAwjj?M<O^?peF)|zc>A{rIRIX?F=>I5^rQMnDDy@CwX+h)sN
zeyYD$Cqw1;8FpcV6`AJTZ*!yL>t)46!frbh$hu9n&T^LRKv;EzF5ZKsT5O;Kgq&xY
z`B)J!v$Bh_1Q9bO-5+i(NnVYAD%ZX@E>!O=&wsP0=()wfy_gkARJ1Y|VBk;EDH=(1
zR>*p~9wC*+uc8Wqex4MqQ9IIlD@g1QFs9Ax%=-n`E0T}=A|~?2r-Kty<h4=u*IsiG
z=5u)Z1nVZ8pIVe8FWUS*5v{?O0&~GK<PGcLmBoY(H202jlH&+Bip!%bgaR@#Cz*o)
z-{hpGPv8t_Kom2Atiqc~=5VX&rxI6<+M|~W5{C!MPs>F`tGEYNg!;N(#*cIz#|wqF
zz1-#w$vSe`<#SZsJi`Z^0iaxUA&n5gFu?6upnL7PdHVpau{G^x9z^Hd>$Xl@wm8Z`
z3QDq=+gp8Z{V$shX0eSW;#w{WrV)E1wz}L<Ysb4%H@WgLpcuUGFz8!o>)piAR9AWI
zJ@OWLtm>Api-6Q&cx6Ur>N85uGej{_p<3p33t#b^@{~PaqM$OsA-OHROe1oM4TzS#
zv9@K2r_bgt0AFwD7{pvHYY8Lvgy#{e;WDk}V*eMX<fpUUpq@1q{Se?@div%u*=Of`
z)4us9JZsAM$<Bz#PpDm70)?aH^^?xmVr)zhw1FdUp{takD{h;M=Woj4g6C!dbF1A~
zgPmo}GFCc#XmgyJ-hO;&9$x<*WqA0@e>s5)bS?7NiMYU*p?LUhnxWFrwU5iKyjtdI
zOy`k1-z;ssB6z@N0=%)?xCL5lBTUDjsfO>b@s&oqd5yI%50g;Gz>94k43o*}ItzVS
z;kNB3CjXg8(t6A{$x)xaWb*(aKo7dk=K%<@)TJj87+hn^$;fyFvD#zr9?=_}_=>86
zlb9{jne;Gu_ic<2<BwRFi@0I7aW?2nE{^71Qgu?%_<J%m`8X0t*7gDM!wcIHc49Fz
zb()I;$h?3;Zq|D9xk#y?fWuG0dyp9A+Chg2OgW=`3pG=_Ip74PXKRyLRIMF1mVZ0&
z{=XJLsuo6$D%_zVh<GK4vj=d93X5#??<d_&*XfOGkG~w4OqE|gns7&|GbRin8Na10
zv$+qQG$vgXqmnlPvy>S8d>$@T?t$;UN`Y>D#frpmDBkF-@0~5h<A8LncHN$7v=7>H
zeTtQxb)k&AJv7V_3Og~B2D<_{sUAd|wjF26k4u0gY4W-$ai>unrgUCg^1u(RZZEWE
zaCjC&87%NJ^oW-k3Li<;SK;e>D^xQ%H880XRBs_Fc&`3YWh$$7Hc4BUd3aNJF2>!t
zZQ6KdO>X!U(Bua;3ia~L7!I7O|2)~hh7ZYWZ}9T^C0F`$^cWwxBj2-}Ak8_mhYFV$
z?ic>g?cESDcT^rnd<qu8k<+7+=eZ~hL6zICgFgF0CbtM-&HN}^LWMoCf<hrlBD@px
zS*)s<$uAf%83XfTanfU>&7<xpcpDJdrZKM}7gkjCuF|=>!~L`y#K}ogN-DKkbjire
zerxx2DbKeu55etHI_NRv0a^PCbzT`f&7y+0+Hknm2fF$b`?R*$6&Gcix{Ze0{+F6e
z|FU<9Z2cOZ=wP~W*{fYXq(c{ROqM{Ju05$gNxB^lJDQ!2Dxz@DN7vC_DipY*LIL#|
zd9E+FY7Jux35Zh1H30_m%y6pa&v5e@pTRJHHes*q2B*P1x)&e!YqgI6U`Huza3E~I
zvTZ<b4xfv$3OS2wX%DBH!m%Sccda0Fc-qF|-aDUT$t<IDkx9h(Jz8$XArB}ty+qbi
zl{~NCO}YDTMt^pV#Ig_~+KGAmbXp}!v<>!aph)JW`cJ}x=3%?X)aNS|qlU&?#d7m`
z!Us-O5Aoh74(VHm9j6Ye5jo57XhhYAc57c%iCT=Cl2jT9LHLm-Nn~m!BXdCdVsbSJ
zT$5qSCsqK|`|8_%CKpB)+HM!C$!^NY#&TTzX$jebVKjf;`tGcQYW#S}Hfx{TW*{=Q
zn-ahu2KYDjc>$y^E($pjI?29SJ&nBCm-3SiZOt=@FuBXg<>Kd5j|p6P+W}H};F_^d
zcjLG;TmOK&tDJzrq&>E}Hk-sA1CvZvZ_EBp>RtNwqYlx<XE@eeG^}@uiS@}C2Ahh?
zUUdhm(nxIx*vW_pO?rv<*oX|uFY)qvmbsBX{MlAR%!<Uj8K<)<q00fa<1yE138h6%
z6}4d3dUN!aMmp}lEw0Fa%r`kLF&i%L+<wpcELwnfocuhOq!Mr%@`pNJ&dZh!*)X1i
zzixp5M<?e8){&6<4?k?*#+a2sT+Ex{yr;$T!9xvcmht1N#*vJFTNHiJlzi2T27+4v
zy>nx}jk%HGrQ&`igpUTj+T=mu#aUj8q53;b#F?|vP5c;X2+ZhZ3IP(YP_CfO$<2dd
z{pibRs#itMPK1k3M>;0Xtmm|TETAp6v5*e1RIO?FRk4S(y0Sfk0<HaIu{E=Y?aQ3g
zJdLoiL{}?fwj`!?`6&!M0GN>oPd0ou{c9+_1nk_#fR2?%J7wIF<rYjAIbolbT!V+V
zXYzu63^&bKhBOWz!)*?I88iG}_Wq}l?cr9}@}Dm=fbI)O>g0Aep>A?|6Y2y(g!{S3
z2mTk-dD%0`YcuE~@X92*PpIS=9pl4N)6rTQKaNl#ntr8)a=JUD*w0d&@ws-SHxA&H
zA(?6QfQkS>MCY*z0j=5CyMm-}?I^BVmi>88#|Jv=@Bsg}#O?7X(0DE7ibgj(d`yfl
z3Z3;vHIkQ7Fl0>u;$9}LDW9&0d_fwe<kZu54}e1Oc^{ad{14$hvi%oR12rLvx*3x0
zAig1EZUWp>zathVf={V0M?(kd?uN6B<ygiwZULnIgvDH<E_-}yi1JL+ROU+2UXz0#
z>a&3C%`U>M%=nAr2L*gD8zWr%B}uhlW29vv-V4*UMt3XP!!$sk&lSMsWI&-NUj$U7
z{}?}H2)ihZ$B2LdUXGj5Vgsz3P>F<*Z=Q^#x$ic7X5X3$^W+#CdI~hL_fsg{^G~Tv
zElS2n&vP;7*7gImYx(<x-$M&-;mqy-bb=+cozFhqlXMr1V<tM^>H@v3Dv<QkvU7<S
zYfFr29aPR@fmL~DAiye@$HbX)pH0+mz%RkgPXol&oATiKIpyD3ygRMPndGGYV;_zC
zI>%oRZosltN5PJzeUd=#wPMQl%w&HQ1XA?<r`;A3_yRhfs+C>+Fd^SaQP(}i3CKrB
z!-LI(@<PYWh0{~sN}GmN7ybycsRQwtAAuk;@y+n7v#Ce3L%-}So4Bke!8q`TJ%r%x
zjqAvr@Xy<FJ%kDUvO4Z2q+dk0jd!;IoW1h3XtH9xu#%71Lj~*9^-zUX7Myh7alS<=
zI6=0j<~v9`iDQg=G_3sVXNMp+s>4L38W!=*A+>A#r>_t@&n9swww4olyfi@M^*5Q}
zzs(>MZH`6h%)_pd%>NC}zNsL6`G-d{K-ab=xNhRuXK(E=d3m*^Kiy(#8v`VToGm6$
zC!vxvZnAw;ctiPkg8&b%1y^XjzP?8_qu5Mt*V`gq=W7j0D}9H(a$U*UdT9$pr`U+U
z_Oa3H5oTTS?R(<85}&ghuB30rQygI4-;1r(jw+zi0SjKE#4*c%%(1DIxxC=H9<s^n
z>9)Lm=`6+Ke%e3moada6Ri6pOVb<qjBmS?8Z6I(o%p?%*Tk89n+N_M*FF?@Ga8TV&
zrG_ofJc~{@>sX&jnoeQ3P4pCKb&Ou+6(Xb*nnLws$CP{=8!8JIX)ERO6lWW^u3V&}
zZSxCUAABh*c&XVIMl-OxcLOhsjI!{HvS-*d3kC@btfcj2VZn#d?#HyXay=aacK517
zMPi#m9R9l_WbH1cW$nM<?#+q@(?ZLS1dbn$*IEhj^74`3H<qs*K;|EMtbSyBqpaq_
zm3$mnT%S9pC1IP*qfb0FQ`0n!->|b&VTwy@xP(oeZ+TLaO|`3)S#f1R#Z$IowT}}v
z?*yw3$*MH}kp#UC+e1JT+nT(}&1c2lR#l)w1+I3zeiXKzM<qHb-rAk64w>nbuQ%hX
zosrr&QJe<}?QIM;p!~U>RV?+~VVy>!+kmd%L<)X{|7v-uCMJ=9fw5P2x;4ETAktrh
z?cU&r8zXfXj9t&yH=|W=MGD$l=MRI2RW5-W4K_}E-KE`2#NHDbjh01A?FbOTYQ1C3
zHco8Ipl<gt9|0}01Da3VG@H@qP1<yVn<D<-yh4703=0*&Y$|#T8c;iKLeO|=x8ZKc
znZ}?R@yARI=7uwh_k0!iinNop_;n?`I7wRqv|!vv-D5}JU|v@VYsOq_8)OIYtD<jQ
zr?iu9(@rw}4djcl!CE_5<Fi#Ub8{|YNT#TPC$KSB>~c<3v#`riAFHFYABCEvG#J=0
z@Tt4!Q!V4>KoDtbWWM29m=JJpk@QsGvXiG@`C=ZOnpcP+(Ob0>mye5K%s)?q>dvTX
zDbA+B{iTMCQ3<0{`<+`TC!C6<>yEVj%upMg(b_Jc&Zv}DJQhL@It14rMEva(Ux2_W
zHGEC7i(vVrc(K3)+bS#OJ7COcjM(qre)Iv{#P-y}r&KaB2EEA^X(8}n;3Mt;T*_~7
zmfA9J9(oFvPXJ2(iDH^Zb()yqW_7!Y%R(aj-aF(4Lt_9;CERu8fh~y-yB7eA0f!EX
z7hrH+xapkP!X?+9*)tSi?Nj`9aucvJt+i16$HA3As<D1~Mnp7xI)A`S279gKGd;!`
zX4BIRdYfm3NxAzTXrf&6nZnF~R+C@5%=#7m*w+-1B-^U{8Nv!+MCX)>VWe^}-Xw6<
zjB<W|=BmtX{*T0QM;5<~cc~6O5LNmyg^5wxa=AzK7gFXk7Gt>`v1)3<eEpuRX<F<Y
zjyC@58OnJRI+03Yfvk(sNPDQ}odTS17P*ub-Sj2P>XoP*YAzlMFU$;Mj&mj&Zlj)`
zl)d&WOiJ=^?_?G;`DP=iyK6P>_&D{-*zoE4swS}tR9)5np;xHMc2;Ey|JS!yj^D`p
z6KRG!Jvg9Jm&k5tT=QXp(O%IBVrLr6bh(psjU85?*18h*G;lV*U^Y|;ajLvGOa?0e
z&uI5G<jdLR-PisGy;!DF|G>a*41?|<dwYxSL=Ww_pVenm731W&nlox~&!&qOR`bgO
zcb0JH*y}@@qB$J^_;*{RVtMT29fSMgA+q|3nWma*jnms0!J5z7&Js`=+<4d5zLtUL
z?i@5>;|s=rs+}NB;q{F{VBLQeauAhOy!W~`*eT08ZHj3|?bUhCmpjswIj38+Z9-#~
zk&cBQtZD}JqAcMbj$BuwFGoNBJ`MJsz-dVTCOX)zurW@L>vMrEl3~_!np<8hp3Rc{
zT<ntpg8*hH)ss6af8NOe41tJz96%GFcDw;Whc_Uo`0^ovED}3xX&G&x$O`&y$!eWN
zA^Bv7%ZHG8_x{bbHy_MTSytKt65foAcd@c3aQT#kH0ETSe@tX6H`egIbTi(xaXu=u
z96?#ymQc`#HH5)8CCunD@bp0Hd$^s7g))u=)x`vEEgmlZL4MtrE+Su-Np{3Sj+;CS
zna1{I09HBQs&d0z(~5B}h10pmY>Q91K+t~1X@Aq+Hxf1<rU1#Ft7QDi-E|c*jTL?J
z1%{d*6=Go@mTyusQR0gjESoqn^q92NN5p(!Pvkn(;PJ(#7r=Z=={}ltTOQ_(S5Aam
zPb9o{al(db9r1i0(SLmma^5jcLyAXXYM+Z<&Rt)*@t>UWazg6{ShTjz?)LNrqXo=#
zOt;m}k?D7be6zm8J+Tm_a$J4q>qn#w38Z(~1{*;C!X!7=ll|Km6XHE{G0jUBkfaV1
z#ZBumzJQpp)nezQP#zEW7d7l!#^0yb<vQ8#2Eh_rj`Hbxm>78Yj`PJug<c3|mMfKa
zJ6n;mDST;D%MF!vGYju={cs<Fm@Fn`(3@X0k(M1)%f*sIm{Xkg5G?WDU%vxjL`izT
z)Ud3)VnviO60s!C*)=ovHra~^p7mFev`qaC%w;RLI{nX-{xv@GSCCXJN``MUbu)p|
zb7PYGalmCjb)GBYf<q2<E%PYE^H6=~@W74K0&z1(!hq4(Q9DE_D8)5Cn+G!CERP#<
z?g?oTtXBO*vYk0_eAF_k5?0d&fci3v#1qrGTa^pxF;?d2n)ztQCfT(GL#~uoiU&?%
zbobhMi$y!Z%T=x>U5ks^s#y<@9>tZ6eODG`<Lx;l7Emx7GsDzaDeLswMk{u3V|nA0
z#M(at4A{5X9G)CsbWdvfrXDXFZ?N>QUJB!)j!>(e=cbUf+ciZOs3v8)IB@Xxm>FrF
zN<>kce6y9I=+<80R?2!1P%sk|8u{|8>FTiY%v`v_xUQ6|E8m)+Z`&uwfuQ=Dv-gwz
zU97OPa_H?w<w!I)rfuY=Va%zqSS{!KvT|xDUE$am#F)@bIo~Cu)SE%;FzUxH6k&j!
z54C<BRl=+-7&3PWKgE9G9?+kEPMn#gHH;Lz2FHzrJOJk9u$=VED}<CS`GM1;v~b!6
zN83vhat8Zp(Wu?(1{w>=j!^xB6NV3T6sKi}di{Q8cS^}Z(h>j*+H$YubQO<JOqkKD
z;~L)OvK9cwj}v`~Mq1+!bG47tnI=#MoSHlEsA)BL1mqC(%)~T@VD^+XWBqYNa(sU$
z2G!6@B}t-luzoxPLd1;eb-(aq_09ce9xe%f%4ZED0hD}O>v6@`=XO=886giI{*(r1
zFm4}ak8g_1;W5g9VYYofSL)k{i+>DD0~gf@zWR^iZXXU4c7_14h@6KOU6y+<7(3N7
zn|=|q>Wz_43uY^C<4hX2Pjg87CO0A5Y@6|(Oo8HrxJW#*U?Pmv&Xwvsu5$l5M4Dw|
zyErxS%7vK}G8A>1@@<rxM`Y?7<h<fhvI&Vr=?U5W4&}G+g91zRaHB=uT@QRZFoCyd
zkA2A=*9^s;!!>xXI@qn<-}w?M7_ty~+s*Z-L#2iC0nT8D_Axj6l`4izeccScOkIg!
zHj+=4=#;NW(5JzFI`QsE=+<`D+uSg^R%S9x|I3OlTe4D+B5*4vzrk254Yb@9U=p=C
zpYSfgA#$l>FU+>XVKsXpq)BJx-HRx~3#V`==qJklo#EEqy`Mof=(6c&<!6_xNsUR+
zx!kJ|QlDE|@on0GEg=eP>qEEgeef+Z)9>H_0C7w@t(;UAUD%=W9>rGJxFm?QC1UMw
zaj)PT*(^T)5_!vam*F<qjJ4pM@Fq9c+nBq@r6!?vCWM%n3TvxF@h^au8Fi72S?@$0
zExHWlIehR*`ZnhJt(z2)BdS`78d9L8K}`BOESI#E$ZOf^*ErmI`_EB#`)aI<EEji`
zDfmTm?#V0@6ihfdV3R$q?AwP^Ze30$EFNv>80bg_YHwns%{G<*T|d5u;2TuT>FN4<
z!=+muY5qUP&O4s!_mBGxQOPEojIxT9QD(LXsgQY$%tN;9Qz6+STgXnf>~%yTl<n9j
zd#_`j!#VEj=sSPE-+e#szj{3S%eg+E&vm`8_xtsFzL;f^i2${*kv5`?gp75IPb<b3
zKKEouQQ9~qakk-3@1p>A*ZWLt*}(CqeATF0;x(VZK<4z)ttYH^!eqKttvpAS0qRfC
z34LxAsrSYXG8`BluhipJ(lz`7L991<y1u7`K3UYR757eOs==LF>+~F>!-*U2AKTf&
z#hDkoBhPnWAypG>eU}A&cpTskJw!_XKHn1gQSpSi)LVJZii}T_$_AwiOL<|PJt`D6
zJH8PO4@me>d&`0`P8&Yl=EDS5DYrfpu85!<QSsmUBNWpNNZ1TSSz4~xu?ll2`M9(c
zc0yJR(&YQkeI6Gy`!M;nP}f$W!zR>dh;Y7;D6zsmUI4b{lw492u<*L!C&P}(>DVvc
z`VtK2e3mx$jUXo<=3m$1-9oqL1-*C4`bp1hvRZC_qLD0^utXBw^w%2V9+!NzFyyL>
zmVI><_8FbLrCU8O5QKza<6rdj^?e9ILW}GDVFv<8jo^cdx7w#5$C*-~m~Dxh65@P$
zyiO~+)d}H*98q$5@=PP5;X8U@#OL5<bNb*}bMLOc914gpqq2DP`0S1MzEE07JV=_s
z-@uysQcSM>@QC*8uFWkM7m2t)ga{@H`=b?b0hIUv0%0B|l7k}n`Fgf-b*R<U7c^O|
z?y=UnmJeiPe7YQHt(XIv^QC@**FLvOgJ$Ds!t(*C&ZyRF@glxkHv+$!#Y`z8(KDC_
z%9ySPMr7*Ri5^yaIVLcmwh|MxO19>+Hxph~w{m4!A8Jk79oDmrQ-y45S>`Q|ux?&8
zW~;!zMI1lf#d>GG;PgcyEsGy-Pl`6&d3_sF)+ZGaoOzZ`$}k^3Sr26m7qZ>Yj+GpI
zEwypC{ON|>f4?*Y_CHR)X#250(=%zZeuLwOj~B($_ix5Ja<jwr4;5ZY-T9Bb?dj}B
zUVrXL`P>ZcN118+6-T*HOa?^jKAi<bwJXuj9wKiW`EffwPxbqcA;GioQZ<53kZ0V$
z!Q%erMyS1SJb^dgSV#VO9f+jdjChssoYh+C*IZWDAJfy4DGm{Y^A`*bMdS@L;^4S7
zHb)g)QJzBJ-HD2y!`u=&fe*ge4N5-{KmRhnN@=XE(XC`H^$mOAZ1Ml>Sy2%LA?rTd
z&phmBF+B2A^4jWz`-taFBTN^<?M%*XPC&-Lj<!YX2v9b{kG_pD95FNnwI=N)vin{D
z5C=Ks7|vRuS4%)=`|&YcWXJ5Nur%u}BZZfGq(LbcqL&`OwVYHRv2vx)3JhO9_e^cI
z!8y(b3!4w?SujEiCL>tvE;(2GPcqJsLXRk~z^uQgnH&zcK0Wi%5^?|!+qv~-tYlC`
zBug+snD1SxR8Oes?J#aYs@&*tv@NUbrE8OF?6u5dcn!@*Pd5IzOn*J=vL|UX>Iuis
z@JmfvKeMcbTqAz<X(n&(Y6eeq`<&yzDwW*eR-3gqaEPVwfAHs+)Q4X#s!@BV7+b;n
zhC_yx<v;43>!^LQvC-l3IV$yWbibHeua_1j2Fciu!R-IYl)1hJB{8_6DQe3&yi9i%
z3Q3eYZF9jg#1t}ngA3-jQe-*@HUuU0boMJSI&ft&_PJ}bV{gOQ#_D2sp`*%FO;9DD
zwApo1uceySYj-JKZs1$6Y&bUz%Z?B|=S2OL9aiWgAt|JgL^D?~B<&*p0eTOr%-C;w
zxb5*1Y>x@(fKw4}jg5;CzV465jHvYX)97S1C@%T{dm!BqU`aZ(G`$~N>^3t)22ZBk
zs@p5AIG9rsb(|e(U^{oSaJx>uvu$ldsP+Jxob0(HpoV=PY@K!?x`BF4l~eDC^46XK
z=~_a)ctoP;6E^+uxYW;g7$Om;4c>tuoMKRLK3^vMDRR@}{q!LHb#IBF(&y&Pqi;Un
zS=rJ1kn%3!(1mbDpo+U+8!=_8QP=WVmuo-O@YwjY^G5i&iF}mBnpo|bs&8r^z2e@k
z(4kVVPK&*%wG65WPhU?2U2Q{r?<&uc``qwYXJ|kr3)$PFL0!X-Vc)qs_NoQzVo~R`
zp+{8QFtr+6pQV__4-z@C`CSjPGvcPka^lSfMtp`V2`Ea7=xNu?AX*?*Gi)z2mOa2n
zC{vYDF5gUm%@u4BNk6RaioX6Luwjbd6yz3eqMR6)Q!kD;9(L;NZmn0O$2;s0zp}pk
z-!PLv!_8X32CMjnRxek*#fQHqDJ=L&%5|7rD?4mVJ@r|CoCf!+q`+vu2D-ui0(&JQ
zRau{h4?N0Ge-gmBnkNdRX$1FG6}W1O1s6%;>>;$POCsS@RGC`ydUc~s!;SO#jlS<{
zChntG#Epy_SoCVnsbO4NMz4ha^zo5Y?-^*Z3^#s<QhSa)8oNI*n?8MWtv`h7(AFI7
zU+K!6-)jQkrQ%9s4Aq+LNcN=WP}FE~oubT|qmR$W@Hi)D9~0@$csN_-A$v0x5p7S@
zDmsfj<eSqJud%J)H`;`qZJg$;@-1--m22JU=3?j~d*E~jg-BEXk8;K=5ZsVL;J#-e
zm`8>DzJWz9#%}XJV%{Q;UJoW5ks)?=y`?d~)Fcq2?H7N+vA=E<fX<7G#wE8cDAH}e
zW#gLRsduaEw#R2vp1rlF_u?m$WayzR+XzoL4C`=>al#V!IB$fR&G%njOHh4!;BaQ$
zA~1kDUFj@CZspF>rB;EDvc30zHrIw$0}T^YUA6dLv`2Rb=#NHJ_@l*V7B#X;;=Sh2
z-*2$g^=1zEitpP2vPJ4w6FVjfPU&5Nehgs0nk4OcP_G-=F-_Sh8V*uOqC~;*8!^=-
z$Q$OWsG)?byIy}Jyv$Vo;Ae+tAxov;CtlbKSIp3<N`WA`YB!~01!K0-9_Oad^fv^6
z1ZMp9N8>&|(guHu?z`o-B<i=h6=KVbN|^tf`XZY)oru%zmmpHWpisavQIvK<4U^r&
zi=9o;jJFJPd@40kBy2kFH)oP)lU!(Pzvo<dRjzq=*{_G?wuZ5ME|4R<60l?4{xwZ+
z*JPuwGd!_O+i*4Thc`ni@q~p`q0zkK`&c;VgSs&5&_Xi8(YjtsHCNlh3l(J-xqKEz
z!iHM?tn8|mHz2w9Av!7os^V>x7Ffpl#+503$fr}nmR-A0VMWQ&nqHya_z6w*!vYi9
zTsdrO;OU0v+l}ZIGp@LHi0W6*z%bz)2K~A)p2FRk;iBvY=1XK&yQPM5-8@egWfShI
zFHuwviWu{S45{Ua44N03OU$>L91?Mq-w2tr7b!p=%7b1nP6w%&$>S>kIVju1X*_24
zT{_5YnK($%*uh=J;WA%17$euOoIVQE5itIi8BsQO=Ny;sn)P?;CeGU9qc~c7-xYIa
z&lD^44YO|ZzPkYdUj1~w9%nuizll`Kx|!j)HLZc!MYsatu&WLufpkyn7tlcA;GVuM
zRRk;duSvFaG_xTM;iRGB&K*VS_q3u~9FXtN87hwFp8w`MAm}jzisw}^3*baCnc!PP
zvMVfzG0WJ1E7S!r6)D>nyBKuRU+G9+wc6LnwKeIIG7rmMRBg<>Q`4XJT<wr4_Q>bp
zz7R>zlWrhqQxfEhQglZ{LkkDQR-zirQie?$bmr`XM2t{+keJJTG@hh)mK(jb(#mS|
zf|dvKtXn=T@ZG89a5$VV9Mhz@;%VJr3~)1}RrLQ|uCU`=eKSLjupKqDPfzG>&&d85
zx|l`5bH~KNNro>>LN9&D&%UV8*xpATU6RGZ9FGO<zJ_sY`7TVj9JMJFT5SL6SxPC}
zPI(-WygLIL<71j2Z-Y#~HE`~`Dr~}U){0zv(ijlyR(44Dm|C=x>*s&=i!Up-u^bK<
zcHOlhh*el2((jj{0<2@dtX!PbMKm-vy-0@X39EEzJ4Ecw%ImfF6<)orA4a>14OA<c
ztrq5z8<VBOAqmhqJE1CPgy%=vLK+eJ*p?{xQ1{D^kmle~lHkd(-;?!WHdF;NnH9IA
z?;yD!%5QY&32Ex~J@QofD&UCfyy5w^_^SKybRaCWB7$bgI_>y~O6v5{77W90V?%lP
zMd{8K)a3lH*$1Z^@^hF(kqkotqB6x`UWVX#wpwGbsQTTRP85kSq-!fzqpM*y`urJ0
z#;+ho{VLVGl^+kLk_@v5)LK=xB4Po59dRw!=*8aCd}Pwu_3-44m7ZhZ_gTF4$bb4q
zRm)1jwe8g21?rH5#%J{c(volPuNn24XDyC1PT1fMKyQu!4ERR8m;>ZbHmCWApVX~q
z6zq;lMhucH3>&0q%EaQ9t;;jaDjY|*cdpJ@%@yAri*EDNJWQ%LdCLjgrH@&4{fW$g
zr6bH}n}u5GpUWvUqK)!J)o9f^=bz4?Xp(t&NA|Lxvdsb9*`oyp<6P&VJjbc%1zz<*
zf?Tbd@oKlmb6P{bb2k<blNbeVK9+X=uWJ+MPGBjz?Nh-C9+>>^w<#qh#a2&6*U(BI
zDa_=--Gibj<hzuVbmx?wzE0;m%jBUuy|Xll&;bnL*rj=o%jlt|xy>}QVax)pqGJR5
zhuCyPF83>_)Y1aeT*KR1W_g(>2(ggwo5C<wSQ#B09Vp!fLu(+vWfMbMHE=Uf9x8YR
zq~L3F@#Jn066}`(R)+eNO)x<;uimk-wD$bfq91GHH6&?WZ)o9{YdLY>)Shgp6ukAR
z&w2`3I4GU2`1{t}nS12o)#I61d$U&3<fk4DSL}^DE6i<SA6#Xq)R;##stD{j?h5a^
zx_Z^eK-<I^>eog&bC4H~URP0Z9;J?0TPfA?4l-Z_eZ4LsnB(p6ik-au>mkLNk>p_b
zti;Q#vc$Gc+>)8O8BX$RlSS`&TQr>SVaewo3FgYGx%AQeEK-EW)SXdt#S}cY`W@V7
zDCUaa;Ihp=y+fN%eYt(8Y0GL>c)exnG{=vsoYJ+BmQ2j`2Xc#dpXsyTSH25)f+aKO
zob$5oVMsMSuZ|j#s&A)ywGQv+sW3^37ECNa>9!2|eT}{)`i-6K6#d<ic^9-Rqkg{G
zmz#!9rtLu!(Q}v3GTs5LSV7iVI@Xx0v*S+xkitgn?D`P*kpoITjJhPw;$5@$q{F|9
z95>e&nTM;oSWBUYleY~gY<0nGl<a>_aKqoV-0<2_9wUS8S<)Tvb%Mtj03~+xT4p@J
zN^8u(yfGXuX?NcQvU>Rc&@Y*H_Kdj|KhG(iU-fzH?xz<DX`<TPqx(I#U8}J;QI|#6
zjNFEwbETF859Q~6Sa(g{AAeFJ#XFJEm`masA6K$-?{I6&J+j)7GWs4BP^`ZT-M#nD
zgZci;MyY^AvRtbA%SAF10gMT?w?mfX)sRrR^~Brll2o_wO0y`ZK*}xR7RPGBXt)_3
zN$6f2VxTol(U}^=-71y{X(u^6XTx^2$NATt6T}yNn#CVzFDfYSXY!JM_>B-#Tf2{n
zd02h)xL}*2<5tOS<h3mrN8pg%?Hs4=_x6f;8?-LJs-C~+#9v@57uIDLPxLtUuBe)~
z{N9DIMu1xqIxd&!J)zgKdHvCIzaLe<>$QI)q!vS1c^wS3-(G@jSJhaPF)+B9u9-oj
zsyu0uxq4>{^#ZDJw&ZX~eHa;Td2F~&^e%MKf}OL07(uhdDfe;#Gkp7&Qib3m2soI(
z`QpWCRkCu&#m*oqUdvo7$%j=GTdM5tQ5JPhVz2wZ3WwKZU%fs)_%m$&Vq<Pt1J$*h
zXb<Mj9|GasX6rK^*QK8J6{Ry+FEPytXh7SZem!b)PC$^>xrn}MHUio#{Hk8Suj*ye
zZ;lr=%Ns9+NwT<m?Qul>;5hG_st3uCCjRap{`~}wmJ|Fasj?|4u8BvvoYx$vC8Q<K
zm~?SS6Cf<~8|k=vI&x|b3}Z!3*A-plPa11%7(G%*x`WPF{~QVZYoK2W$Rc1&ak6Cp
zPp!u1^WB5ATXo3ER@lKhAGe-m!3JLz5g5(Cv?L5kQ^$Pm0YaUoVy@oj-7{BaUYv!`
zj-$fe>NT!;ue>BhrnaqCsUP&sm>m3MpSRb2y#_p|=Ppl@7(j*v!TO}7G#yP}YJKoU
z+t-dzRrPaq(Y&+&<p<tnZxf+8#`#Pwcq3}#r+F|*wp72e|DgRke#6iXhlT8ALWljn
zq?!%azPV3J5bz&VqCEDjqaSiWh3c|PW>NxYEP6xoD*YJE_^^L8s4<_#VAW3Uu|j&O
zkKql2H7wmuc=N<WP`Kax_-^P?#bxCUsL=k^a;Fu8ltucR9d;ADSptPt`;LY6PShKB
zi*nP3?~iplHqR(@pVp_ptRXa$@#2))%3=c#Y+oWT78w%KBDV;&C&eh}KN$(7vMk3y
z09SS8ii+J*GO1g0McpNR{l)sj-Y2HEE430AHy%oh0obadwD$AAm9gQ!m9coPK-L5@
z66_ZI^o{fOVw;EG;LYtib&oE4T=!ROO{H*$sz-d?Z78mPH9|z3uq-qg50?tb*5Gnz
zR*87G!pd*5l*x$8Gr1ounb2~l0Re%wtph_Jk)aTL6{fN9I)LXfb?k{s0M<s|`+i`>
z-I^gJ?ZNPns#HkcIpe*R`NMUd>*Hx(5(Fe!xW&9!s4A7!gC|>+5I^=^R)I$tyR>y>
zze^>82s|HbBW3j2KU6k!|7IicK1J(;u?CBKv0Fx7I*V&qTd$}s#Q*5Nkl_dG*oe&M
zUi6hBZl(?o_{=inD)9p4QHS0Y8J&>IVqxZ6TrdQ)e1s(Gg*lD7XQ&fn{-=k%?ibeq
zd(n+%ammwvt%sbSw0voIRIgy|^A;Uph0{uNA!|V{JqmGK;w9-PofesDE17NJ<a;*H
zCnfYjz;?3tQAqG7J*FHUI)2uzAB7NS#W9F@W8EPg!w>7ikV-`6QfS<UY_fLFtwGm6
zIAy>2;3taZe>|7#|8p0=>`wq@nCBy7JWF0KL5Bu9IiWAn`a6^4Pr}tZS8Kx)>-rnd
zw-4rz`A|McyS$&tC?a#2)zgD`v@}(?YAM5t<=sx|GsgRtd^e2nUkP*Ddnvn3U8G2~
z7cg{N7l+Ldo-eDmI(<V;p`S3VqH;t&n;#RCT`&!_k!6qv?UKZ!8p_ar3A^r~RVhB3
zH4H-|f-5SQoZiVVN3wbSa7ikjgeSOvv`%ZFW8P~ryCpW=8e~|Rmvo}~y-YnOzn%k-
zw3Uo2TuXSpp#EA$d`Fngma`m=P@cYjdb!fG=;`A(h2~$D0#!rzIbjV8WEo8=qEXgq
z9#hc3-zhZzwbLZ3z9|OP(G<|AaCY?K3h#%GW!UZJC2WLeuCIK4S}W~0_44RvKMrsJ
zwyw`xVb#ZCdK@2*gfni85+q15^M6kV5JsyDsxRK0-ELEGDmF{8q<m*Irk4w(7*Rd_
z=3^4q-bdTXx7@sDA2yP8bkkzJzv0%iu_JNP4v`wmpZI;`%D)ze4xRksgH8m-4lmvX
z&QB=coFF@_q2(;-w1*U~5TDKUCj}h9qsm*!qlCZc8JkR!<#U#Dh=<}cbEdB7jahk`
zuieRcI(Rjo*E4TCzwMz7vemR5*(3~0^eo~B<8^I#+|1&g%)#!sqE3h+D)?wFpqTkj
z<otiVQZ`?UF}JTQ$CqTd`DMJ|IB$sb%{g`1pYw`YH{H!#h|z(t!hkN+;~KdnFXd_I
z@wJPF)L1=n(clLzTOLdtd5Eal$!NENtCC3rd5cRAFClxwGYyrZ?Qq=dU%|&pKbv}C
z>Eb`saF5S%z(UCScRI@7*jbW?HS#2dl;%y*sqc_B-Bw|*rV?&co_dJVG2D)4_X_;A
zHWDG>3D3FA+@hyDT3Yv~GFZ>^4qD$yJ|9jKRS+Hc+Vz`-ywfwZK1hi20SQq$;yOCF
zmp_FQ$P<Pf&HYvmR(z(NKB0;IzQgye+bheE-=fvs)@e6=wn|StM|Ws^!Tn|k<Apf+
z%dV*x9@N{01V5mTHA|==Q_77eRdXty0Y}eh(A_Evr>6$*dLl&T(pvABoal}$Ws{mg
z|KiyZA0B;zeDX!@us)w^(&SjL`ubj8yw2s!t$Nx_uKX^$-cDrT-a)P%e}?c2q9jdQ
zRYa~2DHn`&5*UGusv}}YDidub!)4Ow!Z~624o=Ugxn7L+#agE;;86ds!&DWZHdZ8q
z^pXoIlyJ+<qMqK<2>yt3Y_EWPTRS}CST;_vw+7RjwrC~K3RK#2qotU4SH>=N9G0&n
zTpzi%-$j9cOy~dgn7Cj%&tE~``Y&Hby8Kk|s-2==lP6K=?UOPal^SySf!6b-EGcB{
zx~2Td(;?$lw|8-R2l7akI(9HqRs81%Xoz(8L&i!yC{g^XQbe18fd@LjG-`Q91_A|c
zPoM3FPrz_`v~gWq^`cTV{Ehs&b@|X0{;xv|6*CHaux?iQD8sk^WX=7f!X3rp1<~{D
zP~1h`&`?P*0ViPdnfiy&_S3If0nJAd;e19u470t0YYQJ4x!f*e`c%nwTQcofcSD<3
zcAK3W>9a-9c^c^jcKb$FiWGMJbH#g;KNra{27|uVwPlyo79>4K7vIK7jRy^hz@FGC
zqw_T%I$n~Lt1N4K)6=gPeg=}NjMCvVvt%5{)G#b~Z*7*o+<AyXh#FSBpytYtDQ9~5
zmmL8lWdQ-z2wr^qFFOMG+hvp`!C1x*<Gk){1zt%I*k#=jEc}g|m)E$TMNjwCaZ)X5
zS?$doK@N)UMzKBD*8x_)3AA2H0$(HkKDs}`H1Go7*G(<E75IOzWU+t}?+=T{`9yq7
z-anB%_{abt*!~NvLh$87NeMadYb6v%WC6feUlttin(*KGCe=z3_`l;T{@P1G*aF_|
z^>0HB_+^l4-2aU~1t9#tKSdCQaKcmyUZ2A#i}ykBKSCDM4D49{OCBly+crh?58Kpm
zt|w{0PCWiMM>Ya#$N%3S`-d^}-;|$ALxqMRC&*5D_H+O_t`__HpOl~fT(>{@pT8F?
z0FT3&NS~#l$-IK}hCB*uHPj%S3yP2hcMqi{27a}6YUS3x&yf!(*<OOciGQbo{Ks<s
z^%rJwt&fEmA5Sn_Zf{o$7Si0_zZ`$<yzDi+J$+>Dp$HHv0_=M0VWAz1yCe|P=PcM2
zC{FB|>f_o8);_Oa!L-&dLJf@W%6dkH;*mVp{u5mfkUamrtiKVAuOm|zQKHH_47Wr*
zPhZDN)0lyEvHf`<B{xh<MQ>s=HP5_XmZDQi79-dFO2t)`i=QOS`0I=!a(nk<Nv{2;
zfR*?9s*GPYv-_=htFlM#_5_)9pE4T$l4bp0{W0QyUK9Ssism`LbU^?X<k<Cv-$jkh
z_OQx*jJbSbxOEot{*CwtZyEBwlQ@T1IUc;rjHpu+)WSul$@uqJlnjI7v>%1x*|MZN
z&4VSU`OfTh{#~n!-|;aQ6af~gh~oOPQ|NrweytGpwcQ-Ql*PZRWs4MeXmFg!u^>a|
zL*uyajnC)8*6_@hb&Z02*~j_<{G`7zwAv#KtseF=G77iFcFbHd@*ZWpc}yZnbed_g
zx!r+Qukqm<JN*}52Blwrp><1GiglkVqxD-me7NgEzZ~v+j)TMSpzpB?y~bdM-|QBm
zXnKJEDquIL{s-1Y^t>o}Y3>aG`1gTt{$p2szK;iszrKRazVhr=`rL+1C{l}{_(qzb
zVfn5{P*hQ{Dg3-hN3c{h@N_+E0dG#86SpV98jUEXHsV83I!mCJ#3m`pujv4FA?pqN
zDEE#?aM9=)=d?4cRtS`Va6e;2ru}dTunOO9AQ!fbaVhk!iUX~aR>6pLc`w8A1{SrL
zW7%Z4Bb%6_90`q#rPl~<vlleHZmcp9ZN&RiBpBS06j0cXW`w9FJ34mxNg-sg^$dpC
z&CnXh>H#C7wfb&WrOep%-CxgQYv7TTi+4*NuQ4=T)yam9O{$0Puzs=dY{)0^OYOHR
z=@W^W`Z)9)L#n$$!Y~>r=w5a%mk?w!5ft5e9hvv%Nx5)F=%FS&%BF#gE~Y*khM<|5
z_l-IUQ#sl9Vh#R9hd#$9d4UVol3myc{0t9K@lr|`0IXekdd{cDh}{3g9}1SNmVj9*
zTy3Z_c6SjKPN>|&yk_K{Dmu4L#i`|0`XWqvqAHAY6>vJ9^jF!8*_saV!+bW*<~aP6
zlhM7aVrM?fycn>LqM%OR@Y}x-0~fZer;{|aQ-!=z>n8g$_L<dV6gpEsR^pm1ZHQcW
zrqv`R>y*B5g=w(6P7r0<u+=!nRKJjVK^Y0q_H<G;o$$gO62F$*-pv7!HxTqXKlI8o
z-aq-QHE*Rp_7ZV*h(0+>C=~VgwiUaxsJiXIw_)-?=@+&>maZE{t)o-e3~~+bC21G#
ztR1dtd8e+nxZT*^PTaBj-d0uU)V!H_q!j0>;csxQR)mJ6s(i1NmBUYWSJ^EMlJq-W
zlG=agSq)0(xU7DIRRFe&9fpA&h0X8}I*!&?2Fk%O?c1_L@om(Fwf+sGc}ks+<O@NP
zrl+KXop8T^(8^;m{los4t|Ia%xDDD3ZxBz9Mb0h{<Ytk=BMfm2Z7aj(*@;h5nit!7
zo>&$8b&I=5`p?RA%P1?)dj3o|&)-Uw-}n_@$n!ysbR=Mtw7fy$^=G0`1PD4I_%}s^
z!mGR(LIAa<JUIeC;|W+`O<2DjMo9UKcbcAS1<NsG>p|E(U%WZT+D(s!*2Ot?ARY7H
zfApZUhweX<)K9(gwJ*ngvb$RyojkY@KabxmK`C<b3Ss-D#<Gfcb?+y%BVTqu0WOd8
z`0x!a(yLEjzlnzfxC8>DSC=Bw<5}nFSxjLFT|4e+F}G@{z4Q-fTxRTwO`g)Xs7dp7
zq>W1`NjeZ*S(Jh6X2ZnCUL&G3QJtJf+r_)ac^;>AiVVNyF&tOg6#{}tcI!*;K>>qr
z%3g(AqjRmw2&vm(s^0vIm*afmpFwB7KfjzeLW*j|-!=aCYXPPZUoFA2?g2_u`?9%W
z;DJVzm|v_3Ye$v<@Gj3uz@LVUvW9FYBq?WvvbHPcM^uiFQEU9-IZ(#nZNj{Pl-Ffi
zK$Yv}N~lg%D7$3gQfNQ6j9t|IS>A2ozfL+9)8#4eIDo2p3b}m%u*CYFzXp20Ec}S&
z;binAeLal1gpttcEq&qqYwxUKwcED<o3YBAb!heUXi>v+`Hcixgd(7(307M)N^f7)
zr@!`J1K_&>Qrx9vrWwh5iJbT%<JxxoM#JSzFSQfIUzQTYhAPe@Vp>-u;!EWqx;p8&
zL?ilP`I4yITSEX~{Ek%W>7Ez7xgK<^xAMp+r;sKt?6IAw96%gADv;XB%S~<GTN~R7
z5b%}(oFp*m6gVgIaB8l2tL81N&XC{`c_^)_Icwj8V_^3`$5vR1K`Cc-q!Xz2oJYNw
z0|4fF2M}&dW8vAG`rKVnTr)EajE{8#-m&OoI!p&ZvatAN8C<ILTXxmGI2J#z0@|>Z
zu6=07RP8DWT;t`D;j1&04XMuubj=F@*jBqZBrtVnLjWbZ_F>`5%fhfb;zF+*<$@0e
z^Ay@jZiM9oupC|tmr}FN{>Y6C=Vd+Y5flmy$Bt>1em8n^`ag>R-y&oAeO|waD<k>s
zzs^TKoT|(vegr>=#C!`J5RiIb1gTB47sJm#`!WT>jBt7qmhoX|wCxTEy_{`_gfQrR
z9;oV8F)&4)m$j0|F?54;vnThkQ~es!VV^$nURLScEzP}>#n-6Y9Rrg|d$ouf!YHLB
z(w!OZSm0BlXvM+Ueb2F_Xtvd)E62)Ri2FeCXA$q-rYI<8@u1t=)G}S#$Lu!d4R(o^
z43VkT$*O{rDu2V78iy1Qey3HAchQwg7y%%zVucg%(LH_P?{j8OAhxsuaQQ!_{p9Aa
z?a(w{2kRx7zR;xJuj&#(LpWA4*710z`D(YYL1z0TRL5~%^*!gcXQK=LU;c%2d4FZL
zO1-8Xawz(=g~N$YD$93^Z8s#sApf81V%T_O*dRt`f4JvCAaD!V8m{T!D0Q}_XX@sw
zoaU2=@u*NwH}K!ApxVtUPI=GbbyDsowSep6t={y4r;kGc`$8nFosU=Xi;dI`UKFur
zc~K9o2@@3`@xu?XQI^TFddiT+yKe*R#zf6-f0op%J_)&gmT{cX<4Yg#;bjizuf34K
z4`!{Ks*32jtYcZjceL*{lz*QK_8W`NL0feg9gVZc=%Ia*qc=9?Kv~^h_~&zWD#X*C
zfbbBw1S1-SE~D!%7SAUh`bWM4nuL4@o59QjH=Ig++WyTPVc(eJw|i2o-KA&_XJaiE
zqrr|k^ElCzD#{sjL<S_k+w&TXGqrztU#+m7b!2(}hgN<`TRc|<>c!Zn*hc72W>|#w
zv18#+jPT7W$s)u3{7UBxVZTA_b?%K2PkO$t6%cJxjxsWgjX3)N=V05v=b<pRZ?{sd
zr)v-0^;D=!9ZNV$|Ftd{>wKS&>qycln-y8jg0A$UJF|92(MSxUNIKdF*{ayrT0~49
zF2|(>UUQXZ^*%h#aZ53^JMQF&tAy6Qsf41gS5U0^>g~_OzVtcc!T%Mj|6Kg$+ZhIa
zIh<6{AbM=b<FURO>gm`0F1oe0JK^xK_1^GfHHZh<%$V+`0$I{zB2}ZClgH|BR3|B3
zu}KUVs5~b?1W@TOCY)?h_P6rZNJ+`6rqW2SXa|>8q%&mi*_S!AWi6c}jUU+yIrYQd
zKG`CDK2*E)Rt`)1*we7uwO7Q+#9J+Y(dNVdua9XLwLhX2aj?>aqOVU&V^w^AuFTh!
zrFHvAv*fx*guJ9M3ZoS<tzC`sHqX|^6%8%ZuOHyN%FYzqY$R(JmaEY)drH?L1?F#i
zoOP$OSE4SGmog%GDw_1l-^5>J`;K8I_qrq5=i*mu3`+g$9N%U1#VYn0){KtYy*D_%
zI<i+CcTX#cpyTOGt?MeGA2;4b*b`1rWftZgDoR<B6f)N{WDke#y-;q4(k<bVBv>3E
z()m>$&quv1Q|ZSxbQ{)sXoX*=rPwCuz8cz}^Dkzm|NU8D@LiR@W&rpN)~#|Y#9im4
z`s4DF%uAiVeCdnx6e9|xV^n(ciS(P!$vN0n&JioUN9oMxX<YiV4gzNC@nEt%h_^C!
zngg*MzrK)6`p1zE&O4FQlqyyVJTR}<&sr^gKo=l_m;Ju@5Kqn}@$x;p4+MQ3B^{lI
z1$N@4XON*+)XyOLuFA&b4u-M&#S8S@F^z#!5E#8YA`ugK_W{dY`?%pb&WpNwg4|a4
z^x+tr31b5C?SU}I%d;JNuLLVEX*E$iVGX7eW>?0J38Q2U;qo0wiSb(yq9!IT@53s4
zm~sS@x&gIAJ!)UGzPaPT7|rPYbAYtVS$iXGQv2+_j_&#f`5uE}Eu4XR%c~RN+Y$n?
zOijFpW;Do=5ow12^i=!sV?4&8j}|}PaRc7UM+D!8pUI!<7o=qKy#SEO|6^9M{e8jy
zo*ER79B?SDB2lB6XP;lOnX=hv`|yH#eO=v!Y24J-a&|+G%)W<KbOTzx;l(7pV(THo
z3Sx&YE9{6x9}O-)Sy&!g7V>Yr-KJSJDSdV4A6KXWv-6IBO&joi0$Gtxq*nFpJMy$I
zg<AF8L5eu3x{kEKj9*sEPhCIhBz-!tt9#PXP0T^N_9!w-rQ~|1^;5`&NCiGet?x5!
z{996fOGiq6L!vq7pYTNwMygrhKAvMxvPJE0o$r@A+_+$<F>Ny5hYFwy78nI*YY;tC
z-oZF;okOk&MZ)u5d%lpOxu6dc`DYZ2j96|97fCLUlUo|3mcBHbyB*E%h(gph4&a)7
zbf;coeFLnHiOTmjXv14eJ*Mac96KP`_Z4X#5x;o*6|YxXBfbk%gh8pj*La!-C)cap
zj6WF3QI^@b2w+Kr+(|gbk!{u~&dCSaNU!vDKj-cT#`;wqnR)Z^(pTL)@gMfTUi6=U
z`cHnF9rpMfAB?ypbK>mApt_LoKxPpjKfY<8b4g?e5f8mCUx>TWGatu{-V}zV&@uIQ
z41dfn<ZlUoBVw@Q*)y22237mq^&RO-)N2-TG`B2!Xb5aH*Cg-Zii#A821`M{h+YaK
zxOP1p(GROv7+dLeQ54T5w$rP<b+v+=_Rp{8<SzLPq@Y*wI*83VM7;&`aKi${;HDo{
z3ZcFtSq~bMHi{W9ymxp^P88hkt)27HLsoU6sa{NzSSWmW);^+;^nFYf@|^>s_cgmM
z){etla-jYbXRfp7SR9LbFvGqkM+C+8-i$w%y@}WRvHfjotqz4yE^Qo+J0pw4_IN5&
zzXG}dJ)T1Jgr&HH3A`IKhr+e}!&%=f=(7oF_9xWUScW(D-LHD5`TTOd$(&*F9KI<&
z7ON;xCy&HSAkz2QA3HKJen%DuJF;vSs9|Z|JNSTnwKmVv7bKt6;&X%wxACKios3;`
z?)Iw5z@)vAkX{oqiEEi0z)o+j?<Y!%)*ruh3IvN$KRwhP^W5X;_7>=u;v)Qm^XARw
zb>|Sn`Ftn#v$gEJ^In5T7ktH{-@m<mn@t`Mn>ndC$s<N{RJArQoKK<gj4{1a!*Cy$
zTB6`y7Uh01qPR@q(!3-C(*?RKkJvTH)TWomOy;81t}9$MTxD0`_znWnI0GWh_q>{w
zS_qxKbM;Gy*ej8L^Ov69y4@vNH7GD$suN&@yc_LbQL4t58$9wn@*cXgLgO6lkc?T<
zzKvyyVX5AXV-vUO@nm&PXh&$`OF?s<7Mh|M?M!-1x&^!Y+B%JGy|}cpyi_v!;OhI6
zRjfswpzQu@Kk-ihr7$nuRMNj@7!>!R@;J{xB8QCZ%lZgfLiG#Gk8n0<J9Ci=lBU}t
zFI(c|!*y|&jqL>#uq@?+Ix}BiYPW$2S=?2WsNkRXbz;qFhSuQ#F{vBOAM3+MvcbeJ
zq1@#|8MCOA!PmaCr^w<?AOuS;l6;4PTcz6Y!zWeutN9Wo^0H8b7E7bR7<;69O>(e(
zn}T%-=RJEKFNcxDJgO54ebWu@x=O=&57zwS;cj^pg+gT;R7_Ya>B)$UNNax|R;?zx
z&)+MTxXtz9H&AyHPtH?<f>(?xtE1ifYj4?k9)>GMCyM2>>|XHvBxhV}m~%TSzSmTo
zaFFj&mbDcn7mTA*S6_c9HJe2wA{dLAJEvyHBn@tj)$8XXw&8NkP2=!;TZi=6eHHgF
zt2?);4#WlKEw7ygtz7)Y@vk1X^}<6yETab-^=pcvZ-Eo@qtz)gLVAydim$ikyfM4e
zD}Jh*JLs4CzyW)J+;@oU4<ya-&QYYan5YH%kdqVw5`?6y8=2RLKsSW$uUAxsU(JkS
z6z=7mP(Kvz#IJGD+QX9N;MtiQJCm-={b~G~cBNT^FW5;q`!-V)u1~Vasm|F9xFVan
zBpW<|88!$<=$rN|1F_-9xVXX8I?DwFpWj^{j3>5?x81gO#D-7aTHn|eSAB|cAFu9S
z@|R$Bj9TwjD*EHL0P<OSqTphU-q%dNYPma_(dzc9W<IV|mew*d`XSosCDcb<E3(S2
zNs%+ffpTAM9=?lKT|r5`-nyba?X#Ea-<UeJ5%hX(R6Z{8@+%bIP0trJMy16QwnYK8
zM-{4T6k|_*a#Uxfs8$QGZxRd%*PswXxL7w@hPv|)zV5)cI+1S?4)g;B8HcO(0#Uw!
z{-M+naUTwIQ^v}^7Au}fP5e5!z4HpR>Tm7+(Zt2Ou2O(Im(2ns*I!hxUSGcSHo;ui
z8fF;Ux@{DiT5zjMK>)@&YWA)UAImt=oyzhESJV{lCLqzR52f4&`^?|vM|rt1>aj5{
zQ}=qLsNVaQ9Y*X&v+Zli0Gk78UPV}|jD1e%<E?f`mbZ{@&6zLVF{bE`uf|3P0H88)
zg3Cx{gG5+B#5D)3pTe(6mtYRNJm2kvlI6`IrU~ONWa`)16qjn>R%}X5&IGbU5W73B
zuaxMWC!ZQIe1Cs|<HZRGr#F5yON08%LenQDN4|U0TV;avR-p<)y#uZ3IgMdj(Zh&z
z5{Z4^x(AhZWFhSDMkF*%sAM&_=^rde2UCGYNas7aFTLWKB<!tw<T&BLno8>G^-td{
zw|pm6yq&cgrL<lMQC2DD>qqVkb)Yq+6tWgp)&$EQs%0M;w$k$3KAp1+Ir1^^dY+~q
z8>q7*aJ%5)PeJlr@FX~Y;UsOS;0(Qrdg3^+Jy!t!#mPtnf>&OQ-Uaa*riuWg^lNsb
z<Awu?$COm%H_;U5KQGTDmAgKz<vs;VN!t}iI^{<v<0#z!8b@_TSI#?*eR^2#bPgrL
zB9AB$<wYO%49(DGiP?!n)RfV=T1wEZ73`+?@q^*hK&MDJ*PYXU<-$vX{`*t+VnCV;
z#EDwmgr&)DUq0bEJm#@XWp3Fij(-_IZ?KX4^{AQp=V)KI`i)bphGgShdF6heZo>Kn
zu6IIGzV%HwuDJrlZI+fHylC0?`|ITe+D}~1dq-<=wK*6}MPz8@L_gj_d|*uRxi~le
zRNMlGb{`hq&WzWtd+ua|r$Cs$siyygsmj9oX|Gj0XD5Xy+qq=JIDQQr3e~}H7{>-<
zrh3#1qI3fJHr;TUi-;me&Z!zE^jLXEn&>sz@@&9|y!reXb&s5S={;>J^E$Zuk^8$D
zYR?5mx$yu$SoF=yxAbw37!TZxta_pM_C+4d+84m(WGVJiy$PlJ)~&M^I?<MjvwxT9
zsA02+(iubX7_Kz{4>&K#0g_}KQ1RTqSvO{xbj<y};kAz7?k>=<^H5r1bWgLJyWU7Z
zVj)@6=G~|4K%$+sN#Y;e8FsZtgOg+Q%(7|uV)t4vuiE-0hbt`!#k!aQN1{B)!ZAZ?
zW~!f{b3|z>T9fo#A|LF9Pd|&btNXibk=-e;mk3%)##Y+RS;0kuYP_1JQ%uJ8o;(aR
zkqoA&<+iQLjzzxLC>`%BnqYL+n}{pfoT9##!!71=!P&li(fSD-A7Jehec{3&nhby>
zX>u``UZExgB<G{nab;%lPh-ux)a@!vzeTXQhm<MTL|TNwE5=RyDbEmcl+CTKzjKv}
zp7uVjm6{DoCG_cNSL58O|B+Ts6!^9@*k_BK`z-GQBdyPmnflm{nEqaJ_4*>k!B5`x
zNpMQ(G9@X(k~3x$%gRE99WA1}JSB2(f7L%k2vndD$E#nR?6#W~K|920*8by1yBXC>
z5x>SpYYh8F3DsclBav+BB@@zqG<tPqh~3XT?qKs81#q8}QJ_FTK)|Xyf^_cwUzN~f
z?E)S}P0iEEdmvGVx`0pdmB_F~|6|!y&D=qQq{#Cp(Ba9+UgDAa69M<TeC~v2?u-tG
z?-7^#E@lXtmqd$>#H6vbWYvThHS*ia5vzN9T<U)!O$OKCy<fGG`)DDt`G~S)XX%-W
zwDEO&saKiS_56hmKs)aJbhop7frD|1u%36RH@@{6>})2?@0+}PuNAGDhi37iO*~&Y
zVXpKK{`=a~pX|~${f$Hiq}R4v4lJlCAGPsE-ZH@Pt6GTN>j$eQONo%kQCD{CG*ja^
z`m`ny=2Y#LB8y%bjwg7}NsrR$-0)Io?aSpMqb*H+i)3Rfm9F!^A=$b|#-b~+(LSs+
zZE4`Jb^Ehe{4rVq9T60ev5w*D$G^_$_y#HcAE_FE+8C5s?d!!7vL9dK0;3>i)i67n
ziz^Q*zXXxiQ=)DH@TZ9fS}s-xE23^n`5(05=>74$Jczk;t8$s6b$;7TIVd6rg$XE3
zyALem&%?8Gd`Gd&#|iwDSbdcVpG)_vG1+a~6ziDmBXqk=wM;SovoGyLI+(K8SC^`0
zDs7tH)3d^C7cTzno*q+4oa&R6>Fv~J&ZU_$kCz%RA7a{b{^<>(Vb5|Dr>{_>D+OqJ
zDi%=k^Ny5<jZSx7!6h86)A~ex(TtvjO9N2^XvQl~w;f(~nsHEoZ=7--XV^hz5Ff8U
zW6-vB@{u1}3jDqZ@Q*L_09_ahzN!C5)bjI9e*c`g6p!mZw}PhBgUOj%W&?>a<)t8S
zV+OM{p!8Y=J3Tw%*ag0x{RP2oMd{^gi9F69E4fHy9Tmp2aW0qZW>tBNHbvhfX%jrb
z4U}qqPv`92(UkXvFu7Xc+C!tcZlvK&V-{&n!YW&RGw;OGzKq#0Ymem4`v_%xycp^~
z)b4_Y!Y4<uYbM)Y6|=m|;PF%PHd#*UbBBo7FdY`mSUwdBR0~@bu{3mM+nmW?K{0T~
z@XN8c*tYnyu}|IxdJ6q23+Ip<CHorU8e^Z;;1HWLVABOPF!*{(VS6BR4%}Dgn|(-c
zfPe6Gxj$3Y2{&Y|S~vL5X;h6mTo!%)?yEu5z}2fazJoS{<*MJ+>ys&8m=s>|-!R^r
z5HxIc^mr^IhOj?cXU~D`!KKA3PI<eu&}Mt?74kf2v@Ot2zL@3P>;$wbCy)F)^5xRQ
zL~9+6AjP_0A=fVU_(~Y9&!aPWSPg@8UiY2#7-z|D3udUZ4Zj|5Q@(xSX{XQ(82P;~
z`Tm&FH0l|j;o0D_hS+27BHrG<?jlbD`vpypsNCL4jg7+KYTAl&eT>)_ikx4A?t%pp
z<slW_{$V$@5qaj{=E`R6H{)sC6Bpa8iqpPDltT}L-RwjKJ*GLf!0r0xzA)Wb%ql|^
zEYLrweUNSH`47^j@-OH2BZ`hA3e2q6=9KhU);%0hi6E@>t@k{*bMbG|W6&dkXJN}@
zI)pd_nK9N@IgG|O)^e#L?m6zL3Zv27zHjd%U17&p?s5ob3zU6n#Q)B7!Y?#%Pn#?i
zl}dd~a@!e__>i6LB&MC0cD7!a$lC=R%K&%xE}@RdjQ7_Va25r++V)rb&aj>(eq71(
zPCU0{)A%xC$#u@P>k%jPBH~jl=0YdlVF)%KejQv<a|qh47p<$^C4V{W6>1H8^Ng*=
zOK)Ok9&2ff>h`*}v+QW8%mUWcg?ldzE;ht%&g8E?zLfmz)ls%*{hD}j_q5%bSfS;1
zVJqg;-OJZI*JMTOKYm6g|8iQD6@4#6665NfT&hI)I8`SRDr?v6E_K~;G4x1l>^P#_
zd8B3j@mPNCWW{4nBOKv_kOIlH+-eCi7rP@w^4lZvuU2H~MJB&S8zQFtlemHpX%DWR
zYHYZJ?jlG{Ylon_6v+MGH(m3-@fyi^W|$}l^7zalK}o8jG^+??tORBA^vs<rhUAoQ
zcNSigx7Sucw+1kj*b!xdCnC&#;%@a|c<g`a51{XtI`TIvqB$F<RpF^$4gzYM%0VGg
zeKWxAu<{wlZb;fXV}eKg>?fH1M1W(LcP)YUtyh=F_F^J`?$!wf1$?_3Dh;(;L9Fjn
zS`;NZL6&J#U5X*3&EJjigS9nTi*u7dVFWYR`L-HaYOKGX_j`DTpP`qIdr=6*@+ChX
z)m!dKvuAa3<eeojTzo5jR*Rt*Jv$YnJDCbbH1Z2ms)+M^>^dgbKhy){&sazQGA7t9
z^$j_uz&9lh^x^sxaG#o0>n_Xew^tKt*AO7DojI4I8SV<Xgjqvqbhlji)^xthx{xV2
zVJH4wM1G@}>AhV|j((CenW}m9``g->(Zd_a21t+&`}Z&Aosc4I@z<(~74&;o{?V2E
zPMhMbNCI?z$~$RH+@5Zb{pjc;W5y3&Q?R|vV`kGBYr~d>@*R7kqsfaD-&p6c#0SkU
zhxV#1`)f}2(38hxaOEZnA>fMzj3bTFqPfrV{MaY#u-!EV;D*8Vw{u0oWqG4;5>mmu
z$&MKfRLnQ#o_@*ViUoQq8k&R+V$d#T$%e*AuyKF<sAQ<imK>)V8Ix_vPR}WO3dGF*
z^D(~aa5I2QMqKq7nz;J_$s~8&bH~EB!5^)!g!YLJ8qiSY7_Xu&b+M$py&r$`aCb)^
zuD#6Vj|ZoM&tWvHyX<C$tDM590w2TKOl0$x?zkR}2g9K8X{Mwlm$5mvQ>Tu1?gKZ-
zQ9ZZ3o>U`!sf4OZ8#{OcN;pcj{1~3X7V`BZ!k}7**?{nI?OYR5r7SO|nu5SED9wFR
zMIJIO8>ZT8TkkHRRk<N&&Y%9?^H{SIu~?i=5!8tz4Z`4f;1Jn%chDCGhw|)gS`dhO
z4!)_?e?1+FD-VG{Sj2r#cbO_2smvBf%HOJ#7T{N!D7rQ4X#G7SgCw<-&82)Gv()Bn
z8du_gTZ`8moyy{Ft=}T!c1Ce&LO0_*L56OxDM=W)g01IzWIJ99b6F?wU-49aFW6KV
zewwaM(0BRNzRmX9PN*4)5aWk@io{%4x(B#rAF%of&AR-OgUVR{n}3{IbM44(Q@x1L
zF5*-XEfbFn$5@s^diU$Z98Uawm?B;-ZOPZHy^XeseC1*Rso}zOW}l!qG06f|>&$}H
z7&w8N<dMxi>dMzF6%6R4M|aKGHiS#h*cV^KW}gWG1$)d}^#JY_xdKRRVAZax|C%}X
z8ovw*VNAnsjo>W59=e|NRjF)NfTHL|FQ!V7devzZdf-O$Z6nfr0)Fomv(290!AXtt
zdpTb<wL|c#M=7v+RUtp0M3K6dynDX;{obO-`RTkhE6?7rs1W`qhn4ZB`&01_-)_IA
zh+y>TMr1ZOYM`awFS8EyDc<zXqf&Ak?z44p#pAF4!Z?V!(`KYInMo(M#4Mb87e@+?
zLb+vH);&yY=J61d#iW%cDvL5Njhq>D8KWA75|Redi{MwOGGOzyOCOovwbgI9nA?To
zUwT{|9W%A9C>LAkD`2xblS}pUxs{Fi3WGskkxap(KHuV*8c`w1GEGJAT@M2&-_TBr
z)&tL5AA7^G8D|lkR3BEb?>7v>7AAsL)^|3@xg3@gziWefmOZToXvC=Sq{X;*9k_a{
zZJBCMqF*(m5&Sxm!8%FS_^!8fc#>=7k=`V!P9aO8Uisl2F-+huX2;C@2CA@Rp6<&+
zeNulXJc;ZN=2}Q)g0X?~&E>pE)(+%LF&$A%5o!8Hm*YTT_jb0O*f9M=BE-4_MWw}r
zN;zsY)U!vZ_Z%5*M)}qqPr`E4ShA*xG{n@9CTY~u(b4^sq}`V#z9B?L?9V}7fqS?<
z!9u7RWsU^aoAh}vWCfw)W%#hSAZ^AN#+Af7xcytpw6rwgAZ)9QEk}^v>y|qu%x}QJ
z(wZIL_&Vx~$f`({y*P@-9YAgbwBk&+hdkeVj)d?PsW`*+T)+*Yxz}*GGVju0V7JM$
zEMkafhj!5g@KLn$fXa7-0NjDOS@F;H*T{t~Gms(iKu_$-ZpfeWl!=viIq(rEVDMp3
zYzVy8b~k>U=pHDVM&ylWiy=oHV6iJB%W(C}F?Y?KXjD3Fro=X0Ej+k!k-Kn*Zrn&z
zPt^`>XL|dD8gZ#fd^{}Yji>F690@#)@22};SkaJQBTsq=nKgQ6<~N}ND3y$)DDR57
z0a_5~i`&{OrnrUH#;IQl_vk6@eEPV`s;=^fb|5ojVTIe>(ApXzjAMr8Sn(G1xS0{w
zCrvdU+9HEJI-B7Jgh-m=sZmA|Ic`;MEI_Uvv=TNd{HRaBXb5%C@xjcqR|_hjA)ezQ
z1t?X9M{|Q9<u2b4=4sfcGFRRE0(Xajr#PRLr4R?Cy=5%?paE3as3X4XTnv>6m#Wp~
zmt(QKwIeZ{Cv|iteD%7*NRh~;(OLU`RU-or-#Y1ybmvWA4Rgnyqb)L6X^t-_ClPnB
z+2mDUE1Nu=S|<M+9XdAyYM^Jo2{QNY{{3Nr@x1arW{&dYbNZdEiodmCukN3IcxU-v
z9M6E&M(|AXngzTEg;W=lq}Qeq@onLdQ=gww!0)o4>j1bW;UJs{ez+#|bHDMW5^8(I
zd!*e`N9uL6s{%0Rb<PNt?kuQ(AZ}gvJgywn$k@5?_=933eAVl*+nz8Xj=9uSjlME&
zq_PmOBMMhruHqz^Jh6mFy)E)zUKzQAT<&)jH<qpA!fJP!Hi@VE%;YwWtoDjafr?vv
z!D!Xct{&;=N$uB7)bYe8ng1zqNmW~Z7Okm$v1ry&wvUpA&KQdJ!?ZG&-V1ufHDw%W
zl}SELkX=p$=*3M+%dn4J%UB!h!dUX|NR)7+bRv!#cFwrj_f1MyFf09x;EsZ~-0|v(
zY)M{GH+zVeI-V!`^Tj@@Mkcm??Yt4}&!co$abdjr88VLH_i!Kol4p5g2~M=TugOX9
zvk_eM;VEt=!-<JSDKG8gJlV0jiZp@U9b>I83&U8@#*J1pp0$4tjMKw25$SV1ED~Ck
zENO;`-W1sX;E-;lJr~v2-CE4Fk}P9|9e&aO!vV<|ha0EhMj=)L4!Z<}v}4no_(^6W
z;f=~V;`zjydJ4UDZM}{b_r#0fwuYWIhv=Tp>pcpe4maPunk#^|Dr}reDp-n+6<h2Z
zFp2}CQBOUGiJkf!Tj389+6|RW!V<xaW_l?+WkXrNW4+sN_hX}~2|YM-b<v#*Ra8vi
zK2`Z@cQC@a;&H^qJw&luod`>Hr44%b&=O9{wyw$`+kG|!lrF9>Aq;yd$cj$>fsxtu
zd4a~4e29W=R>h5YTg_$>Ae{X>xe#6brS8|lVxh<4F-UIP#pnXl_M;#mD)~c0;ZmG-
zVyVLi-r^P05GU4C0W%MD;#shr*_!@T_kYR#xUuNIrO<Y+L`vaVQ(%ll>p;}~57qA_
zeShqcaJO5cloU>@yx>_d0p1ndEq7KK^5$qWC~lsX`j@ahoZs+%Q=B*Mf(Rtz;L*(U
z<bz#jT=vY<#Q2Fb2V2pm04JEc^>j;**;8$-x?Y`96}C>zH>8t(AM*IcllW(}WbyRY
zq#ek<7NLeM?(v3{MF-)`qUE<Nz%<<eC?UZ^BitE_<M;$}?V;4BGN9+Nrz&Rv_f%TK
zxQe141ELo-s452LCkxLDf397`)V9Su57tKF7`#?@OIhEc$bhu#MsYLf>1>&-?LLG#
zObG1=zX6t*E5F33+qSCIfCBK9LKGab%<$z`$l*hU=KZ`|LhtK?qv9D#!}_d87eE%E
zLcaoZLsX{{A8})MYwa`WT;N6GbB~GEU(3$jnP=%TSq`J`LJ~Q^PJb4iu*!Re$~p6U
zCXPR$myD!e#WwK%sky~BKH;-cr!FeVqw}*j^6Z-?eGYqjN0vUG8j=PTmO%52`?HRD
zzj>kzB5c1r<<2WXXK!Y`mW@dC>4UOi;AK#xZ`>{k&-8xFNRz(IfBx?8v%q2|3I0t(
z;tdizFOoW0MghZNrJFa7Js60{M(3WG@)+p*!&7nlGSi6ZBh_wk-j^@d$6KE-e4MOE
znONs^_4>4#$?Cpq1$q5Dq3&y6n)n+#y(yYlyUnMX74rjKr@^eu)<*v7U*3sINAufH
z-ZSlLINO%)-jO(Q^OJp&<BsElk)UnUu8EOzV5ifY1c+=sCmWxaU=zMs)sh>q1ljXV
zd)`IuryHhhl8)uTf3h!n7+;8lA3E$oI~W=@Dn4|3k=__x;f;4IEZBvqEvu87ZFY*E
zsiZJq{zrz8_xLZvl9|?>Y4#j}o)xk8K0X(n_fJVY{W=a1>~;^gxfuWb2*At#-;Y2D
z^#b`y(Ywg%|FHI+QB8Ht`>@^?5JW_zHw6I&0TJoVLQ#6}5C!SIccRjzStue+KzfrF
zq=e8>klrMrg$|*Fk^o5v{}b>2JkM{f_rv>5*V3GGX3w5|%{8;H5x68b62<@uqA6iB
zIr9~`BB=YEd7p~uo!7pHZ;OwtW%#7LP0+iEk2vjVxfirHqpnttECFi%sJQviwWqAf
zuwM%i0Xi(UPaYHn!#gX464+p;Y$`cJbT1#N&ik&-XrkLF)s1$(<^HUyy?C+{d2%Vi
z9#K!wK!5Q`7gcopQt5O?rB^P&m9TS;5b~A*c2@ChR^XaHq;#pOIzU=3HKS$bJf68w
zCUGSN_BDFle95Unx764)isNKes>{Ov$sdyifpzQF%oJpiwRO;b>ca1^+O_&&e0KGr
zAElXz{H9CE!?##D*M$dORQ$nA80~iFLbPI{$L_=`Lm;!j6BA&N(@08d&Z<=%d-vRj
zWY_AW@K9hL4zzS^QZTIO642wYjB6wH$my!3b^CHmeu4?f-Mjpz*>X?VjI|n++hTP-
zsji&eTuiw6_EF<-lYBSi!`nXiF=B*jz>e49?u|C_tH3F8_S@{HA97c8pAD<IWafRy
zT5h~X)=)E1FmxYvdIYatyUMtq133K5`F~~*zp&CqV(yalW<rsMH{z@fST^#z3m&WY
zFVMvMzc3RrN{Pr^HT2ZUNo_W=mqQ2_nGP48D(i|YY+cO$RLVE6_k(}jsbzdRqN(g=
zb-wSt>@^OSz`ngTMK1MVqvuM~VOL7{d);5j&E+>7jWds~=V+!GMah^ZCW1{AQD1u#
zVI^7jP!{1jB^J#!cf1+GSUK<Pic3!rxOebEC(aZDjhU_O@a=g|p?Y*9n5Zh#;6Rrq
zZ*eoAt|360xG@WA)dUk71iitMc!*q|FmLcCVMK^`@~%~Ob~dx`$+C^nX*GLad4h%B
zyPp@vWg+xJtge8#wi$atbe_C#nCO_qgWz#M3M+SiB#u`4xT^6faC7E{ND&9~mV$aN
zr-@-Q68++>i$V*q)&~8nH<fC$7^pcY-;^S6&WzY^IF4JPe}r5`;E`v0K<0XN*mkRN
zbNLWpfPHYcP)EGjl}U@(VGL!1(z<Z%uGtx!=-_~I;}(PYlH3un(5i`}x$RBhfYjWV
z2SU1}h-$v)t4tX{R=Y=plPf8eBjIR6^uxF$um~3He~Qa$;?6u%Yb`J}>ClpkuQV7C
zANxnDvpY$)3BajW*A4;13v`JCe|}g_>gQM&s;7R@M)MCDR)@vyE}Q+--^R&;Z$f+J
zpgAXxCQhxkPlzh9ABXCQPUG%~CK7_bUMw?=Ya*^O#ZkM3awhGI(rj8Q@Pm&U0{g|S
z-ruTkA2+}35q%p(60US5q7u+kLrTZ05)93|k%zDoJl=0($J>eMmu=PbbBF9h29xcQ
zi=WHF^man!QkROv>2#+Z)l!_<X%)GXucU!l66&{)>))?BZt)O$6}wUjElqvJGK1M#
z2swt|7FI^2+Ivz4+Oks$f>Li^dgpoaj!c%icYdv}(C_19x$f)NyL~@@<OBL9|Fp=^
zQ*$l1>6Q)7AV596?-?#GWE9{$U;gWqzkCWfS^m85Ln=;#zXzYX8V}r}3g6{1CpD-<
zc0Xouauv(B@=1LwE_U>>ZXotGAWjNgV^%}~V|5pVAsIk(Y)|#Ckvg%?<NN)MJ#Un|
zcfNx}iVbYf@ZIc*gi!lhM%G`-8riK|{Bp~uXe;jO5yDAf+YX^LFuIPRH1&P(?fP$A
z;Ny95mT{8r&&s7Lpg33u^EP@@G#A8AFwn4Q(7dOkT;y8O1R6g}%;WTFe>BtzXx<o=
zZ4M-{P^X{LNIHb>U``WOe(A@5zuW?V<5zFWWNMogz&!7O`QIgvfO{M2JdxPBsY%<1
z9v@Rz5Kk_FkC+HU;uUj!$R!TP?aE+@3FA<x+DEHF%#(fLDsqxV<Xq61h(Dy%C*wT=
zX5Hwmw)-ugU1*tS<-zr&k~o}y0;f*^$ws$E8s7|DMEVOnanUZiy2o6XQEo&9>s~+a
zBtC)LQ|xj$DwUxw3%Wwr*sE=s&~kwei9)c)7Su7N1<j|pX%WjyyS~#@m&Vy-zSult
zS2cd-qCQ|NVM3dsdUaU&(THG3u>Z#4xjQj*J85CxKv!U}=0Hm2%;|!dS!64NH%<EE
z9mk!c0r{8mC(R7n7v?(c37CDVptTkk$nAnJXVKaDQo4kQtV>cfS~c50HeH`#Rw%qy
zNdo^;PXK?s_M9IzUOtu;{rrCS{IB%q{r5E2UAC0(Q)xfsdUMWI1Q$?Ouo^<P0jb}^
zg@d?-+f51hgH^xn1w(m4d!ZtVe;XD#d(xgYN5|7Ayo$SlV>JGiz-9#x3SM?m6Y96x
zHTDi<!_8)N4~L#p%kyH>_}2mafW(IW_X*7NZMMP1s&VBZuN2&QpPGqt^j)ETK`gm>
z+)ytdj~Q@T6p?i?Q%N|702D7bCCnLqtRgE<vtqv+lPzs`SuuV-$aUHO8IKs6p{f%E
zrv?KTza-UwG{L77ICc*VIWz%2`vC)N!ovT;2^!R#b#=#)rtDNRQ90O1w<bcM-Tv{Z
zlWC#mNDz_pXg=lIkSYx<nUDuuY&duQ=uM*f^Rsu7GRSvSN!?9`#IvxY&A`JoIvxR=
z^LH5ZmgS}hX$L!aQ1BV?2C+1R*us?K>|p$f+%mDID_Q&=CwPSVAAa|{`1wn0&)j~s
zE~OEUq%6PtM+-QB*57VnXi3vZIfIKxx9w2CF&2(f-8%Eh4Uogr%#iEL@1zt0AMf6~
z0a<$=bKun`Tl{$h-XcwTY^{_CYqj(q*~_<U9xT=5*eoPq*hr5**Q%6UMzX_}(9JgQ
z1i=t!F7$9|wmCy@$Fb708v@97uh(NM7sq14Na~ry`OU;{AV;|E>qGA6aN7r$lVgBB
za~d6D^1`}r^UM0iZKSv_ERwo;q3u~9?mB}@^9c`ejbo<URgNeYLRgox!cU$KLht#y
zoz%gx2{Rp22bwGh&@lwE$<}mW4O}QV113Hq5Vv6wp3C_5lyW=kAZplAH^;o8Jf616
zzx7>bI)Ta%n0~Om0)CYSEjw)0{IMJ2an3NQD4!a{+@e`4b+XJc(>j#}iyA2=jP+y4
z<o#)3xFq*-dFar3g5LPRfurB%D}$8;a1>r1MR`-2;TKc~a(qe6JeCp4u6w1r6<Jh9
zG1Y($`TA1qzxMn85kdiBOAbhFrTxwozTF9U$c~nK3)YR)O+H*4>XuQL;}cjp@ev|<
z{s^VYg6g;wY)XFQsJJ7jOf+fpTfE9w>hX|N+PXND#{Em7a6leRIlx*9sNnL0HoLkx
zLd3b}eE~6(o!$hO`ES*Mk0_p+toUXmCm?3+y>{^8;+R#?N1P<xh#c*Wz+3Q?#}S9z
zmTLpRr4UV02aN%7d~SJQwtM>osZKbQHbjR;yUrO>jvV%BTHMRCr3@h)jC=(jupGWT
zpx%KW%yzhL9bcAbn~JSk07r?#_NWN7ihIO*NCnV#qniTZFux!R-OKC?fX_@kz5+`C
z<Gvg2EQ^EM0_E}7Lttngmyf!S$$DlVV?L8F9_*ySPO`OAwu7iVPd<5%f=@&*uCBp%
z&aV;T7LM=pFLcX;sZaKS0ruFYFyk^csfmLcT$AL^X3JyiJ>2v}ys)G6tl29dFeE0h
zG*K%2Ar<~2?=Puv!I3JU)JaOCe&=H@(Em?9#_}!9nOCz4SRxf7J=@)JEVr?VLt0z?
zC#*z+UBF_pN2#9#HC?2A@uEfgPurMXjN*KQ``3;sh}lsZ>~tJ7R|&qvb#uJVFxM(}
z*8wAIV6!YR+TWVk*ZUSm4b+zK@i~qOWn27ppPpn9>#4lolJc(q3HND9aR0!SSRszi
z6B=8e_gz&Xv$35~i$3fVGK%|t;-(H7ILM`*>F_LzD?LR7W~8)ztcA?#UT6~x*+h^u
z^gmNReK(!43I6o{_70mWSdjc-0Ozm1kGg{dv?g!^uo;L!F9o0V*=LX)uboLDUM>ix
zscjvRn<b>#6PANh0EJ#GyJM&0gwxwv7K;wD6N$KbdC?iNZ?lE#l5t>MGgFe<>I(i+
zNKo?3#2gui`U25em7W%lp6NER-FgobWkhFojma9|R(9Z<KzPfdX57Z?&U9~-5LXw?
zNY#vAtL3u}Xt>9J2U@J4vM(z~meex!IR8mr{%;)q_{2U-)F3$<Q}uS4ZCyOfwSpzL
zAqexyDupIm-|5M`Fts2Apa7O60!nY?3UTbHQymWiBcMmm6*J_rQ=iWg5{KYBiXp*2
z&rl<U^D5%W%xjbPZw{`bG;=*<?oIDoAM6$ckKY`GtfA-<;@YMiOAip@&o>zKr_WuF
zB#$NZ{SXCb-MrOB2F5tw`#68F8!oi40>%{FqJeo4hLA3Ve%^qSE8vqM>7OuH-#4d-
zT_p@(=7*FgJ<?y%!mu^ZDV|=L28Z;<h{G_zd{m7HLVTV)!`bVyzdARM0xjp+WItkM
zU*}_<DeQ%~#qBb_g~33d>?Te(`PggDB@SL++U9`oh9L*p%`lhd$Y{Z@j6cR3ql{K&
z?hTU~Y-OpA95)@GR<J}b9SGw;%1-l5ycXo?amNkEd_Bsjm@kkIq=n_IB4I%9LW^gg
zD2bFLkw8y({}#mlvpDd_o{{>$_RKF?JiiOKz|kbRUEzu8T1M|&tAY2Bpzxn?c+3M4
z&I!veD~yox%A`E)fI<#-e$Z9N?f6SxxkWmuJ|EYgtMjXy*|*1wj(ZIP9aLxQEZj$d
z+{cWweS*+85mInc0K?In4X}-NI)b(-4<{2qnt+_QMo7J4!eQ;%Z4d#SP>HSNlr3A_
z(>y$j?mk&-EG&9b+Ck16BJl3k3*WKCg=N$B1~kt<fDHLsG)V>GTW<-FL<34%&7t*K
zFs6<`E}LfAfw|gk!UY@q3`F3KSF;`JptCMt2xGm3!xD*S&D3*)?CH{u<j+l951Pln
z&%p4qKaMvv(KA^gbk!#<y|dpiu{XeLwcM|dH;(%c2)hTpCYk3p3Hu8{Eb<wQEz}|T
zV-FT9{yfnI8PhXNPRXU-r~FUO_`>=B%ih0)<8;0WDGW7OUZo2+^%bT*muPE#eb;G3
zf$Y%{Mdd4X)AJ@76s4Fjwrdqp>lU%Eg5;)KvKuHLp1;C)gkpfDRxNKYXwm~n8ohET
z1la4V7qa*8J2*(ddcF=DlVo%_)+o0Vcsz?aSLUet+o2E-ND;-c(cRP3^x_`xWW6Vg
zTq>1Nh=A7<LQGoWOp+0eDh<4*f5)oR(fhxR{JmE`m=<=@?K&qKC`acRXR&}0@!KvR
ze?Y{j+5~(7P)6kVIS6FUsmrl$R-_Xx5}>dne_S6tZRQELRU#^t+uk@ryv`!3NY7Ab
zRpzCQNTqd49JKqQ@vsxFS?1Pep!-bjmjjocZv3R>f2JCko3rq2c=+_cpkphEQ2y`K
z=FeeOvFCdN^GnhMRDmjq@nLwyN1F@gdj;kM-0sgE%BS@F^AoM#X8-@zV&nP85v*ac
zB^-uwosoCeSZQKfY2M@6nhm5Cr#8hC28BGRGrGu5o`Oauq6#yD%cg={6L)&>@*Ud@
zGp(AiNz25*!gH?8CzrPHJ@8UZ>fjSwAzXZ*_k3W$jXV5ct}&4u!m-Tx$6JC;(Hve(
zD;|D}nrO|d-<{a4w$mb>Ha{!3Z8~T(+~I$Hmi`F!XK-Gj|3klc%C4x!RY+NNz?hZl
z8>tV5bg}La?mg`B|71!&J)Xfq@yUwj!Dmd9f!zBpDQY%}g45ElpR%9vj>|#l{Ywlh
z{jaFc6zlt;2F~x`I}tc|d*A_&E!DJI*k@m4182r_ayQOoq8XrZp#b!ll3y1(u=x5)
z(gcC6W4`fd`}lJ8?38W3YZt%#4f_&jkRNEk^JJj{nIt<-G?7yOuC@k1iS)gsMr!ey
zlT2atdwDb`hq8oy{Svdyuc083#dYWbCg=c6<h>3=`@P6A+vi8B-U09P-67b5wG!A#
zzWSY$>mh_n|9Cwif#ZU^o1Ujg6$XGbl${tX0Of(H>4gt~p<!oksIR~M{TAjQ5WI~<
zHT-ANcLC_nqWh)WHCK=03^_m`4yk8@&nco}F~Q;c4{)BpCcx$2ii8m^_Ir;X7WhG`
z3(lL{X0_Uj@QDS8EhwyrtV-o;oMv+lxbqCfL<RAVtlx)rV>=B)=t&Rk>86_TjPC~&
zy3)GPy|f?9jecVX2EO-8;8;F172W?G{{Xpya>IlsIpzP@4mW_5LH(=}5!dOOUwV{w
zi4d|=ac6g|JW-LI68Xd!tbtmOG}o0^%DL&=`O)$Ocf?P59|eyD)qyVGJ@Z$YdAI1y
z!PIkBPxy)ZUNF#(qBd(j8j7Kp&kVyGi-N2E!&0PsNB_%GEFs8}eB*}`1bYTpvy2bn
zw-24K5BsXVfv!V=H?craZ6{gXL=Mkif9>Je?}v1me%d4?d%kWWZhUwy=+zthznW)A
zIAeu#sQ?i=K6@Jw5&e#!b>m0;C-K1y<XFFpq%4w7x?g3a$3QGd`@?b1UB7Y*H2@@r
zuNMCO%Vz-@(?-d-N$K~D(&qguPq_cSk~<6yc{mDe5AFgysrve0kd#LJS$#DQ2P8qC
zO9DTt{>0QohuZM(Sq_N(UO*ZyXJL*W5z<-c?w#XaEkE!YQ)}nE{cE5^O=9k~$He9A
z=Lf=G`y@d-T6MbcCPLXwW!fY_;fx(9m2ZyRuehzGsLIl?f42eYaQo5Ail7INIRH)D
z-xW<ru2P+q%LvRH%L|wMF>T&59IB`WOV@a%^e;Ctx&#>G`*bs@c6s?CDaw*+mv4X_
zEk^U}EU8+qcq8z+RG#;V^hN|;<@Zs?c1qp)LNc}v!Inuk$_xXyXI;;jRQLh4+U8lm
zi-1rY&Wx<~7&SDy)z#U%b?V3zUJO0>8Sid=Upk);tc=uNN0MZvps~PRst1AKT3YqS
z60J%+d4LR@7}<Ax?s^<aBjQ)nCyCA-2#^s0#;Fa9Q=$IS9(=Fz?<i#rxLH#ACW(eQ
z+Zy(Zh9RCz;yDVx_Tw$~<y->;18167%4ag`>KwgmA>2+x<7+a>U&6v~KYMvGS?j?y
z)eqO+(1nquT7G|VPR!`?%X@d9cKN9lxF`KAy26|E{;^8D4z~~g?Bb^yId^7pk9R$i
z-;+E?4pyPf0(Hi!sE+O9X8a`B2D@?8cc+Cgc?L9&Gx`yd2|cJj*ce)v1j!C0yPTq-
z5fDeVOc>joYgo?0&WY=F3$mVyDW!q29;w<VRuav^VXaU6_?>#kH#+BHAwO6rS>y=<
z9ht4ycrGE7&oew5cms*2Bhr6B#K0p(2$<ZG9)p4$TH@R(2h2qM&D#|UlONsux0<h?
z)np6nF4kPUauFO|m3S2^RYV#BW4#@R`p~#e37ZL_pO9;g<`3>d^$eJ|mr)Dl^zvzn
zLtO2DHs?LVCwFab=AL`oW>G+gNV!5ollu9~#1l-)Fx55AoTVEci$YmPs=b<BI8QpF
z28W`4hev{3kB=8j8O$b6n5Nj)JEdG)b~lv$hY7NR!aWzOT}am9o^@0rRNV%8<l-(_
zJi2P>%7N=9#24j7PrXD6X(zvHv*6X&#O*e3WTbaab&Ct*J<{q+uK<HQT+DPTvRaeU
zS}@|JRTrP)lOr}wnSmFbnvpZPd~3toq%!yx4b9sp6oDBVv-;6dQ8xphywvC^Li;wI
zv5sHDoIySn3ps2&0~H~D(}woAAVk2v*y|Ew(S2BtxL}UG2$<xO#GU+FuDSN7njB5e
zRE1J@lpmta!v6JI1pS<qy%cwsYfYt_j^Zz<`?HDF6K*KOZA-qKkcP@&)po1^6{7B*
ziz|mf7+~(QspiC}sBhQ8p&HojVg&_-MCj-Hyi5D`S&?4~TAIz`mZ@@l3w8qbp24^X
z0?PQWbj0%Rm%2#pHu_*T{tp7O<RG_;0^CRsM~(}TurXzt4|1<Rrn~uftXgt17;7Ud
zMj3OQxPf0^Z%Aows(74W-VvAJI=?J5Mh<=Ck)dY!PdmLP8RsXkkV7iGz<=2g0<1Ju
zQCLWRFy*PaiZ92R3sm=rBxe_*eR;@FD$id<wK@oj`5s>0=TJ;ys#%u18#cFp`J>q4
zJVb`N_)@|eiV?Z(;D>drI6hM--ab8MDs`tgDKc~tgS$8U7Jmow*6pw)Bx?x%^xQW`
zKBTPmEZN(@I|S|?9i5-3&*g!EWUwlI%Vm7si-Zc~hEI{q$nRc9TG_g~1k1|Erphlu
z+?+W{8l)Eo0UlV70NTPkx0_z`>3ZKKz3G7$**bOM9kCZLD4YwF2CKds@D{KNbRUzS
zuf5y1`tm%YW<Z6;p&>ZH_}ZuO?MKe<o#D3DeV4rKQAT+5!D#l{&xe^uj)-or`-pzV
zOI{M#2mjbBsF}&33a7|B9&LTOyZ?H(8^b9Uyx2Sig__|f&njr~s+^ph2RgZddE1RX
z#qs=i6Pq}%GBEU5M{A){u0E^PvoV2oh0crCTN*#S@{>$EU-)k;6t(jL|2YB%I7jpw
z!2Pi)z@N6Pv(_c)^&^=mhIU)gDK}Mtr@U|2%Da>m6&1xu1T4Y*@GqOB?3)|5T@1H7
zdU~jum`B>9<_9{Fn!wKhyFM!F%Jsh%TNPK%|19ERP0&A9;m_ySm}RtkcO0fRzMM2<
z9pD8&8p~|oc!H>^xr@NJN@o99UMw9~Ia(PPn(dq{;9J5(*?k8d6@APN?7F}wv)<f4
zw4#!!f$uO@0p4uXTgdwmc!LgfN;1EQ8uUm|FcZe;V^1%>zduT|Z)1EIhzjL@+wHx?
z>@uTsZo<8vzf@U4mFNHCt9D+{g{HVaTKYVjbwQ}N3hld9EL2>&>o39>V#`+?8<qUG
z$Na-OX&U~DHwAY(^gi&GzE>!j@Y6Dweo?$Ty4@@4L7{D=6E>z}octbG1Mg{R=|Esr
z?mh<j06Rtp8_kf9yHld06PU_KG{{-0Hgr4Y68&s|KRTpemP_wsa(7q?h)st@q<KOb
z<m;o}D%r}$9b7CAx)W*2!J?0G4oG1qM#Q6*>GlgJc+2OyDqN88lmIuZtS8vB8f}bW
zQFhybrhWMs1QdeGGdLau+XZ^amT{IlV)(e$J0*yl5UDI!gek1yB|ooI@70owth(g5
zxt_>6Hx$%!b!c2z%s$Zd9o!|S<8OC-*Njpzdz*b(Tjvfzy`bUr+0fPxI8>N7eMji)
zF1DNeZnp=30mtsZaKRU|)ZqJw*;tNtd@mPDK-roNeU40vKgn7W2&_62&`~5U4Gm2@
z$fVpdvM8y&`fCxL;@QH7hk=hx^F7*4#Ve4ngB`5(xBUZ8nO&IGPik=B=J+vRWpJ=N
zhWeoUti+SqhHkgmIY=fFWhk^Tf5h*1@W^>OVR>Imya-vL@2i2|u5fX{H@=$OP8aEc
zIC{$uQ#{)I8aqk7Prr(|MD`gHU>JKVzk<+F=)0hESpU6w`vZ#Dksc599upi|BU9YJ
z!3|1>#%!c3V9x|Z5*|4oOm)|}?eSKB_3)-&!PQjVs7tfE{%?0J|E3jn^A;n~<~6$t
zZqR}!QNV-^mkTitgIk51)%4COzR}d=7swkV60*N_yJpNhf|2-|O%AYwFd=WL=OQ>`
zfS{kf*xgb_UD0C8k+go1hoiAjlPWF?bTKkTWx?1?7rEKT@7HCr3^t^W=4w}_y9*k6
zv<wXQx*(7hpj^R3$374Q(o9OBCtmu1ug<R)L(S(-ezO|uaEPR_ob5<D?U^c>v>&&J
z4RDq?==W~Ii*jJsD*C<{NE>1oT=Bz=Uy1#ShuDw3^vp!1TA|5J9ur1jy)3~`6ciRM
z#t#tqZ5Rgv;@tj-TK2Opti&3-4I2)&<Lr^U2o~YCIZTTg?$X##P_wjrerl#G?yWBU
zinD@qAV);^F(cc$lB)jO%BIhkW-@8i&YnS2?Pu5dmsB<tvk+6SZx~x4BEFA^Ma)GT
zTs7^jah?byt8vz}JT&567hi<0yDI8x@;a#2N=?H<x|9bI2GMQ$iZ>nCJLWz>G&CI*
zTAJ$Xsb|blwF_%vkfJ0*yUm-oT_b$$)TEo`YMc&!VzVEv8F;aYKxVg{l~T*5$FVYv
zW5m%NX++_zA@~|w+v+GFzeI(0@(6=f_Jin2sKI+$6<D3T2vOXvb=zhZI87`I49U`}
zkjOXAFy%+u!@}*LwUu#oGnfa@-BIte@10Zh_W92yeax)W>j<DV9DS^}SxYlz(JiUm
zQk?D&;>R5__pesiqPHq)CQQI~)K9#FmE6+Y4)Mn#t81tWskkXRvx!EK=_!YCsC!Xg
zC0i~V&43I<#zuzvXxUV@3q`w3oJoD1X(0K$gV9?0KrsKaeYpT76<EG0RxA+u8F0yG
zf4gMSHiTLR{o-dNfAJ3-k$*apCugG_Ew0;vuDdKM8*;WAKREpJ1ukFXqUJeaq-f}r
zK5EE=ll){yW7L&jSy7jR$EL>FX}E`?M|<RF+|VbEV`q2+B37%m)apv>%k!SW58{t(
zTQBVw2V-h-EH)d}oe^?(jpF#Q?c!pu%6Y~hx#+&Ln2Gio8|Mrgzp>Hb0%<J=mqzS|
z@$nHW#x1d)gmel{Kb63;TG$hW@_XO2AqYwI2FD{en=4Rf@518p_LmPtEsvfqVrwwU
zePWP(yKXU&h-7c2BWK4NF<g81C&;$+(g^lhILy62t3JVr^LNxD6~w7RB}<5F@OPg1
zrY>>H1~|h6v2Vobv3ZHXi}qRkrdh3%CE{^w>CRjp8Lgjps8h=q()C?z<N2UO?gdOe
z^=L7~b`7qVDgNmBv1FZ6+TyLW_EtBq)Hu<PhB)nk5zK`0SlpIspXc6=z!XmZ9){Ls
z;d(kgx>8L&J7_P|*L}%TS7MRezwB1k*ua!f#lkedt?*K9t)j8rA&a-*yIGf<@HZ}3
zq$^=JI5|CpL>mm(VVinv6V^8sYV3fmq(}jtsI?rGRGBczm+v+__vJm!GwYoQkE_eZ
z6}bh$1}}>$f~{7)Z|7~wo$WS3RtoS>iHFTS=M_U$j6p&frx-GMOsJDLxgu4m9lD>_
zj{Wp?vlH?t+f`@#KpvmXeNW0y_EI{9t0(58hh8E=X`X(g^OKJZnM&LQ4jV6?JIDtD
zWOE8a8K+&(PNzXl0&9-Lduy#DYpt`<zRi0n=6?f%qU({c*X|=?>&xYv-Cyll>Scns
zCbZ?d;(R!N4;>(tN##pms_}ch;%-O6o|6yTK*~l;LWH;}mnO8h!Q9%@ErjH5T{lw=
ze7)-;Sia#UO1@q&;6Qbm+{9cq^MXZJBga%ndJ;NBCekr0CdkL-xaFcC%#%(0QBsXh
zv#-z203nW!$WuS95dF^O@?R!}R*!-aMN;LxT2XdGq>y}>xLo|jyGfISt|Xy(j49V2
zN>>~&>>(;48c`0B(sR1`I{k{2(xLQ_wo3`ut&Ys>Ye8h=%7Q}nV_4_#TBSn-h(U1T
z%z~9S5*L4rdR7KC^CP<GNtkPeRXK?6ex-$WcX2A6S9TsSvnh3D4W&C9spq8>M~Dk1
zR>hFAB$UNEI{K!lWhAVNYB%b|gu%eqA(!c^Vm%q+uQtVhVA3}Crf=}(`2RX>b$aA>
z+CXt4QC>|x8k<fG%zgN#9VriomB&i6K4%y(x3c@hpkSWjOi|~ZrsI!v#Mh^*9{oTA
z_@HQoU3G+)_tWkz=ipi-2pV%M+pG>sW;>&s<bpJZ)&G#{UiPPaB0*4p)EGVg=5LE(
zf<Q$l5M6Jxl<dnxIl_d#tJeuYJMVP~$yYO(%{SFee*{RfJGpG!pBQ8$oTht@%@(_-
zBOyf?tFz|_c1$r0o4-Q$f*BZ<<15|c$?Sws4L&sWxerX>dExq4+QyZCy@Yz53rtH1
z=2E7KT+NMh#>WQ!+cfjxu$`XRG?;K3$h%#_K`*Hx+NIH5Qz3@5uQyb0;X5e7D;!6r
zcb>|G8itp?9axbK>*a7b2RT)_>p4+#4nE#5t(52@Uf@AIQrw%Yb^dzjxryl(cN=mn
zDezaKPOHtT34<j`l>CM=op9?qN}qq}>35L9|3Ns5WeVHGEGf;RFSMU-g~17D$<6y>
ztCMKFDJ((^vnZr$z@7~oX@;4VV<q>_>?*X)l1~4ZpIJKoNO@G(8@c~>wR@X;{c>ju
zO6`-azGM!SoNPT9*}3+ca&e#a5Yp97zRlAabL(y2)357~TOe%jnMI{XBAJi9i`!=%
zSW_>}eQQVFb%d{Uw9Sqcu2p7HhRS`E;v`U|C}zPn{t@Bg!Xscf@|nQ|R-%b`L@pSB
z@B&GIqg4v!ZCFLX#AiD@_ZZp*`{r@#R+r}d0BG@GA@x8XYWme5b6aV2w1?NmZE2;e
z3g!AUbjH?AalmE8?U;}#OtrTtX(p1=C+AA3*ms}abHd$SM}1P}RjR8+_f(nW4}rN<
zm?|Y$)aGj$++9*4r_TR|AJfDb1;njkw|Zj#)WP_GkX28*Wx#q9uD}qUFm50_Iumk!
zVqZnv%~+nto50ZLY~C%&|5WJ1-8MJp81b3<QYc4?F#e^%6WMA*Qz`Ia$rGE#X!^$u
zk{cbwcR;QS{oHIi-*7QJiarkMn*SK-+Hc^;8;bUJqEc5jYYIF?ywBk<=4n4BB?7r7
zu2}+>Vhv$NmT;IOJo_dh?$Qn8lm{&~g&}Dx5A^Zm1gx{Zm*qp~jAeO=bK|kzWn$D*
z$s}aO4q>L1#}U5FsmD4FfxSQ<K-P1+gpIqkhF=hGIkP!t?PdPk{(eYTKe(;ws$<;h
zn5$0r1@KWUC@1k(z6G2!KhTD_deKPKY&wN}j6pO7IO&muCnkcOGa_VE#7cg4fsv|o
zQtnlZ{7`NudZ5B(?zKG5xGB;iwUY|3<T~Avw6btE)8{({STw2K=Dy>JcJ}_4;IppW
zN_uv<N@Ew|6b?<1&%833>_$jxPjNS=ei4^t%F#a`>m$dBU^+3oQ9Z3dd3~DI=MV6v
zGb`Y39`SJT3O6v6o=BC4v%QfzDmDhm3l^knpH+L?2Fj~B4J`=8?RURq+8lU6ZBES)
z-qVXM85E0pA^+m(9RL>?Bu*+-uj}$U_J;DBXgdjxgpOjbs}*h*-L>{0-_%EL@?}m3
zql=_$pwU)=$P3QWV?Z*0Rc^|8L;fi%e)VPiA;Pn?!e~X=nM*<>;!Gpgf#mE_FVF9(
zJCHQyj7G5$nZ@Vh(i+<m``p_=3;8ky_BT|{kuWGog&&R;^C}w3)r2TUHfzL1#=fnX
zSsfJD;f81Gap_QJTin*n>KQLT3pY!6v`h|v<lZ(CP@!$xykLlrt;<j#StR<6%cVb$
zh@$P}uY!-hC#GWx?cvXQm2|E%gmWu?Q#TaT)(V@q?B)^~Df1%x=u@83Yo-=ny<YuR
zrHK3m6R}}*T{QD2M_2m8O`-GD6k~Qzi)7-bES;gh)&KZJ95$YUyyv=rpBT_ghe@Qk
z5vMws_Eko`LD#$v6%v^}4pFR~R@ATBE826*S&<d@D5758(bjoP%J_9SIZf6+r?vkh
zrc5She^%2MCpbim@nzq(=Oi1>`zZHj+lx#kyvnO+70b1{trV`cY*WOzgZhlUz8MH)
zA6Kkz{gq>BJ9GrdxsF~<3h;A0E*zX7e^C~Yy(#hA0-8D$l=J*|XZ=Mvh)4cGhop@9
zs(#4+Jkmo6u1><4Deym9Kx#hgnT@3PH0~W4`GA!U@9pJJbKBUzrx8$xfY9>%*HeFG
zcAT6!3XlKwt9L(UFFGqgeNVM7yl0dfkH%5e+ZYS-!GYcekpEYg2cnnufx@ngSwT%D
z?J?K;4~$GN>fE^uOubdt=Qiz?6z$J6J+eakZa;R*&=^hrP*DpRgB;j9?^$^jvIxX?
z+s^=6(8*iZV>RNQeQBiA9}jR(MQ-O~;O^ZPzL@i6)3OHsWDY9r)}4(~LkP1A16#nQ
zqN5><+hT){!J(=4*lUZ;568gWl`S8&)>0T*Fb*>64nY*yi480)izeBvF|~Fak_RA)
zwONJn#mDK`wH13$PmZQWnSlBk3)hUDufsQ-gv>`*I3Fs~#;Z5QM%!k!ug!VdiKMs|
z{ft;wNlOk<)07QYDl46lj<~fc%PJ)t7tQOKQ&;pB3%&Xmo%#zX0Gtd`h=xX+^WXl!
z)T>3|^U0SlDmv3(R9x)Scj@0we%xrHvpLGYbZFBxSk><bJwo4j^(augumTkIkzM}P
zLa^P?c$w>Z#}|0AZ%L&~D#XR@3aypZs>4W6UD4d2nXSXw86Icjg$Mh}Wma)L<_XEP
z4-ON29Z<=+IYrd8B78NXa1T>sekEH1BUTLM?7FsdT|y*G*73*g2fag7<aXi!q}<1h
zczV<XWxz33kY%u>566#qDIg#)YSCpYS<HQ3k1M%W)3{1Qzfx!A5tN1_ek4BkNk)N~
zH|v9oa+Y!d_X?Pm30>}D_V{84sp1Sz`2gRKOUsfwY~ll{QUk@rx9fv)J)?4jaY<*z
z?KR;;4Kk$TETc=PC{E%6LX`niAN6JBa{ShG{xR{wMMT@|<0XlES307x0`P5wJ33ly
z10KZTBP-dD7N`5%b=jK#uMP5lxoT3jAH2)yS-JD%oW<hDibpS9Cm$ScAlIennx)zd
z98)QtVBQSv5G?fBFGhZEsDiEr6f;@lwy|i#@S69?FNV5J*{tFIUE89X=kB=wycnmB
zyUYJL{)w~rs!<(zV1(0kuhsxPr^<wW5~+O|Djhcw@Ih)U?se2q)!m}4<@S)X31dtZ
zo)pMQ2pzkve}bfriBy938FGLWPr?C12+wc6gjOjD#4r#Aodef$<QS?XkgmtNAMPq2
z!&5{E>NG{d3X}iAngIkh&2ZndKj=Vi%=Eh-&u@k+%}rXxhET0BKXNOkO)Cq)ebbXC
z=st+uq9)6!$4BgI!*F)vZ(L%}A1k>r(k#NqC5If;<ZnkCbu%8Zr0Z}+qO>ZrZ_3El
zuy>umGxcoN_l!yW5$2Q0xru-|rqOX~ru${h<rLsE5<1S#y;@BmX_r96?rW`vvP&3s
zwpE=Gu7R^dAlpR6up%igEy%X!MGKOx2xCh*ZjZPfSki`O%JS>SA<vR1SB8vi*fkY-
z2?lN~mQ8g#N<=~H-@n}mxlPYHT%Jlx*2~t*M9h!<2Zs%0gPfd}hpGTkPQJGMMK>Sc
zn@nK+v0Se5N?Q1)6S$t`$NT>95eKtxjkFa@E6BnxaihKM45g68r5x+lB?Se3QbfG_
zKD!iP(H|VAmP2JV`jBW}eVTQ$-^hzw2E`~QJX<2?7NfqnaD0T=d568x2HAePzAyFK
zGlP{{Ox)*_s;r2_Wd*n5f%K35WC6Cnp{W$MrT3i>uQ;!!_&JrLB?1&GT@LQwye3eJ
z3I!`=q@CXP@%>~!Vc`|mO$qkYW~>yVrr6X~0RA#Dx~A(|;yF1x5{J!~+E~j}lOaq`
zGBAy&t&`C+5qZ8qy|l9^jbqWibu#OQ&koZ#b*!SQNVu>Fpq?iI((Ua763hELWe>oE
z9xw2b(Tqcr=Y;bUH(sT%O(9<{|Ka+m6`vo=(@D#hC8$?Qk5^{GyXnm|6ly%41lQfr
zWl~Ysyd2U!`dy=58b5b%kewH-Mt!-rbS>H{EbO|@H>2RIr&pvT!*ABSGG39w+9!F+
z*h#S~+y{%5(U?(hiDbnzUhBGPzS4j!N|wb%Eet_c?X#>RVU>Lh#C5KCQbwDktVSsd
zGBV{<%gd-fqnyw1*SDo!C3dl6N&o`#A3hGuaRZp)tN*A*{Qhb69&NKhP4ChO5J4G&
z=u-Y(P`xk#O6h8f|Itg^6CE}6008blQ00>n7G8LSPc~cdjwi!(6Ug_+n4Xo&Emc#f
z#MJD@1<b8WKRy3K(iE97YT*mO&hEcqr+?lXVTTMeCoHZFSrE*IX>>>veJHMJdf+AT
z;<lddV?3D_=!&4L;ij|%=)S$ikPIDg8qwDZf$jKK;Z_gSybL4adviB?E6U!#MjL`>
zww{ag{jg=4HE3W6g-dEm5X|*|#qomp9Ee$*l%Vp+C+ZMqmKX{!?N5t_!hvu#a_~Yd
zPM?vOANAjEpLS~&y2}@GTv4q}MAcIId2I{2vvG3vumW4*Jp$kB_O+h5f_!O`3xnLQ
z52}w}+95Q$-5NcwZXw8ib)B1|9mJW_`3~pugh%A+z?R&h%`5Wrqoe%~&T4q)DrK4Y
zix$TpVpirNl=573t``Zs5pcf0ZSOptdg?cvSkP*K(Ya2O)T?*bQ5%XUpG~^&NxqQH
zvq`nes5<7t?f0IB4T+uXjHACT=qnc5iT9L2G%vz?t$-R7Bw?CNxENBF|2}ia$`9=S
zwLjnBVoA}5zJ=WbuTQ`Xn#3@mxMn9=o?+{~RZttOfyss<4CGvmO1|%W>XLpHeGB8X
zEWE#Ek$|&`p#qEU{W_Q*E?)#MB>Z2dLW%KR1*js0MLANCtUE{n{;}!fL&tCJ;abwe
z-Wp6mjYJ@s6brJl83#&hGj$uaNQA#x)0bNxFy7-IxZ)Rv3c|<XHgU1$cK&ATUt`{|
zaNX$_upmep-@(MrpUZ52Q;21-9MHPld<I)o!f<U8VR{2o|Cr2vR`nkx8GSNRp=F3f
z<OSQ~fVv8&2k-C8r5XX-5s)DW+&7#l9+XPi-RqS4-ic0$va19#B%oeH?+PWxTFxRJ
zu9lpVDY%?zt}ING9_AZU?ZWvE3hitJKPn<lKIX2a{`UiauK`iG4agouy{urv5AQ!C
z*+JtEJE&5Dw*|g+j~w|T&1M{c$T?ivmDeP_qY}c7y?|Np*D_sEbe^Wf`NTS#e`}-^
zT3!K$jMej>XgJTRT$;HU4lCIgW9&^b^SXfIu@pwSz8vRq%&6P@j1~tWwjRQhBMnP&
zmLJjyXkSoBIb?tp5Mp7FgcG-iXB;t^y{N(ko$V}lGdSilyuf6_gdN2g6?OL!uy228
z**#J5`Q-TH1I{E%F2LjLOa^=XuP;^PGj23Ear*oY9$B-U_g^)vbHMzaD`!B`*u1rN
zz<S>@NFd8)TZn;!xV*5|l<wBTYZ6X*boBFDxobgNAKK1X+vSqQ)i%RG2^Pe>@^1xv
z1oNLamyVQ%c!UVkT5n=J>+8~--`iQ&`&w!liCfC=xZSuzQy=vUNnif1Cz1A=ro|zx
zh&+VuKZ{w<jY^I+Ay;ugh3P-my0<eN<`A~R_V(qBx$g%qg^cT4n|{(l)V1?Ii8ASw
z=dzW8tvV_sf0M8@EfHQY0^b>6PIZ{AfCKZ5oql}r2#L7>CVRB9jAcZ96(N-M!9<!k
zGAIJdJXguXI`7C)gUH9~KpaTNN8Nx0%oKi^^B={w&jY6cXe1E3zm)ne0YIW}rJn#;
zerg6J$U_K*vlEt==jfh!Z7<L~nBV+*l}m!H(%DgLTksjhVvy_{)wYm$m)G!?-|}_@
zp%HCUSmrx#pB*pVK5J%HwQjdPf$*>Qo6@!og=83V&fpu}Mzwik2MF9b8`m(?SH`kb
z53-|g;{Plt-Uz+~pkaX678*zlB9$Mfo&e0iB9`cpjogMFL9~R#L)_L%S=hpsk*~^R
zeBKzn*pU(4)r(W;YyGN~d4!&jq{8wAUAGB72#0kY>3h3$r}-bbXQE7ByobE)OR<y#
zgr$UNtjU0cu#jlhK&`GY8Tn_4-r_(Zk>0noZ4)amT368%P4KM6>GFe|lheTKTUy}d
zxr9D>ec4(<!XvOlZ!IPR95K$Ta(ygC1(bQ~h*VXrfA8h_^ZVxU(!=)I_t|gI@e)WI
zBfrEi_s)4dzt1S-ruWi5=Ihiu99mrFT-EzvmFJ=k*m6d$5CK7eDSL=B;wss6$_=v$
z`wo2hP1DE0bzukZqDe*3wL}u-rl}V0-zKF>S3AI2n!KK;AV|T5WpjDt60es<Pb%k{
zxlhv$RWV!&;ySsQQu1k>e%z$B0;fwIM9V-CvWXPdrYLG2J?c!=3H{e1-zLOeq*<Z9
zAbR8*uGFq1j~Zj=T%LQbF!?a=Izc@uz{0)!PH=5TW7}-^u0fjfliP!aU5{3{$%H7D
z{_8#U!~ynzQ5T%?rT>+m*3j28*5@GB!*T!&!rW`A{&Wg**;<-K3;DLkvgi@ab5@E2
z-uoHHG+(4}-0!idVl7B2;Ff>gincrQj3+?b>CdKdd2uNd;Yz1Uw0<)0IL4idXWRk$
z<P(jHg_4?Oba#PD_+JsT_gpv(a_wNV$!O$QO7VQc+g#thot)s&(j&qg8Q1y^zV}>U
zIz+Xbcgg;(w@X7mwkW`x4_tCi2T9yXR`TK}eT?)!jGn49ei}6VNQ(|41u2Szohhsx
zGu<qTIMBP?N?V5hncQ6m@a7E6S}e%z;YXWSbyrq_R6Xx51E~T$VSb=cb6ZlGAaxSU
zh$%73^~qJ*?x$Ui7#BJ7H0PdHaM6Enw%Y{gNNLIA(}f-MuPIt{0|e1&+0G_gEr@za
zKLL47@Fn#5ZmFu#NZ1b01j80H9`Qa~ORt`*OUecK4(EDvzZ1*Bb!JqDl+b^D$rTYo
zpQ61LFHV_9SQyYiUg-K}|8Y+&2Lh#TUkHi4<ei&W{LRQhhs<?=oafc)!}GX7MAMj&
zU>K}Hlxj7L#8X17;Sdxwn2}WkGTrP6HHOfs%br22lhumZBe3Jy5|$aK%Vhsd^^u$0
zSBS}axp{%)xw=-28!n3a(NHxuT@gMNmN_=&P*`9j#H==twl)tQ(pbB|#__<_l$*kk
zF1xfy*RgRtp1s@0L#EIH1zi5i_b6-DHUOsZLE*b|HPpwl!FF)Va$1y3V-x^%>$e(s
zbC#k92zl0On7rW>TNOD{E5z0f01|oxg6rR)>$qpxodjPosujD5GpulCrlD#mQg%H$
zz1#0{5KVkmR>G7X!`=rLpa~#xz<sI|N$JC+8W1C!Qq)MD4t-aJ2?7f02^_6Eay9qF
zJ~bE7w(CAn^Xt3jI~GurPTmG?qQxM3w1-9`qnVsp(rT(+d5qrkvAVaa3{Hb=i6vBO
zl%frFy>Gl|dF!y?tsxqJ80Rc*4<0fUWea!hN|?zAH>v-q(Li@>Vye_w<7}#XgJI)-
zg#$>Ff4vqf=C3@Ll^Ryp2Je<Zx&n!LZScjwG-njvtwo9#C;73X<0oUo!|u<JwMbW|
zv*zmStVKTOF%w-rACa=<8SR6QEf&((R=iSt%o;CQYDsI%zKp}kd5CY`51wFrrF#Y^
zDV|>&@0nQ!X?*dgIjwJDfgyyo6b{bM%7Paw*bjLGuM*(xRykL7{+HX{0P5KJbccPw
zDPcB~L75mi-R2`OcI5BJEkx$3q@L|$9GCjxbZKB4h+8J9YM<5IHyj2cuT>1+7{=4j
z#*ln92FNu240WlT;V_gQqZGh7gjwS}gY?moOf(PaU2iHs%fy%@Nkf=;2?EXs*ZoTS
z{W5gP2OwoM1E*(#ekMFkV0JFCP}an6*t0xxvvak(>TCxj^m|A3N{1y0^jnp}%G?v|
zl$_|q+Tix(_V-8(#&c2GQ2*-`e0ffePKBknN2<nKqb5R`D}{Y@yt?05kfN7g+eW$o
z$c!(`c;As(@*b@j*vqi>B~fX=cDT$=Dy$~9s96uUtM;9Axc&_<t`Ok`!5V~ASj@z`
ztVo7EkGAVM?^yV6dmA3&KMCASkTV3ft*++`aBgTr-r!s=Y;)5JaFFVO<Y0`JM-#QW
z!>DVN@W%;8b;o$i3>~g#zjAL6mDN08SDIaQDO7N_5`j04C3eG`A1?I+b>6^;(L#{b
zs7sXGYY1%`MoLKw_-@F=kTTjO9H5bAGRCoLzxROgVHzc*;6L+a!{X)QSNGnSn#J=u
z&kD@Q?I%nspLfh@n?35UmIjE*5zBHsZko#O=iXzrxP%QwB=doKsJcSx0_zTnAYwUM
zVHpRHV}?p=equ2hxcI{G%d198_nltg9vC>Ib0?eE&DJ8*$W^j|YenN~(pA*xwob<L
z|LH}fLuh|1Y5lVTy9MRB#5&|V#<m82LL5h;(3di-tpKkqL7?S(xY?NtR;2w&O6C5p
z!CZC<xO8|qoi&=3+mS*xMyxxuFAks^23n{JUsO@oW^0#GQi8|6nVvlJR9O@C#$D}q
zI60P`wsS3R&)oVhf!q#YmEewD9}`s$gYDJ~NDoTWN;VkO6`i3q2z*aNTuxkQ`QT%A
zn&W&e#2>+|<?Uvdi8d@_*p_Jw1vZVqa>F(UV@r$3z$#d(Xz2_*Yv9r)P8iz7J($zv
zrNNvCc)R|9y=HSZ4&N(27oWagx0J_let+&@qM<}W&X3V|c`~aJCR5go60G5vis1-8
zp~?Vy>E5sN#H_34{TC2=0Dx-e*K<<<p)qcpe)MYbkjtJ9*i#8h;aLemx8yAj(?S`z
zdUDwMOzGeTd~G1S*Nm%Dt#>8K(|iC=i$>kO%4u>h0+z~oE=?Nmlxt)4MZLH5x1Rik
zR<vgz!xf^-Ft#Fdz%iny6W@KA)sadwymY7_IG%}EuB4tIAVc3t36{mJ!iSERtE1Iv
zbno(V5k!@*O#JLmYfkWQ2jRE-_cks8On(i~W@7|~$>9w7bh%3P$eUobRM22eUinj4
zJ*D_7zIU^%GaC190<8zAiUL7P_|AqwR8>ZsuyWBwP4`TXb^lq1ENQKL&0LKeF|zX$
z0cCC4ruQ8<j!MXyqbbk9uxN?CT?)#b)VV13hT>C@{bp}VsGfg~eTu*#l{C?b*TW;l
z_f(K;5!uNx$i_XvwoK!=Jo$<Dd&U2CRD40#oic}9(+U5w7Y?Zn_)?h39mvqd);e!>
z<U9Yc96rO>B&PYrf%@hOHF$+ukGA$JTAX_2q4Qh7B5*OHf0Ou$V3Ym$NZvJqz|C)+
z;adKeG?bF0mlkTL5SSG?SaKGxlV)W&41N;X9XKvRqs;?Ey$)|C3K{`sQc>nrUwRo@
z<2(}ellh~~SHFW(gqL!o#VdWq-ZnMfr9)NzCdVTt$Jn@KF}>9_<q01|+-wwD94KS3
zCvF0SuYA-6SL^4{?=E^q1GNIvF%Qb(MF?yzkm;vos~uqu1N5F?N%m2WJ+47RTL|DJ
zjm+VEVHoO9%^hY2!!JUdvvTnhEERyaudg_ftB=c#>$L@{NDJB?N{_|yp?<E&4s4Oy
zP-E)1R;a+WyVF#0Kli>_>|-(9;-|(d3^$LXJA<+?+PmwuphlYv#5a>J+uQ3Oa=&pM
z>9!v>oy(PrRJg>ynhMMGKA3}@WEt+XjH@4xgK;7R9LQ#9%4s`Pr^L=#xLF*ZqTO1t
zbXXnvp81qK0UbK;@jX5R(XsSh57x-+8p2hWfYl$}c1YC|H`W8K6Xw;5fOPsFftQ(B
zd~N69&7VzY7<Tt6ACwxtprUDAVmo}rb+(qQfiE#=%7Femd%luu_g!|WWQ3I(71Ryr
zsu91s=->>Mt%+xaD8)ZF==Rc(PUt^nlmS!4xg#Jc?*Q*eKq&E*NNG}fUp$gX^;K4w
z4z`4nlANieQ1{A9G}_C5EU0!wQmJ_iUOaI<D^5=fVSs;wh3b(a`$aL)JgQaw(}QZK
z{;a!2W>uI#z-L38{aZK&L$Cc_cPmO}V-)!<hqkP1_5O7=%GiWYCGJ*>o=%=ULmpGE
ziJFd>eB9s+8&fg;IA#rh$z))0%+KebwV-aqPIFFA+<`McJD!a=11Tn_+w9so>wP*l
zfWMtf5?EXZe4%!CHb=^MSE?}U>R^AgETJ|(Vtn0*>+Op4fXg2%OnU*$F*y;|7&DP`
zL@VHjTPx6hQ)+uEvV7vnMP+r~a(gl5k0ti?zGKg-0ig^^_R)aNZs}JSj?K=_v3wD#
z%h%T=i-09Eu0(-WvS@Nc=p08~Mpvi(f14f*usM}(!*>Y94EdrvXa$UdSImE!Xvf2j
zQ1acfaF3#pyQRa}>U=*cu_RXo<D+0d%m^<UB`JBRKN>Z+k|}%J#W9<Grjkk?=0g+6
z>>IV@Q{1l!_G6d!ffJt@Qvez@VXiR$^CCiWC8U-$o$2S={|mFo5cG5Xw>z9}{%mA(
zpjb8B-5b<-lQ8{}e)E7~^I49K7?65vBdQ`Bn1iLe#BOu>`$j0gS@&K<>qKAFbL~dJ
z8&<shW7z#2sKK-2a9by#kIbzyj?}^4aLG6(MnwMLc+uVmD?}#Um*Ovh&9@SP_DyE4
zg3V2FB}aMZK>5sZxcl`Sjiv?N+%ztf#hnCoXtz!<XO7zM(K)g6n{mR&d^Yrr03p~X
z^3Kk14`Ve&oKv*5V4&I!?i32^F<VYH9hy@j1n;6TN14i#;qSM?m|IQl;`G$>6_2fL
zV{ZzYZPa|h?OeSso`iJB^f80WasIY_^m$i?_oc{c((UC2%^L*K-%Q$n{D^Ii*8{gc
zL~hIEnqm$_c17NqmO>%rxiZvzK1FM<ORO{v&A!Z(jsTsmtBzK!2;HpEU5DU6%-B+8
z1<Pi`u2Tu+ra0D{L&#55&U0K88W0MvuyR=Tj~8mNVB;H?l*bFhKM^zU9B>Q~2O%|k
zH;!d3%L`7-v&jxk%su&Bdp!7oE(5;9V;B)Z$BGU4tz>jIT(fRreKxbz{OHK?I8P_n
z*LUM*gb;Dbo-kb}Ul7?K5A}JFwQNKYyh)Uohu(Ja6lSi4naUk@@426Os*i0A1gYP=
zp%L*eaC|<xT|f%csK=YC2Qs-9<e$Gt!ViDZT>x>C1XKu2PqEHAS-AYrhH8&6cfXgO
z^^DjPrlo7)i&nF~T^$Lde3urQ>aRpG0N$uW4a`A(XI55txCr{Y`)ld#_yk-1A2dIo
z3CC+nM;zr-@^Y#$0QACh(+JMu^$1X3ya{*Wh5eV-{mKueij?WLZY!5#8a^|%i#)g}
zzSF$yk=#QA({KRkuq40wgNZ2UG&=xVf|mNHn#cjvr4BxH9HaF9F`oEcu4Y><N?Y`u
z*=)QGkUB`=3%{W4(B!&Yc9r=!i$UzYG!tPN>k_MRmKhMcb_E*gV)eNRnhCEE^$rO0
z1Da*UUL@z!c$ykO72<_7pd&-M2VC%{8UyA3kFoa*YeL(?byZXpDWcMw!cr7LKzdg}
zP?088s)BSv5JWn$&_n@|CS5>!i3kZ&gH#3SJrP2rmq_R#A>mHcy_T-M&$;J64@qVn
zbBynM$2<vLJP}iot^Ngy3?3)#+{|B>H|?=ag@@^pV~eeUh1T*%Mga}ll0SxiyYdmP
zq^K><vQ2H@p`PJY>3_Q;@VYMTX-gQ^PqT@nnZ2?6U`g;ke$>PI0~glNe^sR;3}aE`
zz4smScHn8qNBAok;Il4O8|MZl%>NbhBhESB_WAY~oP6g<LhXH?jP%OeL>Jq-LJzyW
zZWIQL{3^)o{Wfn5usFXXD}-=7N4=iA2O)TSxbKQt|3f=&fnb5+mf&qQjin#yy-z(2
z_jAJ2biU!1@aW}|hGZWvT=V|Ok<3Vn6s58?67M*p9r04?O7DYU)WLP(X&IZ4dav15
zc0beEYu}_^6;f1cbrZtQ9tSzs_s1k+gMeH~)VEH)d@--<={?O_Ho-Hw_ZRgh))|-B
zb0~d`Hr|;n1+YVnxdZRdrT7;d9@x}y?czt={kv3e`o&Ylin#E0{)`HMjKnCv@9&gu
zle8liCLXT$Dx%SXq_Xo?#524ZG#@I%rf`m`?1S2zzR|ugE|sgu6p3gktH+NTy`!nM
zW1r_+P}j7fNvaVb6#DMkeZKhG(sqmwMcsv#Df3rkx6<FtMc}VSoYnqod%yv+#*jbv
zMnTW))$Fq4j*X3yjE~(h3cf(8coq=}b%4uJs<IfI%ZH{*wYf)_lQNacMG#$Qq*jbE
z@jldjt@BrQggWV9>yBf&E#1)cw&eGii-FT{y1*SwmuMCxhP<Y`kuN}di*sAZ3tq_u
zBX<}R7GRXF$U8F1Qu4B5QjhjQ0vxL~PaUXFqzmi{d`PcCrE<xy`xVgK`H?^~rdJ{k
z*nD*(I$tPzGU~zSAgU~DA3K-v?zS;pCUhib+V`IYkQ>))_5H%9#%qBWwCDRJKf2d$
z^{cyRXq_(Jr&jshzo26-oDCEIpe)BYGL2V3g0~;N@&R8fTTmOQo0o8QfmjfH5uCNr
zpwMA=F*YJ^>3a(=hSK%TB6Su&=6u9V##(1nPckkUzFO{CL&MIS-b5$`D%p1oMd$LL
z4%O&53Ag{9OX&@bFW`4^{r=P|LELGG4tBo4w5M=jIf~(9wI2}S`<j(ceRNC@6fJXn
zZd%8pm4P)*#+WhvR3nJXPddch`dh}(joH&BKhXI=c`S<cMgT8A<Z^r8gtyPP+w|#l
z*50Vf?Z+Z{C0|*Qea~Yg(i<{p%io9A$SO%hjs;){<1`95p2U_1I|7k-&bQLS2O6z1
zg?D{DAY2<|rrvNl<&Z+~`u0xbrg`6sy8#xkvq6UX1qp^SZ|q`3gopd@Dq9V4-cKQJ
zC_?Op3lPmz^Vx7$0k`$!g&{>-MHTcAvmEEJsjCuHUbvLt^#DeMsmBIIirUjg=Gptv
z(#&EZT+Q6_b*C148Xe5Iq~o$I7W&t0<c-(@rM(=?3L-0ot+&`szwC_A1*520dGB@D
zv~G9FeH+@cZ_2Z3=0pIzrB~V|nesG_J-M&x0%2PpW!wm*8f)VfWF52RjS4D%Hi!x9
z$b&euopWJ9`^GD8`$IQ`c}FWWzZ$(a*-N0t`$`bCum)YMQs~Xm!gP&~qru?VH$5|;
z#X68+YW3QfTj^73<04liXi8ieP!5OOd#5}<MEB%~|LXzEPK)(K_{85ALoUnc53^9p
zZv7`Nqn}q_g5Fiq3KVl*`oMdt1WgC`rhB4pF*GI8S!d=N@|kBbH6)fY)$4gSF2v`P
zqnT-pTE-Q4fY%@8j%LCxgGSt#Lg+$c)6Jt#qu4i%JpM_)yh*2vLYLg{Do1q=hdQBl
z`q|Yxq!DX3`GICC-qSAm%U-DsX|nd#csg`Lv+eA<PgwsR(3NpkzzdUB7K~zy(9ybE
zkgL5DFcdTKS{gQ_<aSihE=@IAjAZQ82#gy)%~IeUHYS3D-f3fk1u>V$%FiFh!3X9z
z8%{Y+x-V?ibT}-1SKWCnchTq&YzAXVd9>`?z&x)mq*1M0AiW3shBKRM5Y~1GmX)i5
zJOBqe`23rRGenoWZUJA94x)AT9G{q$<~{``8oZDptpgZ|J?X%%(q(vdd&;1zz3Za?
zkAtEDM&d-HIoHQGp9v~I-r1H(zphDezAm{(dDXtrM88J;tNQ!=Jwz0hpcqJMT%$#W
z)A<gBS)JcDL;;Nh%}jZhHPQJ6!7%F){w}mBZ`|kaV%abM)NbW6=VI(vjgW>-ACLKN
z6^TdG$AmkH)>3`AZp(m&mjg~}I}BcVTIbSzHtG=U$cA+{Fa3Gv{)-yBZyY)drL!ZH
z61^!pP&?Zl;L!ZR-f48z00$*_mlbQZ)Y=wOl51o1AY=X}W-WxFf&Q6O@vm`k-tS3S
zfrug6D20WA@!6&mk%Q<2j(_byw&PUZfcbN!E<d6y9_+0KtQM^}r&#=)-9Ca2iMiWK
zRC1eP=*Z53<aO`b*RO!W+1>wHntlGL1X>v{;IE1a?~o6rhb6#=1p<qQgz^x<h>d8J
z?|AYDU4k=HRLso-C_eM*M--9j_3<GxF^l+phh%E{)T+Hvim8R+kqQy#Q&bBuf43el
zfnfQvfC`Q5K#^lQ7~SAL<=kfy+XGgixdGB?%Y_Zt+2}fuk_&sE4oVsSac2P?fDK1D
zon!F`O<@$jSUFp>(9uB}E1SRGF~8+R>8!Cw^&jccn10Bqe-_h-4c8{-Mr8_F!&;>I
z8?a$_hRl)OgrWN=3B{z5F{)eTm~;rLBuAO4w22PJ<(DJ29xK&re4uthwo2l?c9CcH
zpT`#%JgTEtg$eS`IVKq7E*|IPT{N>ezoUN#3;lNY{aB?lym&5El`i~+Jqui~%j+GI
z4dhwPQa^m#UnAarOtG%p+1b}#6Vyu5;M~fVR(?|Rv|seva$T}u#gMC%C<BlPX&=7m
zySqkVD^Fzz&!&Bqh)NF}M5*nIGZM$POKR;!0!dUKZhse@FMCXsW-8PQ1&h;Nd<o>J
zne`r&(>!3uwVUrLQYQ=LGX}B@B*>#=;j*0sW1IbTEnQz}hg7GYz1TK9wS?MUfo5(K
zQbm6hElz<l?{6!2`r-*DQ|<lYAK*s~HTJ3N7VNw0iPGac?4p%X!%M4uVBLNbZEqy`
zx~mHjic%mqWW0+=`YaxRgZJ2Zx@@@HNM8*>x$cf?*k0GGlX=*ch$-2(7DK8XNO`V`
zEb^A)+IOU=#5ITs-G9oGtRADHXSVUm?rOqj?_xty?hd9Opr3}v_#3POOphU4eD|z7
z7x`YDE<4w-BalIDy;{piFR7-zT#6;~#g?>uvfpfRa^8Ng76m<D6JtkS>@zfez^O0W
z<**L^gNNVr>bZVjs=&as@4(9HQx9b3)g3;#YkzW|r^L2JT?$yqDveV=*79JU#d_{@
zb!x%*W+;|?j5nZMn<-FbYnXR?yc%x*7qR2KaQze<Rix6jNm<%q;e|qv(Twk=$%<|}
zlNYnYl!yq?_9hRQ;qd6t>U9hGC(xfE1rW7I+(|wtA8k)9sov!6QP^3S`BA2O`RCe>
z;Rshotd?p&(7L@TWq5Kiw1RSWA95U#qro0zW6uQBG!-vUKVjB2X6XKKcJpE%8<lf2
zm`3O7m_ko(fgN$dX@2$S^Al9{NRpHydgr1x-x#muL)h^&pU<I!LXDon|BCF}{m}Lk
zR?!>_8*@x^&^g|xDw0|&4UJfgds|Onn>nn-`#b*4I=2<>Bh|@gy#FOHaU&|vUV(jq
zC+yID7H6x@M>3YTGg~V-gVAzp3+?4Qcjd(&joApiel2bl`ebyLGWmT`VrbQQrv6aM
z6-?6MdYQNTuzTr~aqfivkKH@$;-HyZJfM_#X7g@0dZ8YjksvB{4~D_EMXkPEBNT4%
zz2>ZkF&(Jg;ZX70aULdrD#_bJ95B|tvu@$_40E0J91)R_EwRVw@@B<_1IxzgFw5LP
z9ZzC0>DCO}42wp}#)vQekhkGcm$<q07xsHKTtp9QlW+ct-GACsclBs5?9K|68*ZL~
z2zajhJwv}g3>R56d}`cpGl$F@VMPr6CtDRdFpp6BLm1QX&?GYFGT%1!Y7k0)G_S2}
zo_+J?aRwOlyh0vNGT&23+*y(3H|15wv-Ic11L$F+Hv@RBfhs#oosu-4-q641;ZP`M
zIiw;NIsWOgq66IK75d%Zl1z}zwYo_p8|c7)9ywCkem&3wF>PPiYYaQ=YQaagCEX}z
zO1fMEbkHJ$J3%HlxVoJWG$MWRhPT|9&yT0(3TI46?B-);yp`X<{b<9B&!yTd=FW$0
zsAxG=T4B=U&~i>@NzXnq8U(4Ug3ZtgHbW{*9q4+B^s4o;yk-tRP+dse>-K8W(JBa(
z%)1)NM8UOjLoLVcESR@|z(=_I<Y(!CCO8X$inoGsIxn3YY`?K&#zyxDoM7-bNNL25
z0GlWg@m6Bb*ln|CtI(Tsk1H|*joaT=ea<A^nrmMTzt~mY)#;duw;l9&eEgpT+D}vW
zuEQa*L-z%_^l|r_6A@H%bCnvF4d3a2Yb+;dza+BicxJU!(Q<%v5~$KGN8Yh+V*-(j
zuNPdSR^+wT+3k*Vt&hbg0&|xaEho|(8*p&D^?19rsC;Q+gkO$fLF%t5xgUb+&9l<1
z^`h?+MZK7tOITh}<1_toa`^h6u}dJ(kyu%!n@rmk4zYJ32X?NSyq_FNUp*gd#-Bzj
z94q+oN~CDTaGtZ`jF;mJh>tEiDZ#CrUsi+a^ddhE0!DV*5Z>X*;@kw6+9xZyGNimu
z)>8nsWU=&dXX`l>mmWx9dElG8tg{qw+U6s4G~K1OV+Ws{F~0dFok>G!$ml>l%x{aO
z9Of?S?ykSN`KggfB`n?QIp4PF+Dl^SOsS2%)6-!;O(l{?<kE7{Kt6WhV!rG9ynmO4
z{u$hnxQxk6-O;DQFWX!)zk9LHM=h-KxG6soZBD`Ke%!dp=d{@V$q<AXj^9N!46i1d
z+x=^a{#|f5b7eqjQ01iS^Dv{3{~aA9%wEE{2E4`l!FH~i@3g}0goz@iW<iC<md)@T
zTh^V{P^k5|39ZqnPp(OYTgNErtZlw<B1p1nnO_(wl~}HNo~=&)zN4m8Qb#G!rlid~
z!VUkOcm3y=wTr6WhO6**d41q)c6xI|`;=mJq&2_n;U!l4(f->O0Ve`?00Mwx=L2j#
z=?1qf^CdSoQFk8C&r091x&^Q^y_fNte@?z-#3Te{nxFK`NQPthGg<iC)3-3__go?(
z3?_bErjx9b&pmI6$f)o^{qOHXrB#P7!8VT!mkBC$b$6%>tz8g0H<&H3$N1k_z@IpP
zUA1StZOE<nG!{0vR>FZZ8snphXpW}LDQgeR(KAIF(;fT8e2X}e<vcPAK~lHyzrJD9
zLRwhw$N&A55fz{==PqM+)`jY*acp|#){5AKub2N_d-%t*fvdfjc}*x*YwFM)1m0jj
zitazJxSH?J&WgMTwM19KLgkV*DVX{qLNRC9z)C3KkA&9WhwHI1%`>LT;I8{&5BTP(
zqc(TcuL-_xdH{iZH>kW~{D&swU)9ThCi7PX{O2R$$1mL-ea#b5|E^2@W8G=+`>fVZ
z`}-H?`QN9Tm>%c<WrO_sWUX8PLP+qo7W#60@OD9704rc2K$T0;mgWwzGesI&eT?4j
z+zZX`d?S$GlgvwRCg_JXG$TEO-450sGd2ejjO||q+JDJj{+WGm(ZpTwL9#Z`TOWKX
zzCLt#K{$+-B|<^h=#JSLyvLb6RywK;my0hLVRXFS7{nQSHu9|jUP`GYJ)*VTGiu<O
zZPj~5;uD&@xVCG%Sd1U)m64z2swbvqCeFW=t6rZC{xxSpD_@^NDILzcp|<&-=BHmH
zh`rg<s0HLPLGP~?0;x>0uLBoHX32&@qn}V1@J)NWv`-vEmVs+4VV6~4?ggYjD^2#)
z-itZA2fV~-9ek-u@a8w?s>m)a8&%J2lc-%K-5)lqzdz|22X#90cO!<)WPhs<mmX#;
z6n9@mJ+!Llmf<~N(fp?s_WO^2+~ZFZFbf%T5{_a)mpES9d9X)=SK2Z``eBwA%=TWY
zr&BVmUUp7an&|exCiWTn72*9ieDN$N=Tn%=Aq&XBS!9G{Bppl>nfX~Es3%{X-j{29
zq>13A3<`$7%fGk{Lrqmb!n5&Zfu$FinQcS<2-?)vXZ|*$U!{i~(d(PgaI0YwiD1YB
z_6LH&(c_j9pDYl(B7#o{d`oH+q`QIS`dw>vOv{<#qBq=95u@x3q#kTeadn4H(Q(1@
zV)<j2#;+lkt4L?}^=atY9C48G6J+N8`rLfow+_5s6tf{Vhe#UZkY04}aQIl?<p8r_
zJ4zVAON)m@LEqmfck<-wp5%GF6w4GCg1W!U+gOu334AfZ(Lko;zUX(EymM89Soqa=
z{f!BraP;c@F%_94k2z&YW?R19sw@ydn2O8qx-NbwAO^}iW7LP8<Jo`)B7-xr5T)&c
zw%2s5?vf@w1d;c~3?mnumhYUT<pL(L$xVmP7m|d0y^e2<+0{}D;)=!EPdF#u#`03<
zPp#_8vJWQk491IZM`(g&)9(pgn%#xnnCj^<f3KY3Ei$Xn&IN&j0SCFaAMG)J8w86L
zo@M{z8~@|cJA{J*R8T-aG=_7X%lgH%)Dr`nNvN9>y#+9K59^+gJH7U*!Ac?sVF{gU
z3JUn^T^$bu#SC%26x=FY!MCgNf6QF2(GR)0V{r5-`GuGqH<fi)H=9N7h;Cy=F#H<M
z|KLmLorg*og6p(*MU+ku*RL!r+i8J?8bv_#pZMP%IJM_3zy%*f_$k}J*7OOT$Bg{p
zZ52z)=F+|F#^<Ce5X{C(E!Z;%8&0}qnuWd>dC};y+ju???!7FgXC%trp6^MY^4gJB
z+^B6(4R8bO`l&-3P9@8WeI&?S_|0AtE&k0I)Fg%za>i)<ys|#S_O;egg+l7w_VexR
z1Rl4dt}KOnJ_|cb`P1n0n~;GzpD|}3D2-W=8%g_I_+<Q_lKid9P;XAVMqeN|$xkc9
zrP6`bTI_NP2c5f&_i`?9N(?~HB=M5P+1K>CftdLprU5fEi`va~?ju0yyY)TJczJfr
zVs>dqb<a-ZUNPoq%|C5hyM|y}lh0_xhoAD{0|>|u0dX@JM4;hq_3kWz+c-PO&wLxD
zA<&X^3)2<~qrMCbmZohb=MJb84?wXFuBySPzz2{nDJy6GD;V<=@!q<~!sCt9lV@t;
zaK1U;C}1N|4&9W$G8-I(DhyxCPocDO>biss6jrc9RPOM?m9}e(NoTj`KOkS@FF1DR
zhS?Fh(*N7lkQ2p1Ex=m&&TVq+InG=e^vC%C3hQl|EE$=ldu=l~^q;Y62fv?}h-Um@
z>az<!K@|dpSS21cw=<9GUu@Xdhn9pszcOV@))*g(r`-mu6X1%f$owMB`C+mCb)BMj
zCQGwZA}_k&q?E9j@{^L5h{%}($#fgmx)^HEkTg&E`!@vRvYcc1R!R%Cf3064hW)D*
zZvh{Okc%eh4wg?OaWp<2b@Brf18`WsU=zD25Kk^YVxj-kc~l{7y^Rg*s2(__do}+!
z8o)-gExnN>u6Vr3EoS-9jm+k2Q(;zu2+@27AS55kHi9p|`7pf9ZLX<(s{hc~6)8>=
zA+MNSyUB^qm&;-T&98n!=s>i@e<FbJJW4?88+?235@iz`1;HS38KJzryAdl;nF2j0
z%lSP<`j;^Y$C>p=e=d#pBC4luoCX<4_Z{hSMSSC09-D$odqqEA17XhbCOP*$X+(PQ
zgNpg!N_nYb5t9hgQ{=aY@87?f1GhxOq<AuL&T#jPSp#0wX5Kvsc>hDmeEE&&UQfMs
za2!d!Rqp*Q`2<WT%O%=t(#DzIe&+%33-CqM0`iTFs%Y>^0<YP*p2#?z=`)X&ewYcn
zckH+TP2@_k!~C3TAFCPVl~efxrn?WE=%0=j=Lwa@F&_p|^_5~a!Q33Tl@Xo0zL{Lr
zMN>>Z_t87&ym#&$;q||xfIgTbMsYdL+uz=Pf3~Te-3bE>eeJ9+rGtp*-(HG8UH)NV
zd6)P`&j;WTHdY04a?j<=TPyQyr@Oui`y(%62XqgYpzfO4^OiPXdwb2z{dRVqvB5!s
za#^Y|*titoqhm07^L$nA{>`tb%fbTuZAQ0tX8(z%Uggtgmyd>yJMx9lGG^A5?xj6Q
zIiwwVcMZIg%7@k=0k2;leuL^vI)?y|57X59Wi_QNwG)?#eh*I?i^5f5VtE5Hn|g!c
zJsc__wH>65<eGWrSY>WE<ySGE)B|`IA98!|qvgAxy4C4=bGQN9lIEDASbo}k^Kq)f
zh*hW)#gidY`^Chpc9}5akJa`sk`&$ATxzyx&BOC`q71<`8-&f24I%EuH1Z|C<&Sb%
ziww0*d4+HVP`w%SU2X=hXp#*NZhYv$Yy_%4>6>+F;F*5qQ5Gk&_Vg&5M%6fLCH_no
zf%Pcu?e9MjG{D9D*&rk{6s4a!>>|?ccnK!<NMHabFQs&u$OM(LOz^B{<5q32as!Bv
z4Ql`ru?#4O-Xog%35V6|D>QgYC4)ZQvLA-%pFhjY?|OQce|t3Y`%LTo2VL6U>AsAD
z+KQoLG*Zau+VuK&4~u#IGMO5?ltMFd(eIqg3|W7Fg96yt56o5OKFU^IFPmjG%V@&<
z<?q~fShpA3o<UWlYgQg>aB4Nnem0_5VR#AY%g{2=Nbv>Sm*giRT=E`j)SG%bzzi^G
z<q5WhW6ZW(`LGAyymWS{Uq7?fC%}zKdqcI|z<WWp8gj41a>gW;>i3JlCum@`{ANlG
zT!>0&;5zg=U!#9{?R)vqfC1mtJEXG(i|t`9{WF(OFjEVnYej8*+d^$b6!a*9>Gh?3
zqBh??r>c*3M7<%8D03@yKeAwwsV6U<c+%ySHMVi{&h!3||MpDOB&NR0b4(XdwIF}8
zTCY}Gj9_O`jQSt|i^AmiBP(a95!Mtnm+rbl15BHDmzwSyD2<&Nyxw2Orrxv>XQXs?
zP>{dv%)b}1Z3YfL^Js&7Nj2}wEtR7|@PMq1YNhSb$76}t%c0>#ewZA_oBL^XovqaG
zWhpad<`HDVj^n3r?(6j9iS|9#wUO_5bW#F2x)z^bi1{DeFifWGI4cWPNPSOHV8dPL
z+BNLGU{rP-%Pg@iG3?Iz`sT(&HI~9dNv!XcUv}~L_G?1Mk|t`cN7c%2Dji2C*^Ul&
zSOXD;3qM$b|Ga?`+jIdSsV(avNW|lD@BlTp4|R&Zug`*<k{UB^Nm}uK8}sxSHUtOE
zzkM)KjR9#hu_8Hd#V{NNH^lnCc8#}$!d+la?JV#5nHJVSd7p1%!fxFH7y-S@^PP1U
z7I}R*S;(82s2wJ889>t~G-9t<j0)XPHF*e|f6YGV+qT5E(3*u7C-?Q{L6qEmuNCR2
z#X{avd;T~y+nzLH|D!1jAMo`7Fg}MVP=0GG9b{5jt<XJC3w*o@>~QFL$4e-y0}Tri
zLu&iheU5@0*XG^Oq0qSrNS<`AdkM^)`=h?)qV80jWlG?j9CwlAQ1QTE>edNHr8{-V
z|8*qp&c*a07%0?y_<HE+ai3}EoNv@@Din6Xm3Uq+V@Wh{*=!FrmAB!BXG;GyoFH|@
z+rXsIpkGi~s|?*)QMax#N2XSz$UKS<-Y`aKM`cW`#&}a|S-H80HuwK?OeEq(7nYkV
ztXiYG_*mN{HPRXtuzoxVX>4t*MQlr7Q<~wh$ws}>uf;Ds);bH<uO!ZGu@NSg4lFkd
zTp77Chw<GTGrf=nKe#+mk>37Q&Z9gu%prTXDh!H92SQOd9BF)YXqi*QwHWW{<QuA7
z+^&TfG7F(K#w+GK_lwOJt7RZW_#cxL!?<zKtrignA75@!lw!nOLivJoCX)yYj--H2
zZ|rXuwL$N^e~6Em7|t@gV*BuaU5et{S|<Dgu;LY&l2Djef3i-EWBP>nmEoN?q3?F1
z#>~aX)&@N2sL&|INV1m_cR>XNlj^-buoG5UiESDRH0NX4-k^H!*&)GqXmWC4u(ABN
zn@cDQzWYTRTfLenKEslRJBHtZt1~tNtdetO6kD!33QjnX!qj!xHVJo9nKX2Jn^>fa
zyaV~LmL;>?<K^2U6rVfX4M6HDR`q78S8kiP$dP7?WxGD8kmZ5L5c&<%_;VO}tR$_{
z{TH;hNsTA9(F<P+IiQqT$o8Uh$CZ(Na_AT#xJ3Zh&O^^jyZ75)yUG}wkoUe3w9U@$
zJne==E>Nx^U)0h*MW-45vM`GAOt?+}FRPl?vha&pso1MpJBxq)rk?;fxw5id;^EUZ
zTVR>XZ{eT{`F?Vys2!|PXLs2)hczNQ6<N8crUr-nR*iR#kS^37WuAXn*Il5(WpV(~
zW?Z*Y?dy#ZL-Q4^eil8rEExK5*0vy$F3eE3Xx{`aCh6Ty+;#tzb(OyKBimQT8EYds
z?{hm>IU)iK1$%lv&5bKYe)HT62SG~8uYr_r#M1Xg*^2LlfV$S<aydOmIv9$`biYKE
zKa(Du?w{X((sif9<$n(ml?`EaPO{Iu`Xjhbyhi&ghWpp8%1*87xYcNty*eex|HP_2
z3bsM^m0jfSsjmCB*X8T-QM#d`!y@{R;Vk=hD57nd$n^#nl%+CucKksEbu=#^L;vpg
zvE_+j>IeU){+jx#{r4A>NwFqCB6)qDFZCj3*VQ%p?DJ}Rqo|5M*Um;4bRvr{_2X6s
z1Jd2Of9_QA7#Hzcq0Nig2a)PL^-KndC#{>DY$YuH+P`+Hpq^O;E}gDf$=!ej*|^Nm
z+CTgjr)g9R9dAuYQ>(shPjqG@K%Lqg@g{)*`f)Huc<><h5pJk!++Iayb7xhC(76D~
zV~P_!xvkXmViijcDNSV(9j9f+h+~$s*u-4SSY1(D@{b8#7zrBUhRX1U2i0xXB!amU
z%GFAWzJD_V(%Ma}VNxOH%BZ&P;3YbS?c&Vvj<93Uk<G2D;z-xJRrZA{G5FJ{2E0~V
zm@R+iUtmY?PQeW`aYd<+u~GjtQ4uZhz##z%U4Py0m0G|+{pBBDkp6rKmTbu#K_|z;
z^76*|gx)E_cyMkrz8L2A{6nOLy!wtSxIhdr^XUr=afLPxj+HzXa0ayj{bO>B{QTf@
zZv$TQZi1I!9f(vWhWKiq@ma|~UWJnholyqeL<WCy5X&b{jKO6*T*aRTOI<l^PAaF<
zPCYe$*PJxAKr9{A89<J;L|I9t3t0Ia!cr^gTtvrtAPO^9u)Qiq_}cu2YlT`}xK>jx
z71EXrp@-?|hqWpsszP)eTW-6vfm{}z7(7lR3!7trBqAZTqdL}?tTruE{1>=L$}pex
z0}vnY(ewbH+)9dCBent|UGprej;%5kD9TRIU7ymcQ75a;c&CABI6R@WRl%3q6SWQ+
z6)pE@pq=qb{WRm0Py%{E6xX^_6c0#rr@L)j&ALnQI?&v*QLJQ?F|<pD&<^uGuHuKu
z9azR;RQl2PVCk%Gyjk$)8b`b5QLFm+0LmOk!03>+3Fb6^n<6+C#8gj(zr8YI5V^+)
zqkWYCT;G4AUjG9bb&YvJsMr`z4?ktUT+3TZ_21B9e2%Gx7hEY?ik<I4F$gy38)GQr
zPgMq=+P6P9CO7#$<E3RTb^*ai><G1&9@fz<63+WN<mqQfI+eTs(2&;|ya3ee+cpz+
z5V`z{BQFVK@YpunP_RbPF3fb~IUl%2PytJo-4c&!FXUfZ-ghDRiKXGv%Tfx8PfXQN
zK#{V}q!XlpV*UEuxWoxUnvpnU(%$5l&e!z0?6N<3Q2=SX`3->@8l*&bxoBkK;DZ}W
ziX7scNJ=|f`4n_~J8)vXw-KvB7}SAWhC5;=Iq(6!V+k|Gwuj4ai+5Ejy)io2>AXbl
zdfHOihgp>l+^AytCZw(qSX^t|ve49Jv*vksyu3?o(g;M$|BYttvg4v#al5F(Ca|^j
z!T2mVH*ds(bJJ07Bil6&a0Bop&*7c9XJL;#{8|-dzzwxw;sL^<`0)=W#;?G5YEh5t
z;q{eQS)!CX5NNnlV-_V!ZD39bcH`?A=IEGy6?t1EN|Hv-qiXc*w83X1F%DuU=8AXz
zmIMo+Kwx=q!HdV2b?>Eqc>Go_lQ^?+hj7`P6wQ1{U0c-rQI?f{Mghx9PTX8q-6Ffl
z{2{&LzSB^Os;uwiOQaR~{+Xk1=gGJFlojHQ)9SliW}u&OOM&Ug+KT1Qx3^^`uh*=0
zl@X_g<~xSKSoNq*9PwTV)3xitc<fF1vIlcarYORXH+3i&fT5Wy<9^z6cMUebK-RnD
zmA?GbDzs&lg{)IYwj%LU*x-t#Du$)m@AY!_a<&oK=4{d5o8G*mEXGH%t;Vk|GgpR!
z!TZb*Fn1&R1;N<ZBrIG<@d=)%_yfRc=9>ExKQlh4S!VOSgP!DTt}0G$_ASlpL3wzf
z<d!6!uw_*hDhc&dCKq5K4b?}o=Fw3$;|(4}g4K=*Q&{TyD@cdZ={y%Ka53#{E)_5@
z9F4BNPRY`@BWnu0)O>)RdA-*{?H%WN?-z)#Nf(Lx#=>8x$!b61V16mzpkEq!Mx9uV
zPdwhT>N+4{kHF`h+|Eh{;#O?^RvvS4%UN6J(bJ)*X>vw|{!v$(eGsFRnQO<gB3DgK
z=6&t~VWlgm$R4vh`&;UM_cYvo;42J8a135Zk@yPv9QAb&<Fmy)6{{5QZlP9nT%cj2
z%uLzxvqfjC#w2fVf`y>WTK4&?y$#qC=c;nm%$50^*PsPY1}E4eL!MwaL@9D@TodW4
z3$k@9aagUnynD@MjslD|(mYP-nfsjcFECdo{8~`^DuWuaOOBqZeMIzZSB8Z-_-$Rv
zw3OR5_V_-!^BttszyX7{=yrssC9IM4+J#fw#oYBw{j2UfbM$rI?t-Qr1nG-!wN73e
z*ks`m4pl#ma=jT-J4x`GJw3smBJd*XuWq|3Lj-(Qua^1PVOWeCFYx<Eo9(*L{)?Eb
zlKP5+%6j5!u#D<d;WC{D)lMV?wG7Ut8*Fp!B{5v2-na%lZt2!rr!_b_jn2)AJU@CC
zvvu_Q1yg~+=cfnu64Dht{sPayA`uHg@G$avMbgOqvXP*EGQoj}nfDGUz6z6G(nxPS
zPg*cJmHw`VBDZbgJzaD)-Hw#rb?2gW<(BYBdflTe(!%K=RPRLy+4pGWIKhh*rO3x|
z$E@ob5(y0&jAU+562&Dv3qc*I_5DO@*W9pQ5Q@4(oK($Ys?~ne5w0AuCLFk799<UR
z;s=_(68%KkXOyA|GKXiP|Fu8*&cP2gpH6#Cw;JRbFEpt9{7A&g4{X+6ok%^{I%lzq
zmg}Unbx(ywkhzD&b=T#6NR1=k=zUNBTruxM{Xetk`#~=&r*(EUPF&#-;S=yNB37bn
zw%)(`W7w?aLQ(mgltN@KvKoZ5);|0OVyOjtKFl@iiEo2I=5XBnabQLNdk;u%i{vdf
zGr1Npr-`2GE>bUZt*_7Rn)OsB<*>{*(`|9LpJ$pA@B^yT^hW2_`TJ{OTI7RS+FeI{
z#XzQCCG@c`qVuV&50$~@EuqlpPU0P+U(?q?GaV<g*wbE0i-eB~Nn13s;F5GXrAbvY
zwGLjf4CS+|H;ZAiHv3rXpoDAe0*O7?q-wQc7rpNeK2-Fim_Zbd&8ogj+271erUzI=
zXh^G(*rq5em3uGV6~p$!16t)E50%D9`N*YoTITLf`)YZwX;Sp}=JP_=P(FLH)HMN;
zT>g>|qYBY}BB@)$Tksh53{H^~@69uVSX~JUgj^ju#ox9cT#q04RZnHU{XdneSe?@W
zakZeWunNaS>M^wKhb!g8@f03`^F>wSdywnyJ|8XVJB9D~$>Z3s{RQe&KWFR4L!#z+
znno+237R_@FyiU1YE^Yhc!pqny?NFOQ40-NPzkerb_?&bL%|MK7#dgHC@M3lj`Vzv
zgYI6y%E0pebI+RJAr_8o<kAoyn`#{JtEyNot4O1#O#usX8rg^`Ek)!~w-R0)9S|a4
zJCNRijBYp#mg?rW$)OAEkKaNHCN_Y-neTR2zF{EgSf}WnD(lor_^O~~gD3<;s^B}Y
ze51Oyq?REms_wDZzPcvRhXqnUnJv@MH7HfF`cy|johRM<)Pu3WjVal#Wq47mvoRvT
z1k<~XiLz{X%fb#u)hXVe7t=TtCpjR)td|39-c2mPdUg5$uwI>8cqBTj>X)bsfIhQc
zuKG+4w7Oh+qR8eT)W^@-F05@z5F7QaCk<AA3?1+ZKL^4IAlaAS#e9G5PAECiuC%SS
zF>57t%NU{qF&45qWWT2-=bp%oS8n*ixl}(<BL5RCKC1OFZ`h}}-RFZDxt;V->W0j=
z|4@GwTXE<Bby1&7bnsxgyhgl{a+u(vKx9J0SEKEoLiDnvsHYWIcM00xBtkO2jbXiG
zxm|UhuUErD)Uh9OtaC!TxK<Mu^(^d_#_!(98()A&EIT4~mM^iX>C>K?2rf`PO{-u=
z-~-rsH-FI746nAVyps3!Qx{{Vub1f#9h)w0S=j<2uv$P~V~1xoSV3UxV|yX6U+!+?
zxs(B9Ypa+%PknS~hwUi<%AvQm?&SjwC7{r&yTni%)mf)P^-?LwgCd)EgK{}>5m9fj
zm>2J*aQI?_{}2FmawkJjTkM~!kIy`)oDDZi3mu(aVL0H!J``{9$s+i+MPyywvP*Uo
zhrTv8Safn~9O7XHUBFannw7Lot<&d2l2`5o@>)J{S$HytjM>^k2TpogU!O*@+KA(p
zT=BKyol6!O^#--}6KL{!jwd&|(yPQ?Z>c$~E@EI>9Nv(O-l%)Iv1xM`xAZ3PONgig
z`Kxe$>0*0V^Lg~vhkMTY)<bZ0vmtcX^Nbk?*N~@!AG*@%eu>7U^?$CqW_Ko7+`ULD
z1>|RXY0UCn#0`=Im!D%BM!Zy*>72}-Ong|%fPhq4-W}2o6}7`ByF3zl|DG=&bwR`H
zOuz$i=Ik`Edwzj|cenTju*I+15R=bY6V3hubaQmM6re8{lKbQ}!SvMZ|C{5y(;o*1
zIB6Vom)K0%1jJ@%9l%_sChpn<JO_|EUU#Crj(z-C`w4-}SM)#ecrMFfjsWsL*-n!0
zU;q(U91&4Gt5l5FF{{vxYn46N6$k-EyT3`zc<xkrhnr@#Pkt5^vKhfG$wO^nYId2b
z^umclZW{+O+I3Jgs(GN(QyJ1u3ffz;jtYz;_}3lP=e4iBE<omYUtoey79T_2jRDpg
z-8*b%7b_4aK*Z8GlvJwy{6SzaK_<gya4f0<;d%V9bV4BGaVD6?BDtre&}0Z3^29u)
zy;jLwCfq3APw-%{r|QZQ{eVg?qE;H1FgZ#YB77jv7mioH{7<}AdaS|9c@4hQ$Mvpq
zSx2`f@V-C{BOf&@Rx!6?YeYjpeNG6Ho_K8G%(rT+;oVK>?8o<+fje!+fySV&`2F-B
z8Nq+bbtkAL&dsx5j&2NVAWYlW?8ghvMGHo}8xj^B(~WFUT<`=UTS4)!eW8}gIU;sG
zDFowmq|YaMyIttntW+cR)<DZRyXoNVb-Ggf?nA|z7zn_fGIA#(gIhOjjr@XaOlotu
zS*E5B*<V%CG%56WBWZ4b`e$Viqd>a(=^oKfQbn+Q$?N-jb@{QoW;uB;rBpieS{40I
z2}xErevN;p1VKeT$6UXPp>u-<Ubqn4`Rtq#rX0{Awb7C9yCDImg7*?$HDb3FrtScr
zKzJ*+uS)EvP0I-GNVZRcGn8w>+dMbLh{Xe)&6tb;A)(p0D4pP5oL(&>GY<YRWn*2K
z9(Jz%@8j?Mscn%OvTF))!6xI*`toXebG!yubJcR5u3<!PTwA;~_J{!Uu8<#pgpYDw
z%cJ-S_MXb7Y}!37D=p9ogOc@+9`-krauDh#n(n6|{@CE5n-S5dkNM&c5Ca+3s(O>L
z-9VCF9M~icz#`)90EZhqEb&&IBCSzmjFrm4WBps;EL3!ZWkB+2oR}>CcJXYGirABf
z<PA=<9u=0R@wzKn+C}yt#>*%&EyNB!8?&(?XnGp$!tj4IFUZxOZm^O%T}G0io!D}c
zwEK{jMCW~`i?^w`<wfyV*S|8;=oT__7Y(z7M1#<t3Ktwb7pFodD>@G46#F{)t;or7
zh|?Kj><xHMyPG+kSnZ3HFMvFQIM2m{qVpyF+rgSXKH?4DR~3df2>O01mOWz%_QNGP
zF^o}ewKS!wOZRH|Rzp!5kn}>Lz(f40V$RwWE>GqD2Se~-c%{kZ_afVf&QkQ4bxzY6
z_apxaNv%Pw$i(NPC}g7a;5*A#3-iAQ6Y?Bm4D;lrH)yT5ZY|2KyBLsTJ<VjEuTPZj
zbMgZc#)i+lrNa3ERp<Ky14#2%_YbSxdr8vxhah<DA7uF<m=di&C`75f=#JpbPoDTV
z-NHDLSh<&F|K<-;v=OoTwPX6wM1B6rGwPX`UQFNOAs7PN;h5&^&aXiWZ1xJ|qbVC1
zDo%a@gzpz~^I0P^79S;T$nC+tG#bK$ljfh2K7pXbecU;BxAvlw`yv<>&R%!hVAPGU
znZrIjJ(AOA2&j@%cQ>c8EW8$pehFeqZtpQU`|3YMr<baBemZLA%eRP0f<9Q7KyDfg
zM95t9DFq`g<kiG8Rn(_yv8vb_pwd5k8*>fPI(t`hWh{y~<n!$#bZ^UQ(Sie2Z&FYd
z628pD&W&60#|X3?{QJ<qap-4Z#{d*|N=__jzUV1yF=)HBbt_ipd$=n$(Y~o_x#@_H
z;mM*WcV|}a6}Uj3$wv-KJWsDna>$PPuL0#Sc>hr3hxqNnt*a0#yasyb)=wb!K%<_s
z0Yq4C1FN)4)C2YYN?`ywb?RT+k5h3`f|}f6f*C`Cy)K4*)F?mzP5;U}Jwg6$5v4qQ
zds2fu>x{U;#HR<|e)1k@``?H1)1}TNr-#aN-g?7>{uw6sw(uXsbckMXr7z*kv*(=d
zO@3zI>ta%ciGO~?$mfcH8zjp(D`y%3IltMN$BgP(6fmC%&3TUKCwQI8SbMrPPl;=9
zSaF%TmV}l~T+&!{&UfDX5l&apxO4Ip8~Lp~Ge8<;+mu_ym~L%j1l(1AU!v=c0eTs4
zzg5DrOt6j^q{6!H`hYP^M_4CBM2o@ufiFEIecfgnPeYuwqSn?~<+}<m=VTiR#1DuI
zKS(|j{bjE3S=ep|89ijo53WJ%&Cfrbv%_VtS>C)W*t@>b3e7Q_W0b_3izZ|z(%l=F
zIc4#~IoomK+;)ffJ_D=P!R`m0&DFHyOluj^UFP=cX00F%k!G}0ZiEWRs$^hEA@v}X
zhWv|fUm+IeIHu{6G1ji4txrjy&j)G##Rj-Fr^B!u5Xxt_M?B2b5~1GQR~vlJmrA$T
zX68j&#CZ;-($0vxs8v6F@l<Q@)A$eO^k;%G{jV-Jb0+}qP{?S!;^iYx++OoFhtc3`
zP|PBZa7zP=u3&MFE!Fpqb*^!I$p*~_YY|6kn8Kx0Le8;kO_P}yOx+KnR)fFeR-?gP
zz$?Ghpi=*iXQEeQ`FQ1ShWtme0$hGrGEyb16-7!6yW~ENZ#~A_TzCa*K%4u}NyRC4
znY^^)S8ATAPHss?%kk`ecrh1#hX03{a76oOFnKY%fGaRg&)~3ad%SqJn0F0Fv$fB>
z;R7=Bnpf79vziqKQAE#M<QQ}*P^9g)G>GdxxRy4kd{1KUeuI~sgp36o0fjt^QQ3z=
zDvmRqWTyw%92Q$7>~W?}bdd;CnuC<`Tg}5Tsa>e_9A0dLO?DuH(>cizNT#Ab4a`R(
zgLgdD?-2`c>p$C=K!=(@G_}l>B%XbwfC6E}DmxwDcSgkJ)R-O`o*sb|<CDLi-Po<h
z(ye{9YWem!<usVRY>}2KrUAErU)6ysMiGD`Ic*ln%FHg>bgL1Yop!vM0qy4{3GzbI
zNPSA+wW08U0=(K2pi-DjJJEI;=W&*s7PPVnc`I72?K-Pz93FR+DztE(x0{+y*6AVS
z+jy_dh3I~ex7t(GHZvWlpT2QhNGGl_bmtnA^R8B<**%v@WxM!wR-g!$GzjZnxNiIT
zWf54&pHBW)lyOllfb}o4`C3_Vxd@vmbUYTtAfgj-w@oEt?z0YVHcf<iA!u=-Z~g`D
z8E3{#0fY^(neGy+c|r52aNCNh6PfRto;E0E2%mP3pfsnJ_&lZy*EPR&f)l5xQpVt@
zV7K|RTaj6+f6g#X<(l%U*WBL1zNhGo^iI?f_|)jLBc!!{+ze9vMgWHOcx215u|Yh#
zE=Aw1^;qDU`$A9ZZw8?T&~kh|W7ypY{nZ4!z*{0Etj5T_e4&GN`;21vP+bIuXUT$l
zo>OcS&<l<B{k{FOgHYO@0LA6zS+{36>B8-Sgf{)_2Rfaw^SA46Rod3+p;*uB8o_Q%
zX=bChHc@9A^=H)MB?F|GIl#;5w>oDQ$Bi-dem`0<MdfEWo76n)oeuh>=i$h#S+qUZ
zB_rJk8bEpxVj4OJSybEk^w$~ngX55|?43L}{vSZohLQQvngu<*N<V~(4=Xa;Ohwb0
z%Qee>HlV?cj6VA)UZ#X8zO65^T*3St{SaEV#jZOer;C)#8Zxt|moG=dBPp*3simj9
zz2GuAUk1D49$u(nILk04XV&u;S>al{q1--G;B9Q*zaaz9SJMOlt{**bc#`x6@2GSt
zQv$?0qgMTeQ%J&U=qK^Ht;;J-W$el<O$4gjNEW5<^{mf+1>Un7h7-qSm6RgCr*3#k
zZ4PC4xpVf3Moi?DefjIhviJ=Yp4;aRuCR90@dWDwk56r^7*vSxNn}7oq+H6O&iCId
zY#TnV<3!Xx+LXy&3bjTV?LQo`jj&L84tjC@K7ApmaF(RNt@cul^@8a4uuU(NKzw!*
zT{afBQ?V}HbR^HPvOq9SF2Coa)Bbk`$P)ztojtA36YG+~8vdL>8;%>`nWB9_yr(am
z)N)YLXJ9cmhG6u1D!D&Pp!NR`b3H^azMiNfC@wA?QX*aKpG<eK!!t)6=rrS{c-3J2
z@`GQpK&P849rft^VzbEb9OVhU#KA1NcA&7FXnj|48|tSS#q<$0B`USki8yUpU1a0v
za&_qgaw(1HlhlyDL<LD_YrGHL_jbNKe}f3<#Rqy<Q=(+~?SkX%N)TQ9o#V-oOyiHx
zT^~;o5fdCr;vtrvigp+p^u`M$R}^{85yF&y9v`sA^kz`em?ZpO4<myW@Z=7}4@Vh<
zqV;p;$;F$x7%bpi^Yg}3dC!*}&EGpF$ai_2vYCOGGb57gFQ*VT@4}H^3(Q7`Lp1m<
z9H}+p1h%>RZy7WM0SGqecM$CMgEk-#`Aaet9-(~WBJIq|_onk(mF%CpG(1f)AdRhx
zG4&;KjScd6>noh`G(WO@V^Eu1bj8emwy<_^3|q0jxp|=`uNI}_+`4%OJ;v0`K^=>{
zT`U40!4x2H_wQS1^41+iw+NXZ8>`r=`2<$Pp1(IVNHE{1*)uGZ44s4s-4=*NtrzcH
z7q)WX(qG@UmQq6WM+R$KX{p`)w=kr+PulK?2c-SrX2_K;-Ep&rN0t3PRA~ppBi{{}
z=Ga{vP*rPP^)vJl<36*{wvoAzZx=g<!aUVsG1U%fwA5M-S?Q+F{=wdsy=XF!(7}eh
zf$vR_LnG9coIH+=iL^K?y-8hcvcnu2ZU|6qxd;Tkt9M0?3oCA~htl|JQ7#?bYbNW5
z+3n)-<>B0n_^hn))nSPfj5%42R;^ol<aFh5z{{c@x`k0Ws=MY9S3r;v=HG?{vVNRF
zzssuRYSs3q6HMFq*3<ThG=&&_{o0o<Vsi*Ei&_5Qa?izf;Fg|ld4;5}`VR4Yh)rM<
zbkl@_n`l<3CZ2HC__lkluy*8wAk+qFUNNn`t5G>4?Nq>$#w5aBVXVKT+BBeYFr?dk
zV)X&EzbZc15_%XA5!!#fa2;Df!%J?^*=P&x<;mEi;_+IE!y*uH6CO^N_BL9bHUjp<
zqRvh3(FgBx(u`p8?X2<_ZwJ?vA`vEo(l$zLay{S%I{WI6Y{b1Ys^=v4)$`g&I$Rri
zEh5`LX)qCnWdbT)fC>s7>@oxfr*v^T>9<^2Mq=lJUX$bnO(W)lPctvD3&5W0I|aG&
z2uTm~*;cZQ<?jhmSR}h%Y8OZG8WfJ3GD$u~lTOj(MW913Lx=L85?;d@cmsB_$PxK3
z)*m5TllakZpXjo1Cj8~5{N?E2*qQUf7GFMD`Bj>#@Oy)%aIMbYE4=JK)LFws-$tXD
z$rVs|=JCMuhZx06vdcqI<aAXxU(VyLwZmjLh7I08#y;vyx6$1J_~p&jK5x79Wk4rA
z5zVO@Tl}BqM(Nrk+|<a)+X5oc)@&b*iku3F$QEu@9)|hmr?|#DTK8z~mHzp4p#LeD
zR!hrDuG<tCL%2h!7Ty@A(82HCtv(k=GL(Od3nXqZ1r7k9v#0##W25blaue%ZLyey6
zo{bp<e|9Qo(W72IqK!e|`vd8U6!sEI1-}w|{CsXQoi~UXB)*L_ma1bqH6WV7Ew@Ij
z{Wq%%fMVLiX<iKkW|`N(1}gvdqh}-=2zz%S2J5nJLU}4>h>F&Hpq?%fx<a|M=Q7J7
zv^wr57>#)luNuQCay}@GBu~STF{GEWFzNlSvXsVRex&B{$tU^&(+17E*t18_lfKvt
z`yucc{?KG&6ViIbA%RoRnaP0?8Qr4(&dJ4jY_(K~Etna<{HB|mIR&6h-QT|JM0No5
zCUaJJ<Km3dxqkao@p*)yofDjpDG?eVKzoKKEh*F}-`rHO2EubKj(@hr(&A#Dh+iW%
zSh;mTxx;n75&LAjx*_WoVr5vsNMuVkDgAj&mH#3#VMJZFYkI1gLn}!+AJ~9rWHL4<
z0BvhPXPqqGg*e8zz=Gdyk{uk~lFRUgUXXh^C<cg-*GTUdCPV5ZZPreDF_uBqBDW(>
zM$jRjjPK*KLnL?@2jEEe#kLs~$Z_0?<l@8LqIImdM%S;Gx>n_P_xlFAUTu^%2(T8U
zZthILEc;i(V&qa0h~h2vV_h;J47m#4a{nd;tX+F-_x5XQ0D%nJttscw2H6glw~Ak>
zKYC8BNICqGM{3HI6D@Rh5PjjolON_jNY$3^GSbh}CkP4|RcES~74$UYn9F=GIY$aH
z4(Mgwu_x(f1*R|gH!%Y)SJpEgJf?On8rA86*m|cT`N{{N;GT(jdhMo+v^|K`a6ZxW
zl}xmeCF~yEah*X2l+0a+Ghqq2x#D=48kaid4TlePSDjk_#scj2P}N93JfgTFV?8;k
zc-OjE#6eR7)4ySP1R_d3q&sCvJ~0UBy<(YP>x#Fc3^|OmGS_FmO=oJJwJLb<Vw(ZQ
zCntMu@UVgtY{P?dENZJHF1kkHi@TO<(ZV@4wkw{~D(VyLu0!ee6w|=8qizzQ^P$GC
zIho+z3s2=-cV_a+9s*ezK<&H>Tlo?lHa_(JAw|A4unG^YrRg*FyMmYBMs$sr+B-K_
zt?FHNFLF#eZo9u1mFTvI2TF31F)c%~pXMTZG22G|d3Xt{=Fc`Yy<ozdxkvo%CAAMK
zCB=3L$qM(j$;>}4TzbSom~sjBy5%=oDkaI|vHX26ktQIoqt8<Fly$#+<?!PADcM1%
zo0TqB8k7>i`j+nO8&u+9WM7}blm0=y>+DH%sFp8(xD}PzM*n90k@T#_j;jr)gEK5}
z;db?EDw9XzU;KcQS%%j3k_txz%(yzK@5CC_H4%maON^j;GlNkA11$?+3l-As`dA44
zdj0W*%wMJ)IM+VHEd(6_lN+|b>t<9|Mco%~i{-=gI%a)}2^j_MTm`DUmzO3__-?wY
z4%m4FaOLy-4j13e%f6S}#=k!h2%VX_`!wt8`%_qHA%g@G@?3P+Uy*ERCk!2){LuX9
zd_F;5(OrsmBGSG30>-c4N$cf|&Rf|Ni6}vyKHpZ(<r;-=iq5yFfq%Id=gAw9BbYHQ
z9*+gCzBo3Brj+ZpzJ#YT`MnW-VF{q>|J+GH^P3f~5w&JZtd`XhjZ_b+i;qAj$m9oB
zDfv$>=OGd4WXbOrgpMt=+Gu&y#yY;X3RvG<gAC_prbS5xAh-rLJcB#$YZ83ER!}aN
z^6Clwks|!RW9l11(t@k62ZtapA$NNnAw2E(9h${}hv;3F6VA4`!t&r{Y?K%$p1#RF
z8?i~Yk)CZEQT6bF!^8;WR#ZiZ1}|Lb%GGK;S44nyw<WLYmxs4o`O7u4Xv=AMWW`v=
ztnT?OVvcrda7X`YdsHI`+|2qGG9m$!P+05b7fu-Zyty*aMg@SF3Q+F|#xWC@BfRz>
z*Pp-LZ8JMs%e&qwE&Pfk+;ohYDul31Swp=@SdXsllbsvo&{KH<xD0<Zwg7?MG{HC`
zrRH87)>FZ56(r4Or9cOZxbEfR28<&l`IPnkyulVA<%tYJzYdM@@j|CD7b4@hJZ^mZ
z1Q~rS!_(>~xpN_<J)$V)+NUb^xkE4kb!^hicSp=Ja&qR|k;-Y6J>69L)Ye!O-!see
z(L*!I=$Z5K^^x??20VQ~-%rtTURnqalNW#D9D*vRzy7o2WoP~Z+yLSBszAMH_{nb-
zMz)LPt6M!Cg37U=j52>L$o3wswWd7qlT??j&8WIn#1|#Suxg#|Sd{a^XrXYAiBMFt
zT!5!f<AoD&uhuPu0kT3Zbz)FL-`c|V>BiJpMC;`d9Uxo#$FTPU$e)EsyZnCu^2ZCt
zp1xIgsT6I?<Y1WUJ>!%yqYA;i?liq%#R=HxfC{%+d8l&rz~t&PQxrg^J|Xa!ESc1~
z&6mB?H4{SKdHzmO@0P;fC@$bzC}dQQ*?koWSo35lUlrQlq3MUA-(s)Oxy~JhOwIZx
zEqr7+{^6Hp_4W&f@_=%?vQ=4{CnlM?r15R&#^gH3`4?S%xgL?jUN;K~!6q}2I8hPR
zU)e+s!4Oo-SuAMFmT-FG3pRpl@Hw^Ji~0%&cZAIOF2Zat@~>g2#J#1iXBK(CKX*t5
zl8G!6nDP>82jhF_d|Zb{@#b@@?ZHfSMul8>;P$qC>3Wa)?q4T!Ka)kp4}K??g3>y!
zDmd7Ca%<+wl&b>ckz9DE<sUJ41AQ|kCCek`w3mfcl{T$-6*fg%er^#5y;!8t{_LcG
zXrW%wzRi>?-Vb@2)pW_cwavG^a6eL(yuDZPI)C0MyUAJ?P!~hzMMq0l%1xjB{H45O
z#e|yr;e^DvS@01bpJ9<A!I5G<c)<R`Q9!xh?A)KmS1maQaz?E9ueJF+#zc0=mDZ$A
zP?{UMaqkh2O@E0xVy@#g<l_HF*>^@YwME^cs3-`C2uN4Cpn`z(4k}GSr1vHu(wp=e
zl_p)JgLLU7(n2TFk&ZM;fCvbIgwR7zcqe%4cklbgdt>Mi2g7i(&)#dTJ=a`wD)@9~
z&>8?T{)sn#zjZ`Xw<BC(AH@1Is(DA7T$n$jQ0PnU<^UxsmUO*^kwBs@&K+>q#1-!r
zz8+zDyvE?AQJQuUP2WV8{&vb>ePd4MY9BHV01`FLhKgDXckcqtIaYLcS$-LQ%@ag&
z8*dBJVisWzZCfd+O8ZBKxi9MiO?3pE>LofVI}KwJ0UhmKK;wLDq>c~sU^1T7m{Qp?
zLMz9?m0($LsSqUDC?GcHPGBAa5abyClgD2wO{dI5gO4O+W7q2IMT`1I6&<>KD4g@{
zhhh75Wl=HczMnwygWHZk%<Q>zGdb%F3TutD=zf}YxU40LSBe3!Yh@w&`)qzL3{4X3
zBggdyfc^k-tO6;>;_3Oa<y_DJE3)T@7hsK<gr#&GDJXChb-4_OvCyD@Q;LGAxS^K9
zaYw^j$OY?@`9813b@2_%I=)4Zm+I@s7IB(h#*^QQ9eguE&oWU4=MgBsA}cyoKV(Xw
zPq<;UMfRv}+|lE|_iio;T+6vn)06LW?lUZa^Q~#{@3MA(&H!z`guw3~8&63ejr;E0
z*9}h74&9A#XZdc(N^=X+EO~E2MXs^{{7jf89O~~+opFRl4j<A(r5g^{=9fpBDxw!w
zbzj{o2pxQ{H>&Hp<FxzFHpRbaOaxP)`2qV{v;D?b4#O?+;(@IV*#(alIltHg#LZdg
z^>@Vuh3Y-K7<Q%9mcwls>(K%YlYW7qI80trfGI1L6vFNMH<!o^nNQ#nzk@y~Bk7xn
zwYv|seaTn?Dv2#6N^&6yq!sz#HRjEC*suQoKsWwPC?Z&}dkMfDuH(y%Y*E&Cnf%rZ
zK-Wm`)10i1nl~R6)5^RZ141I`gcWsk2y~VWHU!?qJqaE{rL>qH^sa|5KKmv(&AFki
zDLXWP3ki5?1#M!$WbP?`Y((9brmrb`fu@h4*z4xm3m)9AumD}Bf;g2HJvxoBjUwg}
z@nZku?EjbXds7NV_%cYhoCA8iIy2-qo*NUOJyfeb1Sn^LoV3z$nHg7V>#uR{;5vB&
zlqqj(U%xm0M96N;i9g>#r?nV1TXM2kQMg@DY7Bj5#7kd#AGZj0Y|rJ5l7DJiHmiy4
zH`gwIyGCbv>@RuP=9=vxg&!X>@5_yv_qf~q|FL>PAfG$8BDJIsI&T1nU81-=wY+Yj
z&uT{;s5N+edXWc(U&cr|#;d>DDNW>T#c>y|NC!npuwI>fLQAvH^J2^?N1E!rtcTDy
zonok#&V~fSMepXu!5(8SYyz*F*)=0?*MYtB|M5EQqi$!0T|5?EFQP{4hfD6g>x)x~
zO2(bwQF|_{jB!-iFE|U7b<Auk6>zX3n`}(?^LqXx5>dbXm`-=vKGFc~Laqd5igbD^
zcr77Ss;&@*q5hgg=~p}T?D(e_gk2_}4(i{_@CU1cK#ia6_h1BabO2l@eq0Bwc~*Hb
z<=erQ8DD&SzH$q|NGS9zCyDvU@@PC8r@pwY{>JH6t|grXkZ`J7uF{*cdfS*<hufhK
z8jII7qT5LW2!I}2#-c>#OuIjoLzS1X!!@+#;Xh7%7#AQZtpq3wt^B6}M8&Rm192V|
znj>vE@e`Na)ZhgzuO&l><R9#TzmCKQ!=jbEJhiR)+DUVt!#%8e6-um?(Uvn8HAXJQ
z?kGS@b2vDFQ~0Kc3%N#{V}4>{4{B1O^eS8A{9N<s$H{SSBb`4}1bINhQ87!$0@5_<
zyVJs^V+Bthfm--CqQxIvs=EZQdVgzP>R#G13f!OrYHpp#mJO8`2s|kK-R|h%u#v%k
zKWAqu&w=mB{>en(vp!Qlux2UpE-!U0`bE^Cwx){m;!0K<90?sy*l;PlQO~|FNfCgz
zl=NOw-7Go5pBQLu*r^XW&kAk)Ce7z^+394pwK|>b$Yo4sG7e(XSrz=xhy9Zk!UveD
z{59pcA?(;;>+21G-;g~suj!bPY{zOX8u~thgCc#a+<hX%16H53T82I(83>C_Rab`*
ztpnto8HxT%FU<Gw{ETN~<%Tgn>sJ&Cy6!JKJSY-!aF2wXiWyG&I5f@}91*w+;o(9h
z>Uy)K>%QinD7oQMOVXE1M659=zP*u|H>nyWPixGGT2``JOu)4io%8%vEgrL|X5y}Z
z826k2Sx0NuilH}+|Mi{|rfXS_m`B-5VykrO8L%afMhoyLFF9uA9Kdc#0mmaOs*=b7
zmHc*qiXq#aS;t39!}L`sXWZPZw9-eMu(!)_T?hLE@tH9syAz7c-Gte*2Cjtv%fkIP
zohJ3+S~1pIj4J5F>o%%3;g<s<Ojy{)^88|<&1#qRa1379VaDO*J8{$fl3I&XCq>dS
zq_v_2mrr*MZg=%Tc}oVvI673-ut2xWB9TP3x-GZYqB?Ik84^XXJ$Ia#u<44`gozha
zPXY`sn<Ja8=r2w(x5pK0CIbK;2lYI6X%$7ki-$*QxvK1C`3a8lP>%q>1;T&z-Xx5J
zTN5+&#>Ab)*PsTMdXz%2ftZf*qUh&8^%(hOSx-gvE1R;5Z~@c{tyM%QW|sK-#(Sov
z2{+boQmUBa0{XFWFfAI6L4bU_6mbTh7QE(<FVF68t*_+zl*JCdS!am?65vSVHxD{a
zW47#Z*C<VIroK1-m$lT`Z!D+D6_EX2rJ$EjlELYgF4$&L)#N2BMp{Ny%Lh1?=h`0)
z+l^Lt-kXHaDe5LTF#AsdESIUovZ;uNG|4D*5$+t{^owY52w2m+g%$?54g4535qL0R
zkNP6lA&z$WLC^spjhZ}<R<E#Z*3SoS=%?-l=#G5<-Rh{7Bks%Nd`aY~4zYs|X$f8o
z|6GZ@#pgp`tz_rSx*0ROYGvwFS(}R$E+}KUZRN@s6>tWt-6MqXzNCn{)jMvD931M+
zF7ojJH?L`Yve;Q~`5GI~stELx6$?t&cx!93OTZ*j;k72^vVf^z=ReGee-}QeE@L=f
zqEN^XNmbo-N1GshpcJK6Cfga3({nc)praVz-Z=<owOJ%~+jbWPcHNo164SCig0s~s
zrNS$Oln?rMUj)UB2b(Y+MKdLoqV{1TA?Tkp*=~l+s5J56y!;Ot73(6gfA~8H!M=M?
zG;~#Oe-9fdj&`P~d~-S(PcR%O_=tjm!YXeu$BhvCCw{EWn@d$!EA+J-qCnTsjW%Q8
zbe!m?Er%E(#q;?`GEz4uj7!}j@d?qn7~ZbVU+2ft5;P?WconCNmh*KFO}iWIDu#SP
zN~`r*%~f%`#<<p%!*H!)+5I~qCd8A7E4{RH8NO?+R?^$_mEPL}BAZw+h}rZAHrexO
zup2OtXU<6u2?^<dTHHDKeersNl_ttNag0jXp+1cwOd;mUkv=Cu_u^c12C?+H+lsdo
zmJJ@Uxw}e!pZ@-a2Wt;|P5SmojgjFl6W4LN6U-``nV38lD~Ki5xu2G?QTw@^5>Jmk
zp8d;65s*_9QlLf;5k-rG2M7`??{w}17Y6EIW@mj<C15;@*1H4z(TOzRo(2b^O-H*T
zi(<E~bS_CgFm9OlqWCAUEa?qnk>%jbkr<0(iNNb8+coCR2};0aw6Yw!lhG+8wbvY+
zwr<=y^+agPlhg`q)IMO?wS{(KA|1EdXM6&<oE*>7eO+?GFF9@0f{tom<hCL9W_@Gs
zZ~%Fd4dB}Ye43OGRV+d(5<k9D^;(aRmN2N9I;N=zlNDv@_&@u=O>^cx!5QFece?-F
zNMXhIlQzKdZpG`$8$eaB@@EhfrQZlJ_X;Z~Ba&Z<G0%a;zSVL2z>vWJkfc6J9dz;;
zJN@De;OYm+COrXgw~iJ;|Lgc~uL|-5bZ&x4`6*eziU7DGiPt^Tbcpj{V*Geg|D{}8
z?_G|s)GPg~pL}+}HMo@|JRMF{>wBq5$)W}>;W6R+mq6{?>oW_308}-as->apZhych
z8bm{g06fa_GKdWj7Xd^!7}`x!Dccb{!2A_J=8At>gbI-%W2H{v&rlj$zo)qDk`ZD4
zLceuk;0|qHm29QLv3L<i>BtZ$A^=~CXoCIX<+e!xmP`KwmeU@>YNPwD(RxG21EZ)+
zh-zHvSzQco9;SZDZos?^QRwm0+%=T);fcD|%A9M?oYM<KTJbGiob-q>y*OQlzbwqO
zVPtOIxhgeWe6TY7+0(*pNT<E>pB|8Kf+3(>^(_Ll0Z4dI0%-oFv8q?R$Nt_O*V=mt
z8RqcC<HcoDuGJby8D8sVGeaz<v{8e=P}jjG`Rh7s`c69egDxa!)aL^x_5Gi#H9)|y
zfGuo!&(ZuD>)lcZr!|i9bk>K>&CzPACGXI>gIV2|6WueRA%@U~H(a-Uop+nXrVqat
zitqK=)rs0y--H0{lH27!y1<Te02;&h3h&dw*K~A{k&NtYBP=n(`ZCBy`Z8$rchYYU
zvsRZIP-|&Sk>*OXeLywO5V!+2C)b`y&xA1V!F%ms&Z|G;b%divhrBCl+jL&CVVnTg
zz)PjlFBPYr;1>taT}d9nU)~?aI(yymo5EB1bN>9hDL8Qw^YzgrAk{IPyagQoz*lWU
zZC(-iDwS=?0qUWUdxF56tR`1T!5BWub#8s-LDB@rQ9xNyb|56S_ZvUKS8}ZKwae_;
zf(CU9m81c{yWyR+{D+oRz|39+kiV(ckQ5iY4$N^ECG&gNKOSE;Wn0FnND)DJSs9Or
z{XwCWC+Zzrzs_M1)V|S8))$1l@2kO+Bo_>Y`*$t>hylFqQI<xMAo?oS>qC?ojVQ9v
zf|&GncPYK}_9)MCYb?)vudhfp?TpXK)4B|n!NIwu0mC}?Z3e=ROq;X0)oH*B(-tqK
zMgaZNxT-^lQ-Cvbt>a8b4HsPv#JE++V$g27X+B~$g#7dc<mPc5`_G5ne#CM6cBlBy
zXTQG=`T?~q;hb5C*K?asF0-QLa2M><{uc}EL$=?VqZnn0dmXs|p``+PnmqE2VnrK|
z|F*yem<bX8gPGuD^2D+BYHb;;p;3Ieqzui<_(&IU)xw}j!#&+m*g!zT2F{||a7tZR
zg!$&~3caNjkT7U|Xy+8;&Lgfy-5Ve2?voZpZ-B+vLg{pBP;lKCjQx}&>(7D?iHS06
zjrEayrRtr?=ks1%l2qvYki$s1A`q$OXy)5m2$Lbp_vk=CYpUUdDt8sHxY56JEyHFi
znuPWH+e6vRww-O&=Si-N3^t&@R7>jA?lp23TmdXht`(1b(eS>yg3+^JeDd*3eJ8Af
zw#Skz&hBIFCws2#Uv0YG=nNpmwGo&%tIDH*ZC}~7BM!xmjlGs)l1|`g0wW7F9Nnq&
z2e>^DBWu9E;az%%kA$iCyJ?5Y2yGf)lWwu>d$d;j64+?cC&>FpP5xSrdG(mII{xSP
z;GSEz%5hr?TFnCMMOX)i`|bM2$G0egQ8Yh>y=k<FMFzVWagF;MbgYOk^58O))|(hT
zZFu#f%UOV2H*y`XpbQv0!J#<#zURprVg)!-bicy<he*pi=YifDO@|!d=*0-AL}?TM
z;2_8{iMW3eA;>&;p$9?%ttpt@g{0uZl}$F$*-%=CnZx{N{tu>tCjBmdlHRcU%f<Wk
zh>?}j(aF}IHs0j4hG3bDZ=fbk!&)X975}b#xf83UmSxw|H!Z%yOKY3+x<h{eBxOC~
zA#<fq<a{s(W;;RwJDyd~d_Vt1G(u+x&vy<7!!vNHL(23`Cnp`r#?RNMd1SRH8#>uO
zKv)HL>y=;FJg9-X`V%u-+fKjXPpH>o9WUt9LFOnmW~4?JPQ5r%vsmKWZGDr6F_;46
zN@^g&`s?+OwOCs_#C8*SslSSPL3*dw4jJ%uRO7aSzrsfkrro*4GXksH9v&9vIq-{K
zc1@yUs7{I!dkf-d6%c8tupzkp6OQ{&E%Q^947lE!@1p^5!X}R}tf;locrr?DZcM6t
z`tna^5MM_n)`3Fz+g?)HuQ%UUC8J)11T>fFn~u1aM->#u{a5+5jC{AtGM4$%WD#1_
zs&EC?w7J!qA%zL9?*ZzF3<edZ3dy$lcGJ!4{gsSKu$;c9mqEFwX)S4~eM7__sAK?X
zmcJ1f&NlyxxbR3(O3qyps+&O4ZdO@t&)bk;tB`^R6fd-IF1!$39lz#uhmyR%#GCVV
zSi8;*8$(*syB3cN$)i2ceN5<5La7{&W_z_zs}1UZ8OptiwU^VsMSK!ulZm~t=jHmd
zXYMVw@O!27vCp`USHaum8Ji|RRSgKLW@+O(2_(^4j9{d%>A;jtXc|-QXU(Vn3OR+b
zP)(e5krudbcz?{x>nC_r*5qTxTDwX1QyAj!UBN%cZ2_oN=L11>AR6qaKpDWA&ax0c
zbV+Gx8G*;k1d)1b_i!a}O>Do;i*4l!1MUl!nxJ~1LHY9g;U@R=p|&8FnrcE=IxvOT
zxV2HHKAMr$#yye~79((+ke?&G3ot2kS=1#@r0MYr7W<4*bG!qgb54iAY|d{2^h!5(
zF9Vbyi^z}UBZ_Gr=2hCf1mF08{erjGXILq&yY7*%<jRgOk8B(gq}-xn+o>LwJ20aw
zQa-$Mj~uCPy(@IKmV$;c{8m28?z8j%!>zohh$V{NT=IgenZx~M^hfdK<k|1JwN7qO
z26`rN*-{UJUPhtOP`%N?;%9&5A$}E8EfpZ3vu_9LC}0O)%!8xU5Myt6gqXLVdPx8l
z#ujOZ{8fIld*eX$!>W?%gA%w}b{VU>zftMFmY*RM_&oH;bAEYy^!hB6z2WJvl>0YE
z7WJt!J%CRtb3HS=8NP<?vHT5KWK*HMs#KUhXVvwgb9i!q1+caJBjFLD04stDW*qpE
zt+(7uQU>B*E@K@&4xQr(eGz$F<`+OKBBPT~GY%^1o$XB6wwgOiU8rxTCk4rZ+4`YF
z?u={gQ@kzDgp&|H)QID>+McE3NodH)79~Qp{$zv}pOJB$4*e<a+N%$df4+@gz#)xh
zEb{;cUl?Pe00B;o0XJS}k;*x+8UA8|Uqq)470^7=@=t#gGK{`6=>F>W>V0+QHR&E8
z6c+QCp!5Q02aX)AVJGNY9UoGKD@zJ1+-UqEY;9hqDU+4&G;7@yJ*6YNnRubP1WA2V
z<0`hG=#(z@YQk@<u(>STS+w<!YTtw+tG1C?rExdM&d+6Ty=lE9q7A`p!kVwj)W+k_
ziR9N}_2N0KZ`oUy+gnNE+x$7W!B29Udj1q!NKYpyVbTA}CPIhg=E#e8w-u`J)ZSIF
z>*|)rJt7G}F&lP=>g#o!oytn7!imzNhlK?wYf=h8?0^#F0pU#)L;d=bl@2D3tkmu%
z*m25us<>Mi$h?e<jJgaO`T^_a%YW)2T9BU{?NeS3@yF@6d?f`b-am?M_8*CCnS%HW
z9MjaoJ<r=}pu9A7O91;?e<}6+<E4{*!|aW{Y&=iJvxbky6S|%6<6it;Rse!Dwmxq+
zB=Vnm^v+C?K%tb}7z-b3y_YI<rQ9*sZ?66pREV0Y229y~_HCl$qewvmGFSqI+)+i<
z{@f&Rvu<AuGq7g7Rx`MxuB8ulkJaSrcC>TzcG<r8Rvk|L+ckVD+k1FUfxpSqeTnrW
zRO*H&W5#g#n>pOBrG$&yD<(xx18{8?rrzf1j$jt2*6q}4=-)Mj{+6ZzVJIOd3btFv
zSTh~N>kVe5j(Ub7AF*kZFOB_;R}>(T!0ajeqbPhcb`u(UQqrilT@b1UsWK>~i(&YB
z1a!6%^*Geog2o@uy?82;ekxtkc-W`((c5&O*^g`zA$rYtO)3;!ysx`%{<5*+9{+J!
z$JE|9YSOvu9wohKs3)TSZOWMi_n$tA!WQ+-F-98uhOdh}uS#UxwM!X?!lOsjY%X+)
zxO7ThxYTa?iaG>31xz-cMj(KdD1V#drJpszTp9#83jR*_zM+-5r5{{s8;??ua>g=$
zR%igc6@T#uI$eI}4`{RL=3No`<r9B}$xbL=3j)p!&~>O%U_{!WGbm!JxwS^A|MH5r
zhVUi^SKpi!XNHLb@;n;Zj?)lFxkh{=w%^nh1jr$LYC{w`YE9*bB?2Ppmeex|*?X<I
z>5NeBEMv8O3B(a9Cl(sB3ylmbKz;7?YtF;p#rOnJIP8^78V-Mx30^@;Q;F<r|938x
z;6*F!5Nt6}AueN4_JINIqJo%DY`<jyEazKF9a5Hz8)Kbc-=$&3RsA$dxr#~*^Kdhe
z&qcXqv29<I9mN?5*PjV&61+xQDJpS1U`aZ;b8*|sW!II?<pAa0zcMOlheK@7A?Fl=
z>xjFS_4<vw7k^yzIrO=IwJ8$KDN+-)<G&PM>`o?9-v3;#WOP&{7yuvIxpA$~uVkS1
zZdWo9MB`i6VwKx3o!5GWrnMTsL2!=4yMCs2Ki3rv3<Ja>s%~q+6`XfbDh^~Yoq$&q
z4!al$VANQ|Y(K3TU`WOgd^}RJ36k6*)N=Q;@;xYSITteuExC1SD;^(iyT}eT%>2A4
zrp!3(YhdWf@%nWOIco!paDhM~A)qxcXKJC7IY>SijNNlB)r5fLG6zMo@|7lFOER+z
zEZ$87n>B^{@!hb8zTQk^*0NsAXuV)}K^J&K5luS){+)rkWaKLho2NaJ$p83?>G~+j
z4la<veJ>Q6jY(S%gccAR8yM07SDwvTT@k76+MF|riUm}D-VCF7KoYxeL3Fq9zzDHq
zh25t8D$ObSU&%UW5ojr0H0;d0Zszc4hp_{)p*xd>e?9>LZw%PFyG{oL8bI|~*6D+Q
z$_WT*jTbVmIn~jDp}M8(FP<{u7|B>VkII~IB>oL6#i68XuS|>dtm+Aq>ZQkP_01$!
z<+ES7w^N!XhRRG$+B?k*)rw;kHgqUV0qE~&Xd2t&UK_J)2F4*LLUn&gtY7p^V!(4o
zjU0UgNq>X6<w#eS(*xRMZODL}f_A{!X>Ty6TP$Y^P-dvV)Q(sM#3fHFs)Nhybg25O
z;PV<&$ET`>US^v2(dbe>MW${GX=;%jrs?3s?pS9=`}uMKRl`>ibS=<eHMr@j?;ZXA
zqf|~H>y9n~COLQF`mWwMz1IGjV^Kc{DyOMHTl6m1p@tnwVKcwt3A9L3HC^x1hVD^C
z2C^h(ciidSDOp8X?(4+Pe4$snzlBPI9^#n_eVM`r0HLjiEp8UNLpRoPvvL0BU7<ja
z;ToDp1n8&5&mg3@Ms`0j9KeDh-j7tDSlT5?Z`F3AFX}m5Es7I_!-w-?_}3ol+P!$k
ze3cXwHK}t%Ata9K{IZcW9W>{(YrdZ*{Y$~)8sZcgds6ua8X~8!bgI<K>%K1sz!OG}
zFEiV*=c7>CXUcE~&6nN-2A|T{S8Q6(Ui<`;dY>FX@$SD<FysWmdTgLRNc=l2W~_RE
z^H}>~xfYA6wy*M-wBgD8`HHnyzvT8(EP*MfM}RBE-%m_(_LWZEN{=$U*c0Iz<A3JP
zJc?f}8-kFTuAf5?G)!{aa}>81*0PrlCFn_Pb55y+<3Lmg{Rn7F3pK!3SjQp{l+br<
zQ>}y?s#1ZWh)mT{vdr-B1;8|5A7}@BiZ=K21BE^P-;OQt5Cf{`YrZm^DTTy^|Ih_W
zr1-o)NSms_dH_;&_pQF$g)~f%FT6wEKxsZob9cyg?${-80OaBe+k`w9S||Ly3b*-y
zajh{~Q@~h(W^H%xB)e|#`*+sm+yH`3*1gOj7DSd;F37)=*c`Vg2W0l|rY}=kT)p;g
zPr6L;#<Rcv=U#2Q{9kR;KFrHqF+Ejm)KT1zZBI4;kO=n&#abRNn{Hd(WD5uMxJNV!
zW19(F`CQyUZpO+HYi=*#aap_b3b`fcFsn)D9(NMEiR@_TivreTvk}<~fa5LOpeMq_
zrl54DXyaqa5d5K0FOCwj;W_j?M(?)qbv)1IUnm=)?Y;<DyQ?SuUHp|Bnl`1d%o$oe
zG1m7@z-tEZn4@BE2N2K<7NQcHEG|@Sj^oDN;}tuc7rKCQjzEZ*d@=^iZH^po-DUE^
z${&9fP;~ZmsnBz(j|HaJ0``pb2};3!n-QkJr9ltUpsffz2JvBF64-cr8_E#EzbJyC
zadC0x%&!1`%PG|PpFMd4N0F+i_qt3rj6yV30yjKJ02PAxdz?RUt)b`D+1$|~8CTJo
zeuQ@QdIlHSFQ|p@IPU<UR<i=r(tuvjUmEA9lbWY>G@{Ulz6(H=KCHZkiU50FGOf4c
z@EU=;L0Hd!qh`OiRsY8^J9d0|n;%nUV&zEN@=kmWIH$k|j?gJ~Zg>*Jv@^{KlYE4=
z0B-*Oyu18Y$A3EiDqAKrvJV`YrE%|ej@Eks?y@vCEsoiWI=&QjVWMy8zVA03ggn8b
zmw%klw+VnlcaV30j!uPiCkN052EuUV{Zm}kprH*hY2wTMRx5Nm>{qe!`>zy9-vY*a
z=EI8atLj-5?VPHmFTE5CzSH03Q4ss5fUY{j%4kW~L4^WB$h3pp|BXa}IlDpmU#JQd
zyWs-RKWSahb_M@<(~LEj3jamH%9mvv^gH2j^czhcV2k_p#kq~=crAH<f6KZr?#RUh
z17M>?jzq1`@8{#i&C<_rX63k$^pe{5?f6q<3Fny5-T~wm7~$y(f3~c11cAn;A*)eq
z=Qdrg|7@smvm?90AT+{r$n__nuJ9KgdrK+!sF>6FBvUd{h~2L9RchvG)OZ?PRkvGW
zC(7tEurWDs`drG}KoB8BR2TV>M{-X9oo3A)=h4tz{%rdZ)bRQ=M?1pumjE^)tj2S^
z+_#gmi+eXMPoSsbTgJTd*N<h^GWCIDPj#w6LJjrJe~Vh6UWPJKW*4kqL9v;5W;-;N
zMO*qZHXQm4k8?^LHC%O2-OWONg?OJl<owrm{cE`YUv1pTkB6d8Y_{;D`;u$j%W5J9
z#o>{Q?Cu-8k<V{kf9;e-**stvwHOuzg$bjZiDAOG`TR<$v5c?S`u>6d0Tp%qg5B}R
zfeMscZBFrTMvzmW5B+OKY249<)o|oz4aOo4aC;i;E2r48MRv*v2bDvVuE8cv-~1I*
zZ9X{fOT6V`ooy@I8w^SE$1^zMP#4NSuC`9?Ejgnt*jiGK7KMzMJZ4La<c6%kKMoaZ
zBb8VY{HXMI8L-b=MFMqO550VAr5mETGBIHdt#Q^;IrbcYxJYkH%h<(0*`b4hTZE>}
zG(nGUe@5WzGo#ihQ~DDpkn+)Xmm%BXmMd!z)UXiYWR%`HU<lj0sEwU)H<AXCyJk;{
zxJ>PSJdw>D?X5nk)rD)G#K;u*?}@%hr12V>PnEWetzVmN6y4VIGA`IsvGfwVAH2{V
zgPv32DDt?Yp)YP+x1sGfM+P=CH@}seUtroX1wD?`OLR=akIMUD`%Fm(ypr!Cp@+KS
zMfcLB0mmid5eoU5g(z2WgyqT($|`U<z#O{2cbT2w96=Dv9?2mL>+&6Q%c;b$wr)yS
z3kqko6j8TpK78smaKm%_|5>l$RI0&$2asxjTm323uqEWayr-B*Fo3IdswxHAu7s{J
zR-9W(`kYnBXR9c66W^zH+eLhlsc`F+l(Al5T#9GY-)lGK<}&M>+KQ`|@YE3rmLPER
zv>qt<ue6Z&1TbZxtSX)-LALeHs%;K1InFi(8;XGEdJiJ%{IDS{QtlSWkC>N{>k@|=
zWwY-6CJpZ*l3u#Vnz~WzUTDLTHX)sjXZjDkC?>%sU7g#y&MNR02uC^8<xazFSz4Wk
zyox$=E{l3%93j$~n)VW4{twE(UN}vTB3``R)X$4v>hK~$w(eLNgB{S1Tn3|Ec5lN@
znn9p0y}gQvx@>=vWNg}rs9WPMZh`Gb*CcFbQUEd8;@afdbsU-jYgnKD(wMo<k0Mo?
zL`0aLpzp1@w7Q`X0o#{-qM5GreOuYDO5g7~Nb0C`<K#tTK}9t58=AK<(2lw8w9ZPm
zt#r}1;3nytiFumZi^PEQ9Gs@&-VA;-op(NtWcQur%1>4hgQ*ubUQgjGK_Ba{`FB##
zWYHBNrc{M{qnQgO`R*Biw!pVbC&@B*r$&WCehkmPQ?EX(1VlE*0}!j}k(>y?I_@R>
z<$&gyr%aHuws3xdYMoPmIR{3@kpS^`BRGWz={?e8!W`oEW?(C}-U(3!O7Q)^#YsR#
zdOh=@s%cE1KPN<Q4!pa)9We)r1&g`iLt6H`yaB;2%0WM*xFi0jkzDiHb<627)PR5Y
zb@r?bDvwPh>?{qFuLE{0Du=RWk=3+4#T&KKSL0)qclYPJO2Q=3-J?SdAPLLG8~w_<
zMfU;g*%QTlz=l;FT((Z<kW{^Xh1H}>0J6^3!Ud~6U)6-<#_Yw+c1}@4R&p1f6Hq)S
zz)>ysGz$NUz{Vkuem-Kio1Dj!=N%#~i^e?0c0b|n(EzPYsy4*5zwBWlBERc`|GCoE
z>jQR?9YPBD3xLb$xK3y|xqPhVBVN&C?v9L`Lh}>XD;U24iVnHdX#=mgK9LtKS4Z{E
zkgjVHwKGGoLfqZQK3OGaUq~HG>Cjb>*Yr=es2@qi`X{r202(&NQ62+{f_(8^{M#`A
zj4yhDSt)Xrc3O$!=3V`gXqzMX!hO%#kq$V3-hl1leygwgv7CmDSA3o&>#ujQTU>h(
zl!ORoIAI*;04z3tMYVV!OHctJfly*tasCDvUw}^b6Zsaa(y`xDFjAsNgDU+iRp(~f
zrb&|c#;?zU0oE$exFaCS9j9HqKbxe#kFWo{X!*oa@@#c&0i|&ix@J<o(Axe%iof#@
z(o^A79@dS5w+2|TClIZ3UkLNof9NqRvw9Q&N+Zool)@q&S$5W!@xNN<hkehp=hg`r
zUPs5{9lQ_L>X2a(K!VsN;bU*YhJ`(|JiGh`Kf5vl`j2+*^P$kN)poU}yfYY7eH;EY
z%elRYlpzU|?2iw@a>jcap{jB=l|N&lyRW~SpOc8a>BtVtkcsHi1<xIli11lScPpP%
zKx`nEvk!VmOUJicK8l2n4cx%oW|U>W74~1d>^<;dGEnPhXeLw364gxl$123!30!|b
z?jl!DSL=@!Ct(yFpT%md{Yd{RjY!n>m<D@W1%LUQj$Aff8&9vat3<zf#T69KR<H8U
zp0dhOQ`HcYi=E-pi<3zXF&05)%3IE#U`CJ)n@qb?K+PUfLT~{oVy5cbvB{Q&M^eqg
zIw(O=!a*^uSut-tAaIY>&H<QdBw!F?$!lu%x14DXj6XdrdvSMe{pQD`u$11})b^-M
zqwboLBo`hp+I3iM{g;is3109*1BCmlCG<0kIxV5)`LD>Rm09l3>NV>#-8bKkShm9N
z{+L%?a^4OvMg#*|lx<N?yFr-;N7NV)$E?+U<CXu~Lzd;$Gswfw0_l}EkF_&ntu4R1
z|Iq)qt7-vTZ{L`^pf%Nds@ZR&EgT%DDwKT~aMWP-4G$3Bo$?<8@-sSKw*xoa?a5V;
zMoqp%_y?@E<AU9`>GS}!o&xnYz>Usb8NUd^EyElc8DvxeMFiapHTbl7IWXRU<C8h-
z@2<euOJRGoWAVA{Y92dFypE^2n-W*8LzUY38iL$(GJFg+9-w45`7qabI~ZE4%^HlD
z4f$|kN7V)$v}-2G_I=V(YFmUZtr=Kof}|PLB;{`l{ULf|PtJ=q_T&SiVxWcVP~f#w
z%eX}e+kJG{s5CXV0D)M)x0lz2xU_vD7tQpFjS$Y(emkw8Q%Dmw{1tJT^}7}qDk3OA
zLZK$!bRy%c4{SqNF++x|CU1s5h81odaMfkwrHb@JV#?=AC-21lD!YMR`{UE)KD~Rq
z5S0B2f9JDK6w>{BF;*JMMn~hII8rmzdqMF0xaja`RQ{GTvylI*zlP2Oj9xxrZju@(
zyyNg%cOW0;K<<|2l>TfiWGgzV&|!TPw)Cs|V-om~sFf=}peHUA(z>RjrH}6X`LL{(
z5?63GJLP#)ifL`m-JK)b->G_D9-ijTPciTSlc&4>zCamh#RT?$ZMM0qW5F?1anr3v
zJ6BY&=NU#-Vo)W)dWF8VV-v6sLW{}QDoW779dhH-kt$Q)m{M=*fS8d+3}PQVE-wLv
zWX<jtV2K<H|90JhAC{FQ;v{dT&E=D~Cv<7ds$-=!F!RyILBYoIF28+|^_LN3peSa>
zF<$0p=Sqsp&Kf)f==)w;?-9&DVhw|Z-1<c_Aoy;;OdkQ$I1zq-8E>@Hc>yeg{hGxy
zLRgpk7oodv?o~y-<Ce%$ShPi_1HusJeD+J;YLOUTM^DX=WVY~Hq`lFcDXbXaf*KsX
z-nC;DK8fFb!?^lDKEbw8N{t5?+Zo}pW26q8^B7<x7;t=>%p}-vMEl#@c77%eA`Vz+
zdK#70N!qG==MS9-YW37lY{yYTIg>^#vr7VXIcv-V10jxE*E#uIu^d1FZ2YliveEne
zP!Q@mXP~Y#1|_!75@GZVm>~VL8x33(q;`g7%~@@_@%)BbIhe03OyQf72p=cP27`9C
zC<~xbw5Jxw)n+<QA<wCNyS5rIN^!IfZQJAcKnj}KnXS8d?B3^Fb(PQn``1vsw$A-a
zPQm&uPsqa=W&6YzuuJW67b!6E*)0J#ZGDa}M(<_I8`icIX%10wG%eW|_)rLhg;f9|
zNj8gcEj8<MfxLX931B9Ej3igS+`>|XFciOdKONSvSZIwBxG<_eC8y7&03^y?VYGwO
z%H~Z`z<|gl6K?pfGTmUt!hrFa8yc<cHTFuVj`tm2JU63P?HJ&V+GZprvS8{QkaG|r
z1Aov@@9p%hR;NB~rSW^^hhyJRqJ~kcHpAkcUC-OXTv!j`HM;=!r@TI+!#aji8e=3_
z<T{f-7;I_>PBDFwlGI!9C~$v1Q&~!J>qxe{#FPZ)ixg^i_Wx9E@gPgeioe(Yx|BmB
zZS^)ai&mW*N??9$%l=9Mr4t!1{DkT4kpH7!M#yVLWJ!N>LOyM7y5GgkO?2|*YYg6%
zGYcaL287PETJF?$36ll!A8Cy$$rtP<IT3vK;`1QNrqGM^gSe@mw2dd(h?QHXa*4Xk
zl2n$D#oG`VE0=-e$pa)u6!KDxpCheE8K}ky{&LX@{P2VX2lbmQm3Ujlxv$;VB16p}
z#$*g8(KPkZh37*yPKIWo4?5j5ymR(S1xkii1nid3qg6iGQWJqS-W(Z0PU0@hh{un6
zE|R?%=Dsm}-oi1Fit`17@`YQUAD$)q^x=Gdq*9%^VQlH07P(5pB>llVVFd|*{2xoE
z4u^DXT;w$2Pll?MB=xgbv{v)_L$wIcb>o^nLsgpd+GDfY$9?G9rx;%ck4@`I=<Hq;
zY0MdZI?t+-N8BpFjf;qAt=g>p0z|<e+vF?}Q5~Ibqu4XcJFk+zIw#wu2!G~cQV1b7
zozg5~H}cmD0xNyDeMYSxdil46P2bMr_v~^s;hyTqDsruRAV^5^tsBfSLCvXewb|z`
ze?m>&h`QSj$b!Fo&!p&9J2W!qwEQ@5v1wWAQ?%d;xAEjb>CL)l8Mg(F2d18qaB$yj
za8JFgg~gGNb8)9wyzds6eTcqy5VcC9^OSlB37F_)_AO7MvzY^J>m&ey7!$Heq~U_W
z{Q~xfO^RBTi|Z8yHgIvwK`MDQvgbwJ;(7)f?7*Rt$5fuAn`8Nh4qA}87W(4Gad2H?
z7*7gupcYhzGAC&<K@&Zag`wmX4J7l`o^Pn7^&xs(1<d28HiK2rGu0_Eyf2q`4+KWw
zM(WRI5KSrqx2{1XUrM(;m{H1NtWm-69Zd<QhmGPGALP$DdT1Bstpsk+5q(LYDAjMD
zc+54XOhiPqH*YJ_opM>8a=)tqn^<L*o_j6z{v-LD1s^ER$*q67b!<d$BBL7=bK4i2
zSZHP}c$IWH`!@CCUibbCO)-f3&O~wcrIA;4sl7Ujh7D9Esx4tR$ZHJu9IBU@$F`~I
zABR+9+wYaVqP_&O*exv16cM;cK~28b@Bc0{uzl>MnDEG<ZuKjc@7!A~NBG|kU}fDU
zOsch04iK|W9)>Fq8<tVtfHTEx{YNyG<2s%Nk?Uq$b`njYWl+HV(JMwyzv>M`X6D6A
z@MyQc7MtO2c-G!;%+uzkEsLKSE~4vj?8I}t{Wp^)YA%1%Q-eCodycV%GFTfc88Wv&
zayA1i8SNRhlDxLplJ)hK=bCwDn^I+2K09N0t1rA9A=ihHYXA}V2u=@_bLQF>9e;aV
zO44<Fp6GS3_x@byN~|J_8T!+WrMX$xOMIb8RForJS8AUcESrYcNH5{PIfRFSeEE<M
zBD?LSb3%~%*AA1yFh~3?&+Yxcw_N|I)Vuyj>b6bO%TlBXJO$S`rhcNc)MB503*s-o
zt{DB*L6UZ_LA#uIk>N8-DE@J`RA9i<-ARY$kZBO&Ls;G6fD4DL{*$t9*;jtLe7j}o
z?yE4r;uSjCXNL~lip^#Cjk<bHF%KTXn>w^>AIdER=Id>YjT@yM%X^-1_}G-#8#ko*
z<iGv79y9CdWe=k{&{A8jd3P@3YcTZCdsKG1$8SV_H<=#qxRN*gDf4j5Vsv@oCqLls
z+*pE5F5`A3R^qbqXY8s^1>l<w$t2h2*>mltY;GdRw6Z)0FyEzlsT`jsrw?5%4RM_E
zKN|CcP!u0OeMO>IM#kBz_pIMtU@Yx(`czJLyU421JvAC`%6|oa_Qf5ZRqZge3HL6r
zHM16gO`D>roa=kONAM!(4AJzHAn04`Gxr)^(^?Rb&0F!Q^tU%7HO$Bz>WFSfy~tXA
z{`f_RuWj<(0>*AjocD-ao0RW97v7=n-Q3G$ALi@b)D-lio&!BMMz@ZJ0|$Bzl7{HG
ziE7_ZzWg~|(ruOozL#dpf0+`xw0v})PiAJ_Ou$(urd{&c5ua?a^Iii}0e^h4Bac>f
z-^@4VHxGD)AW^+UpTDpA=$-pGLEFa3^S)H_@k4iJi^odz{R+X*u9L+flVX{xIX~Vg
zVZ0-WgdYNH+gCXM;QiYnnBjcyTIIk-t#!<<_`JJ!e-PBAXF<JP8+|3alIHWP^4gL)
zuw@3uXb|UP8R5WwT(+XyW{TajWzw{ZwKTZe;oISOTgp?(W~MPeIOI`ik^IrYX3MCX
zIdt}XwKUkoa8^|{$uLpG`AGRfo9XMzox#nVE;A*7vlS7M8(~Ac+S)Wo|1gw1UDvNb
z1Z!<ZUd_IseQVn2XW~abu{x(__m#^t2V*S4A;`O}$ebE{0+g}>D#1Tig;5-I<zT7}
z{`|~DptmLcqB#4as6A3KZg4>fjs5y<UH@gr-HXtdQt=e5p@EZ*!V7EeV$nd{Hqw!)
zNmxP+xi)FJ-g(eEYbzC*U@RT+UOQ5y(cnTkUPo%9k=IJ<psNOnLAP_;l0o(~Z+ura
zl#kHnIgT>8oiuT93}`q^G+u_3vjxz0zk~>zl$ZJ5x+>bs=R}OtVr!5RUaAdSfLkz`
zGJOq!?tR^iAr>6gcqSig!dbkU6?+NO6x^6Nm}D$VLNTuKhN^*wYur?|M3R;4B1rZO
z3hwA8<j^$nnrgO}C$ZBTQyhQPXAHm5m`p(easAjQX6jVrk!}r58jOPBT_v@Qz_^Tp
zTic5VV<xKmd$vZ3IT232y2E6*XW2X$msb`FYzp0Fy$meTX5vy4^6-xBR4W_vt@}0c
zE8DgiVo$Q?q;?7`N@-3b|M?y@qwghGC#7^Z&JYpZfVUy!?FYX25m^LS$Q*xOofLPH
zX63jE1Rv+yzzG3DPMDfuWqzI|m(vJ-Chm1a(hjcpriokMM5n__!~A#ohC9Ua?2^<>
zm%AO1onP&`XdA?-+)!ia4wf$pGNzI!_YZj9nD9v-<cF;mwYJSd<om1B%{<*-FLyRJ
zCmn0vBt0)bIe3$lWj%*8SK>!FvC`{Wol8^^wnfMw$ePysx33rjP}9G?HFsd4!}q#-
zs3Yq1y6?}bO7u@;_lkF_wDZ5Xd|}6ejL9atS`x1zolvu~Jz&Ag_<1mfdj&A2E3JNW
zsL-j`bH)LR(bBmYEyZ8H;qSdT<{>8mn*SK?m{`zdlU3BA2Rbw71d^zURxl~S8Qo(W
z%ICrD6%NE1i%-H0@m&&0uFzS(V$?TclX^!_p>e~dzHRTE2v|eSq@4*F%ynB_>HH>3
zn8x^{KnqyQGnH>Yf7*ykZJw2C7UG9?i73StsG_&Ke2PXczSW+_e|WP&cSF|YkE}pM
z^m-K-Q=%L-m!jRjnRdLv?t@F_zE;Y*Jg^<ecv_rv0EcSYmxszW>yDj&>RZX+%l)O4
zByR@+98BnW<bhLud^iPYv0{p4<xpw`5GWg<FcH{dxU_C4!-KXM0rAd(6uY4uKi6$z
z+YuW_>?lt&&^=pGp55DfL&4AqyIZ*I9gQzD=vN<y)LuP_6hVhgskr#{Z8d4B-G}ld
zFN%9BL@ankRyYrAIw7S%6@@peY8YQ~iS0VSXqpTD98xvk#J#gut%p<sAcHLZrdhcF
z@b+)BY<yB0N;EO|M}vjfwbXU`hXno^BqGjI0zqP=F3nhbY3$oFCGG=9;52<|%cp=F
z)QyWlxOT3^z;v-2f8UGFD*GiTjIuZpMIQrIg*vh08j{SBA-d2_-_L8^*>(z)(D8{+
ziLRfdO`rC*e7p!!fuO$}*S2^^k0I}}my^4~58dBxh&0#v8dLDc_g9u~-8g^tv<PbY
zRRrA#z7X%?tr=vOg607FjIpKq+P@)g7jZ!PFue3Y1mnL(w_DudK16ezXI;+7gX{X@
zb?0O`@kBI{63d#I=oHO!sB(>n=o14_TK0Z4Xn4o^;WKNG9&4<(ZF7Q<U@K)6kb8*g
zsDV#$Uayzyaqii2I*YB3V-ii&n{)b!c!b*SyvmGMh&{<L?0*n-Dd0Rwc}n3Ak&uI9
z2_gLn|Dq!mq)P{sf_Bq~2D-Ol_p{BkkB|GXra{mJNE<Kiq;Q;;Aj!*v`fkCJG@oK+
z$*Ub>4On&E&)*rYNl8auFd50)i5-ht@4M^w<II8d6QK%YN6^;?`(*F4>pttUm;09g
z;1$|p{RU%Ol6meR!g?t4XdsOPKEPD<v3{T$Z^2ANr17?KO50M4o5tOiuO;$R2(*`k
zzw$yaP66~>F!S);Y2^oeR<Q37`y-r4t2qvCaTEB0%Nx2UwW`2(+#RB$Rn3`OHxDj9
zM87y0NLm73TmZFi`YvMJyz+!mpCxzEC~sX<5HeJw72(<3>w9+X=1|}k`-FV6P7=?W
zNmAhD^Uob`6{={HJ+DabyclpEI3@Jqr?o4R6#tE?{!G|jj13>}gp4Bwt?yJA5Bk`J
zBM}5Dd#YbArg*aOd(3aPV@9lBdJcS4w9sY8S&9cY)PkB$Rz{r^556j{pYFSxzhYp~
z=McT!2VBi#pEW@lYZh~Drf@4_o1>2pq*zhw99vWG{F}$#pUg(kFXwNj#v&yYBGj>-
zR8CVb^zjb&GE0ss2X&KF_>Q2Rn8`OjxWU_^s?T=ZpG!Sk!=L%k4V=68*+efW|M49(
ze#39}AfCSix!Il!x7@|^IZDQZu2+eup-AQ;jwwBeh#pI=z0?ghC|0-2=;cSuez<uU
z$ejJ@1q~W>QsVUI!)KfD+^k$<jFGo*6%$#EaH0s3x8E;`ol5}bwdJ?R0JEisC!Tuy
z71mI$#l0&5g_%j$W8?|7;>_X2Ogj2D1(t}z#uN)vpW$K|TJFn9^QI&d3&St-R|L4%
zSXzCU^VnXS_?#Z6Yp+-T5!Xz^0WcK?<!(PAg3JmQiKr!lvWgK5mTidE09M@E<Y+0N
zf^(6VgotSH$LXDcLFkx9Xn3nN76U(+IP4kg@*2hn5WSWF0wpQ-DiP6_U&r>}zh{XQ
zREB7a^m|t}SOrW5k<9V6Ax;pyV8!}_B&(HUG~3)F@W1JSVuZ9tD|bRNsx0BbN7{3?
zT%lfno<=oZARA6cG)^wwkUi7G^3S7w$77#SY6$lBtF)>Ejr}Fx@kGGHaa_KXnvH~t
zaGZ$<o2t;D*p1f;^xZC=@o(vq`hR)u`Cuqyjmr|9|5%wFeq9>!dh#2op06W$B=XhI
z0}4Xm=lL?TTFhUNh%!|R*GKacwV4tTdCs?)(5y-QFOU1qZpO~v5tE~V`(bpUaVtC8
zun;uN!>W{&w0XKONPvx#AXcNb5_^mI|LIXl1}bbC7SzypPLt8;GZiKF^76BPCky^x
zzN|=kB2x2Vwg|`2tC#67zWOg|I#LJ>y*JFl$nYkmck3sLbZ^P06$SJu1+Z8JdqkdR
z2{4fqW7#U@EGUEb7Fpj!^FHSBrbT-Ssh*ZB%?7Ivkx=jMiV5}8V)D(eFw~h0tkma=
zrx8c>^r8t=f#p4FL^s&4;PW-zWr81NCm$B4xG!}oTe_zec?DahRt&`^UN>6}Hx|5~
zhdEIblF6*VzIXSgq;V?B<9B)yps)M-(HkC4fsCQN!U5H6YK&G#e?(_hQN;0lUBTOH
z$rpPkuS>!nT6!OE6=|yY-#sv9kNG|PNQ;uq@dDdca`(H%DmfTPZ5sY}&bsy=J`MUS
zGXCp1#q;XYk8jG<&<JePK0O!LD?ISUyD1Qu93A&IRKOmP0mNfXc-YUjVee3=C9@zc
z>F@)bt-;G@hQJhV%(**mP3hqa)vunhw3$8z{sOz?`)4y^-*!9TJzui`_UM=SAOF}k
zKuiA2>+`bv==kJ0Cmxz{cQwR@XcYNg9C+}mGijgh=mf-sL7YA-ww1@Wv}dw_PA3lR
zo80y2;nv=shHATyf5SzPYV^0B7w;+TEA15xR9iN$L`9L@Gh6d1USG>Q)aZNl3Qj(^
zA$k=bZh7=orpUoU4_*LHC9OU<4;OEfLHD^01B^M1D5v)d911pBB`KVwZ15Ng&_X&f
zuMo@lZY{#gUq^xKr9iUr<gjv!1H0D5t-;CrLbNNRNoB?3CNbXkFj|&R>3&w&AqO=_
zo=UCaqc%Jn4}7|83LEupTuPZwARhGr&)wdO8}@#s&PWpfqwH<fKixfM1F1rU_oFbb
zF@o9d7d)u<rYAambA*7imjUdgwN4;51FdeNFK+>Sl9UneQ&=qVAUm#kOix!?2+J%e
zNR`8vN$*x3-)i;aG0C|7o$Sg(6Na>JkP4l&+MJ+bRD<<z*RooGkrr|je?TEQ!@7XE
z#f6l7HD`LGMKFy*!+Gn55aft^j(4<Do5fDXK`2A9&2(hIO#o}tE&8np<Ek7s-6GXb
z11EcbQkNOxN3NCIT;An~(K`!>Y<?MQIc7rMDA0k=*5OkZw<^LGE=R`1L80lWfwj+E
zlo}5tSX}PW7(6VI$-+nsD{Cw0P90Y4+x!f&Jb82F0In2?K_PG7=TnlJmz)%OuUah%
zsV?0Wj<SU_ahMv5(KuOWWyDQjHADZ$&VEN(!s`8#YByi^$~GZ5%}93#JnsiKo!)h!
z<;5Sfzhd5zaWtC$8W9~QP-hra6+dn<{lE@kgLGqV1M8pO77V2n8SNRnf%y!%B~<X$
zS>s&H?vJYH+Lyc&(}p_z^5IrgrQw($g`!O}*Njk)%gfotmnG@0;lq(5Gt!EoP+R30
zKN#QjOKuK*L+%vu7Ga7k$k+?MC2$(9qS7&O{HD*AN>HIy1m1`xq5(8AP>u1tl9TO|
z+gWqNfXQ&M@%y@7Bl{}0Jb%7vx@Y^^T$@Qk-CF%y%E3qbWJEtGmPjUY&VOD$YY=(n
z-n-0BLBHg5lhbYUwKQon>la8!w?o(*qU=`e+T%_f>p2v>cbBEIcHQ<gtkQe#Z55T4
zCx$yTM>cd<O7hYqiz$x0EJm0Q=#Nca)#q)S0rOJbDx_JD(=v=Cx;_WiOx_Uj+{?1x
zG~hM(7_w64?QdyL-@NE#Z5}UfSX^YU-O{YQ>@^2wUriV#V>5FG<dy`CguYJtRO@??
zI~WHHx;|%8j>1xc#mXyM5fFoCwX6l5TYj7{H5DO%19`Wh7ve_49kaO4vIU!<I^*)5
zLMuEoWjpty=hT)b=L0t5fok`5TV>Hq1KZ&~D#G>f_jB^*Xv1I;Z{QQV)?ZR$C8IJ_
zS4DIGS0X~?{&7yuH!}egfoDa_ADTlwbnb6!6lMkJtv{@8d1Kov>1Jw1Os*0ZVx<5s
z=dl<t>}@y;tMF7$;p0Wsyjz*wa(1fNs_!#3y`?ceugm^>sh!>y1fA893GNDAtYy=h
z<MVQDsxB{27bj7?du43ap1OH%Ep7oQFoqOFhP1_CEd~nhGY@zJ_U%F@X%iPJd1R1c
zJtGj2PWvIXQC68_tk#~!gCk<Lt}V=pZNZ^KW8wCvt9S~|84I`xn`=Pwwuzd7vV(D;
z;MI%0H|h#t-!w$!|EPxpe--V-dvi6MY_=;EHmR}35<|l~d@oyWbP;FR(TD!ZqUF*+
zQGbbu=!c2XaG#5D$cM$%`pBbBd;0=2(+Huo-mCLcSMz!myU)f6+PL)B@=1bRm3f&N
z=|*oaf3L!7)hp;DzMNh&2;Y6r0f58gUaaaR)^yrMC!u13?s#Q=OQvOh1VcPWe-&ZL
zd6S+1I|+1q9@i3yiz@OAv?mjpgpBHa;0BR+Fd}yEm%>@I)b^H^7m<=AK4eSJL1oPn
zRyUpK$e*TgyVc7mm`uI$`NZA;w=&!>Swk#O)Ym+gRK0gxgU=vk2)Qfh{hqVm`)=DQ
zoa1_)^<yw0dokBhg0)k$mE}uJ*cP-|w{4kMFP|0#9pj3B6eVOnV$m<}^yz9wfipv%
zMUM_=Qxxl4QsgEpTXK^Wxz<`HchV$`!Di&K?6H<|N$vja3zZ{DU`O{)-D7RGTkaxi
z`s&;Va)AvzQgO+?=@c*nYstxI2RlQshy57_`qi8+(!6Y4Gj^fykmuC7g2UraX_kEW
zylqOrNr%xS?c{SiT_ALk^zk;o!D;5;`r6nWctN4Fr3~5me5Mwh*hGm2Po_Fuv$vmM
zq>iT0uu^8H392Hikioc@a~CL#$f9Cj<|%4P*v)EuE(`SW8`rwBP}6e&t0z}EEOLr9
zH5CurdmN7$`t~!dpeWyuSet>9Wdtb&+mKXw*7BgGj9u%nhjxox_1g=?;If1DDL4$)
ztlJP#q_n~TcoWE)^bfpgvei8Ot^>1cKVlKKb^8{#G4=}ogLFo2rz?wan##`g_+1X>
zm~$U@HzqIYk}wuNh9mi%*bfwH7LgZ0p$xZFu=N`v*Om(y7Gh>AH8#c1&b^<292+4Y
zJdLv;3bigZ+@S<RC#Gx0-G0<TG8cT?zzIhj;mN`i+AOmW&%GPx@0pcL(qg>5PQ*-#
z#jd?K)<T2!fpQwVJ?A74q0Upbtv{rQ`V+slI^E|aYwdP4wl;^qF6O|d|Gjo5ym!kx
zT*8_|LHkWmeF|dzb;kTJV_u*3hH7r94u^ieHZ+N0O=|W;MYT(6jWfTOeIguw^Eb4F
z^<(=!CcMVd{RKf`&X8|oOHNnBLMjG>mh<&4OVo!R=1lO(tWSo{UuIevp5Q)Bu~jbx
zJ8zX-9DWae$l_~JoB2pHu$pbH4#L7Yo5RiJ8p=~|lA`;x){630-$kbXL)%-&HMzh4
z;|NDl5K$43RuDx}T1jaYkZu7<snMMx2-2d2k^<5(YD01g0+OR+Bcx;Whyi2!-Js_j
zPrX0ie|~@Zc*u6|mDlyGn<@L!Or3zcEg0#{xYp61Kt2Lb25wWr1kT(Cvr^@vmYX8U
z`3tfScFz{3i<ZF%qEfdtjFa85L)=L;Lv^fgmNvkw9;=oGO9Q*&y*vRt5jzKc%5@5v
z0t`7lQ@2LExI$%ID~oUNfs{$flo@iUa&~x5pf)!WY8;6i<bckR{eje_zB5My)wj2l
z-%Q`!4CRrP>P;=(l|M&sonxxV(Lb%dN|voG+}a;y1DyY5HYfuF7^2Cz3t_oWtZuL1
zQvtE3Zl&eGM!9C&LG9-NW%RB%UnyC5NkKDHQ_eSGx0Mdt`MbnZ7GJ9#e&ubSIsXP$
zt9@o@o^RRd(Y!4`lwr|6_c6#A3MdGuAz_lZc^qUx3t9r1c?qL+VfymCp+Q@gw#)Rj
z^xul4<HP@@ev-t=)fZM6!~T=Xd0`Z-K@)CQN_D}7t3T3&qZ#e^-JmWMJLIS(bVZ|4
z+XX?g`s{rZ+st10{&mG~Y**GZyPwhJ>Ei6V?7u$4&%~DMXp|NNi^*S5+p&AyvP+jy
zCiR#<X!dTVGtEtUG6w6?6zck^(FboQE;^*bX<wjbz4$6pQo3B9_Fc|2$ZZ>{I>3c2
zQ_z*aArIK`>IKVD46eF_8>bU}^^t|FzJDvgyTQ357Vs|Q!d_p0tx)hn*oH@5b9o(r
zzTR5;PSqhm^katdExe4_*-Aa)=@VwIt7HgciCe~t92TFfenQ_KM!31rJHZ33y(B2D
zkmo(xUVj)PT*U&T*Y1jBDyBq0qY|1)ukXfo9=QA{ALIgwJ)};`hq2IM_JO|blYcyZ
z;-~qORs<@Blr~kdN;B2UwE=_fkT&hCgee*q_NDvR?gyT`bU~gLI=99cSL}}}Mh&_3
zK4AM0nx@1eRvkU+8QoNgB~yNt&@`wCZBLSWb)7XxV8DL7s+YuFmAu4a;$q(rc|~Qr
z@(rvOp%$<5`Z;Y$2TN62?V(H7G#vgHE@&jrjmV;md)xJxa{3!2A2zt7Hn&>emTw5Z
zA6_8XWK;v$u4aFE=C_T}5mHs2sc^M(eiM@PXs%9SukL;Zb$WJd2gG97?n7&>ip|26
zDTj6^VxowseWGd8WhO4+nZK1!|MT~2tD}Hsfo!jR({#1Stae^Q8Mb(Cz`^z<3bYg2
znxxfMX7PSQr=;JQ&Yw}v@K&oLY8kQP<RS;pp{TFaf(lG1iDxSG;THW+GgCGlug+M$
zG>UlOneqfvm@X{-HL8=^&^+e-)MCQK#=F|(&3$N?YJ8i0WJu_cnGoIe9AT{T_nmw9
z>lEg<J(*G^*0LV$*TuPuqY0H?F`DMyTwKIaEz`(glAXuCd^SZYrBa+)9{bwm!USH_
z_K6Pc8h>$84eLaR-z7ik795$33RM;RiGQ>XJ8Cbz|0n_2W%8FVsNG)@(TlImP9zL8
zvazF!4>a{;Q@Z4+Z*aEo9pK+@54xf`9Gj7Q>0gMP=X}2qIrh-5#Bqz{DXU(_Rky3-
z#s&#t?~I%3w}Cfr*GUk++Iv+{X-A}0RH1}K$WfRXRz@XP&7Y%9TFGkdTA=zX=xkF)
zyzu{UlmmUH&|EH5-Rx{LJ<lLLiE3$;KDn7iBAnTr(yYHEA+QjpMSga@Lr<l_Y1QlS
zz%c^xV)f|C+1)<vUekEefUKc5AmmB%rF@jU$&lMu`1DBUPz&(pQWaUkM=^`iB0VaC
zFJt#X)0o|>t<(zTQ|o@t*ck${$~X<RjKpwuQ7dz4QHLo<0U(rw{;sCtY5C{%MVbNP
z#aq4~uVYgeGs8DFvh)4@mH-;0p!M)^|47B4CVP6KddJkmq@J`0ujIYMrR`X%g4gKq
z{I$;ylU9&4M#JHM;s4S&FyA?Upc;Oj#qE*$%ehN5;bIc?-#BOd|2Xu<d`?6G$Gf*v
zwGQdi##7S*oV}?sSHvddw90KQdI<%twJwtF4OMHOGylK2i||M<fV;@7QU$$#dS6ng
z*Tw47+-4%sFes-xFdmLPck{P<7z#_W$R-;QW^a+cV08$}EhlkWNpKVZry!!O7F1F+
zdM$Pa?ve?_Uq$gaW0Ezbi?a|S2#M`7AL^-{?Dqg;eY?K|Hj}%wo&PXNj3Kk_64PK2
z?|kv7v`UPU`eLQf`hfMJ*y+DhLci4f@#i4h)44;Rb;w^lvp)cJm=pd>q1XM4t@=hw
z^3K<loVyJtXX!g*>Q3iWv8-k%u@>D=^O!1h8ccWKb#+k?p+>!?Me5COWuYuHWX~dH
zjg6CD?LAP6i9^(SLiKaIe1hNGfB6f{?m*?`cnpgYtbGP%$2owj{(*;8NKTAij$w_A
z0Kc+7()r<Cq2kr43x>1vZATR2)mPrn!)UBS>{2DD|K(}Fsq%G{0~_w_dG#ZG@eQK{
zoyWxrL04!;<f_}t-+zk&J9HH=|2roBOApX~1QC$O(D4_g-lD;_UriiOvvcE|Pr43v
zn{+mu8<_^Mbb{~4hyK*hPWS_WSF`rd_SGav(Nc`x3zbdmmZH5ka39q-e&E^rX?=%M
zV&l1Q`p2XZ?*B0#Ko3>}gj|h9Lsu1f^>N|*=@Y&4vW>>0%N~J-sw^ig$zM7UsSv_D
z!j}ee3Qm`fbesMLBm9$|{cAnH2F{Kc+tPVj>nF5lyS}Se`5QE(es}ZLjLg6NlGE3G
zfXeSr7BP`|r)g2wJc89CMYcjwarB^V$SoTeSmoPkW(P$0{5g4$fy_@aHyWSb#8U34
zgA0c?gln>SfJX9pXX{^@2LQP%C;s(W1M+#BkoTI5U7pA&zP2R|0&(T9Fgd~(ngI9R
z&ySbp8qAvldoq^9qaF4+q$g_eIAgg#QT)FYssH@^r5+;v&5Viz6IX$<m18RU@~+Ja
zN>B1Tm85|_Av`NW`PVOEn*w7^ub?mP@W%26C^G3a9VEkQo*#EdFFzgRN!R~IK;X#3
zz4&iHvQ^2(Ft!vi)HjUjLD+SfA6`thJ#9f2G;^|ME}Yz&>QVY=yA`egka0+o0_e(5
z4E)!71(?{^;(uxwfHO={4GWkN9g720K|ua6d1dhw7}1xw|J<i^QURPMK|hB-93TDx
zRUbF8{5JVU;O)>nIq!NBNltNn&Tqbr#!(Q9Qn!OAKM-*pCaq6<|Ko?S8DTi)-!nbV
zEuRAe5pJ*zr8oy;iIW!b^ht}Tswl@m>H*<I#m-fWOg8^NeyTgh7Q|)Yb@f!KpSUgR
z=4J)!$_ctl6Z!*$C>Y4f<KecRhK{-YI2ZofcK&l_Z-+DB5Tgb-b~xx1IGeI`*H@yr
z;N)SByLn(IUjeRd0#5F~Z=B=t&FKf=6SnP^S-tL}x17~*-}Ww(c^YTZ%A<w3a`fGf
zt$E!BEB-+Ty*BtvQBQQ)=O%bX8!NfXMC1G>ZJ%{FI{EYZx0buczhl>l?1I=R$}@o6
z;#!d5eyIn_&Q`Ffh=TkCOZhHQr(F$8U_Ms;G&lccKm7jyWmgpDNX(^-cFqWXgxlDN
zW-uUUr3%6?t(BmoY+KiJp{D)~?P5P38~}o(T<nt8ZuDIC<o!t>0I>3*?d{{|)_wAq
zb8aU5{AmJpLIBMQN481EeCFY0rq_a6pXr`qsO*LobtCyi*1r!h;+Cf@`M$VKPl4kb
zj02E1mTAcV0_Gk~?9Nx5>>|`3_>h-r%Asc8VM0xRGv_Y@r0<>a>hO5C5Rf(vD#W|&
zI5V7{lvI&C#F>bE>o%66Gx87f-xa>@ZN?-isRusVINYv<gL@8%G5e$%G7bTFu7kxV
zWc=`rOkB;x<7WRks8OcV%>Eabj86-$o2$8d_<1gGyqrBCU+JX&0r34me~;fLoEW|=
zlIP%=(h_pmrc;%aptrzdtZabvwq7)UE`O#ruZ-C^-AGrtVa<e=^mN<gq@p+(YG;WV
zD}L`0%Udat(zbF2Yd~}&BOt_B8eEOaZ>UXNR^;kv0|^H=%{;(xB&^=Te}qPvfYKXm
z*n8%w?NDd&MLhjdfIj=7V1pFx`>WZ3C6)zjk#>?I*wh*N2W7xpL!!C{ydH>B-wMr#
z58rS0nireV9ZJy1x~rp*)W(r(us6&BU#bZ)+5(|Ns&04tM1hS(*JlJ=^MY)&Z;#)l
zwm~L<;qQ#iyZd8Y%w6N8v*vNk&K?)kt)3vkbNZ#}lBqiYOJ*tY%L({XF$wIw__sUG
zO)sk!JzzK?zn-qHfL9Zks>$5Rqt)BXF-gJ!4r5q}qj^gh2vOFNxQI4R%NR~t>A0Eu
z(tl%Azz-)y$`8M0ytlVVEYn%H{|4zDF(H)3boku|m@{eD&Kf1cPw0v}p-azTX*ubJ
z-{-S?-lMmZVUj8ij%Wgc^0PnZ=acRf5qVFNmfV(Kg{rAv8H4>{n=}S>MF_j2s^#%q
z`j$_ASxJJ;vZ$36GsBJG5dwnw@rSZfnzCjREZ>g$9@&V|W`2&nP%x@0ZLw1?Ae0R<
zD;9E)JEt{x+=AWr<3iNXMSfQY;^+|8p^N&SPpRiZ_OeG^U%z-uoL@HXa4uk{Bp$@&
zHCMLVuRY^+14}usB&?C{9?6o5kf@6Lwu)?eQdUo}A9HB^ZTP+*0%fx@6wUep1V3xB
zdJJAG`C?EY+U%ZzyE~Pd8gdqbkPB8wk%m@xPP1D_1H(BC5l(f@ruaaUtwGzvej^ol
znA(;>RlO<y&MUJ;`-E0w0B3m)B{zOwHktBB<YLc)PF!4%Hm@Z1V0&f-$yGBvG*lL{
zJiT|1y=Hc(J7Z4&)rF=V7kftX#>vi5;NBYhRttSclBhd=d<bPE{M>NU%USKc-g*-%
zk~rTa{~cWSewV@XD*U*>(b^<~<wCZ$We6-^RMHv<uOB8OcwPMIL*h)$`Q}nixZ-KA
zM`oM^#9^Pc>x|VccnO~Z@4K67oD5C2Hn(~09&AvcpVQ{#E9ZHyB(%N-3kYRr_3R~L
zdRHsXUT$`m&Kkg!-h<1Cp4nE_3JD`6321g<8LQ-EV!+uPjyjMzpsib<-spjF0SND%
z&8hYBy36bwy!tYvrb=e3DV6OBpAO2-4|1T3rAl7s#st~f8@NY_e~J*B_jO64$)Q`w
zy(yLh4z07*Q7`djyeFvzKXV(iGQT0T#<BW=cfV!@CL9bKJ#OtjwaK7{dS-ZHUav3H
z^}U@GQ;u0dbaN+zjxV@BB(A`f?+j37#Xj##)g35(UrLm^Mvd)eru$>pVG6MQ!}Wd#
zf3Glq$DBZ+;9=_z<o*YK2hEUr0dD>6a0_$AA%B38*+*L+j4vSYkn{j2;Ia8#S4ocM
zb9s7IJ?Rks>8M;LY^?+85VJyZgxT`9spvE=Go>V}cMI{~RP-~LzANEf_|m2ky>JP~
z2>Q?wU^bcv62)%52QRcfi(CM#vvXwIEyOMNfM@9i+aFlhb)_&JV!vL-?>!BH87xBf
ziVwve$;|Dp4xDGqj`6pt1K!sybToa4;1i79pGQgNtgb)X@<nm^S#ZqxAU16dV^Q*{
zEP!a~%MaB5j1S|f?{($|*n+RSpN?)2{gun8JLWQW9Mv86>5{HycPH4e8^nWML+Ni}
zA;I;|-X=HBKUTmXD_HrAUxRn7Dpn99HQ2F*&tF4fec`_BB?CjYOCQo?vaXy>r<jMt
zyQx0ix~8Q&Oub;!GX}+>b*m<9?iIOc9*SR`VWZ;$(4B+);)XZjq(x?j`rRr(*4Tm;
z{hcOY0V<LK_m$(@ai0474TTHa8+%EN1cxPcQc=b}v4#@KfA8YwJnQKtWnlX|dy6c{
zt7S2LbLmR`>;BGhNm14y>WRLD<QzDDp0x%$q~?u3)Y)EOS`mDqAnr;jHM1^JD=X=#
zV=%9E>GRsh4^XT^Kp|+|0shTx^6o+2SPpHR{axBjxZDR!KmT?EbZl;KG7~O2oQCf*
znYqi@H?%JVs3RtGjmImQT6reMnX6(wF^7H!*u=>Qw6`f_T1$VZn-Z6>p3Q_+_gUR5
z=}|!3tHur~Zu75V{5@0*6wZ7ugOlHyU!M}4M-9fT>)?%kt2*%VHU15bsQl(tnSz3e
zt1wx0Jn`Q<e<b}|jpR;fll#7Y<>Z2c1fKC|g$M>!g83RA@z{3YRk4f>%1mKy@D(x#
zYCtXMD8<w2MiYK&isw_5C-_7a4O`9ynoAH=2|O~Dl|k`Vfacvticr7G!p`#O(^ct!
z*xZeT0_SaTbcL2FCv9zl?XO(U6)8uDPlx7$vT=YfcekRq%S9`?er_4ij@URBmeD7=
z?FV-U0;{39I1{;WZJ!w8=G&#IQLO;QMjcCrqk=zC2_DTubpTB1wM3570Iyt&6qOmF
zPUYgv8RFbZG=EKKczgmZ);>+g2G)8EAg-LDomy8v7O0O+2l9Xg^s%&4U<@7t1oa$p
z131?%q#R{Q^mmXu1)O-elm$!Ane+_^FxT%_J7@;yE>TbNNq^g7JlGWXxx-#r@AJ}s
z52fg;7d=`STEd6X)PG0vq^f22gX=B7YlJ=N^bpAQ_(nU;0d^hYw?YAD$~L2x-VP!i
zD#?o)>X6)_J7t~;3_?->Mk!_ZZPG>+J_*|8*kj8UaC153*1)Pu<fIIKPH{WgIE0NY
z9o3qf){5Jc)1|xDJ)fnpM9f4FjasOi8bl-bbO3M+mB{sxiG+tDr_P?>xm`1`Srz!>
z<_hy$hE-&4wOTK#5)T%IyQ1kCaP#VFsW?6Ch@<5GvNn>gtqru(_u1;Cqycrbf2#vn
znK1Ycx;?)PkN`ZsprLY1nE32Of(&JNb_8^N?(XzygCs5O)k=$Hy7x2%G*pVrf{Lz9
za0nUrx!Re&h!)2aDo4BZ3b`C4<XUsyd89HNuf9~Hj&S>a<E8wrdbXP((H|?Ng@hSY
z6cFrOrx_r77`hqw$P58Qv?LC_br6#!66Jv4iI+a#^rP{?6ms!r{PxinY0cS|03)g`
zE;fNk#vKw}Sstpr59Lb#cJKA4jjA^nl;n*P&0P=a`LU47=NDAoez7x0YK>nf8L26@
z)D7V2;K<jA3>v%9VhBx7A4>($fb|a~oA_SKt#&uyE*L$~I~TxWBG5Q#ciiHQF|U7V
ze6Z-F72F`-VcZ;YYsLeanE#IpL8gAdz%wnwX~wJKtdt~Bue`fnV#h##?sQWUc00m2
z0Jt5(J?%qEd{#TI&YuqeAs?xBnYnI!HuA>j4wV#AkOj!)<ty<F%Q*0lC`(}dG)0BP
z&7+IJq&QX4d6-|=1zI=-5T!F21mRe-I@mm#Hq72}94mFFgfQe~Y<4hXqa$B-!u*MV
zBTtw4_+r)#DF@00rC>J4k233*Tva4bbIJ%J&}YfD+=$KBGonmK4=&L54Uz46+HCjT
zuF9^@2|oy$O(#)>Q?aDqai+n?0>uX%Dq^mQM$xYKdgW0?z>$lOWK>EieKHgjU=U`(
z@a@cWy(y%6#~M+Q|Lzggwf7w>mTSEH?d|~R73WXwc(X5n@Z17~l*j!4J@30H2V*9j
z(1S1TtK^2IiO_H-zh)62HERAHtOGI!I+b_!645|)FCV6w3oEFP4Nu6QiG4l@v=8Gl
z#Q$W&WP7Yf(=Ove2#+*1^5DkW>_!UDFKF@|S6GqOzL-K4x;)_+*7WvWTVymfE~$AM
zBZbhP&VJE&xqxXy<33JJ2x@q<#&!s*W|K1f2jIy#!{-zY8K$-mG}Kk}dpqyHa{9Xj
zi!K!`C@|IXnmu`d#a<5r4G6VS-!@g9>e<|5XQVL6`#_KRJXvgK%ZV>&@<IjjS+j;i
z=!hFX1JHGnKm`2$=!Z-46325FbznFNKLPGERN&k?4ixawE&u#Mr8V!Olohtet$V}c
zfvXJtIYzV5jWIR9Is;z$k`esEWG;N2>jt)7HZe<|Z5>ja4E#i<2=9hQPUK@YtTLOU
zRy6!$iNVDEL<ghZZo^qmfAo8I#$ym*<oFcNKQCuVH5H;>lbLGh`oV}?8RYe~sY`%4
zMEm?+h|T+(AqJhBuRWT)xAbXk_2@E}s+FFLa4@4SLM{smm{$e^7J(6S=tUZm%jH3y
z;L^B_;gWaIRiD6{p?f`9oxb*xfTR?4g&Rv5Zj-NY7<9dcJ7Jud_?Q8c6oY-T);$yW
z<^F5w>ziZ=mRUX~W(|wGy1~UQo;5ZY4ueJ;R7Xi@l=Uv4--hb>8_3%~vx(EMiZF|!
z#BsBzxPirPqRDSi<8~qIy*L8fR<4?YG?E@wjael3?wp`Y3K0V}&Ze~-5NkOz_>IR7
zxhs~ozl0^x^JwjdSlcn*4-8XV9&LDIQ#ouk4)ySH@T{G#`z^*pO$!s_DWT<N4VF?8
z_UFNsbj`-1<A7)A7UqV>FZvs#=LEwNR?h{l*%VaK|4}@D%+C)q+TWP$k+``HseyfX
zZYcTI>2I9CT(q}dmPa+#!N;mOFwy*?oo%2Gx3;cLyg5eHGhBk4xQ91xuRo^w>SsLe
ze7&C?sUTfz)9I3P5Ns4lQj~Uu!_qkYEnug7+w?bsgg_s$VdG)MIj5n@%z#Zs3wkva
zGiKyn^JQ^J@7(tjm`5DD(-SRKL9J}xARhC&-ZE`v(BN#STkk8-V%w7wft?%Kz|f$g
z%q<pFMRjC~<vf#j$WwnI9!Zq2M4}2CR=lB=$`mDDd<NjtuZh0eBjJ$8)B?oXmcEEM
zPHfe$Qv&|=WG5Ti=%po+kgOQ8hR%6@(^zDUDP}D)&?C}Wjj=b8nA5L)5Y4i7@0H@p
zGscBm%bwdWW*i`qr?1f<qjtDb=k_)4#0)2L{_x^l@pL>!ZNJ}S#!|+>EpZ%fcvRKs
z_bLg;I78w7e~f8@x3&8Y7U$6bLJ{io5l!jDml-G1E{<d<L{T+941sZEwtk7PA@5fR
zpvbI}(`mIseGlCR!9}sDImU()rpYBSUUZ|lkScC#czllm^vz=dtf3S*?DdX=%4o|F
z<pJ@Yx`Fbnm-G~Pg%-(2RbkT9!P5)J&9lyUBs{=$q-T*i(;Roj+Q({-pB|}!s?_A%
zija~Y%9Z@wTH$bdA7QY*`*p5_CDd9b^uPwuD<~1Op#vu%;p`N<ma*aC2(*(63Oq!k
zQgu4IE|u8gu_Ml?(`mUa3YiNohYtZ)jjlPbKC-6exKU-s;~ueJG$~u8GDS+!l19CS
zU(FjY{-IQXj0B-i&YgEt;Qe=)HA)*8cE@q!aCToqQ&X*_Bzfr{7nO3oU0-W${5Zbg
z)Jk~h_C@pr<-wOi(R}%2Xod+-J)VMhRjmGIQ!gf?umNY_>Q#DktWT4S`VhQi){R>!
zt}oYG4+%Ni4gzHN{E58Ln`oxp9;q_;mcr5qP^Zv2jZLlIpvC#8`=duG51u{=9wt{q
zt4SV7y9Q!4Bq8rRXr$I1{I@QjhRiT}@3S7fT%o<Ux#1yKb+#Kav!9&hs?@NiHGp5H
zIe3x`#2kt4SO|>mhfy8*0PizWlEnFl-?dNZxN#XL@hCAMvl!jMzl}(b@Y6F20Mz9i
z%xw6E-CCOuL5E!c#z$bz1Yojv<1;kr&#FI#@mhkd<s>L)mzwS%q=&icuOz)XZ=KI>
z6}~2|?|zu#h@ndciK?H2q-q|Ybh0W%2%LTdXaBXCussq*26PobwT--(P~VCQwkrK1
zq710ofLqNZ7L?N+M&M>YJzp)G;U1ag?a?Le==;vsz|@0(is~=i`e)^VjlCvv$s6#a
zy?!8WBL^~Qu!yS@bFa5MCOiJ{r5>X!KFis?FN6v#iZkj$CO++hKn=Pr8+(b1L0Oin
z_Y@WpLn@L(^Bs=+q400ky;IZdv;p{V#`z=(Q5A=8&()1{RtM4B)%PaA8&$cB<si|p
z5ST;nTo!QcB!GZE^SXC&SIvry>q^p`rvzTe@5(kj3;E2jD<XH1n)!oZRn|V%GT??e
z)jM?48yGQ&>Ew@ct;EK{@5XNEn2n}?tcNny3C7r`>)3_Sw@#*KT&q1#aDRRV5DA#k
zgws<GtAMh-M|>u?c4kE{(bV)&;pVN-Ei$tX#ws0=JAZhuX1ICJ&wEnGzpsBmwVE0D
z+~Vj4kdXpZWJ&ZN53~?Y+<WTHI5iUG+fxqTob7%HR%BcewJ$=HZcT7-0?xJV{S&_L
ziCHI)Lq>*%zjxBo!F#02FMhw@`M&QrpI|z;5~KdUA=*EA>*3hM{XT?TfEG_Lz)fVD
zvdWv;g?a2s{BC%i7ixi;RzWElGv`BQ_q6(R7|?;=bemIxyJJ+*@1Vui(LUS=6oMyu
zsqE`+TW_~<MfRZ$P<uB4wf8OlE9-0iw8<oGceH-XGYfT(9lmPBTTnZfslR;hdIFic
zDksyn#zKy-pV8xUf{f=Dqv~!#yeR4ihUQcrVr<8uclz|{##hl{+%~A81l|~BAEWqO
zJ7T^x;PxG`Pan4XSRZ<;5;Y~DeCDw&Uh-imt&l7@cWU?Tu|A9DcW=ZGaq_2gjgy%F
z;H)KNdRviz@6vtY1j#wg=$^JBBr;Sdml+B;sBWYg)D(xTuuO2E%X5O+h2l2Q=g0hi
zH8lOsEelIw=$QUpCG<`8jTvdc^}^y~a}7^E^RXrr*gb!mYkVE4j+=D~LG00*2dsnp
zpY!x9%knU~%K9Cl!kvb7bydt~qOGGh?4~|{eJH?td!k(uzUQ_acj<7Md^5#>o9@Sr
zBG{T^9kSLV*CBxKqL~TrWlT4!<Z?*$SWq|rg$>C|JkbLK6KT#y5JnLQD(8CMd=PO7
zOY(0I9t_*$+Sg|fGTtl=hM6J&aq*msq_Qn(=h!w1%{?B*$uXRov1Hcb?eec=;om8?
z6IS+V10$!A90wDZ#R4nol!LEgO+x!MkB}T5xhgE=4VPck5Ns$t>&4Vh!_>bq8o#?<
zf8Panm<EZ6+dOv2tS9GOwlPaHvxc=vhVIud;#xxW3ruSKqDzVEs3jqx_0!b|E?3S!
z2=PBuKo|J_X~!5K&jK|X>MxVK-P`{H@y#>TF}l%v^N~d3xN$cbfUDiGnQ2IH+^}_7
zC8Hs6L3L7}EJndHfXd|473=is<?=hOVaz4|57rJ~1q~#yluVii(uNkk(xZOaG%Nb8
zyyp5MtOrv<zyf+O0DyN_1J}K}svlr%J(r6w`c+S>xsS_U$3~GuG%2d)z%A-bgFFUK
zJ8FROXY<)`CU!Q<<D@pf2ryuOne$P=;C(*?@LrtAgki3Wr;0H>dPjFepq}G8%Upiz
zPxu0$!7b3IcaNd+*LgK&aE(?$mX-QUJgn(_0Ql7%-McDexiJ-}TZF*u<z**T1Kus_
z+{-k;WpboHRJ;UOLr)PrdG)Kv>feU<GI>DpDKIVrf^(Uz9*aJZ`qXE7m+|B~A%X^x
zJvx<GLFq|HOyQ+3r5IR_j6n|XHnVuC4Qp+&?vIHD97CAKw-%p*-qo9TW(koj?$Q8W
z{r`)*Wb54+o)FI#JWIv-JG+RQch+{yWICSHmE!e)m<x4yWg5&HX((*LI^AmD_RQz0
zC0dYvmskrCK$tVx<ja!<2=Z-^Nt(hV270RhP|f}+Ap92w@6iox{1<RGt428>Y(4aI
zJ#=WGoSQdJlLJVgbB8MxaPwEY0Al%W*Z43*d@+ia_->yxCf~s?N?Ss|-M)VrxMSmx
z!c5A_$}7&Jul`fd_HRQCfKc9fbk>`6CdTA|iQ@i&9uw@42_KYXL{}ADU+0%8SGtK_
z3o~)Ay$S62Uy<|Q4NJ$=|H*Dv&IM{+)y1f`iWI$DT9tm(puC)<_RCvEPv?1bxxI>7
zjVj+SR~2a{JdCA8>~m~vpsAkfrMZtyxn#gDAlF&47p!T#*lqH2ZltH)nk)KPaL_di
z(2=|Y9}-zgd~7p}+W|LGc{2|MmV~#Jw-QP?l-7z2ApxeQGxXqMKVv>P8yW$YbK4&?
z*&p>#b~w%1LO9{E&nb?m6tzJT{`Y+#7eYvIJ8(ldwczmf6_VxwovtE&9wYWbq*C)E
zE4?uRrNI1)r*9D+TVnj8Fzsz-dX`fK`EchI3&T?+r)%;!ZK`KM;y1ec*#spz;pseO
z;sD_{Q;icDn0)yC0e`XLL$>wo0~Ul(jDTvO?^?z*7esR&!l}_K7pMw!oSglpTjf8U
zvc};98^T*p9J&f61}t_$>kXbEYoKeHCo%<ehC~rsh-pM&b-jV{f-j31VZ_GpR)u`!
z8T)&}59Q`iAmsi3ypVopSpRCmdDkwaC~9T*C|Ns+?!ETFeWD)}-q?%Lrb)R9Q$R-@
z)j#sk_GvObHx^PKJ%`F)^?daLZXd0r_<nG}ow*v_^1FCipfzXdab&{hh~x7Qn2_%Y
zqa&L)_PJ3rc!WN_o%eZ^Qy`b2l(16jwU}0xVY&Z)(hgMuKBeF3uKKvMWktH7NbT~A
zI1yG$OtPY!8^eIG*kiM%quD|O<&GkBA~>fQR4?Glcb_H5a6s3@mF3Cb2+Fx_3sK_R
zu9>OfMaZ5jc6r$akOb~HQjYvG+dr*2@pHmL8VlD!hkw$HK34ia)Y0B3Z7(IVN^Wop
zZF8A5YPV8TJ+Roo424>a2R{Q4!hNV0R|jX-lT8u%<a}Lh0AOp<n;+lH-qD;K|3Pg^
z%m`v^^1lt4>LB4z_vNycXF#^{NS|UxTac!S#Bg`OF=>haNm}YjyO~KG9`?Q(&c+*k
z-Q0Z}z;`32*}tK3*yP^cRvme?`myIH-lg^T!I$;u_K4H2JBcKjm+^D#c)&<5?sO1*
zX)CQC=MdarGFd7<ncFpqI0R6>dmnz`zy93CGX>{aTV>K3eSL%ozne0DrCiT=sr$pX
zF|si%qcwhtBy}abrAEIXfBi#7*u|**?Q44tJjEYdvNAcQf2S6`3nw6mI!abetzkKq
z41yhq70UijqXuBWNV#B#Zo$dujVZBcT;K8#)`)^m9+UvZE?M6NmhU@4VGA<@{p!k;
z@q+^*9~fpf#pOTPkt;_au(741o>4fKrrAPaBbEE2IHLF|KkA4%q84n8<?=n=M>q-_
zlo8l>oP~=6B6)zoRhn(aC!v3HI)7>_CfcUe%5K5@m9#=~n=L2*p8s?(4A5w?`WuzK
z_x`%xbXP@?YZ^-om}qD+TlbHw&=ysLp#_k1xxKNjfn1R7M-60m!sT{K6vwcvT7>&V
zQ|s9M29_ao^oH<T;B0@sugWyWr)@zdns+n~rW=<)&EVv#eTA?t3lQ|S4xYE~ltiPk
z=)cQkpTuW;gSQ`Aa|p-GaK-p`U-<rfzY?Pr=2i{5dCV|<+SoI>)F>~lgA}+I4L-}(
z+GLWcdaNj(qAD?Mpk?D>S>H9<QhCXC<w~)dXkJ<0MAE0_(GPu)vQYNjZFMA7{owKm
za~M|nG~V!z?V&Z-W%z1_wJW9&kTbW43mNp$8s0l>=R~8w3b0}+fq0c2+saq*t+wZ0
zcbQ!U0HCa~s<Ow@hbE1a09Lq7d|RMYk&0{|A<q(6{(Te#3ZuvG0a-N7E`XB>C3s!N
zKHGLJWoMR-y!Z2Cal84y=w*S!>yyP@WT-cn;eFKgQrwu;CEu>IAz<r%L3qHr;Q<VH
z$k}Lo`roVRl6KX3I$Zcz;L<6|YldGBLp92p6l8AQwC20>@YaPxD;*jbeO1>_8fHHH
z+NL?rV1#zIiMOqh_@@Dbgpix^`4!nftWN$o<Esr`5$xdHo7|6YX#Ij_$!(B#d*!tF
z%umvG81gg|b&9^_PCr`p)ECKH=wUnEcvu#i^Q6NVxv7h{N_12GjL0sZ1;U8{<j&qj
zmHg>kr84pDykZ^7HNyAj?28weGmaLKXO+*e-N_&g|19R47CC32L)$?|QvAggI|;9A
zG<NE=j4+D`CyM=^{1?~R$)OpRotGJzR_CZs?j<MOGvyQjZ~Htfa-p;oZ|oPOpSEgR
z75|Tp?$1u)Zc@gTl3eeO*U=LYAcm<Z<My0tT+_^zBtY%&!82&!O%^3w#C)GUY)>VQ
zOQm1;X<S+fM|PiEb|vcbLz1YK>_?V*_Q@x>=FO`+(1Y6o5=!C-CN?b$xps8o&>#dA
zP%8UMv{%ufiR&dGtf#ui%I7&y`xcNZYwQjc6ijRPuDZO&2ATRIEDQ3-SPXE>hYta$
z%aC0qZ)T4>E6LxMt+2|SEbOWFrE`w~g9im7rXecOn}_lWEeWR?bAUA~gmHMcOuW1y
zPQzAm!O33|4Upr!>2|rME@>H`3^`0&g#O}Lx}O;y9v=BkC%|{B?beF3%k5D;WuHl}
zL8|TL0jI#p5A$G^Qsg)J{}yZ0cc^X^<nvslu`intR>IBrljt^1ddg_bmy9b3rXsLm
z{`XQW-|HB+N)%;YCE>f_v%h^6`P&25O`KZ1{pdrVWg*#|V(W~I9uu1~PP1v~d!QM8
zJoTdY>h<iXo#fj<4=;JS+%?edoLH2_kl?oZLiYm>{kK+9w98b6;;5OW3oFnwshNe(
zc)ZMY`r}=nsxSGEEbi(}#)x~S>R@c4Nq!@IlFurjl8S5`t(=SiOpu_etudH=<Rn~U
zmd20eLS(J-_kk)OS9(TY2v|jyRzPdWGz=D7_K!L_un-8F(5L~E%Sn0hvu}Ma8^-;v
zIEGvj``VCOE!juZdeVY_BkF>`GP$o8Ypp+Y>Teo}U+xIaka7Sj_Q6$#l%sZS`#Gl^
zuo<@nZK~jW&s0NR2;}PNpCS4f?uq}ZqlDb8zyG$$XHm^k;^*F^j-)lKIY17F){=6M
zOsE7t<pEL7w1m6mRJwI)*8p^gO5Q2U=OV)MwD3f=wQeaAYZOMvJIcCRQ*|^0bnAiN
zp!au<)?%`4jVKxcsv&jbyBmWtk9wK4jU@rf;}9ZQH(!R7>GuNO&AFwjRfP%Z2G|c~
z>G2ct<Jv_pWxkIWLhGpH+30CV?>)xYy0!wEYg<>;Yef{IS@`8VH7@*vhf)e&eFkf@
z09*Y8HRQjTHnZ3C5+*}7?<F`y&g9Z?-kYV>?g^<zY-!5L<^^)Z9EpL>WOQb#?{b0P
z)Wy~6iyuS2^RnkFgB;_RH--lsmvuE0;W>VZ@He;C{Q>N&>2KH<<uWUfkK*G5Fcv^|
zn8SuZpZR{ulZ#O$KofGs#p+QMEiQcLIN*!UwBr52%}lz+Qy*UdLtGAE)#bv-{uy}x
zL@UPP)6ZMusU};&U@g--l4Y~*AAX#ugy|d;60828zz=o0gbGRdBYg->_ue99at2Ti
z;XSVOcEq+@=h_>&y|YAIvCs9mXXpm^Zk@LNs>6uOiF&3%y+2pB*ecM6us^5$_FRA<
zu%@@j`rpw%^N90?f<Gq7$Un8IB%CMG6K7+xzEu2lfh0iCD>=X4*@$R-P}5=URvngp
z3fxj#uOmtQ0*W2UFr0;?;qStj0D?1hc-iP^&oo-0C=FcaY$JO4j{mcy?`-?*%)^8y
zIV4~zA4kCM{e0#1-qY*i`%%|cDa@8an)=ZLjy7?I{@1BEu#_Y^)PQ3EQ~U+Iq1*a)
z1qiG7&mJh6pC(*l%vAGQEi|=-^Pcp{^2Km?>j}0HXorq$gEU@PKEHBtJslIC@4Qzb
zK;@Z6%M_Ld2k`^&jo~BLT016}A!eXXlIHP}wS8(Y!J$(^;gbAf%pM>D8avPW9qq63
zpHe$4_W-5XY}L)n>C5wU(l3}w!P4()&sM;MPj~?T(;7d#r{ywwGu&H-J}iANcAanB
z2M$U}+}2r2u~~~@<pI+WSk6w&`UeKwLjLaJb@pPgMPi%we;;Kj?WzSe#WDuV&T<af
zQyU&7$6FJ_5&A;F=fY`S-|3?)b}r<7O6Z5GIA50Qw05PB`<;+V0Qm0sdV--MAb^$f
z)dzuAnF$cFHD|E@9>tg6%gbY9<TcT_buZ~N^$b&=haW$NZJiN(ocbYCL2(q+$;tqT
z4O;$tRhOO52100xnz+JEZr_rHCtG4fhkN2^FX0}$s>ywl(%vo&?|6iqD~&3i7a_QP
zV?wgvQF{7gChLrL!IsJ`Dq4}b+}!si=_h3o&)q^tez)jl!yBYuHchrbQdOj3fbIWJ
zWAkeU?F8}6-x?O0B-bmHhZi7*zVYqIq!Cc_iwzH_zcVbqI9d2)ctbU=$f$(m$mhG&
z`eD9dWHfA?ALY4e!ml>Y5F3POoj(KdGQHcG^JYWhl={QEfXt%N2R`H~R>Kq4N#|3B
zZ~<>F2--bOoIAM#{su_i-@UulQph(pXn;>+N$15m+`tMFn)HfS@`BcDpXC)<Q`d@9
zHcmD-|MxI%o@ZSvjcX(f&AHOVZi6&z=^}b?X%iP_t$a?)j%{jz=HvwU1HmbN$v6gx
zSb#5fTfX9VV2tBu@WgjHek$yjd5V1ZIs6t+N>1h$-$`R15%G@=(_uw1SuNw??;pVp
z<dC~jxE?JaoS6(i+PmX?myorLJ?S2>0G&hXS<Z29WkYVQ?w(>j5OuntO7A8S!DrL&
zFN}`ihL;A%w)jvg>7tI49rQN<^!dv5Mq~8mP^)kgpau_I7tGoL3v~@KRGtkHWd6-a
zOYe()03LVLGPKj`vtHlIO-%aF!_%TNB7GU}pL}HXB9$jD9ahY9Y@4veVGTcuBIehg
z^rcs&)XVYndn_IBy5R1NW9$;v{O{O_rIXtmN*dzrLM;7VL-g%B2nn7i1FSJI4aw)m
z6So36SFmm(((+%R_0cBaNDlQhg21A7kD6(=40&4#ga}P;V#p+6%+lYlQ9AhBb*~yM
z$T<H5-`}on49{$;0(%|t3H-9*$tD{>9}s*n;*O)i^-)(XHOkw+r>Z$nG<z>c5|FiT
z?JbWSSC-^=;BG4dWWbN7e+=gAtBW2I047`hubAxfmCf;We;xeiZqHW<HS=|Sttcz_
z%cpn0k3XwCGh~1d-wbTVcRe3*jdqWMU7R@c=VD8D4S|tg5m!<MM~_YfF#k56aGF4O
z`2;MB1YV_KJkHv?xixO96tx7C+OtYnJ9>1Z;1Q<Q=^gi2oeV!LHG6cjyQe+|+#d|*
zGiJ|Ss}Nr7UNC*Hm$biqCUp}?%@%gBMcenE-bDA(x#}1^mT2f1u0B$BG2qCXU(~AE
z8I4Tg-u2qcDinC~tTU#Xd-9E^!*`MKA)~~xp#_hnp*fR+vQ8%4ckV8K_aLl{PE$u0
zc3H@ffxQX@MC+&r0j}JCfNCdZ?rT1;cs+~BdF8=1N=8#e$5-*)v3NYW2Pp_d=^HH)
znU0(km6`KNzKG-IJ5fXB&yNUn^)S>}y{EG8y1}&Tg-hmd+4kg$$?T%Um2mn5Lm3ZT
zj<0!fL|w9B3p@Ucw0lkIs%qj~J+<1#>qJ9|`1wN-0)mtlK;OP>A)v=0S^tPyq8Asi
zenvdEGaX}<uvk^KSdf=IwBeDJo+CLt^uAuPY6A912Y7{nXl7-%&Cbweg7tdWP+59W
zG@1_3IW4uc?pf_lL~2)X?dTZXe3F~K-G92Qc+w{MK-2hH`_-6FSUEKmWNFX7pA2*`
zxaZJoXvR5N?=&1`PgcY@yc4sw42M{>M_J6mDE$i=P@Up6eob4nOWcNj>c(e)0Sx^g
z0|+pWNhINbow52M9}o{qsOx@2zr-lQce8XC9WR_W(|)h!pu(VK=n^i677%{ev<<7%
zV8cUMzf&^Z2=L~ui^NSqH^&aHS3Ci5{HB@nEz~@Kc9?JdFak`sPCl-4kZzJVzO5t*
zG4?j()?m7t5jqSeg(Ekf1;~fuW>xY$R$hS&at0Ayv2F(WLg~Y?cY6JHC`7HzeE9vm
zSZcs$o)65NWHj_P?(jNBSVHjjr#aEWMjw#Iuaq$N#Lq&4VQ@c39`;4UGN*9+u<wKP
zk|Vm4w0Z4r4pyk}N1ZQWmnYp^IwGj859Z|z?ia@>_$HQwHtE_MS|m9=sgO)6XBeL7
z$UH)e*O&x%9Z)w{2C&pwSude#OSm#tH~qH1o+5Z{1MuVjw5*)i?nccdroj2;huR2q
zSN;QxSv20KYvQzPXtv_wGuV;P(dxn;;KR6jJa!L<)%OE8&np{;+warWr$`w4zoWYl
zvQPfbEQ}gAbbbdh!IWd^a9t3$l&-F3U-HDh=`ERBhnTqAi;1Hk$q#V<^}ScPFOsjj
zC63GooEvwEx3YFqAC(z}dUV;i?^lbJzFBIhVPHxkx^Dx}0YG+{RV<H!xB}nXqgm;@
z7eUoGMS~KGpR7(fkQ(BZ$W;bcm5;2nq1V=^;PCLLyNu(D5T1(ZHdJ}?(tZfcU9hsM
zD*0vu3)KARvJT<Yy7eVj7h|kQR_LJQKyB!d0d6AmHj)p0=s`q4a3lJEEHO^tDl8t=
zf2iU=Bj9$GEAaFvppt$8erHC6WRSqK*K+Az{joPgmUc(m4>BN_56FXz;$p20dH@iP
z3d~YlC!UJFB}~6a!UOvpT9}UQkjz@g%>*cA1z=k>kFt4UJyvaO{A4P>#&DwNDcqdt
z7H~_FWT9>OR46ysxDty*>S;G)u9}#6XkzqQ;i;!f-+?8y!<Pg(qu*pCcpeI1<OH;6
z6K-nC<)k>?06@DYe4!tZo%Tj9rjL4dw%<aZ4=`g)^t*RxJD+%p;Q7GRj|2O!X<;Y)
z+&9LyU|0?WS*3bd>rD-b<^Et+;ci0O_M_*r0e%p)BsEL2QdtN~d3|M;>F84Zcpd+8
zed)RZSiL`ePPIQBcRRH&;gYw)L1qF4KmgbvOO8w9_$ooQLH^ZBON02a;c7{&3=Khq
zcB5(SvIr^Vx|?e~TJT^Uk6!QXl*ESec~VVP>OL!3E8N3J1Wf7f4HA@AIv)G4Xu7nC
zxW>f_$L}M9dQ9$3tf!n>6lFGtxVPDjc)Fe93h3Bz3VXKRTkLT&uVQpD{GJWw46sx5
zi)Pdlj;(aBk8?r(xf2v)5tkpbI!Ht*VB|-yIUwd_RvRASwIRN;<DXhWfa1~z2uBuN
z-6p^KMfoG^o!sMcNTQSJL`kMe!GVqMUv<+cu6lw2d~bNi!|*O+{GxabPRBv5X=ZS0
zP98rh`8F``tl8vIljO&ox1mkzK|sHyzBJ<oT_wq`tqM)#UG-mjnKw6mDPw(-#!xom
z&Td)i;5KHKO)&laYc7zum)DB-i?i<|s>I~?78DX5&bqDO7w{<)he49BJI*Fn*;m$|
z`Jz0oL-e_?@yF2)IrG?8fTLC<jY<ktPdBycHh672l5cW*toIzk;F;KZeMU?Su+;})
z5|7t?n~Wt~xe`&`{8+)7RP7jBIhcQ46?_?f%mRKqHsSnBJf2xd6|VzxvGCXSs$`IG
zHk9t!VbtxtDfeTJvRr|^$v9)9gJUTSpdNu^*%jXzEW!%$t@?B);D^VKj2b8Jcdh8H
z8~+n>Gv9Z0CaGN%Gcr>spULdu#Zl$CspsgXfbAGNE=L^)!~@iFgY;<*rgBjKa&LmS
zjW;MI%^O8oaIa71G&vkbYF<IP5u+_>=Yu~ds&c*@H4wcWnrQ8_U`y)FU<&gK*t+HF
z8t3pO1z1WD=k$nCKR2OETm@DBkhf5n<E!>0kBSc6IZBDokBProo@52cN7N_?5UOsL
zhGeNp<&}+f!ohEhp^e2E3*D1_1>C*$<Z1jvwiywU>G8#G4k`8-Ta<GHThneeqAZ9j
zt)v09JKVXF={flm_AE;F8HKPb{r0`@pEctmL2cY0iXmwRI>kG4uJaTqr{WJuI8s-X
zi=Q}J@Ys9y;6IFuGBB?z!ei4dqC?8&b>sy=sA8+iWl013;4J$BGhl7MmY8@WxNU{D
zM{JlA%}KsHAYaj7z$I;wkmPOJ^1NA3s;65F(P$l+Gcoy5^#NgjS`BO#6bqzUDec`t
zNI~xHCujRsC-Fyd?zMHQK4z{gep_D%M^~M*+#?&){J7LQZlFcn8?IV2*fqNur>=8-
z46j$NT>31bUjgdRbT>`~H9S$1UtRYbcaN^x5pUu)7=$G5hSW|;(AJXr$Aq@0jXb17
zCNFi+G0i2O`gZ5%K;vGNUMlx@O6InU<ZL~iAs9&Kx>q%AoEY2M*-C8%wxHpCyuPDi
zAzdih@Gb+n05(|D6YTV}*^dCy9|qSN9D;iqNL>xaM3ZB9)_S++7DX8AxhY2MS8_<1
z420zcj&spB<)Fu6^K12h5cek=_^W+3({l<e!sGn5WYSl@rlN8zvU?%O@ifrXZ+prv
z;oK&HLSkpEqtd(IY-NjdbM#sIQo0pQOlBstd-Y3wgNk_f7;?24j$2k86%29so}d-y
z(mOxac$7MNmKdr=?(hFGWJ~syrC)lIwzy@a@M7sW4_QU)UR4KPDWou`%q&(LrcLU{
zki7#@Ln6du8`cUF!;>;5^3a?DKBN|T4%}54JDYhHv@$#hD63fMmWhqGTPJj^#XTF<
ze_B^>_iXV5_NxE0?^jO<duoL!aB_{0Xnyl$s>1eU(S;`=8vR98ol#00xe3p{;&#=e
zK;D&$ZZvK_5RjWf%SE8dYW>k$+}{P{5WnP*$^rhiMF(mi63tf8*g|iIZUA^K^T>Ku
zz}~Qf{BgJ=a6)|iqTv8DJtUA=X{Xzk-MCxZ?VC?-PvgjQaxE@RUp8EIUf1ZgNjH!f
zmyOWh8PRWGe2tc^>R^6KiHP2o<+=r|tIS$(^!T6~C+Sjyh#Gp8do+qM!0X0x-B}N@
zYN#WAjvDhClT!8kCVnxdvF5^>St5t070xgw*@mkap6)FgT!Q~{>109uo)hr%#9FEp
zOD7?z=k-e9N8MmqIs%aOJL%3YpS(gS5fUU~STSAAKi#3X^l|p!67zb#dw|mXX{?uG
zIEbk(Sp@K?99H5<0n<v}66CF&a6y<lK&yN=`T=z`v$iy7P38)Q`ixklG7~;VkI=&0
z-+;PMyTg|X50~E=Qo~Io##!O52e;f+n<p$mhf7P`UKA8VYqc15!6UtB;9c!Uy-W|q
zdAld!xD`d{Ys^QymwWXfLRq*9U+p-ax$cFg-0~D#*&>K|`KvY|ngd98dvGoowxl_(
zlA+3$(_mwn>b0q^H*U#pWFn^G9WXdRy`^EmE3Be3FrV8K=FV<9|7H3Q1;v$S(g5Ch
zparjnT}$6J6sO+F@EW1)fDcc67!tloeTA^_*J-5q^3H11d)sfd{_a2*_e>?0m~`oj
zVBv_@O|;vJh*z-CnqouYq-OY_pIa}X%#iLltIu$eWn#MGm-bNeQu}djIUoL7J9fhZ
z;0{a-WdU1E#=B@DRH-3PGRGYyCnhN&DI52Do76gPHm;6mHuZfuzQ_K69w})^?uT&v
z9%Pq3&zwNf;evb!sFZTARJ{#|e(Hvs4u+5-m>P}$h(duK|3J`};=UI;XPWr?XLS<I
zq^BP|rw9Je^X(BA*ZXH`8*CRw$>DQ#91D@xbjg92o0w_l9W_ND85IDQ5&%7asE8N9
z4k=l!9vO<r=Fe`%es{Ms=}C26$-0UuRLmk(%d=d$YU^I>U<gDFFPdF+K`Q3d&Q`x#
zE0wbyZ;;%lxR<t8!!YRFX=JY_6?urnCM|}D-e__tp|f8{nA-Tw#H|WG@u`zvlQ9&!
zR2u>V?4bGPf!BS6!aWS7mQTu_KjKUbL#E?W;x)Bk@9Q?bWtFv~LyPK5yiY_4l0cWq
z#{7+PJ!@b82Q6wEQdX_0IV=UFdkF}QsWj9KR(6U6?Ass^LxAd-NPurdE{d{+Dfl??
zi@aZ#?EwyFv}~=*q^Ix-0t2Mlm9BETI>ypz8@?=9!`e4CzCi+fypM<syEN6V>YdnM
zG1o1As2?CBJX$uGLW#ud;LTTnp+!$SV5HVf$bhgTl;+|sAk*=_w}7Bvuklf<sOxv6
z0}azVm+PfM$|0W<tP$`oFie)bIN7J@@y-`6qP0IErU=E=hJ&vK@qAe9%AUW9yHjUz
z)@7-(tH|Begw$Br`;ZbqV}d)xV|@hB<oJy9@y+kPnWh$$)K~8Hp`2-Y-wYxKw?iZk
z`4M;?-07WYhA>20X?7-OogI7F9qqc^J=}Nlk^Q!BdlGC-yUN77y&+uj+f$MU3RAD&
z8%R(&;c&}euz4=dyPu7`qWAFVfbNni&9Aj3*LMD*)B%D#ogT?ipO!wg3}{KR!@0nl
z>PN8`Uq%b4o~q(BkCZh4e0knuyMRV-__p0uR7SxX!OO?H>Sl&qg99EtJ+iM_d@Wzs
zzM+i?0n8ymHbQZ#dVV}n%3+RwL|DomW(^Ey7T12U9W4nNPj3*fhJoTW%RuC0ze&$J
z7=k*fryQPRTaN^0Z9mYizN4*ey$xiN6?+{BtxT;yX(i7;jxTo_2SO)KbPz>=4&war
zq`cY~_QlRlOsWk-97ZH%sf+y~c#ph{(z8KP_;oR_;Bn}~U-tp=)cUkWEtu-m%q@He
zp1G;b1OJ`8vG}=8f;h7QU{u&@>|i{2D;b-S^<<YE|2nA>7BfGoTv2O&>4E<q6W**k
z($Py%Zq}i2%6b(ix1t!_J@5QXG(A%PF=mGe=de8<u%$BF&}HUhu0tk{+j@n4(>(;n
zRl7&-g~sq+n!egBLCu1R0{(D?zn4IlKI`r<KfWI?D=Hk<p3qX;60O?YK(#N*Ph{a_
zPu1rv+8?GpvJC0F>K$uHr5^Oh$?3gP);dx;{D>1U%d#dn+tHtWuT&SBsR`-HFr)ax
zI~S=Z-vl~N98YbmuV%8(iOrWnnEX}<wRWaAzSI(pG6D0#er9DZAXi<uy&kpakCem4
z#)GbiG=$b|RgW0GYS}etLjKIioLW!$bsl6DCq*A|OdRJ^y=ENR&=HfsZpa|E?1)#7
zNb9pNDq5f7#PLW+f#3{J_l~(~AbR<C&+G8LT-;)e`8zhk*6571jma;$6Bl|bwC1Kh
zXa`3RX*ZVDC{hJ}JS!3ty(@>y(f8fr0ji9z$IT{R=aq3*Nw0|s!>#TkmG+YN`0kOa
zyU?C2R;b0S^Q|+W!)S#SMLUJxCYCNJQ;<FH(r$BM$hzynOiu+?2yV`tLnTZ+Mo3__
z*liKbC1&w$<E-n9OyM;bf_Zq<6`k%M2XB0Hr4zDyN@UDY7MVrUzBQ;hgUZc#`%^hG
zM~imOFPgjNw#FUCS)2JrzqU57;YPVq=fnexn0zu#ZB507FKQ&NpvR6t>Y&Z;bJ{}T
zp^dHhfsy9D6xz3MhKp=pZO{Kyy+E};n>IKk_kM@_Dx1PWD~AO{9yF|S?5q{cIoY&M
z6=r8T+JB5)s7gE|zcbtel{1(~A->HrAtPk#-skd`V*AOAy!Upjdco)+p>hL80Hl%F
z?}$8pg+}fjlcMuRD!c0SR)TanRr5RXVHS}IH3+8I-_5i6Vv`#>i3Y0Dl$l!K-TC$Y
z32baaovDwMh^n=5!w2g)K+rMA#AJ&R-P@F5|KmLa#|qd7<lI=nh4`W2zBFOuvZ@2X
zRptJUD?sp&Q+DqStK07XN7+{fMA=2%q9`aK79p*OMM+C5AgD-5%18*(CDJ)60wNLy
zT>{b!NDa*>NJ#h4A;Q4GFmw$J_ssAbZ+zdq_ow({p65B|?6ddUYp-Q=$6FWm4EL)O
zkXI;w)dTLJ_`^Oq3B`1yd>4mEe2nbSmN1lLE|yA~>FmldU0Zk?YwG&Vy1L+-h$?gJ
z5mi-cW}}kGTagGAGQ<Tz5;~s5vMuBCD82}#9}G832F``;)$N&|!9bDtx-?sF{dsXM
zXm#YeftNC`h79mbc%WCqi!viuz}e>YI$a*)s5qe$X}I_Gn7b{YZ+2$5hwbN?1OaSo
zpy6vXZp|6tz%6$lkXGbrl1EwvG%_}*HH@qz-(JqKy|~u{h-W!6h9%HAS>KA+6I`g7
zV9n`s1gSv*THES*{$5>k<0!ASbG7|)-s*Ev_wU4w>P{6TFF`(cIc6owT9Jx{yhYkb
zolfpZvf6T7Rg2yBg2r~5WasDZ-I6JOg{(9WJ2+^~EG7<QbcOqbHQK)&KU|ENdNoCm
zb-NCwUK_-gC*wc3NR##y)}0!a{^;*UGoZOO)BiG5Bp|)FE9o1(1y;OSfXvQwpIh*H
z4Q^$RUV4b0T?oEsXvG~lnd<Be6kMxQPZEb^DW`!3v>0cPc$O{4O!@&^HfaovoZost
z4J&>S!l*Qat8LcZJI?8}6DIJtiGwZ<gH3C_l5GD$-s-H9Wk3@3)>&Kl;Eil+?hs`r
zYu-ytzbMPs6ejD%)wjL*<DF_UoMz#7=c?_LNqWqUnBJ_0rhzHcxoV3PJL`?Fl=B6F
z{kvU{d)8lYWCuMup2f>2JJA~}(iOQkh4`rIv$tWYbpOP`?B>*WXGm0~wCNVA%i$&O
z()JAZ<W=Zl@nvh@-Qjy@)+>eFDKk4y4myr-2E~|-M8pOzAZ~K4LLqw0YvLZNRQ-B^
zLF`px?Hmmya9*9x(H1+V?*wdfUl?8<=JVr?Vt)q^ByRC&^FCJ9U&)gaaTO_GYZS?9
zU{&+Xeu;G%QrlbR!4Y2eQotuKitW{lZ}*mX(O&Rpucq4jxH-i+^4IJ2)@;;f#d@Pe
zkZMtP3<UQ8<8?eYO-B9;pjDyv6<Nt)r({rWjTH~2+#Sy~=MgkkO9m(y@7=5n`0ml7
zc=3X#CB0zikOAn7i2G5R!0a1!x$V_X9142&nZq9K?vDs3zkJO-EQ@>SJ<Qd1!u}<h
z%Mjv#@oudVPVRl<l3df@)HZL00);1yt%Qpi%0({<4p&|16z{h<YvXiyB*}75A<Rd3
zW$ZPqVNAO8-J0B-E|Joow*pXw#?1<I6wm!y-ozs(u8AN-R8*^I-<lxlBzKNiJUDk{
zUF0UqkPgD-9+}VcBW|rr&#Xfg%HyOLr%x->=Q&Ak3VR37R&TG4e|gbxNIUTO{gH&n
z4eywwMQfV*RtuVG%Q7k+<>IV5(GPa)>a4F;u!cJ82l9Tp`I+}QzGRST00~(PL&8;~
zn0}F{P5Z1n%XPfo=)cBt5#*GurBKoV1`k-hqrTZyP1)$8GNi1-U^=9LM%sBx<74x8
zF;5QDCnw56Itw$!TI=B|m7}`IclPIQ$zl4uk@qH(o>FDqe9W`*E)4FYD`Oix*dSYD
zh_fzerQtJ~S8C#H&w4VbhrDj9pKLwTh-Y{H>Uk+m7&0>+^iHTpv#AXQk0dZr9*%z4
zn6iL!*B6Ug;<gvr!hXuvEh(SO4=Gl9Mi6Dqv9~(WN0#B3GJvc)Tq09ebt6j@_o1EZ
z;+O+QIqwA`DbOd2KjOajmA<1dDxSl4&&JGc23v+P{{8Hw<mI)$G+k>bb42w|<%mcQ
zT=xXs72KmnPZj?v9B)wK&CP5nM4A-+$`3E8<I-Ec_RScMomR<dYCB1y)&$Z$IXs8)
zeJ}Iu!${{QkeIk{_RD9tX@yS}^yV>;B5k(ZVb%5Pj4wj$Ro*mAJ}im0lL(PvbM}%w
zH=^Sx!nS(T)_SZCnQ>o&@7yI?6LCr@jva;;{t6|#<0G7+>gw(uH4pO>U0`I8P@cur
zcR&-`r)1@5LmfRyLP+O5FUoqd1kvAw{Ol2CbAk8aJsy(sCbgYaf$L79x{NVX8p_Zx
z*>jVhifZBuMekjpe>1m=^iNb&M+Ocs&6%O2Dc&MvJjN#YJ#~HnV*q5$k<f5&ZmZ2$
z9iEC_I#gy}MbIER+fosE4Y(4qkILl;Lo(*RS~7Z?QOX$p%!ev(q!LDElB!M=%P@Yq
zjM=*(<81eeirrxN{B{M6`c-y(N1)GOEZ}iGDJgZ<+#?IzZl!gBZfOEq(Amxi8WpRd
zSjN=8^;?l`6A@pBHacGRr*GC?*v_+mMU~6C7GM!F8PM}LIq)#nbd~tGNjY1`+sme|
z4Hd^81I44l5u1y8yD>7cD;s;+D^Bb62(yyIKrntjYyT8V<aF5`zp2!uZ=#rCY)D!0
zx_g<G`#d(LcV4oyd?TChnE##%1m<BwTA@;2hpzTWGU@VI*yvbTN@|1`ZF4?{01pGE
zg}k)<ibsV^c3?=XaK$=gk>_0iHq=1mgrR!^8^<;hx{2s?-TNkUwB#gxvvfiBg<<NF
z&F9Z9hRP^B%tgKl{#_~Lx;PRU5OSy0%2l+dfY;jf50Q*R3Z|?l+T^Fv!S9=I%7<p4
z#ex08*CS>o8}(V_NUQeDqw4DqsiByvLbQBI8znWAGN#B;Wbm$mV}io^!mCBmDR8j#
zE*CQ=e9T|a%Q8aEm12MsULFuNTDf=Q#%meIWtuml!+Bm^5kdBex)ogGKbmBG%KBuS
z9KK5V+&W6+dyH}~kFx^Uwu>Wr5xMGSbY5UO@6l`WmKQa$-_~LCE?_hvR)1e`*iSQ4
zDrS2jTO)9;x_oNxfXl$vrO{;u*wB4t(4%c>qnCI6rkq^yqeQOAdnSAJbJNVi+cAR|
z3vXc~kAu7;d(c?t6V<P@8wf3qRE~>eHaNk+z7h2L$q9YPUDX5`)1f{>YU&UUd*=Fb
z*54Bqc*7+&-#`)m`>H7&Yz4{2<+%_1os*WCohg<fkyghJU+Raz%;^f6%}*4(QZUOl
z9Y@;>KW~%w(9o(K%W!^T8Q;!!^cHOHW#Z&&J^I8ATXv9JM2%etu@B{ZId!SQlp2cV
z>TL@U$#YE6F}qQ>HaHjkYW|(4vI7LKy`f=I8PwDwnQ1{!ZGk#9VUG^n2-CkTysq5w
zW8&g>GQ`1>DnRf215+f<3w3eOPUJ04H8f>n;`7w6Z3fGEU23r<9S#Jp8T+FOx59g4
z1q*Rjc4bbG*9&jCBobc@YNPzvy_XUAJb|ae%2K_@i-$**@-z%?9H<zP|KZ67K-X3x
z=(-ZF3<nXZ^hl*D^&-y;RcT#z-`RSZT@B0j>gf#A^~%|Vg|GCdeq8`{y>=n*&b)H<
z<l8b;P4);)|1zns$yuRopg>E0upqtradU6+9d@QX5H&9KA_s1IPa3n-y2)TJ2~1y}
z`-%+~Ch)Mfrt?Fo`#r5q0kXm)1#jAQ*3qaE9*(ys2w(;)7CByOoBIfF4K%PiHKYg>
zT)#^_>R$BP++c8cd(2Kf;;#hzr$^miB8cp=PSH_Vo<}H7E-lcEEHI(LcyBmY_1eFV
zKuGM6&X<p?5S?QPL;JE<0vEDNXrNjy0hRou6?raQIten3eWiQ#E|Hb-Xi~+@*)@m3
z?cTPG+^{;gmUt7ze#~w*`O1{;SK|l9`8LTTI_Y{jcBOl@%QA(2-IER515?9Y@tej#
zY>8s6>x^)<9cYh8CniG*<u|IkZ6N>~eF|bNO7L_iE+bNstJK{Qa?AeXUjmzsYxObc
zQ9XKJ1}H;SG4GWnR=rEaEb<qKTG;4IP;2b4^+=2Nid>^nNhCBb&{pP=kPOWLL|Q?;
ze$mGFIdwKXMW_hI40*uy`!D~_&n%UkcU`}!VsB?u`~V?EHDzx;@mtuYpveHTx?ILe
z?5wuvaG;Z6{GFxp2|AeX&1*dKEa*TzmB&i1--GtWqRk)dyq{^~TyYn3PE1Iic+5ax
zc1&7{0wT%vCw)0r-U7hr<eUSs@cGBO7#$8T30yjKQ?v;cOryHS8$LAZ9{x&Hrao8D
zFo+f(17COU91Y52Y}g~ya>kfOl5YI*=u*pU%U$*BW`kZGiq_epL({Fj`paXxh&?~5
zz&Zg!HCj|??A;>}-B0a$!RcbPE-_NxMFe7plROceF}uAi<tv>x(IRR3G*K(|opnhM
z%eUW%>`gK`O%FWD67vYR12%EcUb>S==BiuWY}VaSpP<~tg|sIo+plPag?8G6Mk3}O
zq#reW1PrqpnIB-Lfv?al6)?HcxY6kqxJHbVzvxJR`A&R#&iK5c(Y1AFu}3;$p_<FS
z<CF$IBbNhZonLF%?K=oY6y7m}9*?X2dCTx!Hwy$W7Ez#>9MKwKS1LH+%uPnTrMt0Z
z9a`nip);eQxm~^X+nG0G&1{cy`y^Dk2IK}@n5j{={X!t77><6(T)JGo)O<f#mA5gh
zWT(zDCb~+oWHkE2M2B;^prDfLXlEW4C0(jmh=@s}RIIT4F5zmqUQ%Kq8*3+Z3}{`-
zfV&0Y-RD&gl?B2{=$d&H7P<Z%j<g9%TDmoc?}QIYtKxFw!g(A@*G|33U8Mihhc`Oa
z*uF5;ZceWaJ;EvHGO>Rw*6k8gYR4)fTeauuXOE4f&Z#msv&N=HM_VrES%CglT<Q>t
z12)oZSfO0FVb>V(l^&WKdN!xz5N~=+`Hc1wuw?MrUxB|nI}zthpVDgfRmOVh%=7s8
zc~9(FujI}GOrMJY3hudipxWXEjSY7@kw`$WQu@O&INE$J=@z(c@<Q^#lTH&ah^{k^
zeuy{j=XR>(=!2(#HbY{Xc@gwddt2AMJ$2!rqnK(DMfDBWx|M-5<<?FtwhMs2BtQ<l
zhX0$PbA4kCfmcF@!Jw_jbzkpUzdn!yr>F+x!Z=1wRfF&PH=w{B_S_1!OiWBn|CG_}
z@BPm%IOWN99ss;9tdGcv`yu{K%pxF}7z#yB_HO!Hq9t4bSE);@aP2CXjHlXP!M|IO
z5l4lesz~A!`Fs>p#t>-%)kq;7`3`Gp-?}{>o)^Vi0Q34Zq;Yn~uk5jC#g(3W@q5!$
zo$2(aVtCWf(9Dr{IsPGkE-r_SaJT=lRarYmE40+f-Rk4zZ}r;UlW!!gLbSbOfi~W0
zVzNTWd(Z+?u|ze3$51J=3By5+f5sQYKQMFq_xVerP0NQuX?*D3&KXSArZAwHks1o_
zNTrk4+)*0$2G~QW)b8mD{ZloDQItfV=i(P-`LYIct4gj#N9zNczx$eE5VIz4oWKA1
zlqr%<L1xt*cd+KjHGU8J<M`bEnRKSaR{sj0w1Enz$(vG(Bc6EpaP=t5D)&f**iD{k
z5#XX}^0+wm->p63HSC0zyF1k9`gC2Nzka9JN%!EGixQ=gm_8&I13OL&HPz^W1NXYC
z^uUv=xW_tkb6oc|&Q;xVg2}qPiu03n$asq~)Xhio*XZrAr`faesvb=C!|C3R(NPtv
zfeaOLlBajS^xFM<gptUq=*XmTEJxvSnX|q8=&R-4aI(+pCI^@jwx_v@%wnYuDQr?Y
z?z=XN=X#pkl^^kgJ<OvDj9$C;>qmbXI1}Rb-<xzqVdR;f0C7Z7b;x=(P8?%WW8kg#
zk@J%U4|jshR_o;}qdQR#z>sK*A2IVlp9IR_kZnS@xzX!))9gP_LGm}6^kBtD56(L$
zh}$JGh<<a6n&jjJi2hR*fD9iA*S9UgR^<gi4i4QsXms1@jQ12X<{Ce6Ae{b643W;6
zHUu?b2{r`%)J3)`qAB$sBEA2)?fbvc<hCxZ1FD;@tie#F(m6CZ%~Kxheab7A1Hi)T
zdO83^bE*Y4xwmpJJ+!}z%3K)~wb+*NM<fIPyX5_&pbvDscEx0-u_jE&LLa9UqJS_j
zL9O<$rqX}zmp0a6G|auV53x>nx6l2%xss9*<SL<IL=q212GyrzbZ;r=1v5>OBm#R6
z#}Qd21)Yw7TxbxW^WbDGYyGL`MIQbY1<K`X4IxsR)oQ}@PB^N4J?h`y=Kqd2r}<?v
z`XJml%b&rEjNUfiuNigs`Wy`UkbYFguuxU$trz;d5nAE2Js#4R<O~WWX1o>XI|QgA
zzSw_^wKzdXZ=d<7<nUkdv6qt>AJhFhK>WSz?|u8vEflNLyps8$gXx{QSfPqQR~173
z2au16QY{l}seJSe8LQe{>K+697KHQ0QLS|v>Po_#Tl1BdzF#A>O)u+6kbg^r?w1dG
zGiQ&TA!!cH<bk<jU{7s{)5%8(v%*4>n@;bovDL4^B~wGt*jP?yv{YU*bMX<7r*G*C
zU`ULF*zp>UZeA*`c4+EjS(QGsqhKv2_{EMif|uy7_;2S6U}6rsfg~Rf)r>i1Eu^bm
zI;~+ST-a9WmYHKGNE>?qm5jAN0Mu{U2(3>+Fuax?!^8Q$xm5$!f0I<>z;ZbM3Pr5t
zc_EeRduF3?1d%fdb4A9Cr}25mQM>XIv<@pDt<XwewopHL+b;PP-YU5SndSDXZQ1v;
z&=uzwh;ffzQea5fEoEOVYYmsK=dC!NNdZ-!vnuHt-7tu3u!0|&{viX1@&T#8^L>JM
zAd$O8XIlDUQD~AMP=V)`m#e$nu1eVfc?0f4;1K?rg*B}{YauJ2!C(>_RDd`fg>`5-
z^HI;;qT%|>gE*vO>k9mJn~B72+0EF8J$+T{R~bz3HTN{{RrDTF;(%GUCdL{trBv3C
z_peQJ^iJeiBKyOpqA=@~YZMj7xb=S})C4b7VvWEo_@me#5y5xbx*fHB?#T}W;G$|Y
zK`6HL!2mL)KWJX@%XK`sk~R0CdcuK`Y2l*bh?S>k{Xd-Qu9lzU&ADK>aW&Wv7>;98
z6UaD8^gHl<8s4ttwmf>u!uo@7Rf2$>n0xhm)jD9|c2!(OZiLWO92h04<U($bVvMUD
zUNcoqY^gWAnM{2Zk=ux$Q!2vDtx&+7)j~z2gl5yL7YwpWiUxW5`|rm4rkrMA`Pde5
z=gQTJH>3Niur<0WC2tuO<%GHl?m=126DN?Ba4;UbCE0b?z_#2?zt6GUMhoUrO>X(f
z_&r(qU}je114EM+h`O7D0>k`IfC!)`Y-!CJp@WHIMSqCVDtqG|^Sq198#0Lf(5|Co
zU<>&LFNIW0h}aiQmHJJW<l7#wuZ&&aJdS@pBn5|to`{O!v4EZZBn@BalhdCs57f(9
z)Ny-k%U>MlIpES#<KNdXF!eKH5a(n6k^#_U;Bmt~xK}O2j8*!22YV0hsSXN}^Wc^P
zU8}<+bW~shv;S(}f6cwNbU1Jdvr?=7-~8|*K5OZA;N@?fVc(m%>f9H!MgC2O_HBCr
zu(;Def-%y;?Fj8$2#sZf>#(X1hGDKw1oD;NszKBCMGt(k!!UGs4}K@BA09vkobVtz
z&8Ch>yR?`#FfqH@Jju0!#$7rIb0e+&ajHQRc~|OUkuBAH7wIs;Kt|vexyWqu9hxBC
zM8!;X|DL4{%j)U;cRpzAZiAH0sUkQ1B)Q&g0RYo};NfVyanqEumu=Cyp<79-ZvlR>
z$nkN_lh+rESCV0Q0WE;&O;F)o86C;tfhet2Kcu)DtXQ5$hwDz*0AtV&w~HlF#`{YJ
z%qyRzke5vaoc!Koq$54usjtI)1o{QTI-r$8o~Bc}@Q$M!j5fxwJ{TX1uA_n~XBR<#
zc%|;08SF!HHt<bHJWCD!Rk{B@$(-}SqF!M~p2If6S7!7nKrX@xZnfW@h4l5W!kz%p
z-5>njk3L<Jt#y!^7oMiixpKDs$x2yN9$BUTVJx3KX@%6pRvl*YwD=(N864aq6t3^+
z&T*av`@wlaJGZ&9&{Hk(Lc&l8N2Da@l%~x9G*@?hlXYNFTScQnEn*^<lc88eP>&3}
z(Y?ii)`_i~wmxT$%}tWE7pv|H)ATYuEdD}=&(*zcnySEM3?#5G$bw#o8*j+{*L*fo
z^^*Lo`R=d5%&5z4DT^0KGO^ZcX6`$?#S`wvdv!FP{X|=0>m+hlzz&KYA5YC|ep*sX
zx0%2(Mk{!z??E@pmJMxMazYhY;yv9@MgQi!Q-3l&HP7fMG)0e?bUZyh0b;l_h~eA}
ze|6i=s;;AX%xYKrDm}t1iuB@t>eSj}PkJOwV25#q0q>tvoohX=S%B5>|2XnyTuU!M
zh^!@|WZ2>Kdo@2eR>6>OEqD-eQqd2%bDll|+;%Wgv6=QYC+|hNbo6V=*oGfi^;izJ
zUU5-4XmfU5I>oTih!W}tG$D$TVyw_ZnHo+sQl|G6nH@Ee-3D6~OqM5k3ShWJAmY}E
z)+zc3ue>nuec(uosnX=}Et+BtZ_}ghuRp~9IU@V$xkkE5XFtteF_o(+$kM%29ed8!
z8jifPS5cpc)F~MH4vI3-eXHF+&-!c5Vjk$2q-z|IE}gv;Ip!H8jo+NSxw6`=8W0K+
zZ~+>^tpIcfjJ^<B8b@zb!F(u!X*5(_?cXoDm53SW=^%4MU70{{iqDq1#5mp%^d0eZ
zba=9Lu1RW0WIn5+%F*HwtGu&>W>sQ!gkDy^AcM@#NEZ_;sjigSm`Gu^wbWvGgDvHA
zVaEl*ZDGp3MWn`v(zDDkX1>z&?09quCb{k1olVbz_*Xo0l)}4bmrDW{QeimV+pvZ@
zc(S3Ys;e(6-YNo?^-)3W!s9U6!Ez25r_EnB_k=Y3?5UT8F86NU#!U8@4<uy8+P~Ut
z+?pD?_IQ)oJ5?q>|LF<*b0%W)_V>+`43s_e4sv~2^s3+So=uJH?-0=<D8xJx`P(@=
zRo`UPZG$-zlqz9*;t-PUsQTjdRQ^`huY=qc(9RncvOv6~l{bPqxp+a7Pb)AH)}ZcA
z)DLf3j(KGL18@MlTAjGfO1{xnJ3#0=9I=kTD#GH+(8&=@A<s^*xPmpZW8GWR+3{If
z&6CPz5f^oKp(g*oXcdGJG=VQ*2q-<hpgzUK=Eb_cnDtSwHM%bzB^@rFh_x%>JvI+Z
ztkH9Gg76%fulUj_61r2ws_3_tJDA7-Q2boF<(t{j)n*jEOfUZI&g{+R0(n>7n|z`~
zKb7Nu-wTu`j;nOp`1Q4kg}9$GUUj9_e_GnL^nEmrIYJ9$Jo%AscKKnuJVHCYAxZWX
zofJ9}_3+8F6j29?*RK7TJM+<_lcgvsQb$GFb|7QXH96=?%_JkL+3qcAfK}$_Bl3~q
zXjE$N_TZ2Hx&st<$!4#onr_G8;<$Etp{#RPXc7gn3pWOMz{iR&U^U@|StHvZ<Lp|E
zs3z$q`MF1!xc7{Rl3%KxLyEb>hS!Hmz;3yrFLOA3d*Cncb3!>Id*L{b1B|Bgo@n0U
z0V}-6({m;yOz(M<HqPwXORt=q@}wNV#PS5S2Dr8HkbjE$g-#zPd3=#rY@4V9vyzx4
zHOP8XAEKUvnWCMb`$6)x7J#4xPgLEjL_u`jq>Km;l^2(UXg`j>U*G$XC@wk`fT9<r
zZsrZ}Jy3-k`~1f23cQGd$BreuTTU@H^K;Y%9t$WX6%;oVoEsi(QpBQ2(5oEkjyS4f
z)vOYH&$^<k3pt;5AELm<rxOe8ZEO_}ZhIup&1E_;T3qQw`OWe;$xT`{PnWHWxo&!n
z4Vp2=9LM#x-~Uh%FJA0uK?yC!^u8SPb2qr?pV>);iS~9Y*?4Q10Nsr{3<NU62jX2v
z&C0y<c?Nnn-s2^Ha`}kWc=S_BXsbJ|XRPIzVH{^6rG?;pvCB~&eF;9_34Oj}>Z7EG
z;h?4UUm?f|5a~!rUIu_lAGnB;d@=&lr2DdxlJk|gCz3xdufDxF%qZgSupvs*7p7^`
zEvUHB(nYZ6XrU?jsNDbRaPCEJr$oB4!@vtGKk-GobuQjBIA3|qb)R|!p_D2GVz`Zm
zmOwYPdu}pfT*v8vxAgL`IP0gRrCxrI$7@&0c)_eE>A$mnqHx$#H;{^cD+0NXF<?7i
zHnl!W8T2<zwMWlEqxNA6_V%*AG#6wOv_?*@Clns8)uv7l0lW*Hf5+WFUivS1<D;gQ
z&eMbXu><a5dcV>;V(<bQiZK8hoCh95%tlLvUOp=JC%B(~2V91Vy$N_ep&+38-=6&6
zLkD(FOBx&p3Z#M46>sb;Vb4d|Z*qCLPo@;1U^+lWiVcfoJ*ZfJNCa|}ZA%o}iN!b2
zgM8%#NZqfzv$9P4<qec%AWks6ChqQkBM`3PCf!0DZ#gf_^pZ}TiIFx-Od$T6E>Pt1
z$N^Y8j<Skt=J8^7L5t`1pgW`YF0BiMB#2P7n9B3Cp8NxX_`MMS@jB-Yjz-7&xFoQX
zj&oZdAQXHz1VGuL<VsFJ^QC@NxkwLBIbI{tmQ*WxJ96x^F#++2R#PejOzWT7R2TTx
z2lf-Fe@z@zdp`ImA@77bDcb({Ht!93U=|I;l|I(&ZfzBLte6n=HQQACE+%@NlQUdV
z*VO#V8~L)}qD$9kkirq}a!<OmpHA*jgwBt)<<fl81rY-ns8|w!l%JLP|N0GSPT<=*
zVTJQ_i~#x2TI#zpxRS;XUnmxx`9_&;*$P*lFQ7~XsKj)($M^@AmNyPiEzaU2-hgrb
z|NBE=Sf8?UyZ+;-cR^?Ha&@-7TEM#FBvPe`?#r<F3gI{Cz9+pk_CUv`r#v5<MjD<Y
zbSCFWxaq+50}fR&QbhH%{hE$wrA)H)pV-(4kW>5Y1-L#ZY2)rZ;T~BLI5OI|M^&-l
zl|f?{{YY}!I(0gaJOdN2lez9E_k%!X*blY;e;>}fWvq-1tm<7qLj%jBo~^v^i}#ux
zoZ6dFEHUedO>r$3={h@(6KG!u8GE+_KruIvT|!2Pm!_E$fU;ZCvN9IOZ`Q(}i#Q0j
z_)`hOWSGY+(J+p975*DXAza08dtI9BUm#8-*X2<`!)HCK9bzc7rN7!;WF=5c!)C#%
z^uEnY71*Suu_j!&w%=Qn5net^8n)}{^lR>s^5<;`0)Z(3G?ZXHNEQgN(SlSw!Ci^u
zJ4jyt8-$ZB05I^(sv-1xH5V#F?oc&yl@1{?5%GDua$1nDv#G#&e*N077tP|-S27Kg
zkn4`@i9j@cqK^2i1K$?*HR3#<K>6!LY$W_|OGwPC?h~|n6Gw5XtMdpSi2vt_2t*%=
zt}{lmI3f09fD*D`sF*-kCy5Rr7B5yns&WA3!N9F|08(oJ$sYf$R;b4JzrA5a@QzXc
z^4S9CoX_$ySKH2ml<vOSrnR(+H<l4o;ic`e#Vuzvu(sm9yH{}dQ!2#b%s~Y3c3?`W
z(c&7wQ2u`JyP2s$cc?vK`Vs-Cpuby?p;L)Q&(|gYvsWPc<^~oBIksBDY2L5Vyy-qc
z(m)xv_E=A{$AR)@No0NPHsdrP?!Qg-N3i*9o*gj^Q>{>8Jv&BwVljadP%`)WuIl1*
z<~rsX*+K?=)YaeQo9-^TLN{F1n@JuK?j2yb=hT^63XmRm=z5Bhy3cZ_1R)^pO9D2#
zhiz2W%T<NG7w&aynUrSuUt%te)NqyKWdR<voN=*pr?JsN^OY!@38BKctpgigdLjU^
zf8;QcCx*q7Q)EodH@_K2I^8@}1EfFFN)FM%{O1%BQ!2?>qa1N0124d`l_4V1o-wXp
z5SzxPWhvg@TgV%eCqyn;B6@qF@rY|HP8sL@5kF<@&1xuTLIBkNr(-X-1xz`=1aE&9
zTl-2~BK%Yvbu*;FLy#5cYd^Qm`~ne{)7hzx@d%P^i<h7;Zb@mau*BBsn9dngHJf*f
zfeH97@y$W^LDwnf-s%ouUK2sM_XvT9OuhJ88~ulzHMQLI^_UY(<=$jJ)3H<M(I1P8
z^NQ=Qtcher=3FC$s6Q9Eo8a(z+QVd-+r00#f-J5%y`Wt0N}EQX@-tKSL7(L(1MV9H
zZEGSpDVa?>XnhIj^F>@E!jA?#>kG!z8p6W?U(u}&O@TC@ioHiqD;i6_r&D?Zw(P@_
z?Hikt(&GSS|0WL9M;-Es>Z2;UB`GlkIL!HFm<}8-Tw~Bnt8~k2i@9nA>SbZWGQszV
z@8_FYwZ2<r<Yl`P4?mWAe6Cpwe5Svm0^0OBkRK}z)kNJ#s0kCKR!H_!bP$->Il<_x
zhO>;HY*N&AR<!eUosy|@Y^IyvlH{9RT9J+p&6ob@swVi`$O^|W*;6b<A<;S=LU)oJ
zd=j+OV-saB4racLF6sG6A9X!tZJm^1FVf8Pki$keJvEMXMqxc0z7Tu@pC$VJ?q<dE
zL%zBG$MiLZx0-;PoW|?|rpIN;`h0~)1kAgY?sI+n;NC_w>{;+EE-yY^)Nc1UctxK5
zZ7<aQGHk;Ykq{z)+oG9u-Q)2n&mP}=>pQ7*EQC+&vSc+FYixSET|hyE3XcjbIJA1+
z-KEsn_I}i}OZ1|@b%Ichy-6aueh2uC+;NcDlJl|RGMnbn6<(_woKBv%KgQ+K`C0R+
zmnph3yyqI@IiNyl>LK(3k^k!j={dZ@LvOiVk$Z^YPo$HhOaV76Sr=MTX)_!C+_+}!
zix1l_a&Ps<`&g(u-2~rx)3bmskW-d0IOeVILeAqmYQ0^GcsOzWTJqj*$v4Nn-T8GA
zfis}W0=A+tEcm%G@9T;QL+x#jq$MSH>z6pm8zSRUUA*j|Rhjz(@!xZ#9<_K~Av-0o
zz;()E3pZUhIZuC*7qLOdG?+#KqVm(0`adg(z%%v0xkI0PjXJb@-@Bt*U~XqB+tM1s
zM;%Yq(P%_3to>uIn=<<wQtGZr68jd;Gc*06_am0G(?m#=uQw9ijuc*fYd>@c!%$x2
z{kmJtRWN*theP!?=@yw{u?af0KKKsTLrj#F*Y5UmfOv+P*2ipAmbvd~Nx(J6Pna<t
z4Zb&7Tklxr!$<uZotFvxLKX|)i#pZy1mE_Yi|<9$Li1uMT2L_rqq0mEYl1i*<Vxn}
zzTzSmpORvYP#2%It*IaRIkC5YX;;M`@r1#GV6Zosl^*Rc5uaRH$C?yM+QV`lfsNHV
zVF!-C&7+pFY}C1DS4~p#!bgr>zcBfew;(EZt@;PpJ%v3X?U+2#USene0lW2hw%3<y
zS)7lVEw=s&Pycr;lil_I3Cp~5ok?(q7UsvHuVOFt(RT0aC2D73HD!HLmTRoZ9S)c>
zc)JHC3hiBc`jee`of-N>Lq7lv?OPHVLyOi&_7UTzlb<~x3YVRV?$g-pGl!Me!oxMy
zp<z232han_p)1yu&@v=@IUHU@#d~t-7}dKx0||2H)*eS$3H&qtiKj@e@>sf+xu#4v
zInuSb(>!5H=Z2cue-;uqPB_=HSYoUzCg6uFBeXvcI$9e^f}%bwM-$9k+j>J)aJ-83
z2ako~vilu&++Dn%-mU*hGq8X1*z4PuB~J59mc$`L`z&G_6wMC#Y>h}Sf)41$(-V4B
ze=p$TYYs;z-<<DZ$26J{-M-W${&f2?yj9W;MA$5V_<hU@65btUk;-IeTk%#eG{C~B
zgte`ST?aBc=%KB`bhSkNHu(i#C!=>_P~qbEj=r(XJg8wvKqXV(JLJh@L<a7L+15&B
z%~)LPU^VxbLg$#yg8P-#`7TQRbNb44?r$QRqF?+Jq}u4Tx0{s88R6%<06{{UsNqyD
zQ?;Y8Ld@o=9R)by0uOImL>5i<I~HN@oIj*(JL_W4PWnj=)I9{_SHPxGCIlt0$GD3p
z9dUEY!o-sQlzG+0>+OU2OQw&uZY?&~0khSAeUL-ZWfkP6*@m4p+C|B|1Y4}@8h_ei
z0k~0IYXX~uZuBZMkg=ua%i~K4Ma}^|z2x3J3r-uc={9u?gM>wV{*L&V+oRZ279qN0
zh00|=?rW()<`^?zN=}w6V*Wtl>n{v)O&1+Q03o%5A`lt}7-y~0U`*PO=PNC>e+}fw
zm|TKA1|`tgd`W(l-{2@kXLYlACSlyP8Vs2a%kn5}at(t-28=Zi>K&x?9QE?6v<@0@
z{wuC+>c!kRj=ul`88frtlZe5kvfZ^bMq-fuojCqJWl`+iL+JF5&8urp8w&glKdSil
zt-bkeea{^Mc-}-r&FnGg8W^l#9-lF>I|7si#<OiX6pudltF#)hEpi+29?|d7HdK}<
zKi3TO+eUyw=xqc%er9sXHpt0WUrkTRR^M0X<dG)!()2+FQL);eT<Z4oD`!xbG}w1q
z?U)j5J{?Y<AX$UySgfT5&x@}V>rUkLny{$e!`x!i+TAj^(()X^Ny1FHny8CG8;bo5
zG0*v3q5Xm3JimLwKu@owfO~`^h`khl>*aIuE5VlFEh5#mTtTC(l|Rtr{_WtD<ZRTP
z<zPs~Qv-#=$(#!of<O|r*)Fkc(Y213QO&T{MQIaKq$r_Xti@mZ<QOHR|79Wfuq!z$
zf`^DYU+uIzuZ@|^MI{Jtpn7);Xm)#PZdzOUct5Amq0OJWfUX$Z%}v;54Bf?bateNy
z1wdw2PDUzd>fI*FHT+T9{@ELt&bc_|_HqX^S34p`Z-Y(0PB7tF2>io@M^*m0u2dtn
z8cM;8Y6$4>+|+3{`5tvA*n8S7b6V}`^QvArZ|2ms&j)PF8H-*;Q~*|=nG51UQ4ra|
zHzuEe*qlI{stzaZ5AKxVV(J1VRO61<0JZbD8Z3^l&rmxnu~2)fd~L~p*A{sGlohp^
zkNBAV<lZK#16ab}(!=?+7jko4^gA=gW9e#z&pE=ZlGK_oD^byz<TxAQhJB?+L3xk0
z{0@@T6QCzsP3>c8o-*QcJS~z@OrvZ{l>g(NH1^BCS={4zPChA<{cw8G9?_zvi^svC
z`|9DM*&Cgv4wvMgakOgMSbozR7Qd1n5F(=Sj9;11NShoPRq}Dq+2$ueV_KzLR&oyo
zgMqPu*B!2jxRX|rCp(a_J#hX`uqp8j6Ig*|8+6wOr$Nfha`|Z2vQ8scx`?A^GGv~B
z%?Z>Rv;r{h<THn>9}>p`A6g03u2TIvrSCornKue0gGsi9<)l1?L$x}u6Z7IyVmPGc
zT?q7*Fh&9@!(^4oWy_qF**&7!*6QeonyHscu0ZNVx!bA9of2K>YN6LVv1uG(=Hncj
zTY>gkNEH+<p2Wef!68mx8h9qp?`~x8a=c3mby#8X-%xxzjK?=h{!crfx0qn_2+RRS
zy#ZtRw8u9Sc!aaxgWafU^b@fN+O2#;tn5n+?evfy8)S;k0wo%1c{cvW{snKH)P4<U
z?kjk4yLPv?x2qk27LLvB;WmK8mGlX+*k^f0)K7&mP=^TknsYv}YjKO3a2S`0dteEb
zw_N3~t_)Q;&BZ^=nuu_?H%`}zU#C-knMhC_NeqI%u?UR@Jfgm><C#-~`Z2q!SEO`G
zo;StrI_*XlZZC~g+%!+%F-P9M=<bE6R5?{u>olP#D1`f_CGI#WGP1R0TR!o8MaM^P
zZ#SVc<ejwZL?qP`{?@CZF}CP^Y4+bR)IJ{QsI>{XZ*T`Xx_)g<a-@>oSU;cIZs?%v
zRg&nR2q6HE&Ua=yRyM>d4SPgWPuQ=Y3T@xRj&;3(uCQVRYYhZ9!_V>fZrqm}cWqa@
zzhdVSs|_l@d%pX{msxHmTWeQKddW;kW3U;v6NA00zM<eVuxbUkZ|BQ5zBmrH6XYB)
z*PuS(7d!w%FMh}g8+5;XC8UstmCr|9sl>4G?vPvf!f0%o;8>YbVWI0xaxIT7_%FF`
zKF0Q`$St$k(FV~Obg+cb<mOg46yZ8XuTO_folBfG6mo)Ot5wR-wPCQKcZn31f7Z#l
z6wpw%g^wi&5!t-BdC2kn+<vkW+h-CCPw&?K9Q_2qh$!wpn@rUPmj@bid@DC0RElm<
z*fwDYVb>1HQ(Mvz$seKvrP)U^Vq-#I-uS_uYMX^jq{hbVoD<3sLo-M(=!BZS$(U;r
zp&E;tNw)ZQ%`-BWCO!!wSTg&Z)9I8+T~`%Tk1gb4Rhw7xp@`}^r*?)5lVY80d6IeS
z&Rw_3o=-3N*>zThw!aANU0S(VGsDM?&=|W}E-0b2A^rG1$?J`V=ViOQZvu%)<3AAE
zT5vb}WuEmgZV+K)b&FBi@<dI|II<L_Kdc!3@7K+w;fEzxMXy(Ftles4ItC3MM=B)t
zJ(=dbqPwNmvrbSi`1!KC^fP^~^Jnk2b_O}k72Z!aG)SduUR~u%U$7tTYoLm+QZ~<7
zF^Ee$6Hp7IZLsT*!t|R-$EVF<Rl7&dU{Gv~wU1s-;#Q4U#b?hS>;<e&RH^&1M43+N
zML(o`wpMdd(wvh{#r%S|lmEJ2ngj(l)Xx!z;~@PnL@OY>X3W)qDOHNPcoim?BGiRV
zLD4K6W!koqh-dJM*&$W!{<L1`oS?f7F<1CeZp<_cKfGW>B0&4sT}7Z(j?Je7LH6q9
zog0HdWqvEyn}d0Iu%1*Ty1QtvB#v6G)4yv`<d4-JY)X`pEAf$5#s{Ahn*X>kdQ{9O
zW7PC2LS?Xry1OoR`&xOo@q_+go}!It)C@X(a7o`0KBONq*Or*PGXNwwobn|dgWBf5
zN8YByZ1m4&PoT=4O>I8d!e0&Ls~u&tBY4dJ3*gD6f{yvvzJP1lg>|#uFVut2cu)2`
zEZ<x+aoP%=bkfF^tu4hYdKll&KL%Ww?))lH08V5k1HimOkS2P3W;*7x#$GD7!(INY
zFReL|lV4#`%mWS6$tbD@b>j6``(4GJL0pW5pQutH(1eRN97&pW-RUu&73j0f549K7
z-_gYR;_A3Zs%9U|b-1DORtELmy#(0|AJ1$yS#CPzI9N(d^_RCLAlw?v`}>v6c@4)Q
z-05FNm0T^fwOx`2+U*+E!Xa&!^F!M?v7y&c?OPj)X8WYnf1ujP0EDVYPe;jE%m+Dr
z)q8WNgqOE;_A0~iYY;v^Qs9*O>GaQ%m_Q$F^#RyfeUY`z%XL4}aZ!u0UdNb5$M7g5
z4pTC_w}aU;wTaKj$apy-Lh`kNSTJbJe9Lyyd3{QJRC%PTR%ne7j7kRC_-zMQ2kcM{
zkh&$#OwN-eK0j7Vi<l$X5_fh-ld{_*nvd%hsm1ShzW1y@Tff9(`H!oI*jktvTr6>!
zQyA2RhqRHA&#38eIWKs}@xJg+^=_5ORE>36==tz~Y=V#b=FhT+08$nv0`^?~azsv2
zgyR9FMlQW=Mj69SANY&fhd^v%ycNq?<V`Y8K!1C>PM?G=OUJ0CAv+vV>9Yw8_G|w9
z7t%FA{UhNWWM;n50aLxX_pQ(gJ2@xBS#!<q{>9R*&7v`Ei*hseli_QKXDpBp*1_?0
z1#j%O1+N87Lc0DlmN-vfyFJmfki5_iM}1F=2KXJY>n4j(fsALiU946PEfvmCY>(vO
zGF2e|ejkXlb1~JU)_|GhXh?{L=F%mM`%3uZ&qEI}6obrcn=vQwjK`|?=wLvSZ-n*N
zvRncRaOT*Kn{0yZuJH>#Nv(xW-7zlLs!x~Ra;+{^HZMwSPK-~Ulc7J$)!CBX?X;A^
zRG;s>v{dD&cz#oe8PDR<9qcJz(*7#3dA8+Z;oZ$dg=^KE!Nke--<Kk>H}ilVzW^;r
zs9r;>Gm7=xkjT!S=^B{qsd<5Dtw6|P6IQy{d6-V%Yu^4+1|VDy6@g2xu+S|~jw(Xt
zW;0z4gzNEA7fB6qn}~Ii&80{OsRP`Hh?j$M>XYTMxU(??qWYOM#vw@=<@Vterm8;6
zS^r6;QAekVlsSP1)T-G`X+dlwsRMiqUA-51x>+WsCs(@H3|l+mm3SsBYh~iz=+n<l
zNQdxAm#`WB568s?$1OY3(8QYL_~nL&+1O-Ji9-ODx8Hi2xb5I6Cuz5+D}9mdJARyj
ze~>ZkU6gKuSzAb<-@4a|lV*Q2LE~hEjO6QnNv#2kD{oin9=VU9`7tk5?znPAnI--M
zc+!-C_S|j*mw2a|rDs9RfZ;winmh;Y{`rgM!=gSsA@<+?navX$RY-rtxenUy1gor+
z4TSsKWAmQRV_bavVqBnp36{|3_+HTli}q8+1iQL_9B#Wzz%&{yuIpK@|48L7@!l@c
zFC7$l`ZOfp_W_llRR07@{d9;7LJ5djCRMQMr%s65iKUNkex^=%r%!)sB!y{r*eiWv
zGlGIx2%~Oz@!xn5^Bs^2@wzM0RThSP$A00GgnmiDT<us_aouXqsbVKyw<zA~g>;ZO
z+(D_ZM0~+=)Mft=07hz;|7<PK<$Q;QYqDLtgTclpfu2(`m|B^CLRriJ@VD=o7mFtG
z9-5nw&b~%o8j_{`V_cWNF=$)9t0F4VPQ8y^G<bMT$suRkLV5266}*1;*h`6qSQG@7
z-*PSTd?69JN}xO>ypS`PlkAL_=>#nqem;Vg&px6`d~&YZG5h#4NpGatq@YHs{c83S
zENnmuzpD@_V*hb09p(sREx0fL8G7PZI?9Eg><oKHjBCD5<to=UsPJY25=A_qcLBz5
z(i>D+QsViJb#YXb6gHE59wu@LW{smhKoFee-qmr@D6)Mt3t*ukL!o?ve?cz;1%S*S
zI@>;_yI?kFD26?zFBDPS8cQ&I-G^ZaE#<!wmci~%@gdU48|gcS@sV#(5;NZ#N}6pS
z57CwS9%$UxACl4`DlW$tIv6TlTP-I0eC{~i-k9f-ut!nxGksC@S&)sg3lksC5?%bD
zLdgjzb~dy)l7h1Tug{BV06w_e8M0M(-&fttgH2&mCDuRbNS3_#vXn7_g)Yq8Y8qpa
zwiyC))%!T+en8J!+}NB@@mR6uI4#+!lpeCt(eq92=!xc6&R_pKu`onQuCKB#>x-q6
zBXs1)J=@rQq}h%=OZ3257ulIpR|J<4W>1*+8Ky@Ya=TVdWr}TzRP)3<-tZ>a<tsZL
z+J|odL^!!V*(^Z3XW9Z-NrD23A*hUq>f0|6d#Sl0Gi*D)hl#R%`k?o}AJ%B`+7Xdm
z&q6NFOm*6cWA?7BNv)g*SwC~6t^zl1d8Y8mzmtE$97UdEb>)(})J)YA-jjI7XZBI+
z51bD3`1maEoTtsbVq8KCdTvi!z7Vg^cjFZ*u61lRd}cFk!IY~HSPBWdl>omHa261!
zB8XEl0ymb*y;VL;VPjDtz?fW$Wop^eexOE=uw#wDwB66oi_|Q4DgN3zdA?lo&yqy?
zYkhF``HJsvLmQRL7m{7L>?Ge4Mj_^MIPASzS=WJU`_tBOowo;;n2JnR#atk9)z#9I
z$sKH9AjTw;lmxYZ&K|vQX7oV$?&qw0gd#%c+t_?W{xyd`pLl<cM}S{_Bew7AH9r&l
z6MeCEa>7QKulf0;O^dGikICO@|H%sfil>lN?~a_Z#5Ff-rJ>$l>}@!1vPbB}6lTT2
z?YPp<*;Su<qJ2+m*KB$E>dJ#V)E;8r%XNaJzMi#*7Y9s{NuXo<Ct{bbnFzNYm;hQ9
z3^+qPcC5p3tn6bzg~DfR^zjiHCK*V>;n8%S5|H9(4`TsMiqNJheN{s+i91FTx1ZF!
z<3P`}&;(4i3xiC(K3#8VM>ab#ar6V_F6EqoO!(gxNaU{tdeA(!D3ykv`YsXqwS67e
zT9z?kpG7deYP10z#?o_g2cEvaz8S01yL+0#&lsI;))!6B7v5`|_MNtV<-5yr0GVaL
z)&o7&>Z7*Mi$j^$B$YM#?{XxmTX7fNRf=${0v(!0f!0FcbE`3kPk#<(=h1n)^7L9$
z_xqH5hl^t~&3r`#V97xTlSrJk`y(9%i47}Y{`UEVC{oZ#(aYk|QD8L9R5k%0eI1m@
z!}AQq&k6=+%meMBS{vH2yHdr_71}}bS+rOSm0!4B(uTgYQtYv!LSmiv=ol!<{q$nu
zmd#}1#YR|!G3bVknKsvxSgnWozq>bfGSxOjQOGIDMo-0+q*Y#1pR@NRPwqU)Cm3oI
z8`?h^^@iz<Mt!QbbuE>Lv(u!9MAkl(m<O4jDKk7F!gT|?KJ!7u(rU9pduT)RDH&R)
zTflJ;D7?rV|Io1{l{vD({AzILw76z#Tl49kA^2>}PJOY9BhMZiz!mKwa}Vu*lu`MH
z^Op74KW^|{MBXQ8-+X1LI!q%aubdYO(c6xJLEA06<y|`l+XW8wRru4j4~<F5X|>M>
z4NCt$qX$TgGXI%e|H9Sov@D87zCw#<*t^Bm`{Tapm><34_kZomRK*!Mu-|&NyWK8(
zqx+Iy2<u1Ei?TwWB)X;wba~xAbh)waF#wB<xAu^u;l(c}8Pe*{d2bhJ_4Zr{xe?pf
zeNTlIvN;Egw9YaXGArq}nTcOL^N}?Cjpbpc*i6UA?+>Q<_6*#+eK=wviju%$2R)hB
zsOLU+J(LW@3_W)fUYVia<RwKiiYn-By)wmx06&{t7IQ$Fr#)LL39WCRz`)L9*N-tW
z(4xwHt+WR!nhfAs5nch@c_l?>(WP{!e)<uNztjdST5DiZ$K!pN&^lW+CAQAIam$&P
zME90~kqtSq`8=^UH}lQ@(Ap=Rq8%;0T{LJ78udpZ@$}}I=;*2m+uvc_DM4g=)}H~|
z?bR}zGBg&Qyb#<{pz?V?Ac7lc*vISs>wl!7zsCk_Hve1m%BcKbnpc)Xy4kG|by+QE
zeW8;SYKB4Z+|E>og@qfCxgl5p(7J*s17i=|?5K^6j{VsjR|y!ioW9^%T+ezYPptKT
zf{|C;&MrpN-bK*12+guAY%$k!&!i+#Aq2;PYs*Zn?kM%isdq_cIAE{de97-1Fm0m8
z*|U$G@N703u+p(iwW-c+^pc^rL}eOCM0kvSn(rE*ilh{=XmGtXG~LN-i>qJaLeOk6
zhK6?CaxGl)sJ|>Ed?%QO2^TlFmUiH0_5JCTzC`Q+`zsLq!Wi<i$I7t73&gQk!0}vU
z-u?L?A5`k(w!iO~g_&!o=cuGIutozo#G~WH!z?b-K2oYE$fm3o>{gxcw}ZXg%>r}j
zn%9r<;aR?U24sCdo3eysP3&6!fdv66vI9@Sl}YgZ_AZT9NCWZ9c?aSc!(5`{G-pGj
zMyVYhW?r`S0JDCdqhVPXnfH<O9hiu*l+j`RI4(~P(*UxYrbos6D)oh~3WEWe-LfMJ
za*B+NCT)9f16-&wU>+-$4IdcVkw@gFTyU1wZa!3EgVs?LUC)&JEa$$7vL-)^_fVR8
zQ8O0Ed!?|5j&6m6CpOqLXGB^MjAIGsrom60Wwbn*<Z&=hl=@dOA3j<xihg+LGsB7~
z4k&uxNubq~>Q~0$zjH_HOHsbbP2%W2p8}a7jcn`MTdBjoh5-`eW5K_^7rjh;DkQyk
zcB;pFoo)nY9ATHpqcfdK|F;}tU)A-$8VC=8>E)e`M|n1|D|+wHfPgOWNmvj6%aUno
zsN%(RjUh+TdzeSF_@%3$C-BwjOaZ#NX_wVDVuZFiF%)~&-p%_9*G4vZqQX@xCO(}a
zX1MDRcfTGB(}aC6XP9ZANgO)$ifMT<1pQSHKZweHXb&u{1ui^(#CEiDROpvKME(E-
zf2G~_Kwc{Cr}YOfz8bd}&B2Wc8NrKM!yus3)cMf<+Ny8^VS1u!Yclo;4kU%cK}1?l
zTe~CMFvqr6%ms8ZDm)RPygJ})rJk04>i_*S*k_M11i(e_RCS`)tC{&=+1AL0TIyHq
zrIB!d2!$iS&j;!XkEl$!AttVOb3n3QIY6_^Ilg2{`r`)|%hO`;jRKutW`M?s0I5|F
zrjH+L!fn#Xv-noANOBbPiQZu}b6WW9*l4ibTZ^J^kQJLh*I&*C*nl*Gk&O8f@gY5G
zuDP#-i-Gbe)Q?<S`YyGG4@Kw})6Js+d6hQ^vvvj^Q$iI|B#&8%g=l<UmD3WcP`+?u
zW*y|2x((kY0ZhO`WB#{<V10kQ|2Gix>#m?Ug>M?~o_{4qXWcvi*vV}9F6J!(h=L&0
zDV86CH3p95tYofgs27}#r<-G7zO}3T&-V5(BTzTZsdyQ$y-&OF5$6h6Z#n*u%~S3`
z22RQo$Il(`-MKmu5SDiS2G!XcuZ-TlWj}H62-Vxhm;86N4xI?H?KlXmv=PfZxg(2C
z-e`E0l{NkL4BBA5tTX~8KvTu)f?2?cZEW#7PA9a--4%EyC^PD)pVu7ixB&hVtsyN{
zS%$5!%v}=~VTgY^C2@|!mu0%VX5y+4@>(v_2#iu+<ML38WhzEGN<+=nXu!>ti7Vq6
zccM{sghGFL?Q9Smevl){ItPEvOlG)sG4f>1BGOQf8p^U&LT_{%WhOCSd~i$)jc7QR
zm$I{XW=T^1hs>;*PJ^EKX)DG)X|L6blQaV|8<X=`++zK=jmPV<S$CV8@SFj=O2=@K
zahg~|v$yD!khLyDDrn%##vsiK&dZTW$2-ILch-VV;|HyW$k1s4>5grN9j}aB1*bEe
zy?gnsvdqj|$2t{o@ozf1DWJZ(f?N$gwu0$y$IkYo_+?FRy~Zqj5>2BKi_)XNe#xRJ
z-`D&y1CQE`C!c7i*0&T@vTH@0?OYke+h!E6zG$oWyCi^QXAO+|M%h`!_2PqrG}mc(
zUmLZZ?n^J+ZVUGM+Q|I?H$77EV60th&cPH!*`+KsT)=U>T`m=(VZ6pLWy~=)c!SDl
zWan}to1xKa67{nW67$uYA3y1&=Xz$2ze6zKx0Pt1%}q^TT}Z!GI7?b33<Ya7Bq;h)
zxc9~&rppoe3#A*ZOU&{=_=q1b=Jm-QNtYuHs?|Z=*toAruqjz4nSAKChkI{p@thZX
zagp~wZfBTOt<u*To;$aEuGj8%lj$XSp+{8E-E)43I}@@(7|k2DqUBm{gDjt8JeO;5
zL0N;X9||S<gVip*7@xK}U8X=v&x5^MB4NF$Hw1fAnE&OYaIy}K7>D;K=VD`rhmR1a
zUuSi=tPeij8XakK>Y=R>YD5o9<W$GLZa-u3;N`)Mm(vcM86(U^8%*UAYBGY$ETv;g
zM@1r%YG_+7oWy6bm*4hY536#)vez1NLhVT5^AzVwC0^R11s@NZ-#K1uXn$Da)zzve
z{As)~d<&`(_^?5$`X9?>ZsVz8=9?0x6LnkM^6#1VH<PCD%&xc0sHa2bCqCLwe|`w}
z|LH?$^fWpgZfp;|+sSOI$@`>%o?R!HEMlGJR3Xh|k@{ECGw}gCOYReInjJX1>~cCU
zjJk$V3_mOW5*OmpKyey4X5GElpRIwcGMN7crGiez;$gURNweAQCcUBSCQIvzU*U48
zG9N|c9NJ^_a>U^>S5~#OS>5T}50|`ZIQ|ClF;<_&diHp6!q@v=FD5rAarX}3BAM6u
z#O4j3+^d3~xs??v-lqiR-{CxWj_)2O;v>XgR(=WmlkuQq%p41K)O{nrNwJd1hx$54
z;@7%O1`W9PpGR}?8#pVblXl-4ve=~3{nE)>FNbR#@p9D<b{jUDrO8wlh;S+nz!?_G
zG+s^&ycgwEm~Fzt^6Dh>HqYaU_>r1w&Cmbq`D;;oDL`Ipn4H9*^>n~mA}6z~ceQ&&
zzyF@h#RC6DPIkX4apw`G!-+d}i#qGBg4mj@$1^xdZ5D~+K6ce2nliXjw|S!(@EisB
z^$4$FkB0LOY$sBW5f>6|J0_D@H=DR>G?_eu;p}C~&zJUyW$Q=$*k9Cl=-uWE_q==Z
z4Yq?O_)eT~e`8hh;tYlQw9%&0`?Nm~R8zew_iH`Dk{fz*NFV(Z!~Td?ri%&Y?Avly
za`FQ=$_IM$BRsgoHWStYW)u0wQ(QedbNz&TOo%54L?4x`4Zhf0Yw8UivwZ#tdHEkV
zvqnyuU6POXo#0cCd0S%;U%rs~TorG;$z*7Y6mg6}Wqj6gZE+w8a;5T-GTJ>`d^UNW
zePkZ3t3+NvgVnzlJP8YUynGk2g|Y(8!t3p|oU#y^zim~ie{9vGf~S*PzAQ#wQoj8#
zPep&@-j|DDKLqDxWl_j@VCmf!dwriQGEL8qg@*HCYkwSGsav_d8qnkavcPwLO>dES
z?*fZPyDDDyQgZv9ZEju$XtlxSrarS(?~tJt*lGJ8_VyaylqORet;@Gtw;1{IW#z46
zNDY<WCC95foOd+-+*Xqs6L~9c3nS2%tcPt>w`^3%ZS5h>J0#kf>YwXZ(B7ew5rKZ+
z-ADd>4CT+s|A(?KkB7SL{;yP|tR>k)i;^VSw?Y&NS+fnvZtOc_lC_v|D@E2K`!dMB
zjU`L6W*H2|B)c&q%ZzROKDev<?z!*h`TqXx6|U?0oa>zPexLU_m(q<fgrl7@KI`RR
zh9i;UuZI3m{x?Ivroi3C4mkTS(Wlnt`rHMX{Jt|cVn`!cgwNJWpWLJM<D-RkJD26p
z<oda)Q#Qkpx22I^{a1*@aBvu()E%)Z$$<xVC5GveK2{+Y74QQtW=PE6?C1WT{am=<
z)E3tuy}`hOmG$sVUTX7Cn1xBma{iBRjhXAu0VYipa3ZR|Kd*r3HoElHY+cdKdZGtg
z(Fs7ru?};t+7+fhb+}fFkgVi7URK(i0HTY5l9!WPiUEt@-m?hz^8+9wA~dKMxkI%L
zt$os~tV@mCYWVB5TiXkJF4jI>XT;89|0rY5fW>4)W=`7<yG}r9GY(-(P0o-R8KRi8
zJXB-f(Ob|03%60B_I01DjG>lY4+mZ)2m1Wqv$RRltq#{f*M?u|ueP~n%K6tZZ75}4
zdaK7FWva%!oxQX*<3D1Il=hPbLWRpq2M_n$w7AX4iBz&@kML(7<L`Y{<xW_cg<kY}
z@Lo*b^-)=4$SW86l{w}o>0?v<)KkSe?dG`@R=CF(h;{$NfY|u9+(*imHC=-crw*tt
zLa}#Gb;dRWKa{fn>0le-vviTE=c>WH_mhr{p&gM9GS5CheVApi+c9VUW;yqEE$4H+
zR;quh(i*1(2gh1AYSC$s;z!K;m-{2wL(qG3W7<KQ5Qx8>?mw_&ca7o^YPil_aItAf
zZX3Ba#6o7YklOP{*%e6UjE*dQv5+#bwD)Odaz%@m$x{WSn&0!b@TdQ99%r+l3vZ89
z3GqUJU&7FH?O**<vsf$vC1k!XR``9=Dz6Sj>(fyZfSZ1ixI<ti&m(sL_on%J|8o?!
z1v-wyH10k&Bp4fMKp*BQO>VFAvLodxx6_*cYBQz#HsjR(R;+peArKIS#K;v;BtwRo
zCuaCVo4P&9feX!};s}J3f4OBLjAY5FT*tcXRLb0Oy;Cx3#jH%#I~h>Hr0^eJMeU<Q
z^=8I#@y$<1T!Ty=w+(35|8)%>f9$4fF4qpt%v0Xy>M6BL4XBs`JT=XKF;w847<dy}
zEQL%u$UpA>)MOQea_e@uy{yu-Os_e$e+bVWt`93WCl6aW7wL@Q#r6XwaIfF{>=XrP
zbGhfn1onjY&M0F%Y^qLD8y<8{(MlBl5j^*Hdx?vDTD^wC!c|41#7&knA8|cv+BSap
zBFD+dK9&@>^M8q3VzpQ*=qtnU3y;>9ecLtb?jK<9s$t_|?7F4+Mtv`IT*y9*Gem27
zX><P7B;Tm-ndB|{flb($mE4NWJDJ@R-wWXTYv3S{>FGWno0cR@FiR~>eOCY4>WWsI
zs~ApS%M$%k$e1OpIQ#1s^CvcfL{v(*dX%or+A7Zm@_!WlbOvZ86|%tkNfW*h->R=K
z=$6i!E$Q>L`F-ighnGZ$g%u_49S0DZR23CX-VY0yg~&%sJh;9kkn|vE5_6>`5;PJF
zALx$-NmBH}z@7f9MqsT?ZMJ@0jtSXN#kmujmA}H93X0&_mf~wZ(3|HwDba4EBT&jk
zEwhE2nW0D146HZ`G`I0~J=c;`H@*Rq4hg%Sycc=S^Q72c-1QG>Kx+FJCk2l_0o94!
zociqR1huFr$EcNPg8PNO_={x;$Mnree~T0h<M%9fx_4b^l1FUJyQB6Sw^j7=$Y_jo
zL?2qKEov|7u0B#fMC>zYRsiW`5hH4NEsZbOsa;s^!Gu1UKO;EHO4gMwr0F!Md@hmr
zeK#E|oG$!IFu4~etSaqr%^z^YXi(;AW_C6snx=mtbWUUQLF)o^G|Eczd)@Uy4h9R#
zy_>J1s5o^0x6t%n5y-(Bc_te`BCzF1B=R^7QSjMt?LzIk^-kwyd$2KVIQw?2ti<&%
zdL=q7CvF@m?t7z}oy!Egr;z{pIyUy!rJGAB5`3)l)tw67c4G2|IhyqS4u@WYY2H=2
zbG!80Wr1Wyscu|V44@7LF42qdl#1h;MrUzV;w~4uZmmZgat5Wp{E>M$99&tgk~bEn
zf>+Zf%taoqQr7O9&+T{*4?o;wc{5==?jCRy`Qj_uUf&!8WntfQ=8%+x4w+Ao{BRDk
zq{ADhs`A9JqVRwHUJrN_xKqrc9$+1p`lQ<3{iMpIPnAG=wyKu4HKf+$hC(3qYNX8=
zPUXq36`J5ap*ekbTA~N=C2KEbE1W%b6C73G*xJ^elI%JnU%YV4toKVbp>!k-Oto5U
zwj^E!V<DG5N^*@bdwlECoM%wb_~7SreT(dHdMW4Nl7m5_(a$!oC;rR;7}@5Olnxp4
zLe#mOld9w=GED~!D?^YL@obG)eD(xoZWPj%)k2sgbA~pk|IWB0j%NII!?Ca4)kfJs
zXt@)$7uFONqjA5bSbxHzOHAa~9hd4010&zeuUD3pIqF*+ty*5JJuaM~UQd@i8gdgI
zmnk}T#ywXu)VC_Wj|KCQ2I{I&o_SCJXFOx?czZkLZjaWr$fO|el8(V5{xC4uuFyW6
zV-7B;05O-6R2Zcy7ER4^@gbcNUZ4>*FJ)!053NUMUr_A46okC+0W3B!dU8nA<*WPz
zWVitANhz9_*SH{Wg>loqQOaYQQ1xNdYiHy7H#)C~M}A}L?$+039Sc%v>}*wXds-K_
zoogerUUgUx^}sarq~ciFt~pk3mbYL0;n1qfDNOjON|TgL;>`*q<OiA7Y<WX!-UAcG
z{U33QZhZ?KxPvJO%#=${e+rK{>~O8oRP{EYs<q0!+DrBr5KJqh_rS^}1_leM-?GFP
zE-cgxG!IpRk^QRprg%ZQXR}&7T9W+2iwO}D!r?+C);zBT1zO^3d<jn5Whuj%=6!{8
z?29;u2UdQ(A;^l@(KCwHdcv;-48p!YKWab3A#YW4@|!`g2&I_VTfgR0r}S>5erOSI
zd2EguycAnwEl?W#)H+KD4vV9fpbJMwObom-OOiy&#)$#buwyF##$sM250y60aHA8M
zR?8@?s;XIdmHybPj!PLiJ&#sA(X12O)Aw(6K52<iyrmPmRLQX#uA*@xl~Juqo~rMD
zAqKO#*_vEP|5-G%>%-|u&0b?G%1aCVS@R~BNvA+7D;<kx^__!}8+Sn5TgEzu+>$FJ
zYsDv^Osg~N>pP`No0lyKY{z_WE5(0Tj{mqk3pl@?v~znY-?K12^xeP1i5JnIHNvc0
zA6(uVCEzB-w^nqWldn5^9802c_}FWlSB@VWT!r`&!D3zS96j$OF2PQb$4p@0#o5?V
zbi1jR+Wd$`aLpQd>zURcQp4T?_cj-<b)^n`r!lRl#qe&y;&i<i4xdtYg`MFP;#jRx
zu#TIrKAjHX9FO&8lb^|TZ7@-&KX(fDxiE>21aTUk4#?cy<vHO%kQD@^<-!X^8_X}g
z)JuNuJeRTAE4if;xxC|iFp`YddpoesL;-@a(ijojWbYYP-jqfFsEEN><zGY4-HH>z
zVIfxl&&f2dvYD=awIQ{Ge@TwcGo{qFa8T(;%Pc#2Ds%RYr%0+i%!THI(((Xvj_5!u
zrhAb#H|vtZ(#PtVOYdqLFkg?lg+!RcT=V$**Uqz&FQ+bRh^L;IWOCO}O@FiK99rW%
zu(c}Q%)X93`LVR5KUU2A1%K=PZ=0qhDf&HB>ZY5?#<Ij#F9J=Sjl6Vx%6yV8`Pt!`
zwdk&?;kss5D{AW!rGko`!DaoW?Hax~y~|0-|EH}9q(eMb+)B@g#@;HZ6+D>^xvI}u
zfI@)bnnE28V%Z0@nETDt3@M+EUZ!$rt|qh&ievGamn`|%GUMT2`;D7@Z<x;Uq5LBW
zda!ny{L=J?odR}B1<HA|=;!Gr?wPU3!*(9Pq<9K0VaD~|(<vTcw$dY29cRn4+6`L7
zqws-PgxKExQf{lSvI{t=(5#jyQz##)&If>*9l~|y`lT)R(k`$cy}Ka(IAwK|$P-?>
zgZ!3!_BlgD@$bhkDklDQpM1AtcjWGQDRvBBzqY)CK2O>i3Tx&0EuufT3PcEQ)ht4p
z{rzKb4!;x2s#al}b}<4C+1Z;PA^YyK7!)Nr!Dcf&UC}{>bEwnyluDE;=FoZayyIPK
zT(xrpCPk7dWjFwz`5^ar_Sr#^ewS*3XHic}($&8BTXq2wb6$pO3#U4l8ZnA+p>kO*
ze+wyj-vRS<pTs(1JpmQJhr%5OtWCBVSa5cfRa3k^2Gg15luOK!Z_bb<RdoH1yCbCS
zD61(Od7-J|*n%Yx(@{NHrn>T_ve=e+tmDIn58Hj|f&6qo>__uxllZrG@&+xWs(0BI
z>3{WjO<MSycvp^@k?(($<9!naW=2r~EWPO;7xY>(&2^+8$qI83j_(PceQtf84|&}Z
zXA_p0i+Kh|BfM=TAG_a+bdLBig||+vVeK)L`Xn2=$5Vbb5!Sn8V8(t@rr)*GNQ4#T
zo|H)tqpX-Xu5kl-(C{g@+dxcEq%dmQ*pPA2u>OnaVTD30{&m~a!;yu<l(vayB`LM$
zDX4I{3h#Vmx`}4hqK%l2SFN6*UmwcvVMA27%(~#qMo>#NKDR!bOJe?@awHj+QDk+I
zypqhkAZ$oCJEExAczZ9&WlReb$0B6e!Wq{?eb*XkeLKcc-sPQ4B{EZ7n+#FErI~-;
z@w5ieWNp!dEz)LHx6{sxOk9&zIDu5EB;C^!#wf6*10;NN`b3XJAc)?<A|8~}t4S$P
zt-7UFwU8V=57;dhrr*+i4v>*H(N+DYKE0!V8lR*2jaoMRwP!3^!7wKZk?uQYR&0|H
z$PSElW&XexNQKM%02gTlm2f&K67xNBAKtj+qlW#|KUjnwbR-H4>W7MG@<Mofr9+kR
zv~Cd}kW$u=u~D4<RM3~U1DF<?iMH<da60#ve2WC^F9zug@T6U;(<q&Yik|IsX>pEB
zHLX*P-6-bHjBj@w_3+Tz+%0KhIJ5v0u<IU-_B|ipZ6Gg5RbFn6I9!?$E(<wV3MRSV
z^R;?I$MfJ{G7o0*<<H26a52zW;3og)rfr98m~9R`YOU&S;$0oy7N)aua(W}4jhRN7
zJrxyeGbmL7pvePY_`TNasH76Ei))&-Fn4K7wrHO%K`{G%2LXwZ?Y1$IH;SNF0iNT?
z9NIZN7x@tDs6EK$aeyWtH4l=D=-nYh!>4(9Sg-zAxmOS}X>-9s@*6=97tS%8bLcVg
z&ZGZK<G%<1m!7nbCLV`W$oV@nOB(3K&#&JXE0x&ncP&xFX@Rv3-6J;He+M(@22jh#
zDy#8;M&Ax6Pn|x4y0tJ<Gst*KMcUVju&|JQ*6O?pL*NN$YK9B^B-sJ4;Fi<6%eV#o
zW^6w&jeDj|Lce6KoPXg-$J(uPaOtwq_enWmTg*)@8Q=)HRrG$*S3|61Ny|R%x1~gz
z8$qZ;9s@_=CH8ppuM&U#+niX0R5vWBwzIE;lNSn9H0-t*X%v400za_a<y{{zl)$Jh
zkQf;{pL1^y$K7rD$m<@$XZ(w_v+yO&$Lb*2-IbG=6hLCL`aCJveQNO81H}=7*ppg+
ztM~b<BgcFMDAYD{%P#WlL%2Y*?IClSV(62vNl|CFtorMI15<R+(3gLQuI_~mm}<1c
z?b$#&Q_U8ocCZm_1i5WkII2P839O;S=ZG%HsNhi~`?{(k^UM9*UxmTB0aPOE__#_6
zz!JK25?k&{)KaNIOh+3OCHK7F$+T?=rd6x>%`UF(E@8)?m6#t)@Qq*C*<Gjs<2>Pb
ztG_o9+wIn0NRcTPEjP?p%Jm$W@_hMnX8yt$C)3ttt<&u%(I**b{=`~<)4j<fvl8Vz
zELocoIe5^iPrGX>$!Xl~Xlp)YASlIppR&8N&2q|$+IPMyqcvG=O78wMly2jHqnns{
zw*<URSyBc%Wh{4yI;(zir@_#3vr%=-!dvdAUY|;J>!2w2U8TOqSF2^Opm@XRw><ac
zdouUuH?@S^!%pg(xm`}C<Wy#2`{7*{{x6vR?_4FSi3&O`ng>6O1Rg@a4LfR5?jGpn
z$8+^IfX3Y}-QA-nd3f49_IK2p)O6PNvX2x2#xnbPcPk;!fC|^YoU2sK)i4@g<1V(o
zOj8kR{TkUyuE}^H&Ged`nYp%;(%>z<{_W)>DV`L!eU|ZO%K7Fj#0??Q|3PL$?5~_q
zcfAz>cw=`Z#d|z}vH^0ICuN1V-{GHFGvf$?-Vnj%@$j_H;-$B0g<A3mKX0z*IWb|=
zFER^I+W`BnID3CTW-w@$zTBmNuHPE2tkuLiGTM>-iB%XT1vIt+*dbrd-G3&RnfbSL
zdaoh3;&)EwfMmjsx<=y<-e8Av=0u?G6VT)LC~<M8Hv$^D?<E-XB=y1ouWP~jcclJV
z@kslsf1*vYFTk1VVxN>TPw9hPll${`wCiL$+5Q_XXxvWFli8)+*kt77%qXip2=gWs
zgGuCvc?a3YEJ?auwBL4#=Ca)#T!;M~Gf$f8b0b!}2UbLscZMT{Yx2!^6Nmp|Ahgg#
zWgQ)+sWLyd9Jm4RlhIp_u^(s&OMz3Y_1U9E-S<z8Xr6NQ2MFD0o8K(*zw`4k*SFl)
zUOC#xZ}(6PP?;JoRMv$!o$)&$LYZ{4{@Wd@_J3IYZw$?EH1g+20;=%6YdF(lT<=Xo
zEP{0jXnbkpnLjKjM>u@p6z0?JZ-oE-JpRXT>;j?^uJcpo5Ld+E8rx!o!H$^p9LgUo
zEB8ca&8J>XZZLF*v~0D<!fI~plYjq!-2cf;*8yT9eM}ENJeHC7hu#q+VmK9IJb%D&
z2d2M05hzY33wA66oM4LE#eaij|5V{oc||}udv0%MN`1e=`l!JKpwq7w_<+UNq=%tC
zCv-&mzpjUceF^?whY<7SF9g>Ymp|sc9U`|=U0@LJGg*!?r#f#njU4-4`z~xf|N9@p
zD%LSg`?*L)tJYk(J{Io?-87V1E8!HjY^O&zX&D&@40HK+nb3Kex>K%&O>^_8F#kLH
zdbW$cjx=Iavwo3L?_a%ZS{~ut44<Q?DtVMtYphW%8m8eS@H`lzzyr~f86DIGJvGXL
zoc>7$Hl{IW;NCKAL#V>QkBotyN$4Fgqq9|$d|&N~Oi%_yw9yozT`-AX<TR?grx>mB
zueSSwahEkX9)k223hX~%8y*B{ocj`lZ0rQ$KF0UkM-}_wUhs;DSS9%NuRqQWM9H_n
zP4*l0JzDq1BoB6_A4p@3byPI~5Gwo)+$|4k`Bo(HwNO!U_U7MR(Lad?R1*lEwid#3
z)9SaJ)r3nIY+H)t?KWGV9oNJRhJdT23T(g}mS}WibIhY511qSACERnZDWvMian|l)
zpJUJ4vyvzo$naglCmVFj-p(-GLU_3Wygbb|ohztN>myU!K4W)29nN20)a>ELnw*-I
zerjE_S9JQVlO~11a8>uvn0?acjfEov{@hzSmSQ3Fwh1SPP7_^^Z_YEPjC)i$=8LX>
z$SzFJqo{|A<~kFXJysLhFstQv&<&ddDOnEpRU%|x|KI`}Z^1Tj0QJ4O${=!-bi>Dd
z_;$R$!PBXWqUK%o_no2FfqI-JUz@1dGk`5i-Hd|z26&xd(3Je+fAC^}T!8W7R$>`<
zkf|Q?p*;6Y{Tr0G&0#ozU^#K5@F&6YM5BP^L%-~@QUBn;N%^;htdrrVQyzgS<z>M7
z_93r(uny#>x`zYv_=r@YjVTS7WBR52Gw7+K(Ot1mzdpBgTRXFzY+oXfE3#4ifi@UB
zafr&^K^f8{AFX%8RJB{&!`Oy2ayuK+J%-F=Rg;pUAGGlc8NRC<4}g;m|H{PW*ktsE
zN#C@|fOUfKRt3#OM3-f?W5#k#Um0%!uc=>5)bi<pGZ-ChIe99u!K2VBZ$3vHe8qQ!
z(SB}L9#RPLPyUgsWtbJz&}}akp!{&ufk#|99j;|)n7D5}v1!86r(a39Sjs^SRCZai
zoy*`YMH#Sp46XmX$ylgVOmsN-*$*d>_ISht4fetYGlv!Fy1ITKA!$?ue=Ay_o4kIC
zhxIye1(v9w3i14@%CF&xPrllmG{U8)`g>BTx#poha4jkk8}oY#cwK~CZwuQ_XGc{;
zIiaZi(FNkReNMnoa$6J=t?#Q{0>}=|`MLpfcA!0?Sfp`8W?o23hKoNa)3Sh7Zi_=A
z|G@2K6mR#*kChMX;x|STb25}WvGzG-rD}P2`OJ=EE&^J5Z0Lk#cwC^nZ?V5PI(-Py
z7~sfhDR$I+tV?}Ag|6!Ez4k?UgO;9r{|320Bv8wB+o%y>l?Nm%>Db4@QzX*9ItRW3
zBoCh|0n{;N#p0=2Tb>-om$+ZpQwah3O4%izetLQFq(x##$k7la%kQ<{_eKE0uFy<C
z37TN>Aw`+s^d4`%1kI4|&n0s;wJs6G1M;Y!Ry77#U*R7aEqcdPuR-}*J(_q?^1E1Z
z6@{H`n})Oy9j`GsEeffb+yTk|dh~GOS@A2(;pi0t%1f>+>FNyuCwZrNSH~<ZUJu^a
zV5+zPM>wPwth09G3+?LIqQ6^N>VSJS>o&SbDo9P0cb=MA+x<+kRG4Y^jB8(CKlztG
zIt!#y;Jj55F%olQyUR1u;2lCh8dk(|$nZ79k(n$iC-|K+@I7!Gii)T9^RY`T_euOX
z-Zr-rP~p(u@XS7Vj=&;7M;XXduSIwVPs&^Q^2ZGfyn94u%pICMT<Y50cT$E&ERJb0
z#G@p|LYeB;#7NJ4zfTZy@vSzC&XcV0x!hIfDwyk{L$kE+^T}JmNI-XF&XzJTs?%mD
zlMd0<0ukLzhj90OS1YO*tieiJsm(^dUWZ<@C8IdL#$7<Y>m7}hIaoZ?!q#9%hi*9>
zfzPaRH&e-7o&V#fr!gBBf$roJN(){%UZn!w&4F{=+|C)`8`o)BGbel2a>%yqYCC8c
z7;gXh*^f4Y+ARO;ju~m8$J-go(6)~<Af<;4?U0-<*)}g+J4ApvDET!<9o~98&&gwY
zA*pq~iYar|De<PBbEMB6g%q{wNy$WpBbrP9kZKi)?G^CNTaUMbf5VB^#<MTGCpe)j
zrX(Sfz{5}y(*j0jD_Jz*i6t*@zicNS>(eziE?^Tl-lskMph{K!2RT9$b6{g5fUI?J
z*&WYvz{;mYw5N9cn}=&2#%X3gVnb#s;;^hWSl9%`;eA>Q&wsM(WF#O=qG!+y+Kc~b
zkFRZ|**6o!Tz`{}{K@qKLa*~!0%~}mqV$|}hs!R3W1Q;l3PZg!<!@_2w?u%#UdxQ?
zdjk8DDH5~FXT5D-jj(%P;O(c*JkTLnfZ?TFPotq)$+UTi>wdV3f{e_}W@1>5+3g-f
zs|c!#2B#nCtwsHZoImwt(IfOX0%yIjh<D`&6W_J6)(9n|XSDLDZS@AH`3%hR8LG3=
z4+jI(lC@ttxGHdlHW@`79msZ?2SZz`eE);&v`ZC!D!R*<Cf0UA3|VC=Z0Q@)6a)WJ
zlwrMUyMoxB!7JRfKM9^)#49ym4v#=*F5RmIq-sVE!NI{E%DFAbZ8Y*3E-Z{selI3J
zxPFHGK-8QRFY(WO2oQ0uhY^S&`}ECNFKjW1{wd5||3j~gjw|Q$d8u{?x0YCGf6SoP
zsh0cmM(>{*cv{=?>37?Q)GV&Li}l}&G(eSQW{)QLS4s_nOOH9^D@Ad{(E<;pMqI92
z*zj=6E^+hpjI~<_tbSB@izCX;Pp;Y5F;6LAeV8;-qMIx~stb&6y}j{1B0=}rYuZ)L
zTjn5+=T^4cXY`%|okPom4kE8gHb!*TT4&HXg?Sfe4Adp)Ci6xc`i96quL;@bvG2)&
z?U{%C<0TosYaR#a*nOyPyDpyY%Fx!)87f4qlGeMRS4(+$QmFPp%qIXt4Mkubr}paS
z*PR2jw%3f~x1GAqmekN;Ybe^UOzx^A_Ov<sRTq{<%#9Z>@%JX#TQZHl!MhaTzCKg8
z9^j*rxuBOV=4B%MBTlc;DBa_7?a(X_m|UFAJNd2u;x?pDvRS4h7B`k2(V<YgG+NQP
zsJ&k*lDeJrpk+##)rl|!j=fQJn6CQNb&4?^p#Ve*Wg}(5*QShXHV*cCD8ibspWK}X
zxETxK5ab($y~6j$tn+~hlYuD@g;f(}Q<9Vgg>TUR5Y)W5*QycL`a%?o|MGoku$+8Q
z`a6L_ztR*wXnFR5RV&@ecK7ELIjT{JLukzkzF6c~+!yb-F^?Ig*ZIoV21A~I(v6jI
zF*^3z5vOF`%ji2gzH;G5fop3r2-!Jbp+@(pzi`{2+wK}_N5}4P)xa^)WUjh0pF^$u
z<syE&$VM@6Kl8uDasqlOUTCX>eIJImQM&^#Pn*LxWMC$nB@*)D^^?KBaV<2^@Qks5
z7d9^&5xySay5lnO&ToB%*W7M|l;wyvX)RJA*Ld7R{I2`c4!G%SiNtGN^(;yCcL*5q
zXmz<(l1`IoD`~YVYb&`x^C~uOA#?H+_s`X*g(BO^4O=GS)$Ic%hV|5rKo-1nuivP)
z6?c#+JA@6K;xlu7Pbj3&Cye4_TXsbatkVBzG@1i5W39Z5YjBxI3qUDkuEZBf`Q!Na
zkPYwoM$D|%^MYBd!2-^<X=_OMTGji(6A(RJfsb*+j$ciQsj*@?X8<1mY+wIV(bPQZ
z@HE$o-)OW40FmU@b#M2o^Una9Cu-l09;64!F0^(INrT`lcsici^=|DG#{h<7kZ$+S
zQ|yDd=o2BxXNE%wfv>`Ir_UQIjl-B-HBw4GiJLdS6|#!hmS{1>z{DOAt@Aq07hi87
z(KHWsDUXIth($iL5kB)Xf*iZ9Ok7KKtXeftJBT}6`yWc1I~4=~`hn;5c9j){o_fbk
zMmCM5m%aGm3z&c=i!}WQqHM|_uM=Gh4o%_j@<=9D$9;&7E$Pja8usk`iM`yvxI3T1
zi#x#lB{(wvVZ<h#EDNm<2bQ7ks0hzs0_(5|TRFC$xf?R4w$+j>XAUqR(FgwgDy;*A
zvZ+D_an3dd;wOg&8>7=nN8K?9B$W|Ka;>TO^EEN!BSy}7Oe^1vB0t1{;2*?JO!<ae
zojAnnpr{Tn7UY}|D{m*!I6UZbB{b_@rL1+4VQngXX7<Btvh#SJNvLbZ;JF3^x@2+T
z&NJh}kF2GPc1<=->`y@$Jo-4)>Rx=rMGBzsVp~7jq}9`>5&XJ@XkK6aFxKD(gD2~0
zjIWphmr1}BWscB%z7)fpy%4%9LH4$EhQe<ukaGZEHY$9apVl26fDk<-4i}M=4Z<T=
zPcHfWCA|R%)}!~04<=OH9l01z3;hrxwZ)-}xrt%A|3^HZCrL{B4B3))k5LS5t?3j*
z0hXK+uK1^}lJ|TDBnjlhOdDMKw(#ABYVhzkp7x5W!S_j0=y+W{Y*P(xYNflg)a!jG
zeH#CdqU<+BJs=*EYMU~(zzeV4F|~V-zbt&Bl)?-ZX4(?O()-bsfgx(Yn(^TJ1DP%G
zPJM~^_9v!tr^OsE{5QVb8)Z<67AQpIen<-1LE44pJ{$P;FoG?)k`wR0g(~mfVM_3y
zzEIp%REj5m>L<;NFh7xFK|`T5KJmQM)^fH9jb2Eydj7{MWn_ShZxtt5lw4<RmC!3Q
zcY|Cwo4Um&_6|RXc)LSAQB~1Ns!eUc#4k1X>rKEkqt;-&h(=$~2lP(Is*sj^8Rqep
zKNP&>4-)m4bC-3klI(glv(sQvPC)6gwN%u$2sJxyis^k_VA303K;_pjIVyGnuA>Se
z2CpGcwfc9NTl~5tUzCV(y|T%(B}BvdgND%4N4qnMFj@zFlg0kSAyf#5FD)$U7E3<{
z5=JYgiDzJ#mr$PrwTHC5gVv^KJ}AJ-L+<I&`QDUH?kGux==@(rl0CVYD55?)Rrf&d
zz-Gx)6aEte9p2@)q$wE~9{w33%*z`vh8ITQHmb~~F6&0lI~w-VOHAVpdW6Lu%|VVz
z&WugDP_mX-{CwBqCXV?D2JVzs;VV40-D^Rb5wW8ge6g)Jafr;Ap$@NG%#SAkkHvfp
z78ZMhooMcciF;3})(s&hNIeWxBM3NG;24Gty@6=>lq$xGMhK7LU5rTERDH42k+jf`
zsK)L4e70P^*c>mSi2FhbY36AU$}_iCGTBOel4;~Q0OQQt8rHv(-|<zf8?1oHw-dJG
z=bg8dCZsCos1vq}mLwXnj&7vNC7%gm#Rv(Gs5%y^G!j(HkEHTjuXHkfyttFHv^i?M
z<)0dX!3)Ch-wak0zrCGSn%LY9|LnBJI<d*RL^ChNDSRjc`M9`ZPI7rW66E=6D7lw6
z!5sp;%SN<|ISBfo?1*kLA<c<+DRB7WUX>Hp`3d>_nXj+?3|O7)J@e8lQ8iODpiKta
zV9KAV!JcgQy*8=Jt)6{hs3*+IQ|@UD-NLmDAKg?x9RhlJ@M!d?aPNMN1VVgmV0S>S
zkU`zv@#Bjk-;b{R53Itzy!w&heb)n~ZkyMa>Y}Vc5?hIwjX%7u{N=j>@A^vN`2m$V
zjt)h1Ts`chip4!b*U!kfzF}DlDJ$`(sG7%3s~ZO%FQ=|qvmPtFwYs6gE*5Acm9R}n
zzeDnY(jJO$4g$5@+pOL;SeZaL7xnw+^<lyy2{B$`nI^tL$UGD_*MDJ+ZE4IA(c&<@
zdX2iP^br)J)8+QAt{fjde8J%a9ONx=)o6k?w`ClLFyR#265xUe`#5+!eb{(rVzY7q
z(QOr3u7kDT!Ib+W*#V_}<Oz7<nuJr{QlkI5q`liPo9-AvXIwD95ZOY);+y9I1>|5I
z4AkN)Rz3!*`_EK<Ka!?3V3b+8>gqE}O)dK6uUzF9L6LNNrE_{}FR!={?<os21`e12
z!G=GF8N0qHFeNcE?e_Aw`@_5Cer51GN8cOXfYd;cMOzA%El*xC`q_`G103-t$Z3Ea
z$!F)QZ!dLbsukpS%nAzO@KM0jwcTFawtbJE#9s3tN<nQxD(*Ykz_zy8H@b|%#c0PO
zMEV!a%^NXss9NfTDq38=sCmoO__raz4i(``(*7hnPT#c+Kng6F4hXkf{4mGM9O%&(
zI!UrSUypk^Dz2=tGSxO8gT8tpBrzx>5BpMcGy}PYDt8)U0w4@4i#_0}#Qc$(&3Lg3
zE=KmGoTpQtyP>0EM&J_?sEGv&Q2i(1wRb?5!{NK;vno{qS3A&%Y3Ke;M6jz}hWAlJ
zxlGKCmS1kILD;XoZNP|>U_J&cb^uwL-JPG>cN#0we7Wa@WM55@;8sj@T8>`WUx5YS
zjPecKWyq@_IV&F`QA{!T54iFeRS=r*i#KBrsSh@@xvJL##V%XY`)%BL{60&hlBm=d
zdyBwK7^|N#|6B&I`{bGbafmF)+Tu@Z1wGBupB;+C$!+G$L^YI7aAo(jT>c}1i`*>b
zQLa7a#Y<jwZ6;cK;pg?9VLX=uE;fLp4O_~UzFl~H_&$i77HjiD)uHmb1Bp!|6)d<T
zy@AXgz}3*UC>w=G8UYW4h_{ipYaM_yyzVbIv6bQIvH>{r=6OL-NTgAH(c}e`#6&Q1
z3C?lm-wy3m{MtIFtK{@_vd^iS%`$WBNNaJIy387f@QThzudHA#(ScotbcWVL?zs#H
zY^ty4O9j*4<)!nFfaxqFMkBId>gG{NlQDHgMa>_U$A`tYzYz-^g>>l)MdbQ?jmq=@
zj#2aLy?J}<txtMS<UlY;r@w3EB){|4xJdc<n1d^qVeQU*`4hzW;}5F_bkLSXq~ylP
z1z)!%y1r!+7U8{+oPR5FbMT>gLAv*ewo!D5^;Ac*=S)$X$m9oeZzntL`1(+!?vw1u
zBwWRmDj*GE@WLM-zGLP(JUv4|afFFwN7aFxYRzS~IKm-%(1YbZilh>o=q0p?Ka)=f
zYN-J<uP<UzvZ*g}xk5;~qxdJ9`V0TNTUt{F<Z5v5G*7H)m!+Q-&SiOZ<YANLU=ASP
z+AH9KjgW`B7RIdMhdh!MfTaGfrCj6UT@ZHkM@A81K0G~yF=08Wbh@L$&_2H0@hxJ<
z#kB);@#e@joZm?#%jS(>OYm_}U9e|LAaYDNxe*9mW@+1%OEa&Y*uhMNtGB=T+>kuD
zbOp$z@zaM(tJJrdoUpbF!f2o%|D`Y+VU>z{%W?ICu0Z5^?ZucbCNyn`gxWGQqQTkq
z`D7s<a@`<d+pk&#s^jG=AzR7aLWVS(VnmvWOtjFv?QK-0KN2Za`;t%r@b$qRon%Jg
znQi`+QTrNBsVU19$PfvF;4~|H#zj_Xsm<wxCK9!~e`XQ?DIu=$TstBBZF`M^2@AH3
zMo@b(t&R+hkxZFPM$qu}W}*K`&-Qv}vi93;9$XLM-O^b!df<@1EQMIVb+6nmZqTwo
zg|mv2%eb7Kv>fAv?TR_bT>JcG<n1yc6uJrYb<}iat#Fl>V6rnEVUDzB&*^kNGA1>{
zN@EB;c|XT>0&rBwlDx;^g=!oWO<qVj<6yDUL0nA(XnBy$c|#qzKmJ;$JC%oc=Y{Z6
zb_CB4i;U<KV`tbmDwis*3fIQ$nEAm4jf2P7@}EoLmfILW$~)7rt_`_bDkHK)Ld{j5
z;prFgFbrOG&ZrrmF%0=c+D>rN<$(6;lsi=v%1E<%T^V+)90qP7jEG!tEhm()8P8v9
zp@Vjq!)oL3yqx_1z;*1^uA*Fk8#b#&KWAG%)*||LC10v%%Tz=(*BE|#+3JnmfgBP4
zeqb6ID(_}*pa@^05RFWg0imW-cUgZnf%fnBc()Zw({`WCkB-1nLj}|0LS4G`xvVfb
zdOq+10U$+$Sl{z<v*Bqs|5}Z?`9ea}B7!BbIpJeQuF0F1fv?QJK~!Lc(6_TO?i7i=
zpH1NwKd{EH7Q!E^2K2x@ZpC@ckx7_mHO6d&Mk^^o!<c~hM#I$+K-->XK^#}6^u*5Q
z!$<*zj*eExO}zanOTh+U&cCCp{dOjxAAx4SaP=aJ7K_M~rNkKzw2nuba4c+;DxUs9
zE&QbuZeM&MfpZ0P$=!vsx7_g7q8U&2po5!Zb6a*W$pa@=C`bycn8Mej33u1ju%NlT
zyQP&RV*usu--Z4_JzC^Xo>B>r&DfdLFfx<fj>t-iT&~U+>@odG5&YI}cIOj8Pczla
z>VEjWiLJg){5XJ|#YugZ(uFuI!K2^uEd%nuexqWJb=4aue!`*O%DV4?U~2flpN{h(
z@=&C7^&wT*^n>_-JBbz1N^t(0i~0~>T9+0!w6Yyqd72yQ$Ej3Vc2`NQ4rn~)J9B>F
zWrRp)d@?^iocAKKZbp?oP+G4cq`S*Lm9mD>eRRGlX{!bBVL$i%ul#KAZqZPA7^utL
znrlzf)@Qq!2|ngBf(~b+KM~yhQ0#m**k6Yd5V1$$hcCoc42a8yi3kTn4t=1Ln%Cf4
zaQ${KDeybXk+u1|nWHT7tuv|CPh4qqc(&U;eo1n6r6dpbbwB@3ooWNbk+s*gt(s`<
zZgg+NP(IkQHA`MwU`D`^hFe4G(w0y8ImYZb@UCWj3VdyY)e7VEh$MCGCr13c6Z$s-
zQsptwA$#Qv+2lc*e%ZyajYre&2LWlm8M<<nDrmSsT>5;mEehtIwl?4MQo{uET%fA5
zz(Rqd?c&rR?!?4r4b0#Z?+F}=*X5Tkyt(L&cdWrs#K!u-9g~aN0!a^H7gE&#<@W0F
z3qf5O!=(!|N|`wvYMRp}VOYdasLCnktBMdnC2BXVkM8gnGuKk4M-LCAcsP86Tv@Cw
zP4Vw}Pq={+!s5#ruNYQwmZW)8aQZfe&1PyqlI_`h2jQI^{d`pT&+I>r`0fXwo)sp&
zp?)M~jhIyEc_we8v<l9K4)0y#Tp@CgOEw<|bP*|i`*Nh;c(Gqbe@<k#Tt#~VDwt(-
z#laOe!=V%MIteJ<{#mTTc}!7Zb=$S(N$|wL3+5mzbCEV?0ma*pszL-m<5}i@Zu$q)
z1t!c{-8Tl|8_$E4Hf?X<7H*naeUs_Xa95`f=%C5G)~RRG8_}6WFFI<KhlrOm=LYIC
zJjL#L&RguKZ0t^j@1D?AHxD;cHJI~#5sQ^w$!G|@HeSo%`5UHrhM8lm$vqES!~jho
zj5vf_aX(_vH=Ud8uoy`VRaRHV(M|~Wsg+TfYz`WC=%>pn+@>fkhu4?|E!BiPof%=e
zsR};dHhuqDlC6}&&z!Ris0J9n%V#;PY(jZ|Rr%>C@8vle*cib%>h0i(u&xz@=`#oZ
z|ISayRRCl)iutlSGdB7pt9kj&d?kYsI5=ie^oYm+P(dBDbU;5&ZsZ`tji0J5n(DJ;
zl-gkNizR%z^+ltWb91KJZ|zE1+Kam^xr*IGl_yh7o83;$;CrnjscUOk(efPn9=?xv
zXl|<(Okq_{v2-<J5hu6uuRimmoEuCMy}~&yIWS}y(tml2#!NL>SVdg;N9psTVBtH5
z$L9(}z7SU!rYrbwz^OxOc7-fI{WH*tS_F{J|B=E!I1fkyzX@&C^l59@M$YM&SrdUe
zqwm8UnJ@jU9MyR$YQ6R{c>CNS)>XFBbP8@M;8#QY!>~Y=vUl5m*m@$9p+r<>fy02r
z#sXoF3LJTMKDI2AvBWOE&_eIqU_u&LXr8_54P>zY`D+gD!||U}8XT8_k2ugeSx_=~
z+9kcOv;p(Fs8#6Aoge*=-p-WOy7cxkk$?c!)HSGpf1zLLgs<5yNyqw+%=J4bjPLM>
zD&u+a57E0KpM9SFI-pZH55wZmXQX@S&aWHHZ--E*h}fcxh@P}@?OAX8*N*Ae@;=TV
zMfYXqM9=`jFJ*bNnD4q=fC$cF%B|lPH~zZ0Br}h%@oR}O*8KQuHhfRzwJ#>-Yuu+k
zzNWE_vzr)s$-CKZ-XZeL92xW6CYz=a6uK*EPKM-mi%xOp_Oi)9KKKhSQbSjxYUN4j
z0fR`$I{_hok4Id)c6aI@?=5YTH=e~E$+Afo#rr|SdzYKsYXrNS2)OhYO#~FB?epon
zxua4G?xkom!dwYe<)M)w*gJw-H;*Sl(j->JyN^8=?K%rQd^a}-w>?!pd|OQr7x#U5
z2$BB0lOx$Ge|~;3qXh2EKPAyC-Eypg7m!-_x#O>{eCw!Qhf@c=WLpQu&Vu8S91|s6
zxV>{f^pEF$>%mSeseN_^YM(o5e)N7;eAghf;L7d~?5{X&cg2ka6dkbQB#rjs7RzxP
zdph+ad8fqQYQg*xUz^u(>OA>QbIVOE<_))v8zC-y2zD#TBe$jc(vem!xg$*Rhp3M3
z4P#KOwW~2vZs3LXTP+xbf9+YDZ#X~rc!k$*A#*kpe|<woY;=R27a;4$yg*Xd;EU7e
zTo1c-iw`7_C8h?WTK^m{@dn>QK)u@=+tA6$a^+r5lL!#QuE+dY{sUC~#|5izM!y1L
z`_VnBld`cQrq43&0Wo^9z>}UB`%^u6>D4=W%?Ch5us-3d1Y>JRmWXd~caiBW;X{|N
zEG{aw4q|G|1uUgfO;^X=wGUdN%2HiD>FY;1tPQRmoMb!7Ob*Ggr_Gwp;>AS=HDWZi
z3hZ6G=kS~pv7;TC#yK_WSjJ*Emd!pZtxAK!^6p{gUiDOUfy*B~4q+OCt%tMV^Gapw
zqlXKolB73BPCz;K`i5_ZC(TJ1^dU>(mFw`Nkk9k%lDmB2&jenZB<216aZ2umZO6bb
z;d?dgXIjMA0mx%F5}WXs7$6a4pg9RJ&<`#HKH>efEj2cYRu0gU5yFig=Z_Hs9Zg?L
z=?{IrXpI((D)esc>Uu>S+RbUm;=YfU&%SA)bt2!}7n1^cirWB98QBSu_bs>Su{|tq
zKw@t2aK;31VgSp1^f&3>;jFC0Mj||rYkhN@LW(ey0TH6*@KZVg4&94yD;Izf7#mi6
zir-90@tPN6=Z{kA#_)jDpwgF_k1V57h5LdxY<vt=Jb%Q^-5Cl$Q<I<Vj24gDdukdQ
zPdwRcX*E6vG}1m+2D&RbfUh05<XVv47{@uB;8KypvFdvKTWR#bFRJt(SN*PAiL6uu
zH?g!n`_n8Qz62PNgTSf(t(*H-g8x$s#}4#iio~WuaV>95^bG&2DtEW5|3||2Q+)a>
zy8rV8h5tO|-;;1)&426C|CLDml%D>t;R(MS@;`K!{qqch|NJcfU2*tVboBG^euFi8
zQx--gYV=R|jsBQ9@PFJ*rFomS5WyXo1hPMQ<Nvn2?D0}`Qyog}$5e-3VfNn|cmV@S
z%NlV8^f2OgPe7PT)c^BGufot8HI?iolV4<cc%Z*^o9)q-d&4UpU=b-w2XZdG?Pslf
z?vr1d1^F>E;D?oEX{(m)5YCS6G`;jnR~bu&wV_MDCW6?TH<k62OXb$emt<Jbijk?R
za%4}$#1<E(p#p<z>?wT~wfs@DhIkiSebkfd-pRsAf~+3_YdEkDwb}B()T-H;=TMIa
zs$)K)4UNz$ZA<NTb7FMZH1~X5>0>!xeQz3gt^48W2-&0^0@av=QJ_m!;!tuU>6`hg
z_t?ja8KsYoH`=D;o&_jGyv%QyX>U};ebW5x-;U*~yX~xk*K{O=w9pGIrm-q$`=Qd2
zsEcrH^%5i#|Lp@vmUW0(@W6JXp%S{$>yv{XWW2z8Yh8~0<Fm%d3B4(D8G(EdkN4bs
zCbl$Gfm#aiCub6fqN$_vQ|q!4tK#rl_J&QaoZ4DW4#Kb{yJSQcxtwlv&5mio0LR3A
z>i+i+p*k|piCwJI;+vBGtHZhp;;WUbiCbSawUtW}!(;qy5++9Cy>=82D1)TJ)Y~T_
zT)%Vi(p&5{9(m#akN3y8t?x?>Wyd%n5K|M}MJ9+3sDg`HmysIv6GGKBWyc(I{^;X)
z@_e!JnVdc@SHrc0B|TZp1QmiFJUGoo{KWehEVz9=faq(_)tS@nkz@DX@l%@<$f_L8
znzVj#0<x3!$!B!!oa}lr-L!uplOZh^{227*&H{t6V~x#`@{%ZUNvJj-`NEj@m7=_j
zP-VhU1+Vy=tyrlCzpS{`%Ce%`V>SkhbN^pEvhDkVCR9^XLYZ%ta2!guc3bNo|A?#(
zR=+=^MT-fEi2&xvU4KG}0}G3me#L<dwAhn(NN4=r-AedL?BN0k&c=0&3>+7EgitG?
zvvf<^5$~!V=|_%4Oazt%U4r(n)MvmS_EP37bLD^Z*i0}q!X2Gc=1E#NtMlK93p&)z
zqMn2AU`p{A!sg0Sd#X}R%R-Lh-E7c}mzUN;A>un9LW3X-ma&`hc|vCM5p5Ov$c?K4
zTO~^FNN6kVb2Mj@o$u#7QCr1=fv)#*zOk#dh1fjzu~w@qVvQ5aj<cv(XXC!t<`7(+
zmc>a;pIym3G3htL4Zx!EyDdOKiAo0O0fXUEOK_>nf5^$w@xrDngqc(PRFX;{xrH)v
zVwHK}Rp9&n0nTu7>CUKV&5GvfPYRuUW?VG;rP49unM)#j(;s%(maFG&Z9b)X?Pyt5
zP7l^~#)Xj1COLCyl`wH-nwylSUrQ>~362BySOxLI5p>xhxNDt>;hgKXNz;*zU#o>n
z@SpPr7i9+$IETd7CLyGoYU`U-H_sId*fb#8ZJtD86Jubap<FGST*zmxT(!Ynvb1le
z?-p~JvvIXtY%WzdQGKjv!*kGjp%t}?;0)jHyw^Off#0^RC>_Q6?c{lpOCVFxZAi(b
z%+o=J2bU_6wI4N?=}nZB_4R$GTw25S>w~^JSP4^1n|rCn$pVAecth5P8V6V~%NdSX
zJ>L@CQQ>OZ$ZKW!NFrS(^e};MOg2rnOE$qvvU9jjG1?iB9!=C_{2ER0fE!3wu=NBY
z<K<kMvwfw9B^Gf_G*lr#mux&^zbG=B;$2>UE0-qFw8$MKs>j-eb6o&B>~g?CRXCt&
z{YDbo^ywxU<rmKZDfJNz!*dI%X1_XOe#YKP?aZ{P=&EGSdQB<z8yR!%>S`mI>Br!-
zODU0shw5f7!CM}M$ZYh#8AAb661r!SvIjM4-1*03m-q~f(YZbEqw0!QOHk$+M?4N;
zok;Qea?P@qlpiw|Z2pj;VSl1~{9yL_L*sXDLGHCAEf&LDnFe;mE#NNJveH00y&#M3
zD57QP>cxewB|%*&SI8J0jM#U`R5<MP=A%2;w_eHm#<EC$-b|@YF1^^{fs{1Mi}G9a
z3|%54Gwsf=m7PmzKlhv8eL=k|;|3%iF)yfneB*@BB^@VRb<Wrwt%<@-=5Zgky%-FV
zss?8F0Hn;Axx$-rM|}V!KK_TCXc{U|a~!eVNlj|dI)a}6q%`ojBz<ywA=v;Y>WQ6k
zG-}a4LI@ClRVebjpJkF&j@~^!Y}kErM$)I9>9QoAi*3MTr(NW`SiS#=&YK4_Yk>FY
z^+VXnuSbF@VO=|>Y5ZpeL16gG_5z*y@WG0c^vGu*_b!^U_$6GP*G?{{EygmRo86Oj
z_I(3r{X;0wR~(0nSWb`%L5V8KdRB0Jfx5WyA=wzxPVRZIH|2F%{y|(;KB+`Uyn+{^
zw(IA}nY;g25@}$5w_`s$!9h0i7_{Y;>Co_Mra(!$k4KsN$wthQMW$n}qBB;$ugv{y
zxd*%i0sw%4+}o<Y%#vtBO_0!$ip2?~Z-ACu;qgw&-KmwnsoGeA7+q6y#X$e-kgh1X
z99Fx&P4{9mHML9M8?_YGm2aC<OsR>=Y5~&-#Pm|@WJ4bP1pa$N#`aKtC(*zbK8I^u
zm&?rZ;81SQdNFF2Bk_eea!VSa^lF%U9+6ZUD0#6uyz!Xi#L<-VuLcZiZBHQ}?dy@4
z>*V>vp-U86LW&W*WNSmgv4fc+-}`Hniq89!s=i2V!5UePK^`UgfJ2dsbz_#bcrM~Q
zscJPfVFC3TdljB7fU{`?H2HQ5va_Dy+xHzlkfQ<&!X<5`fIgr7V?WEZxJKkQt)+d7
z;F^(RDj*WS-T+1?y@!nLCf9qDkRI^v-sCz0@kLwHS5Z{hn5KpGtmds*w>~`WJDdE`
zPIm5*=iVNCbF>bC5~HVAv#L=XG`iwMVs#8cl#iaU1%&xM0U{#DHDy!l24(9{yjQ4-
zE425&WZ4M{P`foD^I9tP4_Bcop|I{nk3PLKEmsTzPN(7%S3SnrnaES7wuwC$4)<7F
zgpHAYZ-7R(L@BG9t?ite>VoMYNml-r+amSbv{J@N*Nn5a&+VV{{Lp}1g_REYEDL@x
z-{vJR@2o4E`EHOtVC71{%(syR;8^1qUAG=88|%$MFMg@Tx?CcAdI3H8Q88low}h{r
z+$FG)c3BdMMN5VWI}?UI+Vt~5HQ9L;%?KuvE;2XI%1#~4AMEGga@L0}NpBvRUE)WV
z8xi5<{!~FYx_F@cl@dZJQ5d*9aJ>U_Lf==PP%8zydvuJC7+^$gH*W^vCq|yV62i4(
zrh0)4X~^=vH@N!sz#(1Wiuw4hUGw#^^);TM@-1E$OjsVq(N-x*q1&TIxn!RS414gj
zT>&(9OJlCqz#N@UDv)a*-e#qe7##TM7h=hZ0wy{-nUZ{;y|G)DoF@Z{KjPxidm>3)
zMkv_0E&olJtvN6d@FL0Bm{H`iCjsk7Z)aIq3TwT!7|nPJ7H<Ff;c!SdoN0h>1dwD3
z^aWUyDX(EPiVxdy<|{_6j~s(0j+Y&5>a0-esIQbU&X4NK2lw{bF_A+G(i&Ks?v3rc
zB+qvleNJ0<=<(Y;OP8uc<|21cm<f1_yfdgsc4IqI2r|s^wH90SF6*?Mmsv)+WBC?>
z3*Xd6`8sSf<nvRY<@x&#sTTNWX{M2|P7WCGe^U<C0khsPr-?Kfi=%ln)aQyir@L!*
zx|FX~73+_P84bwl2kXIh@>DlN!X=SDTs9adO{7F4NX{-x`H58|mH*BkCtHWOae@?<
zPM+kv{`@stHybWlZ=5VjbW+xS$X~1thjJm=t={5Vl~6c-zQaANi}R!KBK?Ptah(z_
zogX)Z#Fr>Ex}p%4`uXW`@I}=e11PGb*5!n7E-bNfn0l6%JAWOL*~P&$*I6RpFDDIO
zT@ziFBC<+IeI$6+X(BK9`Z%S^Ev_cCh{`&c7;<fO9}C8LAct6MY7xtu)V+|CnwC*}
zxr@R(*rJS!q~wAQ!q}{U`G?Hth4v?nFg|a9ITm4p52yNM<kP138fTT%<o0v+*uiMW
zbkmfu1}z_hkW~gfMZ7_#u5Uy+mNgnc-jK0`txK^L*4(fA#ZuFF&v1h6kJb-weAH}r
z^>}9y*wbYyJXIn8*j3ThQ_2>${5n)8o;OrXphIL>AM2?4X8z1`)gN@=?l`nZXUG@e
zSo}D^Nw7D9l6S77jnHCa(RFK*Rls&=Y4fr|Vc_IS6h*22yD1<aC#Y!W+$`FXmEI9%
z(&s!*83dd&C6sHiQ5d6pYZ;t5##%=?b*ejGqi9XjRR-N9D;se#wCw8)wq=Rj;`ntW
zG+zWt^K7N@1Xsr&;!#;K6Gz^1)>q7m&M*6KNRD||GM1Ehnt$%yT$qLFg+#t7B%bX|
z_C1d0a(b#UQEdwWO}KK7%A&*_u2urswuD3O($0`hxgS~Vpj%!oTS<=I*EFp;*UB!7
z?T{op4!TRb{uAG5xAVw;r|~5gW8SRmt1_J|Vivx{(N`*h<yc<6O^Fh2??#U<awm{r
zaT}Yf;t<}Hd%Hs&@G_L2PI&Y;n!gv^ZIWcYusd(^9?*($*PP`0DeF>FzfbLe4-)&<
zb%D|TI%*rB_+2m0v<eAf9r?lp*oGOjaTk<_XTg*sSA&tM>89SHJ*84l)L<Q%h=*Zs
z_=g*?j`c1R+lI_a$t@kyR#f#Jd4nnG;rWS-Lt<qt?|_zrGt=NNeO-EHVvU&kUn1&9
zr1&#{X4IS{C4K^W65!psknOcJT?sy_hFqd?BEbc|(b*zJqM~&=7gFX+c*PNGP+KV?
z0J2s_oY*9`MEXj<>RrC)#z9;&Bi?AaUlr=~H3os!(n7+Cbb8d&?B!hMTptd7TFzix
z|8SG`rd<c#@@*8tb*Y-ARcXUzQQNL>W?-&SxgD3x?tY}WdD?H&^D@Z|?t7do!HdsF
zJJ+mvpk*n5m1VwIDnlOMcIT`eq9Zqw2Yx+>AV#(VflKswi;dBC$+FgY+_;tH#z3#y
z0f<q8hgBpN=YYa1DYB>nvgt8j+9;`UHPdf+BHcpRmc&94F{@?ii>jdUjaRQ;MaiCI
z&>RNF$enWsN-!#?8$n!|my#%Q*cJ*<Lk^+!IVc`$^&_}qAdSGCExjW{SE>ZdR|BTC
zXlddfMh>m{G(MLYM)|7~wfnK=z*sF$zoe4Ig3W}NuxXiF#nD5(;>`Ki)+*#a0C&T5
zzwWUsdllMJJJE>wD73}FzV`*<pF!WqFqF)<75c9lJ1c!`c4f;3REc?PBP;FB6qDS<
z2_C+R<8=A)b}+@)Yb{#-p7NL$02O_o)}E)WLRqf8THOpmxvgpZzr|($$=fP?wAN+H
zOmH*&xxmcVe?aSbKi^4K+0g#%S(@P%Sv}Bb*rnOPt<Wo{00&8nfP<utz8~)hcg?iB
z$y3(*_TkC}xgQVRmv-|xRAl;h^TzWt|5?8L5T5%w)A?w{@2@+Au1LQZtUDigIq<%y
z(}KKRqTl*X9K2Gs*kAVQwOI#lS#n?Xcv#>tH{CB&_Ra=@pJh92ie^>qXP7qot>izx
zHu&;4;JK4Wz{SP=gTS@77H#|goPOh?TlvPb=F>;PJ=-pd%B>PS{A|{SkIUlD<;B`p
z%0B=9GO*6vWy&Y;<_4b$X1mO-9=vU}y!O4LYTa6P8wPl(IOP<uRMZ6Sc1ZC1xMrEl
zJdwSzYdf`D=6^gKe|U${mK86jzBMp=`JvoJE^WQ(y~8iuzt78Ssj}Lz=Uim}jlAF;
zEV{ABeugxxEdidzyKt}mvpJQ=s@Vl^1-7qT+<X18SHSL@6>HDkU)%To&@!#`tc<q(
z&G7Z+9UUD%rr$igDn-@rPq(S)Ceyc@ZFN5#|0Hq<I67trarqp{A8qotX6*y5FDz91
zSZ@H@It-Z;2?EWDv_8~7>GoXl{>)RBeG?x8x0~p>-!WgXk$L|7J@96wl9JND)Ndbl
z^InafUGU{Y*ky13JLW4i7XilxO>vG*!S`30lssLrQcrLj|N2R<W_8O+OgXdb$Na~O
zW?t<(kZh_k@mrwI<L%q_trnW1@Adfp+_t%dw%;NTr)FIATC-E-;Y%r#Yty@bPrCSH
z^5z3KC*RO`BW?Hl!@X8+i@%S867Lrn-dp_Nr0Vt3+QTblwB>hkDCTb9|69*i@Xo|f
z?oP$U=1;xr_jQ-o3pkwBsr<iTW@xkNS?%`!pL5<HzG+|EQtrR6{h$9mhs9UYB;Nim
zwfB>c)O;r`r@Er@jX<CL%bhRgt6oMs4ghULcE^{8?>+wf&zmQrxU6OUA>j3|44$rj
JF6*2UngFd@e_8+l

literal 0
HcmV?d00001


From 39c0df3ae6b95cae96000fd1eaac96dafec67ff7 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 22 Jun 2021 10:07:12 +0800
Subject: [PATCH 082/402] Update TestCalendar.md

---
 examples/TestCalendar.md | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
index 5e14bf2..3c70568 100644
--- a/examples/TestCalendar.md
+++ b/examples/TestCalendar.md
@@ -1,38 +1,45 @@
 # Test Calendar
 
+## Month View
+
+Use threshold
+Circles shown on days with values larger than 40
 ``` tracker
 searchType: tag
 searchTarget: exercise-pushup
 folder: diary
 month:
-    startWeekOn:
+    startWeekOn: Sun
     threshold: 40
     color: tomato
-	headerMonthColor: orange
+    headerMonthColor: orange
     dimNotInMonth: false
-	todayRingColor: orange
-	selectedRingColor: steelblue
-	showSelectedValue: true
+    todayRingColor: orange
+    selectedRingColor: steelblue
+    showSelectedValue: true
 ```
 
+Default threshold = 0
+Circles shown on days with values larger than zero 
 ``` tracker
 searchType: tag
 searchTarget: meditation
 folder: diary
 month:
-    startWeekOn: 
+    startWeekOn: Sun
     color: steelblue
-	headerMonthColor: green
-	selectedRingColor: orange
+    headerMonthColor: green
+    selectedRingColor: orange
 ```
 
 Use default colors
+Start week on Monday
 ``` tracker
 searchType: tag
 searchTarget: exercise-pushup
 folder: diary
 month:
-    startWeekOn:
+    startWeekOn: Mon
     threshold: 40
 ```
 

From 084366b59decf7bd007a9a548e3a7eb7409f8ce2 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 22 Jun 2021 15:53:46 +0800
Subject: [PATCH 083/402] Add template variables minDate and maxDate

---
 src/expr.ts | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/expr.ts b/src/expr.ts
index 43969f6..4ffc334 100644
--- a/src/expr.ts
+++ b/src/expr.ts
@@ -8,11 +8,39 @@ let fnSet = {
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
         return d3.min(dataset.getValues());
     },
+    // the latest date with min value
+    minDate: function (renderInfo: RenderInfo, datasetId: number) {
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        let min = d3.min(dataset.getValues());
+        if (Number.isNumber(min)) {
+            let arrayDataset = Array.from(dataset);
+            for (let dataPoint of arrayDataset.reverse()) {
+                if (dataPoint.value !== null && dataPoint.value === min) {
+                    return dataPoint.date.format(renderInfo.dateFormat);
+                }
+            }
+        }
+        return "min not found";
+    },
     // max value of a dataset
     max: function (renderInfo: RenderInfo, datasetId: number) {
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
         return d3.max(dataset.getValues());
     },
+    // the latest date with max value
+    maxDate: function (renderInfo: RenderInfo, datasetId: number) {
+        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+        let max = d3.max(dataset.getValues());
+        if (Number.isNumber(max)) {
+            let arrayDataset = Array.from(dataset);
+            for (let dataPoint of arrayDataset.reverse()) {
+                if (dataPoint.value !== null && dataPoint.value === max) {
+                    return dataPoint.date.format(renderInfo.dateFormat);
+                }
+            }
+        }
+        return "max not found";
+    },
     // start date of a dataset
     // if datasetId not found, return overall startDate
     startDate: function (renderInfo: RenderInfo, datasetId: number) {

From 3b1ecd16f1135a9266a0621438793d330c2c2468 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 22 Jun 2021 15:58:18 +0800
Subject: [PATCH 084/402] Update TestTemplateVariables.md

---
 examples/TestTemplateVariables.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/examples/TestTemplateVariables.md b/examples/TestTemplateVariables.md
index 5380520..9536999 100644
--- a/examples/TestTemplateVariables.md
+++ b/examples/TestTemplateVariables.md
@@ -10,6 +10,16 @@ summary:
     template: 'Minimum value: {{min}} <-- should be 27'
 ```
 
+### {{minDate}}
+``` tracker
+searchType: dvField
+searchTarget: dataviewTarget
+folder: /diary
+endDate: 2021-01-03
+summary:
+    template: 'Latest date of minimum value: {{minDate}} <-- should be 2021-01-02'
+```
+
 ### {{max}}
 ``` tracker
 searchType: dvField
@@ -20,6 +30,16 @@ summary:
     template: 'Maximum value: {{max}} <-- should be 88'
 ```
 
+### {{maxDate}}
+``` tracker
+searchType: dvField
+searchTarget: dataviewTarget
+folder: /diary
+endDate: 2021-01-03
+summary:
+    template: 'Latest date of maximum value: {{maxDate}} <-- should be 2021-01-03'
+```
+
 ### {{startDate}}
 ``` tracker
 searchType: dvField

From c2879c5b3e652ad99919996c0deb4d65ce0a289f Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 22 Jun 2021 16:24:05 +0800
Subject: [PATCH 085/402] Update TemplateVariables.md

---
 docs/TemplateVariables.md | 48 ++++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/docs/TemplateVariables.md b/docs/TemplateVariables.md
index df6bdf3..ec91c01 100644
--- a/docs/TemplateVariables.md
+++ b/docs/TemplateVariables.md
@@ -10,29 +10,31 @@ Examples using template variables could be found [here](https://github.com/pyroc
 
 | Template variable | Description |
 |:------------------|:-----------|
-| {{min}}<br>{{min(Dataset(N))}} | Minimum value of first dataset |
-| {{max}}<br>{{max(Dataset(N))}} | Maximum value of first dataset |
-| {{startDate}}<br>{{startDate(Dataset(N))}} | |
-| {{endDate}}<br>{{endDate(Dataset(N))}} | |
-| {{sum}}<br>{{sum(Dataset(N))}} | Summation of values of first dataset |
-| {{numTargets}}<br>{{numTargets(Dataset(N))}} | Total counts of not-null values of specified dataset|
-| {{numDays}}<br>{{numDays(Dataset(N))}} | Days from startDate to endDate of first dataset |
-| {{numDaysHavingData}}<br>{{numDaysHavingData(Dataset(N))}} | |
-| {{maxStreak}}<br>{{maxStreak(Dataset(N))}} | Maximum streak between missing data of first dataset |
-| {{maxStreakStart}}<br>{{maxStreakStart(Dataset(N))}} |  |
-| {{maxStreakEnd}}<br>{{maxStreakEnd(Dataset(N))}} |  |
-| {{maxBreaks}}<br>{{maxBreaks(Dataset(N))}} | Maximum break from missing data of first dataset |
-| {{maxBreaksStart}}<br>{{maxBreaksStart(Dataset(N))}} | Maximum break from missing data of specified dataset |
-| {{maxBreaksEnd}}<br>{{maxBreaksEnd(Dataset(N))}} | Maximum break from missing data of specified dataset |
-| {{currentStreak}}<br>{{currentStreak(Dataset(N))}} | Last streak of first dataset |
-| {{currentStreakStart}}<br>{{currentStreakStart(Dataset(N))}} | Last streak of first dataset |
-| {{currentStreakEnd}}<br>{{currentStreakEnd(Dataset(N))}} | Last streak of first dataset |
-| {{currentBreaks}}<br>{{currentBreaks(Dataset(N))}} | Last breaks of first dataset |
-| {{currentBreaksStart}}<br>{{currentBreaksStart(Dataset(N))}} | Last breaks of first dataset |
-| {{currentBreaksEnd}}<br>{{currentBreaksEnd(Dataset(N))}} | Last breaks of first dataset |
-| {{average}}<br>{{average(Dataset(N))}} | Average value of first dataset |
-| {{median}}<br>{{median(Dataset(N))}} | Median value of first dataset |
-| {{variance}}<br>{{variance(Dataset(N))}} | Variance value of first dataset |
+| {{min}}<br>{{min(Dataset(N))}} | Minimum value of the dataset |
+| {{minDate}}<br>{{minDate(Dataset(N))}} | Latest date of minimum value |
+| {{max}}<br>{{max(Dataset(N))}} | Maximum value of the dataset |
+| {{maxDate}}<br>{{maxDate(Dataset(N))}} | Latest date of maximum value |
+| {{startDate}}<br>{{startDate(Dataset(N))}} | Start date of the dataset |
+| {{endDate}}<br>{{endDate(Dataset(N))}} | End date of the dataset |
+| {{sum}}<br>{{sum(Dataset(N))}} | Summation of values of the dataset |
+| {{numTargets}}<br>{{numTargets(Dataset(N))}} | Total counts of targets |
+| {{numDays}}<br>{{numDays(Dataset(N))}} | Days from startDate to endDate |
+| {{numDaysHavingData}}<br>{{numDaysHavingData(Dataset(N))}} | Number of days having data |
+| {{maxStreak}}<br>{{maxStreak(Dataset(N))}} | Maximum continuous days without breaks |
+| {{maxStreakStart}}<br>{{maxStreakStart(Dataset(N))}} | Start date of the max streak |
+| {{maxStreakEnd}}<br>{{maxStreakEnd(Dataset(N))}} | End date of the max streak |
+| {{maxBreaks}}<br>{{maxBreaks(Dataset(N))}} | Maximum break days |
+| {{maxBreaksStart}}<br>{{maxBreaksStart(Dataset(N))}} | Start date of the maximum break days |
+| {{maxBreaksEnd}}<br>{{maxBreaksEnd(Dataset(N))}} | End date of the maximum break days |
+| {{currentStreak}}<br>{{currentStreak(Dataset(N))}} | Current continuous days |
+| {{currentStreakStart}}<br>{{currentStreakStart(Dataset(N))}} | Start date of current streak |
+| {{currentStreakEnd}}<br>{{currentStreakEnd(Dataset(N))}} | End date of current streak |
+| {{currentBreaks}}<br>{{currentBreaks(Dataset(N))}} | Current break days |
+| {{currentBreaksStart}}<br>{{currentBreaksStart(Dataset(N))}} | Start date of current breaks |
+| {{currentBreaksEnd}}<br>{{currentBreaksEnd(Dataset(N))}} | End date of current breaks |
+| {{average}}<br>{{average(Dataset(N))}} | Average value of the dataset |
+| {{median}}<br>{{median(Dataset(N))}} | Median value of the dataset |
+| {{variance}}<br>{{variance(Dataset(N))}} | Variance value of the dataset |
 
 ## List of Deprecated Template Variables
 | Template variable | Description |

From cc27edfa3f934ba745788223618bf570220df4a7 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 22 Jun 2021 16:38:06 +0800
Subject: [PATCH 086/402] Allow gradient circle in month view

---
 examples/TestCalendar.md | 24 +++++++++++++
 package.json             |  1 +
 src/data.ts              |  6 ++++
 src/month.ts             | 73 +++++++++++++++++++++++++++++-----------
 src/parsing.ts           | 18 ++++++++++
 5 files changed, 103 insertions(+), 19 deletions(-)

diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
index 5e14bf2..e42ac0b 100644
--- a/examples/TestCalendar.md
+++ b/examples/TestCalendar.md
@@ -36,5 +36,29 @@ month:
     threshold: 40
 ```
 
+Gradient circle
+``` tracker
+searchType: tag
+searchTarget: exercise-pushup
+folder: diary
+month:
+    startWeekOn:
+	useThreshold: false
+    threshold: 40
+    color: green
+	headerMonthColor: orange
+    dimNotInMonth: false
+	todayRingColor: orange
+	selectedRingColor: steelblue
+	showSelectedValue: true
+```
+
+``` tracker
+searchType: tag
+searchTarget: exercise-pushup
+summary:
+    template: "minDate: {{minDate}}\nminValue: {{min}}\nmaxDate: {{maxDate}}\nmaxValue: {{max}}"
+```
+
 Please also check those search targets in markdown files under folder 'diary'.
 
diff --git a/package.json b/package.json
index 28b5fcc..2910930 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
   },
   "dependencies": {
     "d3": "^6.5.0",
+    "d3-interpolate": "^3.0.1",
     "obsidian-daily-notes-interface": "^0.9.1"
   }
 }
diff --git a/src/data.ts b/src/data.ts
index 6762f01..292adbe 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -683,6 +683,8 @@ export class MonthInfo {
     dataset: string;
     startWeekOn: string;
     threshold: number;
+    yMin: number;
+    yMax: number;
     showCircle: boolean;
     color: string;
     dimNotInMonth: boolean;
@@ -691,6 +693,7 @@ export class MonthInfo {
     showSelectedValue: boolean;
     showSelectedRing: boolean;
     circleColor: string;
+    circleWithGradient: boolean;
     headerYearColor: string;
     headerMonthColor: string;
     dividingLineColor: string;
@@ -703,6 +706,8 @@ export class MonthInfo {
         this.dataset = "0";
         this.startWeekOn = "Sun";
         this.threshold = 0.0; // if value > threshold, will show dot
+        this.yMin = null;
+        this.yMax = null;
         this.showCircle = true;
         this.color = null;
         this.dimNotInMonth = true;
@@ -711,6 +716,7 @@ export class MonthInfo {
         this.showSelectedValue = true;
         this.showSelectedRing = true;
         this.circleColor = null;
+        this.circleWithGradient = false;
         this.headerYearColor = null;
         this.headerMonthColor = null;
         this.dividingLineColor = null;
diff --git a/src/month.ts b/src/month.ts
index d714f55..ab29e6b 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -21,6 +21,7 @@ let ratioDotToText = 1.8;
 interface DayInfo {
     date: string;
     value: number;
+    scaledValue: number;
     dayInMonth: number;
     isInThisMonth: boolean;
     isOutOfDataRange: boolean;
@@ -372,6 +373,17 @@ function renderMonthDays(
     let streakWidth = (cellSize - dotRadius * 2.0) / 2.0;
     let streakHeight = 3;
 
+    // Get min and max, null values will be treated as zero here
+    let yMin = d3.min(dataset.getValues());
+    if (monthInfo.yMin !== null) {
+        yMin = monthInfo.yMin;
+    }
+    let yMax = d3.max(dataset.getValues());
+    if (monthInfo.yMax !== null) {
+        yMax = monthInfo.yMax;
+    }
+    // console.log(`yMin:${yMin}, yMax:${yMax}`);
+
     // Prepare data for graph
     let daysInMonthView: Array<DayInfo> = [];
     const monthStartDate = curMonthDate.clone().startOf("month");
@@ -423,7 +435,7 @@ function renderMonthDays(
             isOutOfDataRange = true;
         }
 
-        // scaledValue
+        // showCircle
         let curValue = dataset.getValue(curDate);
         let showCircle = false;
         if (curValue !== null) {
@@ -432,6 +444,12 @@ function renderMonthDays(
             }
         }
 
+        // scaledValue
+        let scaledValue = 0;
+        if (Number.isNumber(yMax) && Number.isNumber(yMin) && yMax - yMin > 0) {
+            scaledValue = (curValue - yMin) / (yMax - yMin);
+        }
+
         // if (curDate.format("YYYY-MM-DD") === "2021-11-02") {
         //     logToConsole = true;
         // }
@@ -461,6 +479,7 @@ function renderMonthDays(
         daysInMonthView.push({
             date: curDate.format(renderInfo.dateFormat),
             value: curValue,
+            scaledValue: scaledValue,
             dayInMonth: curDate.date(),
             isInThisMonth: isInThisMonth,
             isOutOfDataRange: isOutOfDataRange,
@@ -491,6 +510,13 @@ function renderMonthDays(
 
     // streak lines
     if (monthInfo.showStreak) {
+        let streakColor = "#69b3a2";
+        if (monthInfo.circleColor) {
+            streakColor = monthInfo.circleColor;
+        } else if (monthInfo.color) {
+            streakColor = monthInfo.color;
+        }
+
         chartElements.dataArea
             .selectAll("streakIn")
             .data(
@@ -514,12 +540,13 @@ function renderMonthDays(
             .attr("height", streakHeight)
             .style("fill", function (d: DayInfo) {
                 if (d.showCircle) {
-                    if (monthInfo.circleColor) {
-                        return monthInfo.circleColor;
-                    } else if (monthInfo.color) {
-                        return monthInfo.color;
+                    if (!monthInfo.circleWithGradient) {
+                        return streakColor;
                     }
-                    return "#69b3a2";
+                    return d3.interpolateLab(
+                        "white",
+                        streakColor
+                    )(d.scaledValue);
                 }
                 return "none";
             })
@@ -556,12 +583,13 @@ function renderMonthDays(
             .attr("height", streakHeight)
             .style("fill", function (d: DayInfo) {
                 if (d.showCircle) {
-                    if (monthInfo.circleColor) {
-                        return monthInfo.circleColor;
-                    } else if (monthInfo.color) {
-                        return monthInfo.color;
+                    if (!monthInfo.circleWithGradient) {
+                        return streakColor;
                     }
-                    return "#69b3a2";
+                    return d3.interpolateLab(
+                        "white",
+                        streakColor
+                    )(d.scaledValue);
                 }
                 return "none";
             })
@@ -576,7 +604,13 @@ function renderMonthDays(
             });
     }
 
-    // dots
+    // circles
+    let circleColor = "#69b3a2";
+    if (monthInfo.circleColor) {
+        circleColor = monthInfo.circleColor;
+    } else if (monthInfo.color) {
+        circleColor = monthInfo.color;
+    }
     if (monthInfo.showCircle) {
         let dots = chartElements.dataArea
             .selectAll("dot")
@@ -592,12 +626,13 @@ function renderMonthDays(
             })
             .style("fill", function (d: DayInfo) {
                 if (d.showCircle) {
-                    if (monthInfo.circleColor) {
-                        return monthInfo.circleColor;
-                    } else if (monthInfo.color) {
-                        return monthInfo.color;
+                    if (!monthInfo.circleWithGradient) {
+                        return circleColor;
                     }
-                    return "#69b3a2";
+                    return d3.interpolateLab(
+                        "white",
+                        circleColor
+                    )(d.scaledValue);
                 }
                 return "none";
             })
@@ -613,7 +648,7 @@ function renderMonthDays(
             .style("cursor", "default");
     }
 
-    // today circles
+    // today rings
     let today = window.moment().format(renderInfo.dateFormat);
     if (monthInfo.showTodayRing) {
         let todayRings = chartElements.dataArea
@@ -642,7 +677,7 @@ function renderMonthDays(
         }
     }
 
-    // selected circles
+    // selected rings
     if (monthInfo.showSelectedRing) {
         let selectedRings = chartElements.dataArea
             .selectAll("selectedRing")
diff --git a/src/parsing.ts b/src/parsing.ts
index 61cffde..0fe847a 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1490,6 +1490,18 @@ export function getRenderInfoFromYaml(
         }
         // console.log(month.threshold);
 
+        // yMin
+        if (typeof yamlMonth?.yMin === "number") {
+            month.yMin = yamlMonth.yMin;
+        }
+        // console.log(month.yMin);
+
+        // yMax
+        if (typeof yamlMonth?.yMax === "number") {
+            month.yMax = yamlMonth.yMax;
+        }
+        // console.log(month.yMax);
+
         // color
         if (typeof yamlMonth?.color === "string") {
             month.color = yamlMonth.color;
@@ -1532,6 +1544,12 @@ export function getRenderInfoFromYaml(
         }
         // console.log(month.circleColor);
 
+        // circleWithGradient
+        if (typeof yamlMonth?.circleWithGradient === "boolean") {
+            month.circleWithGradient = yamlMonth.circleWithGradient;
+        }
+        // console.log(month.circleWithGradient);
+
         // headerYearColor
         if (typeof yamlMonth?.headerYearColor === "string") {
             month.headerYearColor = yamlMonth.headerYearColor;

From 663e5c327109b75987d140cfa1ea90cd82825719 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 22 Jun 2021 21:48:07 +0800
Subject: [PATCH 087/402] Add heatmap view

---
 examples/TestHeatmap.md |  12 ++
 src/data.ts             |  23 ++++
 src/heatmap.ts          | 277 ++++++++++++++++++++++++++++++++++++++++
 src/month.ts            |   1 +
 src/parsing.ts          |  31 ++++-
 src/rendering.ts        |   8 ++
 6 files changed, 350 insertions(+), 2 deletions(-)
 create mode 100644 examples/TestHeatmap.md
 create mode 100644 src/heatmap.ts

diff --git a/examples/TestHeatmap.md b/examples/TestHeatmap.md
new file mode 100644
index 0000000..5bc362c
--- /dev/null
+++ b/examples/TestHeatmap.md
@@ -0,0 +1,12 @@
+# Test Heat Map
+
+``` tracker
+searchType: tag
+searchTarget: exercise-pushup
+folder: diary
+heatmap:
+```
+
+
+Please also check those search targets in markdown files under folder 'diary'.
+
diff --git a/src/data.ts b/src/data.ts
index 292adbe..f14d654 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -17,6 +17,7 @@ export enum OutputType {
     Summary,
     Table,
     Month,
+    Heatmap,
     Bullet,
     Unknown,
 }
@@ -523,6 +524,7 @@ export class RenderInfo {
     bar: BarInfo[];
     summary: SummaryInfo[];
     month: MonthInfo[];
+    heatmap: HeatmapInfo[];
     bullet: BulletInfo[];
 
     public datasets: Datasets | null;
@@ -557,6 +559,7 @@ export class RenderInfo {
         this.summary = [];
         this.bar = [];
         this.month = [];
+        this.heatmap = [];
         this.bullet = [];
 
         this.datasets = null;
@@ -680,6 +683,7 @@ export class SummaryInfo extends OutputInfo {
 }
 
 export class MonthInfo {
+    mode: string;
     dataset: string;
     startWeekOn: string;
     threshold: number;
@@ -703,6 +707,7 @@ export class MonthInfo {
     selectedDate: string;
 
     constructor() {
+        this.mode = "";
         this.dataset = "0";
         this.startWeekOn = "Sun";
         this.threshold = 0.0; // if value > threshold, will show dot
@@ -727,6 +732,24 @@ export class MonthInfo {
     }
 }
 
+export class HeatmapInfo {
+    dataset: string;
+    startWeekOn: string;
+    orientation: string;
+    yMin: number;
+    yMax: number;
+    color: string;
+
+    constructor() {
+        this.dataset = "0";
+        this.startWeekOn = "Sun";
+        this.orientation = "vertical";
+        this.yMin = null;
+        this.yMax = null;
+        this.color = null;
+    }
+} 
+
 export class BulletInfo extends OutputInfo {
     title: string;
     dataset: string;
diff --git a/src/heatmap.ts b/src/heatmap.ts
new file mode 100644
index 0000000..fd4c53b
--- /dev/null
+++ b/src/heatmap.ts
@@ -0,0 +1,277 @@
+import { Moment } from "moment";
+import {
+    Datasets,
+    DataPoint,
+    RenderInfo,
+    MonthInfo,
+    HeatmapInfo,
+    Dataset,
+    Size,
+    Transform,
+    ChartElements,
+    OutputType,
+    ValueType,
+} from "./data";
+import * as helper from "./helper";
+import * as d3 from "d3";
+
+interface DayInfo {
+    date: string;
+    value: number;
+    scaledValue: number;
+    row: number;
+    col: number;
+}
+
+function createAreas(
+    chartElements: ChartElements,
+    canvas: HTMLElement,
+    renderInfo: RenderInfo,
+    heatmapInfo: HeatmapInfo
+): ChartElements {
+    // clean areas
+    d3.select(canvas).select("#svg").remove();
+    var props = Object.getOwnPropertyNames(chartElements);
+    for (var i = 0; i < props.length; i++) {
+        // d3.select(chartElements[props[i]]).remove();
+        delete chartElements[props[i]];
+    }
+    // console.log(chartElements);
+
+    // whole area for plotting, includes margins
+    let svg = d3
+        .select(canvas)
+        .append("svg")
+        .attr("id", "svg")
+        .attr(
+            "width",
+            renderInfo.dataAreaSize.width +
+                renderInfo.margin.left +
+                renderInfo.margin.right
+        )
+        .attr(
+            "height",
+            renderInfo.dataAreaSize.height +
+                renderInfo.margin.top +
+                renderInfo.margin.bottom
+        );
+    chartElements["svg"] = svg;
+
+    // graphArea, includes chartArea, title, legend
+    let graphArea = svg
+        .append("g")
+        .attr("id", "graphArea")
+        .attr(
+            "transform",
+            "translate(" +
+                renderInfo.margin.left +
+                "," +
+                renderInfo.margin.top +
+                ")"
+        )
+        .attr("width", renderInfo.dataAreaSize.width + renderInfo.margin.right)
+        .attr(
+            "height",
+            renderInfo.dataAreaSize.height + renderInfo.margin.bottom
+        );
+    chartElements["graphArea"] = graphArea;
+
+    // dataArea, under graphArea, includes points, lines, xAxis, yAxis
+    let dataArea = graphArea
+        .append("g")
+        .attr("id", "dataArea")
+        .attr("width", renderInfo.dataAreaSize.width)
+        .attr("height", renderInfo.dataAreaSize.height);
+    chartElements["dataArea"] = dataArea;
+
+    return chartElements;
+}
+
+function renderHeatmapHeader(
+    canvas: HTMLElement,
+    chartElements: ChartElements,
+    renderInfo: RenderInfo,
+    heatmapInfo: HeatmapInfo,
+    dataset: Dataset
+) {
+    // console.log("renderMonthHeader")
+
+    if (!renderInfo || !heatmapInfo) return;
+
+}
+
+function renderHeatmapDays(
+    canvas: HTMLElement,
+    chartElements: ChartElements,
+    renderInfo: RenderInfo,
+    heatmapInfo: HeatmapInfo,
+    dataset: Dataset,
+) {
+    // console.log("renderHeatmapDays");
+
+    if (!renderInfo || !heatmapInfo) return;
+
+    let cellSize = 20;
+    let dotRadius = cellSize / 2.0 * 0.6;
+
+    // Get min and max, null values will be treated as zero here
+    let yMin = d3.min(dataset.getValues());
+    if (heatmapInfo.yMin !== null) {
+        yMin = heatmapInfo.yMin;
+    }
+    let yMax = d3.max(dataset.getValues());
+    if (heatmapInfo.yMax !== null) {
+        yMax = heatmapInfo.yMax;
+    }
+    // console.log(`yMin:${yMin}, yMax:${yMax}`);
+
+    // Prepare data for graph
+    let daysInHeatmapView: Array<DayInfo> = [];
+    const dataStartDate = dataset.getStartDate().clone();
+    let startDate = dataStartDate
+        .clone()
+        .subtract(dataStartDate.day(), "days");
+    if (heatmapInfo.startWeekOn.toLowerCase() === "mon") {
+        startDate = startDate.add(1, "days");
+    }
+    const dataEndDate = dataset.getEndDate().clone();
+    let endDate = dataEndDate.clone().add(7 - dataEndDate.day() - 1, "days");
+    if (heatmapInfo.startWeekOn.toLowerCase() === "mon") {
+        endDate = endDate.add(1, "days");
+    }
+    // console.log(startDate.format("YYYY-MM-DD"));
+    // console.log(endDate.format("YYYY-MM-DD"));
+
+    let indCol = 0;
+    let indRow = 0;
+    let ind = 0;
+    for (
+        let curDate = startDate.clone();
+        curDate <= endDate;
+        curDate.add(1, "days")
+    ) {
+        if (heatmapInfo.startWeekOn.toLowerCase() === "mon") {
+            indCol = curDate.day() - 1;
+            if (indCol < 0) {
+                indCol = 6;
+            }
+            indRow = Math.floor(ind / 7);
+        } else {
+            indCol = curDate.day(); // 0~6
+            indRow = Math.floor(ind / 7);
+        }
+
+        // curValue and scaledValue
+        let curValue = dataset.getValue(curDate);
+        let scaledValue = 0;
+        if (Number.isNumber(yMax) && Number.isNumber(yMin) && yMax - yMin > 0) {
+            scaledValue = (curValue - yMin) / (yMax - yMin);
+        }
+
+        daysInHeatmapView.push({
+            date: curDate.format(renderInfo.dateFormat),
+            value: curValue,
+            scaledValue: scaledValue,
+            row: indRow,
+            col: indCol,
+        });
+
+        ind++;
+    }
+    // console.log(daysInHeatmapView);
+
+    // scale
+    let totalDayBlockWidth = (indCol + 1) * cellSize;
+    let totalBlockHeight = (indRow + 1) * cellSize;
+    let scale = d3
+        .scaleLinear()
+        .domain([-0.5, 6.5])
+        .range([0, totalDayBlockWidth]);
+
+    // circles
+    let heatmapColor = "#69b3a2";
+    if (heatmapInfo.color) {
+        heatmapColor = heatmapInfo.color;
+    }
+
+    // days, shown as dots or squares
+    let days = chartElements.dataArea
+        .selectAll("dot")
+        .data(daysInHeatmapView)
+        .enter()
+        .append("circle")
+        .attr("r", dotRadius)
+        .attr("cx", function (d: DayInfo) {
+            return scale(d.col);
+        })
+        .attr("cy", function (d: DayInfo) {
+            return scale(d.row);
+        })
+        .style("fill", function (d: DayInfo) {
+            return d3.interpolateLab(
+                    "white",
+                    heatmapColor
+                )(d.scaledValue);
+        })
+        .style("cursor", "default");
+
+    // Expand areas
+    let svgWidth = parseFloat(chartElements.svg.attr("width"));
+    let svgHeight = parseFloat(chartElements.svg.attr("height"));
+    let graphAreaWidth = parseFloat(chartElements.graphArea.attr("width"));
+    let graphAreaHeight = parseFloat(chartElements.graphArea.attr("height"));
+    let totalHeight =
+        (indRow + 2) * cellSize;// + parseFloat(chartElements.header.attr("height"));
+    let totalWidth = (indCol + 1) * cellSize;
+    if (totalHeight > svgHeight) {
+        helper.expandArea(chartElements.svg, 0, totalHeight - svgHeight);
+    }
+    if (totalWidth > svgWidth) {
+        helper.expandArea(chartElements.svg, totalWidth - svgWidth, 0);
+    }
+    if (totalHeight > graphAreaHeight) {
+        helper.expandArea(
+            chartElements.graphArea,
+            0,
+            totalHeight - graphAreaHeight
+        );
+    }
+    if (totalWidth > graphAreaWidth) {
+        helper.expandArea(chartElements.svg, totalWidth - graphAreaWidth, 0);
+    }
+}
+
+export function renderHeatmap(
+    canvas: HTMLElement,
+    renderInfo: RenderInfo,
+    heatmapInfo: HeatmapInfo
+) {
+    // console.log("renderHeatmap");
+    // console.log(renderInfo);
+    if (!renderInfo || !renderHeatmap) return;
+
+    let chartElements: ChartElements = {};
+    chartElements = createAreas(chartElements, canvas, renderInfo, heatmapInfo);
+
+    let today = window.moment();
+    let lastDataMonthDate = renderInfo.datasets.getDates().last();
+
+    let datasetId = parseFloat(heatmapInfo.dataset);
+    let dataset = renderInfo.datasets.getDatasetById(datasetId);
+
+    renderHeatmapHeader(
+        canvas,
+        chartElements,
+        renderInfo,
+        heatmapInfo,
+        dataset
+    );
+
+    renderHeatmapDays(
+        canvas,
+        chartElements,
+        renderInfo,
+        heatmapInfo,
+        dataset
+    );
+}
diff --git a/src/month.ts b/src/month.ts
index ab29e6b..717061b 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -110,6 +110,7 @@ function clearSelection(chartElements: ChartElements, monthInfo: MonthInfo) {
 
     chartElements.monitor.text("");
 }
+
 function renderMonthHeader(
     canvas: HTMLElement,
     chartElements: ChartElements,
diff --git a/src/parsing.ts b/src/parsing.ts
index 0fe847a..3abceea 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -10,6 +10,7 @@ import {
     OutputType,
     LineInfo,
     MonthInfo,
+    HeatmapInfo,
     BulletInfo,
 } from "./data";
 import { TFolder, normalizePath } from "obsidian";
@@ -886,6 +887,7 @@ export function getRenderInfoFromYaml(
     let yamlBarKeys = [];
     let yamlSummaryKeys = [];
     let yamlMonthKeys = [];
+    let yamlHeatmapKeys = [];
     let yamlBulletKeys = [];
     for (let key of keysFoundInYAML) {
         if (/line[0-9]*/.test(key)) {
@@ -908,6 +910,10 @@ export function getRenderInfoFromYaml(
             yamlMonthKeys.push(key);
             additionalAllowedKeys.push(key);
         }
+        if (/heatmap[0-9]*/.test(key)) {
+            yamlHeatmapKeys.push(key);
+            additionalAllowedKeys.push(key);
+        }
     }
     // console.log(additionalAllowedKeys);
     for (let key of keysFoundInYAML) {
@@ -924,8 +930,9 @@ export function getRenderInfoFromYaml(
         yamlLineKeys.length +
         yamlBarKeys.length +
         yamlSummaryKeys.length +
-        +yamlBulletKeys.length +
-        yamlMonthKeys.length;
+        yamlBulletKeys.length +
+        yamlMonthKeys.length +
+        yamlHeatmapKeys.length;
     if (totalNumOutputs === 0) {
         return "No output parameter provided, please place line, bar, month, bullet, or summary.";
     }
@@ -1584,6 +1591,26 @@ export function getRenderInfoFromYaml(
     } // Month related parameters
     // console.log(renderInfo.month);
 
+    // Heatmap related parameters
+    for (let heatmapKey of yamlHeatmapKeys) {
+        let heatmap = new HeatmapInfo();
+        let yamlHeatmap = yaml[heatmapKey];
+
+        let keysOfHeatmapInfo = getAvailableKeysOfClass(heatmap);
+        let keysFoundInYAML = getAvailableKeysOfClass(yamlHeatmap);
+        // console.log(keysOfHeatmapInfo);
+        // console.log(keysFoundInYAML);
+        for (let key of keysFoundInYAML) {
+            if (!keysOfHeatmapInfo.includes(key)) {
+                errorMessage = "'" + key + "' is not an available key";
+                return errorMessage;
+            }
+        }
+
+        renderInfo.heatmap.push(heatmap);
+    }
+    // console.log(renderInfo.heatmap);
+
     // Bullet related parameters
     for (let bulletKey of yamlBulletKeys) {
         let bullet = new BulletInfo();
diff --git a/src/rendering.ts b/src/rendering.ts
index e2fea3c..db0b654 100644
--- a/src/rendering.ts
+++ b/src/rendering.ts
@@ -16,9 +16,11 @@ import {
     SummaryInfo,
     BulletInfo,
     MonthInfo,
+    HeatmapInfo
 } from "./data";
 import * as summary from "./summary";
 import * as month from "./month";
+import * as heatmap from "./heatmap"
 import * as bullet from "./bullet";
 import * as helper from "./helper";
 
@@ -175,6 +177,12 @@ export function render(canvas: HTMLElement, renderInfo: RenderInfo) {
             return ret;
         }
     }
+    for (let heatmapInfo of renderInfo.heatmap) {
+        let ret = heatmap.renderHeatmap(canvas, renderInfo, heatmapInfo);
+        if (typeof ret === "string") {
+            return ret;
+        }
+    }
 }
 
 function renderXAxis(

From 35087f8bfe53bdbe12005f70ae340c2ae88bc35a Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 22 Jun 2021 21:54:34 +0800
Subject: [PATCH 088/402] Rename parameter circleWithGradient as
 circleColorByValue

---
 examples/TestCalendar.md | 22 +++++++++++-----------
 src/data.ts              |  6 +++---
 src/month.ts             |  6 +++---
 src/parsing.ts           |  8 ++++----
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
index e42ac0b..f4764f1 100644
--- a/examples/TestCalendar.md
+++ b/examples/TestCalendar.md
@@ -8,11 +8,11 @@ month:
     startWeekOn:
     threshold: 40
     color: tomato
-	headerMonthColor: orange
+    headerMonthColor: orange
     dimNotInMonth: false
-	todayRingColor: orange
-	selectedRingColor: steelblue
-	showSelectedValue: true
+    todayRingColor: orange
+    selectedRingColor: steelblue
+    showSelectedValue: true
 ```
 
 ``` tracker
@@ -22,8 +22,8 @@ folder: diary
 month:
     startWeekOn: 
     color: steelblue
-	headerMonthColor: green
-	selectedRingColor: orange
+    headerMonthColor: green
+    selectedRingColor: orange
 ```
 
 Use default colors
@@ -43,14 +43,14 @@ searchTarget: exercise-pushup
 folder: diary
 month:
     startWeekOn:
-	useThreshold: false
     threshold: 40
     color: green
-	headerMonthColor: orange
+    headerMonthColor: orange
     dimNotInMonth: false
-	todayRingColor: orange
-	selectedRingColor: steelblue
-	showSelectedValue: true
+    todayRingColor: orange
+    selectedRingColor: steelblue
+    circleColorByValue: true
+    showSelectedValue: true
 ```
 
 ``` tracker
diff --git a/src/data.ts b/src/data.ts
index f14d654..b0922e0 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -697,7 +697,7 @@ export class MonthInfo {
     showSelectedValue: boolean;
     showSelectedRing: boolean;
     circleColor: string;
-    circleWithGradient: boolean;
+    circleColorByValue: boolean;
     headerYearColor: string;
     headerMonthColor: string;
     dividingLineColor: string;
@@ -721,7 +721,7 @@ export class MonthInfo {
         this.showSelectedValue = true;
         this.showSelectedRing = true;
         this.circleColor = null;
-        this.circleWithGradient = false;
+        this.circleColorByValue = false;
         this.headerYearColor = null;
         this.headerMonthColor = null;
         this.dividingLineColor = null;
@@ -748,7 +748,7 @@ export class HeatmapInfo {
         this.yMax = null;
         this.color = null;
     }
-} 
+}
 
 export class BulletInfo extends OutputInfo {
     title: string;
diff --git a/src/month.ts b/src/month.ts
index 717061b..2da81b0 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -541,7 +541,7 @@ function renderMonthDays(
             .attr("height", streakHeight)
             .style("fill", function (d: DayInfo) {
                 if (d.showCircle) {
-                    if (!monthInfo.circleWithGradient) {
+                    if (!monthInfo.circleColorByValue) {
                         return streakColor;
                     }
                     return d3.interpolateLab(
@@ -584,7 +584,7 @@ function renderMonthDays(
             .attr("height", streakHeight)
             .style("fill", function (d: DayInfo) {
                 if (d.showCircle) {
-                    if (!monthInfo.circleWithGradient) {
+                    if (!monthInfo.circleColorByValue) {
                         return streakColor;
                     }
                     return d3.interpolateLab(
@@ -627,7 +627,7 @@ function renderMonthDays(
             })
             .style("fill", function (d: DayInfo) {
                 if (d.showCircle) {
-                    if (!monthInfo.circleWithGradient) {
+                    if (!monthInfo.circleColorByValue) {
                         return circleColor;
                     }
                     return d3.interpolateLab(
diff --git a/src/parsing.ts b/src/parsing.ts
index 3abceea..95f7366 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1551,11 +1551,11 @@ export function getRenderInfoFromYaml(
         }
         // console.log(month.circleColor);
 
-        // circleWithGradient
-        if (typeof yamlMonth?.circleWithGradient === "boolean") {
-            month.circleWithGradient = yamlMonth.circleWithGradient;
+        // circleColorByValue
+        if (typeof yamlMonth?.circleColorByValue === "boolean") {
+            month.circleColorByValue = yamlMonth.circleColorByValue;
         }
-        // console.log(month.circleWithGradient);
+        // console.log(month.circleColorByValue);
 
         // headerYearColor
         if (typeof yamlMonth?.headerYearColor === "string") {

From dc728969f3a921107ddc7c877f68834ec1c16a9b Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Wed, 23 Jun 2021 22:49:53 +0800
Subject: [PATCH 089/402] Allow multiple inputs for parameter dataset in month
 view

---
 src/data.ts    |   6 +--
 src/month.ts   |  25 +++--------
 src/parsing.ts | 112 ++++++++++++++++++++++++++++---------------------
 3 files changed, 73 insertions(+), 70 deletions(-)

diff --git a/src/data.ts b/src/data.ts
index b0922e0..fb99bda 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -684,7 +684,7 @@ export class SummaryInfo extends OutputInfo {
 
 export class MonthInfo {
     mode: string;
-    dataset: string;
+    dataset: number[];
     startWeekOn: string;
     threshold: number;
     yMin: number;
@@ -707,8 +707,8 @@ export class MonthInfo {
     selectedDate: string;
 
     constructor() {
-        this.mode = "";
-        this.dataset = "0";
+        this.mode = "circle"; // circle, symbol
+        this.dataset = [];
         this.startWeekOn = "Sun";
         this.threshold = 0.0; // if value > threshold, will show dot
         this.yMin = null;
diff --git a/src/month.ts b/src/month.ts
index 2da81b0..9926efb 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -116,7 +116,6 @@ function renderMonthHeader(
     chartElements: ChartElements,
     renderInfo: RenderInfo,
     monthInfo: MonthInfo,
-    dataset: Dataset,
     curMonthDate: Moment
 ) {
     // console.log("renderMonthHeader")
@@ -357,13 +356,15 @@ function renderMonthDays(
     chartElements: ChartElements,
     renderInfo: RenderInfo,
     monthInfo: MonthInfo,
-    dataset: Dataset,
     curMonthDate: Moment
 ) {
     // console.log("renderMonthDays");
 
     if (!renderInfo || !monthInfo) return;
 
+    let datasetIds = monthInfo.dataset;
+    if (datasetIds.length === 0) return;
+
     let curMonth = curMonthDate.month(); // 0~11
     let curDaysInMonth = curMonthDate.daysInMonth(); // 28~31
 
@@ -374,6 +375,8 @@ function renderMonthDays(
     let streakWidth = (cellSize - dotRadius * 2.0) / 2.0;
     let streakHeight = 3;
 
+    let dataset = renderInfo.datasets.getDatasetById(datasetIds[0]);
+
     // Get min and max, null values will be treated as zero here
     let yMin = d3.min(dataset.getValues());
     if (monthInfo.yMin !== null) {
@@ -808,27 +811,16 @@ function refresh(
 
     chartElements = createAreas(chartElements, canvas, renderInfo, monthInfo);
 
-    let datasetId = parseFloat(monthInfo.dataset);
-    let dataset = renderInfo.datasets.getDatasetById(datasetId);
-
     // render
     renderMonthHeader(
         canvas,
         chartElements,
         renderInfo,
         monthInfo,
-        dataset,
         curMonthDate
     );
 
-    renderMonthDays(
-        canvas,
-        chartElements,
-        renderInfo,
-        monthInfo,
-        dataset,
-        curMonthDate
-    );
+    renderMonthDays(canvas, chartElements, renderInfo, monthInfo, curMonthDate);
 }
 
 export function renderMonth(
@@ -846,15 +838,11 @@ export function renderMonth(
     let today = window.moment();
     let lastDataMonthDate = renderInfo.datasets.getDates().last();
 
-    let datasetId = parseFloat(monthInfo.dataset);
-    let dataset = renderInfo.datasets.getDatasetById(datasetId);
-
     renderMonthHeader(
         canvas,
         chartElements,
         renderInfo,
         monthInfo,
-        dataset,
         lastDataMonthDate
     );
 
@@ -863,7 +851,6 @@ export function renderMonth(
         chartElements,
         renderInfo,
         monthInfo,
-        dataset,
         lastDataMonthDate
     );
 }
diff --git a/src/parsing.ts b/src/parsing.ts
index 95f7366..fac9683 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -12,6 +12,7 @@ import {
     MonthInfo,
     HeatmapInfo,
     BulletInfo,
+    Dataset,
 } from "./data";
 import { TFolder, normalizePath } from "obsidian";
 import { parseYaml } from "obsidian";
@@ -505,6 +506,58 @@ function getStringArrayFromInput(
     return array;
 }
 
+function getNumberArray(name: string, input: any): Array<number> | string {
+    let numArray: Array<number> = [];
+
+    if (typeof input === "undefined" || input === null) return numArray;
+
+    if (typeof input === "object") {
+        if (Array.isArray(input)) {
+            for (let elem of input) {
+                if (typeof elem === "string") {
+                    let v = parseFloat(elem);
+                    if (Number.isNumber(v)) {
+                        numArray.push(v);
+                    } else {
+                        let errorMessage = `Parameter '${name}' accepts only numbers`;
+                        return errorMessage;
+                    }
+                }
+            }
+        }
+    } else if (typeof input === "string") {
+        let splitted = input.split(",");
+        if (splitted.length > 1) {
+            for (let piece of splitted) {
+                let v = parseFloat(piece.trim());
+                if (!Number.isNaN(v)) {
+                    // Number.isNumber(NaN) --> true
+                    numArray.push(v);
+                } else {
+                    let errorMessage = `Parameter '${name}' accepts only numbers`;
+                    return errorMessage;
+                }
+            }
+        } else if (input === "") {
+            let errorMessage = `Empty ${name} is not allowed.`;
+            return errorMessage;
+        } else {
+            let v = parseFloat(input);
+            if (Number.isNumber(v)) {
+                numArray.push(v);
+            } else {
+                let errorMessage = `Parameter '${name}' accepts only numbers`;
+                return errorMessage;
+            }
+        }
+    } else {
+        let errorMessage = `Invalid ${name}`;
+        return errorMessage;
+    }
+
+    return numArray;
+}
+
 function parseCommonChartInfo(yaml: any, renderInfo: CommonChartInfo) {
     // console.log("parseCommonChartInfo");
 
@@ -1474,9 +1527,14 @@ export function getRenderInfoFromYaml(
         }
 
         // dataset
-        if (typeof yamlMonth?.dataset === "string") {
-            month.dataset = yamlMonth.dataset;
+        let retDataset = getNumberArray("dataset", yamlMonth?.dataset);
+        if (typeof retDataset === "string") {
+            return retDataset;
+        }
+        if (retDataset.length === 0) {
+            retDataset.push(0);
         }
+        month.dataset = retDataset;
         // console.log(month.dataset);
 
         // startWeekOn
@@ -1646,53 +1704,11 @@ export function getRenderInfoFromYaml(
         // console.log(bullet.orientation);
 
         // range
-        let range: Array<number> = [];
-        if (
-            typeof yamlBullet?.range === "object" &&
-            yamlBullet?.range !== null
-        ) {
-            if (Array.isArray(yamlBullet.range)) {
-                for (let r of yamlBullet.range) {
-                    if (typeof r === "string") {
-                        let v = parseFloat(r);
-                        if (Number.isNumber(v)) {
-                            range.push(v);
-                        } else {
-                            errorMessage =
-                                "Parameter 'range' accepts only numbers";
-                            return errorMessage;
-                        }
-                    }
-                }
-            }
-        } else if (typeof yamlBullet?.range === "string") {
-            let splitted = yamlBullet?.range.split(",");
-            if (splitted.length > 1) {
-                for (let piece of splitted) {
-                    let v = parseFloat(piece.trim());
-                    if (!Number.isNaN(v)) {
-                        // Number.isNumber(NaN) --> true
-                        range.push(v);
-                    } else {
-                        errorMessage = "Parameter 'range' accepts only numbers";
-                        return errorMessage;
-                    }
-                }
-            } else if (yamlBullet?.range === "") {
-                errorMessage = "Empty range is not allowed.";
-            } else {
-                let v = parseFloat(yamlBullet?.range);
-                if (Number.isNumber(v)) {
-                    range.push(v);
-                } else {
-                    errorMessage = "Parameter 'range' accepts only numbers";
-                    return errorMessage;
-                }
-            }
-        } else {
-            errorMessage = "Invalid range";
-            return errorMessage;
+        let retRange = getNumberArray("range", yamlBullet?.range);
+        if (typeof retRange === "string") {
+            return retRange;
         }
+        let range = retRange as Array<number>;
         // Check the value is monotonically increasing
         // Check the value is not negative
         if (range.length === 1) {

From bd5d3b7899c41254b87763736ceb816ebe0deb92 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Wed, 23 Jun 2021 23:11:57 +0800
Subject: [PATCH 090/402] Fix regex test for input keys

---
 src/parsing.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/parsing.ts b/src/parsing.ts
index fac9683..1262e77 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -943,27 +943,28 @@ export function getRenderInfoFromYaml(
     let yamlHeatmapKeys = [];
     let yamlBulletKeys = [];
     for (let key of keysFoundInYAML) {
-        if (/line[0-9]*/.test(key)) {
+        if (/^line[0-9]*$/.test(key)) {
             yamlLineKeys.push(key);
             additionalAllowedKeys.push(key);
+            console.log("aaaaaa");
         }
-        if (/bar[0-9]*/.test(key)) {
+        if (/^bar[0-9]*$/.test(key)) {
             yamlBarKeys.push(key);
             additionalAllowedKeys.push(key);
         }
-        if (/summary[0-9]*/.test(key)) {
+        if (/^summary[0-9]*$/.test(key)) {
             yamlSummaryKeys.push(key);
             additionalAllowedKeys.push(key);
         }
-        if (/bullet[0-9]*/.test(key)) {
+        if (/^bullet[0-9]*$/.test(key)) {
             yamlBulletKeys.push(key);
             additionalAllowedKeys.push(key);
         }
-        if (/month[0-9]*/.test(key)) {
+        if (/^month[0-9]*$/.test(key)) {
             yamlMonthKeys.push(key);
             additionalAllowedKeys.push(key);
         }
-        if (/heatmap[0-9]*/.test(key)) {
+        if (/^heatmap[0-9]*$/.test(key)) {
             yamlHeatmapKeys.push(key);
             additionalAllowedKeys.push(key);
         }

From 22118c46bbe63cea0473436c8f16a89c0fd8809f Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 24 Jun 2021 18:13:44 +0800
Subject: [PATCH 091/402] Add rotator to change dataset in month view

---
 examples/TestCalendar.md | 24 +++++++++++++++
 src/data.ts              |  8 +++--
 src/month.ts             | 65 ++++++++++++++++++++++++++++++----------
 src/parsing.ts           | 28 +++++++++++++++--
 4 files changed, 104 insertions(+), 21 deletions(-)

diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
index f4764f1..df23379 100644
--- a/examples/TestCalendar.md
+++ b/examples/TestCalendar.md
@@ -1,8 +1,10 @@
 # Test Calendar
 
+## Single target
 ``` tracker
 searchType: tag
 searchTarget: exercise-pushup
+datasetName: PushUp
 folder: diary
 month:
     startWeekOn:
@@ -18,6 +20,7 @@ month:
 ``` tracker
 searchType: tag
 searchTarget: meditation
+datasetName: Meditation
 folder: diary
 month:
     startWeekOn: 
@@ -30,6 +33,7 @@ Use default colors
 ``` tracker
 searchType: tag
 searchTarget: exercise-pushup
+datasetName: PushUp
 folder: diary
 month:
     startWeekOn:
@@ -40,6 +44,7 @@ Gradient circle
 ``` tracker
 searchType: tag
 searchTarget: exercise-pushup
+datasetName: PushUp
 folder: diary
 month:
     startWeekOn:
@@ -60,5 +65,24 @@ summary:
     template: "minDate: {{minDate}}\nminValue: {{min}}\nmaxDate: {{maxDate}}\nmaxValue: {{max}}"
 ```
 
+## Multiple targets
+``` tracker
+searchType: tag
+searchTarget: exercise-pushup, meditation
+datasetName: PushUp, Meditation
+folder: diary
+month:
+    dataset: 0, 1
+    startWeekOn: 'Sun'
+    threshold: 40, 0
+    color: green
+    headerMonthColor: orange
+    dimNotInMonth: false
+    todayRingColor: orange
+    selectedRingColor: steelblue
+    circleColorByValue: true
+    showSelectedValue: true
+```
+
 Please also check those search targets in markdown files under folder 'diary'.
 
diff --git a/src/data.ts b/src/data.ts
index fb99bda..6d97932 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -686,7 +686,7 @@ export class MonthInfo {
     mode: string;
     dataset: number[];
     startWeekOn: string;
-    threshold: number;
+    threshold: number[];
     yMin: number;
     yMax: number;
     showCircle: boolean;
@@ -705,12 +705,13 @@ export class MonthInfo {
     selectedRingColor: string;
 
     selectedDate: string;
+    selectedDataset: number;
 
     constructor() {
         this.mode = "circle"; // circle, symbol
         this.dataset = [];
         this.startWeekOn = "Sun";
-        this.threshold = 0.0; // if value > threshold, will show dot
+        this.threshold = []; // if value > threshold, will show dot
         this.yMin = null;
         this.yMax = null;
         this.showCircle = true;
@@ -728,7 +729,8 @@ export class MonthInfo {
         this.todayRingColor = ""; // white
         this.selectedRingColor = "firebrick";
 
-        this.selectedDate = "";
+        this.selectedDate = ""; // selected date
+        this.selectedDataset = 0; // selected index of dataset
     }
 }
 
diff --git a/src/month.ts b/src/month.ts
index 9926efb..1b7e929 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -106,6 +106,7 @@ function clearSelection(chartElements: ChartElements, monthInfo: MonthInfo) {
             d3.select(circle).style("stroke", "none");
         }
     }
+
     monthInfo.selectedDate = "";
 
     chartElements.monitor.text("");
@@ -122,6 +123,12 @@ function renderMonthHeader(
 
     if (!renderInfo || !monthInfo) return;
 
+    let curDatasetId = monthInfo.selectedDataset;
+    let datasetIds = monthInfo.dataset;
+    if (datasetIds.length === 0) return;
+    let dataset = renderInfo.datasets.getDatasetById(curDatasetId);
+    let datasetName = dataset.getName();
+
     let curMonth = curMonthDate.month(); // 0~11
     let curDaysInMonth = curMonthDate.daysInMonth(); // 28~31
     let curYear = curMonthDate.year();
@@ -216,11 +223,10 @@ function renderMonthHeader(
         titleMonth.style("fill", titleMonthColor);
     }
 
-    // value monitor
-    let valueMonitor = headerGroup
+    // dataset rotator
+    let datasetRotator = headerGroup
         .append("text")
-        .text("")
-        .attr("id", "valueMonitor")
+        .text(datasetName)
         .attr(
             "transform",
             "translate(" +
@@ -231,8 +237,21 @@ function renderMonthHeader(
         )
         .attr("class", "tracker-month-title-monitor")
         .style("cursor", "pointer")
-        .style("fill", monthInfo.selectedRingColor);
-    chartElements["monitor"] = valueMonitor;
+        .on("click", function (event: any) {
+            if (monthInfo.dataset.length <= 1) return;
+            // clear circles
+            clearSelection(chartElements, monthInfo);
+            // show next target
+            let curDataset = monthInfo.selectedDataset + 1;
+            if (curDataset >= monthInfo.dataset.length) {
+                curDataset = 0;
+            }
+            monthInfo.selectedDataset = curDataset;
+            // console.log(monthInfo.selectedDataset);
+
+            refresh(canvas, chartElements, renderInfo, monthInfo, curMonthDate);
+        });
+    chartElements["rotator"] = datasetRotator;
 
     // arrow left
     let arrowLeft = headerGroup
@@ -251,6 +270,7 @@ function renderMonthHeader(
         .on("click", function (event: any) {
             // console.log("left arrow clicked");
             clearSelection(chartElements, monthInfo);
+            monthInfo.selectedDate = "";
             let prevMonthDate = curMonthDate.clone().add(-1, "month");
             refresh(
                 canvas,
@@ -279,6 +299,7 @@ function renderMonthHeader(
         .on("click", function (event: any) {
             // console.log("right arrow clicked");
             clearSelection(chartElements, monthInfo);
+
             let nextMonthDate = curMonthDate.clone().add(1, "month");
             refresh(
                 canvas,
@@ -362,8 +383,12 @@ function renderMonthDays(
 
     if (!renderInfo || !monthInfo) return;
 
+    let curDatasetId = monthInfo.selectedDataset;
     let datasetIds = monthInfo.dataset;
     if (datasetIds.length === 0) return;
+    let dataset = renderInfo.datasets.getDatasetById(curDatasetId);
+
+    let threshold = monthInfo.threshold[curDatasetId];
 
     let curMonth = curMonthDate.month(); // 0~11
     let curDaysInMonth = curMonthDate.daysInMonth(); // 28~31
@@ -375,8 +400,6 @@ function renderMonthDays(
     let streakWidth = (cellSize - dotRadius * 2.0) / 2.0;
     let streakHeight = 3;
 
-    let dataset = renderInfo.datasets.getDatasetById(datasetIds[0]);
-
     // Get min and max, null values will be treated as zero here
     let yMin = d3.min(dataset.getValues());
     if (monthInfo.yMin !== null) {
@@ -388,8 +411,7 @@ function renderMonthDays(
     }
     // console.log(`yMin:${yMin}, yMax:${yMax}`);
 
-    // Prepare data for graph
-    let daysInMonthView: Array<DayInfo> = [];
+    // Start and end
     const monthStartDate = curMonthDate.clone().startOf("month");
     let startDate = monthStartDate
         .clone()
@@ -406,6 +428,9 @@ function renderMonthDays(
     const dataEndDate = dataset.getEndDate().clone();
     // console.log(monthStartDate.format("YYYY-MM-DD"));
     // console.log(startDate.format("YYYY-MM-DD"));
+
+    // Prepare data for graph
+    let daysInMonthView: Array<DayInfo> = [];
     let indCol = 0;
     let indRow = 0;
     let ind = 0;
@@ -443,7 +468,7 @@ function renderMonthDays(
         let curValue = dataset.getValue(curDate);
         let showCircle = false;
         if (curValue !== null) {
-            if (curValue > monthInfo.threshold) {
+            if (curValue > threshold) {
                 showCircle = true;
             }
         }
@@ -462,14 +487,14 @@ function renderMonthDays(
         let nextValue = dataset.getValue(curDate, 1);
         let prevValue = dataset.getValue(curDate, -1);
         let streakIn = false;
-        if (curValue !== null && curValue > monthInfo.threshold) {
-            if (prevValue !== null && prevValue > monthInfo.threshold) {
+        if (curValue !== null && curValue > threshold) {
+            if (prevValue !== null && prevValue > threshold) {
                 streakIn = true;
             }
         }
         let streakOut = false;
-        if (curValue !== null && curValue > monthInfo.threshold) {
-            if (nextValue !== null && nextValue > monthInfo.threshold) {
+        if (curValue !== null && curValue > threshold) {
+            if (nextValue !== null && nextValue > threshold) {
                 streakOut = true;
             }
         }
@@ -703,6 +728,16 @@ function renderMonthDays(
             .style("stroke", "none");
     }
 
+    // value monitor
+    let valueMonitor = chartElements.dataArea
+        .append("text")
+        .text("")
+        .attr("id", "valueBox")
+        .attr("class", "tracker-month-title-monitor")
+        .style("cursor", "pointer")
+        .style("fill", monthInfo.selectedRingColor);
+    chartElements["monitor"] = valueMonitor;
+
     // labels
     let dayLabals = chartElements.dataArea
         .selectAll("dayLabel")
diff --git a/src/parsing.ts b/src/parsing.ts
index 1262e77..93645f7 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -550,6 +550,8 @@ function getNumberArray(name: string, input: any): Array<number> | string {
                 return errorMessage;
             }
         }
+    } else if (typeof input === "number") {
+        numArray.push(input);
     } else {
         let errorMessage = `Invalid ${name}`;
         return errorMessage;
@@ -1533,10 +1535,16 @@ export function getRenderInfoFromYaml(
             return retDataset;
         }
         if (retDataset.length === 0) {
-            retDataset.push(0);
+            // insert y dataset given
+            for (let q of queries) {
+                if (!q.usedAsXDataset) {
+                    retDataset.push(q.getId());
+                }
+            }
         }
         month.dataset = retDataset;
         // console.log(month.dataset);
+        let numDataset = month.dataset.length;
 
         // startWeekOn
         if (typeof yamlMonth?.startWeekOn === "string") {
@@ -1551,8 +1559,22 @@ export function getRenderInfoFromYaml(
         // console.log(month.showCircle);
 
         // threshold
-        if (typeof yamlMonth?.threshold === "number") {
-            month.threshold = yamlMonth.threshold;
+        let retThreshold = getNumberArray("threshold", yamlMonth?.threshold);
+        if (typeof retThreshold === "string") {
+            return retThreshold;
+        }
+        month.threshold = retThreshold;
+        if (month.threshold.length === 0) {
+            for (let indDataset = 0; indDataset < numDataset; indDataset++) {
+                month.threshold.push(0);
+            }
+        }
+        if (month.threshold.length !== month.dataset.length) {
+            console.log(month.threshold);
+            console.log(month.dataset);
+            const errorMessage =
+                "The number of inputs of threshold and dataset not matched";
+            return errorMessage;
         }
         // console.log(month.threshold);
 

From 4525c66d6c8680941f58a269acfce6a5be6e31a6 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 25 Jun 2021 16:01:12 +0800
Subject: [PATCH 092/402] Fall back using color by value to show/hide circle

---
 src/data.ts    |   2 +
 src/month.ts   | 112 ++++++++++++++++++++++++++++++++-----------------
 src/parsing.ts |   6 +++
 3 files changed, 82 insertions(+), 38 deletions(-)

diff --git a/src/data.ts b/src/data.ts
index 6d97932..16dcb31 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -703,6 +703,7 @@ export class MonthInfo {
     dividingLineColor: string;
     todayRingColor: string;
     selectedRingColor: string;
+    initMonth: string; // YYYY-MM
 
     selectedDate: string;
     selectedDataset: number;
@@ -728,6 +729,7 @@ export class MonthInfo {
         this.dividingLineColor = null;
         this.todayRingColor = ""; // white
         this.selectedRingColor = "firebrick";
+        this.initMonth = "";
 
         this.selectedDate = ""; // selected date
         this.selectedDataset = 0; // selected index of dataset
diff --git a/src/month.ts b/src/month.ts
index 1b7e929..48d1de5 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -400,7 +400,7 @@ function renderMonthDays(
     let streakWidth = (cellSize - dotRadius * 2.0) / 2.0;
     let streakHeight = 3;
 
-    // Get min and max, null values will be treated as zero here
+    // Get min and max
     let yMin = d3.min(dataset.getValues());
     if (monthInfo.yMin !== null) {
         yMin = monthInfo.yMin;
@@ -410,6 +410,12 @@ function renderMonthDays(
         yMax = monthInfo.yMax;
     }
     // console.log(`yMin:${yMin}, yMax:${yMax}`);
+    let allowScaledValue = true;
+    if (yMax === null || yMin === null || yMax <= yMin) {
+        // scaledValue can not be calculated, do not use gradient color
+        allowScaledValue = false;
+        // console.log("scaledValue not allowed");
+    }
 
     // Start and end
     const monthStartDate = curMonthDate.clone().startOf("month");
@@ -464,19 +470,36 @@ function renderMonthDays(
             isOutOfDataRange = true;
         }
 
-        // showCircle
+        // curValue
         let curValue = dataset.getValue(curDate);
+
+        // showCircle
         let showCircle = false;
-        if (curValue !== null) {
-            if (curValue > threshold) {
+        if (!monthInfo.circleColorByValue) {
+            // shown or not shown
+            if (curValue !== null) {
+                if (curValue > threshold) {
+                    showCircle = true;
+                }
+            }
+        } else {
+            if (!allowScaledValue) {
+                if (curValue !== null) {
+                    if (curValue > threshold) {
+                        showCircle = true;
+                    }
+                }
+            } else {
                 showCircle = true;
             }
         }
 
         // scaledValue
-        let scaledValue = 0;
-        if (Number.isNumber(yMax) && Number.isNumber(yMin) && yMax - yMin > 0) {
-            scaledValue = (curValue - yMin) / (yMax - yMin);
+        let scaledValue = null;
+        if (monthInfo.circleColorByValue) {
+            if (allowScaledValue && curValue !== null) {
+                scaledValue = (curValue - yMin) / (yMax - yMin);
+            }
         }
 
         // if (curDate.format("YYYY-MM-DD") === "2021-11-02") {
@@ -545,6 +568,7 @@ function renderMonthDays(
         } else if (monthInfo.color) {
             streakColor = monthInfo.color;
         }
+        // console.log(streakColor);
 
         chartElements.dataArea
             .selectAll("streakIn")
@@ -572,14 +596,18 @@ function renderMonthDays(
                     if (!monthInfo.circleColorByValue) {
                         return streakColor;
                     }
-                    return d3.interpolateLab(
-                        "white",
-                        streakColor
-                    )(d.scaledValue);
+                    if (d.scaledValue !== null) {
+                        return d3.interpolateLab(
+                            "white",
+                            streakColor
+                        )(d.scaledValue * 0.8 + 0.2);
+                    } else {
+                        return streakColor;
+                    }
                 }
                 return "none";
             })
-            .style("fill-opacity", function (d: DayInfo) {
+            .style("opacity", function (d: DayInfo) {
                 if (
                     d.isOutOfDataRange ||
                     (monthInfo.dimNotInMonth && !d.isInThisMonth)
@@ -615,14 +643,18 @@ function renderMonthDays(
                     if (!monthInfo.circleColorByValue) {
                         return streakColor;
                     }
-                    return d3.interpolateLab(
-                        "white",
-                        streakColor
-                    )(d.scaledValue);
+                    if (d.scaledValue !== null) {
+                        return d3.interpolateLab(
+                            "white",
+                            streakColor
+                        )(d.scaledValue * 0.8 + 0.2);
+                    } else {
+                        return streakColor;
+                    }
                 }
                 return "none";
             })
-            .style("fill-opacity", function (d: DayInfo) {
+            .style("opacity", function (d: DayInfo) {
                 if (
                     d.isOutOfDataRange ||
                     (monthInfo.dimNotInMonth && !d.isInThisMonth)
@@ -658,14 +690,18 @@ function renderMonthDays(
                     if (!monthInfo.circleColorByValue) {
                         return circleColor;
                     }
-                    return d3.interpolateLab(
-                        "white",
-                        circleColor
-                    )(d.scaledValue);
+                    if (d.scaledValue !== null) {
+                        return d3.interpolateLab(
+                            "white",
+                            circleColor
+                        )(d.scaledValue * 0.8 + 0.2);
+                    } else {
+                        return circleColor;
+                    }
                 }
                 return "none";
             })
-            .style("fill-opacity", function (d: DayInfo) {
+            .style("opacity", function (d: DayInfo) {
                 if (
                     d.isOutOfDataRange ||
                     (monthInfo.dimNotInMonth && !d.isInThisMonth)
@@ -870,22 +906,22 @@ export function renderMonth(
     let chartElements: ChartElements = {};
     chartElements = createAreas(chartElements, canvas, renderInfo, monthInfo);
 
-    let today = window.moment();
-    let lastDataMonthDate = renderInfo.datasets.getDates().last();
+    let monthDate: Moment = null;
+    if (monthInfo.initMonth) {
+        let initMonth = window.moment(monthInfo.initMonth, "YYYY-MM", true);
+        // console.log(initMonth);
+        if (initMonth.isValid()) {
+            monthDate = initMonth;
+        } else {
+            return "Invalid initMonth";
+        }
+    } else {
+        let today = window.moment();
+        monthDate = renderInfo.datasets.getDates().last();
+    }
+    if (!monthDate) return;
 
-    renderMonthHeader(
-        canvas,
-        chartElements,
-        renderInfo,
-        monthInfo,
-        lastDataMonthDate
-    );
+    renderMonthHeader(canvas, chartElements, renderInfo, monthInfo, monthDate);
 
-    renderMonthDays(
-        canvas,
-        chartElements,
-        renderInfo,
-        monthInfo,
-        lastDataMonthDate
-    );
+    renderMonthDays(canvas, chartElements, renderInfo, monthInfo, monthDate);
 }
diff --git a/src/parsing.ts b/src/parsing.ts
index 93645f7..4fa4c72 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1668,6 +1668,12 @@ export function getRenderInfoFromYaml(
         }
         // console.log(month.selectedRingColor);
 
+        // initMonth
+        if (typeof yamlMonth?.initMonth === "string") {
+            month.initMonth = yamlMonth.initMonth;
+        }
+        // console.log(month.initMonth);
+
         renderInfo.month.push(month);
     } // Month related parameters
     // console.log(renderInfo.month);

From 33cc6414efa057c94a358103768c73403c8f7901 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 25 Jun 2021 16:31:35 +0800
Subject: [PATCH 093/402] Add empty output type pie

---
 examples/TestPieChart.md |  7 +++++++
 src/data.ts              |  9 ++++++++-
 src/parsing.ts           | 29 ++++++++++++++++++++++++++++-
 src/pie.ts               | 24 ++++++++++++++++++++++++
 src/rendering.ts         | 12 ++++++++++--
 5 files changed, 77 insertions(+), 4 deletions(-)
 create mode 100644 examples/TestPieChart.md
 create mode 100644 src/pie.ts

diff --git a/examples/TestPieChart.md b/examples/TestPieChart.md
new file mode 100644
index 0000000..7525b30
--- /dev/null
+++ b/examples/TestPieChart.md
@@ -0,0 +1,7 @@
+# Test Pie Chart
+
+``` tracker
+searchType: tag
+searchTarget: meditation
+pie:
+```
\ No newline at end of file
diff --git a/src/data.ts b/src/data.ts
index 16dcb31..766e042 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -13,6 +13,7 @@ export enum SearchType {
 export enum OutputType {
     Line,
     Bar,
+    Pie,
     Radar,
     Summary,
     Table,
@@ -522,6 +523,7 @@ export class RenderInfo {
     output: any[];
     line: LineInfo[];
     bar: BarInfo[];
+    pie: PieInfo[];
     summary: SummaryInfo[];
     month: MonthInfo[];
     heatmap: HeatmapInfo[];
@@ -556,8 +558,9 @@ export class RenderInfo {
 
         this.output = [];
         this.line = [];
-        this.summary = [];
         this.bar = [];
+        this.pie = [];
+        this.summary = [];
         this.month = [];
         this.heatmap = [];
         this.bullet = [];
@@ -671,6 +674,10 @@ export class BarInfo extends CommonChartInfo {
     }
 }
 
+export class PieInfo {
+    constructor() {}
+}
+
 export class SummaryInfo extends OutputInfo {
     template: string;
     style: string;
diff --git a/src/parsing.ts b/src/parsing.ts
index 4fa4c72..9bc1988 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -9,6 +9,7 @@ import {
     Margin,
     OutputType,
     LineInfo,
+    PieInfo,
     MonthInfo,
     HeatmapInfo,
     BulletInfo,
@@ -940,6 +941,7 @@ export function getRenderInfoFromYaml(
     // console.log(keysOfRenderInfo);
     let yamlLineKeys = [];
     let yamlBarKeys = [];
+    let yamlPieKeys = [];
     let yamlSummaryKeys = [];
     let yamlMonthKeys = [];
     let yamlHeatmapKeys = [];
@@ -954,6 +956,10 @@ export function getRenderInfoFromYaml(
             yamlBarKeys.push(key);
             additionalAllowedKeys.push(key);
         }
+        if (/^pie[0-9]*$/.test(key)) {
+            yamlPieKeys.push(key);
+            additionalAllowedKeys.push(key);
+        }
         if (/^summary[0-9]*$/.test(key)) {
             yamlSummaryKeys.push(key);
             additionalAllowedKeys.push(key);
@@ -985,12 +991,13 @@ export function getRenderInfoFromYaml(
     let totalNumOutputs =
         yamlLineKeys.length +
         yamlBarKeys.length +
+        yamlPieKeys.length +
         yamlSummaryKeys.length +
         yamlBulletKeys.length +
         yamlMonthKeys.length +
         yamlHeatmapKeys.length;
     if (totalNumOutputs === 0) {
-        return "No output parameter provided, please place line, bar, month, bullet, or summary.";
+        return "No output parameter provided, please place line, bar, pie, month, bullet, or summary.";
     }
 
     // Get daily notes settings using obsidian-daily-notes-interface
@@ -1486,6 +1493,26 @@ export function getRenderInfoFromYaml(
     } // bar related parameters
     // console.log(renderInfo.bar);
 
+    // pie related parameters
+    for (let pieKey of yamlPieKeys) {
+        let pie = new PieInfo();
+        let yamlPie = yaml[pieKey];
+
+        let keysOfPieInfo = getAvailableKeysOfClass(pie);
+        let keysFoundInYAML = getAvailableKeysOfClass(yamlPie);
+        // console.log(keysOfPieInfo);
+        // console.log(keysFoundInYAML);
+        for (let key of keysFoundInYAML) {
+            if (!keysOfPieInfo.includes(key)) {
+                errorMessage = "'" + key + "' is not an available key";
+                return errorMessage;
+            }
+        }
+
+        renderInfo.pie.push(pie);
+    } // pie related parameters
+    // console.log(renderInfo.pi);
+
     // summary related parameters
     for (let summaryKey of yamlSummaryKeys) {
         let summary = new SummaryInfo();
diff --git a/src/pie.ts b/src/pie.ts
new file mode 100644
index 0000000..e3daf6d
--- /dev/null
+++ b/src/pie.ts
@@ -0,0 +1,24 @@
+import { Moment } from "moment";
+import {
+    Datasets,
+    DataPoint,
+    RenderInfo,
+    PieInfo,
+    MonthInfo,
+    Dataset,
+    Size,
+    Transform,
+    ChartElements,
+    OutputType,
+    ValueType,
+} from "./data";
+import * as helper from "./helper";
+import * as d3 from "d3";
+
+export function renderPieChart(
+    canvas: HTMLElement,
+    renderInfo: RenderInfo,
+    pieInfo: PieInfo
+) {
+    return "Under construction";
+}
diff --git a/src/rendering.ts b/src/rendering.ts
index db0b654..27e1d24 100644
--- a/src/rendering.ts
+++ b/src/rendering.ts
@@ -13,14 +13,16 @@ import {
     CommonChartInfo,
     LineInfo,
     BarInfo,
+    PieInfo,
     SummaryInfo,
     BulletInfo,
     MonthInfo,
-    HeatmapInfo
+    HeatmapInfo,
 } from "./data";
+import * as pie from "./pie";
 import * as summary from "./summary";
 import * as month from "./month";
-import * as heatmap from "./heatmap"
+import * as heatmap from "./heatmap";
 import * as bullet from "./bullet";
 import * as helper from "./helper";
 
@@ -159,6 +161,12 @@ export function render(canvas: HTMLElement, renderInfo: RenderInfo) {
             return ret;
         }
     }
+    for (let pieInfo of renderInfo.pie) {
+        let ret = pie.renderPieChart(canvas, renderInfo, pieInfo);
+        if (typeof ret === "string") {
+            return ret;
+        }
+    }
     for (let summaryInfo of renderInfo.summary) {
         let ret = summary.renderSummary(canvas, renderInfo, summaryInfo);
         if (typeof ret === "string") {

From 119be4c0041fa28955e56223b78a6fc715e97cb4 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 26 Jun 2021 23:29:13 +0800
Subject: [PATCH 094/402] Drawing pie

---
 examples/TestPieChart.md |   7 +-
 src/data.ts              |  18 ++++-
 src/parsing.ts           |  70 ++++++++++++++++++++
 src/pie.ts               | 138 ++++++++++++++++++++++++++++++++++++++-
 4 files changed, 228 insertions(+), 5 deletions(-)

diff --git a/examples/TestPieChart.md b/examples/TestPieChart.md
index 7525b30..d7e56e1 100644
--- a/examples/TestPieChart.md
+++ b/examples/TestPieChart.md
@@ -4,4 +4,9 @@
 searchType: tag
 searchTarget: meditation
 pie:
-```
\ No newline at end of file
+    title: Pie
+	data: 2,4,6,8,10
+	dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
+	ratioInnerRadius: 0.5
+```
+
diff --git a/src/data.ts b/src/data.ts
index 766e042..d19d3b8 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -674,8 +674,19 @@ export class BarInfo extends CommonChartInfo {
     }
 }
 
-export class PieInfo {
-    constructor() {}
+export class PieInfo extends OutputInfo {
+    title: string;
+    data: string[];
+    dataColor: string[];
+    ratioInnerRadius: number;
+
+    constructor() {
+        super();
+        this.title = "";
+        this.data = [];
+        this.dataColor = [];
+        this.ratioInnerRadius = 0.0;
+    }
 }
 
 export class SummaryInfo extends OutputInfo {
@@ -689,7 +700,7 @@ export class SummaryInfo extends OutputInfo {
     }
 }
 
-export class MonthInfo {
+export class MonthInfo extends OutputInfo {
     mode: string;
     dataset: number[];
     startWeekOn: string;
@@ -716,6 +727,7 @@ export class MonthInfo {
     selectedDataset: number;
 
     constructor() {
+        super();
         this.mode = "circle"; // circle, symbol
         this.dataset = [];
         this.startWeekOn = "Sun";
diff --git a/src/parsing.ts b/src/parsing.ts
index 9bc1988..2ec4736 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -561,6 +561,40 @@ function getNumberArray(name: string, input: any): Array<number> | string {
     return numArray;
 }
 
+function getStringArray(name: string, input: any): Array<string> | string {
+    let strArray: Array<string> = [];
+
+    if (typeof input === "undefined" || input === null) return strArray;
+
+    if (typeof input === "object") {
+        if (Array.isArray(input)) {
+            for (let elem of input) {
+                if (typeof elem === "string") {
+                    strArray.push(elem);
+                }
+            }
+        }
+    } else if (typeof input === "string") {
+        let splitted = input.split(",");
+        // console.log(splitted);
+        if (splitted.length > 1) {
+            for (let piece of splitted) {
+                strArray.push(piece);
+            }
+        } else if (input === "") {
+            let errorMessage = `Empty ${name} is not allowed.`;
+            return errorMessage;
+        } else {
+            strArray.push(input);
+        }
+    } else {
+        let errorMessage = `Invalid ${name}`;
+        return errorMessage;
+    }
+
+    return strArray;
+}
+
 function parseCommonChartInfo(yaml: any, renderInfo: CommonChartInfo) {
     // console.log("parseCommonChartInfo");
 
@@ -1509,6 +1543,42 @@ export function getRenderInfoFromYaml(
             }
         }
 
+        // title
+        if (typeof yamlPie?.title === "string") {
+            pie.title = yamlPie.title;
+        }
+        // console.log(pie.title);
+
+        // data
+        let retData = getStringArray("data", yamlPie?.data);
+        if (typeof retData === "string") {
+            return retData;
+        }
+        pie.data = retData;
+        console.log(pie.data);
+        let numData = pie.data.length;
+
+        // dataColor
+        let retDataColor = getStringArrayFromInput(
+            "dataColor",
+            yamlPie?.dataColor,
+            numData,
+            "none",
+            validateColor,
+            true
+        );
+        if (typeof retDataColor === "string") {
+            return retDataColor; // errorMessage
+        }
+        pie.dataColor = retDataColor;
+        // console.log(pie.dataColor);
+
+        // ratioInnerRadius
+        if (typeof yamlPie?.ratioInnerRadius === "number") {
+            pie.ratioInnerRadius = yamlPie.ratioInnerRadius;
+        }
+        // console.log(pie.ratioInnerRadius);
+
         renderInfo.pie.push(pie);
     } // pie related parameters
     // console.log(renderInfo.pi);
diff --git a/src/pie.ts b/src/pie.ts
index e3daf6d..1e7dbb4 100644
--- a/src/pie.ts
+++ b/src/pie.ts
@@ -15,10 +15,146 @@ import {
 import * as helper from "./helper";
 import * as d3 from "d3";
 
+function createAreas(
+    chartElements: ChartElements,
+    canvas: HTMLElement,
+    renderInfo: RenderInfo,
+    pieInfo: PieInfo
+): ChartElements {
+    // clean areas
+    d3.select(canvas).select("#svg").remove();
+    var props = Object.getOwnPropertyNames(chartElements);
+    for (var i = 0; i < props.length; i++) {
+        // d3.select(chartElements[props[i]]).remove();
+        delete chartElements[props[i]];
+    }
+    // console.log(chartElements);
+
+    // whole area for plotting, includes margins
+    let svg = d3
+        .select(canvas)
+        .append("svg")
+        .attr("id", "svg")
+        .attr(
+            "width",
+            renderInfo.dataAreaSize.width +
+                renderInfo.margin.left +
+                renderInfo.margin.right
+        )
+        .attr(
+            "height",
+            renderInfo.dataAreaSize.height +
+                renderInfo.margin.top +
+                renderInfo.margin.bottom
+        );
+    chartElements["svg"] = svg;
+
+    // graphArea, includes chartArea, title, legend
+    let graphArea = svg
+        .append("g")
+        .attr("id", "graphArea")
+        .attr(
+            "transform",
+            "translate(" +
+                renderInfo.margin.left +
+                "," +
+                renderInfo.margin.top +
+                ")"
+        )
+        .attr("width", renderInfo.dataAreaSize.width + renderInfo.margin.right)
+        .attr(
+            "height",
+            renderInfo.dataAreaSize.height + renderInfo.margin.bottom
+        );
+    chartElements["graphArea"] = graphArea;
+
+    // dataArea, under graphArea, includes points, lines, xAxis, yAxis
+    let dataArea = graphArea
+        .append("g")
+        .attr("id", "dataArea")
+        .attr("width", renderInfo.dataAreaSize.width)
+        .attr("height", renderInfo.dataAreaSize.height);
+    chartElements["dataArea"] = dataArea;
+
+    return chartElements;
+}
+
+function renderTitle(
+    canvas: HTMLElement,
+    chartElements: ChartElements,
+    renderInfo: RenderInfo,
+    pieInfo: PieInfo
+) {
+    // console.log("renderTitle")
+    // under graphArea
+
+    if (!renderInfo || !pieInfo) return;
+
+    if (!pieInfo.title) return;
+    let titleSize = helper.measureTextSize(pieInfo.title, "tracker-title");
+}
+
+function renderPie(
+    canvas: HTMLElement,
+    chartElements: ChartElements,
+    renderInfo: RenderInfo,
+    pieInfo: PieInfo
+) {
+    let radius = renderInfo.dataAreaSize.width * 0.5 * 0.8;
+    let data = pieInfo.data.map(function (v) {
+        return parseFloat(v);
+    });
+    let colorScale = d3.scaleOrdinal().range(pieInfo.dataColor);
+
+    let sectorsGroup = chartElements.dataArea.append("g");
+    sectorsGroup.attr("transform", function () {
+        let strTranslate =
+            "translate(" +
+            renderInfo.dataAreaSize.width * 0.5 +
+            "," +
+            renderInfo.dataAreaSize.height * 0.5 +
+            ")";
+
+        return strTranslate;
+    });
+
+    let pie = d3.pie();
+
+    let sectors = sectorsGroup
+        .selectAll("sector")
+        .data(pie(data))
+        .enter()
+        .append("g")
+        .attr("class", "sector");
+
+    let arc = d3
+        .arc()
+        .innerRadius(radius * pieInfo.ratioInnerRadius)
+        .outerRadius(radius);
+
+    let sectorPaths = sectors
+        .append("path")
+        .attr("fill", function (d: any, i: number) {
+            return colorScale(i.toString());
+        })
+        .attr("d", arc);
+}
+
 export function renderPieChart(
     canvas: HTMLElement,
     renderInfo: RenderInfo,
     pieInfo: PieInfo
 ) {
-    return "Under construction";
+    // console.log("renderPieChart");
+    // console.log(renderInfo);
+    if (!renderInfo || !pieInfo) return;
+
+    // return "Under construction";
+
+    let chartElements: ChartElements = {};
+    chartElements = createAreas(chartElements, canvas, renderInfo, pieInfo);
+
+    renderTitle(canvas, chartElements, renderInfo, pieInfo);
+
+    renderPie(canvas, chartElements, renderInfo, pieInfo);
 }

From 65618d5f97f61c3df062563298ae63fbdf45bb35 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 27 Jun 2021 18:39:21 +0800
Subject: [PATCH 095/402] Allow relative values for startDate and endDate

---
 examples/TestRelativeStartEndDate.md |  13 ++++
 src/parsing.ts                       | 112 +++++++++++++++++++++++----
 2 files changed, 111 insertions(+), 14 deletions(-)
 create mode 100644 examples/TestRelativeStartEndDate.md

diff --git a/examples/TestRelativeStartEndDate.md b/examples/TestRelativeStartEndDate.md
new file mode 100644
index 0000000..ef8e417
--- /dev/null
+++ b/examples/TestRelativeStartEndDate.md
@@ -0,0 +1,13 @@
+# Test Relative startDate and endDate
+
+``` tracker
+searchType: tag
+searchTarget: exercise-pushup
+folder: diary
+startDate: -2m
+endDate: -1m
+line:
+    title: PushUp
+    yAxisLabel: Count
+    lineColor: "#d65d0e"
+```
\ No newline at end of file
diff --git a/src/parsing.ts b/src/parsing.ts
index 2ec4736..f715358 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -984,7 +984,6 @@ export function getRenderInfoFromYaml(
         if (/^line[0-9]*$/.test(key)) {
             yamlLineKeys.push(key);
             additionalAllowedKeys.push(key);
-            console.log("aaaaaa");
         }
         if (/^bar[0-9]*$/.test(key)) {
             yamlBarKeys.push(key);
@@ -1102,19 +1101,59 @@ export function getRenderInfoFromYaml(
                 strStartDate.length - renderInfo.dateFormatSuffix.length
             );
         }
-        let startDate = window.moment(
-            strStartDate,
-            renderInfo.dateFormat,
-            true
-        );
-        if (startDate.isValid()) {
-            renderInfo.startDate = startDate;
-        } else {
+        
+        let startDate = null;
+        let isStartDateValid = false;
+        const relDateRegex = /^(?<value>[\-\+]?[0-9]+)(?<unit>[dwmy])$/;
+        if (relDateRegex.test(strStartDate)) {
+            let match = relDateRegex.exec(strStartDate);
+            if (
+                typeof match.groups !== "undefined" &&
+                typeof match.groups.value !== "undefined" &&
+                typeof match.groups.unit !== "undefined"
+            ) {
+                let value = parseFloat(match.groups.value);
+                let unit = match.groups.unit;
+                startDate = window.moment(
+                    window.moment().format(dateFormat),
+                    dateFormat,
+                    true
+                );
+                if (unit === "d") {
+                    startDate = startDate.add(value, "days");
+                }
+                else if (unit === "w") {
+                    startDate = startDate.add(value, "weeks");
+                }
+                else if (unit === "m") {
+                    startDate = startDate.add(value, "months");
+                }
+                else if (unit === "y") {
+                    startDate = startDate.add(value, "years");
+                }
+                if (startDate.isValid()) {
+                    isStartDateValid = true;
+                }
+            }
+        }
+        else {
+            startDate = window.moment(
+                strStartDate,
+                renderInfo.dateFormat,
+                true
+            );
+            if (startDate.isValid()) {
+                isStartDateValid = true;
+            }
+        }
+
+        if (!isStartDateValid || startDate === null) {
             let errorMessage =
                 "Invalid startDate, the format of startDate may not match your dateFormat " +
                 renderInfo.dateFormat;
             return errorMessage;
         }
+        renderInfo.startDate = startDate;
     }
     if (typeof yaml.endDate === "string") {
         let strEndDate = yaml.endDate;
@@ -1133,15 +1172,60 @@ export function getRenderInfoFromYaml(
                 strEndDate.length - renderInfo.dateFormatSuffix.length
             );
         }
-        let endDate = window.moment(strEndDate, renderInfo.dateFormat, true);
-        if (endDate.isValid()) {
-            renderInfo.endDate = endDate;
-        } else {
+
+        let endDate = null;
+        let isEndDateValid = false;
+        const relDateRegex = /^(?<value>[\-\+]?[0-9]+)(?<unit>[dwmy])$/;
+        if (relDateRegex.test(strEndDate)) {
+            let match = relDateRegex.exec(strEndDate);
+            if (
+                typeof match.groups !== "undefined" &&
+                typeof match.groups.value !== "undefined" &&
+                typeof match.groups.unit !== "undefined"
+            ) {
+                let value = parseFloat(match.groups.value);
+                let unit = match.groups.unit;
+                endDate = window.moment(
+                    window.moment().format(dateFormat),
+                    dateFormat,
+                    true
+                );
+                if (unit === "d") {
+                    endDate = endDate.add(value, "days");
+                }
+                else if (unit === "w") {
+                    endDate = endDate.add(value, "weeks");
+                }
+                else if (unit === "m") {
+                    endDate = endDate.add(value, "months");
+                }
+                else if (unit === "y") {
+                    endDate = endDate.add(value, "years");
+                }
+                if (endDate.isValid()) {
+                    isEndDateValid = true;
+                }
+            }
+        }
+        else {
+            endDate = window.moment(
+                strEndDate,
+                renderInfo.dateFormat,
+                true
+            );
+            if (endDate.isValid()) {
+                isEndDateValid = true;
+            }
+        }
+        // console.log(endDate);
+
+        if (!isEndDateValid || endDate === null) {
             let errorMessage =
                 "Invalid endDate, the format of endDate may not match your dateFormat " +
                 renderInfo.dateFormat;
             return errorMessage;
         }
+        renderInfo.endDate = endDate;
     }
     if (
         renderInfo.startDate !== null &&
@@ -1555,7 +1639,7 @@ export function getRenderInfoFromYaml(
             return retData;
         }
         pie.data = retData;
-        console.log(pie.data);
+        // console.log(pie.data);
         let numData = pie.data.length;
 
         // dataColor

From 6971ba562a3ced184273fe71db5f8d790b1e9a51 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 29 Jun 2021 21:23:19 +0800
Subject: [PATCH 096/402] Relative date input; support iso-8601 date;

---
 src/collecting.ts | 34 +++++++---------------------------
 src/expr.ts       | 35 +++++++++++++++++++++--------------
 src/heatmap.ts    |  2 +-
 src/helper.ts     | 44 ++++++++++++++++++++++++++++++++++++++++++++
 src/main.ts       | 35 ++++++++++++++++++++++-------------
 src/month.ts      |  4 ++--
 src/parsing.ts    | 44 ++++++++++++--------------------------------
 7 files changed, 109 insertions(+), 89 deletions(-)

diff --git a/src/collecting.ts b/src/collecting.ts
index 0f353f0..63b56f6 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -11,18 +11,6 @@ import {
 } from "./data";
 import * as helper from "./helper";
 
-export function strToDate(strDate: string, dateFormat: string) {
-    if (
-        strDate.length > 4 &&
-        strDate.startsWith("[[") &&
-        strDate.endsWith("]]")
-    ) {
-        strDate = strDate.substring(2, strDate.length - 2);
-    }
-
-    return window.moment(strDate, dateFormat, true);
-}
-
 export function getDateFromFilename(file: TFile, renderInfo: RenderInfo) {
     let fileBaseName = file.basename;
 
@@ -43,7 +31,7 @@ export function getDateFromFilename(file: TFile, renderInfo: RenderInfo) {
     }
     // console.log(fileBaseName);
 
-    let fileDate = window.moment(fileBaseName, renderInfo.dateFormat, true);
+    let fileDate = helper.strToDate(fileBaseName, renderInfo.dateFormat);
     // console.log(fileDate);
 
     return fileDate;
@@ -65,7 +53,7 @@ export function getDateFromFrontmatter(
         if (helper.deepValue(frontMatter, query.getTarget())) {
             let strDate = helper.deepValue(frontMatter, query.getTarget());
 
-            date = strToDate(strDate, renderInfo.dateFormat);
+            date = helper.strToDate(strDate, renderInfo.dateFormat);
             // console.log(date);
         }
     }
@@ -104,7 +92,7 @@ export function getDateFromTag(
             typeof match.groups.values !== "undefined"
         ) {
             let strDate = match.groups.values;
-            date = strToDate(strDate, renderInfo.dateFormat);
+            date = helper.strToDate(strDate, renderInfo.dateFormat);
             if (date.isValid()) {
                 break;
             }
@@ -140,7 +128,7 @@ export function getDateFromText(
             let strDate = match.groups.value.trim();
             // console.log(strDate);
 
-            date = strToDate(strDate, renderInfo.dateFormat);
+            date = helper.strToDate(strDate, renderInfo.dateFormat);
             if (date.isValid()) {
                 break;
             }
@@ -185,7 +173,7 @@ export function getDateFromDvField(
             typeof match.groups.values !== "undefined"
         ) {
             let strDate = match.groups.values.trim();
-            date = strToDate(strDate, renderInfo.dateFormat);
+            date = helper.strToDate(strDate, renderInfo.dateFormat);
             if (date.isValid()) {
                 break;
             }
@@ -212,18 +200,10 @@ export function getDateFromFileMeta(
         let target = query.getTarget();
         if (target === "cDate") {
             let ctime = file.stat.ctime;
-            date = window.moment(
-                window.moment(ctime).format(renderInfo.dateFormat),
-                renderInfo.dateFormat,
-                true
-            );
+            date = helper.getDateFromUnixTime(ctime, renderInfo.dateFormat);
         } else if (target === "mDate") {
             let mtime = file.stat.mtime;
-            date = window.moment(
-                window.moment(mtime).format(renderInfo.dateFormat),
-                renderInfo.dateFormat,
-                true
-            );
+            date = helper.getDateFromUnixTime(mtime, renderInfo.dateFormat);
         } else if (target === "size") {
         }
     }
diff --git a/src/expr.ts b/src/expr.ts
index 4ffc334..f624bf3 100644
--- a/src/expr.ts
+++ b/src/expr.ts
@@ -1,6 +1,7 @@
 import { RenderInfo } from "./data";
 import * as d3 from "d3";
 import { Moment } from "moment";
+import * as helper from "./helper";
 
 let fnSet = {
     // min value of a dataset
@@ -16,7 +17,10 @@ let fnSet = {
             let arrayDataset = Array.from(dataset);
             for (let dataPoint of arrayDataset.reverse()) {
                 if (dataPoint.value !== null && dataPoint.value === min) {
-                    return dataPoint.date.format(renderInfo.dateFormat);
+                    return helper.dateToStr(
+                        dataPoint.date,
+                        renderInfo.dateFormat
+                    );
                 }
             }
         }
@@ -35,7 +39,10 @@ let fnSet = {
             let arrayDataset = Array.from(dataset);
             for (let dataPoint of arrayDataset.reverse()) {
                 if (dataPoint.value !== null && dataPoint.value === max) {
-                    return dataPoint.date.format(renderInfo.dateFormat);
+                    return helper.dateToStr(
+                        dataPoint.date,
+                        renderInfo.dateFormat
+                    );
                 }
             }
         }
@@ -48,10 +55,10 @@ let fnSet = {
         if (dataset) {
             let startDate = dataset.getStartDate();
             if (startDate && startDate.isValid()) {
-                return startDate.format(renderInfo.dateFormat);
+                return helper.dateToStr(startDate, renderInfo.dateFormat);
             }
         }
-        return renderInfo.startDate.format(renderInfo.dateFormat);
+        return helper.dateToStr(renderInfo.startDate, renderInfo.dateFormat);
     },
     // end date of a dataset
     // if datasetId not found, return overall endDate
@@ -60,10 +67,10 @@ let fnSet = {
         if (dataset) {
             let endDate = dataset.getEndDate();
             if (endDate && endDate.isValid()) {
-                return endDate.format(renderInfo.dateFormat);
+                return helper.dateToStr(endDate, renderInfo.dateFormat);
             }
         }
-        return renderInfo.endDate.format(renderInfo.dateFormat);
+        return helper.dateToStr(renderInfo.endDate, renderInfo.dateFormat);
     },
     // sum of all values in a dataset
     sum: function (renderInfo: RenderInfo, datasetId: number) {
@@ -127,7 +134,7 @@ let fnSet = {
                 }
             }
         }
-        return maxStreakStart?.format(renderInfo.dateFormat);
+        return helper.dateToStr(maxStreakStart, renderInfo.dateFormat);
     },
     maxStreakEnd: function (renderInfo: RenderInfo, datasetId: number) {
         let streak = 0;
@@ -159,7 +166,7 @@ let fnSet = {
                 }
             }
         }
-        return maxStreakEnd?.format(renderInfo.dateFormat);
+        return helper.dateToStr(maxStreakEnd, renderInfo.dateFormat);
     },
     maxBreaks: function (renderInfo: RenderInfo, datasetId: number) {
         let breaks = 0;
@@ -200,7 +207,7 @@ let fnSet = {
                 }
             }
         }
-        return maxBreaksStart?.format(renderInfo.dateFormat);
+        return helper.dateToStr(maxBreaksStart, renderInfo.dateFormat);
     },
     maxBreaksEnd: function (renderInfo: RenderInfo, datasetId: number) {
         let breaks = 0;
@@ -230,7 +237,7 @@ let fnSet = {
                 }
             }
         }
-        return maxBreaksEnd?.format(renderInfo.dateFormat);
+        return helper.dateToStr(maxBreaksEnd, renderInfo.dateFormat);
     },
     lastStreak: function (renderInfo: RenderInfo, datasetId: number) {
         return "deprecated template variable 'lastStreak'";
@@ -273,7 +280,7 @@ let fnSet = {
         if (currentStreakStart === null) {
             return "absense";
         }
-        return currentStreakStart?.format(renderInfo.dateFormat);
+        return helper.dateToStr(currentStreakStart, renderInfo.dateFormat);
     },
     currentStreakEnd: function (renderInfo: RenderInfo, datasetId: number) {
         let currentStreak = 0;
@@ -297,7 +304,7 @@ let fnSet = {
         if (currentStreakEnd === null) {
             return "absense";
         }
-        return currentStreakEnd?.format(renderInfo.dateFormat);
+        return helper.dateToStr(currentStreakEnd, renderInfo.dateFormat);
     },
     currentBreaks: function (renderInfo: RenderInfo, datasetId: number) {
         let currentBreaks = 0;
@@ -337,7 +344,7 @@ let fnSet = {
         if (currentBreaksStart === null) {
             return "absense";
         }
-        return currentBreaksStart?.format(renderInfo.dateFormat);
+        return helper.dateToStr(currentBreaksStart, renderInfo.dateFormat);
     },
     currentBreaksEnd: function (renderInfo: RenderInfo, datasetId: number) {
         let currentBreaks = 0;
@@ -361,7 +368,7 @@ let fnSet = {
         if (currentBreaksEnd === null) {
             return "absense";
         }
-        return currentBreaksEnd?.format(renderInfo.dateFormat);
+        return helper.dateToStr(currentBreaksEnd, renderInfo.dateFormat);
     },
     average: function (renderInfo: RenderInfo, datasetId: number) {
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
diff --git a/src/heatmap.ts b/src/heatmap.ts
index fd4c53b..b48d538 100644
--- a/src/heatmap.ts
+++ b/src/heatmap.ts
@@ -169,7 +169,7 @@ function renderHeatmapDays(
         }
 
         daysInHeatmapView.push({
-            date: curDate.format(renderInfo.dateFormat),
+            date: helper.dateToStr(curDate, renderInfo.dateFormat),
             value: curValue,
             scaledValue: scaledValue,
             row: indRow,
diff --git a/src/helper.ts b/src/helper.ts
index 1ab2589..da80a18 100644
--- a/src/helper.ts
+++ b/src/helper.ts
@@ -2,7 +2,9 @@ import { RenderInfo, Size, Transform } from "./data";
 import { TFile, TFolder, normalizePath } from "obsidian";
 import { ValueType } from "./data";
 import * as d3 from "d3";
+import { Moment } from "moment";
 
+// date and time
 const timeFormat = [
     "HH:mm",
     "HH:m",
@@ -18,6 +20,48 @@ const timeFormat = [
     "h:m a",
 ];
 
+export function strToDate(strDate: string, dateFormat: string): Moment {
+    let format: any = dateFormat;
+
+    if (
+        strDate.length > 4 &&
+        strDate.startsWith("[[") &&
+        strDate.endsWith("]]")
+    ) {
+        strDate = strDate.substring(2, strDate.length - 2);
+    }
+
+    if (dateFormat.toLowerCase() === "iso-8601") {
+        format = window.moment.ISO_8601;
+    }
+
+    return window.moment(strDate, format, true);
+}
+
+export function dateToStr(date: Moment, dateFormat: string): string {
+    if (typeof date === "undefined" || date === null) return null;
+
+    if (dateFormat.toLowerCase() === "iso-8601") {
+        return date.format();
+    }
+    return date.format(dateFormat);
+}
+
+export function getDateFromUnixTime(
+    unixTime: number,
+    dateFormat: string
+): Moment {
+    let date = window.moment(unixTime);
+    let strDate = dateToStr(date, dateFormat);
+    return strToDate(strDate, dateFormat);
+}
+
+export function getDateToday(dateFormat: string) {
+    let today = window.moment();
+    let strToday = dateToStr(today, dateFormat);
+    return strToDate(strToday, dateFormat);
+}
+
 // http://jsfiddle.net/alnitak/hEsys/
 export function deepValue(obj: any, str: string) {
     str = str.replace(/^\./, "");
diff --git a/src/main.ts b/src/main.ts
index 5f1680c..ea5c050 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -202,9 +202,12 @@ export default class Tracker extends Plugin {
                     type === SearchType.dvField
                 ) {
                     return true;
-                }
-                else if (type === SearchType.FileMeta) {
-                    if (target === "numWords" || target === "numChars" || target === "numSentences") {
+                } else if (type === SearchType.FileMeta) {
+                    if (
+                        target === "numWords" ||
+                        target === "numChars" ||
+                        target === "numSentences"
+                    ) {
                         return true;
                     }
                 }
@@ -290,7 +293,7 @@ export default class Tracker extends Plugin {
                     if (!skipThisFile) {
                         xValueMap.set(
                             xDatasetId,
-                            xDate.format(renderInfo.dateFormat)
+                            helper.dateToStr(xDate, renderInfo.dateFormat)
                         );
                         fileCounter++;
 
@@ -526,10 +529,7 @@ export default class Tracker extends Plugin {
                 let dataRowSplitted = dataRow.split("|");
                 if (columnXDataset < dataRowSplitted.length) {
                     let data = dataRowSplitted[columnXDataset].trim();
-                    let date = collecting.strToDate(
-                        data,
-                        renderInfo.dateFormat
-                    );
+                    let date = helper.strToDate(data, renderInfo.dateFormat);
 
                     if (date.isValid()) {
                         xValues.push(date);
@@ -585,7 +585,8 @@ export default class Tracker extends Plugin {
                                 ) {
                                     this.addToDataMap(
                                         dataMap,
-                                        xValues[indLine].format(
+                                        helper.dateToStr(
+                                            xValues[indLine],
                                             renderInfo.dateFormat
                                         ),
                                         yDatasetQuery,
@@ -608,7 +609,8 @@ export default class Tracker extends Plugin {
                                 ) {
                                     this.addToDataMap(
                                         dataMap,
-                                        xValues[indLine].format(
+                                        helper.dateToStr(
+                                            xValues[indLine],
                                             renderInfo.dateFormat
                                         ),
                                         yDatasetQuery,
@@ -703,9 +705,13 @@ export default class Tracker extends Plugin {
                 // console.log(curDate);
 
                 // dataMap --> {date: [query: value, ...]}
-                if (dataMap.has(curDate.format(renderInfo.dateFormat))) {
+                if (
+                    dataMap.has(
+                        helper.dateToStr(curDate, renderInfo.dateFormat)
+                    )
+                ) {
                     let queryValuePairs = dataMap
-                        .get(curDate.format(renderInfo.dateFormat))
+                        .get(helper.dateToStr(curDate, renderInfo.dateFormat))
                         .filter(function (pair) {
                             return pair.query.equalTo(query);
                         });
@@ -718,7 +724,10 @@ export default class Tracker extends Plugin {
                             indPair++
                         ) {
                             let collected = queryValuePairs[indPair].value;
-                            if (Number.isNumber(collected) && !Number.isNaN(collected)) {
+                            if (
+                                Number.isNumber(collected) &&
+                                !Number.isNaN(collected)
+                            ) {
                                 if (value === null) {
                                     value = collected;
                                 } else {
diff --git a/src/month.ts b/src/month.ts
index 48d1de5..4a0ceb2 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -529,7 +529,7 @@ function renderMonthDays(
         // }
 
         daysInMonthView.push({
-            date: curDate.format(renderInfo.dateFormat),
+            date: helper.dateToStr(curDate, renderInfo.dateFormat),
             value: curValue,
             scaledValue: scaledValue,
             dayInMonth: curDate.date(),
@@ -714,7 +714,7 @@ function renderMonthDays(
     }
 
     // today rings
-    let today = window.moment().format(renderInfo.dateFormat);
+    let today = helper.dateToStr(window.moment(), renderInfo.dateFormat);
     if (monthInfo.showTodayRing) {
         let todayRings = chartElements.dataArea
             .selectAll("todayRing")
diff --git a/src/parsing.ts b/src/parsing.ts
index f715358..0744519 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1101,7 +1101,7 @@ export function getRenderInfoFromYaml(
                 strStartDate.length - renderInfo.dateFormatSuffix.length
             );
         }
-        
+
         let startDate = null;
         let isStartDateValid = false;
         const relDateRegex = /^(?<value>[\-\+]?[0-9]+)(?<unit>[dwmy])$/;
@@ -1114,29 +1114,21 @@ export function getRenderInfoFromYaml(
             ) {
                 let value = parseFloat(match.groups.value);
                 let unit = match.groups.unit;
-                startDate = window.moment(
-                    window.moment().format(dateFormat),
-                    dateFormat,
-                    true
-                );
+                startDate = helper.getDateToday(dateFormat);
                 if (unit === "d") {
                     startDate = startDate.add(value, "days");
-                }
-                else if (unit === "w") {
+                } else if (unit === "w") {
                     startDate = startDate.add(value, "weeks");
-                }
-                else if (unit === "m") {
+                } else if (unit === "m") {
                     startDate = startDate.add(value, "months");
-                }
-                else if (unit === "y") {
+                } else if (unit === "y") {
                     startDate = startDate.add(value, "years");
                 }
                 if (startDate.isValid()) {
                     isStartDateValid = true;
                 }
             }
-        }
-        else {
+        } else {
             startDate = window.moment(
                 strStartDate,
                 renderInfo.dateFormat,
@@ -1185,34 +1177,22 @@ export function getRenderInfoFromYaml(
             ) {
                 let value = parseFloat(match.groups.value);
                 let unit = match.groups.unit;
-                endDate = window.moment(
-                    window.moment().format(dateFormat),
-                    dateFormat,
-                    true
-                );
+                endDate = helper.getDateToday(dateFormat);
                 if (unit === "d") {
                     endDate = endDate.add(value, "days");
-                }
-                else if (unit === "w") {
+                } else if (unit === "w") {
                     endDate = endDate.add(value, "weeks");
-                }
-                else if (unit === "m") {
+                } else if (unit === "m") {
                     endDate = endDate.add(value, "months");
-                }
-                else if (unit === "y") {
+                } else if (unit === "y") {
                     endDate = endDate.add(value, "years");
                 }
                 if (endDate.isValid()) {
                     isEndDateValid = true;
                 }
             }
-        }
-        else {
-            endDate = window.moment(
-                strEndDate,
-                renderInfo.dateFormat,
-                true
-            );
+        } else {
+            endDate = window.moment(strEndDate, renderInfo.dateFormat, true);
             if (endDate.isValid()) {
                 isEndDateValid = true;
             }

From ce9e1ce68da16bcd26b528905374f81ab3beb30d Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 29 Jun 2021 22:43:32 +0800
Subject: [PATCH 097/402] Update TestWordCounting.md

---
 examples/TestWordCounting.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/examples/TestWordCounting.md b/examples/TestWordCounting.md
index eba4518..f08531f 100644
--- a/examples/TestWordCounting.md
+++ b/examples/TestWordCounting.md
@@ -1,5 +1,6 @@
 # Test Word Counting
 
+
 ## Word counts of daily notes
 ``` tracker
 searchType: fileMeta
@@ -38,11 +39,12 @@ summary:
 
 ## Word counts of any notes
 Use file creation dates as x values then sum the counts up
-```
+``` tracker
 searchType: fileMeta
-searchTargtet: cDate, numWords
+searchTarget: cDate, numWords
 xDataset: 0
 folder: /
 summary:
-    template: "Total word count: {{sum}}"
+    template: "Total word count: {{sum(Dataset(1))}}"
 ```
+

From cec7cc828a88e0d2681864d7debe157806f6457d Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Wed, 30 Jun 2021 10:10:42 +0800
Subject: [PATCH 098/402] Fix missing values from dvField when the dvField is
 at the last line of file

---
 src/collecting.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/collecting.ts b/src/collecting.ts
index 63b56f6..e61e9d5 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -583,7 +583,7 @@ export function collectDataFromDvField(
     let strHashtagRegex =
         "(^|\\s)\\*{0,2}" +
         dvTarget +
-        "\\*{0,2}(::\\s*(?<values>[\\d\\.\\/\\-\\w,@;\\s]*))(\r?\n|\r)";
+        "\\*{0,2}(::\\s*(?<values>[\\d\\.\\/\\-\\w,@;\\s]*))(\r?\n|\r|$)";
     // console.log(strHashtagRegex);
     let hashTagRegex = new RegExp(strHashtagRegex, "gm");
     let match;

From f278826c8c65dc28b12fb65a1e8131d8e6c37258 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Wed, 30 Jun 2021 19:58:51 +0800
Subject: [PATCH 099/402] Add input type 'task'

---
 examples/TestTask.md          |  47 ++++++++++++++++
 examples/diary/2021-01-01.md  |   2 +
 examples/diary/2021-01-02.md  |  34 ++++++------
 examples/diary/2021-01-03.md  |  48 ++++++++--------
 examples/diary/2021-01-04.md  |  40 ++++++++------
 examples/diary/2021-01-05.md  |  49 +++++++++--------
 examples/diary/2021-01-06.md  |  45 +++++++--------
 examples/diary/2021-01-07.md  |  44 ++++++++-------
 examples/diary/2021-01-08.md  |  47 ++++++++--------
 examples/diary/2021-01-09.md  |  48 ++++++++--------
 examples/diary/2021-01-10.md  |  44 ++++++++-------
 examples/diary/2021-01-11.md  |  46 ++++++++--------
 examples/diary/2021-01-12.md  |  47 +++++++++-------
 examples/diary/2021-01-13.md  |  41 +++++++-------
 examples/diary/2021-01-14.md  |  44 ++++++++-------
 examples/diary/2021-01-15.md  |  47 ++++++++--------
 examples/diary/2021-01-16.md  |  42 +++++++-------
 examples/diary/2021-01-17.md  |  48 ++++++++--------
 examples/diary/2021-01-18.md  |  46 ++++++++--------
 examples/diary/2021-01-19.md  |  47 ++++++++--------
 examples/diary/2021-01-20.md  |  45 +++++++--------
 examples/diary/2021-01-21.md  |  47 ++++++++--------
 examples/diary/2021-01-22.md  |  48 ++++++++--------
 examples/diary/2021-01-23.md  |  45 +++++++--------
 examples/diary/2021-01-24.md  |  46 ++++++++--------
 examples/diary/2021-01-25.md  |  46 ++++++++--------
 examples/diary/2021-01-26.md  |  43 ++++++++-------
 examples/diary/2021-01-27.md  |  44 ++++++++-------
 examples/diary/2021-01-28.md  |  47 ++++++++--------
 examples/diary/2021-01-29.md  |  47 ++++++++--------
 examples/diary/2021-01-30.md  |  42 +++++++-------
 examples/diary/2021-01-31.md  |  47 ++++++++--------
 examples/example_generator.ts |  12 ++++
 src/collecting.ts             | 100 +++++++++++++++++++++++++++++++++-
 src/data.ts                   |  11 ++++
 src/main.ts                   |  23 +++++++-
 src/month.ts                  |  17 ++++--
 src/parsing.ts                |  45 ++++++++++++---
 38 files changed, 946 insertions(+), 665 deletions(-)
 create mode 100644 examples/TestTask.md

diff --git a/examples/TestTask.md b/examples/TestTask.md
new file mode 100644
index 0000000..bfc6fbb
--- /dev/null
+++ b/examples/TestTask.md
@@ -0,0 +1,47 @@
+# Test Task
+
+## Summary
+All Tasks
+``` tracker
+searchType: task
+searchTarget: Say I love you
+folder: diary
+summary:
+    template: "Total count: {{sum}}"
+```
+
+All tasks
+``` tracker
+searchType: task.all
+searchTarget: Say I love you
+folder: diary
+summary:
+    template: "Total count: {{sum}}"
+```
+
+Task done
+``` tracker
+searchType: task.done
+searchTarget: Say I love you
+folder: diary
+summary:
+    template: "How many days I said: {{sum}}"
+```
+
+Task not done
+``` tracker
+searchType: task.notdone
+searchTarget: Say I love you
+folder: diary
+summary:
+    template: "How many days I didn't say: {{sum}}"
+```
+
+## Month View
+``` tracker
+searchType: task.notdone
+searchTarget: Say I love you
+folder: diary
+datasetName: Love
+month:
+```
\ No newline at end of file
diff --git a/examples/diary/2021-01-01.md b/examples/diary/2021-01-01.md
index 8144865..010e31d 100644
--- a/examples/diary/2021-01-01.md
+++ b/examples/diary/2021-01-01.md
@@ -48,3 +48,5 @@ dataviewTarget3:: 29, 88
 
 #sinsquare:0.00000/0.04323/0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907
 
+- [x] Say I love you
+
diff --git a/examples/diary/2021-01-02.md b/examples/diary/2021-01-02.md
index 6a37be3..b8e826f 100644
--- a/examples/diary/2021-01-02.md
+++ b/examples/diary/2021-01-02.md
@@ -1,52 +1,52 @@
 ---
 tags: 
-mood: 1
+mood: 7
 bloodpressure: 180.8/120.6
 bloodpressure1: 180.8, 120.6
 bloodpressure2: [180.8, 120.6]
 bp:
     systolic: 180.8
     diastolic: 120.6
-clock-in: 9:16
-clock-out: 16:49
-sleep: 9:12 pm/6:41 am
+clock-in: 8:7
+clock-out: 20:10
+sleep: 9:37 pm/7:57 am
 deepValue: 
     very: 
         very: 
             very: 
                 very: 
                     very: 
-                        deep: 96.3
+                        deep: 13.3
 ---
 
-#weight:62.8kg
+#weight:76.2kg
 
 #exercise-pushup:46
-#exercise-plank:101sec
+#exercise-plank:52sec
 
 #meditation
 
 
 
-#clean-up
 
-#finance/bank1:-3.8USD
+#finance/bank1:-3.5USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@gmail.com
 
-weightlifting: 12
+weightlifting: 13
 
-dataviewTarget:: 27
-- Make Progress:: 12
-- Make-Progress:: 55
-dataviewTarget1:: 27/12
-dataviewTarget2:: 12 @ 55
-dataviewTarget3:: 12, 55
+dataviewTarget:: 25
+- Make Progress:: 5
+- Make-Progress:: 72
+dataviewTarget1:: 25/5
+dataviewTarget2:: 5 @ 72
+dataviewTarget3:: 5, 72
 
 #sin:0.20791/0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452/0.95106
 
 #sinsquare:0.04323/0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451
 
+- [x] Say I love you
+
diff --git a/examples/diary/2021-01-03.md b/examples/diary/2021-01-03.md
index 6ac6973..ff62c5a 100644
--- a/examples/diary/2021-01-03.md
+++ b/examples/diary/2021-01-03.md
@@ -1,50 +1,52 @@
 ---
 tags: 
-mood: 5
-bloodpressure: 178.2/120.4
-bloodpressure1: 178.2, 120.4
-bloodpressure2: [178.2, 120.4]
+mood: 7
+bloodpressure: 180.2/118.4
+bloodpressure1: 180.2, 118.4
+bloodpressure2: [180.2, 118.4]
 bp:
-    systolic: 178.2
-    diastolic: 120.4
-clock-in: 10:22
-clock-out: 20:49
-sleep: 9:33 pm/5:17 am
+    systolic: 180.2
+    diastolic: 118.4
+clock-in: 10:49
+clock-out: 16:33
+sleep: 9:17 pm/6:48 am
 deepValue: 
     very: 
         very: 
             very: 
                 very: 
                     very: 
-                        deep: 49.3
+                        deep: 73.0
 ---
 
-#weight:76.8kg
+#weight:63.2kg
 
-#exercise-pushup:45
-#exercise-plank:43sec
+#exercise-pushup:49
+#exercise-plank:79sec
 
+#meditation
 
-⭐⭐⭐
+⭐
 
 
-#finance/bank1:-2.6USD
+#finance/bank1:-2.4USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@gmail.com
+obsidian-tracker@yahoo.com
 
-weightlifting: 12
 
-dataviewTarget:: 88
-- Make Progress:: 5
-- Make-Progress:: 56
-dataviewTarget1:: 88/5
-dataviewTarget2:: 5 @ 56
-dataviewTarget3:: 5, 56
+dataviewTarget:: 12
+- Make Progress:: 14
+- Make-Progress:: 82
+dataviewTarget1:: 12/14
+dataviewTarget2:: 14 @ 82
+dataviewTarget3:: 14, 82
 
 #sin:0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452/0.95106/0.86603
 
 #sinsquare:0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000
 
+- [ ] Say I love you
+
diff --git a/examples/diary/2021-01-04.md b/examples/diary/2021-01-04.md
index 73fce11..19d43a8 100644
--- a/examples/diary/2021-01-04.md
+++ b/examples/diary/2021-01-04.md
@@ -1,51 +1,55 @@
 ---
 tags: work_log
 mood: 3
-bloodpressure: 179.6/121.2
-bloodpressure1: 179.6, 121.2
-bloodpressure2: [179.6, 121.2]
+bloodpressure: 176.6/121.2
+bloodpressure1: 176.6, 121.2
+bloodpressure2: [176.6, 121.2]
 bp:
-    systolic: 179.6
+    systolic: 176.6
     diastolic: 121.2
-clock-in: 8:24
-clock-out: 20:58
-sleep: 11:57 pm/7:20 am
+clock-in: 10:41
+clock-out: 20:52
+sleep: 10:10 pm/6:37 am
 deepValue: 
     very: 
         very: 
             very: 
                 very: 
                     very: 
-                        deep: 18.0
+                        deep: 88.6
 ---
 
-#weight:70.1kg
+#weight:61.6kg
 
-#exercise-pushup:42
-#exercise-plank:109sec
+#exercise-pushup:33
+#exercise-plank:114sec
 
 #meditation
 
 ⭐
 
 
-#finance/bank1:-2.7USD
+#finance/bank1:-3.8USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
+obsidian-tracker@gmail.com
+obsidian-tracker+1@gmail.com
 obsidian-tracker@yahoo.com
 
 weightlifting: 18
 
-dataviewTarget:: 58
-- Make Progress:: 41
-- Make-Progress:: 59
-dataviewTarget1:: 58/41
-dataviewTarget2:: 41 @ 59
-dataviewTarget3:: 41, 59
+dataviewTarget:: 43
+- Make Progress:: 29
+- Make-Progress:: 74
+dataviewTarget1:: 43/29
+dataviewTarget2:: 29 @ 74
+dataviewTarget3:: 29, 74
 
 #sin:0.58779/0.74314/0.86603/0.95106/0.99452/0.99452/0.95106/0.86603/0.74314
 
 #sinsquare:0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000/0.55226
 
+- [x] Say I love you
+
diff --git a/examples/diary/2021-01-05.md b/examples/diary/2021-01-05.md
index 51dca8b..3265595 100644
--- a/examples/diary/2021-01-05.md
+++ b/examples/diary/2021-01-05.md
@@ -1,51 +1,54 @@
 ---
 tags: work_log
-mood: 5
-bloodpressure: 178/119
-bloodpressure1: 178, 119
-bloodpressure2: [178, 119]
+mood: 2
+bloodpressure: 180/118
+bloodpressure1: 180, 118
+bloodpressure2: [180, 118]
 bp:
-    systolic: 178
-    diastolic: 119
-clock-in: 8:10
-clock-out: 20:21
-sleep: 10:1 pm/6:57 am
+    systolic: 180
+    diastolic: 118
+clock-in: 9:1
+clock-out: 18:57
+sleep: 9:9 pm/5:57 am
 deepValue: 
     very: 
         very: 
             very: 
                 very: 
                     very: 
-                        deep: 11.3
+                        deep: 13.1
 ---
 
-#weight:63.2kg
+#weight:72.5kg
 
-#exercise-pushup:32
-#exercise-plank:117sec
+#exercise-pushup:49
+#exercise-plank:57sec
 
 #meditation
 
-⭐⭐⭐
+⭐
 
 
-#finance/bank1:-2.6USD
+#finance/bank1:-3.9USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@yahoo.com
+obsidian-tracker@gmail.com
+obsidian-tracker+1@gmail.com
 
-weightlifting: 20
+weightlifting: 17
 
-dataviewTarget:: 66
-- Make Progress:: 12
-- Make-Progress:: 85
-dataviewTarget1:: 66/12
-dataviewTarget2:: 12 @ 85
-dataviewTarget3:: 12, 85
+dataviewTarget:: 86
+- Make Progress:: 24
+- Make-Progress:: 90
+dataviewTarget1:: 86/24
+dataviewTarget2:: 24 @ 90
+dataviewTarget3:: 24, 90
 
 #sin:0.74314/0.86603/0.95106/0.99452/0.99452/0.95106/0.86603/0.74314/0.58779
 
 #sinsquare:0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000/0.55226/0.34549
 
+- [x] Say I love you
+
diff --git a/examples/diary/2021-01-06.md b/examples/diary/2021-01-06.md
index 3cce288..3a092b0 100644
--- a/examples/diary/2021-01-06.md
+++ b/examples/diary/2021-01-06.md
@@ -1,52 +1,53 @@
 ---
 tags: work_log
-mood: 7
-bloodpressure: 180.4/118.8
-bloodpressure1: 180.4, 118.8
-bloodpressure2: [180.4, 118.8]
+mood: 8
+bloodpressure: 171.4/118.8
+bloodpressure1: 171.4, 118.8
+bloodpressure2: [171.4, 118.8]
 bp:
-    systolic: 180.4
+    systolic: 171.4
     diastolic: 118.8
-clock-in: 10:23
-clock-out: 19:2
-sleep: 10:47 pm/6:41 am
+clock-in: 10:27
+clock-out: 19:26
+sleep: 10:30 pm/5:29 am
 deepValue: 
     very: 
         very: 
             very: 
                 very: 
                     very: 
-                        deep: 44.5
+                        deep: 20.7
 ---
 
-#weight:74.0kg
+#weight:60.1kg
 
-#exercise-pushup:40
-#exercise-plank:51sec
+#exercise-pushup:46
+#exercise-plank:110sec
 
 #meditation
 
-⭐
+⭐⭐⭐
 
 
-#finance/bank1:-3.6USD
+#finance/bank1:-2.4USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@gmail.com
-obsidian-tracker@yahoo.com
+obsidian-tracker+1@gmail.com
 
-weightlifting: 12
+weightlifting: 19
 
-dataviewTarget:: 25
-- Make Progress:: 47
+dataviewTarget:: 98
+- Make Progress:: 46
 - Make-Progress:: 75
-dataviewTarget1:: 25/47
-dataviewTarget2:: 47 @ 75
-dataviewTarget3:: 47, 75
+dataviewTarget1:: 98/46
+dataviewTarget2:: 46 @ 75
+dataviewTarget3:: 46, 75
 
 #sin:0.86603/0.95106/0.99452/0.99452/0.95106/0.86603/0.74314/0.58779/0.40674
 
 #sinsquare:0.75000/0.90451/0.98907/0.98907/0.90451/0.75000/0.55226/0.34549/0.16543
 
+- [x] Say I love you
+
diff --git a/examples/diary/2021-01-07.md b/examples/diary/2021-01-07.md
index 4be6c2c..8498898 100644
--- a/examples/diary/2021-01-07.md
+++ b/examples/diary/2021-01-07.md
@@ -1,51 +1,53 @@
 ---
 tags: work_log
-mood: 9
-bloodpressure: 173.8/120.6
-bloodpressure1: 173.8, 120.6
-bloodpressure2: [173.8, 120.6]
+mood: 1
+bloodpressure: 175.8/120.6
+bloodpressure1: 175.8, 120.6
+bloodpressure2: [175.8, 120.6]
 bp:
-    systolic: 173.8
+    systolic: 175.8
     diastolic: 120.6
-clock-in: 10:29
-clock-out: 17:0
-sleep: 10:54 pm/6:53 am
+clock-in: 9:53
+clock-out: 17:39
+sleep: 10:53 pm/7:13 am
 deepValue: 
     very: 
         very: 
             very: 
                 very: 
                     very: 
-                        deep: 38.4
+                        deep: 47.8
 ---
 
-#weight:73.7kg
+#weight:70.2kg
 
-#exercise-pushup:40
-#exercise-plank:111sec
+#exercise-pushup:33
+#exercise-plank:103sec
 
 
 ⭐
 
 
-#finance/bank1:-3.0USD
+#finance/bank1:-2.6USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker+1@gmail.com
+obsidian-tracker@gmail.com
 obsidian-tracker@yahoo.com
 
-weightlifting: 12
+weightlifting: 10
 
-dataviewTarget:: 29
-- Make Progress:: 38
-- Make-Progress:: 59
-dataviewTarget1:: 29/38
-dataviewTarget2:: 38 @ 59
-dataviewTarget3:: 38, 59
+dataviewTarget:: 43
+- Make Progress:: 6
+- Make-Progress:: 77
+dataviewTarget1:: 43/6
+dataviewTarget2:: 6 @ 77
+dataviewTarget3:: 6, 77
 
 #sin:0.95106/0.99452/0.99452/0.95106/0.86603/0.74314/0.58779/0.40674/0.20791
 
 #sinsquare:0.90451/0.98907/0.98907/0.90451/0.75000/0.55226/0.34549/0.16543/0.04323
 
+- [x] Say I love you
+
diff --git a/examples/diary/2021-01-08.md b/examples/diary/2021-01-08.md
index 8c4f6c9..bd277b9 100644
--- a/examples/diary/2021-01-08.md
+++ b/examples/diary/2021-01-08.md
@@ -1,35 +1,34 @@
 ---
 tags: work_log
-mood: 10
-bloodpressure: 170.2/119.4
-bloodpressure1: 170.2, 119.4
-bloodpressure2: [170.2, 119.4]
+mood: 1
+bloodpressure: 172.2/116.4
+bloodpressure1: 172.2, 116.4
+bloodpressure2: [172.2, 116.4]
 bp:
-    systolic: 170.2
-    diastolic: 119.4
-clock-in: 9:8
-clock-out: 18:18
-sleep: 9:12 pm/5:1 am
+    systolic: 172.2
+    diastolic: 116.4
+clock-in: 8:5
+clock-out: 16:5
+sleep: 9:1 pm/6:56 am
 deepValue: 
     very: 
         very: 
             very: 
                 very: 
                     very: 
-                        deep: 9.8
+                        deep: 68.6
 ---
 
-#weight:63.9kg
+#weight:74.0kg
 
-#exercise-pushup:32
-#exercise-plank:48sec
+#exercise-pushup:33
+#exercise-plank:77sec
 
-#meditation
 
-⭐⭐⭐
+⭐
 
 
-#finance/bank1:-3.4USD
+#finance/bank1:-2.9USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
@@ -37,16 +36,18 @@ deepValue:
 obsidian-tracker@gmail.com
 obsidian-tracker@yahoo.com
 
-weightlifting: 15
+weightlifting: 19
 
-dataviewTarget:: 100
-- Make Progress:: 23
-- Make-Progress:: 79
-dataviewTarget1:: 100/23
-dataviewTarget2:: 23 @ 79
-dataviewTarget3:: 23, 79
+dataviewTarget:: 39
+- Make Progress:: 25
+- Make-Progress:: 77
+dataviewTarget1:: 39/25
+dataviewTarget2:: 25 @ 77
+dataviewTarget3:: 25, 77
 
 #sin:0.99452/0.99452/0.95106/0.86603/0.74314/0.58779/0.40674/0.20791/0.00000
 
 #sinsquare:0.98907/0.98907/0.90451/0.75000/0.55226/0.34549/0.16543/0.04323/0.00000
 
+- [ ] Say I love you
+
diff --git a/examples/diary/2021-01-09.md b/examples/diary/2021-01-09.md
index cf13e63..1d4f394 100644
--- a/examples/diary/2021-01-09.md
+++ b/examples/diary/2021-01-09.md
@@ -1,51 +1,55 @@
 ---
 tags: 
-mood: 2
-bloodpressure: 177.6/120.2
-bloodpressure1: 177.6, 120.2
-bloodpressure2: [177.6, 120.2]
+mood: 1
+bloodpressure: 175.6/118.2
+bloodpressure1: 175.6, 118.2
+bloodpressure2: [175.6, 118.2]
 bp:
-    systolic: 177.6
-    diastolic: 120.2
-clock-in: 10:23
-clock-out: 18:32
-sleep: 11:3 pm/6:35 am
+    systolic: 175.6
+    diastolic: 118.2
+clock-in: 8:37
+clock-out: 17:9
+sleep: 9:23 pm/5:51 am
 deepValue: 
     very: 
         very: 
             very: 
                 very: 
                     very: 
-                        deep: 23.3
+                        deep: 68.6
 ---
 
-#weight:73.1kg
+#weight:68.8kg
 
-#exercise-pushup:37
-#exercise-plank:44sec
+#exercise-pushup:35
+#exercise-plank:112sec
 
 #meditation
 
-⭐⭐
+⭐⭐⭐
 
 
-#finance/bank1:-3.7USD
+#finance/bank1:-3.8USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
 obsidian-tracker@gmail.com
+obsidian-tracker+1@gmail.com
+obsidian-tracker@yahoo.com
 
-weightlifting: 19
+weightlifting: 10
 
-dataviewTarget:: 62
-- Make Progress:: 44
-- Make-Progress:: 96
-dataviewTarget1:: 62/44
-dataviewTarget2:: 44 @ 96
-dataviewTarget3:: 44, 96
+dataviewTarget:: 37
+- Make Progress:: 36
+- Make-Progress:: 53
+dataviewTarget1:: 37/36
+dataviewTarget2:: 36 @ 53
+dataviewTarget3:: 36, 53
 
 #sin:0.99452/0.95106/0.86603/0.74314/0.58779/0.40674/0.20791/0.00000/-0.20791
 
 #sinsquare:0.98907/0.90451/0.75000/0.55226/0.34549/0.16543/0.04323/0.00000/0.04323
 
+- [x] Say I love you
+
diff --git a/examples/diary/2021-01-10.md b/examples/diary/2021-01-10.md
index 7f01e58..2d9ecc9 100644
--- a/examples/diary/2021-01-10.md
+++ b/examples/diary/2021-01-10.md
@@ -1,31 +1,31 @@
 ---
 tags: 
-mood: 7
-bloodpressure: 178/118
-bloodpressure1: 178, 118
-bloodpressure2: [178, 118]
+mood: 3
+bloodpressure: 179/116
+bloodpressure1: 179, 116
+bloodpressure2: [179, 116]
 bp:
-    systolic: 178
-    diastolic: 118
-clock-in: 8:31
-clock-out: 17:43
-sleep: 9:7 pm/5:59 am
+    systolic: 179
+    diastolic: 116
+clock-in: 10:25
+clock-out: 17:55
+sleep: 10:11 pm/5:31 am
 deepValue: 
     very: 
         very: 
             very: 
                 very: 
                     very: 
-                        deep: 8.4
+                        deep: 17.7
 ---
 
-#weight:79.3kg
+#weight:62.1kg
 
-#exercise-pushup:38
-#exercise-plank:62sec
+#exercise-pushup:41
+#exercise-plank:92sec
 
 
-⭐⭐
+⭐⭐⭐
 
 
 #finance/bank1:-2.2USD
@@ -34,17 +34,19 @@ deepValue:
 [[todo_work|To-Do @Work]]
 
 obsidian-tracker@gmail.com
+obsidian-tracker@yahoo.com
 
-weightlifting: 15
 
-dataviewTarget:: 65
-- Make Progress:: 27
-- Make-Progress:: 77
-dataviewTarget1:: 65/27
-dataviewTarget2:: 27 @ 77
-dataviewTarget3:: 27, 77
+dataviewTarget:: 4
+- Make Progress:: 10
+- Make-Progress:: 92
+dataviewTarget1:: 4/10
+dataviewTarget2:: 10 @ 92
+dataviewTarget3:: 10, 92
 
 #sin:0.95106/0.86603/0.74314/0.58779/0.40674/0.20791/0.00000/-0.20791/-0.40674
 
 #sinsquare:0.90451/0.75000/0.55226/0.34549/0.16543/0.04323/0.00000/0.04323/0.16543
 
+- [ ] Say I love you
+
diff --git a/examples/diary/2021-01-11.md b/examples/diary/2021-01-11.md
index 847c842..e8fe2dd 100644
--- a/examples/diary/2021-01-11.md
+++ b/examples/diary/2021-01-11.md
@@ -1,49 +1,51 @@
 ---
 tags: work_log
-mood: 2
-bloodpressure: 174.4/115.8
-bloodpressure1: 174.4, 115.8
-bloodpressure2: [174.4, 115.8]
+mood: 5
+bloodpressure: 173.4/117.8
+bloodpressure1: 173.4, 117.8
+bloodpressure2: [173.4, 117.8]
 bp:
-    systolic: 174.4
-    diastolic: 115.8
-clock-in: 10:8
-clock-out: 16:2
-sleep: 9:49 pm/7:29 am
+    systolic: 173.4
+    diastolic: 117.8
+clock-in: 9:42
+clock-out: 20:35
+sleep: 11:47 pm/6:8 am
 deepValue: 
     very: 
         very: 
             very: 
                 very: 
                     very: 
-                        deep: 50.7
+                        deep: 26.2
 ---
 
-#weight:71.0kg
+#weight:80.8kg
 
-#exercise-pushup:43
-#exercise-plank:95sec
+#exercise-pushup:48
+#exercise-plank:46sec
 
 
-⭐⭐⭐
+⭐⭐⭐⭐
 
 
-#finance/bank1:-3.6USD
+#finance/bank1:-2.5USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
+obsidian-tracker@yahoo.com
 
-weightlifting: 20
 
-dataviewTarget:: 18
-- Make Progress:: 31
-- Make-Progress:: 85
-dataviewTarget1:: 18/31
-dataviewTarget2:: 31 @ 85
-dataviewTarget3:: 31, 85
+dataviewTarget:: 97
+- Make Progress:: 19
+- Make-Progress:: 82
+dataviewTarget1:: 97/19
+dataviewTarget2:: 19 @ 82
+dataviewTarget3:: 19, 82
 
 #sin:0.86603/0.74314/0.58779/0.40674/0.20791/0.00000/-0.20791/-0.40674/-0.58779
 
 #sinsquare:0.75000/0.55226/0.34549/0.16543/0.04323/0.00000/0.04323/0.16543/0.34549
 
+- [x] Say I love you
+
diff --git a/examples/diary/2021-01-12.md b/examples/diary/2021-01-12.md
index ac51000..406957a 100644
--- a/examples/diary/2021-01-12.md
+++ b/examples/diary/2021-01-12.md
@@ -1,48 +1,53 @@
 ---
 tags: work_log
-mood: 4
-bloodpressure: 169.8/117.6
-bloodpressure1: 169.8, 117.6
-bloodpressure2: [169.8, 117.6]
+mood: 1
+bloodpressure: 176.8/118.6
+bloodpressure1: 176.8, 118.6
+bloodpressure2: [176.8, 118.6]
 bp:
-    systolic: 169.8
-    diastolic: 117.6
-clock-in: 9:31
-clock-out: 17:4
-sleep: 11:22 pm/6:1 am
+    systolic: 176.8
+    diastolic: 118.6
+clock-in: 8:54
+clock-out: 16:19
+sleep: 11:23 pm/6:15 am
 deepValue: 
     very: 
         very: 
             very: 
                 very: 
                     very: 
-                        deep: 1.4
+                        deep: 45.0
 ---
 
-#weight:78.4kg
+#weight:61.7kg
 
-#exercise-pushup:45
-#exercise-plank:37sec
+#exercise-pushup:32
+#exercise-plank:31sec
 
+#meditation
 
+⭐⭐⭐
 
 
-
-#finance/bank1:-3.7USD
+#finance/bank1:-2.7USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
+obsidian-tracker@gmail.com
 
+weightlifting: 10
 
-dataviewTarget:: 12
-- Make Progress:: 0
-- Make-Progress:: 67
-dataviewTarget1:: 12/0
-dataviewTarget2:: 0 @ 67
-dataviewTarget3:: 0, 67
+dataviewTarget:: 79
+- Make Progress:: 36
+- Make-Progress:: 66
+dataviewTarget1:: 79/36
+dataviewTarget2:: 36 @ 66
+dataviewTarget3:: 36, 66
 
 #sin:0.74314/0.58779/0.40674/0.20791/0.00000/-0.20791/-0.40674/-0.58779/-0.74314
 
 #sinsquare:0.55226/0.34549/0.16543/0.04323/0.00000/0.04323/0.16543/0.34549/0.55226
 
+- [x] Say I love you
+
diff --git a/examples/diary/2021-01-13.md b/examples/diary/2021-01-13.md
index ad01bfc..20ffccd 100644
--- a/examples/diary/2021-01-13.md
+++ b/examples/diary/2021-01-13.md
@@ -1,50 +1,51 @@
 ---
 tags: work_log
-mood: 7
-bloodpressure: 176.2/116.4
-bloodpressure1: 176.2, 116.4
-bloodpressure2: [176.2, 116.4]
+mood: 10
+bloodpressure: 168.2/116.4
+bloodpressure1: 168.2, 116.4
+bloodpressure2: [168.2, 116.4]
 bp:
-    systolic: 176.2
+    systolic: 168.2
     diastolic: 116.4
-clock-in: 10:23
-clock-out: 16:5
-sleep: 11:47 pm/7:19 am
+clock-in: 8:1
+clock-out: 17:0
+sleep: 9:2 pm/6:37 am
 deepValue: 
     very: 
         very: 
             very: 
                 very: 
                     very: 
-                        deep: 47.9
+                        deep: 64.5
 ---
 
-#weight:79.5kg
+#weight:71.7kg
 
-#exercise-pushup:32
-#exercise-plank:53sec
+#exercise-pushup:44
+#exercise-plank:45sec
 
 #meditation
 
 
 
 
-#finance/bank1:-2.0USD
+#finance/bank1:-3.4USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
 
-weightlifting: 16
 
-dataviewTarget:: 56
-- Make Progress:: 34
-- Make-Progress:: 58
-dataviewTarget1:: 56/34
-dataviewTarget2:: 34 @ 58
-dataviewTarget3:: 34, 58
+dataviewTarget:: 87
+- Make Progress:: 46
+- Make-Progress:: 73
+dataviewTarget1:: 87/46
+dataviewTarget2:: 46 @ 73
+dataviewTarget3:: 46, 73
 
 #sin:0.58779/0.40674/0.20791/0.00000/-0.20791/-0.40674/-0.58779/-0.74314/-0.86603
 
 #sinsquare:0.34549/0.16543/0.04323/0.00000/0.04323/0.16543/0.34549/0.55226/0.75000
 
+- [x] Say I love you
+
diff --git a/examples/diary/2021-01-14.md b/examples/diary/2021-01-14.md
index 6575a5e..110f0a2 100644
--- a/examples/diary/2021-01-14.md
+++ b/examples/diary/2021-01-14.md
@@ -1,51 +1,53 @@
 ---
 tags: work_log
 mood: 5
-bloodpressure: 167.6/117.2
-bloodpressure1: 167.6, 117.2
-bloodpressure2: [167.6, 117.2]
+bloodpressure: 175.6/117.2
+bloodpressure1: 175.6, 117.2
+bloodpressure2: [175.6, 117.2]
 bp:
-    systolic: 167.6
+    systolic: 175.6
     diastolic: 117.2
-clock-in: 10:7
-clock-out: 16:5
-sleep: 9:9 pm/7:54 am
+clock-in: 8:53
+clock-out: 17:19
+sleep: 9:40 pm/7:25 am
 deepValue: 
     very: 
         very: 
             very: 
                 very: 
                     very: 
-                        deep: 46.6
+                        deep: 61.5
 ---
 
-#weight:61.9kg
+#weight:77.1kg
 
-#exercise-pushup:39
-#exercise-plank:111sec
+#exercise-pushup:37
+#exercise-plank:89sec
 
 #meditation
 
+⭐
 
 
-
-#finance/bank1:-2.7USD
+#finance/bank1:-2.5USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@yahoo.com
+obsidian-tracker@gmail.com
 
-weightlifting: 20
+weightlifting: 15
 
-dataviewTarget:: 61
-- Make Progress:: 41
-- Make-Progress:: 68
-dataviewTarget1:: 61/41
-dataviewTarget2:: 41 @ 68
-dataviewTarget3:: 41, 68
+dataviewTarget:: 43
+- Make Progress:: 5
+- Make-Progress:: 92
+dataviewTarget1:: 43/5
+dataviewTarget2:: 5 @ 92
+dataviewTarget3:: 5, 92
 
 #sin:0.40674/0.20791/0.00000/-0.20791/-0.40674/-0.58779/-0.74314/-0.86603/-0.95106
 
 #sinsquare:0.16543/0.04323/0.00000/0.04323/0.16543/0.34549/0.55226/0.75000/0.90451
 
+- [x] Say I love you
+
diff --git a/examples/diary/2021-01-15.md b/examples/diary/2021-01-15.md
index 729cf3d..06f6b03 100644
--- a/examples/diary/2021-01-15.md
+++ b/examples/diary/2021-01-15.md
@@ -1,52 +1,53 @@
 ---
 tags: work_log
-mood: 7
-bloodpressure: 168/116
-bloodpressure1: 168, 116
-bloodpressure2: [168, 116]
+mood: 1
+bloodpressure: 176/115
+bloodpressure1: 176, 115
+bloodpressure2: [176, 115]
 bp:
-    systolic: 168
-    diastolic: 116
-clock-in: 8:13
-clock-out: 18:16
-sleep: 9:28 pm/7:25 am
+    systolic: 176
+    diastolic: 115
+clock-in: 9:20
+clock-out: 18:40
+sleep: 11:14 pm/6:44 am
 deepValue: 
     very: 
         very: 
             very: 
                 very: 
                     very: 
-                        deep: 10.0
+                        deep: 44.0
 ---
 
-#weight:77.4kg
+#weight:69.6kg
 
-#exercise-pushup:33
-#exercise-plank:32sec
+#exercise-pushup:40
+#exercise-plank:100sec
 
+#meditation
 
 
 
 
-#finance/bank1:-2.7USD
+#finance/bank1:-2.5USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@gmail.com
-obsidian-tracker+1@gmail.com
 obsidian-tracker@yahoo.com
 
-weightlifting: 12
+weightlifting: 14
 
-dataviewTarget:: 74
-- Make Progress:: 22
-- Make-Progress:: 73
-dataviewTarget1:: 74/22
-dataviewTarget2:: 22 @ 73
-dataviewTarget3:: 22, 73
+dataviewTarget:: 60
+- Make Progress:: 7
+- Make-Progress:: 81
+dataviewTarget1:: 60/7
+dataviewTarget2:: 7 @ 81
+dataviewTarget3:: 7, 81
 
 #sin:0.20791/0.00000/-0.20791/-0.40674/-0.58779/-0.74314/-0.86603/-0.95106/-0.99452
 
 #sinsquare:0.04323/0.00000/0.04323/0.16543/0.34549/0.55226/0.75000/0.90451/0.98907
 
+- [ ] Say I love you
+
diff --git a/examples/diary/2021-01-16.md b/examples/diary/2021-01-16.md
index 44d6d23..0f0b883 100644
--- a/examples/diary/2021-01-16.md
+++ b/examples/diary/2021-01-16.md
@@ -1,51 +1,51 @@
 ---
 tags: 
-mood: 5
-bloodpressure: 173.4/114.8
-bloodpressure1: 173.4, 114.8
-bloodpressure2: [173.4, 114.8]
+mood: 9
+bloodpressure: 168.4/114.8
+bloodpressure1: 168.4, 114.8
+bloodpressure2: [168.4, 114.8]
 bp:
-    systolic: 173.4
+    systolic: 168.4
     diastolic: 114.8
-clock-in: 8:32
-clock-out: 17:4
-sleep: 9:51 pm/6:15 am
+clock-in: 9:54
+clock-out: 18:3
+sleep: 11:24 pm/6:40 am
 deepValue: 
     very: 
         very: 
             very: 
                 very: 
                     very: 
-                        deep: 61.0
+                        deep: 81.6
 ---
 
-#weight:63.1kg
+#weight:70.0kg
 
-#exercise-pushup:43
-#exercise-plank:110sec
+#exercise-pushup:38
+#exercise-plank:113sec
 
 
 ⭐⭐
 
 
-#finance/bank1:-3.1USD
+#finance/bank1:-2.6USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@gmail.com
 obsidian-tracker+1@gmail.com
 
-weightlifting: 20
 
-dataviewTarget:: 54
-- Make Progress:: 34
-- Make-Progress:: 91
-dataviewTarget1:: 54/34
-dataviewTarget2:: 34 @ 91
-dataviewTarget3:: 34, 91
+dataviewTarget:: 17
+- Make Progress:: 21
+- Make-Progress:: 93
+dataviewTarget1:: 17/21
+dataviewTarget2:: 21 @ 93
+dataviewTarget3:: 21, 93
 
 #sin:0.00000/-0.20791/-0.40674/-0.58779/-0.74314/-0.86603/-0.95106/-0.99452/-0.99452
 
 #sinsquare:0.00000/0.04323/0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907
 
+- [ ] Say I love you
+
diff --git a/examples/diary/2021-01-17.md b/examples/diary/2021-01-17.md
index 188c795..dfa7263 100644
--- a/examples/diary/2021-01-17.md
+++ b/examples/diary/2021-01-17.md
@@ -1,49 +1,53 @@
 ---
 tags: 
-mood: 5
-bloodpressure: 168.8/118.6
-bloodpressure1: 168.8, 118.6
-bloodpressure2: [168.8, 118.6]
+mood: 3
+bloodpressure: 165.8/114.6
+bloodpressure1: 165.8, 114.6
+bloodpressure2: [165.8, 114.6]
 bp:
-    systolic: 168.8
-    diastolic: 118.6
-clock-in: 9:25
-clock-out: 17:18
-sleep: 9:42 pm/5:42 am
+    systolic: 165.8
+    diastolic: 114.6
+clock-in: 8:3
+clock-out: 16:23
+sleep: 10:42 pm/6:30 am
 deepValue: 
     very: 
         very: 
             very: 
                 very: 
                     very: 
-                        deep: 15.4
+                        deep: 43.0
 ---
 
-#weight:63.5kg
+#weight:64.6kg
 
-#exercise-pushup:38
-#exercise-plank:107sec
+#exercise-pushup:48
+#exercise-plank:93sec
 
 
-⭐
+⭐⭐⭐⭐
 
 
-#finance/bank1:-2.4USD
+#finance/bank1:-3.6USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
+obsidian-tracker@gmail.com
+obsidian-tracker@yahoo.com
 
-weightlifting: 14
+weightlifting: 17
 
-dataviewTarget:: 70
-- Make Progress:: 17
-- Make-Progress:: 75
-dataviewTarget1:: 70/17
-dataviewTarget2:: 17 @ 75
-dataviewTarget3:: 17, 75
+dataviewTarget:: 46
+- Make Progress:: 38
+- Make-Progress:: 82
+dataviewTarget1:: 46/38
+dataviewTarget2:: 38 @ 82
+dataviewTarget3:: 38, 82
 
 #sin:-0.20791/-0.40674/-0.58779/-0.74314/-0.86603/-0.95106/-0.99452/-0.99452/-0.95106
 
 #sinsquare:0.04323/0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451
 
+- [ ] Say I love you
+
diff --git a/examples/diary/2021-01-18.md b/examples/diary/2021-01-18.md
index 662c4d1..8183400 100644
--- a/examples/diary/2021-01-18.md
+++ b/examples/diary/2021-01-18.md
@@ -1,51 +1,53 @@
 ---
 tags: work_log
-mood: 5
-bloodpressure: 166.2/118.4
-bloodpressure1: 166.2, 118.4
-bloodpressure2: [166.2, 118.4]
+mood: 2
+bloodpressure: 167.2/118.4
+bloodpressure1: 167.2, 118.4
+bloodpressure2: [167.2, 118.4]
 bp:
-    systolic: 166.2
+    systolic: 167.2
     diastolic: 118.4
-clock-in: 10:44
-clock-out: 19:39
-sleep: 11:31 pm/5:44 am
+clock-in: 8:48
+clock-out: 19:49
+sleep: 9:10 pm/7:51 am
 deepValue: 
     very: 
         very: 
             very: 
                 very: 
                     very: 
-                        deep: 68.6
+                        deep: 19.5
 ---
 
-#weight:64.2kg
+#weight:78.7kg
 
-#exercise-pushup:39
-#exercise-plank:99sec
+#exercise-pushup:42
+#exercise-plank:77sec
 
+#meditation
 
-⭐⭐⭐⭐⭐
+⭐
 
 
-#finance/bank1:-2.6USD
+#finance/bank1:-3.3USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
 obsidian-tracker@gmail.com
-obsidian-tracker@yahoo.com
 
-weightlifting: 16
+weightlifting: 20
 
-dataviewTarget:: 2
-- Make Progress:: 8
-- Make-Progress:: 93
-dataviewTarget1:: 2/8
-dataviewTarget2:: 8 @ 93
-dataviewTarget3:: 8, 93
+dataviewTarget:: 28
+- Make Progress:: 40
+- Make-Progress:: 81
+dataviewTarget1:: 28/40
+dataviewTarget2:: 40 @ 81
+dataviewTarget3:: 40, 81
 
 #sin:-0.40674/-0.58779/-0.74314/-0.86603/-0.95106/-0.99452/-0.99452/-0.95106/-0.86603
 
 #sinsquare:0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000
 
+- [ ] Say I love you
+
diff --git a/examples/diary/2021-01-19.md b/examples/diary/2021-01-19.md
index 1eb4693..7ff9028 100644
--- a/examples/diary/2021-01-19.md
+++ b/examples/diary/2021-01-19.md
@@ -1,50 +1,53 @@
 ---
 tags: work_log
-mood: 9
-bloodpressure: 165.6/118.2
-bloodpressure1: 165.6, 118.2
-bloodpressure2: [165.6, 118.2]
+mood: 6
+bloodpressure: 165.6/117.2
+bloodpressure1: 165.6, 117.2
+bloodpressure2: [165.6, 117.2]
 bp:
     systolic: 165.6
-    diastolic: 118.2
-clock-in: 9:31
-clock-out: 16:13
-sleep: 11:39 pm/6:11 am
+    diastolic: 117.2
+clock-in: 8:30
+clock-out: 17:42
+sleep: 9:34 pm/7:2 am
 deepValue: 
     very: 
         very: 
             very: 
                 very: 
                     very: 
-                        deep: 44.1
+                        deep: 29.5
 ---
 
-#weight:80.0kg
+#weight:69.3kg
 
-#exercise-pushup:35
-#exercise-plank:55sec
+#exercise-pushup:47
+#exercise-plank:69sec
 
+#meditation
 
-⭐⭐⭐
+⭐⭐
 
 
-#finance/bank1:-3.1USD
+#finance/bank1:-3.5USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker+1@gmail.com
+obsidian-tracker@gmail.com
 
-weightlifting: 15
+weightlifting: 16
 
-dataviewTarget:: 71
-- Make Progress:: 9
-- Make-Progress:: 79
-dataviewTarget1:: 71/9
-dataviewTarget2:: 9 @ 79
-dataviewTarget3:: 9, 79
+dataviewTarget:: 73
+- Make Progress:: 8
+- Make-Progress:: 59
+dataviewTarget1:: 73/8
+dataviewTarget2:: 8 @ 59
+dataviewTarget3:: 8, 59
 
 #sin:-0.58779/-0.74314/-0.86603/-0.95106/-0.99452/-0.99452/-0.95106/-0.86603/-0.74314
 
 #sinsquare:0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000/0.55226
 
+- [ ] Say I love you
+
diff --git a/examples/diary/2021-01-20.md b/examples/diary/2021-01-20.md
index ff9c856..9ccb474 100644
--- a/examples/diary/2021-01-20.md
+++ b/examples/diary/2021-01-20.md
@@ -1,50 +1,51 @@
 ---
 tags: work_log
-mood: 10
-bloodpressure: 163/115
-bloodpressure1: 163, 115
-bloodpressure2: [163, 115]
+mood: 4
+bloodpressure: 163/117
+bloodpressure1: 163, 117
+bloodpressure2: [163, 117]
 bp:
     systolic: 163
-    diastolic: 115
-clock-in: 9:49
-clock-out: 18:2
-sleep: 10:46 pm/7:45 am
+    diastolic: 117
+clock-in: 9:30
+clock-out: 20:13
+sleep: 9:28 pm/7:58 am
 deepValue: 
     very: 
         very: 
             very: 
                 very: 
                     very: 
-                        deep: 22.5
+                        deep: 56.2
 ---
 
-#weight:60.6kg
+#weight:80.7kg
 
-#exercise-pushup:43
-#exercise-plank:66sec
+#exercise-pushup:33
+#exercise-plank:90sec
 
 
+⭐⭐⭐
 
 
-
-#finance/bank1:-3.9USD
+#finance/bank1:-3.2USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@yahoo.com
 
-weightlifting: 14
+weightlifting: 19
 
-dataviewTarget:: 99
-- Make Progress:: 11
-- Make-Progress:: 53
-dataviewTarget1:: 99/11
-dataviewTarget2:: 11 @ 53
-dataviewTarget3:: 11, 53
+dataviewTarget:: 64
+- Make Progress:: 0
+- Make-Progress:: 54
+dataviewTarget1:: 64/0
+dataviewTarget2:: 0 @ 54
+dataviewTarget3:: 0, 54
 
 #sin:-0.74314/-0.86603/-0.95106/-0.99452/-0.99452/-0.95106/-0.86603/-0.74314/-0.58779
 
 #sinsquare:0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000/0.55226/0.34549
 
+- [x] Say I love you
+
diff --git a/examples/diary/2021-01-21.md b/examples/diary/2021-01-21.md
index 8d0f391..ab257cc 100644
--- a/examples/diary/2021-01-21.md
+++ b/examples/diary/2021-01-21.md
@@ -1,50 +1,53 @@
 ---
 tags: work_log
-mood: 5
-bloodpressure: 169.4/117.8
-bloodpressure1: 169.4, 117.8
-bloodpressure2: [169.4, 117.8]
+mood: 4
+bloodpressure: 170.4/113.8
+bloodpressure1: 170.4, 113.8
+bloodpressure2: [170.4, 113.8]
 bp:
-    systolic: 169.4
-    diastolic: 117.8
-clock-in: 9:59
-clock-out: 16:39
-sleep: 10:38 pm/5:35 am
+    systolic: 170.4
+    diastolic: 113.8
+clock-in: 9:4
+clock-out: 19:29
+sleep: 10:43 pm/6:37 am
 deepValue: 
     very: 
         very: 
             very: 
                 very: 
                     very: 
-                        deep: 12.5
+                        deep: 11.1
 ---
 
-#weight:61.8kg
+#weight:67.3kg
 
-#exercise-pushup:32
-#exercise-plank:105sec
+#exercise-pushup:50
+#exercise-plank:94sec
 
+#meditation
 
 ⭐⭐⭐
 
 
-#finance/bank1:-2.2USD
+#finance/bank1:-2.8USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@yahoo.com
+obsidian-tracker@gmail.com
 
-weightlifting: 10
+weightlifting: 19
 
-dataviewTarget:: 8
-- Make Progress:: 37
-- Make-Progress:: 74
-dataviewTarget1:: 8/37
-dataviewTarget2:: 37 @ 74
-dataviewTarget3:: 37, 74
+dataviewTarget:: 88
+- Make Progress:: 41
+- Make-Progress:: 75
+dataviewTarget1:: 88/41
+dataviewTarget2:: 41 @ 75
+dataviewTarget3:: 41, 75
 
 #sin:-0.86603/-0.95106/-0.99452/-0.99452/-0.95106/-0.86603/-0.74314/-0.58779/-0.40674
 
 #sinsquare:0.75000/0.90451/0.98907/0.98907/0.90451/0.75000/0.55226/0.34549/0.16543
 
+- [x] Say I love you
+
diff --git a/examples/diary/2021-01-22.md b/examples/diary/2021-01-22.md
index b021ca6..26f4263 100644
--- a/examples/diary/2021-01-22.md
+++ b/examples/diary/2021-01-22.md
@@ -1,50 +1,52 @@
 ---
 tags: work_log
-mood: 5
-bloodpressure: 168.8/115.6
-bloodpressure1: 168.8, 115.6
-bloodpressure2: [168.8, 115.6]
+mood: 9
+bloodpressure: 165.8/116.6
+bloodpressure1: 165.8, 116.6
+bloodpressure2: [165.8, 116.6]
 bp:
-    systolic: 168.8
-    diastolic: 115.6
-clock-in: 9:6
-clock-out: 17:57
-sleep: 11:28 pm/6:45 am
+    systolic: 165.8
+    diastolic: 116.6
+clock-in: 9:32
+clock-out: 20:27
+sleep: 10:25 pm/5:12 am
 deepValue: 
     very: 
         very: 
             very: 
                 very: 
                     very: 
-                        deep: 39.0
+                        deep: 83.3
 ---
 
-#weight:77.6kg
+#weight:64.7kg
 
-#exercise-pushup:32
-#exercise-plank:48sec
+#exercise-pushup:30
+#exercise-plank:100sec
 
 
-⭐⭐⭐
+⭐
 
 
-#finance/bank1:-3.6USD
+#finance/bank1:-3.3USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@yahoo.com
+obsidian-tracker@gmail.com
 
-weightlifting: 14
+weightlifting: 11
 
-dataviewTarget:: 64
-- Make Progress:: 27
-- Make-Progress:: 90
-dataviewTarget1:: 64/27
-dataviewTarget2:: 27 @ 90
-dataviewTarget3:: 27, 90
+dataviewTarget:: 36
+- Make Progress:: 0
+- Make-Progress:: 91
+dataviewTarget1:: 36/0
+dataviewTarget2:: 0 @ 91
+dataviewTarget3:: 0, 91
 
 #sin:-0.95106/-0.99452/-0.99452/-0.95106/-0.86603/-0.74314/-0.58779/-0.40674/-0.20791
 
 #sinsquare:0.90451/0.98907/0.98907/0.90451/0.75000/0.55226/0.34549/0.16543/0.04323
 
+- [x] Say I love you
+
diff --git a/examples/diary/2021-01-23.md b/examples/diary/2021-01-23.md
index 6a79477..a9fd95d 100644
--- a/examples/diary/2021-01-23.md
+++ b/examples/diary/2021-01-23.md
@@ -1,32 +1,31 @@
 ---
 tags: 
-mood: 5
-bloodpressure: 167.2/115.4
-bloodpressure1: 167.2, 115.4
-bloodpressure2: [167.2, 115.4]
+mood: 1
+bloodpressure: 164.2/115.4
+bloodpressure1: 164.2, 115.4
+bloodpressure2: [164.2, 115.4]
 bp:
-    systolic: 167.2
+    systolic: 164.2
     diastolic: 115.4
-clock-in: 8:12
-clock-out: 20:13
-sleep: 9:46 pm/7:12 am
+clock-in: 10:36
+clock-out: 19:31
+sleep: 10:9 pm/7:30 am
 deepValue: 
     very: 
         very: 
             very: 
                 very: 
                     very: 
-                        deep: 66.0
+                        deep: 28.8
 ---
 
-#weight:73.5kg
+#weight:67.3kg
 
-#exercise-pushup:46
-#exercise-plank:55sec
-
-#meditation
+#exercise-pushup:47
+#exercise-plank:83sec
 
 
+⭐⭐⭐⭐
 
 
 #finance/bank1:-2.7USD
@@ -34,18 +33,20 @@ deepValue:
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker+1@gmail.com
+obsidian-tracker@gmail.com
 
-weightlifting: 10
+weightlifting: 12
 
-dataviewTarget:: 53
-- Make Progress:: 38
-- Make-Progress:: 81
-dataviewTarget1:: 53/38
-dataviewTarget2:: 38 @ 81
-dataviewTarget3:: 38, 81
+dataviewTarget:: 45
+- Make Progress:: 27
+- Make-Progress:: 95
+dataviewTarget1:: 45/27
+dataviewTarget2:: 27 @ 95
+dataviewTarget3:: 27, 95
 
 #sin:-0.99452/-0.99452/-0.95106/-0.86603/-0.74314/-0.58779/-0.40674/-0.20791/-0.00000
 
 #sinsquare:0.98907/0.98907/0.90451/0.75000/0.55226/0.34549/0.16543/0.04323/0.00000
 
+- [ ] Say I love you
+
diff --git a/examples/diary/2021-01-24.md b/examples/diary/2021-01-24.md
index 1dc610d..40a9ffb 100644
--- a/examples/diary/2021-01-24.md
+++ b/examples/diary/2021-01-24.md
@@ -1,52 +1,54 @@
 ---
 tags: 
-mood: 7
-bloodpressure: 165.6/114.2
-bloodpressure1: 165.6, 114.2
-bloodpressure2: [165.6, 114.2]
+mood: 4
+bloodpressure: 170.6/113.2
+bloodpressure1: 170.6, 113.2
+bloodpressure2: [170.6, 113.2]
 bp:
-    systolic: 165.6
-    diastolic: 114.2
-clock-in: 8:41
-clock-out: 18:17
-sleep: 10:49 pm/6:41 am
+    systolic: 170.6
+    diastolic: 113.2
+clock-in: 8:1
+clock-out: 18:9
+sleep: 10:53 pm/5:33 am
 deepValue: 
     very: 
         very: 
             very: 
                 very: 
                     very: 
-                        deep: 78.8
+                        deep: 39.4
 ---
 
-#weight:68.8kg
+#weight:64.1kg
 
-#exercise-pushup:37
-#exercise-plank:81sec
+#exercise-pushup:43
+#exercise-plank:44sec
 
 #meditation
 
-⭐
+⭐⭐⭐⭐
 
 
-#finance/bank1:-3.0USD
+#finance/bank1:-3.3USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker+1@gmail.com
+obsidian-tracker@gmail.com
 obsidian-tracker@yahoo.com
 
-weightlifting: 19
+weightlifting: 10
 
-dataviewTarget:: 98
-- Make Progress:: 1
+dataviewTarget:: 63
+- Make Progress:: 23
 - Make-Progress:: 60
-dataviewTarget1:: 98/1
-dataviewTarget2:: 1 @ 60
-dataviewTarget3:: 1, 60
+dataviewTarget1:: 63/23
+dataviewTarget2:: 23 @ 60
+dataviewTarget3:: 23, 60
 
 #sin:-0.99452/-0.95106/-0.86603/-0.74314/-0.58779/-0.40674/-0.20791/-0.00000/0.20791
 
 #sinsquare:0.98907/0.90451/0.75000/0.55226/0.34549/0.16543/0.04323/0.00000/0.04323
 
+- [ ] Say I love you
+
diff --git a/examples/diary/2021-01-25.md b/examples/diary/2021-01-25.md
index ad22288..f1c93f4 100644
--- a/examples/diary/2021-01-25.md
+++ b/examples/diary/2021-01-25.md
@@ -1,51 +1,51 @@
 ---
 tags: work_log
-mood: 1
-bloodpressure: 165/113
-bloodpressure1: 165, 113
-bloodpressure2: [165, 113]
+mood: 9
+bloodpressure: 167/114
+bloodpressure1: 167, 114
+bloodpressure2: [167, 114]
 bp:
-    systolic: 165
-    diastolic: 113
-clock-in: 9:53
-clock-out: 16:33
-sleep: 10:11 pm/6:9 am
+    systolic: 167
+    diastolic: 114
+clock-in: 9:52
+clock-out: 17:55
+sleep: 10:53 pm/6:3 am
 deepValue: 
     very: 
         very: 
             very: 
                 very: 
                     very: 
-                        deep: 33.4
+                        deep: 81.4
 ---
 
-#weight:74.9kg
+#weight:62.4kg
 
-#exercise-pushup:33
-#exercise-plank:91sec
+#exercise-pushup:30
+#exercise-plank:110sec
 
 
-⭐
 
 
-#finance/bank1:-2.2USD
+
+#finance/bank1:-3.6USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@gmail.com
 obsidian-tracker+1@gmail.com
 
-weightlifting: 12
 
-dataviewTarget:: 85
-- Make Progress:: 36
-- Make-Progress:: 64
-dataviewTarget1:: 85/36
-dataviewTarget2:: 36 @ 64
-dataviewTarget3:: 36, 64
+dataviewTarget:: 88
+- Make Progress:: 12
+- Make-Progress:: 96
+dataviewTarget1:: 88/12
+dataviewTarget2:: 12 @ 96
+dataviewTarget3:: 12, 96
 
 #sin:-0.95106/-0.86603/-0.74314/-0.58779/-0.40674/-0.20791/-0.00000/0.20791/0.40674
 
 #sinsquare:0.90451/0.75000/0.55226/0.34549/0.16543/0.04323/0.00000/0.04323/0.16543
 
+- [ ] Say I love you
+
diff --git a/examples/diary/2021-01-26.md b/examples/diary/2021-01-26.md
index 8ebefc0..f99c94c 100644
--- a/examples/diary/2021-01-26.md
+++ b/examples/diary/2021-01-26.md
@@ -1,51 +1,52 @@
 ---
 tags: work_log
-mood: 7
-bloodpressure: 168.4/113.8
-bloodpressure1: 168.4, 113.8
-bloodpressure2: [168.4, 113.8]
+mood: 3
+bloodpressure: 162.4/114.8
+bloodpressure1: 162.4, 114.8
+bloodpressure2: [162.4, 114.8]
 bp:
-    systolic: 168.4
-    diastolic: 113.8
+    systolic: 162.4
+    diastolic: 114.8
 clock-in: 10:24
-clock-out: 20:21
-sleep: 9:48 pm/5:2 am
+clock-out: 19:12
+sleep: 11:36 pm/6:2 am
 deepValue: 
     very: 
         very: 
             very: 
                 very: 
                     very: 
-                        deep: 89.2
+                        deep: 73.1
 ---
 
-#weight:79.1kg
+#weight:72.7kg
 
-#exercise-pushup:32
-#exercise-plank:102sec
+#exercise-pushup:42
+#exercise-plank:114sec
 
+#meditation
 
 ⭐
 
 
-#finance/bank1:-2.9USD
+#finance/bank1:-3.3USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@gmail.com
 obsidian-tracker@yahoo.com
 
-weightlifting: 12
 
-dataviewTarget:: 71
-- Make Progress:: 13
-- Make-Progress:: 66
-dataviewTarget1:: 71/13
-dataviewTarget2:: 13 @ 66
-dataviewTarget3:: 13, 66
+dataviewTarget:: 42
+- Make Progress:: 19
+- Make-Progress:: 93
+dataviewTarget1:: 42/19
+dataviewTarget2:: 19 @ 93
+dataviewTarget3:: 19, 93
 
 #sin:-0.86603/-0.74314/-0.58779/-0.40674/-0.20791/-0.00000/0.20791/0.40674/0.58779
 
 #sinsquare:0.75000/0.55226/0.34549/0.16543/0.04323/0.00000/0.04323/0.16543/0.34549
 
+- [ ] Say I love you
+
diff --git a/examples/diary/2021-01-27.md b/examples/diary/2021-01-27.md
index 892bba6..2fbbb88 100644
--- a/examples/diary/2021-01-27.md
+++ b/examples/diary/2021-01-27.md
@@ -1,28 +1,28 @@
 ---
 tags: work_log
-mood: 6
-bloodpressure: 166.8/114.6
-bloodpressure1: 166.8, 114.6
-bloodpressure2: [166.8, 114.6]
+mood: 4
+bloodpressure: 165.8/113.6
+bloodpressure1: 165.8, 113.6
+bloodpressure2: [165.8, 113.6]
 bp:
-    systolic: 166.8
-    diastolic: 114.6
-clock-in: 9:12
-clock-out: 19:36
-sleep: 10:2 pm/7:36 am
+    systolic: 165.8
+    diastolic: 113.6
+clock-in: 10:28
+clock-out: 18:4
+sleep: 11:34 pm/6:12 am
 deepValue: 
     very: 
         very: 
             very: 
                 very: 
                     very: 
-                        deep: 58.7
+                        deep: 78.5
 ---
 
-#weight:79.5kg
+#weight:63.7kg
 
-#exercise-pushup:38
-#exercise-plank:59sec
+#exercise-pushup:46
+#exercise-plank:40sec
 
 #meditation
 
@@ -34,18 +34,20 @@ deepValue:
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@gmail.com
+obsidian-tracker@yahoo.com
 
-weightlifting: 14
+weightlifting: 11
 
-dataviewTarget:: 86
-- Make Progress:: 26
-- Make-Progress:: 68
-dataviewTarget1:: 86/26
-dataviewTarget2:: 26 @ 68
-dataviewTarget3:: 26, 68
+dataviewTarget:: 59
+- Make Progress:: 31
+- Make-Progress:: 67
+dataviewTarget1:: 59/31
+dataviewTarget2:: 31 @ 67
+dataviewTarget3:: 31, 67
 
 #sin:-0.74314/-0.58779/-0.40674/-0.20791/-0.00000/0.20791/0.40674/0.58779/0.74314
 
 #sinsquare:0.55226/0.34549/0.16543/0.04323/0.00000/0.04323/0.16543/0.34549/0.55226
 
+- [ ] Say I love you
+
diff --git a/examples/diary/2021-01-28.md b/examples/diary/2021-01-28.md
index c9eddbc..c8b3927 100644
--- a/examples/diary/2021-01-28.md
+++ b/examples/diary/2021-01-28.md
@@ -1,50 +1,53 @@
 ---
 tags: work_log
-mood: 7
-bloodpressure: 160.2/116.4
-bloodpressure1: 160.2, 116.4
-bloodpressure2: [160.2, 116.4]
+mood: 2
+bloodpressure: 158.2/115.4
+bloodpressure1: 158.2, 115.4
+bloodpressure2: [158.2, 115.4]
 bp:
-    systolic: 160.2
-    diastolic: 116.4
-clock-in: 9:28
-clock-out: 16:58
-sleep: 10:28 pm/5:46 am
+    systolic: 158.2
+    diastolic: 115.4
+clock-in: 10:44
+clock-out: 16:41
+sleep: 10:27 pm/5:11 am
 deepValue: 
     very: 
         very: 
             very: 
                 very: 
                     very: 
-                        deep: 17.7
+                        deep: 80.6
 ---
 
-#weight:76.2kg
+#weight:79.2kg
 
-#exercise-pushup:32
-#exercise-plank:58sec
+#exercise-pushup:36
+#exercise-plank:90sec
 
 
 
 
 
-#finance/bank1:-2.5USD
+#finance/bank1:-3.9USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker+1@gmail.com
+obsidian-tracker@gmail.com
+obsidian-tracker@yahoo.com
 
-weightlifting: 15
+weightlifting: 18
 
-dataviewTarget:: 62
-- Make Progress:: 17
-- Make-Progress:: 81
-dataviewTarget1:: 62/17
-dataviewTarget2:: 17 @ 81
-dataviewTarget3:: 17, 81
+dataviewTarget:: 36
+- Make Progress:: 33
+- Make-Progress:: 92
+dataviewTarget1:: 36/33
+dataviewTarget2:: 33 @ 92
+dataviewTarget3:: 33, 92
 
 #sin:-0.58779/-0.40674/-0.20791/-0.00000/0.20791/0.40674/0.58779/0.74314/0.86603
 
 #sinsquare:0.34549/0.16543/0.04323/0.00000/0.04323/0.16543/0.34549/0.55226/0.75000
 
+- [ ] Say I love you
+
diff --git a/examples/diary/2021-01-29.md b/examples/diary/2021-01-29.md
index 909d652..8b74a63 100644
--- a/examples/diary/2021-01-29.md
+++ b/examples/diary/2021-01-29.md
@@ -1,51 +1,52 @@
 ---
 tags: work_log
-mood: 2
-bloodpressure: 157.6/115.2
-bloodpressure1: 157.6, 115.2
-bloodpressure2: [157.6, 115.2]
+mood: 8
+bloodpressure: 163.6/112.2
+bloodpressure1: 163.6, 112.2
+bloodpressure2: [163.6, 112.2]
 bp:
-    systolic: 157.6
-    diastolic: 115.2
-clock-in: 10:44
-clock-out: 16:41
-sleep: 10:27 pm/5:11 am
+    systolic: 163.6
+    diastolic: 112.2
+clock-in: 8:19
+clock-out: 16:35
+sleep: 11:47 pm/6:39 am
 deepValue: 
     very: 
         very: 
             very: 
                 very: 
                     very: 
-                        deep: 80.6
+                        deep: 18.6
 ---
 
-#weight:79.2kg
+#weight:63.5kg
 
-#exercise-pushup:36
-#exercise-plank:90sec
+#exercise-pushup:42
+#exercise-plank:30sec
 
 
+⭐
 
 
-
-#finance/bank1:-3.9USD
+#finance/bank1:-2.7USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
-obsidian-tracker@gmail.com
 obsidian-tracker@yahoo.com
 
-weightlifting: 18
+weightlifting: 15
 
-dataviewTarget:: 36
-- Make Progress:: 33
-- Make-Progress:: 92
-dataviewTarget1:: 36/33
-dataviewTarget2:: 33 @ 92
-dataviewTarget3:: 33, 92
+dataviewTarget:: 96
+- Make Progress:: 44
+- Make-Progress:: 90
+dataviewTarget1:: 96/44
+dataviewTarget2:: 44 @ 90
+dataviewTarget3:: 44, 90
 
 #sin:-0.40674/-0.20791/-0.00000/0.20791/0.40674/0.58779/0.74314/0.86603/0.95106
 
 #sinsquare:0.16543/0.04323/0.00000/0.04323/0.16543/0.34549/0.55226/0.75000/0.90451
 
+- [x] Say I love you
+
diff --git a/examples/diary/2021-01-30.md b/examples/diary/2021-01-30.md
index 9943c26..a6196d3 100644
--- a/examples/diary/2021-01-30.md
+++ b/examples/diary/2021-01-30.md
@@ -1,35 +1,34 @@
 ---
 tags: 
-mood: 7
-bloodpressure: 165/114
-bloodpressure1: 165, 114
-bloodpressure2: [165, 114]
+mood: 5
+bloodpressure: 159/114
+bloodpressure1: 159, 114
+bloodpressure2: [159, 114]
 bp:
-    systolic: 165
+    systolic: 159
     diastolic: 114
-clock-in: 8:16
-clock-out: 17:2
-sleep: 10:51 pm/7:29 am
+clock-in: 10:24
+clock-out: 18:4
+sleep: 11:10 pm/5:46 am
 deepValue: 
     very: 
         very: 
             very: 
                 very: 
                     very: 
-                        deep: 65.7
+                        deep: 17.9
 ---
 
-#weight:63.9kg
+#weight:63.3kg
 
-#exercise-pushup:33
+#exercise-pushup:30
 #exercise-plank:83sec
 
-#meditation
 
-⭐⭐⭐⭐
+⭐⭐⭐
 
 
-#finance/bank1:-3.9USD
+#finance/bank1:-2.2USD
 #finance/bank2:200USD
 #finance/bank2/transfer:-100USD
 #finance/bank1/transfer:100USD
@@ -37,17 +36,20 @@ deepValue:
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
+obsidian-tracker@gmail.com
 
-weightlifting: 18
+weightlifting: 10
 
-dataviewTarget:: 69
+dataviewTarget:: 44
 - Make Progress:: 48
-- Make-Progress:: 94
-dataviewTarget1:: 69/48
-dataviewTarget2:: 48 @ 94
-dataviewTarget3:: 48, 94
+- Make-Progress:: 84
+dataviewTarget1:: 44/48
+dataviewTarget2:: 48 @ 84
+dataviewTarget3:: 48, 84
 
 #sin:-0.20791/-0.00000/0.20791/0.40674/0.58779/0.74314/0.86603/0.95106/0.99452
 
 #sinsquare:0.04323/0.00000/0.04323/0.16543/0.34549/0.55226/0.75000/0.90451/0.98907
 
+- [ ] Say I love you
+
diff --git a/examples/diary/2021-01-31.md b/examples/diary/2021-01-31.md
index cf2c8ac..dbc610f 100644
--- a/examples/diary/2021-01-31.md
+++ b/examples/diary/2021-01-31.md
@@ -1,51 +1,52 @@
 ---
 tags: 
-mood: 8
-bloodpressure: 159.4/113.8
-bloodpressure1: 159.4, 113.8
-bloodpressure2: [159.4, 113.8]
+mood: 4
+bloodpressure: 160.4/115.8
+bloodpressure1: 160.4, 115.8
+bloodpressure2: [160.4, 115.8]
 bp:
-    systolic: 159.4
-    diastolic: 113.8
-clock-in: 8:30
-clock-out: 20:24
-sleep: 10:4 pm/7:10 am
+    systolic: 160.4
+    diastolic: 115.8
+clock-in: 10:5
+clock-out: 17:3
+sleep: 9:14 pm/5:9 am
 deepValue: 
     very: 
         very: 
             very: 
                 very: 
                     very: 
-                        deep: 32.2
+                        deep: 56.8
 ---
 
-#weight:76.4kg
+#weight:72.2kg
 
-#exercise-pushup:33
-#exercise-plank:44sec
+#exercise-pushup:36
+#exercise-plank:119sec
 
-#meditation
 
-⭐⭐⭐
+⭐⭐⭐⭐⭐
 
 
-#finance/bank1:-3.0USD
+#finance/bank1:-2.8USD
 
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
 obsidian-tracker@gmail.com
-obsidian-tracker@yahoo.com
 
+weightlifting: 17
 
-dataviewTarget:: 7
-- Make Progress:: 24
-- Make-Progress:: 72
-dataviewTarget1:: 7/24
-dataviewTarget2:: 24 @ 72
-dataviewTarget3:: 24, 72
+dataviewTarget:: 59
+- Make Progress:: 22
+- Make-Progress:: 55
+dataviewTarget1:: 59/22
+dataviewTarget2:: 22 @ 55
+dataviewTarget3:: 22, 55
 
 #sin:-0.00000/0.20791/0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452
 
 #sinsquare:0.00000/0.04323/0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907
 
+- [ ] Say I love you
+
diff --git a/examples/example_generator.ts b/examples/example_generator.ts
index 69f43be..4318129 100644
--- a/examples/example_generator.ts
+++ b/examples/example_generator.ts
@@ -262,6 +262,18 @@ for (
 
     content += "\n";
 
+    // Tasks
+    let taskSayLove = "Say I love you";
+    let missedSayLove = randomIntFromInterval(0, 1);
+    if (!missedSayLove) {
+        content += "- [x] " + taskSayLove + "\n";
+    }
+    else {
+        content += "- [ ] " + taskSayLove + "\n";
+    }
+
+    content += "\n";
+
     fs.writeFileSync(fh, content);
     fs.closeSync(fh);
 }
diff --git a/src/collecting.ts b/src/collecting.ts
index e61e9d5..a506e5f 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -117,8 +117,6 @@ export function getDateFromText(
     // console.log(strTextRegex);
     let textRegex = new RegExp(strTextRegex, "gm");
     let match;
-    let textMeasure = 0.0;
-    let textExist = false;
     while ((match = textRegex.exec(content))) {
         // console.log(match);
         if (
@@ -212,6 +210,41 @@ export function getDateFromFileMeta(
     return date;
 }
 
+// Not support multiple targets
+// May merge with colllectDataFromTask
+export function getDateFromTask(
+    content: string,
+    query: Query,
+    renderInfo: RenderInfo
+) {
+    // console.log("getDateFromTask");
+
+    let date = window.moment("");
+
+    let subType = query.getSubType();
+    let strTextRegex = query.getTarget();
+    // console.log(strTextRegex);
+    let textRegex = new RegExp(strTextRegex, "gm");
+    let match;
+    while ((match = textRegex.exec(content))) {
+        // console.log(match);
+        if (
+            typeof match.groups !== "undefined" &&
+            typeof match.groups.value !== "undefined"
+        ) {
+            let strDate = match.groups.value.trim();
+            // console.log(strDate);
+
+            date = helper.strToDate(strDate, renderInfo.dateFormat);
+            if (date.isValid()) {
+                break;
+            }
+        }
+    }
+    // console.log(date);
+    return date;
+}
+
 function addToDataMap(
     dataMap: DataMap,
     date: string,
@@ -658,3 +691,66 @@ export function collectDataFromDvField(
     let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
     addToDataMap(dataMap, xValue, query, value);
 }
+
+export function collectDataFromTask(
+    content: string,
+    query: Query,
+    renderInfo: RenderInfo,
+    dataMap: DataMap,
+    xValueMap: XValueMap
+) {
+    let subType = query.getSubType();
+    // console.log(subType);
+
+    let strTextRegex = query.getTarget();
+    if (subType === "all") {
+        strTextRegex = "\\[[\\sx]\\]\\s" + strTextRegex;
+    } else if (subType === "done") {
+        strTextRegex = "\\[x\\]\\s" + strTextRegex;
+    } else if (subType === "notdone") {
+        strTextRegex = "\\[\\s\\]\\s" + strTextRegex;
+    } else {
+        // all
+        strTextRegex = "\\[[\\sx]\\]\\s" + strTextRegex;
+    }
+    // console.log(strTextRegex);
+    let textRegex = new RegExp(strTextRegex, "gm");
+    let match;
+    let textMeasure = 0.0;
+    let textExist = false;
+    while ((match = textRegex.exec(content))) {
+        // console.log(match);
+        if (
+            !renderInfo.ignoreAttachedValue[query.getId()] &&
+            typeof match.groups !== "undefined"
+        ) {
+            // match[0] whole match
+            console.log("valued-text");
+            if (typeof match.groups.value !== "undefined") {
+                // set as null for missing value if it is valued-tag
+                let value = parseFloat(match.groups.value);
+                // console.log(value);
+                if (!Number.isNaN(value)) {
+                    if (
+                        !renderInfo.ignoreZeroValue[query.getId()] ||
+                        value !== 0
+                    ) {
+                        textMeasure += value;
+                        textExist = true;
+                        query.addNumTargets();
+                    }
+                }
+            }
+        } else {
+            // console.log("simple-text");
+            textMeasure = textMeasure + renderInfo.constValue[query.getId()];
+            textExist = true;
+            query.addNumTargets();
+        }
+    }
+
+    if (textExist) {
+        let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
+        addToDataMap(dataMap, xValue, query, textMeasure);
+    }
+}
diff --git a/src/data.ts b/src/data.ts
index d19d3b8..2953489 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -8,6 +8,7 @@ export enum SearchType {
     dvField,
     Table,
     FileMeta,
+    Task,
 }
 
 export enum OutputType {
@@ -44,6 +45,7 @@ export class DataPoint {
 
 export class Query {
     private type: SearchType | null;
+    private subType: string;
     private target: string;
     private parentTarget: string | null;
     private separator: string; // multiple value separator
@@ -58,6 +60,7 @@ export class Query {
 
     constructor(id: number, searchType: SearchType, searchTarget: string) {
         this.type = searchType;
+        this.subType = "";
         this.target = searchTarget;
         this.separator = "/";
         this.id = id;
@@ -134,6 +137,14 @@ export class Query {
         return this.type;
     }
 
+    public getSubType() {
+        return this.subType;
+    }
+
+    public setSubType(subType: string) {
+        this.subType = subType;
+    }
+
     public getTarget() {
         return this.target;
     }
diff --git a/src/main.ts b/src/main.ts
index ea5c050..87549a9 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -199,7 +199,8 @@ export default class Tracker extends Plugin {
                 if (
                     type === SearchType.Tag ||
                     type === SearchType.Text ||
-                    type === SearchType.dvField
+                    type === SearchType.dvField ||
+                    type === SearchType.Task
                 ) {
                     return true;
                 } else if (type === SearchType.FileMeta) {
@@ -270,6 +271,13 @@ export default class Tracker extends Plugin {
                                     renderInfo
                                 );
                                 break;
+                            case SearchType.Task:
+                                xDate = collecting.getDateFromTask(
+                                    content,
+                                    xDatasetQuery,
+                                    renderInfo
+                                );
+                                break;
                         }
                     }
 
@@ -375,7 +383,7 @@ export default class Tracker extends Plugin {
                     );
                 } // Search inline tags
 
-                // console.log("Search text");
+                // console.log("Search Text");
                 if (content && query.getType() === SearchType.Text) {
                     collecting.collectDataFromText(
                         content,
@@ -408,6 +416,17 @@ export default class Tracker extends Plugin {
                         xValueMap
                     );
                 } // search dvField
+
+                // console.log("Search Task");
+                if (content && query.getType() === SearchType.Task) {
+                    collecting.collectDataFromTask(
+                        content,
+                        query,
+                        renderInfo,
+                        dataMap,
+                        xValueMap
+                    );
+                } // search Task
             });
             await Promise.all(loopQueryPromises);
         });
diff --git a/src/month.ts b/src/month.ts
index 4a0ceb2..b93cea7 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -380,7 +380,7 @@ function renderMonthDays(
     curMonthDate: Moment
 ) {
     // console.log("renderMonthDays");
-
+    // console.log(renderInfo);
     if (!renderInfo || !monthInfo) return;
 
     let curDatasetId = monthInfo.selectedDataset;
@@ -430,8 +430,8 @@ function renderMonthDays(
     if (monthInfo.startWeekOn.toLowerCase() === "mon") {
         endDate = endDate.add(1, "days");
     }
-    const dataStartDate = dataset.getStartDate().clone();
-    const dataEndDate = dataset.getEndDate().clone();
+    const dataStartDate = dataset.getStartDate();
+    const dataEndDate = dataset.getEndDate();
     // console.log(monthStartDate.format("YYYY-MM-DD"));
     // console.log(startDate.format("YYYY-MM-DD"));
 
@@ -465,9 +465,14 @@ function renderMonthDays(
             isInThisMonth = false;
         }
         // is this day out of data range
-        let isOutOfDataRange = false;
-        if (curDate.diff(dataStartDate) < 0 || curDate.diff(dataEndDate) > 0) {
-            isOutOfDataRange = true;
+        let isOutOfDataRange = true;
+        if (
+            dataStartDate &&
+            dataEndDate &&
+            curDate.diff(dataStartDate) >= 0 &&
+            curDate.diff(dataEndDate) <= 0
+        ) {
+            isOutOfDataRange = false;
         }
 
         // curValue
diff --git a/src/parsing.ts b/src/parsing.ts
index 0744519..f93e846 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -39,13 +39,17 @@ function strToBool(str: string): boolean | null {
 
 function validateSearchType(searchType: string): boolean {
     if (
-        searchType === "tag" ||
-        searchType === "text" ||
-        searchType === "frontmatter" ||
-        searchType === "wiki" ||
-        searchType === "dvField" ||
-        searchType === "table" ||
-        searchType === "fileMeta"
+        searchType.toLowerCase() === "tag" ||
+        searchType.toLowerCase() === "text" ||
+        searchType.toLowerCase() === "frontmatter" ||
+        searchType.toLowerCase() === "wiki" ||
+        searchType.toLowerCase() === "dvField" ||
+        searchType.toLowerCase() === "table" ||
+        searchType.toLowerCase() === "fileMeta" ||
+        searchType.toLowerCase() === "task" ||
+        searchType.toLowerCase() === "task.all" ||
+        searchType.toLowerCase() === "task.done" ||
+        searchType.toLowerCase() === "task.notdone"
     ) {
         return true;
     }
@@ -867,6 +871,7 @@ export function getRenderInfoFromYaml(
         return errorMessage;
     }
     let searchType: Array<SearchType> = [];
+    let searchSubType: Array<string> = [];
     let retSearchType = getStringArrayFromInput(
         "searchType",
         yaml.searchType,
@@ -882,24 +887,47 @@ export function getRenderInfoFromYaml(
         switch (strType) {
             case "tag":
                 searchType.push(SearchType.Tag);
+                searchSubType.push("");
                 break;
             case "frontmatter":
                 searchType.push(SearchType.Frontmatter);
+                searchSubType.push("");
                 break;
             case "wiki":
                 searchType.push(SearchType.Wiki);
+                searchSubType.push("");
                 break;
             case "text":
                 searchType.push(SearchType.Text);
+                searchSubType.push("");
                 break;
             case "dvField":
                 searchType.push(SearchType.dvField);
+                searchSubType.push("");
                 break;
             case "table":
                 searchType.push(SearchType.Table);
+                searchSubType.push("");
                 break;
             case "fileMeta":
                 searchType.push(SearchType.FileMeta);
+                searchSubType.push("");
+                break;
+            case "task":
+                searchType.push(SearchType.Task);
+                searchSubType.push("all");
+                break;
+            case "task.all":
+                searchType.push(SearchType.Task);
+                searchSubType.push("all");
+                break;
+            case "task.done":
+                searchType.push(SearchType.Task);
+                searchSubType.push("done");
+                break;
+            case "task.notdone":
+                searchType.push(SearchType.Task);
+                searchSubType.push("notdone");
                 break;
         }
     }
@@ -963,6 +991,9 @@ export function getRenderInfoFromYaml(
             searchTarget[ind]
         );
         query.setSeparator(multipleValueSparator[ind]);
+        if (searchSubType[ind] !== "") {
+            query.setSubType(searchSubType[ind]);
+        }
         if (xDataset.includes(ind)) query.usedAsXDataset = true;
         queries.push(query);
     }

From d77a069eb1726e38a60847cda46f91fb28ab6451 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 3 Jul 2021 13:41:03 +0800
Subject: [PATCH 100/402] Add value monitor to month view

---
 src/month.ts | 159 +++++++++++++++++++++++++++++++--------------------
 styles.css   |  25 ++++++--
 2 files changed, 116 insertions(+), 68 deletions(-)

diff --git a/src/month.ts b/src/month.ts
index b93cea7..3621089 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -142,100 +142,94 @@ function renderMonthHeader(
     let headerMonthText = curMonthDate.format("MMM");
     let headerYearSize = helper.measureTextSize(
         headerYearText,
-        "tracker-month-title-year"
+        "tracker-month-header-year"
     );
     let headerMonthSize = helper.measureTextSize(
         headerMonthText,
-        "tracker-month-title-month"
+        "tracker-month-header-month"
     );
 
     let headerHeight = 0;
+    let ySpacing = 8;
+
     // Append header group
     let headerGroup = chartElements.graphArea.append("g");
 
-    // title
-    let titleHeight =
-        Math.max(headerYearSize.height, headerMonthSize.height) * 1.5;
-    let titleSpacing = 8;
-
-    // title year
-    let headerYearColor = null;
-    if (monthInfo.headerYearColor) {
-        headerYearColor = monthInfo.headerYearColor;
+    // haeder month
+    let headerMonthColor = null;
+    if (monthInfo.headerMonthColor) {
+        headerMonthColor = monthInfo.headerMonthColor;
     } else {
         if (monthInfo.color) {
-            headerYearColor = monthInfo.color;
+            headerMonthColor = monthInfo.color;
         }
     }
-    let titleYear = headerGroup
+    let headerMonth = headerGroup
         .append("text")
-        .text(headerYearText) // pivot at center
-        .attr("id", "titleYear")
+        .text(headerMonthText) // pivot at center
+        .attr("id", "titleMonth")
         .attr(
             "transform",
-            "translate(" +
-                (headerYearSize.width / 2.0 + cellSize / 4.0) +
-                "," +
-                headerYearSize.height / 2.0 +
-                ")"
+            "translate(" + cellSize / 4.0 + "," + headerMonthSize.height + ")"
         )
-        .attr("class", "tracker-month-title-year")
+        .attr("class", "tracker-month-header-month")
         .style("cursor", "default")
         .on("click", function (event: any) {
             clearSelection(chartElements, monthInfo);
         });
 
-    if (headerYearColor) {
-        titleYear.style("fill", headerYearColor);
+    if (headerMonthColor) {
+        headerMonth.style("fill", headerMonthColor);
     }
+    headerHeight += headerMonthSize.height;
 
-    // title month
-    let titleMonthColor = null;
-    if (monthInfo.headerMonthColor) {
-        titleMonthColor = monthInfo.headerMonthColor;
+    // header year
+    let headerYearColor = null;
+    if (monthInfo.headerYearColor) {
+        headerYearColor = monthInfo.headerYearColor;
     } else {
         if (monthInfo.color) {
-            titleMonthColor = monthInfo.color;
+            headerYearColor = monthInfo.color;
         }
     }
-    let titleMonth = headerGroup
+    let headerYear = headerGroup
         .append("text")
-        .text(headerMonthText) // pivot at center
-        .attr("id", "titleMonth")
+        .text(headerYearText) // pivot at center
+        .attr("id", "titleYear")
         .attr(
             "transform",
             "translate(" +
-                (headerYearSize.width +
-                    headerMonthSize.width / 2.0 +
-                    cellSize / 4.0 +
-                    titleSpacing) +
+                cellSize / 4.0 +
                 "," +
-                headerMonthSize.height / 2.0 +
+                (headerHeight + headerYearSize.height) +
                 ")"
         )
-        .attr("class", "tracker-month-title-month")
+        .attr("class", "tracker-month-header-year")
         .style("cursor", "default")
+        .attr("font-weight", "bold")
         .on("click", function (event: any) {
             clearSelection(chartElements, monthInfo);
         });
 
-    if (titleMonthColor) {
-        titleMonth.style("fill", titleMonthColor);
+    if (headerYearColor) {
+        headerYear.style("fill", headerYearColor);
     }
 
+    headerHeight += headerYearSize.height;
+
     // dataset rotator
+    let datasetNameSize = helper.measureTextSize(
+        datasetName,
+        "tracker-month-title-rotator"
+    );
     let datasetRotator = headerGroup
         .append("text")
         .text(datasetName)
         .attr(
             "transform",
-            "translate(" +
-                3.5 * cellSize +
-                "," +
-                headerMonthSize.height / 2.0 +
-                ")"
+            "translate(" + 3.5 * cellSize + "," + datasetNameSize.height + ")"
         )
-        .attr("class", "tracker-month-title-monitor")
+        .attr("class", "tracker-month-title-rotator")
         .style("cursor", "pointer")
         .on("click", function (event: any) {
             if (monthInfo.dataset.length <= 1) return;
@@ -253,7 +247,30 @@ function renderMonthHeader(
         });
     chartElements["rotator"] = datasetRotator;
 
+    // value monitor
+    let monitorTextSize = helper.measureTextSize(
+        "0.0000",
+        "tracker-month-title-monitor"
+    );
+    let monitor = headerGroup
+        .append("text")
+        .text("")
+        .attr("id", "monitor")
+        .attr("class", "tracker-month-title-monitor")
+        .attr(
+            "transform",
+            "translate(" +
+                3.5 * cellSize +
+                "," +
+                (datasetNameSize.height + monitorTextSize.height) +
+                ")"
+        )
+        .style("cursor", "pointer")
+        .style("fill", monthInfo.selectedRingColor);
+    chartElements["monitor"] = monitor;
+
     // arrow left
+    let arrowSize = helper.measureTextSize("<", "tracker-month-title-arrow");
     let arrowLeft = headerGroup
         .append("text")
         .text("<") // pivot at center
@@ -263,7 +280,7 @@ function renderMonthHeader(
             "translate(" +
                 5.5 * cellSize +
                 "," +
-                headerMonthSize.height / 2.0 +
+                (headerHeight / 2 + arrowSize.height / 2) +
                 ")"
         )
         .attr("class", "tracker-month-title-arrow")
@@ -292,7 +309,7 @@ function renderMonthHeader(
             "translate(" +
                 6.5 * cellSize +
                 "," +
-                headerMonthSize.height / 2.0 +
+                (headerHeight / 2 + arrowSize.height / 2) +
                 ")"
         )
         .attr("class", "tracker-month-title-arrow")
@@ -310,7 +327,31 @@ function renderMonthHeader(
             );
         })
         .style("cursor", "pointer");
-    headerHeight += titleHeight;
+
+    // arrow today
+    let arrowToday = headerGroup
+        .append("text")
+        .text("◦") // pivot at center
+        .attr("id", "arrowToday")
+        .attr(
+            "transform",
+            "translate(" +
+                6 * cellSize +
+                "," +
+                (headerHeight / 2 + arrowSize.height / 2) +
+                ")"
+        )
+        .attr("class", "tracker-month-title-arrow")
+        .on("click", function (event: any) {
+            // console.log("today arrow clicked");
+            clearSelection(chartElements, monthInfo);
+
+            let todayDate = helper.getDateToday(renderInfo.dateFormat);
+            refresh(canvas, chartElements, renderInfo, monthInfo, todayDate);
+        })
+        .style("cursor", "pointer");
+
+    headerHeight += ySpacing;
 
     // week day names
     let weekdayNames = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
@@ -319,7 +360,7 @@ function renderMonthHeader(
     }
     let weekdayNameSize = helper.measureTextSize(
         weekdayNames[0],
-        "tracker-tick-label"
+        "tracker-month-weekday"
     );
     let weekDays = chartElements.graphArea
         .selectAll("weekDays")
@@ -331,16 +372,20 @@ function renderMonthHeader(
         })
         .attr("transform", function (n: string, i: number) {
             let strTranslate =
-                "translate(" + (i + 0.5) * cellSize + "," + headerHeight + ")";
+                "translate(" +
+                (i + 0.5) * cellSize +
+                "," +
+                (headerHeight + weekdayNameSize.height) +
+                ")";
             return strTranslate;
         })
-        .attr("class", "tracker-tick-label")
+        .attr("class", "tracker-month-weekday")
         .attr("text-anchor", "middle")
         .style("cursor", "default")
         .on("click", function (event: any) {
             clearSelection(chartElements, monthInfo);
         });
-    headerHeight += weekdayNameSize.height;
+    headerHeight += weekdayNameSize.height + ySpacing;
 
     // dividing line
     let dividingLineHeight = 1;
@@ -769,16 +814,6 @@ function renderMonthDays(
             .style("stroke", "none");
     }
 
-    // value monitor
-    let valueMonitor = chartElements.dataArea
-        .append("text")
-        .text("")
-        .attr("id", "valueBox")
-        .attr("class", "tracker-month-title-monitor")
-        .style("cursor", "pointer")
-        .style("fill", monthInfo.selectedRingColor);
-    chartElements["monitor"] = valueMonitor;
-
     // labels
     let dayLabals = chartElements.dataArea
         .selectAll("dayLabel")
diff --git a/styles.css b/styles.css
index c42a653..ca9163a 100644
--- a/styles.css
+++ b/styles.css
@@ -108,16 +108,17 @@
     fill: var(--color-bar-fill);
 }
 
-.tracker-month-title-year {
+.tracker-month-header-year {
     fill: var(--color-title);
-    text-anchor: middle;
+    text-anchor: start;
     font-size: 22px;
+    
 }
 
-.tracker-month-title-month {
+.tracker-month-header-month {
     fill: var(--color-title);
-    text-anchor: middle;
-    font-size: 22px;
+    text-anchor: start;
+    font-size: 18px;
 }
 
 .tracker-month-dividing-line {
@@ -130,10 +131,22 @@
     font-size: 22px;
 }
 
+.tracker-month-title-rotator {
+    fill: var(--color-title);
+    text-anchor: middle;
+    font-size: 20px;
+}
+
 .tracker-month-title-monitor {
     fill: var(--color-title);
     text-anchor: middle;
-    font-size: 22px;
+    font-size: 18px;
+}
+
+.tracker-month-weekday {
+    fill: var(--color-tick-label);
+    stroke: none;
+    font-size: 12px;
 }
 
 .tracker-month-today-circle {

From b47669c30c5465b424cb31432e7daa3bb2c571ad Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 3 Jul 2021 15:14:43 +0800
Subject: [PATCH 101/402] Set version to 1.8.0

---
 manifest.json | 2 +-
 package.json  | 2 +-
 versions.json | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index 1cd0dd9..45ae5ed 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-tracker",
 	"name": "Tracker",
-	"version": "1.7.0",
+	"version": "1.8.0",
 	"minAppVersion": "0.9.12",
 	"description": "A plugin tracks occurrences and numbers in your notes",
 	"author": "pyrochlore",
diff --git a/package.json b/package.json
index 2910930..9533fda 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
diff --git a/versions.json b/versions.json
index d31b61b..f5188cd 100644
--- a/versions.json
+++ b/versions.json
@@ -12,5 +12,6 @@
 	"1.5.1": "0.9.12",
 	"1.6.0": "0.9.12",
 	"1.6.1": "0.9.12",
-	"1.7.0": "0.9.12"
+	"1.7.0": "0.9.12",
+	"1.8.0": "0.9.12"
 }

From 61b80aa92d1b07ce0e82cc5cad538c2af07a3bc3 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 3 Jul 2021 22:39:29 +0800
Subject: [PATCH 102/402] Update TestCalendar.md

---
 examples/TestCalendar.md | 39 +++++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
index df23379..4388305 100644
--- a/examples/TestCalendar.md
+++ b/examples/TestCalendar.md
@@ -1,13 +1,28 @@
 # Test Calendar
 
 ## Single target
+### Minimum setup
+1. Use default colors only
+2. Use parameter `datasetName` to set the title name
+``` tracker
+searchType: tag
+searchTarget: meditation
+datasetName: Meditation
+folder: diary
+month:
+```
+
+### Colorized
+1. Click "<" to see data in previous month
+2. Click ">" to see data in next month
+3. Click "◦" to see data in current month
 ``` tracker
 searchType: tag
 searchTarget: exercise-pushup
 datasetName: PushUp
 folder: diary
 month:
-    startWeekOn:
+    startWeekOn: 'Sun'
     threshold: 40
     color: tomato
     headerMonthColor: orange
@@ -17,30 +32,21 @@ month:
     showSelectedValue: true
 ```
 
+### Colorized
 ``` tracker
 searchType: tag
 searchTarget: meditation
 datasetName: Meditation
 folder: diary
 month:
-    startWeekOn: 
+    startWeekOn: 'Sun'
     color: steelblue
     headerMonthColor: green
     selectedRingColor: orange
 ```
 
-Use default colors
-``` tracker
-searchType: tag
-searchTarget: exercise-pushup
-datasetName: PushUp
-folder: diary
-month:
-    startWeekOn:
-    threshold: 40
-```
-
-Gradient circle
+### Colored by Values
+Use parameter `circleColorByValue`, color the circles based on the values
 ``` tracker
 searchType: tag
 searchTarget: exercise-pushup
@@ -58,6 +64,7 @@ month:
     showSelectedValue: true
 ```
 
+### Check minDate, minValue, maxDate, maxValue
 ``` tracker
 searchType: tag
 searchTarget: exercise-pushup
@@ -66,6 +73,10 @@ summary:
 ```
 
 ## Multiple targets
+1. Use parameter `datasetName` to specify the name of each dataset
+2. Use parameter `dataset` to include dataset we are going to view
+3. Use parameter `threshold` to specify the level of achievement (affect the streaks)
+4. Click the datasetName label in month view to change the target dataset
 ``` tracker
 searchType: tag
 searchTarget: exercise-pushup, meditation

From b8595f9d6a0eebffcd3f819225fbc4b1423f29de Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 3 Jul 2021 22:45:04 +0800
Subject: [PATCH 103/402] Update TestTask.md

---
 examples/TestTask.md | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/examples/TestTask.md b/examples/TestTask.md
index bfc6fbb..54fd0c5 100644
--- a/examples/TestTask.md
+++ b/examples/TestTask.md
@@ -1,7 +1,8 @@
 # Test Task
 
 ## Summary
-All Tasks
+### All Tasks
+Collect all tasks matched `searchTarget`
 ``` tracker
 searchType: task
 searchTarget: Say I love you
@@ -10,7 +11,8 @@ summary:
     template: "Total count: {{sum}}"
 ```
 
-All tasks
+### All Tasks
+Collect all tasks matched `searchTarget`
 ``` tracker
 searchType: task.all
 searchTarget: Say I love you
@@ -19,7 +21,8 @@ summary:
     template: "Total count: {{sum}}"
 ```
 
-Task done
+### Task Done
+Collect all tasks done matched `searchTarget`
 ``` tracker
 searchType: task.done
 searchTarget: Say I love you
@@ -28,7 +31,8 @@ summary:
     template: "How many days I said: {{sum}}"
 ```
 
-Task not done
+### Task Not Done
+Collect all tasks not-done matched `searchTarget`
 ``` tracker
 searchType: task.notdone
 searchTarget: Say I love you
@@ -38,10 +42,16 @@ summary:
 ```
 
 ## Month View
+See tasks done in month view
 ``` tracker
-searchType: task.notdone
+searchType: task.done
 searchTarget: Say I love you
 folder: diary
 datasetName: Love
 month:
+    color: tomato
+    headerMonthColor: orange
+    todayRingColor: orange
+    selectedRingColor: steelblue
+    showSelectedValue: false
 ```
\ No newline at end of file

From ab01c0b75a84833587235db630234b5bf8753998 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 4 Jul 2021 10:54:55 +0800
Subject: [PATCH 104/402] Fix getDateFromTask

---
 src/collecting.ts | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/collecting.ts b/src/collecting.ts
index a506e5f..529afc7 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -219,11 +219,24 @@ export function getDateFromTask(
 ) {
     // console.log("getDateFromTask");
 
+    let subType = query.getSubType();
+    // console.log(subType);
+
     let date = window.moment("");
 
-    let subType = query.getSubType();
     let strTextRegex = query.getTarget();
+    if (subType === "all") {
+        strTextRegex = "\\[[\\sx]\\]\\s" + strTextRegex;
+    } else if (subType === "done") {
+        strTextRegex = "\\[x\\]\\s" + strTextRegex;
+    } else if (subType === "notdone") {
+        strTextRegex = "\\[\\s\\]\\s" + strTextRegex;
+    } else {
+        // all
+        strTextRegex = "\\[[\\sx]\\]\\s" + strTextRegex;
+    }
     // console.log(strTextRegex);
+
     let textRegex = new RegExp(strTextRegex, "gm");
     let match;
     while ((match = textRegex.exec(content))) {
@@ -714,6 +727,7 @@ export function collectDataFromTask(
         strTextRegex = "\\[[\\sx]\\]\\s" + strTextRegex;
     }
     // console.log(strTextRegex);
+
     let textRegex = new RegExp(strTextRegex, "gm");
     let match;
     let textMeasure = 0.0;
@@ -725,7 +739,7 @@ export function collectDataFromTask(
             typeof match.groups !== "undefined"
         ) {
             // match[0] whole match
-            console.log("valued-text");
+            // console.log("valued-text");
             if (typeof match.groups.value !== "undefined") {
                 // set as null for missing value if it is valued-tag
                 let value = parseFloat(match.groups.value);

From e27b105f7f9f02fcc2aae1e3114867cf32550d28 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 4 Jul 2021 11:01:11 +0800
Subject: [PATCH 105/402] Set heatmap and pie as "under construction"

---
 src/heatmap.ts | 2 ++
 src/pie.ts     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/heatmap.ts b/src/heatmap.ts
index b48d538..9531ba2 100644
--- a/src/heatmap.ts
+++ b/src/heatmap.ts
@@ -250,6 +250,8 @@ export function renderHeatmap(
     // console.log(renderInfo);
     if (!renderInfo || !renderHeatmap) return;
 
+    return "Under construction";
+
     let chartElements: ChartElements = {};
     chartElements = createAreas(chartElements, canvas, renderInfo, heatmapInfo);
 
diff --git a/src/pie.ts b/src/pie.ts
index 1e7dbb4..4d0198f 100644
--- a/src/pie.ts
+++ b/src/pie.ts
@@ -149,7 +149,7 @@ export function renderPieChart(
     // console.log(renderInfo);
     if (!renderInfo || !pieInfo) return;
 
-    // return "Under construction";
+    return "Under construction";
 
     let chartElements: ChartElements = {};
     chartElements = createAreas(chartElements, canvas, renderInfo, pieInfo);

From f8ad73602d1680b885b13fad9bc36841e5306920 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 4 Jul 2021 11:23:21 +0800
Subject: [PATCH 106/402] Fix startDate and endDate in iso-8601 format

---
 src/collecting.ts |  2 +-
 src/helper.ts     |  7 ++++++-
 src/main.ts       | 16 ++--------------
 src/parsing.ts    |  8 ++------
 4 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/src/collecting.ts b/src/collecting.ts
index 529afc7..0a6bdbc 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -258,7 +258,7 @@ export function getDateFromTask(
     return date;
 }
 
-function addToDataMap(
+export function addToDataMap(
     dataMap: DataMap,
     date: string,
     query: Query,
diff --git a/src/helper.ts b/src/helper.ts
index da80a18..fc822fb 100644
--- a/src/helper.ts
+++ b/src/helper.ts
@@ -35,7 +35,12 @@ export function strToDate(strDate: string, dateFormat: string): Moment {
         format = window.moment.ISO_8601;
     }
 
-    return window.moment(strDate, format, true);
+    let date = window.moment(strDate, format, true);
+
+    // stip time
+    date = date.startOf('day');
+
+    return date;
 }
 
 export function dateToStr(date: Moment, dateFormat: string): string {
diff --git a/src/main.ts b/src/main.ts
index 87549a9..19f23ef 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -117,18 +117,6 @@ export default class Tracker extends Plugin {
         return files;
     }
 
-    // To be moved to collecting.ts
-    addToDataMap(dataMap: DataMap, date: string, query: Query, value: number) {
-        if (!dataMap.has(date)) {
-            let queryValuePairs = new Array<QueryValuePair>();
-            queryValuePairs.push({ query: query, value: value });
-            dataMap.set(date, queryValuePairs);
-        } else {
-            let targetValuePairs = dataMap.get(date);
-            targetValuePairs.push({ query: query, value: value });
-        }
-    }
-
     async postprocessor(
         source: string,
         el: HTMLElement,
@@ -602,7 +590,7 @@ export default class Tracker extends Plugin {
                                     indLine < xValues.length &&
                                     xValues[indLine]
                                 ) {
-                                    this.addToDataMap(
+                                    collecting.addToDataMap(
                                         dataMap,
                                         helper.dateToStr(
                                             xValues[indLine],
@@ -626,7 +614,7 @@ export default class Tracker extends Plugin {
                                     indLine < xValues.length &&
                                     xValues[indLine]
                                 ) {
-                                    this.addToDataMap(
+                                    collecting.addToDataMap(
                                         dataMap,
                                         helper.dateToStr(
                                             xValues[indLine],
diff --git a/src/parsing.ts b/src/parsing.ts
index f93e846..f157600 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1160,11 +1160,7 @@ export function getRenderInfoFromYaml(
                 }
             }
         } else {
-            startDate = window.moment(
-                strStartDate,
-                renderInfo.dateFormat,
-                true
-            );
+            startDate = helper.strToDate(strStartDate, renderInfo.dateFormat);
             if (startDate.isValid()) {
                 isStartDateValid = true;
             }
@@ -1223,7 +1219,7 @@ export function getRenderInfoFromYaml(
                 }
             }
         } else {
-            endDate = window.moment(strEndDate, renderInfo.dateFormat, true);
+            endDate = helper.strToDate(strEndDate, renderInfo.dateFormat);
             if (endDate.isValid()) {
                 isEndDateValid = true;
             }

From 15653984bbab4bad9ee118c71b6ec5b8c55d97e3 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 4 Jul 2021 12:23:32 +0800
Subject: [PATCH 107/402] Fix relative date input

---
 src/helper.ts  | 37 ++++++++++++++++++++++++++++++-
 src/parsing.ts | 60 ++++++++++----------------------------------------
 2 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/src/helper.ts b/src/helper.ts
index fc822fb..8449bd6 100644
--- a/src/helper.ts
+++ b/src/helper.ts
@@ -38,11 +38,46 @@ export function strToDate(strDate: string, dateFormat: string): Moment {
     let date = window.moment(strDate, format, true);
 
     // stip time
-    date = date.startOf('day');
+    date = date.startOf("day");
 
     return date;
 }
 
+export function relDateStringToDate(
+    relDateString: string,
+    dateFormat: string
+): Moment {
+    let date = null;
+    const relDateRegex = /^(?<value>[\-\+]?[0-9]+)(?<unit>[dwmy])$/;
+    if (relDateRegex.test(relDateString)) {
+        let match = relDateRegex.exec(relDateString);
+        if (
+            typeof match.groups !== "undefined" &&
+            typeof match.groups.value !== "undefined" &&
+            typeof match.groups.unit !== "undefined"
+        ) {
+            let value = parseFloat(match.groups.value);
+            let unit = match.groups.unit;
+            date = getDateToday(dateFormat);
+            if (unit === "d") {
+                date = date.add(value, "days");
+            } else if (unit === "w") {
+                date = date.add(value, "weeks");
+            } else if (unit === "m") {
+                date = date.add(value, "months");
+            } else if (unit === "y") {
+                date = date.add(value, "years");
+            }
+        }
+    }
+
+    if (date && date.isValid()) {
+        return date;
+    }
+
+    return null;
+}
+
 export function dateToStr(date: Moment, dateFormat: string): string {
     if (typeof date === "undefined" || date === null) return null;
 
diff --git a/src/parsing.ts b/src/parsing.ts
index f157600..895f382 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1113,6 +1113,7 @@ export function getRenderInfoFromYaml(
     }
 
     // startDate, endDate
+    // console.log("Parsing startDate");
     if (typeof yaml.startDate === "string") {
         let strStartDate = yaml.startDate;
         if (
@@ -1135,30 +1136,12 @@ export function getRenderInfoFromYaml(
 
         let startDate = null;
         let isStartDateValid = false;
-        const relDateRegex = /^(?<value>[\-\+]?[0-9]+)(?<unit>[dwmy])$/;
-        if (relDateRegex.test(strStartDate)) {
-            let match = relDateRegex.exec(strStartDate);
-            if (
-                typeof match.groups !== "undefined" &&
-                typeof match.groups.value !== "undefined" &&
-                typeof match.groups.unit !== "undefined"
-            ) {
-                let value = parseFloat(match.groups.value);
-                let unit = match.groups.unit;
-                startDate = helper.getDateToday(dateFormat);
-                if (unit === "d") {
-                    startDate = startDate.add(value, "days");
-                } else if (unit === "w") {
-                    startDate = startDate.add(value, "weeks");
-                } else if (unit === "m") {
-                    startDate = startDate.add(value, "months");
-                } else if (unit === "y") {
-                    startDate = startDate.add(value, "years");
-                }
-                if (startDate.isValid()) {
-                    isStartDateValid = true;
-                }
-            }
+        startDate = helper.relDateStringToDate(
+            strStartDate,
+            renderInfo.dateFormat
+        );
+        if (startDate) {
+            isStartDateValid = true;
         } else {
             startDate = helper.strToDate(strStartDate, renderInfo.dateFormat);
             if (startDate.isValid()) {
@@ -1174,6 +1157,8 @@ export function getRenderInfoFromYaml(
         }
         renderInfo.startDate = startDate;
     }
+
+    // console.log("Parsing endDate");
     if (typeof yaml.endDate === "string") {
         let strEndDate = yaml.endDate;
         if (
@@ -1194,30 +1179,9 @@ export function getRenderInfoFromYaml(
 
         let endDate = null;
         let isEndDateValid = false;
-        const relDateRegex = /^(?<value>[\-\+]?[0-9]+)(?<unit>[dwmy])$/;
-        if (relDateRegex.test(strEndDate)) {
-            let match = relDateRegex.exec(strEndDate);
-            if (
-                typeof match.groups !== "undefined" &&
-                typeof match.groups.value !== "undefined" &&
-                typeof match.groups.unit !== "undefined"
-            ) {
-                let value = parseFloat(match.groups.value);
-                let unit = match.groups.unit;
-                endDate = helper.getDateToday(dateFormat);
-                if (unit === "d") {
-                    endDate = endDate.add(value, "days");
-                } else if (unit === "w") {
-                    endDate = endDate.add(value, "weeks");
-                } else if (unit === "m") {
-                    endDate = endDate.add(value, "months");
-                } else if (unit === "y") {
-                    endDate = endDate.add(value, "years");
-                }
-                if (endDate.isValid()) {
-                    isEndDateValid = true;
-                }
-            }
+        endDate = helper.relDateStringToDate(strEndDate, renderInfo.dateFormat);
+        if (endDate) {
+            isEndDateValid = true;
         } else {
             endDate = helper.strToDate(strEndDate, renderInfo.dateFormat);
             if (endDate.isValid()) {

From 010197656c87019348eb4a67fe006dc11231980d Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 4 Jul 2021 13:14:47 +0800
Subject: [PATCH 108/402] Update examples; Comment out debug messages;

---
 examples/ErrorMessages.md   |  1 +
 examples/TestDateFormats.md | 33 +++++++++++++++++++++++++++++++--
 src/parsing.ts              |  4 ++--
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/examples/ErrorMessages.md b/examples/ErrorMessages.md
index fb2212e..29afea7 100644
--- a/examples/ErrorMessages.md
+++ b/examples/ErrorMessages.md
@@ -56,6 +56,7 @@ Folder not exists
 searchType: tag
 searchTarget: weight
 folder: abc
+line:
 ```
 
 ## Date
diff --git a/examples/TestDateFormats.md b/examples/TestDateFormats.md
index 6c03e4a..be99a80 100644
--- a/examples/TestDateFormats.md
+++ b/examples/TestDateFormats.md
@@ -1,6 +1,5 @@
 # Test Date Formats
 
-
 ## Test Default Date Formats
 
 Change the default dateFomat on Tracker settings panel and then check the following trackers in the preview mode. Only the one fit dateFomat settings will get rendered.
@@ -94,6 +93,21 @@ line:
     lineColor: yellow
 ```
 
+## ISO-8601 Date Format
+``` tracker
+searchType: tag
+searchTarget: weight
+folder: diary
+dateFormat: iso-8601
+startDate: 2021-01-01T14:53:25+00:00
+endDate: 2021-01-05T14:53:25+00:00
+line:
+    title: Weight Log
+    yAxisLabel: Weight
+    yAxisUnit: kg
+    lineColor: yellow
+```
+
 ## Test Date Format Prefix and Suffix
 
 ### dateFormat: YYYYMMDD with prefix D-
@@ -128,4 +142,19 @@ line:
     lineColor: yellow
 ```
 
-Please also check those search targets in markdown files under folder 'diary'.
+## Relative Date Input for startDate and endDate
+
+``` tracker
+searchType: tag
+searchTarget: weight
+folder: diary
+startDate: -1m
+endDate: 0d
+line:
+    title: Weight Log
+    yAxisLabel: Weight
+    yAxisUnit: kg
+    lineColor: yellow
+```
+
+Please also check those search targets in markdown files under folder 'diary'.
\ No newline at end of file
diff --git a/src/parsing.ts b/src/parsing.ts
index 895f382..579c300 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1722,8 +1722,8 @@ export function getRenderInfoFromYaml(
             }
         }
         if (month.threshold.length !== month.dataset.length) {
-            console.log(month.threshold);
-            console.log(month.dataset);
+            // console.log(month.threshold);
+            // console.log(month.dataset);
             const errorMessage =
                 "The number of inputs of threshold and dataset not matched";
             return errorMessage;

From 2bee99a10caf92dda8921685e3974e720dc9840a Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 4 Jul 2021 14:26:18 +0800
Subject: [PATCH 109/402] Update TestDateFormats.md

---
 examples/TestDateFormats.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/examples/TestDateFormats.md b/examples/TestDateFormats.md
index be99a80..d612b4f 100644
--- a/examples/TestDateFormats.md
+++ b/examples/TestDateFormats.md
@@ -94,6 +94,7 @@ line:
 ```
 
 ## ISO-8601 Date Format
+
 ``` tracker
 searchType: tag
 searchTarget: weight
@@ -110,6 +111,8 @@ line:
 
 ## Test Date Format Prefix and Suffix
 
+The string provided in dateFormatPrefix and dateFormatSuffix will be removed before parsing dates.
+
 ### dateFormat: YYYYMMDD with prefix D-
 
 ``` tracker
@@ -144,6 +147,13 @@ line:
 
 ## Relative Date Input for startDate and endDate
 
+The reference date of the relative date input is 'today' (The current date of your computer), So
+0d ==> today
+-1d ==> yesterday
+-1w ==> last week
+-1m ==> last month
+-1y ==> last year
+
 ``` tracker
 searchType: tag
 searchTarget: weight

From 623d074f668f1b5a57639c45e5657f361d8d3a1b Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 4 Jul 2021 16:16:40 +0800
Subject: [PATCH 110/402] Fix multiple yMin and yMax for MonthInfo

---
 src/data.ts    |  8 ++++----
 src/month.ts   |  8 ++++----
 src/parsing.ts | 32 ++++++++++++++++++++++++++++----
 3 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/src/data.ts b/src/data.ts
index 2953489..c75f5fa 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -716,8 +716,8 @@ export class MonthInfo extends OutputInfo {
     dataset: number[];
     startWeekOn: string;
     threshold: number[];
-    yMin: number;
-    yMax: number;
+    yMin: number[];
+    yMax: number[];
     showCircle: boolean;
     color: string;
     dimNotInMonth: boolean;
@@ -743,8 +743,8 @@ export class MonthInfo extends OutputInfo {
         this.dataset = [];
         this.startWeekOn = "Sun";
         this.threshold = []; // if value > threshold, will show dot
-        this.yMin = null;
-        this.yMax = null;
+        this.yMin = [];
+        this.yMax = [];
         this.showCircle = true;
         this.color = null;
         this.dimNotInMonth = true;
diff --git a/src/month.ts b/src/month.ts
index 3621089..b265777 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -447,12 +447,12 @@ function renderMonthDays(
 
     // Get min and max
     let yMin = d3.min(dataset.getValues());
-    if (monthInfo.yMin !== null) {
-        yMin = monthInfo.yMin;
+    if (monthInfo.yMin[curDatasetId] !== null) {
+        yMin = monthInfo.yMin[curDatasetId];
     }
     let yMax = d3.max(dataset.getValues());
-    if (monthInfo.yMax !== null) {
-        yMax = monthInfo.yMax;
+    if (monthInfo.yMax[curDatasetId] !== null) {
+        yMax = monthInfo.yMax[curDatasetId];
     }
     // console.log(`yMin:${yMin}, yMax:${yMax}`);
     let allowScaledValue = true;
diff --git a/src/parsing.ts b/src/parsing.ts
index 579c300..bf8e27a 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1731,14 +1731,38 @@ export function getRenderInfoFromYaml(
         // console.log(month.threshold);
 
         // yMin
-        if (typeof yamlMonth?.yMin === "number") {
-            month.yMin = yamlMonth.yMin;
+        let retYMin = getNumberArray("yMin", yamlMonth?.yMin);
+        if (typeof retYMin === "string") {
+            return retYMin;
+        }
+        month.yMin = retYMin;
+        if (month.yMin.length === 0) {
+            for (let indDataset = 0; indDataset < numDataset; indDataset++) {
+                month.yMin.push(null);
+            }
+        }
+        if (month.yMin.length !== month.dataset.length) {
+            const errorMessage =
+                "The number of inputs of yMin and dataset not matched";
+            return errorMessage;
         }
         // console.log(month.yMin);
 
         // yMax
-        if (typeof yamlMonth?.yMax === "number") {
-            month.yMax = yamlMonth.yMax;
+        let retYMax = getNumberArray("yMax", yamlMonth?.yMax);
+        if (typeof retYMax === "string") {
+            return retYMax;
+        }
+        month.yMax = retYMax;
+        if (month.yMax.length === 0) {
+            for (let indDataset = 0; indDataset < numDataset; indDataset++) {
+                month.yMax.push(null);
+            }
+        }
+        if (month.yMax.length !== month.dataset.length) {
+            const errorMessage =
+                "The number of inputs of yMin and dataset not matched";
+            return errorMessage;
         }
         // console.log(month.yMax);
 

From d98722cc7be7b88236ec4bce6ebce90399a6ac37 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 4 Jul 2021 16:18:02 +0800
Subject: [PATCH 111/402] Update documents

---
 README.md                | 12 ++++++++++--
 docs/Concepts.md         |  2 +-
 docs/Examples.md         |  4 ++++
 docs/InputParameters.md  | 20 ++++++++++++--------
 docs/ReleaseNotes.md     | 11 +++++++++++
 docs/RoadMap.md          |  1 +
 docs/TargetEvaluation.md | 12 ++++++++++--
 7 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 57317d1..1534edd 100644
--- a/README.md
+++ b/README.md
@@ -8,8 +8,16 @@ This is an [Obsidian](https://obsidian.md/) plugin that helps you do tracking in
 [Here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Examples.md) is a simplified table of examples showing what you can track.
 
 ## What's New
-Version 1.7.0
-- Add a new output type 'month', rendering a month view for a given dataset ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestCalendar.md))
+Version 1.8.0
+- Add a new `searchType` `task`, retrieving data from tasks ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTask.md))
+- Enhancement
+    - Month view ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestCalendar.md))
+        - Add parameter `circleColorByValue` to show color based on the value
+        - Support multiple targets (dataset), change the dataset by clicking the header 
+        - Add a button to show current month
+    - Accept ISO-8601 date as `dateFormat` ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md#iso-8601-date-format))
+    - Relative date input for `startDate` and `endDate` ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md#relative-date-input-for-startdate-and-enddate))
+- Fixed missing dvField values at the last line of files
 
 ## Usage
 1. Have some targets you want to track in daily notes.
diff --git a/docs/Concepts.md b/docs/Concepts.md
index bf56509..18b62ff 100644
--- a/docs/Concepts.md
+++ b/docs/Concepts.md
@@ -6,7 +6,7 @@ This plugin was designed to read code blocks in [YAML format](https://en.wikiped
 
 ### Collecting Data
 
-Providing parameters `searchType` and `searchTarget` is the minimum requirement for a successful data collection. `searchType` can be `tag`, `frontmatter`, `wiki`, `dvField`, `table`, `fileMeta`,or `text`. Then the cooresponding `searchTarget` should be provided according to the specified type.
+Providing parameters `searchType` and `searchTarget` is the minimum requirement for a successful data collection. `searchType` can be `tag`, `frontmatter`, `wiki`, `dvField`, `table`, `fileMeta`, `task`, or `text`. Then the cooresponding `searchTarget` should be provided according to the specified type.
 
 ### Target Evaluation
 
diff --git a/docs/Examples.md b/docs/Examples.md
index e4dcd77..30f832a 100644
--- a/docs/Examples.md
+++ b/docs/Examples.md
@@ -30,6 +30,9 @@ The following table lists use cases with information of target location (Locatio
 | table content | { a table filled with dates and values }<br>[example table](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/data/Tables.md) | searchType: table<br>searchTarget: filePath[0][0], filePath[0][1] | V |
 | talbe content | { a table filled with dates and values }<br>[example table](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/data/Tables.md) | searchType: table<br>searchTarget: filePath[1][0], filePath[1][1][0], filePath[1][1][1] | V |
 | file meta | meta data from files <br>(size, cDate, mDate, numWords, numChars, numSentences) | searchType: fileMeta<br>searchTarget: size | V |
+| content | - [x] Say love<br>- [ ] Say love | searchType:task<br>searchTarget: Say love | O |
+| content | - [x] Say love | searchType:task.done<br>searchTarget: Say love | O |
+| content | - [ ] Say love | searchType: task.notdone<br>searchTarget: Say love | O |
 
 ## Full examples
 
@@ -52,6 +55,7 @@ List of all examples
 - [Multiple Targets / Multiple Values](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestMultipleTargetsMultipleValues.md)
 - [Scaling and Positioning](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestScalingAndPositioning.md)
 - [Table](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTable.md)
+- [Task](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTask.md)
 - [Template Variables](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTemplateVariables.md)
 - [Time Values](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTimeValues.md)
 - [Word Counting](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestWordCounting.md)
diff --git a/docs/InputParameters.md b/docs/InputParameters.md
index 77b3479..0d83baa 100644
--- a/docs/InputParameters.md
+++ b/docs/InputParameters.md
@@ -1,5 +1,5 @@
 # Input Parameters
-Obsidian-tracker parses key-value pairs in your code block in YAML format and uses them as input parameters. The minimum requirements for parameters are `searchType`, `searchTarget` and one output parameter (`line`, `bar`, `frontmatter`, `fileMeta`, `wiki`, `table`, or `text`).
+Obsidian-tracker parses key-value pairs in your code block in YAML format and uses them as input parameters. The minimum requirements for parameters are `searchType`, `searchTarget` and one output parameter (`line`, `bar`, `frontmatter`, `fileMeta`, `wiki`, `table`, `task`, or `text`).
 
 ## Array Input
 
@@ -17,14 +17,14 @@ These key-value pairs are placed under the code block root.
 
 | Key | Description | Number of Values | Default |
 |:--------|:-------|:-----------:|:------|
-| `searchType` | The type of `searchTarget` (tag\|frontmatter\|wiki\|text\|dvField\|table\|filemeta) | 1~NT | Must be provided |
+| `searchType` | The type of `searchTarget` (tag\|frontmatter\|wiki\|text\|dvField\|table\|filemeta\|task) | 1~NT | Must be provided |
 | `searchTarget` | The target to search<br>[[detail](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TargetEvaluation.md)] | NT (Number of Targets) | Must be provided |
 | `folder` | The root path of notes to search | 1 | Root of this vault |
-| `dateFormat` | The date format you are using | 1  | 'YYYY-MM-DD' |
+| `dateFormat` | The date format you are using<br> or use [iso-8601](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md#iso-8601-date-format) | 1  | 'YYYY-MM-DD' |
 | `dateFormatPrefix` | The prefix before your dateFormat | 1 | '' |
 | `dateFormatSuffix` | The suffix after your dateFormat | 1 | '' |
-| `startDate` | The start date to collect data | 1 | Min date found |
-| `endDate` | The end date of to collect data | 1 | Max date found |
+| `startDate` | The start date to collect data<br>accept [relative date](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md#relative-date-input-for-startdate-and-enddate) | 1 | Min date found |
+| `endDate` | The end date of to collect data<br>accept [relative date](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md#relative-date-input-for-startdate-and-enddate) | 1 | Max date found |
 | `datasetName` | The name of the dataset for a search target` | 1~NT | untitled |
 | `separator` | The character to separate multiple values appearing in the search target | 1~NT | '/' |
 | `xDataset` | The `searchTarget` of this index will be used as xDataset | 1~NT | -1 (use filename as xDataset) |
@@ -120,9 +120,11 @@ These key-value pairs should be placed under the key `month`.
 
 | Key | Description | Number of Values | Default |
 |:--------|:-------|:-----------:|:------|
-| `dataset` | The index of the dataset of your interest | 1 | 0 |
+| `dataset` | The index of the dataset of your interest | 1~NT | all indices of non-x searchTarget |
 | `startWeekOn` | First day of a week ('Sun'\|'Mon') | 1 | 'Sun' |
-| `threshold` | The threshold to determine showing a circle on a day or not | 1 | 0 |
+| `threshold` | The threshold to determine showing a circle on a day or not | 1~NT | 0 |
+| `yMin` | Minimum value | 1~NT | Minimum value of the dataset |
+| `yMax` | Maximum value | 1~NT | Maximum value of the dataset |
 | `showCircle` | Circle the day label if the collected value reach the threshold (value > threshold) | 1 | true |
 | `color` | Main color (can be override by other color parameters) | 1 | null |
 | `dimNotInMonth` | Dim the color for days not in current month | 1 | true |
@@ -131,8 +133,10 @@ These key-value pairs should be placed under the key `month`.
 | `showSelectedValue` | Show the value on the selected day | 1 | true |
 | `showSelectedRing` | Show a ring on the label of the selected day | 1 | true |
 | `circleColor` | The color of circles | 1 | '#69b3a2' |
+| `circleColorByValue` | Display colors based on the value | 1 | 1 |
 | `headerYearColor` | The color of year text in header | 1 | 'white' |
 | `headerMonthColor` | The color of the month text in header | 1 | 'white' |
 | `dividingLineColor` | The color of the dividing line | 1 | '#69b3a2' |
 | `todayRingColor` | The color of the ring on today | 1 | 'white' |
-| `selectedRingColor` | The color of the ring on the selected day | 1 | 'firebrick' |
\ No newline at end of file
+| `selectedRingColor` | The color of the ring on the selected day | 1 | 'firebrick' |
+| `initMonth` | Initial month to show (0~11) | 1 | last month found |
\ No newline at end of file
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index 7bb2be1..12bf337 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,5 +1,16 @@
 # Release Notes
 
+## v1.8.0
+- Add a new `searchType` `task`, retrieving data from tasks ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTask.md))
+- Enhancement
+    - Month view ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestCalendar.md))
+        - Add parameter `circleColorByValue` to show color based on the value
+        - Support multiple targets (dataset), change the dataset by clicking the header 
+        - Add a button (◦) to show current month
+    - Accept ISO-8601 date as `dateFormat` ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md#iso-8601-date-format))
+    - Relative date input for `startDate` and `endDate` ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md#relative-date-input-for-startdate-and-enddate))
+- Fixed missing dvField values at the last line of files
+
 ## v1.7.0
 - Add a new output type 'month', rendering a month view for a given dataset ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestCalendar.md))
 
diff --git a/docs/RoadMap.md b/docs/RoadMap.md
index 25112dd..9b21956 100644
--- a/docs/RoadMap.md
+++ b/docs/RoadMap.md
@@ -9,6 +9,7 @@
     - [x] Get data from a table
     - [x] Collect data from dataview plugin's inline fields
     - [x] Collect meta information from file
+    - [x] Support tracking tasks
     - [ ] Allow manual data input (x and y values)
     - [ ] Allow forced value types
     - [ ] Allow using non-date x values
diff --git a/docs/TargetEvaluation.md b/docs/TargetEvaluation.md
index e5653ab..a771ecb 100644
--- a/docs/TargetEvaluation.md
+++ b/docs/TargetEvaluation.md
@@ -1,6 +1,6 @@
 # Target Evaluation
 
-From the [input parameters](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md) you provided, the search targets dispersed in the notes will be counted or evaluated as a value. Tracker plugin supports seven kinds of `searchType`: `tag`, `frontmatter`, `wiki`, `text`, `table`, `dvField`, and `fileMeta`, dealing with different types of searching condition.
+From the [input parameters](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md) you provided, the search targets dispersed in the notes will be counted or evaluated as a value. Tracker plugin supports eight kinds of `searchType`: `tag`, `frontmatter`, `wiki`, `text`, `table`, `dvField`, `task`, and `fileMeta`, dealing with different types of searching condition.
 
 ## Multiple Targets
 You can provide multiple search targets in code block by entering an array of targets separated by a comma under parameter `searchType` and `searchTarget`. Each of the targets will be identified in order and then the  values in notes will be evaluated and form a dataset indexed by that order in the array (zero-based indexing).
@@ -116,4 +116,12 @@ With this search type, you can retrieve infomation of files. Currently, three ki
 - numChars: number of characters in a file (including spaces)
 - numSentences: number of setences in a file
 
-`cData` and `mDate` can be used as X dataset and `size` can be used as Y dataset.
\ No newline at end of file
+`cData` and `mDate` can be used as X dataset and `size` can be used as Y dataset.
+
+### searchType: task
+
+You can retrieve infomation from tasks by using `searchType` `tasks`.
+The provided `searchTarget` will limit the result with task's contents match the input.
+
+Using type `task` or `task.all` will get you all tasks no matter it is done or not.
+To get task done, use `task.done`. By contrast, use `task.notdone`.
\ No newline at end of file

From 1cb0bc7d46bb69f31eb5254b613a65abb943b653 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 4 Jul 2021 16:21:39 +0800
Subject: [PATCH 112/402] Ignore examples for users

---
 .gitignore | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index c709e73..bb7f74e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,7 @@ examples/*.js
 *.zip
 
 # .obsidian
-.obsidian
\ No newline at end of file
+.obsidian
+
+# examples for users
+examples/case
\ No newline at end of file

From 708d7b24bf287d44f059302339a890dc10eb5fb5 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 4 Jul 2021 17:15:10 +0800
Subject: [PATCH 113/402] Fix validateSearchType

---
 src/parsing.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/parsing.ts b/src/parsing.ts
index bf8e27a..ab2bdde 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -43,9 +43,9 @@ function validateSearchType(searchType: string): boolean {
         searchType.toLowerCase() === "text" ||
         searchType.toLowerCase() === "frontmatter" ||
         searchType.toLowerCase() === "wiki" ||
-        searchType.toLowerCase() === "dvField" ||
+        searchType.toLowerCase() === "dvfield" ||
         searchType.toLowerCase() === "table" ||
-        searchType.toLowerCase() === "fileMeta" ||
+        searchType.toLowerCase() === "filemeta" ||
         searchType.toLowerCase() === "task" ||
         searchType.toLowerCase() === "task.all" ||
         searchType.toLowerCase() === "task.done" ||

From e58ab5ac16e7d4823c80011cd1ac893df5e6aed3 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 4 Jul 2021 17:43:00 +0800
Subject: [PATCH 114/402] Update TestTemplateVariables.md

---
 examples/TestTemplateVariables.md | 36 +++++++++++++++----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/examples/TestTemplateVariables.md b/examples/TestTemplateVariables.md
index 9536999..995bc51 100644
--- a/examples/TestTemplateVariables.md
+++ b/examples/TestTemplateVariables.md
@@ -7,7 +7,7 @@ searchTarget: dataviewTarget
 folder: /diary
 endDate: 2021-01-03
 summary:
-    template: 'Minimum value: {{min}} <-- should be 27'
+    template: 'Minimum value: {{min}} <-- should be 12'
 ```
 
 ### {{minDate}}
@@ -17,7 +17,7 @@ searchTarget: dataviewTarget
 folder: /diary
 endDate: 2021-01-03
 summary:
-    template: 'Latest date of minimum value: {{minDate}} <-- should be 2021-01-02'
+    template: 'Latest date of minimum value: {{minDate}} <-- should be 2021-01-03'
 ```
 
 ### {{max}}
@@ -27,7 +27,7 @@ searchTarget: dataviewTarget
 folder: /diary
 endDate: 2021-01-03
 summary:
-    template: 'Maximum value: {{max}} <-- should be 88'
+    template: 'Maximum value: {{max}} <-- should be 48'
 ```
 
 ### {{maxDate}}
@@ -37,7 +37,7 @@ searchTarget: dataviewTarget
 folder: /diary
 endDate: 2021-01-03
 summary:
-    template: 'Latest date of maximum value: {{maxDate}} <-- should be 2021-01-03'
+    template: 'Latest date of maximum value: {{maxDate}} <-- should be 2021-01-01'
 ```
 
 ### {{startDate}}
@@ -67,7 +67,7 @@ searchTarget: meditation
 folder: /diary
 endDate: 2021-01-04
 summary:
-    template: 'Sum: {{sum}} <-- should be 2'
+    template: 'Sum: {{sum}} <-- should be 3'
 ```
 
 ### {{numTargets}}
@@ -97,7 +97,7 @@ searchTarget: meditation
 folder: /diary
 endDate: 2021-01-04
 summary:
-    template: 'Number of days having data: {{numDaysHavingData}} <-- should be 2'
+    template: 'Number of days having data: {{numDaysHavingData}} <-- should be 3'
 ```
 
 ### {{maxStreak}}
@@ -107,7 +107,7 @@ searchTarget: meditation
 folder: /diary
 endDate: 2021-01-09
 summary:
-    template: 'Maximum streak: {{maxStreak}} <-- should be 3'
+    template: 'Maximum streak: {{maxStreak}} <-- should be 5'
 ```
 
 ### {{maxStreakStart}}
@@ -117,7 +117,7 @@ searchTarget: meditation
 folder: /diary
 endDate: 2021-01-09
 summary:
-    template: 'The start date of maximum streak: {{maxStreakStart}} <-- should be 2021-01-04'
+    template: 'The start date of maximum streak: {{maxStreakStart}} <-- should be 2021-01-02'
 ```
 
 ### {{maxStreakEnd}}
@@ -137,7 +137,7 @@ searchTarget: meditation
 folder: /diary
 endDate: 2021-01-09
 summary:
-    template: 'Maximum breaks: {{maxBreaks}} <-- should be 1'
+    template: 'Maximum breaks: {{maxBreaks}} <-- should be 2'
 ```
 
 ### {{maxBreaksStart}}
@@ -157,7 +157,7 @@ searchTarget: meditation
 folder: /diary
 endDate: 2021-01-09
 summary:
-    template: 'The end date of maximum breaks: {{maxBreaksEnd}} <-- should be 2021-01-07'
+    template: 'The end date of maximum breaks: {{maxBreaksEnd}} <-- should be 2021-01-08'
 ```
 
 ### {{currentStreak}}
@@ -167,7 +167,7 @@ searchTarget: meditation
 folder: /diary
 endDate: 2021-01-24
 summary:
-    template: 'Latest streak: {{currentStreak}} <-- should be 2'
+    template: 'Latest streak: {{currentStreak}} <-- should be 1'
 ```
 
 ### {{currentStreakStart}}
@@ -177,7 +177,7 @@ searchTarget: meditation
 folder: /diary
 endDate: 2021-01-24
 summary:
-    template: 'The start date of current streak: {{currentStreakStart}} <-- should be 2021-01-23'
+    template: 'The start date of current streak: {{currentStreakStart}} <-- should be 2021-01-24'
 ```
 
 ### {{currentStreakEnd}}
@@ -197,7 +197,7 @@ searchTarget: meditation
 folder: /diary
 endDate: 2021-01-22
 summary:
-    template: 'Current breaks: {{currentBreaks}} <-- should be 8'
+    template: 'Current breaks: {{currentBreaks}} <-- should be 1'
 ```
 
 ### {{currentBreaksStart}}
@@ -207,7 +207,7 @@ searchTarget: meditation
 folder: /diary
 endDate: 2021-01-22
 summary:
-    template: 'The start date of current breaks: {{currentBreaksStart}} <-- should be 2021-01-15'
+    template: 'The start date of current breaks: {{currentBreaksStart}} <-- should be 2021-01-22'
 ```
 
 ### {{currentBreaksEnd}}
@@ -221,14 +221,14 @@ summary:
 ```
 
 ### {{average}}
-(48+27+88)/3 = 54.33
+(48+25+12)/3 = 28.33
 ``` tracker
 searchType: dvField
 searchTarget: dataviewTarget
 folder: /diary
 endDate: 2021-01-03
 summary:
-    template: 'Average value: {{average}} <-- should be 54.33'
+    template: 'Average value: {{average}} <-- should be 28.33'
 ```
 
 ### {{median}}
@@ -238,7 +238,7 @@ searchTarget: dataviewTarget
 folder: /diary
 endDate: 2021-01-03
 summary:
-    template: 'Median value: {{median}} <-- should be 48'
+    template: 'Median value: {{median}} <-- should be 25'
 ```
 
 ### {{variance}}
@@ -249,5 +249,5 @@ searchTarget: dataviewTarget
 folder: /diary
 endDate: 2021-01-03
 summary:
-    template: 'Variance value: {{variance}} <-- should be 960.33'
+    template: 'Variance value: {{variance}} <-- should be 332.33'
 ```

From a93c753c2760d6e691fce1738dd3f1896c91bf00 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 4 Jul 2021 18:26:28 +0800
Subject: [PATCH 115/402] Update TestDateFormats.md

---
 examples/TestDateFormats.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/TestDateFormats.md b/examples/TestDateFormats.md
index d612b4f..a98b946 100644
--- a/examples/TestDateFormats.md
+++ b/examples/TestDateFormats.md
@@ -148,11 +148,11 @@ line:
 ## Relative Date Input for startDate and endDate
 
 The reference date of the relative date input is 'today' (The current date of your computer), So
-0d ==> today
--1d ==> yesterday
--1w ==> last week
--1m ==> last month
--1y ==> last year
+- 0d ==> today
+- -1d ==> yesterday
+- -1w ==> last week
+- -1m ==> last month
+- -1y ==> last year
 
 ``` tracker
 searchType: tag
@@ -167,4 +167,4 @@ line:
     lineColor: yellow
 ```
 
-Please also check those search targets in markdown files under folder 'diary'.
\ No newline at end of file
+Please also check those search targets in markdown files under folder 'diary'.

From 9a2327a955cd32b10ba8fbd7afc03536529ef1b8 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 5 Jul 2021 10:55:20 +0800
Subject: [PATCH 116/402] Test expression-eval

---
 examples/TestPieChart.md |  6 +++---
 package.json             |  1 +
 src/expr.ts              | 10 ++++++++++
 src/pie.ts               | 17 ++++++++++++-----
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/examples/TestPieChart.md b/examples/TestPieChart.md
index d7e56e1..084e43e 100644
--- a/examples/TestPieChart.md
+++ b/examples/TestPieChart.md
@@ -5,8 +5,8 @@ searchType: tag
 searchTarget: meditation
 pie:
     title: Pie
-	data: 2,4,6,8,10
-	dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
-	ratioInnerRadius: 0.5
+    data: '{{sum}}*1,{{sum}}*2,{{sum}}*3,{{sum}}*4,{{sum}}*5'
+    dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
+    ratioInnerRadius: 0.5
 ```
 
diff --git a/package.json b/package.json
index 9533fda..926fa67 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,7 @@
   "dependencies": {
     "d3": "^6.5.0",
     "d3-interpolate": "^3.0.1",
+    "expression-eval": "^5.0.0",
     "obsidian-daily-notes-interface": "^0.9.1"
   }
 }
diff --git a/src/expr.ts b/src/expr.ts
index f624bf3..dbb9d86 100644
--- a/src/expr.ts
+++ b/src/expr.ts
@@ -2,6 +2,7 @@ import { RenderInfo } from "./data";
 import * as d3 from "d3";
 import { Moment } from "moment";
 import * as helper from "./helper";
+import { parse, eval as evaluate } from "expression-eval";
 
 let fnSet = {
     // min value of a dataset
@@ -520,3 +521,12 @@ export function resolveTemplate(template: string, renderInfo: RenderInfo) {
 
     return template;
 }
+
+export function resolve(s: string, renderInfo: RenderInfo) {
+    console.log(s);
+    s = resolveTemplate(s, renderInfo);
+    console.log(s);
+    const ast = parse(s);
+    const value = evaluate(ast, {});
+    return value;
+}
diff --git a/src/pie.ts b/src/pie.ts
index 4d0198f..f75460c 100644
--- a/src/pie.ts
+++ b/src/pie.ts
@@ -14,6 +14,7 @@ import {
 } from "./data";
 import * as helper from "./helper";
 import * as d3 from "d3";
+import * as expr from "./expr";
 
 function createAreas(
     chartElements: ChartElements,
@@ -85,7 +86,7 @@ function renderTitle(
     renderInfo: RenderInfo,
     pieInfo: PieInfo
 ) {
-    // console.log("renderTitle")
+    // console.log("renderTitle");
     // under graphArea
 
     if (!renderInfo || !pieInfo) return;
@@ -100,10 +101,18 @@ function renderPie(
     renderInfo: RenderInfo,
     pieInfo: PieInfo
 ) {
+    // console.log("renderPie");
+    // console.log(renderInfo);
+
     let radius = renderInfo.dataAreaSize.width * 0.5 * 0.8;
-    let data = pieInfo.data.map(function (v) {
-        return parseFloat(v);
+
+    // data
+    let data = pieInfo.data.map(function (s) {
+        let value = expr.resolve(s, renderInfo);
+        return value;
     });
+
+    // scale
     let colorScale = d3.scaleOrdinal().range(pieInfo.dataColor);
 
     let sectorsGroup = chartElements.dataArea.append("g");
@@ -149,8 +158,6 @@ export function renderPieChart(
     // console.log(renderInfo);
     if (!renderInfo || !pieInfo) return;
 
-    return "Under construction";
-
     let chartElements: ChartElements = {};
     chartElements = createAreas(chartElements, canvas, renderInfo, pieInfo);
 

From 6931054fb60bcdc390b6b722a4b9b43ee543128a Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 5 Jul 2021 17:43:12 +0800
Subject: [PATCH 117/402] Fix dataset ids in month view

---
 docs/InputParameters.md |  2 +-
 examples/TestTable.md   | 23 +++++++++-
 src/data.ts             |  2 +-
 src/month.ts            | 93 ++++++++++++++++++++++++++++++++++-------
 src/parsing.ts          |  4 +-
 5 files changed, 104 insertions(+), 20 deletions(-)

diff --git a/docs/InputParameters.md b/docs/InputParameters.md
index 0d83baa..018d3be 100644
--- a/docs/InputParameters.md
+++ b/docs/InputParameters.md
@@ -139,4 +139,4 @@ These key-value pairs should be placed under the key `month`.
 | `dividingLineColor` | The color of the dividing line | 1 | '#69b3a2' |
 | `todayRingColor` | The color of the ring on today | 1 | 'white' |
 | `selectedRingColor` | The color of the ring on the selected day | 1 | 'firebrick' |
-| `initMonth` | Initial month to show (0~11) | 1 | last month found |
\ No newline at end of file
+| `initMonth` | Initial month to show (YYYY-MM) | 1 | last month found |
\ No newline at end of file
diff --git a/examples/TestTable.md b/examples/TestTable.md
index 4a87434..7ab9251 100644
--- a/examples/TestTable.md
+++ b/examples/TestTable.md
@@ -1,4 +1,6 @@
 # Test Table
+
+## Line Chart
 Use first column as X dataset , and second and third columns as Y values
 ``` tracker
 searchType: table
@@ -35,7 +37,7 @@ line:
     legendPosition: right
 ```
 
-## Tables with Defects
+### Tables with Defects
 ``` tracker
 searchType: table
 searchTarget: data/Tables[2][0], data/Tables[2][1]
@@ -53,4 +55,23 @@ line:
     lineColor: none, yellow
 ```
 
+## Month View
+
+``` tracker
+searchType: table
+searchTarget: data/Tables[0][0], data/Tables[0][1], data/Tables[0][2], data/Tables[0][3]
+xDataset: 0
+datasetName: null, Jeffrey, Lucas, Anne
+month:
+    startWeekOn: 'Sun'
+    threshold: 0, 62.2, 20.8, 18.2
+    color: green
+    headerMonthColor: orange
+    dimNotInMonth: false
+    todayRingColor: orange
+    selectedRingColor: steelblue
+    circleColorByValue: true
+    showSelectedValue: true
+```
+
 Please also check those search targets in markdown file /data/Tables.
diff --git a/src/data.ts b/src/data.ts
index c75f5fa..09ad176 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -762,7 +762,7 @@ export class MonthInfo extends OutputInfo {
         this.initMonth = "";
 
         this.selectedDate = ""; // selected date
-        this.selectedDataset = 0; // selected index of dataset
+        this.selectedDataset = null; // selected index of dataset
     }
 }
 
diff --git a/src/month.ts b/src/month.ts
index b265777..edee9be 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -32,6 +32,55 @@ interface DayInfo {
     streakOut: boolean;
 }
 
+function toNextDataset(renderInfo: RenderInfo, monthInfo: MonthInfo): boolean {
+    let datasetIds = monthInfo.dataset;
+    if (datasetIds.length === 0) return false; // false if selected dataset not changed
+
+    let dataset = null;
+    if (monthInfo.selectedDataset === null) {
+        for (let datasetId of datasetIds) {
+            dataset = renderInfo.datasets.getDatasetById(datasetId);
+            if (dataset && !dataset.getQuery().usedAsXDataset) break;
+        }
+        if (dataset) {
+            monthInfo.selectedDataset = dataset.getId();
+            return true; // true if selectec dataset changed
+        }
+    } else {
+        let curDatasetId = monthInfo.selectedDataset;
+        let curIndex = datasetIds.findIndex((id) => {
+            return id === curDatasetId;
+        });
+        if (curIndex >= 0) {
+            if (curIndex === monthInfo.dataset.length - 1) {
+                // search from start
+                for (let datasetId of datasetIds) {
+                    dataset = renderInfo.datasets.getDatasetById(datasetId);
+                    if (dataset && !dataset.getQuery().usedAsXDataset) break;
+                }
+                if (dataset) {
+                    monthInfo.selectedDataset = dataset.getId();
+                    return true; // true if selectec dataset changed
+                } else {
+                    return false;
+                }
+            } else {
+                curIndex++;
+                let datasetId = datasetIds[curIndex];
+                dataset = renderInfo.datasets.getDatasetById(datasetId);
+                monthInfo.selectedDataset = datasetId;
+                if (dataset && !dataset.getQuery().usedAsXDataset) {
+                    return true;
+                } else {
+                    toNextDataset(renderInfo, monthInfo);
+                }
+            }
+        }
+    }
+
+    return false;
+}
+
 function createAreas(
     chartElements: ChartElements,
     canvas: HTMLElement,
@@ -124,8 +173,7 @@ function renderMonthHeader(
     if (!renderInfo || !monthInfo) return;
 
     let curDatasetId = monthInfo.selectedDataset;
-    let datasetIds = monthInfo.dataset;
-    if (datasetIds.length === 0) return;
+    if (curDatasetId === null) return;
     let dataset = renderInfo.datasets.getDatasetById(curDatasetId);
     let datasetName = dataset.getName();
 
@@ -232,18 +280,19 @@ function renderMonthHeader(
         .attr("class", "tracker-month-title-rotator")
         .style("cursor", "pointer")
         .on("click", function (event: any) {
-            if (monthInfo.dataset.length <= 1) return;
-            // clear circles
-            clearSelection(chartElements, monthInfo);
             // show next target
-            let curDataset = monthInfo.selectedDataset + 1;
-            if (curDataset >= monthInfo.dataset.length) {
-                curDataset = 0;
+            if (toNextDataset(renderInfo, monthInfo)) {
+                // clear circles
+                clearSelection(chartElements, monthInfo);
+
+                refresh(
+                    canvas,
+                    chartElements,
+                    renderInfo,
+                    monthInfo,
+                    curMonthDate
+                );
             }
-            monthInfo.selectedDataset = curDataset;
-            // console.log(monthInfo.selectedDataset);
-
-            refresh(canvas, chartElements, renderInfo, monthInfo, curMonthDate);
         });
     chartElements["rotator"] = datasetRotator;
 
@@ -429,8 +478,7 @@ function renderMonthDays(
     if (!renderInfo || !monthInfo) return;
 
     let curDatasetId = monthInfo.selectedDataset;
-    let datasetIds = monthInfo.dataset;
-    if (datasetIds.length === 0) return;
+    if (curDatasetId === null) return;
     let dataset = renderInfo.datasets.getDatasetById(curDatasetId);
 
     let threshold = monthInfo.threshold[curDatasetId];
@@ -941,8 +989,25 @@ export function renderMonth(
 ) {
     // console.log("renderMonth");
     // console.log(renderInfo);
+    // console.log(monthInfo);
     if (!renderInfo || !renderMonth) return;
 
+    // dataset
+    let datasetIds = monthInfo.dataset;
+    let numAvailableDataset = 0;
+    for (let dataset of renderInfo.datasets) {
+        if (!dataset.getQuery().usedAsXDataset) {
+            numAvailableDataset++;
+        }
+    }
+    if (numAvailableDataset === 0) {
+        return "No available dataset found";
+    }
+    toNextDataset(renderInfo, monthInfo);
+    if (monthInfo.selectedDataset === null) {
+        return "No available dataset found";
+    }
+
     let chartElements: ChartElements = {};
     chartElements = createAreas(chartElements, canvas, renderInfo, monthInfo);
 
diff --git a/src/parsing.ts b/src/parsing.ts
index ab2bdde..1a22af7 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1689,9 +1689,7 @@ export function getRenderInfoFromYaml(
         if (retDataset.length === 0) {
             // insert y dataset given
             for (let q of queries) {
-                if (!q.usedAsXDataset) {
-                    retDataset.push(q.getId());
-                }
+                retDataset.push(q.getId());
             }
         }
         month.dataset = retDataset;

From 3cbc4ceed7751f17342ef22072faabe47b050a31 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 5 Jul 2021 19:26:20 +0800
Subject: [PATCH 118/402] Fix dataset ids for yMin/yMax/threshold in month view

---
 src/month.ts | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/month.ts b/src/month.ts
index edee9be..c1de582 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -175,6 +175,7 @@ function renderMonthHeader(
     let curDatasetId = monthInfo.selectedDataset;
     if (curDatasetId === null) return;
     let dataset = renderInfo.datasets.getDatasetById(curDatasetId);
+    if (!dataset) return;
     let datasetName = dataset.getName();
 
     let curMonth = curMonthDate.month(); // 0~11
@@ -480,8 +481,12 @@ function renderMonthDays(
     let curDatasetId = monthInfo.selectedDataset;
     if (curDatasetId === null) return;
     let dataset = renderInfo.datasets.getDatasetById(curDatasetId);
+    if (!dataset) return;
 
-    let threshold = monthInfo.threshold[curDatasetId];
+    let curDatasetIndex = monthInfo.dataset.findIndex((id) => {
+        return id === curDatasetId;
+    });
+    let threshold = monthInfo.threshold[curDatasetIndex];
 
     let curMonth = curMonthDate.month(); // 0~11
     let curDaysInMonth = curMonthDate.daysInMonth(); // 28~31
@@ -495,12 +500,12 @@ function renderMonthDays(
 
     // Get min and max
     let yMin = d3.min(dataset.getValues());
-    if (monthInfo.yMin[curDatasetId] !== null) {
-        yMin = monthInfo.yMin[curDatasetId];
+    if (monthInfo.yMin[curDatasetIndex] !== null) {
+        yMin = monthInfo.yMin[curDatasetIndex];
     }
     let yMax = d3.max(dataset.getValues());
-    if (monthInfo.yMax[curDatasetId] !== null) {
-        yMax = monthInfo.yMax[curDatasetId];
+    if (monthInfo.yMax[curDatasetIndex] !== null) {
+        yMax = monthInfo.yMax[curDatasetIndex];
     }
     // console.log(`yMin:${yMin}, yMax:${yMax}`);
     let allowScaledValue = true;
@@ -599,6 +604,9 @@ function renderMonthDays(
                 scaledValue = (curValue - yMin) / (yMax - yMin);
             }
         }
+        // console.log(yMin);
+        // console.log(yMax);
+        // console.log(scaledValue);
 
         // if (curDate.format("YYYY-MM-DD") === "2021-11-02") {
         //     logToConsole = true;
@@ -789,10 +797,13 @@ function renderMonthDays(
                         return circleColor;
                     }
                     if (d.scaledValue !== null) {
-                        return d3.interpolateLab(
+                        let scaledColor = d3.interpolateLab(
                             "white",
                             circleColor
                         )(d.scaledValue * 0.8 + 0.2);
+                        // console.log(d.scaledValue);
+                        // console.log(scaledColor);
+                        return scaledColor;
                     } else {
                         return circleColor;
                     }

From 4ff8debeb1e6d56b865da7ff806ca26210616449 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 5 Jul 2021 19:28:44 +0800
Subject: [PATCH 119/402] Set pie chart as 'under construction'

---
 src/pie.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pie.ts b/src/pie.ts
index f75460c..7c87286 100644
--- a/src/pie.ts
+++ b/src/pie.ts
@@ -158,6 +158,8 @@ export function renderPieChart(
     // console.log(renderInfo);
     if (!renderInfo || !pieInfo) return;
 
+    return "Under construction";
+    
     let chartElements: ChartElements = {};
     chartElements = createAreas(chartElements, canvas, renderInfo, pieInfo);
 

From 7538bae1c250593aa7859db8f643b846ec560a80 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 5 Jul 2021 19:29:29 +0800
Subject: [PATCH 120/402] Set version to 1.8.1

---
 manifest.json | 2 +-
 package.json  | 2 +-
 versions.json | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index 45ae5ed..bf29ef3 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-tracker",
 	"name": "Tracker",
-	"version": "1.8.0",
+	"version": "1.8.1",
 	"minAppVersion": "0.9.12",
 	"description": "A plugin tracks occurrences and numbers in your notes",
 	"author": "pyrochlore",
diff --git a/package.json b/package.json
index 926fa67..a8157c1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
diff --git a/versions.json b/versions.json
index f5188cd..4ce4220 100644
--- a/versions.json
+++ b/versions.json
@@ -13,5 +13,6 @@
 	"1.6.0": "0.9.12",
 	"1.6.1": "0.9.12",
 	"1.7.0": "0.9.12",
-	"1.8.0": "0.9.12"
+	"1.8.0": "0.9.12",
+	"1.8.1": "0.9.12"
 }

From e54a37a3eb741819294e03bdb196ce4c41f48363 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 5 Jul 2021 19:40:23 +0800
Subject: [PATCH 121/402] Update documents

---
 README.md            | 3 +++
 docs/ReleaseNotes.md | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 1534edd..e3a3745 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,9 @@ Version 1.8.0
     - Relative date input for `startDate` and `endDate` ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md#relative-date-input-for-startdate-and-enddate))
 - Fixed missing dvField values at the last line of files
 
+Version 1.8.1
+- Fixed bugs while using month view with parameter `xDataset`
+
 ## Usage
 1. Have some targets you want to track in daily notes.
 2. Add a new note for displaying the tracker.
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index 12bf337..2a8ffd6 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,5 +1,8 @@
 # Release Notes
 
+## v1.8.1
+- Fixed bugs while using month view with parameter `xDataset`
+
 ## v1.8.0
 - Add a new `searchType` `task`, retrieving data from tasks ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTask.md))
 - Enhancement

From 24a26e4f5631a6bcc85087defd9f65e4f926d3dc Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Wed, 7 Jul 2021 11:52:45 +0800
Subject: [PATCH 122/402] Fix data collecting for tasks while using multiple
 targets

---
 src/collecting.ts | 22 ++++++++++------------
 src/data.ts       | 12 ++----------
 src/main.ts       | 13 +++++++++++--
 src/parsing.ts    | 25 +++++--------------------
 4 files changed, 28 insertions(+), 44 deletions(-)

diff --git a/src/collecting.ts b/src/collecting.ts
index 0a6bdbc..080f1b4 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -219,20 +219,18 @@ export function getDateFromTask(
 ) {
     // console.log("getDateFromTask");
 
-    let subType = query.getSubType();
-    // console.log(subType);
-
     let date = window.moment("");
+    let searchType = query.getType();
+    // console.log(searchType);
 
     let strTextRegex = query.getTarget();
-    if (subType === "all") {
+    if (searchType === SearchType.Task) {
         strTextRegex = "\\[[\\sx]\\]\\s" + strTextRegex;
-    } else if (subType === "done") {
+    } else if (searchType === SearchType.TaskDone) {
         strTextRegex = "\\[x\\]\\s" + strTextRegex;
-    } else if (subType === "notdone") {
+    } else if (searchType === SearchType.TaskNotDone) {
         strTextRegex = "\\[\\s\\]\\s" + strTextRegex;
     } else {
-        // all
         strTextRegex = "\\[[\\sx]\\]\\s" + strTextRegex;
     }
     // console.log(strTextRegex);
@@ -712,15 +710,15 @@ export function collectDataFromTask(
     dataMap: DataMap,
     xValueMap: XValueMap
 ) {
-    let subType = query.getSubType();
-    // console.log(subType);
+    let searchType = query.getType();
+    // console.log(searchType);
 
     let strTextRegex = query.getTarget();
-    if (subType === "all") {
+    if (searchType === SearchType.Task) {
         strTextRegex = "\\[[\\sx]\\]\\s" + strTextRegex;
-    } else if (subType === "done") {
+    } else if (searchType === SearchType.TaskDone) {
         strTextRegex = "\\[x\\]\\s" + strTextRegex;
-    } else if (subType === "notdone") {
+    } else if (searchType === SearchType.TaskNotDone) {
         strTextRegex = "\\[\\s\\]\\s" + strTextRegex;
     } else {
         // all
diff --git a/src/data.ts b/src/data.ts
index 09ad176..11f865e 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -9,6 +9,8 @@ export enum SearchType {
     Table,
     FileMeta,
     Task,
+    TaskDone,
+    TaskNotDone,
 }
 
 export enum OutputType {
@@ -45,7 +47,6 @@ export class DataPoint {
 
 export class Query {
     private type: SearchType | null;
-    private subType: string;
     private target: string;
     private parentTarget: string | null;
     private separator: string; // multiple value separator
@@ -60,7 +61,6 @@ export class Query {
 
     constructor(id: number, searchType: SearchType, searchTarget: string) {
         this.type = searchType;
-        this.subType = "";
         this.target = searchTarget;
         this.separator = "/";
         this.id = id;
@@ -137,14 +137,6 @@ export class Query {
         return this.type;
     }
 
-    public getSubType() {
-        return this.subType;
-    }
-
-    public setSubType(subType: string) {
-        this.subType = subType;
-    }
-
     public getTarget() {
         return this.target;
     }
diff --git a/src/main.ts b/src/main.ts
index 19f23ef..ba09ace 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -188,7 +188,9 @@ export default class Tracker extends Plugin {
                     type === SearchType.Tag ||
                     type === SearchType.Text ||
                     type === SearchType.dvField ||
-                    type === SearchType.Task
+                    type === SearchType.Task ||
+                    type === SearchType.TaskDone ||
+                    type === SearchType.TaskNotDone
                 ) {
                     return true;
                 } else if (type === SearchType.FileMeta) {
@@ -260,6 +262,8 @@ export default class Tracker extends Plugin {
                                 );
                                 break;
                             case SearchType.Task:
+                            case SearchType.TaskDone:
+                            case SearchType.TaskNotDone:
                                 xDate = collecting.getDateFromTask(
                                     content,
                                     xDatasetQuery,
@@ -406,7 +410,12 @@ export default class Tracker extends Plugin {
                 } // search dvField
 
                 // console.log("Search Task");
-                if (content && query.getType() === SearchType.Task) {
+                if (
+                    content &&
+                    (query.getType() === SearchType.Task ||
+                        query.getType() === SearchType.TaskDone ||
+                        query.getType() === SearchType.TaskNotDone)
+                ) {
                     collecting.collectDataFromTask(
                         content,
                         query,
diff --git a/src/parsing.ts b/src/parsing.ts
index 1a22af7..c4f8d96 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -871,7 +871,6 @@ export function getRenderInfoFromYaml(
         return errorMessage;
     }
     let searchType: Array<SearchType> = [];
-    let searchSubType: Array<string> = [];
     let retSearchType = getStringArrayFromInput(
         "searchType",
         yaml.searchType,
@@ -884,50 +883,39 @@ export function getRenderInfoFromYaml(
         return retSearchType; // errorMessage
     }
     for (let strType of retSearchType) {
-        switch (strType) {
+        switch (strType.toLowerCase()) {
             case "tag":
                 searchType.push(SearchType.Tag);
-                searchSubType.push("");
                 break;
             case "frontmatter":
                 searchType.push(SearchType.Frontmatter);
-                searchSubType.push("");
                 break;
             case "wiki":
                 searchType.push(SearchType.Wiki);
-                searchSubType.push("");
                 break;
             case "text":
                 searchType.push(SearchType.Text);
-                searchSubType.push("");
                 break;
-            case "dvField":
+            case "dvfield":
                 searchType.push(SearchType.dvField);
-                searchSubType.push("");
                 break;
             case "table":
                 searchType.push(SearchType.Table);
-                searchSubType.push("");
                 break;
-            case "fileMeta":
+            case "filemeta":
                 searchType.push(SearchType.FileMeta);
-                searchSubType.push("");
                 break;
             case "task":
                 searchType.push(SearchType.Task);
-                searchSubType.push("all");
                 break;
             case "task.all":
                 searchType.push(SearchType.Task);
-                searchSubType.push("all");
                 break;
             case "task.done":
-                searchType.push(SearchType.Task);
-                searchSubType.push("done");
+                searchType.push(SearchType.TaskDone);
                 break;
             case "task.notdone":
-                searchType.push(SearchType.Task);
-                searchSubType.push("notdone");
+                searchType.push(SearchType.TaskNotDone);
                 break;
         }
     }
@@ -991,9 +979,6 @@ export function getRenderInfoFromYaml(
             searchTarget[ind]
         );
         query.setSeparator(multipleValueSparator[ind]);
-        if (searchSubType[ind] !== "") {
-            query.setSubType(searchSubType[ind]);
-        }
         if (xDataset.includes(ind)) query.usedAsXDataset = true;
         queries.push(query);
     }

From 3d5995f4c73c8957374767f29e32de8d747866ac Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 10 Jul 2021 12:11:44 +0800
Subject: [PATCH 123/402] Set version 1.8.2

---
 manifest.json | 2 +-
 package.json  | 2 +-
 versions.json | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index bf29ef3..5ee61fa 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-tracker",
 	"name": "Tracker",
-	"version": "1.8.1",
+	"version": "1.8.2",
 	"minAppVersion": "0.9.12",
 	"description": "A plugin tracks occurrences and numbers in your notes",
 	"author": "pyrochlore",
diff --git a/package.json b/package.json
index a8157c1..0b7b9c5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
diff --git a/versions.json b/versions.json
index 4ce4220..28f318c 100644
--- a/versions.json
+++ b/versions.json
@@ -14,5 +14,6 @@
 	"1.6.1": "0.9.12",
 	"1.7.0": "0.9.12",
 	"1.8.0": "0.9.12",
-	"1.8.1": "0.9.12"
+	"1.8.1": "0.9.12",
+	"1.8.2": "0.9.12"
 }

From 397f01013463a4c8d29911529205c9cc4e761886 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 10 Jul 2021 12:24:16 +0800
Subject: [PATCH 124/402] Update TestTask.md

---
 examples/TestTask.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/examples/TestTask.md b/examples/TestTask.md
index 54fd0c5..06c115d 100644
--- a/examples/TestTask.md
+++ b/examples/TestTask.md
@@ -48,6 +48,20 @@ searchType: task.done
 searchTarget: Say I love you
 folder: diary
 datasetName: Love
+month:
+    color: tomato
+    headerMonthColor: orange
+    todayRingColor: orange
+    selectedRingColor: steelblue
+    showSelectedValue: false
+```
+
+task.done and task.notdone
+``` tracker
+searchType: task.done, task.notdone
+searchTarget: Say I love you, Say I love you
+folder: diary
+datasetName: Good Lover, Bad Lover
 month:
     color: tomato
     headerMonthColor: orange

From 20fce7306c0948d4e24b3575761d2256c574f5a1 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 10 Jul 2021 12:24:28 +0800
Subject: [PATCH 125/402] Update documents

---
 README.md            | 3 +++
 docs/ReleaseNotes.md | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/README.md b/README.md
index e3a3745..9bf79c7 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,9 @@ Version 1.8.0
 Version 1.8.1
 - Fixed bugs while using month view with parameter `xDataset`
 
+Version 1.8.2
+- Fixed tasks searching not working for multiple targets
+
 ## Usage
 1. Have some targets you want to track in daily notes.
 2. Add a new note for displaying the tracker.
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index 2a8ffd6..ca3ecea 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,5 +1,8 @@
 # Release Notes
 
+## v1.8.2
+- Fixed tasks searching not working for multiple targets
+
 ## v1.8.1
 - Fixed bugs while using month view with parameter `xDataset`
 

From 7ef214545e0fe7dfb88f88956d1ae7c775d8ba4c Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 12 Jul 2021 12:07:16 +0800
Subject: [PATCH 126/402] Fix error messages from table input while the file
 not exists

---
 src/main.ts | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/main.ts b/src/main.ts
index ba09ace..0dd2f2d 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -434,10 +434,20 @@ export default class Tracker extends Plugin {
         let tableQueries = renderInfo.queries.filter(
             (q) => q.getType() === SearchType.Table
         );
+        // console.log(tableQueries);
         // Separate queries by tables and xDatasets/yDatasets
         let tables: Array<TableData> = [];
+        let tableFileNotFound = false;
         for (let query of tableQueries) {
             let filePath = query.getParentTarget();
+            let file = this.app.vault.getAbstractFileByPath(
+                normalizePath(filePath + ".md")
+            );
+            if (!file || !(file instanceof TFile)) {
+                tableFileNotFound = true;
+                break;
+            }
+
             let tableIndex = query.getAccessor();
             let isX = query.usedAsXDataset;
 
@@ -462,9 +472,19 @@ export default class Tracker extends Plugin {
         }
         // console.log(tables);
 
+        if (tableFileNotFound) {
+            let errorMessage = "File containing tables not found";
+            renderErrorMessage(canvas, errorMessage);
+            el.appendChild(canvas);
+            return;
+        }
+
         for (let tableData of tables) {
             //extract xDataset from query
             let xDatasetQuery = tableData.xDataset;
+            if (!xDatasetQuery) {// missing xDataset
+                continue;
+            }
             let yDatasetQueries = tableData.yDatasets;
             let filePath = xDatasetQuery.getParentTarget();
             let tableIndex = xDatasetQuery.getAccessor();

From 5b55dac13f1363ffc820e34e0a46232cd7908a59 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 8 Jul 2021 19:20:10 +0800
Subject: [PATCH 127/402] Parse expression using jsep; Remove expression-eval;

---
 examples/BloodPressureTracker.md  |   2 +-
 examples/ErrorMessages.md         |   5 +-
 examples/HabitTracker.md          |   4 +-
 examples/StarTracker.md           |   2 +-
 examples/TestBullet.md            |   4 +-
 examples/TestCalendar.md          |   2 +-
 examples/TestPieChart.md          |  57 +++++-
 examples/TestTask.md              |   8 +-
 examples/TestTemplateVariables.md | 100 +++++-----
 examples/TestWordCounting.md      |   6 +-
 examples/TrackUsingRegex.md       |   2 +-
 examples/WeightTracker.md         |   2 +-
 package.json                      |   2 +-
 src/bullet.ts                     |   9 +-
 src/expr.ts                       | 304 +++++++++++++++---------------
 src/pie.ts                        |  23 ++-
 src/summary.ts                    |   1 +
 17 files changed, 296 insertions(+), 237 deletions(-)

diff --git a/examples/BloodPressureTracker.md b/examples/BloodPressureTracker.md
index d198b77..4ac34a8 100644
--- a/examples/BloodPressureTracker.md
+++ b/examples/BloodPressureTracker.md
@@ -26,7 +26,7 @@ folder: diary
 startDate: 2021-01-01
 endDate: 2021-01-31
 summary:
-    template: "Average: {{average(Dataset(0))}}/{{average(Dataset(1))}}\nAverage: {{average(Dataset(systolic))}}/{{average(Dataset(diastolic))}}"
+    template: "Average: {{average(dataset(0))}}/{{average(dataset(1))}}\nAverage: {{average(dataset(systolic))}}/{{average(dataset(diastolic))}}"
 ```
 
 
diff --git a/examples/ErrorMessages.md b/examples/ErrorMessages.md
index 29afea7..6c36823 100644
--- a/examples/ErrorMessages.md
+++ b/examples/ErrorMessages.md
@@ -139,4 +139,7 @@ line:
 ```
 
 
-Please also check those search targets in markdown files under folder 'diary' and 'data'.
\ No newline at end of file
+Please also check those search targets in markdown files under folder 'diary' and 'data'.
+
+## Expression
+TODO
\ No newline at end of file
diff --git a/examples/HabitTracker.md b/examples/HabitTracker.md
index b517eed..568d2c2 100644
--- a/examples/HabitTracker.md
+++ b/examples/HabitTracker.md
@@ -41,7 +41,7 @@ searchType: tag
 searchTarget: meditation
 folder: diary
 summary:
-    template: "Longest Streak: {{maxStreak}} day(s)\nLongest Breaks: {{maxBreaks}} day(s)\nLast streak: {{currentStreak}} day(s)"
+    template: "Longest Streak: {{maxStreak()}} day(s)\nLongest Breaks: {{maxBreaks()}} day(s)\nLast streak: {{currentStreak()}} day(s)"
 ```
 
 ### CleanUp
@@ -51,7 +51,7 @@ searchTarget: clean-up
 folder: diary
 endDate: 2021-01-31
 summary:
-    template: "Last Break: {{currentBreaks}} day(s)"
+    template: "Last Break: {{currentBreaks()}} day(s)"
 ```
 
 ### Work log
diff --git a/examples/StarTracker.md b/examples/StarTracker.md
index 994ce45..41bdb34 100644
--- a/examples/StarTracker.md
+++ b/examples/StarTracker.md
@@ -6,7 +6,7 @@ searchType: text
 searchTarget: ⭐
 folder: diary
 summary:
-    template: "I have {{sum}} stars in total."
+    template: "I have {{sum()}} stars in total."
     style: "font-size:20px;color:yellow;margin-left: 50px;margin-top:00px;"
 ```
 
diff --git a/examples/TestBullet.md b/examples/TestBullet.md
index 733e1f6..b71fee4 100644
--- a/examples/TestBullet.md
+++ b/examples/TestBullet.md
@@ -12,7 +12,7 @@ bullet:
     orientation: horizontal
 	range: 10, 20, 40
 	rangeColor: darkgray, silver, lightgray
-	value: "{{currentBreaks}}"
+	value: "{{currentBreaks()}}"
 	valueUnit: times
 	valueColor: '#69b3a2'
 	showMarker: true
@@ -32,7 +32,7 @@ bullet:
     orientation: vertical
 	range: 30, 60, 100
 	rangeColor: darkgray, silver, lightgray
-	value: "{{sum}}"
+	value: "{{sum()}}"
 	valueUnit: times
 	valueColor: steelblue
 	showMarker: true
diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
index 4388305..a58ab08 100644
--- a/examples/TestCalendar.md
+++ b/examples/TestCalendar.md
@@ -69,7 +69,7 @@ month:
 searchType: tag
 searchTarget: exercise-pushup
 summary:
-    template: "minDate: {{minDate}}\nminValue: {{min}}\nmaxDate: {{maxDate}}\nmaxValue: {{max}}"
+    template: "minDate: {{minDate()}}\nminValue: {{min()}}\nmaxDate: {{maxDate()}}\nmaxValue: {{max()}}"
 ```
 
 ## Multiple targets
diff --git a/examples/TestPieChart.md b/examples/TestPieChart.md
index 084e43e..16f3e14 100644
--- a/examples/TestPieChart.md
+++ b/examples/TestPieChart.md
@@ -1,12 +1,65 @@
 # Test Pie Chart
 
+## Manual Input Data
+### Numbers
+To be fixed,
+If numeric data not wrapped by single quotes
+``` tracker
+searchType: task.done, task.notdone
+searchTarget: Say I love you, Say I love you
+pie:
+    title: Pie
+    data: '2, 4, 6, 8, 10'
+    dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
+    ratioInnerRadius: 0.5
+```
+
+### Expression
+To be fixed,
+If numeric data not wrapped by single quotes
+2,4,6,8,10
+????? errro?????
+``` tracker
+searchType: task.done, task.notdone
+searchTarget: Say I love you, Say I love you
+pie:
+    title: Pie
+    data: '{{1 + 1}}, {{2 * 2}}, {{12/ 2}}, {{1+(2+3*2)-1}}, {{27%17}}'
+    dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
+    ratioInnerRadius: 0.5
+```
+
+## Data from Notes
+``` tracker
+searchType: task.done, task.notdone
+searchTarget: Say I love you, Say I love you
+folder: diary
+pie:
+    title: Pie
+    data: '{{sum(0)}},{{sum(1)}}'
+    dataColor: '#4daf4a,#377eb8'
+    ratioInnerRadius: 0.5
+```
+
+
+``` tracker
+searchType: task.done, task.notdone
+searchTarget: Say I love you, Say I love you
+folder: diary
+summary:
+    template: "How many days I said love: {{sum(0)}}\nHow many days I didn't say love: {{sum(1)}}"
+```
+
+
+<!--
 ``` tracker
 searchType: tag
-searchTarget: meditation
+searchTarget: meditation, exercise-pushup, exercise-plank
 pie:
     title: Pie
-    data: '{{sum}}*1,{{sum}}*2,{{sum}}*3,{{sum}}*4,{{sum}}*5'
+    data: '{{sum(0)}},{{sum(1)}},{{sum()}}*3,{{sum()}}*4,{{sum()}}*5'
     dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
     ratioInnerRadius: 0.5
 ```
 
+
diff --git a/examples/TestTask.md b/examples/TestTask.md
index 06c115d..a253698 100644
--- a/examples/TestTask.md
+++ b/examples/TestTask.md
@@ -8,7 +8,7 @@ searchType: task
 searchTarget: Say I love you
 folder: diary
 summary:
-    template: "Total count: {{sum}}"
+    template: "Total count: {{sum()}}"
 ```
 
 ### All Tasks
@@ -18,7 +18,7 @@ searchType: task.all
 searchTarget: Say I love you
 folder: diary
 summary:
-    template: "Total count: {{sum}}"
+    template: "Total count: {{sum()}}"
 ```
 
 ### Task Done
@@ -28,7 +28,7 @@ searchType: task.done
 searchTarget: Say I love you
 folder: diary
 summary:
-    template: "How many days I said: {{sum}}"
+    template: "How many days I said: {{sum()}}"
 ```
 
 ### Task Not Done
@@ -38,7 +38,7 @@ searchType: task.notdone
 searchTarget: Say I love you
 folder: diary
 summary:
-    template: "How many days I didn't say: {{sum}}"
+    template: "How many days I didn't say: {{sum()}}"
 ```
 
 ## Month View
diff --git a/examples/TestTemplateVariables.md b/examples/TestTemplateVariables.md
index 995bc51..62d03d3 100644
--- a/examples/TestTemplateVariables.md
+++ b/examples/TestTemplateVariables.md
@@ -1,226 +1,226 @@
 # Test Template Variables
 
-### {{min}}
+### {{min()}}
 ``` tracker
 searchType: dvField
 searchTarget: dataviewTarget
 folder: /diary
 endDate: 2021-01-03
 summary:
-    template: 'Minimum value: {{min}} <-- should be 12'
+    template: 'Minimum value: {{min()}} <-- should be 12'
 ```
 
-### {{minDate}}
+### {{minDate()}}
 ``` tracker
 searchType: dvField
 searchTarget: dataviewTarget
 folder: /diary
 endDate: 2021-01-03
 summary:
-    template: 'Latest date of minimum value: {{minDate}} <-- should be 2021-01-03'
+    template: 'Latest date of minimum value: {{minDate()}} <-- should be 2021-01-03'
 ```
 
-### {{max}}
+### {{max()}}
 ``` tracker
 searchType: dvField
 searchTarget: dataviewTarget
 folder: /diary
 endDate: 2021-01-03
 summary:
-    template: 'Maximum value: {{max}} <-- should be 48'
+    template: 'Maximum value: {{max()}} <-- should be 48'
 ```
 
-### {{maxDate}}
+### {{maxDate()}}
 ``` tracker
 searchType: dvField
 searchTarget: dataviewTarget
 folder: /diary
 endDate: 2021-01-03
 summary:
-    template: 'Latest date of maximum value: {{maxDate}} <-- should be 2021-01-01'
+    template: 'Latest date of maximum value: {{maxDate()}} <-- should be 2021-01-01'
 ```
 
-### {{startDate}}
+### {{startDate()}}
 ``` tracker
 searchType: dvField
 searchTarget: dataviewTarget
 folder: /diary
 endDate: 2021-01-03
 summary:
-    template: 'Start date: {{startDate}} <-- should be 2021-01-01'
+    template: 'Start date: {{startDate()}} <-- should be 2021-01-01'
 ```
 
-### {{endDate}}
+### {{endDate()}}
 ``` tracker
 searchType: dvField
 searchTarget: dataviewTarget
 folder: /diary
 endDate: 2021-01-03
 summary:
-    template: 'End date: {{endDate}} <-- should be 2021-01-03'
+    template: 'End date: {{endDate()}} <-- should be 2021-01-03'
 ```
 
-### {{sum}}
+### {{sum()}}
 ``` tracker
 searchType: tag
 searchTarget: meditation
 folder: /diary
 endDate: 2021-01-04
 summary:
-    template: 'Sum: {{sum}} <-- should be 3'
+    template: 'Sum: {{sum()}} <-- should be 3'
 ```
 
-### {{numTargets}}
+### {{numTargets()}}
 ``` tracker
 searchType: tag
 searchTarget: meditation
 folder: /diary
 endDate: 2021-01-04
 summary:
-    template: 'Number of targets: {{numTargets}} <-- should be 3'
+    template: 'Number of targets: {{numTargets()}} <-- should be 3'
 ```
 
-### {{numDays}}
+### {{numDays()}}
 ``` tracker
 searchType: tag
 searchTarget: meditation
 folder: /diary
 endDate: 2021-01-04
 summary:
-    template: 'Number of days: {{numDays}} <-- should be 4'
+    template: 'Number of days: {{numDays()}} <-- should be 4'
 ```
 
-### {{numDaysHavingData}}
+### {{numDaysHavingData()}}
 ``` tracker
 searchType: tag
 searchTarget: meditation
 folder: /diary
 endDate: 2021-01-04
 summary:
-    template: 'Number of days having data: {{numDaysHavingData}} <-- should be 3'
+    template: 'Number of days having data: {{numDaysHavingData()}} <-- should be 3'
 ```
 
-### {{maxStreak}}
+### {{maxStreak()}}
 ``` tracker
 searchType: tag
 searchTarget: meditation
 folder: /diary
 endDate: 2021-01-09
 summary:
-    template: 'Maximum streak: {{maxStreak}} <-- should be 5'
+    template: 'Maximum streak: {{maxStreak()}} <-- should be 5'
 ```
 
-### {{maxStreakStart}}
+### {{maxStreakStart()}}
 ``` tracker
 searchType: tag
 searchTarget: meditation
 folder: /diary
 endDate: 2021-01-09
 summary:
-    template: 'The start date of maximum streak: {{maxStreakStart}} <-- should be 2021-01-02'
+    template: 'The start date of maximum streak: {{maxStreakStart()}} <-- should be 2021-01-02'
 ```
 
-### {{maxStreakEnd}}
+### {{maxStreakEnd()}}
 ``` tracker
 searchType: tag
 searchTarget: meditation
 folder: /diary
 endDate: 2021-01-09
 summary:
-    template: 'The end date of maximum streak: {{maxStreakEnd}} <-- should be 2021-01-06'
+    template: 'The end date of maximum streak: {{maxStreakEnd()}} <-- should be 2021-01-06'
 ```
 
-### {{maxBreaks}}
+### {{maxBreaks()}}
 ``` tracker
 searchType: tag
 searchTarget: meditation
 folder: /diary
 endDate: 2021-01-09
 summary:
-    template: 'Maximum breaks: {{maxBreaks}} <-- should be 2'
+    template: 'Maximum breaks: {{maxBreaks()}} <-- should be 2'
 ```
 
-### {{maxBreaksStart}}
+### {{maxBreaksStart()}}
 ``` tracker
 searchType: tag
 searchTarget: meditation
 folder: /diary
 endDate: 2021-01-09
 summary:
-    template: 'The start date of maximum breaks: {{maxBreaksStart}} <-- should be 2021-01-07'
+    template: 'The start date of maximum breaks: {{maxBreaksStart()}} <-- should be 2021-01-07'
 ```
 
-### {{maxBreaksEnd}}
+### {{maxBreaksEnd()}}
 ``` tracker
 searchType: tag
 searchTarget: meditation
 folder: /diary
 endDate: 2021-01-09
 summary:
-    template: 'The end date of maximum breaks: {{maxBreaksEnd}} <-- should be 2021-01-08'
+    template: 'The end date of maximum breaks: {{maxBreaksEnd()}} <-- should be 2021-01-08'
 ```
 
-### {{currentStreak}}
+### {{currentStreak()}}
 ``` tracker
 searchType: tag
 searchTarget: meditation
 folder: /diary
 endDate: 2021-01-24
 summary:
-    template: 'Latest streak: {{currentStreak}} <-- should be 1'
+    template: 'Latest streak: {{currentStreak()}} <-- should be 1'
 ```
 
-### {{currentStreakStart}}
+### {{currentStreakStart()}}
 ``` tracker
 searchType: tag
 searchTarget: meditation
 folder: /diary
 endDate: 2021-01-24
 summary:
-    template: 'The start date of current streak: {{currentStreakStart}} <-- should be 2021-01-24'
+    template: 'The start date of current streak: {{currentStreakStart()}} <-- should be 2021-01-24'
 ```
 
-### {{currentStreakEnd}}
+### {{currentStreakEnd()}}
 ``` tracker
 searchType: tag
 searchTarget: meditation
 folder: /diary
 endDate: 2021-01-24
 summary:
-    template: 'The end date of current streak: {{currentStreakEnd}} <-- should be 2021-01-24'
+    template: 'The end date of current streak: {{currentStreakEnd()}} <-- should be 2021-01-24'
 ```
 
-### {{currentBreaks}}
+### {{currentBreaks()}}
 ``` tracker
 searchType: tag
 searchTarget: meditation
 folder: /diary
 endDate: 2021-01-22
 summary:
-    template: 'Current breaks: {{currentBreaks}} <-- should be 1'
+    template: 'Current breaks: {{currentBreaks()}} <-- should be 1'
 ```
 
-### {{currentBreaksStart}}
+### {{currentBreaksStart()}}
 ``` tracker
 searchType: tag
 searchTarget: meditation
 folder: /diary
 endDate: 2021-01-22
 summary:
-    template: 'The start date of current breaks: {{currentBreaksStart}} <-- should be 2021-01-22'
+    template: 'The start date of current breaks: {{currentBreaksStart()}} <-- should be 2021-01-22'
 ```
 
-### {{currentBreaksEnd}}
+### {{currentBreaksEnd()}}
 ``` tracker
 searchType: tag
 searchTarget: meditation
 folder: /diary
 endDate: 2021-01-22
 summary:
-    template: 'The end date of current breaks: {{currentBreaksEnd}} <-- should be 2021-01-22'
+    template: 'The end date of current breaks: {{currentBreaksEnd()}} <-- should be 2021-01-22'
 ```
 
-### {{average}}
+### {{average()}}
 (48+25+12)/3 = 28.33
 ``` tracker
 searchType: dvField
@@ -228,20 +228,20 @@ searchTarget: dataviewTarget
 folder: /diary
 endDate: 2021-01-03
 summary:
-    template: 'Average value: {{average}} <-- should be 28.33'
+    template: 'Average value: {{average()}} <-- should be 28.33'
 ```
 
-### {{median}}
+### {{median()}}
 ``` tracker
 searchType: dvField
 searchTarget: dataviewTarget
 folder: /diary
 endDate: 2021-01-03
 summary:
-    template: 'Median value: {{median}} <-- should be 25'
+    template: 'Median value: {{median()}} <-- should be 25'
 ```
 
-### {{variance}}
+### {{variance()}}
 https://mathworld.wolfram.com/SampleVariance.html
 ``` tracker
 searchType: dvField
@@ -249,5 +249,5 @@ searchTarget: dataviewTarget
 folder: /diary
 endDate: 2021-01-03
 summary:
-    template: 'Variance value: {{variance}} <-- should be 332.33'
+    template: 'Variance value: {{variance()}} <-- should be 332.33'
 ```
diff --git a/examples/TestWordCounting.md b/examples/TestWordCounting.md
index f08531f..ab56d51 100644
--- a/examples/TestWordCounting.md
+++ b/examples/TestWordCounting.md
@@ -24,7 +24,7 @@ folder: diary
 startDate: 2021-01-01
 endDate: 2021-01-05
 summary:
-    template: 'Total number of words: {{sum}}'
+    template: 'Total number of words: {{sum()}}'
 ```
 
 ``` tracker
@@ -34,7 +34,7 @@ folder: diary
 startDate: 2021-01-01
 endDate: 2021-01-05
 summary:
-    template: 'Total number of characters: {{sum}}'
+    template: 'Total number of characters: {{sum()}}'
 ```
 
 ## Word counts of any notes
@@ -45,6 +45,6 @@ searchTarget: cDate, numWords
 xDataset: 0
 folder: /
 summary:
-    template: "Total word count: {{sum(Dataset(1))}}"
+    template: "Total word count: {{sum(1)}}"
 ```
 
diff --git a/examples/TrackUsingRegex.md b/examples/TrackUsingRegex.md
index 863bb94..22471ec 100644
--- a/examples/TrackUsingRegex.md
+++ b/examples/TrackUsingRegex.md
@@ -27,7 +27,7 @@ folder: diary
 startDate: 2021-01-01
 endDate: 2021-01-31
 summary:
-    template: "Total number of emails found: {{sum}}"
+    template: "Total number of emails found: {{sum()}}"
     style: "font-size:20px;color:red;margin-left: 50px;margin-top:00px;"
 ```
 
diff --git a/examples/WeightTracker.md b/examples/WeightTracker.md
index b38e072..0c1f671 100644
--- a/examples/WeightTracker.md
+++ b/examples/WeightTracker.md
@@ -19,7 +19,7 @@ searchType: tag
 searchTarget: weight
 folder: diary
 summary:
-  template: "Minimum: {{min}}kg\nMaximum: {{max}}kg\nMedian: {{median}}kg\nAverage: {{average}}kg"
+  template: "Minimum: {{min()}}kg\nMaximum: {{max()}}kg\nMedian: {{median()}}kg\nAverage: {{average()}}kg"
 ```
 
 ``` tracker
diff --git a/package.json b/package.json
index 0b7b9c5..fabf406 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
   "dependencies": {
     "d3": "^6.5.0",
     "d3-interpolate": "^3.0.1",
-    "expression-eval": "^5.0.0",
+    "jsep": "^0.4.0",
     "obsidian-daily-notes-interface": "^0.9.1"
   }
 }
diff --git a/src/bullet.ts b/src/bullet.ts
index 4bbc8a5..9581ba1 100644
--- a/src/bullet.ts
+++ b/src/bullet.ts
@@ -450,9 +450,12 @@ function renderBar(
 
     if (!renderInfo || !bulletInfo) return;
 
-    let retActualValue = bulletInfo.value;
-    retActualValue = expr.resolveTemplate(retActualValue, renderInfo);
-    let actualValue = parseFloat(retActualValue);
+    let retActualValue = expr.resolveValue(bulletInfo.value, renderInfo);
+    // console.log(retActualValue);
+    if (typeof retActualValue === "string") {
+        return retActualValue;
+    }
+    let actualValue = retActualValue;
     if (Number.isNaN(actualValue)) {
         errorMessage = "Invalid input value: " + retActualValue;
         return errorMessage;
diff --git a/src/expr.ts b/src/expr.ts
index dbb9d86..c0640bb 100644
--- a/src/expr.ts
+++ b/src/expr.ts
@@ -1,17 +1,32 @@
-import { RenderInfo } from "./data";
+import { RenderInfo, Dataset } from "./data";
 import * as d3 from "d3";
 import { Moment } from "moment";
 import * as helper from "./helper";
-import { parse, eval as evaluate } from "expression-eval";
+import jsep from "jsep";
 
-let fnSet = {
+// Function accept datasetId as first argument
+type FnDatasetId = (
+    datasetId: number,
+    renderInfo: RenderInfo
+) => number | string;
+type FnBinaryOp = (a: number, b: number) => number;
+
+interface FnMapDatasetId {
+    [key: string]: FnDatasetId;
+}
+
+interface FnMapBinaryOp {
+    [key: string]: FnBinaryOp;
+}
+
+const fnMapDatasetId: FnMapDatasetId = {
     // min value of a dataset
-    min: function (renderInfo: RenderInfo, datasetId: number) {
+    min: function (datasetId: number, renderInfo: RenderInfo) {
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
         return d3.min(dataset.getValues());
     },
     // the latest date with min value
-    minDate: function (renderInfo: RenderInfo, datasetId: number) {
+    minDate: function (datasetId: number, renderInfo: RenderInfo) {
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
         let min = d3.min(dataset.getValues());
         if (Number.isNumber(min)) {
@@ -28,12 +43,12 @@ let fnSet = {
         return "min not found";
     },
     // max value of a dataset
-    max: function (renderInfo: RenderInfo, datasetId: number) {
+    max: function (datasetId: number, renderInfo: RenderInfo) {
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
         return d3.max(dataset.getValues());
     },
     // the latest date with max value
-    maxDate: function (renderInfo: RenderInfo, datasetId: number) {
+    maxDate: function (datasetId: number, renderInfo: RenderInfo) {
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
         let max = d3.max(dataset.getValues());
         if (Number.isNumber(max)) {
@@ -51,7 +66,7 @@ let fnSet = {
     },
     // start date of a dataset
     // if datasetId not found, return overall startDate
-    startDate: function (renderInfo: RenderInfo, datasetId: number) {
+    startDate: function (datasetId: number, renderInfo: RenderInfo) {
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
         if (dataset) {
             let startDate = dataset.getStartDate();
@@ -63,7 +78,7 @@ let fnSet = {
     },
     // end date of a dataset
     // if datasetId not found, return overall endDate
-    endDate: function (renderInfo: RenderInfo, datasetId: number) {
+    endDate: function (datasetId: number, renderInfo: RenderInfo) {
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
         if (dataset) {
             let endDate = dataset.getEndDate();
@@ -74,30 +89,30 @@ let fnSet = {
         return helper.dateToStr(renderInfo.endDate, renderInfo.dateFormat);
     },
     // sum of all values in a dataset
-    sum: function (renderInfo: RenderInfo, datasetId: number) {
+    sum: function (datasetId: number, renderInfo: RenderInfo) {
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
         return d3.sum(dataset.getValues());
     },
-    count: function (renderInfo: RenderInfo, datasetId: number) {
+    count: function (datasetId: number, renderInfo: RenderInfo) {
         return "deprecated template variable 'count'";
     },
     // number of occurrences of a target in a dataset
-    numTargets: function (renderInfo: RenderInfo, datasetId: number) {
+    numTargets: function (datasetId: number, renderInfo: RenderInfo) {
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
         return dataset.getNumTargets();
     },
-    days: function (renderInfo: RenderInfo, datasetId: number) {
+    days: function (datasetId: number, renderInfo: RenderInfo) {
         return "deprecated template variable 'days'";
     },
-    numDays: function (renderInfo: RenderInfo, datasetId: number) {
+    numDays: function (datasetId: number, renderInfo: RenderInfo) {
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
         return dataset.getLength();
     },
-    numDaysHavingData: function (renderInfo: RenderInfo, datasetId: number) {
+    numDaysHavingData: function (datasetId: number, renderInfo: RenderInfo) {
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
         return dataset.getLengthNotNull();
     },
-    maxStreak: function (renderInfo: RenderInfo, datasetId: number) {
+    maxStreak: function (datasetId: number, renderInfo: RenderInfo) {
         let streak = 0;
         let maxStreak = 0;
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
@@ -113,7 +128,7 @@ let fnSet = {
         }
         return maxStreak;
     },
-    maxStreakStart: function (renderInfo: RenderInfo, datasetId: number) {
+    maxStreakStart: function (datasetId: number, renderInfo: RenderInfo) {
         let streak = 0;
         let maxStreak = 0;
         let streakStart: Moment = null;
@@ -137,7 +152,7 @@ let fnSet = {
         }
         return helper.dateToStr(maxStreakStart, renderInfo.dateFormat);
     },
-    maxStreakEnd: function (renderInfo: RenderInfo, datasetId: number) {
+    maxStreakEnd: function (datasetId: number, renderInfo: RenderInfo) {
         let streak = 0;
         let maxStreak = 0;
         let streakEnd: Moment = null;
@@ -169,7 +184,7 @@ let fnSet = {
         }
         return helper.dateToStr(maxStreakEnd, renderInfo.dateFormat);
     },
-    maxBreaks: function (renderInfo: RenderInfo, datasetId: number) {
+    maxBreaks: function (datasetId: number, renderInfo: RenderInfo) {
         let breaks = 0;
         let maxBreaks = 0;
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
@@ -186,7 +201,7 @@ let fnSet = {
         }
         return maxBreaks;
     },
-    maxBreaksStart: function (renderInfo: RenderInfo, datasetId: number) {
+    maxBreaksStart: function (datasetId: number, renderInfo: RenderInfo) {
         let breaks = 0;
         let maxBreaks = 0;
         let breaksStart: Moment = null;
@@ -210,7 +225,7 @@ let fnSet = {
         }
         return helper.dateToStr(maxBreaksStart, renderInfo.dateFormat);
     },
-    maxBreaksEnd: function (renderInfo: RenderInfo, datasetId: number) {
+    maxBreaksEnd: function (datasetId: number, renderInfo: RenderInfo) {
         let breaks = 0;
         let maxBreaks = 0;
         let breaksEnd: Moment = null;
@@ -240,10 +255,10 @@ let fnSet = {
         }
         return helper.dateToStr(maxBreaksEnd, renderInfo.dateFormat);
     },
-    lastStreak: function (renderInfo: RenderInfo, datasetId: number) {
+    lastStreak: function (datasetId: number, renderInfo: RenderInfo) {
         return "deprecated template variable 'lastStreak'";
     },
-    currentStreak: function (renderInfo: RenderInfo, datasetId: number) {
+    currentStreak: function (datasetId: number, renderInfo: RenderInfo) {
         let currentStreak = 0;
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
         if (dataset) {
@@ -259,7 +274,7 @@ let fnSet = {
         }
         return currentStreak;
     },
-    currentStreakStart: function (renderInfo: RenderInfo, datasetId: number) {
+    currentStreakStart: function (datasetId: number, renderInfo: RenderInfo) {
         let currentStreak = 0;
         let currentStreakStart: Moment = null;
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
@@ -283,7 +298,7 @@ let fnSet = {
         }
         return helper.dateToStr(currentStreakStart, renderInfo.dateFormat);
     },
-    currentStreakEnd: function (renderInfo: RenderInfo, datasetId: number) {
+    currentStreakEnd: function (datasetId: number, renderInfo: RenderInfo) {
         let currentStreak = 0;
         let currentStreakEnd: Moment = null;
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
@@ -307,7 +322,7 @@ let fnSet = {
         }
         return helper.dateToStr(currentStreakEnd, renderInfo.dateFormat);
     },
-    currentBreaks: function (renderInfo: RenderInfo, datasetId: number) {
+    currentBreaks: function (datasetId: number, renderInfo: RenderInfo) {
         let currentBreaks = 0;
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
         if (dataset) {
@@ -323,7 +338,7 @@ let fnSet = {
         }
         return currentBreaks;
     },
-    currentBreaksStart: function (renderInfo: RenderInfo, datasetId: number) {
+    currentBreaksStart: function (datasetId: number, renderInfo: RenderInfo) {
         let currentBreaks = 0;
         let currentBreaksStart: Moment = null;
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
@@ -347,7 +362,7 @@ let fnSet = {
         }
         return helper.dateToStr(currentBreaksStart, renderInfo.dateFormat);
     },
-    currentBreaksEnd: function (renderInfo: RenderInfo, datasetId: number) {
+    currentBreaksEnd: function (datasetId: number, renderInfo: RenderInfo) {
         let currentBreaks = 0;
         let currentBreaksEnd: Moment = null;
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
@@ -371,7 +386,7 @@ let fnSet = {
         }
         return helper.dateToStr(currentBreaksEnd, renderInfo.dateFormat);
     },
-    average: function (renderInfo: RenderInfo, datasetId: number) {
+    average: function (datasetId: number, renderInfo: RenderInfo) {
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
         let countNotNull = dataset.getLengthNotNull();
         if (countNotNull > 0) {
@@ -380,153 +395,128 @@ let fnSet = {
         }
         return null;
     },
-    median: function (renderInfo: RenderInfo, datasetId: number) {
+    median: function (datasetId: number, renderInfo: RenderInfo) {
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
         return d3.median(dataset.getValues());
     },
-    variance: function (renderInfo: RenderInfo, datasetId: number) {
+    variance: function (datasetId: number, renderInfo: RenderInfo) {
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
         return d3.variance(dataset.getValues());
     },
 };
 
-export function resolveTemplate(template: string, renderInfo: RenderInfo) {
-    //console.log("resolveTemplate");
-    let replaceMap: { [key: string]: string } = {};
-    // Loop over fnSet, prepare replaceMap
-    Object.entries(fnSet).forEach(([fnName, fn]) => {
-        // {{\s*max(\(\s*Dataset\(\s*(?<datasetId>\d+)\s*\)\s*\))?\s*}}
-        let strRegex =
-            "{{\\s*" +
-            fnName +
-            "(\\(\\s*Dataset\\(\\s*((?<datasetId>\\d+)|(?<datasetName>\\w+))\\s*\\)\\s*\\))?\\s*}}";
-        // console.log(strRegex);
-        let regex = new RegExp(strRegex, "gm");
-        let match;
-        while ((match = regex.exec(template))) {
-            // console.log(match);
-            if (typeof match.groups !== "undefined") {
-                if (typeof match.groups.datasetId !== "undefined") {
-                    let datasetId = parseInt(match.groups.datasetId);
-                    // console.log(datasetId);
-                    if (Number.isInteger(datasetId)) {
-                        let strReplaceRegex =
-                            "{{\\s*" +
-                            fnName +
-                            "(\\(\\s*Dataset\\(\\s*" +
-                            datasetId.toString() +
-                            "\\s*\\)\\s*\\))?\\s*}}";
+const fnMapBinaryOp: FnMapBinaryOp = {
+    "+": function (a: number, b: number) {
+        return a + b;
+    },
+    "-": function (a: number, b: number) {
+        return a - b;
+    },
+    "*": function (a: number, b: number) {
+        return a * b;
+    },
+    "/": function (a: number, b: number) {
+        return a / b;
+    },
+    "%": function (a: number, b: number) {
+        return a % b;
+    },
+};
 
-                        if (!(strReplaceRegex in replaceMap)) {
-                            let result = fn(renderInfo, datasetId); // calculate result
-                            let strResult = "{{NA}}";
-                            if (
-                                typeof result !== "undefined" &&
-                                result !== null
-                            ) {
-                                if (Number.isInteger(result)) {
-                                    strResult = result.toFixed(0);
-                                } else {
-                                    strResult = result.toFixed(2);
-                                }
-                            }
+function evaluate(expr: jsep.Expression, renderInfo: RenderInfo): any {
+    // console.log(expr);
 
-                            replaceMap[strReplaceRegex] = strResult;
-                        }
-                    }
-                } else if (typeof match.groups.datasetName !== "undefined") {
-                    let datasetName = match.groups.datasetName;
-                    // console.log(datasetName);
-                    let strReplaceRegex =
-                        "{{\\s*" +
-                        fnName +
-                        "(\\(\\s*Dataset\\(\\s*" +
-                        datasetName +
-                        "\\s*\\)\\s*\\))?\\s*}}";
+    switch (expr.type) {
+        // case 'ArrayExpression':
+        //     return evaluateArray(node.elements, context);
 
-                    let datasetId = renderInfo.datasetName.indexOf(datasetName);
-                    // console.log(datasetName);
-                    // console.log(renderInfo.datasetName);
-                    // console.log(datasetId);
-                    if (!(strReplaceRegex in replaceMap)) {
-                        let strResult = "{{NA}}";
-                        if (datasetId >= 0) {
-                            let result = fn(renderInfo, datasetId); // calculate result
-                            if (
-                                typeof result !== "undefined" &&
-                                result !== null
-                            ) {
-                                if (Number.isInteger(result)) {
-                                    strResult = result.toFixed(0);
-                                } else {
-                                    strResult = result.toFixed(2);
-                                }
-                            }
-                        }
-                        replaceMap[strReplaceRegex] = strResult;
-                    }
-                } else {
-                    // no datasetId assigned use id 0
-                    // console.log("{{" + fnName + "}}")
-                    let strReplaceRegex = "{{\\s*" + fnName + "\\s*}}";
-                    if (!(strReplaceRegex in replaceMap)) {
-                        let result = fn(renderInfo, 0); // calculate result
-                        let strResult = "{{NA}}";
-                        if (typeof result !== "undefined" && result !== null) {
-                            if (typeof result === "number") {
-                                if (Number.isInteger(result)) {
-                                    strResult = result.toFixed(0);
-                                } else {
-                                    strResult = result.toFixed(2);
-                                }
-                            } else if (typeof result === "string") {
-                                strResult = result;
-                            }
-                        }
+        case "BinaryExpression":
+            let binaryExpr = expr as jsep.BinaryExpression;
+            return fnMapBinaryOp[binaryExpr.operator](
+                evaluate(binaryExpr.left, renderInfo),
+                evaluate(binaryExpr.right, renderInfo)
+            );
 
-                        replaceMap[strReplaceRegex] = strResult;
-                    }
-                }
-            } else {
-                // groups undefined
-                // no datasetId assigned use id 0
-                // console.log("{{" + fnName + "}}")
-                let strReplaceRegex = "{{\\s*" + fnName + "\\s*}}";
-                if (!(strReplaceRegex in replaceMap)) {
-                    let result = fn(renderInfo, 0); // calculate result
-                    let strResult = "{{NA}}";
-                    if (typeof result !== "undefined" && result !== null) {
-                        if (Number.isInteger(result)) {
-                            strResult = result.toFixed(0);
-                        } else {
-                            strResult = result.toFixed(2);
-                        }
-                    } else if (typeof result === "string") {
-                        strResult = result;
-                    }
+        case "CallExpression":
+            let callExpr = expr as jsep.CallExpression;
+            let fnName: string = (callExpr.callee as jsep.Identifier).name;
+            let args = callExpr.arguments;
 
-                    replaceMap[strReplaceRegex] = strResult;
+            if (args.length === 1) {
+                let arg = args[0];
+                if (arg.type === "Literal") {
+                    let datasetId = (arg as jsep.Literal).value as number;
+                    let fnDatasetId = fnMapDatasetId[fnName];
+                    return fnDatasetId(datasetId, renderInfo);
+                } else if (arg.type === "CallExpression") {
                 }
             }
+
+            return null;
+
+        case "Literal":
+            return (expr as jsep.Literal).value;
+    }
+    return "Error evaluating expression";
+}
+
+export function resolve(str: string, renderInfo: RenderInfo) {
+    // console.log(s);
+
+    let exprMap: { [key: string]: string } = {};
+
+    // {{[\w+\-*\/0-9\s()\[\]]+}}
+    let strExprRegex = "{{[\\w+\\-*\\/0-9\\s()\\[\\]%]+}}";
+    let exprRegex = new RegExp(strExprRegex, "gm");
+    let match;
+    while ((match = exprRegex.exec(str))) {
+        let fullmatch = match[0];
+        // console.log(match);
+        let strExpr = fullmatch.substring(2, fullmatch.length - 2);
+        // console.log(strExpr);
+
+        if (!(fullmatch in exprMap)) {
+            const ast = jsep(strExpr);
+            // console.log(ast);
+
+            const value = evaluate(ast, renderInfo);
+            if (typeof value === "string") {
+                exprMap[fullmatch] = value;
+            } else if (typeof value === "number") {
+                exprMap[fullmatch] = value.toString();
+            }
         }
-    });
+    }
 
-    // console.log(replaceMap);
-    // Do replace
-    for (let strReplaceRegex in replaceMap) {
-        let strResult = replaceMap[strReplaceRegex];
-        let regex = new RegExp(strReplaceRegex, "gi");
-        template = template.replace(regex, strResult);
+    for (let fullmatch in exprMap) {
+        let strValue = exprMap[fullmatch];
+        str = str.replace(fullmatch, strValue);
     }
 
-    return template;
+    return str;
 }
 
-export function resolve(s: string, renderInfo: RenderInfo) {
-    console.log(s);
-    s = resolveTemplate(s, renderInfo);
-    console.log(s);
-    const ast = parse(s);
-    const value = evaluate(ast, {});
-    return value;
+export function resolveTemplate(str: string, renderInfo: RenderInfo): string {
+    // console.log(str);
+    let retResolve = resolve(str, renderInfo);
+    return retResolve;
+}
+
+export function resolveValue(
+    str: string,
+    renderInfo: RenderInfo
+): number | string {
+    // console.log(str);
+    str = str.trim();
+    let value = null;
+    if (str.startsWith("{{") && str.endsWith("}}")) {
+        let retResolve = resolve(str, renderInfo);
+        value = parseFloat(retResolve);
+    } else {
+        value = parseFloat(str);
+    }
+    if (Number.isNumber(value) && !Number.isNaN(value)) {
+        return value;
+    }
+    return "Error resolving values";
 }
diff --git a/src/pie.ts b/src/pie.ts
index 7c87286..d956bfd 100644
--- a/src/pie.ts
+++ b/src/pie.ts
@@ -103,14 +103,23 @@ function renderPie(
 ) {
     // console.log("renderPie");
     // console.log(renderInfo);
+    let errorMessage = "";
 
     let radius = renderInfo.dataAreaSize.width * 0.5 * 0.8;
 
     // data
-    let data = pieInfo.data.map(function (s) {
-        let value = expr.resolve(s, renderInfo);
-        return value;
-    });
+    let values: Array<number> = [];
+    for (let strExpr of pieInfo.data) {
+        let retValue = expr.resolveValue(strExpr, renderInfo);
+        if (typeof retValue === "string") {
+            errorMessage = retValue;
+            break;
+        }
+        values.push(retValue);
+    }
+    if (errorMessage !== "") {
+        return errorMessage;
+    }
 
     // scale
     let colorScale = d3.scaleOrdinal().range(pieInfo.dataColor);
@@ -131,7 +140,7 @@ function renderPie(
 
     let sectors = sectorsGroup
         .selectAll("sector")
-        .data(pie(data))
+        .data(pie(values))
         .enter()
         .append("g")
         .attr("class", "sector");
@@ -158,8 +167,8 @@ export function renderPieChart(
     // console.log(renderInfo);
     if (!renderInfo || !pieInfo) return;
 
-    return "Under construction";
-    
+    // return "Under construction";
+
     let chartElements: ChartElements = {};
     chartElements = createAreas(chartElements, canvas, renderInfo, pieInfo);
 
diff --git a/src/summary.ts b/src/summary.ts
index 0a13865..c12d4f8 100644
--- a/src/summary.ts
+++ b/src/summary.ts
@@ -23,6 +23,7 @@ export function renderSummary(
     }
 
     outputSummary = expr.resolveTemplate(outputSummary, renderInfo);
+    // console.log(outputSummary);
     if (outputSummary !== "") {
         let textBlock = d3.select(canvas).append("div");
         if (outputSummary.includes("\n")) {

From 29b8ce879dfc496812d29806b626e088427c7b79 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 12 Jul 2021 11:10:16 +0800
Subject: [PATCH 128/402] Allow evaluating functions

---
 examples/TestPieChart.md |  20 +++---
 src/expr.ts              | 147 +++++++++++++++++++++++++++++----------
 2 files changed, 120 insertions(+), 47 deletions(-)

diff --git a/examples/TestPieChart.md b/examples/TestPieChart.md
index 16f3e14..93b36f9 100644
--- a/examples/TestPieChart.md
+++ b/examples/TestPieChart.md
@@ -1,5 +1,14 @@
 # Test Pie Chart
 
+``` tracker
+searchType: task.done, task.notdone
+searchTarget: Say I love you, Say I love you
+folder: diary
+summary:
+    template: "How many days I said love: {{sum(dataset(0))}}\nHow many days I didn't say love: {{sum(dataset(0) + dataset(0))}}"
+```
+
+<!--
 ## Manual Input Data
 ### Numbers
 To be fixed,
@@ -51,15 +60,4 @@ summary:
 ```
 
 
-<!--
-``` tracker
-searchType: tag
-searchTarget: meditation, exercise-pushup, exercise-plank
-pie:
-    title: Pie
-    data: '{{sum(0)}},{{sum(1)}},{{sum()}}*3,{{sum()}}*4,{{sum()}}*5'
-    dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
-    ratioInnerRadius: 0.5
-```
-
 
diff --git a/src/expr.ts b/src/expr.ts
index c0640bb..1b58c83 100644
--- a/src/expr.ts
+++ b/src/expr.ts
@@ -5,21 +5,24 @@ import * as helper from "./helper";
 import jsep from "jsep";
 
 // Function accept datasetId as first argument
-type FnDatasetId = (
-    datasetId: number,
+type FnDataset = (
+    dataset: number | Dataset,
     renderInfo: RenderInfo
 ) => number | string;
-type FnBinaryOp = (a: number, b: number) => number;
+type FnBinaryOp = (
+    a: number | boolean | Dataset | Array<number>,
+    b: number | boolean | Dataset | Array<number>
+) => number | boolean | Dataset | Array<number>;
 
-interface FnMapDatasetId {
-    [key: string]: FnDatasetId;
+interface FnMapDataset {
+    [key: string]: FnDataset;
 }
 
 interface FnMapBinaryOp {
     [key: string]: FnBinaryOp;
 }
 
-const fnMapDatasetId: FnMapDatasetId = {
+const fnMapDataset: FnMapDataset = {
     // min value of a dataset
     min: function (datasetId: number, renderInfo: RenderInfo) {
         let dataset = renderInfo.datasets.getDatasetById(datasetId);
@@ -89,9 +92,13 @@ const fnMapDatasetId: FnMapDatasetId = {
         return helper.dateToStr(renderInfo.endDate, renderInfo.dateFormat);
     },
     // sum of all values in a dataset
-    sum: function (datasetId: number, renderInfo: RenderInfo) {
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
-        return d3.sum(dataset.getValues());
+    sum: function (_dataset: number | Dataset, renderInfo: RenderInfo) {
+        // console.log(_dataset);
+        if (typeof _dataset === "number") {
+            let dataset = renderInfo.datasets.getDatasetById(_dataset);
+            return d3.sum(dataset.getValues());
+        }
+        return d3.sum(_dataset.getValues());
     },
     count: function (datasetId: number, renderInfo: RenderInfo) {
         return "deprecated template variable 'count'";
@@ -406,56 +413,124 @@ const fnMapDatasetId: FnMapDatasetId = {
 };
 
 const fnMapBinaryOp: FnMapBinaryOp = {
-    "+": function (a: number, b: number) {
-        return a + b;
+    "+": function (l, r) {
+        if (typeof l === "number" && typeof r === "number") {
+            return l + r;
+        } else if (typeof l === "number" && Array.isArray(r)) {
+            return (r as Array<number>).map(function (v) {
+                return v + l;
+            });
+        }
+        else if (Array.isArray(l) && typeof r === "number") {
+            return (l as Array<number>).map(function (v) {
+                return v + r;
+            });
+        }
     },
-    "-": function (a: number, b: number) {
-        return a - b;
+    "-": function (l, r) {
+        if (typeof l === "number" && typeof r === "number") {
+            return l - r;
+        } else if (typeof l === "number" && typeof Array.isArray(r)) {
+            return (r as Array<number>).map(function (v) {
+                return l - v;
+            });
+        }
+        else if (Array.isArray(l) && typeof r === "number") {
+            return (l as Array<number>).map(function (v) {
+                return v - r;
+            });
+        }
     },
-    "*": function (a: number, b: number) {
-        return a * b;
+    "*": function (l, r) {
+        if (typeof l === "number" && typeof r === "number") {
+            return l * r;
+        } else if (typeof l === "number" && typeof Array.isArray(r)) {
+            return (r as Array<number>).map(function (v) {
+                return l * v;
+            });
+        }
+        else if (Array.isArray(l) && typeof r === "number") {
+            return (l as Array<number>).map(function (v) {
+                return v * r;
+            });
+        }
     },
-    "/": function (a: number, b: number) {
-        return a / b;
+    "/": function (l, r) {
+        if (typeof l === "number" && typeof r === "number") {
+            return l / r;
+        } else if (typeof l === "number" && typeof Array.isArray(r)) {
+            return (r as Array<number>).map(function (v) {
+                return l / v;
+            });
+        }
+        else if (Array.isArray(l) && typeof r === "number") {
+            return (l as Array<number>).map(function (v) {
+                return v / r;
+            });
+        }
     },
-    "%": function (a: number, b: number) {
-        return a % b;
+    "%": function (l, r) {
+        if (typeof l === "number" && typeof r === "number") {
+            return l % r;
+        } else if (typeof l === "number" && typeof Array.isArray(r)) {
+            return (r as Array<number>).map(function (v) {
+                return l % v;
+            });
+        }
+        else if (Array.isArray(l) && typeof r === "number") {
+            return (l as Array<number>).map(function (v) {
+                return v % r;
+            });
+        }
     },
 };
 
+function getDatasetById(datasetId: number, renderInfo: RenderInfo) {
+    return renderInfo.datasets.getDatasetById(datasetId);
+}
+
+function evaluateArray(arr: any, renderInfo: RenderInfo) {
+    return arr.map(function (expr: jsep.Expression) {
+        return evaluate(expr, renderInfo);
+    });
+}
+
 function evaluate(expr: jsep.Expression, renderInfo: RenderInfo): any {
     // console.log(expr);
 
     switch (expr.type) {
-        // case 'ArrayExpression':
-        //     return evaluateArray(node.elements, context);
+        case "Literal":
+            let literalExpr = expr as jsep.Literal;
+            return literalExpr.value; // string, number, boolean
 
         case "BinaryExpression":
             let binaryExpr = expr as jsep.BinaryExpression;
+            let left = binaryExpr.left; // number, Array<number>, Dataset
+            let right = binaryExpr.right; // number, Array<number>, Dataset
             return fnMapBinaryOp[binaryExpr.operator](
-                evaluate(binaryExpr.left, renderInfo),
-                evaluate(binaryExpr.right, renderInfo)
+                evaluate(left, renderInfo),
+                evaluate(right, renderInfo)
             );
 
         case "CallExpression":
             let callExpr = expr as jsep.CallExpression;
-            let fnName: string = (callExpr.callee as jsep.Identifier).name;
+
+            let calleeIdentifier = callExpr.callee as jsep.Identifier;
+            let fnName = calleeIdentifier.name;
             let args = callExpr.arguments;
+            // console.log(fnName);
+            // console.log(args);
+            let evaluatedArgs = evaluateArray(args, renderInfo);
 
-            if (args.length === 1) {
-                let arg = args[0];
-                if (arg.type === "Literal") {
-                    let datasetId = (arg as jsep.Literal).value as number;
-                    let fnDatasetId = fnMapDatasetId[fnName];
-                    return fnDatasetId(datasetId, renderInfo);
-                } else if (arg.type === "CallExpression") {
-                }
+            if (fnName === "dataset") {
+                return getDatasetById(evaluatedArgs[0], renderInfo);
             }
 
-            return null;
+            if (fnName in fnMapDataset) {
+                return fnMapDataset[fnName](evaluatedArgs[0], renderInfo);
+            }
 
-        case "Literal":
-            return (expr as jsep.Literal).value;
+            return null;
     }
     return "Error evaluating expression";
 }
@@ -477,7 +552,7 @@ export function resolve(str: string, renderInfo: RenderInfo) {
 
         if (!(fullmatch in exprMap)) {
             const ast = jsep(strExpr);
-            // console.log(ast);
+            console.log(ast);
 
             const value = evaluate(ast, renderInfo);
             if (typeof value === "string") {

From bef782fd9c8b1e8ad3fb95698b2d5d4e2d093302 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 13 Jul 2021 16:41:01 +0800
Subject: [PATCH 129/402] Evaluating functions and binary operators

---
 examples/TestPieChart.md     |  21 ++-
 examples/TestWordCounting.md |   2 +-
 src/data.ts                  |  15 +-
 src/expr.ts                  | 275 +++++++++++++++++++++--------------
 4 files changed, 189 insertions(+), 124 deletions(-)

diff --git a/examples/TestPieChart.md b/examples/TestPieChart.md
index 93b36f9..cc948dd 100644
--- a/examples/TestPieChart.md
+++ b/examples/TestPieChart.md
@@ -1,14 +1,6 @@
 # Test Pie Chart
 
-``` tracker
-searchType: task.done, task.notdone
-searchTarget: Say I love you, Say I love you
-folder: diary
-summary:
-    template: "How many days I said love: {{sum(dataset(0))}}\nHow many days I didn't say love: {{sum(dataset(0) + dataset(0))}}"
-```
 
-<!--
 ## Manual Input Data
 ### Numbers
 To be fixed,
@@ -45,7 +37,7 @@ searchTarget: Say I love you, Say I love you
 folder: diary
 pie:
     title: Pie
-    data: '{{sum(0)}},{{sum(1)}}'
+    data: '{{sum(dataset(0))}},{{sum(dataset(1))}}'
     dataColor: '#4daf4a,#377eb8'
     ratioInnerRadius: 0.5
 ```
@@ -56,8 +48,13 @@ searchType: task.done, task.notdone
 searchTarget: Say I love you, Say I love you
 folder: diary
 summary:
-    template: "How many days I said love: {{sum(0)}}\nHow many days I didn't say love: {{sum(1)}}"
+    template: "How many days I said love: {{sum(dataset(0))}}\nHow many days I didn't say love: {{sum(dataset(1))}}"
 ```
 
-
-
+``` tracker
+searchType: task.done, task.notdone
+searchTarget: Say I love you, Say I love you
+folder: diary
+summary:
+    template: "How many days I said love: {{sum(dataset(0))}}\nHow many days I didn't say love: {{sum( dataset(0) + dataset(0) + 1)}}"
+```
diff --git a/examples/TestWordCounting.md b/examples/TestWordCounting.md
index ab56d51..727b809 100644
--- a/examples/TestWordCounting.md
+++ b/examples/TestWordCounting.md
@@ -45,6 +45,6 @@ searchTarget: cDate, numWords
 xDataset: 0
 folder: /
 summary:
-    template: "Total word count: {{sum(1)}}"
+    template: "Total word count: {{sum(dataset(1))}}"
 ```
 
diff --git a/src/data.ts b/src/data.ts
index 11f865e..66367cf 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -216,13 +216,26 @@ export class Dataset implements IterableIterator<DataPoint> {
         this.numTargets = 0;
         this.lineInfo = null;
         this.barInfo = null;
-        this.valueType = query.valueType;
+        this.valueType = query?.valueType;
 
         for (let ind = 0; ind < parent.getDates().length; ind++) {
             this.values.push(null);
         }
     }
 
+    public cloneToTmpDataset() {
+        let tmpDataset = new Dataset(this.parent, null);
+        tmpDataset.name = "tmp";
+        tmpDataset.values = [...this.values];
+        tmpDataset.yMin = this.yMin;
+        tmpDataset.yMax = this.yMax;
+        tmpDataset.startDate = this.startDate.clone();
+        tmpDataset.endDate = this.endDate.clone();
+        tmpDataset.numTargets = this.numTargets;
+        tmpDataset.valueType = this.valueType;
+        return tmpDataset;
+    }
+
     public getName() {
         return this.name;
     }
diff --git a/src/expr.ts b/src/expr.ts
index 1b58c83..5535744 100644
--- a/src/expr.ts
+++ b/src/expr.ts
@@ -5,14 +5,11 @@ import * as helper from "./helper";
 import jsep from "jsep";
 
 // Function accept datasetId as first argument
-type FnDataset = (
-    dataset: number | Dataset,
-    renderInfo: RenderInfo
-) => number | string;
+type FnDataset = (dataset: Dataset, renderInfo: RenderInfo) => number | string;
 type FnBinaryOp = (
-    a: number | boolean | Dataset | Array<number>,
-    b: number | boolean | Dataset | Array<number>
-) => number | boolean | Dataset | Array<number>;
+    l: number | Dataset,
+    r: number | Dataset
+) => number | Dataset;
 
 interface FnMapDataset {
     [key: string]: FnDataset;
@@ -24,13 +21,11 @@ interface FnMapBinaryOp {
 
 const fnMapDataset: FnMapDataset = {
     // min value of a dataset
-    min: function (datasetId: number, renderInfo: RenderInfo) {
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+    min: function (dataset, renderInfo) {
         return d3.min(dataset.getValues());
     },
     // the latest date with min value
-    minDate: function (datasetId: number, renderInfo: RenderInfo) {
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+    minDate: function (dataset, renderInfo) {
         let min = d3.min(dataset.getValues());
         if (Number.isNumber(min)) {
             let arrayDataset = Array.from(dataset);
@@ -46,13 +41,11 @@ const fnMapDataset: FnMapDataset = {
         return "min not found";
     },
     // max value of a dataset
-    max: function (datasetId: number, renderInfo: RenderInfo) {
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+    max: function (dataset, renderInfo) {
         return d3.max(dataset.getValues());
     },
     // the latest date with max value
-    maxDate: function (datasetId: number, renderInfo: RenderInfo) {
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+    maxDate: function (dataset, renderInfo) {
         let max = d3.max(dataset.getValues());
         if (Number.isNumber(max)) {
             let arrayDataset = Array.from(dataset);
@@ -69,8 +62,7 @@ const fnMapDataset: FnMapDataset = {
     },
     // start date of a dataset
     // if datasetId not found, return overall startDate
-    startDate: function (datasetId: number, renderInfo: RenderInfo) {
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+    startDate: function (dataset, renderInfo) {
         if (dataset) {
             let startDate = dataset.getStartDate();
             if (startDate && startDate.isValid()) {
@@ -81,8 +73,7 @@ const fnMapDataset: FnMapDataset = {
     },
     // end date of a dataset
     // if datasetId not found, return overall endDate
-    endDate: function (datasetId: number, renderInfo: RenderInfo) {
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+    endDate: function (dataset, renderInfo) {
         if (dataset) {
             let endDate = dataset.getEndDate();
             if (endDate && endDate.isValid()) {
@@ -92,37 +83,28 @@ const fnMapDataset: FnMapDataset = {
         return helper.dateToStr(renderInfo.endDate, renderInfo.dateFormat);
     },
     // sum of all values in a dataset
-    sum: function (_dataset: number | Dataset, renderInfo: RenderInfo) {
-        // console.log(_dataset);
-        if (typeof _dataset === "number") {
-            let dataset = renderInfo.datasets.getDatasetById(_dataset);
-            return d3.sum(dataset.getValues());
-        }
-        return d3.sum(_dataset.getValues());
+    sum: function (dataset, renderInfo) {
+        return d3.sum(dataset.getValues());
     },
-    count: function (datasetId: number, renderInfo: RenderInfo) {
+    count: function (dataset, renderInfo) {
         return "deprecated template variable 'count'";
     },
     // number of occurrences of a target in a dataset
-    numTargets: function (datasetId: number, renderInfo: RenderInfo) {
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+    numTargets: function (dataset, renderInfo) {
         return dataset.getNumTargets();
     },
-    days: function (datasetId: number, renderInfo: RenderInfo) {
+    days: function (dataset, renderInfo) {
         return "deprecated template variable 'days'";
     },
-    numDays: function (datasetId: number, renderInfo: RenderInfo) {
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+    numDays: function (dataset, renderInfo) {
         return dataset.getLength();
     },
-    numDaysHavingData: function (datasetId: number, renderInfo: RenderInfo) {
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+    numDaysHavingData: function (dataset, renderInfo) {
         return dataset.getLengthNotNull();
     },
-    maxStreak: function (datasetId: number, renderInfo: RenderInfo) {
+    maxStreak: function (dataset, renderInfo) {
         let streak = 0;
         let maxStreak = 0;
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
         for (let dataPoint of dataset) {
             if (dataPoint.value !== null) {
                 streak++;
@@ -135,12 +117,11 @@ const fnMapDataset: FnMapDataset = {
         }
         return maxStreak;
     },
-    maxStreakStart: function (datasetId: number, renderInfo: RenderInfo) {
+    maxStreakStart: function (dataset, renderInfo) {
         let streak = 0;
         let maxStreak = 0;
         let streakStart: Moment = null;
         let maxStreakStart: Moment = null;
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
         if (dataset) {
             for (let dataPoint of dataset) {
                 if (dataPoint.value !== null) {
@@ -159,12 +140,11 @@ const fnMapDataset: FnMapDataset = {
         }
         return helper.dateToStr(maxStreakStart, renderInfo.dateFormat);
     },
-    maxStreakEnd: function (datasetId: number, renderInfo: RenderInfo) {
+    maxStreakEnd: function (dataset, renderInfo) {
         let streak = 0;
         let maxStreak = 0;
         let streakEnd: Moment = null;
         let maxStreakEnd: Moment = null;
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
         if (dataset) {
             let arrayDataset = Array.from(dataset);
             for (let ind = 0; ind < arrayDataset.length; ind++) {
@@ -191,11 +171,9 @@ const fnMapDataset: FnMapDataset = {
         }
         return helper.dateToStr(maxStreakEnd, renderInfo.dateFormat);
     },
-    maxBreaks: function (datasetId: number, renderInfo: RenderInfo) {
+    maxBreaks: function (dataset, renderInfo) {
         let breaks = 0;
         let maxBreaks = 0;
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
-
         for (let dataPoint of dataset) {
             if (dataPoint.value === null) {
                 breaks++;
@@ -208,12 +186,11 @@ const fnMapDataset: FnMapDataset = {
         }
         return maxBreaks;
     },
-    maxBreaksStart: function (datasetId: number, renderInfo: RenderInfo) {
+    maxBreaksStart: function (dataset, renderInfo) {
         let breaks = 0;
         let maxBreaks = 0;
         let breaksStart: Moment = null;
         let maxBreaksStart: Moment = null;
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
         if (dataset) {
             for (let dataPoint of dataset) {
                 if (dataPoint.value === null) {
@@ -232,12 +209,11 @@ const fnMapDataset: FnMapDataset = {
         }
         return helper.dateToStr(maxBreaksStart, renderInfo.dateFormat);
     },
-    maxBreaksEnd: function (datasetId: number, renderInfo: RenderInfo) {
+    maxBreaksEnd: function (dataset, renderInfo) {
         let breaks = 0;
         let maxBreaks = 0;
         let breaksEnd: Moment = null;
         let maxBreaksEnd: Moment = null;
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
         if (dataset) {
             let arrayDataset = Array.from(dataset);
             for (let ind = 0; ind < arrayDataset.length; ind++) {
@@ -262,12 +238,11 @@ const fnMapDataset: FnMapDataset = {
         }
         return helper.dateToStr(maxBreaksEnd, renderInfo.dateFormat);
     },
-    lastStreak: function (datasetId: number, renderInfo: RenderInfo) {
+    lastStreak: function (dataset, renderInfo) {
         return "deprecated template variable 'lastStreak'";
     },
-    currentStreak: function (datasetId: number, renderInfo: RenderInfo) {
+    currentStreak: function (dataset, renderInfo) {
         let currentStreak = 0;
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
         if (dataset) {
             let arrayDataset = Array.from(dataset);
             for (let ind = arrayDataset.length - 1; ind >= 0; ind--) {
@@ -281,10 +256,9 @@ const fnMapDataset: FnMapDataset = {
         }
         return currentStreak;
     },
-    currentStreakStart: function (datasetId: number, renderInfo: RenderInfo) {
+    currentStreakStart: function (dataset, renderInfo) {
         let currentStreak = 0;
         let currentStreakStart: Moment = null;
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
         if (dataset) {
             let arrayDataset = Array.from(dataset);
             for (let ind = arrayDataset.length - 1; ind >= 0; ind--) {
@@ -305,10 +279,9 @@ const fnMapDataset: FnMapDataset = {
         }
         return helper.dateToStr(currentStreakStart, renderInfo.dateFormat);
     },
-    currentStreakEnd: function (datasetId: number, renderInfo: RenderInfo) {
+    currentStreakEnd: function (dataset, renderInfo) {
         let currentStreak = 0;
         let currentStreakEnd: Moment = null;
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
         if (dataset) {
             let arrayDataset = Array.from(dataset);
             for (let ind = arrayDataset.length - 1; ind >= 0; ind--) {
@@ -329,9 +302,8 @@ const fnMapDataset: FnMapDataset = {
         }
         return helper.dateToStr(currentStreakEnd, renderInfo.dateFormat);
     },
-    currentBreaks: function (datasetId: number, renderInfo: RenderInfo) {
+    currentBreaks: function (dataset, renderInfo) {
         let currentBreaks = 0;
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
         if (dataset) {
             let arrayDataset = Array.from(dataset);
             for (let ind = arrayDataset.length - 1; ind >= 0; ind--) {
@@ -345,10 +317,9 @@ const fnMapDataset: FnMapDataset = {
         }
         return currentBreaks;
     },
-    currentBreaksStart: function (datasetId: number, renderInfo: RenderInfo) {
+    currentBreaksStart: function (dataset, renderInfo) {
         let currentBreaks = 0;
         let currentBreaksStart: Moment = null;
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
         if (dataset) {
             let arrayDataset = Array.from(dataset);
             for (let ind = arrayDataset.length - 1; ind >= 0; ind--) {
@@ -369,10 +340,9 @@ const fnMapDataset: FnMapDataset = {
         }
         return helper.dateToStr(currentBreaksStart, renderInfo.dateFormat);
     },
-    currentBreaksEnd: function (datasetId: number, renderInfo: RenderInfo) {
+    currentBreaksEnd: function (dataset, renderInfo) {
         let currentBreaks = 0;
         let currentBreaksEnd: Moment = null;
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
         if (dataset) {
             let arrayDataset = Array.from(dataset);
             for (let ind = arrayDataset.length - 1; ind >= 0; ind--) {
@@ -393,8 +363,7 @@ const fnMapDataset: FnMapDataset = {
         }
         return helper.dateToStr(currentBreaksEnd, renderInfo.dateFormat);
     },
-    average: function (datasetId: number, renderInfo: RenderInfo) {
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+    average: function (dataset, renderInfo) {
         let countNotNull = dataset.getLengthNotNull();
         if (countNotNull > 0) {
             let sum = d3.sum(dataset.getValues());
@@ -402,12 +371,10 @@ const fnMapDataset: FnMapDataset = {
         }
         return null;
     },
-    median: function (datasetId: number, renderInfo: RenderInfo) {
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+    median: function (dataset, renderInfo) {
         return d3.median(dataset.getValues());
     },
-    variance: function (datasetId: number, renderInfo: RenderInfo) {
-        let dataset = renderInfo.datasets.getDatasetById(datasetId);
+    variance: function (dataset, renderInfo) {
         return d3.variance(dataset.getValues());
     },
 };
@@ -415,73 +382,144 @@ const fnMapDataset: FnMapDataset = {
 const fnMapBinaryOp: FnMapBinaryOp = {
     "+": function (l, r) {
         if (typeof l === "number" && typeof r === "number") {
+            // return number
+
             return l + r;
-        } else if (typeof l === "number" && Array.isArray(r)) {
-            return (r as Array<number>).map(function (v) {
-                return v + l;
+        } else if (typeof l === "number" && r instanceof Dataset) {
+            // return Dataset
+            let tmpDataset = r.cloneToTmpDataset();
+            tmpDataset.getValues().forEach(function (value, index, array) {
+                array[index] = l + value;
             });
-        }
-        else if (Array.isArray(l) && typeof r === "number") {
-            return (l as Array<number>).map(function (v) {
-                return v + r;
+            return tmpDataset;
+        } else if (l instanceof Dataset && typeof r === "number") {
+            // return Dataset
+            let tmpDataset = l.cloneToTmpDataset();
+            tmpDataset.getValues().forEach(function (value, index, array) {
+                array[index] = value + r;
+            });
+            return tmpDataset;
+        } else if (l instanceof Dataset && r instanceof Dataset) {
+            // return Dataset
+            let tmpDataset = l.cloneToTmpDataset();
+            tmpDataset.getValues().forEach(function (value, index, array) {
+                array[index] = value + r.getValues()[index];
             });
+            return tmpDataset;
         }
+        return null;
     },
     "-": function (l, r) {
         if (typeof l === "number" && typeof r === "number") {
+            // return number
             return l - r;
-        } else if (typeof l === "number" && typeof Array.isArray(r)) {
-            return (r as Array<number>).map(function (v) {
-                return l - v;
+        } else if (typeof l === "number" && r instanceof Dataset) {
+            // return Dataset
+            let tmpDataset = r.cloneToTmpDataset();
+            tmpDataset.getValues().forEach(function (value, index, array) {
+                array[index] = l - value;
             });
-        }
-        else if (Array.isArray(l) && typeof r === "number") {
-            return (l as Array<number>).map(function (v) {
-                return v - r;
+            return tmpDataset;
+        } else if (l instanceof Dataset && typeof r === "number") {
+            // return Dataset
+            let tmpDataset = l.cloneToTmpDataset();
+            tmpDataset.getValues().forEach(function (value, index, array) {
+                array[index] = value - r;
+            });
+            return tmpDataset;
+        } else if (l instanceof Dataset && r instanceof Dataset) {
+            // return Dataset
+            let tmpDataset = l.cloneToTmpDataset();
+            tmpDataset.getValues().forEach(function (value, index, array) {
+                array[index] = value - r.getValues()[index];
             });
+            return tmpDataset;
         }
+        return null;
     },
     "*": function (l, r) {
         if (typeof l === "number" && typeof r === "number") {
+            // return number
             return l * r;
-        } else if (typeof l === "number" && typeof Array.isArray(r)) {
-            return (r as Array<number>).map(function (v) {
-                return l * v;
+        } else if (typeof l === "number" && r instanceof Dataset) {
+            // return Dataset
+            let tmpDataset = r.cloneToTmpDataset();
+            tmpDataset.getValues().forEach(function (value, index, array) {
+                array[index] = l * value;
             });
-        }
-        else if (Array.isArray(l) && typeof r === "number") {
-            return (l as Array<number>).map(function (v) {
-                return v * r;
+            return tmpDataset;
+        } else if (l instanceof Dataset && typeof r === "number") {
+            // return Dataset
+            let tmpDataset = l.cloneToTmpDataset();
+            tmpDataset.getValues().forEach(function (value, index, array) {
+                array[index] = value * r;
+            });
+            return tmpDataset;
+        } else if (l instanceof Dataset && r instanceof Dataset) {
+            // return Dataset
+            let tmpDataset = l.cloneToTmpDataset();
+            tmpDataset.getValues().forEach(function (value, index, array) {
+                array[index] = value * r.getValues()[index];
             });
+            return tmpDataset;
         }
+        return null;
     },
     "/": function (l, r) {
         if (typeof l === "number" && typeof r === "number") {
+            // return number
             return l / r;
-        } else if (typeof l === "number" && typeof Array.isArray(r)) {
-            return (r as Array<number>).map(function (v) {
-                return l / v;
+        } else if (typeof l === "number" && r instanceof Dataset) {
+            // return Dataset
+            let tmpDataset = r.cloneToTmpDataset();
+            tmpDataset.getValues().forEach(function (value, index, array) {
+                array[index] = l / value;
             });
-        }
-        else if (Array.isArray(l) && typeof r === "number") {
-            return (l as Array<number>).map(function (v) {
-                return v / r;
+            return tmpDataset;
+        } else if (l instanceof Dataset && typeof r === "number") {
+            // return Dataset
+            let tmpDataset = l.cloneToTmpDataset();
+            tmpDataset.getValues().forEach(function (value, index, array) {
+                array[index] = value / r;
+            });
+            return tmpDataset;
+        } else if (l instanceof Dataset && r instanceof Dataset) {
+            // return Dataset
+            let tmpDataset = l.cloneToTmpDataset();
+            tmpDataset.getValues().forEach(function (value, index, array) {
+                array[index] = value / r.getValues()[index];
             });
+            return tmpDataset;
         }
+        return null;
     },
     "%": function (l, r) {
         if (typeof l === "number" && typeof r === "number") {
+            // return number
             return l % r;
-        } else if (typeof l === "number" && typeof Array.isArray(r)) {
-            return (r as Array<number>).map(function (v) {
-                return l % v;
+        } else if (typeof l === "number" && r instanceof Dataset) {
+            // return Dataset
+            let tmpDataset = r.cloneToTmpDataset();
+            tmpDataset.getValues().forEach(function (value, index, array) {
+                array[index] = l % value;
             });
-        }
-        else if (Array.isArray(l) && typeof r === "number") {
-            return (l as Array<number>).map(function (v) {
-                return v % r;
+            return tmpDataset;
+        } else if (l instanceof Dataset && typeof r === "number") {
+            // return Dataset
+            let tmpDataset = l.cloneToTmpDataset();
+            tmpDataset.getValues().forEach(function (value, index, array) {
+                array[index] = value % r;
+            });
+            return tmpDataset;
+        } else if (l instanceof Dataset && r instanceof Dataset) {
+            // return Dataset
+            let tmpDataset = l.cloneToTmpDataset();
+            tmpDataset.getValues().forEach(function (value, index, array) {
+                array[index] = value % r.getValues()[index];
             });
+            return tmpDataset;
         }
+        return null;
     },
 };
 
@@ -505,12 +543,9 @@ function evaluate(expr: jsep.Expression, renderInfo: RenderInfo): any {
 
         case "BinaryExpression":
             let binaryExpr = expr as jsep.BinaryExpression;
-            let left = binaryExpr.left; // number, Array<number>, Dataset
-            let right = binaryExpr.right; // number, Array<number>, Dataset
-            return fnMapBinaryOp[binaryExpr.operator](
-                evaluate(left, renderInfo),
-                evaluate(right, renderInfo)
-            );
+            let leftValue = evaluate(binaryExpr.left, renderInfo);
+            let rightValue = evaluate(binaryExpr.right, renderInfo);
+            return fnMapBinaryOp[binaryExpr.operator](leftValue, rightValue);
 
         case "CallExpression":
             let callExpr = expr as jsep.CallExpression;
@@ -522,12 +557,32 @@ function evaluate(expr: jsep.Expression, renderInfo: RenderInfo): any {
             // console.log(args);
             let evaluatedArgs = evaluateArray(args, renderInfo);
 
+            // function dataset accept only one arg in number
             if (fnName === "dataset") {
-                return getDatasetById(evaluatedArgs[0], renderInfo);
+                if (evaluatedArgs.length === 1) {
+                    return getDatasetById(evaluatedArgs[0], renderInfo);
+                }
             }
 
+            // fnDataset accept only one arg in number or Dataset
             if (fnName in fnMapDataset) {
-                return fnMapDataset[fnName](evaluatedArgs[0], renderInfo);
+                if (evaluatedArgs.length === 0) {
+                    // Use first non-X dataset
+                    let dataset = null;
+                    for (let ds of renderInfo.datasets) {
+                        if (!dataset && !ds.getQuery().usedAsXDataset) {
+                            dataset = ds;
+                            // if breaks here, the index of Datasets not reset???
+                        }
+                    }
+                    if (dataset) {
+                        return fnMapDataset[fnName](dataset, renderInfo);
+                    }
+                }
+                if (evaluatedArgs.length === 1) {
+                    return fnMapDataset[fnName](evaluatedArgs[0], renderInfo);
+                }
+                return null;
             }
 
             return null;
@@ -552,7 +607,7 @@ export function resolve(str: string, renderInfo: RenderInfo) {
 
         if (!(fullmatch in exprMap)) {
             const ast = jsep(strExpr);
-            console.log(ast);
+            // console.log(ast);
 
             const value = evaluate(ast, renderInfo);
             if (typeof value === "string") {

From c48741c4d6149cda494839a63ac57acd588e222c Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 13 Jul 2021 17:15:38 +0800
Subject: [PATCH 130/402] Fix replaceAll

---
 examples/BloodPressureTracker.md | 3 +--
 src/expr.ts                      | 2 +-
 tsconfig.json                    | 4 +++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/examples/BloodPressureTracker.md b/examples/BloodPressureTracker.md
index 4ac34a8..bcfceed 100644
--- a/examples/BloodPressureTracker.md
+++ b/examples/BloodPressureTracker.md
@@ -26,10 +26,9 @@ folder: diary
 startDate: 2021-01-01
 endDate: 2021-01-31
 summary:
-    template: "Average: {{average(dataset(0))}}/{{average(dataset(1))}}\nAverage: {{average(dataset(systolic))}}/{{average(dataset(diastolic))}}"
+    template: "Average: {{average(dataset(0))}}/{{average(dataset(1))}}"
 ```
 
-
 ``` tracker
 searchType: frontmatter
 searchTarget: bloodpressure[0], bloodpressure[1]
diff --git a/src/expr.ts b/src/expr.ts
index 5535744..2c94aca 100644
--- a/src/expr.ts
+++ b/src/expr.ts
@@ -620,7 +620,7 @@ export function resolve(str: string, renderInfo: RenderInfo) {
 
     for (let fullmatch in exprMap) {
         let strValue = exprMap[fullmatch];
-        str = str.replace(fullmatch, strValue);
+        str = str.replaceAll(fullmatch, strValue);
     }
 
     return str;
diff --git a/tsconfig.json b/tsconfig.json
index 38b2e68..8816ba4 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -10,11 +10,13 @@
     "moduleResolution": "node",
     "importHelpers": true,
     "allowSyntheticDefaultImports": true,
+
     "lib": [
       "dom",
       "es5",
       "scripthost",
-      "es2015"
+      "es2015",
+      "ESNext.String"
     ]
   },
   "include": [

From 4fb0336c6583dc0effda21fb447e56e9e150fc74 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 13 Jul 2021 19:58:15 +0800
Subject: [PATCH 131/402] Add function normalize

---
 src/expr.ts | 49 ++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 42 insertions(+), 7 deletions(-)

diff --git a/src/expr.ts b/src/expr.ts
index 2c94aca..58ab98d 100644
--- a/src/expr.ts
+++ b/src/expr.ts
@@ -5,21 +5,29 @@ import * as helper from "./helper";
 import jsep from "jsep";
 
 // Function accept datasetId as first argument
-type FnDataset = (dataset: Dataset, renderInfo: RenderInfo) => number | string;
+type FnDatasetToValue = (
+    dataset: Dataset,
+    renderInfo: RenderInfo
+) => number | string;
+type FnDatasetToDataset = (dataset: Dataset, renderInfo: RenderInfo) => Dataset;
 type FnBinaryOp = (
     l: number | Dataset,
     r: number | Dataset
 ) => number | Dataset;
 
-interface FnMapDataset {
-    [key: string]: FnDataset;
+interface FnMapDatasetToValue {
+    [key: string]: FnDatasetToValue;
+}
+
+interface FnMapDatasetToDataset {
+    [key: string]: FnDatasetToDataset;
 }
 
 interface FnMapBinaryOp {
     [key: string]: FnBinaryOp;
 }
 
-const fnMapDataset: FnMapDataset = {
+const fnMapDatasetToValue: FnMapDatasetToValue = {
     // min value of a dataset
     min: function (dataset, renderInfo) {
         return d3.min(dataset.getValues());
@@ -523,6 +531,21 @@ const fnMapBinaryOp: FnMapBinaryOp = {
     },
 };
 
+const fnMapDatasetToDataset: FnMapDatasetToDataset = {
+    // min value of a dataset
+    normalize: function (dataset, renderInfo) {
+        let yMin = dataset.getYMin();
+        let yMax = dataset.getYMax();
+        if (yMax > yMin) {
+            let normalized = dataset.cloneToTmpDataset();
+            normalized.getValues().forEach(function (value, index, array) {
+                array[index] = (value - yMin) / (yMax - yMin);
+            });
+        }
+        return dataset;
+    },
+};
+
 function getDatasetById(datasetId: number, renderInfo: RenderInfo) {
     return renderInfo.datasets.getDatasetById(datasetId);
 }
@@ -565,7 +588,7 @@ function evaluate(expr: jsep.Expression, renderInfo: RenderInfo): any {
             }
 
             // fnDataset accept only one arg in number or Dataset
-            if (fnName in fnMapDataset) {
+            if (fnName in fnMapDatasetToValue) {
                 if (evaluatedArgs.length === 0) {
                     // Use first non-X dataset
                     let dataset = null;
@@ -576,15 +599,27 @@ function evaluate(expr: jsep.Expression, renderInfo: RenderInfo): any {
                         }
                     }
                     if (dataset) {
-                        return fnMapDataset[fnName](dataset, renderInfo);
+                        return fnMapDatasetToValue[fnName](dataset, renderInfo);
                     }
                 }
                 if (evaluatedArgs.length === 1) {
-                    return fnMapDataset[fnName](evaluatedArgs[0], renderInfo);
+                    return fnMapDatasetToValue[fnName](
+                        evaluatedArgs[0],
+                        renderInfo
+                    );
                 }
                 return null;
             }
 
+            if (fnName in fnMapDatasetToDataset) {
+                if (evaluatedArgs.length === 1) {
+                    return fnMapDatasetToDataset[fnName](
+                        evaluatedArgs[0],
+                        renderInfo
+                    );
+                }
+            }
+
             return null;
     }
     return "Error evaluating expression";

From 7ceaddf583d3f6baa86ade7a4498a65c91018d75 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Wed, 14 Jul 2021 17:37:51 +0800
Subject: [PATCH 132/402] Add labels to pie chart

---
 src/data.ts    |   5 +++
 src/parsing.ts |  30 +++++++++++++
 src/pie.ts     | 117 ++++++++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 146 insertions(+), 6 deletions(-)

diff --git a/src/data.ts b/src/data.ts
index 66367cf..d648f4c 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -694,6 +694,9 @@ export class PieInfo extends OutputInfo {
     title: string;
     data: string[];
     dataColor: string[];
+    label: string[];
+    extLabel: string[];
+
     ratioInnerRadius: number;
 
     constructor() {
@@ -701,6 +704,8 @@ export class PieInfo extends OutputInfo {
         this.title = "";
         this.data = [];
         this.dataColor = [];
+        this.label = [];
+        this.extLabel = [];
         this.ratioInnerRadius = 0.0;
     }
 }
diff --git a/src/parsing.ts b/src/parsing.ts
index c4f8d96..c94a85d 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1613,6 +1613,36 @@ export function getRenderInfoFromYaml(
         pie.dataColor = retDataColor;
         // console.log(pie.dataColor);
 
+        // label
+        let retLabel = getStringArrayFromInput(
+            "label",
+            yamlPie?.label,
+            numData,
+            "",
+            null,
+            true
+        );
+        if (typeof retLabel === "string") {
+            return retLabel; // errorMessage
+        }
+        pie.label = retLabel;
+        // console.log(pie.label);
+
+        // extLabel
+        let retExtLabel = getStringArrayFromInput(
+            "extLabel",
+            yamlPie?.extLabel,
+            numData,
+            "",
+            null,
+            true
+        );
+        if (typeof retExtLabel === "string") {
+            return retExtLabel; // errorMessage
+        }
+        pie.extLabel = retExtLabel;
+        // console.log(pie.extLabel);
+
         // ratioInnerRadius
         if (typeof yamlPie?.ratioInnerRadius === "number") {
             pie.ratioInnerRadius = yamlPie.ratioInnerRadius;
diff --git a/src/pie.ts b/src/pie.ts
index d956bfd..3ae214a 100644
--- a/src/pie.ts
+++ b/src/pie.ts
@@ -105,9 +105,11 @@ function renderPie(
     // console.log(renderInfo);
     let errorMessage = "";
 
-    let radius = renderInfo.dataAreaSize.width * 0.5 * 0.8;
+    let radius = renderInfo.dataAreaSize.width * 0.5;
+    let outterRadius = radius * 0.8;
+    let innerRadius = outterRadius * pieInfo.ratioInnerRadius;
 
-    // data
+    // values
     let values: Array<number> = [];
     for (let strExpr of pieInfo.data) {
         let retValue = expr.resolveValue(strExpr, renderInfo);
@@ -120,6 +122,38 @@ function renderPie(
     if (errorMessage !== "") {
         return errorMessage;
     }
+    // console.log(values);
+
+    // labels
+    let labels: Array<string> = [];
+    for (let strExpr of pieInfo.label) {
+        let retLabel = expr.resolveTemplate(strExpr, renderInfo);
+        // console.log(retLabel);
+        if (retLabel.startsWith("Error")) {
+            errorMessage = retLabel;
+            break;
+        }
+        labels.push(retLabel);
+    }
+    if (errorMessage !== "") {
+        return errorMessage;
+    }
+    // console.log(labels);
+
+    // extLabel
+    let extLabels: Array<string> = [];
+    for (let strExpr of pieInfo.extLabel) {
+        let retExtLabel = expr.resolveTemplate(strExpr, renderInfo);
+        if (retExtLabel.startsWith("Error")) {
+            errorMessage = retExtLabel;
+            break;
+        }
+        extLabels.push(retExtLabel);
+    }
+    if (errorMessage !== "") {
+        return errorMessage;
+    }
+    // console.log(extLabels);
 
     // scale
     let colorScale = d3.scaleOrdinal().range(pieInfo.dataColor);
@@ -137,18 +171,21 @@ function renderPie(
     });
 
     let pie = d3.pie();
+    let pieValues = pie(values);
 
     let sectors = sectorsGroup
         .selectAll("sector")
-        .data(pie(values))
+        .data(pieValues)
         .enter()
         .append("g")
         .attr("class", "sector");
 
-    let arc = d3
+    let arc = d3.arc().innerRadius(innerRadius).outerRadius(outterRadius);
+
+    var hiddenArc = d3
         .arc()
-        .innerRadius(radius * pieInfo.ratioInnerRadius)
-        .outerRadius(radius);
+        .innerRadius(radius * 0.9)
+        .outerRadius(radius * 0.9);
 
     let sectorPaths = sectors
         .append("path")
@@ -156,6 +193,74 @@ function renderPie(
             return colorScale(i.toString());
         })
         .attr("d", arc);
+
+    // label elements
+    let labelElements = sectorsGroup
+        .selectAll("label")
+        .data(pie(values))
+        .enter()
+        .append("text")
+        .text(function (d: any, i: number) {
+            return labels[i];
+        })
+        .attr("transform", function (d: any) {
+            return (
+                "translate(" +
+                arc.centroid(d)[0] +
+                "," +
+                arc.centroid(d)[1] +
+                ")"
+            );
+        })
+        .style("text-anchor", "middle")
+        .attr("class", "tracker-tick-label");
+
+    function getMidAngle(arcObj: any) {
+        return arcObj.startAngle + (arcObj.endAngle - arcObj.startAngle) / 2;
+    }
+
+    // external label elements
+    let extLabelElements = sectorsGroup
+        .selectAll("extLabel")
+        .data(pieValues)
+        .enter()
+        .append("text")
+        .text(function (d: any, i: number) {
+            return extLabels[i];
+        })
+        .attr("transform", function (arcObj: any, i: number) {
+            let posLabel = hiddenArc.centroid(arcObj);
+            let midAngle = getMidAngle(arcObj);
+            posLabel[0] = radius * 0.99 * (midAngle < Math.PI ? 1 : -1);
+            return "translate(" + posLabel[0] + "," + posLabel[1] + ")";
+        })
+        .style("text-anchor", function (arcObj: any) {
+            let midAngle = getMidAngle(arcObj);
+            return midAngle < Math.PI ? "start" : "end";
+        })
+        .attr("class", "tracker-tick-label");
+
+    // Add lines between sectors and external labels
+    let lines = sectorsGroup
+        .selectAll("line")
+        .data(pieValues)
+        .enter()
+        .append("polyline")
+        .attr("stroke", "black")
+        .style("fill", "none")
+        .attr("stroke-width", 1)
+        .attr("points", function (arcObj: any, i: number) {
+            //PieArcDatum
+            if (extLabels[i] !== "") {
+                let posLabel = arc.centroid(arcObj); // line insertion in the slice
+                let posMiddle = hiddenArc.centroid(arcObj); // line break: we use the other arc generator that has been built only for that
+                let posExtLabel = hiddenArc.centroid(arcObj); // Label position = almost the same as posB
+                let midAngle = getMidAngle(arcObj);
+                posExtLabel[0] = radius * 0.95 * (midAngle < Math.PI ? 1 : -1); // multiply by 1 or -1 to put it on the right or on the left
+                return [posLabel, posMiddle, posExtLabel];
+            }
+        })
+        .attr("class", "tracker-axis");
 }
 
 export function renderPieChart(

From 6afdf63ab0a8cf1f8c06179e648d180ae279e8ea Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Wed, 14 Jul 2021 20:27:33 +0800
Subject: [PATCH 133/402] Add lib sprintf-js, remove
 obsidian-daily-notes-interface

---
 package.json   | 3 ++-
 src/expr.ts    | 1 +
 src/parsing.ts | 4 ----
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index fabf406..5726fdd 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "@types/d3": "^6.3.0",
     "@types/moment": "^2.13.0",
     "@types/node": "^14.14.2",
+    "@types/sprintf-js": "^1.1.2",
     "@types/yaml": "^1.9.7",
     "gulp": "^4.0.2",
     "gulp-zip": "^5.1.0",
@@ -32,6 +33,6 @@
     "d3": "^6.5.0",
     "d3-interpolate": "^3.0.1",
     "jsep": "^0.4.0",
-    "obsidian-daily-notes-interface": "^0.9.1"
+    "sprintf-js": "^1.1.2"
   }
 }
diff --git a/src/expr.ts b/src/expr.ts
index 58ab98d..6399db3 100644
--- a/src/expr.ts
+++ b/src/expr.ts
@@ -3,6 +3,7 @@ import * as d3 from "d3";
 import { Moment } from "moment";
 import * as helper from "./helper";
 import jsep from "jsep";
+import sprintf from "sprintf-js";
 
 // Function accept datasetId as first argument
 type FnDatasetToValue = (
diff --git a/src/parsing.ts b/src/parsing.ts
index c94a85d..4d17c04 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -17,7 +17,6 @@ import {
 } from "./data";
 import { TFolder, normalizePath } from "obsidian";
 import { parseYaml } from "obsidian";
-import { getDailyNoteSettings } from "obsidian-daily-notes-interface";
 import * as helper from "./helper";
 
 function strToBool(str: string): boolean | null {
@@ -1049,9 +1048,6 @@ export function getRenderInfoFromYaml(
         return "No output parameter provided, please place line, bar, pie, month, bullet, or summary.";
     }
 
-    // Get daily notes settings using obsidian-daily-notes-interface
-    let dailyNotesSettings = getDailyNoteSettings();
-
     // Root folder to search
     if (typeof yaml.folder === "string") {
         if (yaml.folder === "") {

From 12d0e1f75759b7a3b6f3ea3da9ca542b9b0e6dd4 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 15 Jul 2021 16:40:43 +0800
Subject: [PATCH 134/402] Allow formatting the resolved expression

---
 src/expr.ts | 239 ++++++++++++++++++++++++++++++++++------------------
 src/pie.ts  |   3 +-
 2 files changed, 157 insertions(+), 85 deletions(-)

diff --git a/src/expr.ts b/src/expr.ts
index 6399db3..63be677 100644
--- a/src/expr.ts
+++ b/src/expr.ts
@@ -1,20 +1,20 @@
 import { RenderInfo, Dataset } from "./data";
 import * as d3 from "d3";
-import { Moment } from "moment";
+import { isMoment, Moment } from "moment";
 import * as helper from "./helper";
 import jsep from "jsep";
-import sprintf from "sprintf-js";
+import { sprintf } from "sprintf-js";
 
 // Function accept datasetId as first argument
 type FnDatasetToValue = (
     dataset: Dataset,
     renderInfo: RenderInfo
-) => number | string;
+) => number | Moment | string;
 type FnDatasetToDataset = (dataset: Dataset, renderInfo: RenderInfo) => Dataset;
 type FnBinaryOp = (
-    l: number | Dataset,
-    r: number | Dataset
-) => number | Dataset;
+    l: number | Moment | Dataset,
+    r: number | Moment | Dataset
+) => number | Moment | Dataset | string;
 
 interface FnMapDatasetToValue {
     [key: string]: FnDatasetToValue;
@@ -31,87 +31,92 @@ interface FnMapBinaryOp {
 const fnMapDatasetToValue: FnMapDatasetToValue = {
     // min value of a dataset
     min: function (dataset, renderInfo) {
+        // return number
         return d3.min(dataset.getValues());
     },
     // the latest date with min value
     minDate: function (dataset, renderInfo) {
+        // return Moment
         let min = d3.min(dataset.getValues());
         if (Number.isNumber(min)) {
             let arrayDataset = Array.from(dataset);
             for (let dataPoint of arrayDataset.reverse()) {
                 if (dataPoint.value !== null && dataPoint.value === min) {
-                    return helper.dateToStr(
-                        dataPoint.date,
-                        renderInfo.dateFormat
-                    );
+                    return dataPoint.date;
                 }
             }
         }
-        return "min not found";
+        return "Error evaluating: min not found";
     },
     // max value of a dataset
     max: function (dataset, renderInfo) {
+        // return number
         return d3.max(dataset.getValues());
     },
     // the latest date with max value
     maxDate: function (dataset, renderInfo) {
+        // return Moment
         let max = d3.max(dataset.getValues());
         if (Number.isNumber(max)) {
             let arrayDataset = Array.from(dataset);
             for (let dataPoint of arrayDataset.reverse()) {
                 if (dataPoint.value !== null && dataPoint.value === max) {
-                    return helper.dateToStr(
-                        dataPoint.date,
-                        renderInfo.dateFormat
-                    );
+                    return dataPoint.date;
                 }
             }
         }
-        return "max not found";
+        return "Error evaluating: max not found";
     },
     // start date of a dataset
     // if datasetId not found, return overall startDate
     startDate: function (dataset, renderInfo) {
+        // return Moment
         if (dataset) {
             let startDate = dataset.getStartDate();
             if (startDate && startDate.isValid()) {
-                return helper.dateToStr(startDate, renderInfo.dateFormat);
+                return startDate;
             }
         }
-        return helper.dateToStr(renderInfo.startDate, renderInfo.dateFormat);
+        return renderInfo.startDate;
     },
     // end date of a dataset
     // if datasetId not found, return overall endDate
     endDate: function (dataset, renderInfo) {
+        // return Moment
         if (dataset) {
             let endDate = dataset.getEndDate();
             if (endDate && endDate.isValid()) {
-                return helper.dateToStr(endDate, renderInfo.dateFormat);
+                return endDate;
             }
         }
-        return helper.dateToStr(renderInfo.endDate, renderInfo.dateFormat);
+        return renderInfo.endDate;
     },
     // sum of all values in a dataset
     sum: function (dataset, renderInfo) {
+        // return number
         return d3.sum(dataset.getValues());
     },
     count: function (dataset, renderInfo) {
-        return "deprecated template variable 'count'";
+        return "Error evaluating: deprecated function 'count'";
     },
     // number of occurrences of a target in a dataset
     numTargets: function (dataset, renderInfo) {
+        // return number
         return dataset.getNumTargets();
     },
     days: function (dataset, renderInfo) {
-        return "deprecated template variable 'days'";
+        return "Error evaluating: deprecated function 'days'";
     },
     numDays: function (dataset, renderInfo) {
+        // return number
         return dataset.getLength();
     },
     numDaysHavingData: function (dataset, renderInfo) {
+        // return number
         return dataset.getLengthNotNull();
     },
     maxStreak: function (dataset, renderInfo) {
+        // return number
         let streak = 0;
         let maxStreak = 0;
         for (let dataPoint of dataset) {
@@ -127,6 +132,7 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
         return maxStreak;
     },
     maxStreakStart: function (dataset, renderInfo) {
+        // return Moment
         let streak = 0;
         let maxStreak = 0;
         let streakStart: Moment = null;
@@ -147,9 +153,10 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
                 }
             }
         }
-        return helper.dateToStr(maxStreakStart, renderInfo.dateFormat);
+        return maxStreakStart;
     },
     maxStreakEnd: function (dataset, renderInfo) {
+        // return Moment
         let streak = 0;
         let maxStreak = 0;
         let streakEnd: Moment = null;
@@ -178,9 +185,10 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
                 }
             }
         }
-        return helper.dateToStr(maxStreakEnd, renderInfo.dateFormat);
+        return maxStreakEnd;
     },
     maxBreaks: function (dataset, renderInfo) {
+        // return number
         let breaks = 0;
         let maxBreaks = 0;
         for (let dataPoint of dataset) {
@@ -196,6 +204,7 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
         return maxBreaks;
     },
     maxBreaksStart: function (dataset, renderInfo) {
+        // return Moment
         let breaks = 0;
         let maxBreaks = 0;
         let breaksStart: Moment = null;
@@ -216,9 +225,10 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
                 }
             }
         }
-        return helper.dateToStr(maxBreaksStart, renderInfo.dateFormat);
+        return maxBreaksStart;
     },
     maxBreaksEnd: function (dataset, renderInfo) {
+        // return Moment
         let breaks = 0;
         let maxBreaks = 0;
         let breaksEnd: Moment = null;
@@ -245,12 +255,13 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
                 }
             }
         }
-        return helper.dateToStr(maxBreaksEnd, renderInfo.dateFormat);
+        return maxBreaksEnd;
     },
     lastStreak: function (dataset, renderInfo) {
-        return "deprecated template variable 'lastStreak'";
+        return "Error evaluating: deprecated function 'lastStreak'";
     },
     currentStreak: function (dataset, renderInfo) {
+        // return number
         let currentStreak = 0;
         if (dataset) {
             let arrayDataset = Array.from(dataset);
@@ -266,6 +277,7 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
         return currentStreak;
     },
     currentStreakStart: function (dataset, renderInfo) {
+        // return Moment
         let currentStreak = 0;
         let currentStreakStart: Moment = null;
         if (dataset) {
@@ -284,11 +296,12 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
         }
 
         if (currentStreakStart === null) {
-            return "absense";
+            return "Error evaluating: absense";
         }
-        return helper.dateToStr(currentStreakStart, renderInfo.dateFormat);
+        return currentStreakStart;
     },
     currentStreakEnd: function (dataset, renderInfo) {
+        // return Moment
         let currentStreak = 0;
         let currentStreakEnd: Moment = null;
         if (dataset) {
@@ -307,11 +320,12 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
         }
 
         if (currentStreakEnd === null) {
-            return "absense";
+            return "Error evaluating: absense";
         }
-        return helper.dateToStr(currentStreakEnd, renderInfo.dateFormat);
+        return currentStreakEnd;
     },
     currentBreaks: function (dataset, renderInfo) {
+        // return number
         let currentBreaks = 0;
         if (dataset) {
             let arrayDataset = Array.from(dataset);
@@ -327,6 +341,7 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
         return currentBreaks;
     },
     currentBreaksStart: function (dataset, renderInfo) {
+        // return Moment
         let currentBreaks = 0;
         let currentBreaksStart: Moment = null;
         if (dataset) {
@@ -345,11 +360,12 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
         }
 
         if (currentBreaksStart === null) {
-            return "absense";
+            return "Error evaluating: absense";
         }
-        return helper.dateToStr(currentBreaksStart, renderInfo.dateFormat);
+        return currentBreaksStart;
     },
     currentBreaksEnd: function (dataset, renderInfo) {
+        // return Moment
         let currentBreaks = 0;
         let currentBreaksEnd: Moment = null;
         if (dataset) {
@@ -368,22 +384,25 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
         }
 
         if (currentBreaksEnd === null) {
-            return "absense";
+            return "Error evaluating: absense";
         }
-        return helper.dateToStr(currentBreaksEnd, renderInfo.dateFormat);
+        return currentBreaksEnd;
     },
     average: function (dataset, renderInfo) {
+        // return number
         let countNotNull = dataset.getLengthNotNull();
         if (countNotNull > 0) {
             let sum = d3.sum(dataset.getValues());
             return sum / countNotNull;
         }
-        return null;
+        return "Error evaluating: divide by zero";
     },
     median: function (dataset, renderInfo) {
+        // return number
         return d3.median(dataset.getValues());
     },
     variance: function (dataset, renderInfo) {
+        // return number
         return d3.variance(dataset.getValues());
     },
 };
@@ -392,7 +411,6 @@ const fnMapBinaryOp: FnMapBinaryOp = {
     "+": function (l, r) {
         if (typeof l === "number" && typeof r === "number") {
             // return number
-
             return l + r;
         } else if (typeof l === "number" && r instanceof Dataset) {
             // return Dataset
@@ -416,7 +434,7 @@ const fnMapBinaryOp: FnMapBinaryOp = {
             });
             return tmpDataset;
         }
-        return null;
+        return "Error evaluating:";
     },
     "-": function (l, r) {
         if (typeof l === "number" && typeof r === "number") {
@@ -444,7 +462,7 @@ const fnMapBinaryOp: FnMapBinaryOp = {
             });
             return tmpDataset;
         }
-        return null;
+        return "Error evaluating:";
     },
     "*": function (l, r) {
         if (typeof l === "number" && typeof r === "number") {
@@ -472,7 +490,7 @@ const fnMapBinaryOp: FnMapBinaryOp = {
             });
             return tmpDataset;
         }
-        return null;
+        return "Error evaluating:";
     },
     "/": function (l, r) {
         if (typeof l === "number" && typeof r === "number") {
@@ -500,7 +518,7 @@ const fnMapBinaryOp: FnMapBinaryOp = {
             });
             return tmpDataset;
         }
-        return null;
+        return "Error evaluating:";
     },
     "%": function (l, r) {
         if (typeof l === "number" && typeof r === "number") {
@@ -528,7 +546,7 @@ const fnMapBinaryOp: FnMapBinaryOp = {
             });
             return tmpDataset;
         }
-        return null;
+        return "Error evaluating:";
     },
 };
 
@@ -609,7 +627,7 @@ function evaluate(expr: jsep.Expression, renderInfo: RenderInfo): any {
                         renderInfo
                     );
                 }
-                return null;
+                return "Error evaluating:";
             }
 
             if (fnName in fnMapDatasetToDataset) {
@@ -621,68 +639,121 @@ function evaluate(expr: jsep.Expression, renderInfo: RenderInfo): any {
                 }
             }
 
-            return null;
+            return "Error evaluating:";
     }
     return "Error evaluating expression";
 }
 
-export function resolve(str: string, renderInfo: RenderInfo) {
-    // console.log(s);
+interface ExprResolved {
+    source: string;
+    value: number | Moment;
+    format: string;
+}
 
-    let exprMap: { [key: string]: string } = {};
+// Get a list of resolved result containing source, value, and format
+function resolve(
+    text: string,
+    renderInfo: RenderInfo
+): Array<ExprResolved> | string {
+    // console.log(text);
+
+    let exprMap: Array<ExprResolved> = [];
 
-    // {{[\w+\-*\/0-9\s()\[\]]+}}
-    let strExprRegex = "{{[\\w+\\-*\\/0-9\\s()\\[\\]%]+}}";
+    // {{(?<expr>[\w+\-*\/0-9\s()\[\]%.]+)(::(?<format>[\w+\-*\/0-9\s()\[\]%.:]+))?}}
+    let strExprRegex =
+        "{{(?<expr>[\\w+\\-*\\/0-9\\s()\\[\\]%.]+)(::(?<format>[\\w+\\-*\\/0-9\\s()\\[\\]%.:]+))?}}";
     let exprRegex = new RegExp(strExprRegex, "gm");
     let match;
-    while ((match = exprRegex.exec(str))) {
+    while ((match = exprRegex.exec(text))) {
         let fullmatch = match[0];
-        // console.log(match);
-        let strExpr = fullmatch.substring(2, fullmatch.length - 2);
-        // console.log(strExpr);
-
-        if (!(fullmatch in exprMap)) {
-            const ast = jsep(strExpr);
-            // console.log(ast);
-
-            const value = evaluate(ast, renderInfo);
-            if (typeof value === "string") {
-                exprMap[fullmatch] = value;
-            } else if (typeof value === "number") {
-                exprMap[fullmatch] = value.toString();
+        if (exprMap.some((e) => e.source === fullmatch)) continue;
+
+        if (typeof match.groups !== "undefined") {
+            if (typeof match.groups.expr !== "undefined") {
+                let expr = match.groups.expr;
+
+                const ast = jsep(expr);
+                // console.log(ast);
+                const value = evaluate(ast, renderInfo);
+                if (typeof value === "string") {
+                    return value; // error message
+                }
+
+                if (
+                    typeof value === "number" ||
+                    window.moment.isMoment(value)
+                ) {
+                    let format = null;
+                    if (typeof match.groups.format !== "undefined") {
+                        format = match.groups.format;
+                    }
+
+                    exprMap.push({
+                        source: fullmatch,
+                        value: value,
+                        format: format,
+                    });
+                }
             }
         }
     }
 
-    for (let fullmatch in exprMap) {
-        let strValue = exprMap[fullmatch];
-        str = str.replaceAll(fullmatch, strValue);
+    return exprMap;
+}
+
+// Resolve the template expression in string and return a resolved string
+export function resolveTemplate(
+    template: string,
+    renderInfo: RenderInfo
+): string {
+    let retResolve = resolve(template, renderInfo);
+    if (typeof retResolve === "string") {
+        return retResolve; // error message
     }
+    let exprMap = retResolve as Array<ExprResolved>;
+
+    for (let exprResolved of exprMap) {
+        let value = exprResolved.value;
+        let format = exprResolved.format;
+        let strValue = "";
+        if (typeof value === "number") {
+            if (format) {
+                strValue = sprintf("%" + format, value);
+            } else {
+                strValue = value.toFixed(1);
+            }
+        } else if (window.moment.isMoment(value)) {
+            if (format) {
+                strValue = helper.dateToStr(value, format);
+            } else {
+                strValue = helper.dateToStr(value, renderInfo.dateFormat);
+            }
+        }
 
-    return str;
-}
+        if (strValue) {
+            template = template.replaceAll(exprResolved.source, strValue);
+        }
+    }
 
-export function resolveTemplate(str: string, renderInfo: RenderInfo): string {
-    // console.log(str);
-    let retResolve = resolve(str, renderInfo);
-    return retResolve;
+    return template;
 }
 
+// Resolve the template expression in string and return a number or date
 export function resolveValue(
-    str: string,
+    template: string,
     renderInfo: RenderInfo
-): number | string {
-    // console.log(str);
-    str = str.trim();
-    let value = null;
-    if (str.startsWith("{{") && str.endsWith("}}")) {
-        let retResolve = resolve(str, renderInfo);
-        value = parseFloat(retResolve);
-    } else {
-        value = parseFloat(str);
+): number | Moment | string {
+    // console.log(template);
+
+    let retResolve = resolve(template.trim(), renderInfo);
+    if (typeof retResolve === "string") {
+        return retResolve; // error message
     }
-    if (Number.isNumber(value) && !Number.isNaN(value)) {
-        return value;
+    let exprMap = retResolve as Array<ExprResolved>;
+
+    if (exprMap.length > 0) {
+        return exprMap[0].value; // only first value will be return
     }
+
     return "Error resolving values";
 }
diff --git a/src/pie.ts b/src/pie.ts
index 3ae214a..696d378 100644
--- a/src/pie.ts
+++ b/src/pie.ts
@@ -116,8 +116,9 @@ function renderPie(
         if (typeof retValue === "string") {
             errorMessage = retValue;
             break;
+        } else if (typeof retValue === "number") {
+            values.push(retValue);
         }
-        values.push(retValue);
     }
     if (errorMessage !== "") {
         return errorMessage;

From 07800abd66a1c9948b3f587d855d96f6518b73bd Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 15 Jul 2021 19:32:22 +0800
Subject: [PATCH 135/402] Fix resolving pure number

---
 src/expr.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/expr.ts b/src/expr.ts
index 63be677..9d04e61 100644
--- a/src/expr.ts
+++ b/src/expr.ts
@@ -740,12 +740,19 @@ export function resolveTemplate(
 
 // Resolve the template expression in string and return a number or date
 export function resolveValue(
-    template: string,
+    text: string,
     renderInfo: RenderInfo
 ): number | Moment | string {
     // console.log(template);
+    text = text.trim();
+
+    // input is pure number
+    if (/^([\-]?[0-9]+[\.][0-9]+|[\-]?[0-9]+)$/.test(text)) {
+        return parseFloat(text);
+    }
 
-    let retResolve = resolve(template.trim(), renderInfo);
+    // template
+    let retResolve = resolve(text, renderInfo);
     if (typeof retResolve === "string") {
         return retResolve; // error message
     }

From f6f6850a383ff3ebe9ee1f8d9d9ce78967fea374 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 16 Jul 2021 10:49:46 +0800
Subject: [PATCH 136/402] Parse custom dataset inputs

---
 examples/TestCustomDataset.md | 48 ++++++++++++++++++++
 src/data.ts                   | 16 +++++++
 src/main.ts                   |  4 +-
 src/parsing.ts                | 84 +++++++++++++++++++++++++++++++++++
 4 files changed, 151 insertions(+), 1 deletion(-)
 create mode 100644 examples/TestCustomDataset.md

diff --git a/examples/TestCustomDataset.md b/examples/TestCustomDataset.md
new file mode 100644
index 0000000..6ea1faf
--- /dev/null
+++ b/examples/TestCustomDataset.md
@@ -0,0 +1,48 @@
+# Test Custom Dataset
+
+## Normalize
+``` tracker
+searchType: tag
+searchTarget: weight
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-31
+dataset1:
+    name: A
+    xData: 1, 2
+	yData: 3, 4
+dataset2:
+    name: B
+    xData: 5, 6
+	yData: 7, 8
+line:
+    title: Weight Log
+    yAxisLabel: Weight
+    yAxisUnit: kg
+    lineColor: yellow
+```
+
+<!--
+## Moving Average
+
+## Manual Input
+Custom dataset only (no searchType and searchTarget)
+``` tracker
+
+```
+
+Dataset and custom dataset
+``` tracker
+
+```
+
+
+
+``` tracker
+searchType: task.done, task.notdone
+searchTarget: Say I love you, Say I love you
+folder: diary
+summary:
+    template: "How many days I said love: {{sum(dataset(0))}}\nHow many days I didn't say love: {{sum( dataset(0) + dataset(0) + 1)}}"
+```
+
diff --git a/src/data.ts b/src/data.ts
index d648f4c..9fd2dd7 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -544,6 +544,7 @@ export class RenderInfo {
     month: MonthInfo[];
     heatmap: HeatmapInfo[];
     bullet: BulletInfo[];
+    customDataset: CustomDatasetInfo[];
 
     public datasets: Datasets | null;
 
@@ -580,6 +581,7 @@ export class RenderInfo {
         this.month = [];
         this.heatmap = [];
         this.bullet = [];
+        this.customDataset = [];
 
         this.datasets = null;
     }
@@ -593,6 +595,20 @@ export class RenderInfo {
     }
 }
 
+export class CustomDatasetInfo {
+    id: number;
+    name: string;
+    xData: string[];
+    yData: string[];
+
+    constructor() {
+        this.id = -1;
+        this.name = "";
+        this.xData = [];
+        this.yData = [];
+    }
+}
+
 export class OutputInfo {
     constructor() {}
 }
diff --git a/src/main.ts b/src/main.ts
index 0dd2f2d..ab64ff2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -13,6 +13,7 @@ import {
     RenderInfo,
     XValueMap,
     DataMap,
+    CustomDatasetInfo,
 } from "./data";
 import * as collecting from "./collecting";
 import {
@@ -482,7 +483,8 @@ export default class Tracker extends Plugin {
         for (let tableData of tables) {
             //extract xDataset from query
             let xDatasetQuery = tableData.xDataset;
-            if (!xDatasetQuery) {// missing xDataset
+            if (!xDatasetQuery) {
+                // missing xDataset
                 continue;
             }
             let yDatasetQueries = tableData.yDatasets;
diff --git a/src/parsing.ts b/src/parsing.ts
index 4d17c04..e4c2b49 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -14,6 +14,7 @@ import {
     HeatmapInfo,
     BulletInfo,
     Dataset,
+    CustomDatasetInfo,
 } from "./data";
 import { TFolder, normalizePath } from "obsidian";
 import { parseYaml } from "obsidian";
@@ -1025,6 +1026,32 @@ export function getRenderInfoFromYaml(
             additionalAllowedKeys.push(key);
         }
     }
+    // Custom dataset
+    let yamlCustomDatasetKeys = [];
+    for (let key of keysFoundInYAML) {
+        if (/^dataset[0-9]*$/.test(key)) {
+            // Check the id of custom dataset is not duplicated
+            let customDatasetId = -1;
+            let strCustomDatasetId = key.replace("dataset", "");
+            if (strCustomDatasetId === "") {
+                customDatasetId = 0;
+            } else {
+                customDatasetId = parseFloat(strCustomDatasetId);
+            }
+
+            if (
+                queries.some((q) => {
+                    return q.getId() === customDatasetId;
+                })
+            ) {
+                errorMessage = "Duplicated dataset id for key '" + key + "'";
+                return errorMessage;
+            }
+
+            yamlCustomDatasetKeys.push(key);
+            additionalAllowedKeys.push(key);
+        }
+    }
     // console.log(additionalAllowedKeys);
     for (let key of keysFoundInYAML) {
         if (
@@ -1339,6 +1366,63 @@ export function getRenderInfoFromYaml(
     );
     // console.log(renderInfo.margin);
 
+    // customDataset related parameters
+    for (let datasetKey of yamlCustomDatasetKeys) {
+        let customDataset = new CustomDatasetInfo();
+        let yamlCustomDataset = yaml[datasetKey];
+
+        let keysOfCustomDatasetInfo = getAvailableKeysOfClass(customDataset);
+        let keysFoundInYAML = getAvailableKeysOfClass(yamlCustomDataset);
+        // console.log(keysOfCustomDatasetInfo);
+        // console.log(keysFoundInYAML);
+        for (let key of keysFoundInYAML) {
+            if (!keysOfCustomDatasetInfo.includes(key)) {
+                errorMessage = "'" + key + "' is not an available key";
+                return errorMessage;
+            }
+        }
+
+        // id
+        let customDatasetId = -1;
+        let strCustomDatasetId = datasetKey.replace("dataset", "");
+        if (strCustomDatasetId === "") {
+            customDatasetId = 0;
+        } else {
+            customDatasetId = parseFloat(strCustomDatasetId);
+        }
+        customDataset.id = customDatasetId;
+
+        // name
+        if (typeof yamlCustomDataset?.name === "string") {
+            customDataset.name = yamlCustomDataset.name;
+        }
+
+        // xData
+        let retXData = getStringArray("xData", yamlCustomDataset?.xData);
+        if (typeof retXData === "string") {
+            return retXData;
+        }
+        customDataset.xData = retXData;
+        // console.log(customDataset.xData);
+        let numXData = customDataset.xData.length;
+
+        // yData
+        let retYData = getStringArray("yData", yamlCustomDataset?.yData);
+        if (typeof retYData === "string") {
+            return retYData;
+        }
+        customDataset.yData = retYData;
+        // console.log(customDataset.yData);
+        if (customDataset.yData.length !== numXData) {
+            let errorMessage =
+                "Number of elements in xData and yData not matched";
+            return errorMessage;
+        }
+
+        renderInfo.customDataset.push(customDataset);
+    } // customDataset related parameters
+    // console.log(renderInfo.customDataset);
+
     // line related parameters
     for (let lineKey of yamlLineKeys) {
         let line = new LineInfo();

From d047856a2526d105b54b6f2e85167db04b397cc4 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 16 Jul 2021 11:21:02 +0800
Subject: [PATCH 137/402] Update examples

---
 ...emplateVariables.md => TestDatasetMath.md} | 28 +++++++++----------
 examples/TestPieChart.md                      | 17 +++++++----
 2 files changed, 26 insertions(+), 19 deletions(-)
 rename examples/{TestTemplateVariables.md => TestDatasetMath.md} (84%)

diff --git a/examples/TestTemplateVariables.md b/examples/TestDatasetMath.md
similarity index 84%
rename from examples/TestTemplateVariables.md
rename to examples/TestDatasetMath.md
index 62d03d3..78585d6 100644
--- a/examples/TestTemplateVariables.md
+++ b/examples/TestDatasetMath.md
@@ -1,4 +1,4 @@
-# Test Template Variables
+# Test Dataset Math
 
 ### {{min()}}
 ``` tracker
@@ -7,7 +7,7 @@ searchTarget: dataviewTarget
 folder: /diary
 endDate: 2021-01-03
 summary:
-    template: 'Minimum value: {{min()}} <-- should be 12'
+    template: 'Minimum value: {{min()::i}} <-- should be 12'
 ```
 
 ### {{minDate()}}
@@ -27,7 +27,7 @@ searchTarget: dataviewTarget
 folder: /diary
 endDate: 2021-01-03
 summary:
-    template: 'Maximum value: {{max()}} <-- should be 48'
+    template: 'Maximum value: {{max()::i}} <-- should be 48'
 ```
 
 ### {{maxDate()}}
@@ -67,7 +67,7 @@ searchTarget: meditation
 folder: /diary
 endDate: 2021-01-04
 summary:
-    template: 'Sum: {{sum()}} <-- should be 3'
+    template: 'Sum: {{sum()::i}} <-- should be 3'
 ```
 
 ### {{numTargets()}}
@@ -77,7 +77,7 @@ searchTarget: meditation
 folder: /diary
 endDate: 2021-01-04
 summary:
-    template: 'Number of targets: {{numTargets()}} <-- should be 3'
+    template: 'Number of targets: {{numTargets()::i}} <-- should be 3'
 ```
 
 ### {{numDays()}}
@@ -87,7 +87,7 @@ searchTarget: meditation
 folder: /diary
 endDate: 2021-01-04
 summary:
-    template: 'Number of days: {{numDays()}} <-- should be 4'
+    template: 'Number of days: {{numDays()::i}} <-- should be 4'
 ```
 
 ### {{numDaysHavingData()}}
@@ -97,7 +97,7 @@ searchTarget: meditation
 folder: /diary
 endDate: 2021-01-04
 summary:
-    template: 'Number of days having data: {{numDaysHavingData()}} <-- should be 3'
+    template: 'Number of days having data: {{numDaysHavingData()::i}} <-- should be 3'
 ```
 
 ### {{maxStreak()}}
@@ -107,7 +107,7 @@ searchTarget: meditation
 folder: /diary
 endDate: 2021-01-09
 summary:
-    template: 'Maximum streak: {{maxStreak()}} <-- should be 5'
+    template: 'Maximum streak: {{maxStreak()::i}} <-- should be 5'
 ```
 
 ### {{maxStreakStart()}}
@@ -137,7 +137,7 @@ searchTarget: meditation
 folder: /diary
 endDate: 2021-01-09
 summary:
-    template: 'Maximum breaks: {{maxBreaks()}} <-- should be 2'
+    template: 'Maximum breaks: {{maxBreaks()::i}} <-- should be 2'
 ```
 
 ### {{maxBreaksStart()}}
@@ -167,7 +167,7 @@ searchTarget: meditation
 folder: /diary
 endDate: 2021-01-24
 summary:
-    template: 'Latest streak: {{currentStreak()}} <-- should be 1'
+    template: 'Latest streak: {{currentStreak()::i}} <-- should be 1'
 ```
 
 ### {{currentStreakStart()}}
@@ -197,7 +197,7 @@ searchTarget: meditation
 folder: /diary
 endDate: 2021-01-22
 summary:
-    template: 'Current breaks: {{currentBreaks()}} <-- should be 1'
+    template: 'Current breaks: {{currentBreaks()::i}} <-- should be 1'
 ```
 
 ### {{currentBreaksStart()}}
@@ -228,7 +228,7 @@ searchTarget: dataviewTarget
 folder: /diary
 endDate: 2021-01-03
 summary:
-    template: 'Average value: {{average()}} <-- should be 28.33'
+    template: 'Average value: {{average()::.2f}} <-- should be 28.33'
 ```
 
 ### {{median()}}
@@ -238,7 +238,7 @@ searchTarget: dataviewTarget
 folder: /diary
 endDate: 2021-01-03
 summary:
-    template: 'Median value: {{median()}} <-- should be 25'
+    template: 'Median value: {{median()::i}} <-- should be 25'
 ```
 
 ### {{variance()}}
@@ -249,5 +249,5 @@ searchTarget: dataviewTarget
 folder: /diary
 endDate: 2021-01-03
 summary:
-    template: 'Variance value: {{variance()}} <-- should be 332.33'
+    template: 'Variance value: {{variance()::.2f}} <-- should be 332.33'
 ```
diff --git a/examples/TestPieChart.md b/examples/TestPieChart.md
index cc948dd..8878229 100644
--- a/examples/TestPieChart.md
+++ b/examples/TestPieChart.md
@@ -1,6 +1,5 @@
 # Test Pie Chart
 
-
 ## Manual Input Data
 ### Numbers
 To be fixed,
@@ -10,6 +9,7 @@ searchType: task.done, task.notdone
 searchTarget: Say I love you, Say I love you
 pie:
     title: Pie
+    label: '{{2/30*100}}%, {{4/30*100}}%, {{6/30*100}}%, {{8/30*100}}%, {{10/30*100}}%'
     data: '2, 4, 6, 8, 10'
     dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
     ratioInnerRadius: 0.5
@@ -23,6 +23,7 @@ If numeric data not wrapped by single quotes
 ``` tracker
 searchType: task.done, task.notdone
 searchTarget: Say I love you, Say I love you
+datasetName: Done, NotDone
 pie:
     title: Pie
     data: '{{1 + 1}}, {{2 * 2}}, {{12/ 2}}, {{1+(2+3*2)-1}}, {{27%17}}'
@@ -35,6 +36,7 @@ pie:
 searchType: task.done, task.notdone
 searchTarget: Say I love you, Say I love you
 folder: diary
+datasetName: Done, NotDone
 pie:
     title: Pie
     data: '{{sum(dataset(0))}},{{sum(dataset(1))}}'
@@ -54,7 +56,12 @@ summary:
 ``` tracker
 searchType: task.done, task.notdone
 searchTarget: Say I love you, Say I love you
-folder: diary
-summary:
-    template: "How many days I said love: {{sum(dataset(0))}}\nHow many days I didn't say love: {{sum( dataset(0) + dataset(0) + 1)}}"
-```
+datasetName: Done, NotDone
+pie:
+    title: Pie
+	label: '2%, 4%, 6%, 8%, 10%'
+	extLabel: A, B, C, D
+    data: '{{1 + 1}}, {{2 * 2}}, {{12/ 2}}, {{1+(2+3*2)-1}}, {{27%17}}'
+    dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
+    ratioInnerRadius: 0.5
+```
\ No newline at end of file

From e07552906bae5fe3b46e1fc82c7754d385f67000 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 16 Jul 2021 21:51:25 +0800
Subject: [PATCH 138/402] Update examples

---
 docs/MathOnDataset.md     | 57 +++++++++++++++++++++++++++++++++++++++
 docs/TemplateVariables.md | 46 -------------------------------
 2 files changed, 57 insertions(+), 46 deletions(-)
 create mode 100644 docs/MathOnDataset.md
 delete mode 100644 docs/TemplateVariables.md

diff --git a/docs/MathOnDataset.md b/docs/MathOnDataset.md
new file mode 100644
index 0000000..69b7d04
--- /dev/null
+++ b/docs/MathOnDataset.md
@@ -0,0 +1,57 @@
+# Template Variables
+
+## Importat!!! Changed!!!
+Currently, there are two places you can use template variables. First is the `template` parameter under output type `summary`. The second one is the `value` parameter under output type `bullet`. For each template variable, the plugin will do calculations based on the collected dataset refereed, and render the output with variables replaced by calculated results.
+
+The following table shows all the template variables available for now. The "N" in the table is the ID (the order of a target in `searchTarget` parameter starting from zero) or the name (specified by the parameter `datasetName`) of a dataset. 
+
+Examples using template variables could be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/BloodPressureTracker.md).
+
+## List of Dataset Related Functions
+
+| Function | Description |
+|:------------------|:-----------|
+| dataset(id: number): Dataset | |
+| min(dataset: Dataset): number | Minimum value of the dataset |
+| minDate(dataset: Dataset): Date | Latest date of minimum value |
+| max(dataset: Dataset): number | Maximum value of the dataset |
+| maxDate(dataset: Dataset): Date | Latest date of maximum value |
+| startDate(dataset: Dataset): Date | Start date of the dataset |
+| endDate(dataset: Dataset): Date | End date of the dataset |
+| sum(dataset: Dataset): number | Summation of values of the dataset |
+| numTargets(dataset: Dataset): number | Total counts of targets |
+| numDays(dataset: Dataset): number | Days from startDate to endDate |
+| numDaysHavingData(dataset: Dataset): number | Number of days having data |
+| maxStreak(dataset: Dataset): number | Maximum continuous days without breaks |
+| maxStreakStart(dataset: Dataset): Date | Start date of the max streak |
+| maxStreakEnd(dataset: Dataset): Date | End date of the max streak |
+| maxBreaks(dataset: Dataset): number | Maximum break days |
+| maxBreaksStart(dataset: Dataset): Date | Start date of the maximum break days |
+| maxBreaksEnd(dataset: Dataset): Date | End date of the maximum break days |
+| currentStreak(dataset: Dataset): number | Current continuous days |
+| currentStreakStart(dataset: Dataset): Date | Start date of current streak |
+| currentStreakEnd(dataset: Dataset): Date | End date of current streak |
+| currentBreaks(dataset: Dataset): number | Current break days |
+| currentBreaksStart(dataset: Dataset): Date | Start date of current breaks |
+| currentBreaksEnd(dataset: Dataset): Date | End date of current breaks |
+| average(dataset: Dataset): number | Average value of the dataset |
+| median(dataset: Dataset): number | Median value of the dataset |
+| variance(dataset: Dataset): number | Variance value of the dataset |
+
+## List of Binary Operation
+| Function | Description |
+|:------------------|:-----------|
+| + | |
+| - | |
+| * | |
+| / | |
+| % | |
+
+## List of Deprecated Template Variables
+| Template variable | Description |
+|:------------------|:-----------|
+| count | Use numTargets instead |
+| days | Use numDays instead |
+| lastStreak | Use currentSteak instead |
+
+Notice when doing calculations like sum or average, the missing values are ignored. You can set those missing values to zero by setting the value of key `penalty`  to zero. Moreover, if the key `ignoreZeroValue` is assigned true, zero value will be ignored too. You can check these parameters [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md)
\ No newline at end of file
diff --git a/docs/TemplateVariables.md b/docs/TemplateVariables.md
deleted file mode 100644
index ec91c01..0000000
--- a/docs/TemplateVariables.md
+++ /dev/null
@@ -1,46 +0,0 @@
-# Template Variables
-
-Currently, there are two places you can use template variables. First is the `template` parameter under output type `summary`. The second one is the `value` parameter under output type `bullet`. For each template variable, the plugin will do calculations based on the collected dataset refereed, and render the output with variables replaced by calculated results.
-
-The following table shows all the template variables available for now. The "N" in the table is the ID (the order of a target in `searchTarget` parameter starting from zero) or the name (specified by the parameter `datasetName`) of a dataset. 
-
-Examples using template variables could be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/BloodPressureTracker.md).
-
-## List of Template Variables
-
-| Template variable | Description |
-|:------------------|:-----------|
-| {{min}}<br>{{min(Dataset(N))}} | Minimum value of the dataset |
-| {{minDate}}<br>{{minDate(Dataset(N))}} | Latest date of minimum value |
-| {{max}}<br>{{max(Dataset(N))}} | Maximum value of the dataset |
-| {{maxDate}}<br>{{maxDate(Dataset(N))}} | Latest date of maximum value |
-| {{startDate}}<br>{{startDate(Dataset(N))}} | Start date of the dataset |
-| {{endDate}}<br>{{endDate(Dataset(N))}} | End date of the dataset |
-| {{sum}}<br>{{sum(Dataset(N))}} | Summation of values of the dataset |
-| {{numTargets}}<br>{{numTargets(Dataset(N))}} | Total counts of targets |
-| {{numDays}}<br>{{numDays(Dataset(N))}} | Days from startDate to endDate |
-| {{numDaysHavingData}}<br>{{numDaysHavingData(Dataset(N))}} | Number of days having data |
-| {{maxStreak}}<br>{{maxStreak(Dataset(N))}} | Maximum continuous days without breaks |
-| {{maxStreakStart}}<br>{{maxStreakStart(Dataset(N))}} | Start date of the max streak |
-| {{maxStreakEnd}}<br>{{maxStreakEnd(Dataset(N))}} | End date of the max streak |
-| {{maxBreaks}}<br>{{maxBreaks(Dataset(N))}} | Maximum break days |
-| {{maxBreaksStart}}<br>{{maxBreaksStart(Dataset(N))}} | Start date of the maximum break days |
-| {{maxBreaksEnd}}<br>{{maxBreaksEnd(Dataset(N))}} | End date of the maximum break days |
-| {{currentStreak}}<br>{{currentStreak(Dataset(N))}} | Current continuous days |
-| {{currentStreakStart}}<br>{{currentStreakStart(Dataset(N))}} | Start date of current streak |
-| {{currentStreakEnd}}<br>{{currentStreakEnd(Dataset(N))}} | End date of current streak |
-| {{currentBreaks}}<br>{{currentBreaks(Dataset(N))}} | Current break days |
-| {{currentBreaksStart}}<br>{{currentBreaksStart(Dataset(N))}} | Start date of current breaks |
-| {{currentBreaksEnd}}<br>{{currentBreaksEnd(Dataset(N))}} | End date of current breaks |
-| {{average}}<br>{{average(Dataset(N))}} | Average value of the dataset |
-| {{median}}<br>{{median(Dataset(N))}} | Median value of the dataset |
-| {{variance}}<br>{{variance(Dataset(N))}} | Variance value of the dataset |
-
-## List of Deprecated Template Variables
-| Template variable | Description |
-|:------------------|:-----------|
-| {{count}}<br>{{count(Dataset(N))}} | Use numTargets instead |
-| {{days}}<br>{{days(Dataset(N))}} | Use numDays instead |
-| {{lastStreak}}<br>{{lastStreak(Dataset(N))}} | Use currentSteak instead |
-
-Notice when doing calculations like sum or average, the missing values are ignored. You can set those missing values to zero by setting the value of key `penalty`  to zero. Moreover, if the key `ignoreZeroValue` is assigned true, zero value will be ignored too. You can check these parameters [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md)
\ No newline at end of file

From 26c1613fc341c06065ecbbd4d039d4d08995cdab Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 18 Jul 2021 11:36:23 +0800
Subject: [PATCH 139/402] Handle error messages for expression

---
 src/expr.ts    | 249 ++++++++++++++++++++++++++++++++++++++-----------
 src/summary.ts |   9 +-
 2 files changed, 201 insertions(+), 57 deletions(-)

diff --git a/src/expr.ts b/src/expr.ts
index 9d04e61..2f98135 100644
--- a/src/expr.ts
+++ b/src/expr.ts
@@ -28,6 +28,42 @@ interface FnMapBinaryOp {
     [key: string]: FnBinaryOp;
 }
 
+function checkDivisor(divisor: any) {
+    // console.log("checking divior");
+    if (typeof divisor === "number") {
+        if (divisor === 0) return false;
+    } else if (divisor instanceof Dataset) {
+        if (
+            divisor.getValues().some(function (v) {
+                return v === 0;
+            })
+        ) {
+            return false;
+        }
+    }
+    return true;
+}
+
+function checkBinaryOperantType(left: any, right: any) {
+    if (typeof left === "string") return left;
+    if (typeof right === "string") return right;
+    if (
+        typeof left !== "number" &&
+        !window.moment.isMoment(left) &&
+        !(left instanceof Dataset)
+    ) {
+        return "Error: invalide operant type";
+    }
+    if (
+        typeof right !== "number" &&
+        !window.moment.isMoment(right) &&
+        !(right instanceof Dataset)
+    ) {
+        return "Error: invalide operant type";
+    }
+    return "";
+}
+
 const fnMapDatasetToValue: FnMapDatasetToValue = {
     // min value of a dataset
     min: function (dataset, renderInfo) {
@@ -46,7 +82,7 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
                 }
             }
         }
-        return "Error evaluating: min not found";
+        return "Error: min not found";
     },
     // max value of a dataset
     max: function (dataset, renderInfo) {
@@ -65,7 +101,7 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
                 }
             }
         }
-        return "Error evaluating: max not found";
+        return "Error: max not found";
     },
     // start date of a dataset
     // if datasetId not found, return overall startDate
@@ -97,7 +133,7 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
         return d3.sum(dataset.getValues());
     },
     count: function (dataset, renderInfo) {
-        return "Error evaluating: deprecated function 'count'";
+        return "Error: deprecated function 'count'";
     },
     // number of occurrences of a target in a dataset
     numTargets: function (dataset, renderInfo) {
@@ -105,7 +141,7 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
         return dataset.getNumTargets();
     },
     days: function (dataset, renderInfo) {
-        return "Error evaluating: deprecated function 'days'";
+        return "Error: deprecated function 'days'";
     },
     numDays: function (dataset, renderInfo) {
         // return number
@@ -258,7 +294,7 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
         return maxBreaksEnd;
     },
     lastStreak: function (dataset, renderInfo) {
-        return "Error evaluating: deprecated function 'lastStreak'";
+        return "Error: deprecated function 'lastStreak'";
     },
     currentStreak: function (dataset, renderInfo) {
         // return number
@@ -296,7 +332,7 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
         }
 
         if (currentStreakStart === null) {
-            return "Error evaluating: absense";
+            return "Error: absense";
         }
         return currentStreakStart;
     },
@@ -320,7 +356,7 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
         }
 
         if (currentStreakEnd === null) {
-            return "Error evaluating: absense";
+            return "Error: absense";
         }
         return currentStreakEnd;
     },
@@ -360,7 +396,7 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
         }
 
         if (currentBreaksStart === null) {
-            return "Error evaluating: absense";
+            return "Error: absense";
         }
         return currentBreaksStart;
     },
@@ -384,18 +420,18 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
         }
 
         if (currentBreaksEnd === null) {
-            return "Error evaluating: absense";
+            return "Error: absense";
         }
         return currentBreaksEnd;
     },
     average: function (dataset, renderInfo) {
         // return number
         let countNotNull = dataset.getLengthNotNull();
-        if (countNotNull > 0) {
-            let sum = d3.sum(dataset.getValues());
-            return sum / countNotNull;
+        if (!checkDivisor(countNotNull)) {
+            return "Error: divide by zero in expression";
         }
-        return "Error evaluating: divide by zero";
+        let sum = d3.sum(dataset.getValues());
+        return sum / countNotNull;
     },
     median: function (dataset, renderInfo) {
         // return number
@@ -416,25 +452,37 @@ const fnMapBinaryOp: FnMapBinaryOp = {
             // return Dataset
             let tmpDataset = r.cloneToTmpDataset();
             tmpDataset.getValues().forEach(function (value, index, array) {
-                array[index] = l + value;
+                if (array[index] !== null) {
+                    array[index] = l + value;
+                } else {
+                    array[index] = null;
+                }
             });
             return tmpDataset;
         } else if (l instanceof Dataset && typeof r === "number") {
             // return Dataset
             let tmpDataset = l.cloneToTmpDataset();
             tmpDataset.getValues().forEach(function (value, index, array) {
-                array[index] = value + r;
+                if (array[index] !== null) {
+                    array[index] = value + r;
+                } else {
+                    array[index] = null;
+                }
             });
             return tmpDataset;
         } else if (l instanceof Dataset && r instanceof Dataset) {
             // return Dataset
             let tmpDataset = l.cloneToTmpDataset();
             tmpDataset.getValues().forEach(function (value, index, array) {
-                array[index] = value + r.getValues()[index];
+                if (array[index] !== null) {
+                    array[index] = value + r.getValues()[index];
+                } else {
+                    array[index] = null;
+                }
             });
             return tmpDataset;
         }
-        return "Error evaluating:";
+        return "Error: unknown operation for '+'";
     },
     "-": function (l, r) {
         if (typeof l === "number" && typeof r === "number") {
@@ -444,25 +492,37 @@ const fnMapBinaryOp: FnMapBinaryOp = {
             // return Dataset
             let tmpDataset = r.cloneToTmpDataset();
             tmpDataset.getValues().forEach(function (value, index, array) {
-                array[index] = l - value;
+                if (array[index] !== null) {
+                    array[index] = l - value;
+                } else {
+                    array[index] = null;
+                }
             });
             return tmpDataset;
         } else if (l instanceof Dataset && typeof r === "number") {
             // return Dataset
             let tmpDataset = l.cloneToTmpDataset();
             tmpDataset.getValues().forEach(function (value, index, array) {
-                array[index] = value - r;
+                if (array[index] !== null) {
+                    array[index] = value - r;
+                } else {
+                    array[index] = null;
+                }
             });
             return tmpDataset;
         } else if (l instanceof Dataset && r instanceof Dataset) {
             // return Dataset
             let tmpDataset = l.cloneToTmpDataset();
             tmpDataset.getValues().forEach(function (value, index, array) {
-                array[index] = value - r.getValues()[index];
+                if (array[index] !== null) {
+                    array[index] = value - r.getValues()[index];
+                } else {
+                    array[index] = null;
+                }
             });
             return tmpDataset;
         }
-        return "Error evaluating:";
+        return "Error: unknown operation for '-'";
     },
     "*": function (l, r) {
         if (typeof l === "number" && typeof r === "number") {
@@ -472,27 +532,42 @@ const fnMapBinaryOp: FnMapBinaryOp = {
             // return Dataset
             let tmpDataset = r.cloneToTmpDataset();
             tmpDataset.getValues().forEach(function (value, index, array) {
-                array[index] = l * value;
+                if (array[index] !== null) {
+                    array[index] = l * value;
+                } else {
+                    array[index] = null;
+                }
             });
             return tmpDataset;
         } else if (l instanceof Dataset && typeof r === "number") {
             // return Dataset
             let tmpDataset = l.cloneToTmpDataset();
             tmpDataset.getValues().forEach(function (value, index, array) {
-                array[index] = value * r;
+                if (array[index] !== null) {
+                    array[index] = value * r;
+                } else {
+                    array[index] = null;
+                }
             });
             return tmpDataset;
         } else if (l instanceof Dataset && r instanceof Dataset) {
             // return Dataset
             let tmpDataset = l.cloneToTmpDataset();
             tmpDataset.getValues().forEach(function (value, index, array) {
-                array[index] = value * r.getValues()[index];
+                if (array[index] !== null) {
+                    array[index] = value * r.getValues()[index];
+                } else {
+                    array[index] = null;
+                }
             });
             return tmpDataset;
         }
-        return "Error evaluating:";
+        return "Error: unknown operation for '*'";
     },
     "/": function (l, r) {
+        if (!checkDivisor(r)) {
+            return "Error: divide by zero in expression";
+        }
         if (typeof l === "number" && typeof r === "number") {
             // return number
             return l / r;
@@ -500,27 +575,42 @@ const fnMapBinaryOp: FnMapBinaryOp = {
             // return Dataset
             let tmpDataset = r.cloneToTmpDataset();
             tmpDataset.getValues().forEach(function (value, index, array) {
-                array[index] = l / value;
+                if (array[index] !== null) {
+                    array[index] = l / value;
+                } else {
+                    array[index] = null;
+                }
             });
             return tmpDataset;
         } else if (l instanceof Dataset && typeof r === "number") {
             // return Dataset
             let tmpDataset = l.cloneToTmpDataset();
             tmpDataset.getValues().forEach(function (value, index, array) {
-                array[index] = value / r;
+                if (array[index] !== null) {
+                    array[index] = value / r;
+                } else {
+                    array[index] = null;
+                }
             });
             return tmpDataset;
         } else if (l instanceof Dataset && r instanceof Dataset) {
             // return Dataset
             let tmpDataset = l.cloneToTmpDataset();
             tmpDataset.getValues().forEach(function (value, index, array) {
-                array[index] = value / r.getValues()[index];
+                if (array[index] !== null) {
+                    array[index] = value / r.getValues()[index];
+                } else {
+                    array[index] = null;
+                }
             });
             return tmpDataset;
         }
-        return "Error evaluating:";
+        return "Error: unknown operation for '/'";
     },
     "%": function (l, r) {
+        if (!checkDivisor(r)) {
+            return "Error: divide by zero in expression";
+        }
         if (typeof l === "number" && typeof r === "number") {
             // return number
             return l % r;
@@ -528,25 +618,37 @@ const fnMapBinaryOp: FnMapBinaryOp = {
             // return Dataset
             let tmpDataset = r.cloneToTmpDataset();
             tmpDataset.getValues().forEach(function (value, index, array) {
-                array[index] = l % value;
+                if (array[index] !== null) {
+                    array[index] = l % value;
+                } else {
+                    array[index] = null;
+                }
             });
             return tmpDataset;
         } else if (l instanceof Dataset && typeof r === "number") {
             // return Dataset
             let tmpDataset = l.cloneToTmpDataset();
             tmpDataset.getValues().forEach(function (value, index, array) {
-                array[index] = value % r;
+                if (array[index] !== null) {
+                    array[index] = value % r;
+                } else {
+                    array[index] = null;
+                }
             });
             return tmpDataset;
         } else if (l instanceof Dataset && r instanceof Dataset) {
             // return Dataset
             let tmpDataset = l.cloneToTmpDataset();
             tmpDataset.getValues().forEach(function (value, index, array) {
-                array[index] = value % r.getValues()[index];
+                if (array[index] !== null) {
+                    array[index] = value % r.getValues()[index];
+                } else {
+                    array[index] = null;
+                }
             });
             return tmpDataset;
         }
-        return "Error evaluating:";
+        return "Error: unknown operation for '%'";
     },
 };
 
@@ -583,10 +685,24 @@ function evaluate(expr: jsep.Expression, renderInfo: RenderInfo): any {
             let literalExpr = expr as jsep.Literal;
             return literalExpr.value; // string, number, boolean
 
+        case "Identifier":
+            let identifierExpr = expr as jsep.Identifier;
+            let identifierName = identifierExpr.name;
+            if (identifierName in fnMapDatasetToValue) {
+                return `Error: deprecated template variable '${identifierName}', use '${identifierName}()' instead`;
+            } else if (identifierName in fnMapDatasetToDataset) {
+                return `Error: deprecated template variable '${identifierName}', use '${identifierName}()' instead`;
+            }
+            return `Error: unknown function name '${identifierName}'`;
+
         case "BinaryExpression":
             let binaryExpr = expr as jsep.BinaryExpression;
             let leftValue = evaluate(binaryExpr.left, renderInfo);
             let rightValue = evaluate(binaryExpr.right, renderInfo);
+            let retCheck = checkBinaryOperantType(leftValue, rightValue);
+            if (typeof retCheck === "string" && retCheck.startsWith("Error:")) {
+                return retCheck;
+            }
             return fnMapBinaryOp[binaryExpr.operator](leftValue, rightValue);
 
         case "CallExpression":
@@ -598,16 +714,25 @@ function evaluate(expr: jsep.Expression, renderInfo: RenderInfo): any {
             // console.log(fnName);
             // console.log(args);
             let evaluatedArgs = evaluateArray(args, renderInfo);
+            if (typeof evaluatedArgs === "string") return evaluatedArgs;
 
             // function dataset accept only one arg in number
             if (fnName === "dataset") {
                 if (evaluatedArgs.length === 1) {
-                    return getDatasetById(evaluatedArgs[0], renderInfo);
+                    let arg = evaluatedArgs[0];
+                    if (typeof arg === "string") return arg;
+                    if (typeof arg !== "number") {
+                        return "Error: function 'dataset' only accepts id in number";
+                    }
+                    let dataset = getDatasetById(arg, renderInfo);
+                    if (!dataset) {
+                        return `Error: no dataset found for id '${arg}'`;
+                    }
+                    return dataset;
                 }
             }
-
             // fnDataset accept only one arg in number or Dataset
-            if (fnName in fnMapDatasetToValue) {
+            else if (fnName in fnMapDatasetToValue) {
                 if (evaluatedArgs.length === 0) {
                     // Use first non-X dataset
                     let dataset = null;
@@ -617,31 +742,36 @@ function evaluate(expr: jsep.Expression, renderInfo: RenderInfo): any {
                             // if breaks here, the index of Datasets not reset???
                         }
                     }
-                    if (dataset) {
-                        return fnMapDatasetToValue[fnName](dataset, renderInfo);
+                    if (!dataset) {
+                        return `No available dataset found for function ${fnName}`;
                     }
+                    return fnMapDatasetToValue[fnName](dataset, renderInfo);
                 }
                 if (evaluatedArgs.length === 1) {
-                    return fnMapDatasetToValue[fnName](
-                        evaluatedArgs[0],
-                        renderInfo
-                    );
+                    let arg = evaluatedArgs[0];
+                    if (typeof arg === "string") return arg;
+                    if (arg instanceof Dataset) {
+                        return fnMapDatasetToValue[fnName](arg, renderInfo);
+                    } else {
+                        return `Error: function '${fnName}' only accepts Dataset`;
+                    }
                 }
-                return "Error evaluating:";
-            }
-
-            if (fnName in fnMapDatasetToDataset) {
+                return `Error: Too many arguments for function ${fnName}`;
+            } else if (fnName in fnMapDatasetToDataset) {
                 if (evaluatedArgs.length === 1) {
-                    return fnMapDatasetToDataset[fnName](
-                        evaluatedArgs[0],
-                        renderInfo
-                    );
+                    let arg = evaluatedArgs[0];
+                    if (typeof arg === "string") return arg;
+                    if (arg instanceof Dataset) {
+                        return fnMapDatasetToDataset[fnName](arg, renderInfo);
+                    } else {
+                        return `Error: function ${fnName} only accept Dataset`;
+                    }
                 }
+                return `Error: Too many arguments for function ${fnName}`;
             }
-
-            return "Error evaluating:";
+            return `Error: unknown function name '${fnName}'`;
     }
-    return "Error evaluating expression";
+    return "Error: unknown expression";
 }
 
 interface ExprResolved {
@@ -672,8 +802,17 @@ function resolve(
             if (typeof match.groups.expr !== "undefined") {
                 let expr = match.groups.expr;
 
-                const ast = jsep(expr);
+                let ast = null;
+                try {
+                    ast = jsep(expr);
+                } catch (err) {
+                    return "Error:" + err.message;
+                }
+                if (!ast) {
+                    return "Error: failed to parse expression";
+                }
                 // console.log(ast);
+
                 const value = evaluate(ast, renderInfo);
                 if (typeof value === "string") {
                     return value; // error message
@@ -762,5 +901,5 @@ export function resolveValue(
         return exprMap[0].value; // only first value will be return
     }
 
-    return "Error resolving values";
+    return "Error: failed to resolve values";
 }
diff --git a/src/summary.ts b/src/summary.ts
index c12d4f8..6c64ba9 100644
--- a/src/summary.ts
+++ b/src/summary.ts
@@ -22,8 +22,13 @@ export function renderSummary(
         return "Invalid summary template";
     }
 
-    outputSummary = expr.resolveTemplate(outputSummary, renderInfo);
-    // console.log(outputSummary);
+    let retResolvedTemplate = expr.resolveTemplate(outputSummary, renderInfo);
+    // console.log(retResolvedTemplate);
+    if (retResolvedTemplate.startsWith("Error:")) {
+        return retResolvedTemplate;
+    }
+    outputSummary = retResolvedTemplate;
+
     if (outputSummary !== "") {
         let textBlock = d3.select(canvas).append("div");
         if (outputSummary.includes("\n")) {

From 6a32b0640c34838294da07ebe98bbf984ae028c4 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 18 Jul 2021 11:38:16 +0800
Subject: [PATCH 140/402] Update ErrorMessages.md

---
 examples/ErrorMessages.md | 47 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 45 insertions(+), 2 deletions(-)

diff --git a/examples/ErrorMessages.md b/examples/ErrorMessages.md
index 6c36823..78b320a 100644
--- a/examples/ErrorMessages.md
+++ b/examples/ErrorMessages.md
@@ -1,6 +1,7 @@
 # Error Messages
+
 ## YAML
-Error parsing caused by the escaping character --> YAMLParsError: Missing closing "quote"
+Error parsing caused by the escaping character YAMLParsError: Missing closing "quote"
 ``` tracker
 searchType: tag
 searchTarget: "\"
@@ -142,4 +143,46 @@ line:
 Please also check those search targets in markdown files under folder 'diary' and 'data'.
 
 ## Expression
-TODO
\ No newline at end of file
+Unknown function
+``` tracker
+searchType: task
+searchTarget: Say I love you
+summary:
+    template: '{{unknown()}}'
+```
+
+Incomplete expression
+``` tracker
+searchType: task
+searchTarget: Say I love you
+summary:
+    template: '{{1+}}'
+```
+
+No data set found for id
+``` tracker
+searchType: task
+searchTarget: Say I love you
+summary:
+    template: '{{sum(dataset(1))}}'
+```
+
+Divide by zero
+``` tracker
+searchType: task
+searchTarget: Say I love you
+summary:
+    template: '{{sum()/0}}'
+```
+
+## Deprecated
+### Deprecated template variables
+
+Deprecated template variable
+``` tracker
+searchType: task
+searchTarget: Say I love you
+summary:
+    template: '{{sum}}'
+```
+

From 5eaa79594be9a3861200a2f11dde66bfab6621b3 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 18 Jul 2021 18:44:15 +0800
Subject: [PATCH 141/402] Add expression function setMissingValues; fix
 expression function normalize

---
 examples/ErrorMessages.md   |   8 +++
 examples/TestDatasetMath.md |  73 +++++++++++++-------
 src/data.ts                 |  41 ++++++++---
 src/expr.ts                 | 132 +++++++++++++++++++++++++++++++++---
 4 files changed, 208 insertions(+), 46 deletions(-)

diff --git a/examples/ErrorMessages.md b/examples/ErrorMessages.md
index 78b320a..a986a5f 100644
--- a/examples/ErrorMessages.md
+++ b/examples/ErrorMessages.md
@@ -175,6 +175,14 @@ summary:
     template: '{{sum()/0}}'
 ```
 
+Invalid datarange
+``` tracker
+searchType: tag
+searchTarget: meditation
+summary:
+    template: '{{sum(normalize(dataset(0)))}}'
+```
+
 ## Deprecated
 ### Deprecated template variables
 
diff --git a/examples/TestDatasetMath.md b/examples/TestDatasetMath.md
index 78585d6..959706c 100644
--- a/examples/TestDatasetMath.md
+++ b/examples/TestDatasetMath.md
@@ -1,6 +1,7 @@
 # Test Dataset Math
 
-### {{min()}}
+# Function Dataset to Value
+### min(Dataset): number
 ``` tracker
 searchType: dvField
 searchTarget: dataviewTarget
@@ -10,7 +11,7 @@ summary:
     template: 'Minimum value: {{min()::i}} <-- should be 12'
 ```
 
-### {{minDate()}}
+### minDate(Dataset): Date
 ``` tracker
 searchType: dvField
 searchTarget: dataviewTarget
@@ -20,7 +21,7 @@ summary:
     template: 'Latest date of minimum value: {{minDate()}} <-- should be 2021-01-03'
 ```
 
-### {{max()}}
+### max(Dataset): number
 ``` tracker
 searchType: dvField
 searchTarget: dataviewTarget
@@ -30,7 +31,7 @@ summary:
     template: 'Maximum value: {{max()::i}} <-- should be 48'
 ```
 
-### {{maxDate()}}
+### maxDate()
 ``` tracker
 searchType: dvField
 searchTarget: dataviewTarget
@@ -40,7 +41,7 @@ summary:
     template: 'Latest date of maximum value: {{maxDate()}} <-- should be 2021-01-01'
 ```
 
-### {{startDate()}}
+### startDate()
 ``` tracker
 searchType: dvField
 searchTarget: dataviewTarget
@@ -50,7 +51,7 @@ summary:
     template: 'Start date: {{startDate()}} <-- should be 2021-01-01'
 ```
 
-### {{endDate()}}
+### endDate()
 ``` tracker
 searchType: dvField
 searchTarget: dataviewTarget
@@ -60,7 +61,7 @@ summary:
     template: 'End date: {{endDate()}} <-- should be 2021-01-03'
 ```
 
-### {{sum()}}
+### sum()
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -70,7 +71,7 @@ summary:
     template: 'Sum: {{sum()::i}} <-- should be 3'
 ```
 
-### {{numTargets()}}
+### numTargets()
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -80,7 +81,7 @@ summary:
     template: 'Number of targets: {{numTargets()::i}} <-- should be 3'
 ```
 
-### {{numDays()}}
+### numDays()
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -90,7 +91,7 @@ summary:
     template: 'Number of days: {{numDays()::i}} <-- should be 4'
 ```
 
-### {{numDaysHavingData()}}
+### numDaysHavingData()
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -100,7 +101,7 @@ summary:
     template: 'Number of days having data: {{numDaysHavingData()::i}} <-- should be 3'
 ```
 
-### {{maxStreak()}}
+### maxStreak()
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -110,7 +111,7 @@ summary:
     template: 'Maximum streak: {{maxStreak()::i}} <-- should be 5'
 ```
 
-### {{maxStreakStart()}}
+### maxStreakStart()
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -120,7 +121,7 @@ summary:
     template: 'The start date of maximum streak: {{maxStreakStart()}} <-- should be 2021-01-02'
 ```
 
-### {{maxStreakEnd()}}
+### maxStreakEnd()
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -130,7 +131,7 @@ summary:
     template: 'The end date of maximum streak: {{maxStreakEnd()}} <-- should be 2021-01-06'
 ```
 
-### {{maxBreaks()}}
+### maxBreaks()
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -140,7 +141,7 @@ summary:
     template: 'Maximum breaks: {{maxBreaks()::i}} <-- should be 2'
 ```
 
-### {{maxBreaksStart()}}
+### maxBreaksStart()
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -150,7 +151,7 @@ summary:
     template: 'The start date of maximum breaks: {{maxBreaksStart()}} <-- should be 2021-01-07'
 ```
 
-### {{maxBreaksEnd()}}
+### maxBreaksEnd()
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -160,7 +161,7 @@ summary:
     template: 'The end date of maximum breaks: {{maxBreaksEnd()}} <-- should be 2021-01-08'
 ```
 
-### {{currentStreak()}}
+### currentStreak()
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -170,7 +171,7 @@ summary:
     template: 'Latest streak: {{currentStreak()::i}} <-- should be 1'
 ```
 
-### {{currentStreakStart()}}
+### currentStreakStart()
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -180,7 +181,7 @@ summary:
     template: 'The start date of current streak: {{currentStreakStart()}} <-- should be 2021-01-24'
 ```
 
-### {{currentStreakEnd()}}
+### currentStreakEnd()
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -190,7 +191,7 @@ summary:
     template: 'The end date of current streak: {{currentStreakEnd()}} <-- should be 2021-01-24'
 ```
 
-### {{currentBreaks()}}
+### currentBreaks()
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -200,7 +201,7 @@ summary:
     template: 'Current breaks: {{currentBreaks()::i}} <-- should be 1'
 ```
 
-### {{currentBreaksStart()}}
+### currentBreaksStart()
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -210,7 +211,7 @@ summary:
     template: 'The start date of current breaks: {{currentBreaksStart()}} <-- should be 2021-01-22'
 ```
 
-### {{currentBreaksEnd()}}
+### currentBreaksEnd()
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -220,7 +221,7 @@ summary:
     template: 'The end date of current breaks: {{currentBreaksEnd()}} <-- should be 2021-01-22'
 ```
 
-### {{average()}}
+### average()
 (48+25+12)/3 = 28.33
 ``` tracker
 searchType: dvField
@@ -231,7 +232,7 @@ summary:
     template: 'Average value: {{average()::.2f}} <-- should be 28.33'
 ```
 
-### {{median()}}
+### median()
 ``` tracker
 searchType: dvField
 searchTarget: dataviewTarget
@@ -241,7 +242,7 @@ summary:
     template: 'Median value: {{median()::i}} <-- should be 25'
 ```
 
-### {{variance()}}
+### variance()
 https://mathworld.wolfram.com/SampleVariance.html
 ``` tracker
 searchType: dvField
@@ -251,3 +252,25 @@ endDate: 2021-01-03
 summary:
     template: 'Variance value: {{variance()::.2f}} <-- should be 332.33'
 ```
+
+## Function Dataset to Dataset
+
+### setMissingValues()
+``` tracker
+searchType: tag
+searchTarget: meditation
+folder: /diary
+endDate: 2021-01-04
+summary:
+    template: 'Set missing values to -1 then do summation: {{sum( setMissingValues( dataset(0), -1 ) )::i}} <-- should be 2'
+```
+
+### Normalize()
+``` tracker
+searchType: tag
+searchTarget: meditation
+folder: /diary
+endDate: 2021-01-04
+summary:
+    template: 'Set missing values to -1, do normalization then do summation: {{sum( normalize( setMissingValues(dataset(0), -1) ) )::i}} <-- sgiydk be 3'
+```
\ No newline at end of file
diff --git a/src/data.ts b/src/data.ts
index 9fd2dd7..4fa6b70 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -199,6 +199,8 @@ export class Dataset implements IterableIterator<DataPoint> {
     private lineInfo: LineInfo;
     private barInfo: BarInfo;
 
+    private isTmpDataset: boolean;
+
     valueType: ValueType;
 
     private currentIndex = 0; // IterableIterator
@@ -216,6 +218,9 @@ export class Dataset implements IterableIterator<DataPoint> {
         this.numTargets = 0;
         this.lineInfo = null;
         this.barInfo = null;
+
+        this.isTmpDataset = false;
+
         this.valueType = query?.valueType;
 
         for (let ind = 0; ind < parent.getDates().length; ind++) {
@@ -224,16 +229,20 @@ export class Dataset implements IterableIterator<DataPoint> {
     }
 
     public cloneToTmpDataset() {
-        let tmpDataset = new Dataset(this.parent, null);
-        tmpDataset.name = "tmp";
-        tmpDataset.values = [...this.values];
-        tmpDataset.yMin = this.yMin;
-        tmpDataset.yMax = this.yMax;
-        tmpDataset.startDate = this.startDate.clone();
-        tmpDataset.endDate = this.endDate.clone();
-        tmpDataset.numTargets = this.numTargets;
-        tmpDataset.valueType = this.valueType;
-        return tmpDataset;
+        if (!this.isTmpDataset) {
+            let tmpDataset = new Dataset(this.parent, null);
+            tmpDataset.name = "tmp";
+            tmpDataset.values = [...this.values];
+            tmpDataset.yMin = this.yMin;
+            tmpDataset.yMax = this.yMax;
+            tmpDataset.startDate = this.startDate.clone();
+            tmpDataset.endDate = this.endDate.clone();
+            tmpDataset.numTargets = this.numTargets;
+            tmpDataset.isTmpDataset = true;
+            tmpDataset.valueType = this.valueType;
+            return tmpDataset;
+        }
+        return this; // already tmp dataset
     }
 
     public getName() {
@@ -271,15 +280,20 @@ export class Dataset implements IterableIterator<DataPoint> {
     public setValue(date: Moment, value: number) {
         let ind = this.parent.getIndexOfDate(date);
         // console.log(ind);
-        if (ind >= 0) {
+
+        if (ind >= 0 && ind < this.values.length) {
+            // Set value
             this.values[ind] = value;
 
+            // Update yMin and yMax
             if (this.yMin === null || value < this.yMin) {
                 this.yMin = value;
             }
             if (this.yMax === null || value > this.yMax) {
                 this.yMax = value;
             }
+
+            // Update startDate and endDate
             if (this.startDate === null || date < this.startDate) {
                 this.startDate = date.clone();
             }
@@ -289,6 +303,11 @@ export class Dataset implements IterableIterator<DataPoint> {
         }
     }
 
+    public recalculateMinMax() {
+        this.yMin = Math.min(...this.values);
+        this.yMax = Math.max(...this.values);
+    }
+
     public getYMin() {
         return this.yMin;
     }
diff --git a/src/expr.ts b/src/expr.ts
index 2f98135..38671e6 100644
--- a/src/expr.ts
+++ b/src/expr.ts
@@ -10,7 +10,14 @@ type FnDatasetToValue = (
     dataset: Dataset,
     renderInfo: RenderInfo
 ) => number | Moment | string;
-type FnDatasetToDataset = (dataset: Dataset, renderInfo: RenderInfo) => Dataset;
+type FnDatasetToDataset = (
+    dataset: Dataset,
+    args: Array<number | Dataset>,
+    renderInfo: RenderInfo
+) => Dataset | string;
+type FnUniryOp = (
+    u: number | Moment | Dataset
+) => number | Moment | Dataset | string;
 type FnBinaryOp = (
     l: number | Moment | Dataset,
     r: number | Moment | Dataset
@@ -28,6 +35,10 @@ interface FnMapBinaryOp {
     [key: string]: FnBinaryOp;
 }
 
+interface FnMapUniryOp {
+    [key: string]: FnUniryOp;
+}
+
 function checkDivisor(divisor: any) {
     // console.log("checking divior");
     if (typeof divisor === "number") {
@@ -52,7 +63,7 @@ function checkBinaryOperantType(left: any, right: any) {
         !window.moment.isMoment(left) &&
         !(left instanceof Dataset)
     ) {
-        return "Error: invalide operant type";
+        return "Error: invalid operant type";
     }
     if (
         typeof right !== "number" &&
@@ -443,6 +454,33 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
     },
 };
 
+const fnMapUniryOp: FnMapUniryOp = {
+    "-": function (u) {
+        if (typeof u === "number") {
+            return -1 * u;
+        } else if (u instanceof Dataset) {
+            let tmpDataset = u.cloneToTmpDataset();
+            tmpDataset.getValues().forEach(function (value, index, array) {
+                if (array[index] !== null) {
+                    array[index] = -1 * value;
+                }
+            });
+            tmpDataset.recalculateMinMax();
+            return tmpDataset;
+        }
+        return "Error: unknown operation for '-'";
+    },
+    "+": function (u) {
+        if (typeof u === "number") {
+            return u;
+        } else if (u instanceof Dataset) {
+            let tmpDataset = u.cloneToTmpDataset();
+            return tmpDataset;
+        }
+        return "Error: unknown operation for '+'";
+    },
+};
+
 const fnMapBinaryOp: FnMapBinaryOp = {
     "+": function (l, r) {
         if (typeof l === "number" && typeof r === "number") {
@@ -458,6 +496,7 @@ const fnMapBinaryOp: FnMapBinaryOp = {
                     array[index] = null;
                 }
             });
+            tmpDataset.recalculateMinMax();
             return tmpDataset;
         } else if (l instanceof Dataset && typeof r === "number") {
             // return Dataset
@@ -469,6 +508,7 @@ const fnMapBinaryOp: FnMapBinaryOp = {
                     array[index] = null;
                 }
             });
+            tmpDataset.recalculateMinMax();
             return tmpDataset;
         } else if (l instanceof Dataset && r instanceof Dataset) {
             // return Dataset
@@ -480,6 +520,7 @@ const fnMapBinaryOp: FnMapBinaryOp = {
                     array[index] = null;
                 }
             });
+            tmpDataset.recalculateMinMax();
             return tmpDataset;
         }
         return "Error: unknown operation for '+'";
@@ -498,6 +539,7 @@ const fnMapBinaryOp: FnMapBinaryOp = {
                     array[index] = null;
                 }
             });
+            tmpDataset.recalculateMinMax();
             return tmpDataset;
         } else if (l instanceof Dataset && typeof r === "number") {
             // return Dataset
@@ -520,6 +562,7 @@ const fnMapBinaryOp: FnMapBinaryOp = {
                     array[index] = null;
                 }
             });
+            tmpDataset.recalculateMinMax();
             return tmpDataset;
         }
         return "Error: unknown operation for '-'";
@@ -538,6 +581,7 @@ const fnMapBinaryOp: FnMapBinaryOp = {
                     array[index] = null;
                 }
             });
+            tmpDataset.recalculateMinMax();
             return tmpDataset;
         } else if (l instanceof Dataset && typeof r === "number") {
             // return Dataset
@@ -549,6 +593,7 @@ const fnMapBinaryOp: FnMapBinaryOp = {
                     array[index] = null;
                 }
             });
+            tmpDataset.recalculateMinMax();
             return tmpDataset;
         } else if (l instanceof Dataset && r instanceof Dataset) {
             // return Dataset
@@ -560,6 +605,7 @@ const fnMapBinaryOp: FnMapBinaryOp = {
                     array[index] = null;
                 }
             });
+            tmpDataset.recalculateMinMax();
             return tmpDataset;
         }
         return "Error: unknown operation for '*'";
@@ -581,6 +627,7 @@ const fnMapBinaryOp: FnMapBinaryOp = {
                     array[index] = null;
                 }
             });
+            tmpDataset.recalculateMinMax();
             return tmpDataset;
         } else if (l instanceof Dataset && typeof r === "number") {
             // return Dataset
@@ -592,6 +639,7 @@ const fnMapBinaryOp: FnMapBinaryOp = {
                     array[index] = null;
                 }
             });
+            tmpDataset.recalculateMinMax();
             return tmpDataset;
         } else if (l instanceof Dataset && r instanceof Dataset) {
             // return Dataset
@@ -603,6 +651,7 @@ const fnMapBinaryOp: FnMapBinaryOp = {
                     array[index] = null;
                 }
             });
+            tmpDataset.recalculateMinMax();
             return tmpDataset;
         }
         return "Error: unknown operation for '/'";
@@ -624,6 +673,7 @@ const fnMapBinaryOp: FnMapBinaryOp = {
                     array[index] = null;
                 }
             });
+            tmpDataset.recalculateMinMax();
             return tmpDataset;
         } else if (l instanceof Dataset && typeof r === "number") {
             // return Dataset
@@ -635,6 +685,7 @@ const fnMapBinaryOp: FnMapBinaryOp = {
                     array[index] = null;
                 }
             });
+            tmpDataset.recalculateMinMax();
             return tmpDataset;
         } else if (l instanceof Dataset && r instanceof Dataset) {
             // return Dataset
@@ -646,6 +697,7 @@ const fnMapBinaryOp: FnMapBinaryOp = {
                     array[index] = null;
                 }
             });
+            tmpDataset.recalculateMinMax();
             return tmpDataset;
         }
         return "Error: unknown operation for '%'";
@@ -654,16 +706,42 @@ const fnMapBinaryOp: FnMapBinaryOp = {
 
 const fnMapDatasetToDataset: FnMapDatasetToDataset = {
     // min value of a dataset
-    normalize: function (dataset, renderInfo) {
+    normalize: function (dataset, args, renderInfo) {
+        // console.log("normalize");
+        // console.log(dataset);
         let yMin = dataset.getYMin();
         let yMax = dataset.getYMax();
-        if (yMax > yMin) {
+        // console.log(`yMin/yMax: ${yMin}/${yMax}`);
+        if (yMin !== null && yMax !== null && yMax > yMin) {
             let normalized = dataset.cloneToTmpDataset();
             normalized.getValues().forEach(function (value, index, array) {
                 array[index] = (value - yMin) / (yMax - yMin);
             });
+            normalized.recalculateMinMax();
+            return normalized;
+        }
+        return "Error: invalid data range for function 'normalize'";
+    },
+    setMissingValues: function (dataset, args, renderInfo) {
+        // console.log("setMissingValues");
+        // console.log(dataset);
+        // console.log(args);
+        if (args && args.length > 0) {
+            let missingValue = args[0];
+            // console.log(missingValue);
+            let newDataset = dataset.cloneToTmpDataset();
+            if (Number.isNumber(missingValue) && !Number.isNaN(missingValue)) {
+                newDataset.getValues().forEach(function (value, index, array) {
+                    if (value === null) {
+                        array[index] = missingValue as number;
+                    }
+                });
+                newDataset.recalculateMinMax();
+                return newDataset;
+            }
+            return "Error: invalid arguments for function 'setMissingValues'";
         }
-        return dataset;
+        return "Error: invalid arguments for function 'setMissingValues";
     },
 };
 
@@ -695,6 +773,14 @@ function evaluate(expr: jsep.Expression, renderInfo: RenderInfo): any {
             }
             return `Error: unknown function name '${identifierName}'`;
 
+        case "UnaryExpression":
+            let uniryExpr = expr as jsep.UnaryExpression;
+            let retUniryArg = evaluate(uniryExpr.argument, renderInfo);
+            if (typeof retUniryArg === "string") {
+                return retUniryArg;
+            }
+            return fnMapUniryOp[uniryExpr.operator](retUniryArg);
+
         case "BinaryExpression":
             let binaryExpr = expr as jsep.BinaryExpression;
             let leftValue = evaluate(binaryExpr.left, renderInfo);
@@ -759,10 +845,35 @@ function evaluate(expr: jsep.Expression, renderInfo: RenderInfo): any {
                 return `Error: Too many arguments for function ${fnName}`;
             } else if (fnName in fnMapDatasetToDataset) {
                 if (evaluatedArgs.length === 1) {
-                    let arg = evaluatedArgs[0];
-                    if (typeof arg === "string") return arg;
-                    if (arg instanceof Dataset) {
-                        return fnMapDatasetToDataset[fnName](arg, renderInfo);
+                    if (typeof evaluatedArgs[0] === "string")
+                        return evaluatedArgs[0]; // error message
+                    if (evaluatedArgs[0] instanceof Dataset) {
+                        let dataset = evaluatedArgs[0];
+                        return fnMapDatasetToDataset[fnName](
+                            dataset,
+                            null,
+                            renderInfo
+                        );
+                    } else {
+                        return `Error: function ${fnName} only accept Dataset`;
+                    }
+                } else if (evaluatedArgs.length > 1) {
+                    if (typeof evaluatedArgs[0] === "string") {
+                        return evaluatedArgs[0];
+                    }
+                    if (evaluatedArgs[0] instanceof Dataset) {
+                        let dataset = evaluatedArgs[0];
+                        return fnMapDatasetToDataset[fnName](
+                            dataset,
+                            evaluatedArgs.filter(function (
+                                value: any,
+                                index: number,
+                                arr: any
+                            ) {
+                                return index > 0;
+                            }),
+                            renderInfo
+                        );
                     } else {
                         return `Error: function ${fnName} only accept Dataset`;
                     }
@@ -791,10 +902,11 @@ function resolve(
 
     // {{(?<expr>[\w+\-*\/0-9\s()\[\]%.]+)(::(?<format>[\w+\-*\/0-9\s()\[\]%.:]+))?}}
     let strExprRegex =
-        "{{(?<expr>[\\w+\\-*\\/0-9\\s()\\[\\]%.]+)(::(?<format>[\\w+\\-*\\/0-9\\s()\\[\\]%.:]+))?}}";
+        "{{(?<expr>[\\w+\\-*\\/0-9\\s()\\[\\]%.,]+)(::(?<format>[\\w+\\-*\\/0-9\\s()\\[\\]%.:]+))?}}";
     let exprRegex = new RegExp(strExprRegex, "gm");
     let match;
     while ((match = exprRegex.exec(text))) {
+        // console.log(match);
         let fullmatch = match[0];
         if (exprMap.some((e) => e.source === fullmatch)) continue;
 

From cbbaffcf79f9621ec482e7eeff5eb54785d6fe16 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 19 Jul 2021 13:19:45 +0800
Subject: [PATCH 142/402] Refactoring IGraph and ILegend

---
 src/bullet.ts    |  2 +-
 src/data.ts      | 83 +++++++++++++++++++++++++++++++++++-------------
 src/heatmap.ts   |  2 +-
 src/main.ts      | 16 +++++-----
 src/month.ts     |  2 +-
 src/parsing.ts   |  2 +-
 src/rendering.ts | 24 +++++++-------
 7 files changed, 85 insertions(+), 46 deletions(-)

diff --git a/src/bullet.ts b/src/bullet.ts
index 9581ba1..0494dcd 100644
--- a/src/bullet.ts
+++ b/src/bullet.ts
@@ -7,7 +7,7 @@ import {
     Size,
     Transform,
     ChartElements,
-    OutputType,
+    GraphType,
     ValueType,
 } from "./data";
 import * as helper from "./helper";
diff --git a/src/data.ts b/src/data.ts
index 4fa6b70..b1ca997 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -13,7 +13,7 @@ export enum SearchType {
     TaskNotDone,
 }
 
-export enum OutputType {
+export enum GraphType {
     Line,
     Bar,
     Pie,
@@ -628,11 +628,19 @@ export class CustomDatasetInfo {
     }
 }
 
-export class OutputInfo {
-    constructor() {}
+export interface IGraph {
+    GetGraphType(): GraphType;
 }
 
-export class CommonChartInfo extends OutputInfo {
+export interface ILegend {
+    showLegend: boolean;
+    legendPosition: string;
+    legendOrientation: string;
+    legendBgColor: string;
+    legendBorderColor: string;
+}
+
+export class CommonChartInfo implements IGraph, ILegend {
     title: string;
     xAxisLabel: string;
     xAxisColor: string;
@@ -645,15 +653,15 @@ export class CommonChartInfo extends OutputInfo {
     yMax: number[];
     reverseYAxis: boolean[];
     allowInspectData: boolean;
+
+    // ILegend
     showLegend: boolean;
     legendPosition: string;
     legendOrientation: string;
     legendBgColor: string;
     legendBorderColor: string;
-    chartType: OutputType;
 
     constructor() {
-        super();
         this.title = "";
         this.xAxisLabel = "Date";
         this.xAxisColor = "";
@@ -666,16 +674,17 @@ export class CommonChartInfo extends OutputInfo {
         this.yMax = []; // null, 2 elements
         this.reverseYAxis = []; // false, 2 elements
         this.allowInspectData = true;
+
+        // ILegend
         this.showLegend = false;
         this.legendPosition = ""; // top, bottom, left, right
         this.legendOrientation = ""; // horizontal, vertical
         this.legendBgColor = "";
         this.legendBorderColor = "";
-        this.chartType = OutputType.Unknown;
     }
 
-    public GetChartType() {
-        return this.chartType;
+    public GetGraphType() {
+        return GraphType.Unknown;
     }
 }
 
@@ -705,8 +714,8 @@ export class LineInfo extends CommonChartInfo {
         this.yAxisLocation = []; // left, for each target
     }
 
-    public GetChartType() {
-        return OutputType.Line;
+    public GetGraphType() {
+        return GraphType.Line;
     }
 }
 
@@ -720,12 +729,12 @@ export class BarInfo extends CommonChartInfo {
         this.yAxisLocation = []; // left, for each target
     }
 
-    public GetChartType() {
-        return OutputType.Bar;
+    public GetGraphType() {
+        return GraphType.Bar;
     }
 }
 
-export class PieInfo extends OutputInfo {
+export class PieInfo implements IGraph, ILegend {
     title: string;
     data: string[];
     dataColor: string[];
@@ -734,29 +743,49 @@ export class PieInfo extends OutputInfo {
 
     ratioInnerRadius: number;
 
+    // ILegend
+    showLegend: boolean;
+    legendPosition: string;
+    legendOrientation: string;
+    legendBgColor: string;
+    legendBorderColor: string;
+
     constructor() {
-        super();
         this.title = "";
         this.data = [];
         this.dataColor = [];
         this.label = [];
         this.extLabel = [];
         this.ratioInnerRadius = 0.0;
+
+        // ILegend
+        this.showLegend = false;
+        this.legendPosition = ""; // top, bottom, left, right
+        this.legendOrientation = ""; // horizontal, vertical
+        this.legendBgColor = "";
+        this.legendBorderColor = "";
+    }
+
+    public GetGraphType() {
+        return GraphType.Pie;
     }
 }
 
-export class SummaryInfo extends OutputInfo {
+export class SummaryInfo implements IGraph {
     template: string;
     style: string;
 
     constructor() {
-        super();
         this.template = "";
         this.style = "";
     }
+
+    public GetGraphType() {
+        return GraphType.Summary;
+    }
 }
 
-export class MonthInfo extends OutputInfo {
+export class MonthInfo implements IGraph {
     mode: string;
     dataset: number[];
     startWeekOn: string;
@@ -783,7 +812,6 @@ export class MonthInfo extends OutputInfo {
     selectedDataset: number;
 
     constructor() {
-        super();
         this.mode = "circle"; // circle, symbol
         this.dataset = [];
         this.startWeekOn = "Sun";
@@ -809,9 +837,13 @@ export class MonthInfo extends OutputInfo {
         this.selectedDate = ""; // selected date
         this.selectedDataset = null; // selected index of dataset
     }
+
+    public GetGraphType() {
+        return GraphType.Month;
+    }
 }
 
-export class HeatmapInfo {
+export class HeatmapInfo implements IGraph {
     dataset: string;
     startWeekOn: string;
     orientation: string;
@@ -827,9 +859,13 @@ export class HeatmapInfo {
         this.yMax = null;
         this.color = null;
     }
+
+    public GetGraphType() {
+        return GraphType.Heatmap;
+    }
 }
 
-export class BulletInfo extends OutputInfo {
+export class BulletInfo implements IGraph {
     title: string;
     dataset: string;
     orientation: string;
@@ -843,7 +879,6 @@ export class BulletInfo extends OutputInfo {
     markerColor: string;
 
     constructor() {
-        super();
         this.title = "";
         this.dataset = "0"; // dataset id or name
         this.orientation = "horizontal"; // or vertical
@@ -856,6 +891,10 @@ export class BulletInfo extends OutputInfo {
         this.markerValue = 0;
         this.markerColor = "";
     }
+
+    public GetGraphType() {
+        return GraphType.Bullet;
+    }
 }
 
 export class Size {
diff --git a/src/heatmap.ts b/src/heatmap.ts
index 9531ba2..601e618 100644
--- a/src/heatmap.ts
+++ b/src/heatmap.ts
@@ -9,7 +9,7 @@ import {
     Size,
     Transform,
     ChartElements,
-    OutputType,
+    GraphType,
     ValueType,
 } from "./data";
 import * as helper from "./helper";
diff --git a/src/main.ts b/src/main.ts
index ab64ff2..6aa4f39 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -7,7 +7,7 @@ import {
     Datasets,
     Query,
     QueryValuePair,
-    OutputType,
+    GraphType,
     SearchType,
     TableData,
     RenderInfo,
@@ -50,19 +50,19 @@ export default class Tracker extends Plugin {
         this.addCommand({
             id: "add-line-chart-tracker",
             name: "Add Line Chart Tracker",
-            callback: () => this.addCodeBlock(OutputType.Line),
+            callback: () => this.addCodeBlock(GraphType.Line),
         });
 
         this.addCommand({
             id: "add-bar-chart-tracker",
             name: "Add Bar Chart Tracker",
-            callback: () => this.addCodeBlock(OutputType.Bar),
+            callback: () => this.addCodeBlock(GraphType.Bar),
         });
 
         this.addCommand({
             id: "add-summary-tracker",
             name: "Add Summary Tracker",
-            callback: () => this.addCodeBlock(OutputType.Summary),
+            callback: () => this.addCodeBlock(GraphType.Summary),
         });
     }
 
@@ -800,7 +800,7 @@ export default class Tracker extends Plugin {
         return this.app.workspace.getActiveViewOfType(MarkdownView).editor;
     }
 
-    addCodeBlock(outputType: OutputType): void {
+    addCodeBlock(outputType: GraphType): void {
         const currentView = this.app.workspace.activeLeaf.view;
 
         if (!(currentView instanceof MarkdownView)) {
@@ -809,7 +809,7 @@ export default class Tracker extends Plugin {
 
         let codeblockToInsert = "";
         switch (outputType) {
-            case OutputType.Line:
+            case GraphType.Line:
                 codeblockToInsert = `\`\`\` tracker
 searchType: tag
 searchTarget: tagName
@@ -822,7 +822,7 @@ line:
     yAxisLabel: Value
 \`\`\``;
                 break;
-            case OutputType.Bar:
+            case GraphType.Bar:
                 codeblockToInsert = `\`\`\` tracker
 searchType: tag
 searchTarget: tagName
@@ -835,7 +835,7 @@ bar:
     yAxisLabel: Value
 \`\`\``;
                 break;
-            case OutputType.Summary:
+            case GraphType.Summary:
                 codeblockToInsert = `\`\`\` tracker
 searchType: tag
 searchTarget: tagName
diff --git a/src/month.ts b/src/month.ts
index c1de582..3b5b3ed 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -8,7 +8,7 @@ import {
     Size,
     Transform,
     ChartElements,
-    OutputType,
+    GraphType,
     ValueType,
 } from "./data";
 import * as helper from "./helper";
diff --git a/src/parsing.ts b/src/parsing.ts
index e4c2b49..2f05474 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -7,7 +7,7 @@ import {
     RenderInfo,
     SummaryInfo,
     Margin,
-    OutputType,
+    GraphType,
     LineInfo,
     PieInfo,
     MonthInfo,
diff --git a/src/rendering.ts b/src/rendering.ts
index 27e1d24..8b7a6b0 100644
--- a/src/rendering.ts
+++ b/src/rendering.ts
@@ -8,7 +8,7 @@ import {
     Size,
     Transform,
     ChartElements,
-    OutputType,
+    GraphType,
     ValueType,
     CommonChartInfo,
     LineInfo,
@@ -368,7 +368,7 @@ function renderYAxis(
         yUpper = yMax + yExtent * 0.2;
     }
     // if it is bar chart, zero must be contained in the range
-    if (chartInfo.GetChartType() === OutputType.Bar) {
+    if (chartInfo.GetGraphType() === GraphType.Bar) {
         if (yUpper < 0.0) {
             yUpper = 0;
         }
@@ -816,8 +816,8 @@ function renderLegend(
     renderInfo: RenderInfo,
     chartInfo: CommonChartInfo
 ) {
-    // console.log(renderInfo.legendPosition);
-    // console.log(renderInfo.legendOrientation);
+    // console.log(chartInfo.legendPosition);
+    // console.log(chartInfo.legendOrientation);
 
     // Get chart elements
     let svg = chartElements.svg;
@@ -970,7 +970,7 @@ function renderLegend(
     let firstLabelY = firstMarkerY;
 
     if (chartInfo.legendOrientation === "vertical") {
-        if (chartInfo.GetChartType() === OutputType.Line) {
+        if (chartInfo.GetGraphType() === GraphType.Line) {
             // lines
             legend
                 .selectAll("markers")
@@ -1023,7 +1023,7 @@ function renderLegend(
                     if (xDatasetIds.includes(i)) return;
                     return (chartInfo as LineInfo).pointColor[i];
                 });
-        } else if (chartInfo.GetChartType() === OutputType.Bar) {
+        } else if (chartInfo.GetGraphType() === GraphType.Bar) {
             // bars
             legend
                 .selectAll("markers")
@@ -1067,12 +1067,12 @@ function renderLegend(
             .style("alignment-baseline", "middle")
             .attr("class", "tracker-legend-label");
 
-        if (chartInfo.GetChartType() === OutputType.Line) {
+        if (chartInfo.GetGraphType() === GraphType.Line) {
             nameLabels.style("fill", function (name: string, i: number) {
                 if (xDatasetIds.includes(i)) return;
                 return (chartInfo as LineInfo).lineColor[i];
             });
-        } else if (chartInfo.GetChartType() === OutputType.Bar) {
+        } else if (chartInfo.GetGraphType() === GraphType.Bar) {
             nameLabels.style("fill", function (name: string, i: number) {
                 if (xDatasetIds.includes(i)) return;
                 return (chartInfo as BarInfo).barColor[i];
@@ -1081,7 +1081,7 @@ function renderLegend(
     } else if (chartInfo.legendOrientation === "horizontal") {
         let currRenderPosX = 0.0;
         let currRenderPosX2 = 0.0;
-        if (chartInfo.GetChartType() === OutputType.Line) {
+        if (chartInfo.GetGraphType() === GraphType.Line) {
             // lines
             legend
                 .selectAll("markers")
@@ -1162,7 +1162,7 @@ function renderLegend(
                     if (xDatasetIds.includes(i)) return;
                     return (chartInfo as LineInfo).pointColor[i];
                 });
-        } else if (chartInfo.GetChartType() === OutputType.Bar) {
+        } else if (chartInfo.GetGraphType() === GraphType.Bar) {
             // bars
             currRenderPosX = 0.0;
             legend
@@ -1227,12 +1227,12 @@ function renderLegend(
             .style("alignment-baseline", "middle")
             .attr("class", "tracker-legend-label");
 
-        if (chartInfo.GetChartType() === OutputType.Line) {
+        if (chartInfo.GetGraphType() === GraphType.Line) {
             nameLabels.style("fill", function (name: string, i: number) {
                 if (xDatasetIds.includes(i)) return;
                 return (chartInfo as LineInfo).lineColor[i];
             });
-        } else if (chartInfo.GetChartType() === OutputType.Bar) {
+        } else if (chartInfo.GetGraphType() === GraphType.Bar) {
             nameLabels.style("fill", function (name: string, i: number) {
                 if (xDatasetIds.includes(i)) return;
                 return (chartInfo as BarInfo).barColor[i];

From 31dc86d5b2b84bd379f794501c65e4a4ba694a03 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 20 Jul 2021 15:02:36 +0800
Subject: [PATCH 143/402] Render title and legend in pie chart

---
 examples/TestPieChart.md |  25 +++-
 src/data.ts              |   2 +
 src/parsing.ts           |  60 ++++++++-
 src/pie.ts               | 256 ++++++++++++++++++++++++++++++++++++++-
 4 files changed, 337 insertions(+), 6 deletions(-)

diff --git a/examples/TestPieChart.md b/examples/TestPieChart.md
index 8878229..54cf4cc 100644
--- a/examples/TestPieChart.md
+++ b/examples/TestPieChart.md
@@ -8,7 +8,7 @@ If numeric data not wrapped by single quotes
 searchType: task.done, task.notdone
 searchTarget: Say I love you, Say I love you
 pie:
-    title: Pie
+    title: Manual Input Data
     label: '{{2/30*100}}%, {{4/30*100}}%, {{6/30*100}}%, {{8/30*100}}%, {{10/30*100}}%'
     data: '2, 4, 6, 8, 10'
     dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
@@ -25,12 +25,29 @@ searchType: task.done, task.notdone
 searchTarget: Say I love you, Say I love you
 datasetName: Done, NotDone
 pie:
-    title: Pie
+    title: Manual Input Data
     data: '{{1 + 1}}, {{2 * 2}}, {{12/ 2}}, {{1+(2+3*2)-1}}, {{27%17}}'
     dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
     ratioInnerRadius: 0.5
 ```
 
+### Legend
+``` tracker
+searchType: task.done, task.notdone
+searchTarget: Say I love you, Say I love you
+datasetName: Done, NotDone
+pie:
+    title: Manual Input Data
+	label: '{{2/30*100}}%, {{4/30*100}}%, {{6/30*100}}%, {{8/30*100}}%, {{10/30*100}}%'
+    data: '2, 4, 6, 8, 10'
+    dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
+	dataName: A, B, C, D, E
+    ratioInnerRadius: 0.5
+	showLegend: true
+	legendPosition: right
+	legendOrientation: vertical	
+```
+
 ## Data from Notes
 ``` tracker
 searchType: task.done, task.notdone
@@ -38,7 +55,7 @@ searchTarget: Say I love you, Say I love you
 folder: diary
 datasetName: Done, NotDone
 pie:
-    title: Pie
+    title: Task Done and Not Done
     data: '{{sum(dataset(0))}},{{sum(dataset(1))}}'
     dataColor: '#4daf4a,#377eb8'
     ratioInnerRadius: 0.5
@@ -58,7 +75,7 @@ searchType: task.done, task.notdone
 searchTarget: Say I love you, Say I love you
 datasetName: Done, NotDone
 pie:
-    title: Pie
+    title: Task Done and Not Done
 	label: '2%, 4%, 6%, 8%, 10%'
 	extLabel: A, B, C, D
     data: '{{1 + 1}}, {{2 * 2}}, {{12/ 2}}, {{1+(2+3*2)-1}}, {{27%17}}'
diff --git a/src/data.ts b/src/data.ts
index b1ca997..39d0915 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -738,6 +738,7 @@ export class PieInfo implements IGraph, ILegend {
     title: string;
     data: string[];
     dataColor: string[];
+    dataName: string[];
     label: string[];
     extLabel: string[];
 
@@ -754,6 +755,7 @@ export class PieInfo implements IGraph, ILegend {
         this.title = "";
         this.data = [];
         this.dataColor = [];
+        this.dataName = [];
         this.label = [];
         this.extLabel = [];
         this.ratioInnerRadius = 0.0;
diff --git a/src/parsing.ts b/src/parsing.ts
index 2f05474..d36c42b 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1693,6 +1693,21 @@ export function getRenderInfoFromYaml(
         pie.dataColor = retDataColor;
         // console.log(pie.dataColor);
 
+        // dataName
+        let retDataName = getStringArrayFromInput(
+            "dataName",
+            yamlPie?.dataName,
+            numData,
+            "",
+            null,
+            true
+        );
+        if (typeof retDataName === "string") {
+            return retDataName; // errorMessage
+        }
+        pie.dataName = retDataName;
+        // console.log(pie.dataName);
+
         // label
         let retLabel = getStringArrayFromInput(
             "label",
@@ -1729,9 +1744,52 @@ export function getRenderInfoFromYaml(
         }
         // console.log(pie.ratioInnerRadius);
 
+        // showLegend
+        if (typeof yamlPie?.showLegend === "boolean") {
+            pie.showLegend = yamlPie.showLegend;
+        }
+
+        // legendPosition
+        if (typeof yamlPie?.legendPosition === "string") {
+            pie.legendPosition = yamlPie.legendPosition;
+        } else {
+            pie.legendPosition = "right";
+        }
+
+        // legendOrient
+        if (typeof yamlPie?.legendOrientation === "string") {
+            pie.legendOrientation = yamlPie.legendOrientation;
+        } else {
+            if (
+                pie.legendPosition === "top" ||
+                pie.legendPosition === "bottom"
+            ) {
+                pie.legendOrientation = "horizontal";
+            } else if (
+                pie.legendPosition === "left" ||
+                pie.legendPosition === "right"
+            ) {
+                pie.legendOrientation = "vertical";
+            } else {
+                pie.legendOrientation = "horizontal";
+            }
+        }
+        // console.log(pie.legendPosition);
+        // console.log(pie.legendOrientation);
+
+        // legendBgColor
+        if (typeof yamlPie?.legendBgColor === "string") {
+            pie.legendBgColor = yamlPie.legendBgColor;
+        }
+
+        // legendBorderColor
+        if (typeof yamlPie?.legendBorderColor === "string") {
+            pie.legendBorderColor = yamlPie.legendBorderColor;
+        }
+
         renderInfo.pie.push(pie);
     } // pie related parameters
-    // console.log(renderInfo.pi);
+    // console.log(renderInfo.pie);
 
     // summary related parameters
     for (let summaryKey of yamlSummaryKeys) {
diff --git a/src/pie.ts b/src/pie.ts
index 696d378..c157e1c 100644
--- a/src/pie.ts
+++ b/src/pie.ts
@@ -9,12 +9,13 @@ import {
     Size,
     Transform,
     ChartElements,
-    OutputType,
+    GraphType,
     ValueType,
 } from "./data";
 import * as helper from "./helper";
 import * as d3 from "d3";
 import * as expr from "./expr";
+import { pie } from "d3";
 
 function createAreas(
     chartElements: ChartElements,
@@ -93,6 +94,255 @@ function renderTitle(
 
     if (!pieInfo.title) return;
     let titleSize = helper.measureTextSize(pieInfo.title, "tracker-title");
+
+    // Append title
+    let title = chartElements.graphArea
+        .append("text")
+        .text(pieInfo.title) // pivot at center
+        .attr("id", "title")
+        .attr(
+            "transform",
+            "translate(" +
+                renderInfo.dataAreaSize.width / 2.0 +
+                "," +
+                titleSize.height / 2.0 +
+                ")"
+        )
+        .attr("height", titleSize.height) // for later use
+        .attr("class", "tracker-title");
+    chartElements["title"] = title;
+
+    // Expand parent areas
+    helper.expandArea(chartElements.svg, 0, titleSize.height);
+    helper.expandArea(chartElements.graphArea, 0, titleSize.height);
+
+    // Move sibling areas
+    helper.moveArea(chartElements.dataArea, 0, titleSize.height);
+
+    return;
+}
+
+function renderLegend(
+    canvas: HTMLElement,
+    chartElements: ChartElements,
+    renderInfo: RenderInfo,
+    pieInfo: PieInfo
+) {
+    // console.log("renderLegend");
+    // console.log(piInfo.legendPosition);
+    // console.log(piInfo.legendOrientation);
+
+    // Get chart elements
+    let svg = chartElements.svg;
+    let graphArea = chartElements.graphArea;
+    let dataArea = chartElements.dataArea;
+    let title = chartElements.title;
+
+    // Get element width and height
+    let titleHeight = 0.0;
+    if (title) {
+        titleHeight = parseFloat(title.attr("height"));
+    }
+
+    // Get names and their dimension
+    let names = pieInfo.dataName;
+    let nameSizes = names.map(function (n) {
+        return helper.measureTextSize(n, "tracker-legend-label");
+    });
+    let indMaxName = 0;
+    let maxNameWidth = 0.0;
+    for (let ind = 0; ind < names.length; ind++) {
+        if (nameSizes[ind].width > maxNameWidth) {
+            maxNameWidth = nameSizes[ind].width;
+            indMaxName = ind;
+        }
+    }
+    let maxName = names[indMaxName];
+    let characterWidth = maxNameWidth / maxName.length;
+    let nameHeight = nameSizes[indMaxName].height;
+    let numNames = names.length;
+
+    let xSpacing = 2 * characterWidth;
+    let ySpacing = nameHeight;
+    let markerWidth = 2 * characterWidth;
+
+    // Get legend width and height
+    let legendWidth = 0;
+    let legendHeight = 0;
+    if (pieInfo.legendOrientation === "vertical") {
+        legendWidth = xSpacing * 3 + markerWidth + maxNameWidth;
+        legendHeight = (numNames + 1) * ySpacing;
+    } else if (pieInfo.legendOrientation === "horizontal") {
+        legendWidth =
+            (2 * xSpacing + markerWidth) * numNames +
+            xSpacing +
+            d3.sum(nameSizes, function (s, i) {
+                return s.width;
+            });
+        legendHeight = ySpacing + nameHeight;
+    }
+    // console.log(
+    //     `maxName: ${maxName}, characterWidth: ${characterWidth}, maxNameWidth: ${maxNameWidth}`
+    // );
+    // console.log(`xSpacing:${xSpacing}, numNames: ${numNames}, markerWidth: ${markerWidth}`);
+    // console.log(`legendWidth: ${legendWidth}, legendHeight: ${legendHeight}`);
+
+    // Calcualte lengendX and legendY
+    let legendX = 0.0; // relative to graphArea
+    let legendY = 0.0;
+    if (pieInfo.legendPosition === "top") {
+        // below title
+        legendX = renderInfo.dataAreaSize.width / 2.0 - legendWidth / 2.0;
+        legendY = titleHeight;
+        // Expand svg
+        helper.expandArea(svg, 0, legendHeight + ySpacing);
+        // Move dataArea down
+        helper.moveArea(dataArea, 0, legendHeight + ySpacing);
+    } else if (pieInfo.legendPosition === "bottom") {
+        // bellow x-axis label
+        legendX = renderInfo.dataAreaSize.width / 2.0 - legendWidth / 2.0;
+        legendY = titleHeight + renderInfo.dataAreaSize.height + ySpacing;
+        // Expand svg
+        helper.expandArea(svg, 0, legendHeight + ySpacing);
+    } else if (pieInfo.legendPosition === "left") {
+        legendX = 0;
+        legendY =
+            titleHeight +
+            renderInfo.dataAreaSize.height / 2.0 -
+            legendHeight / 2.0;
+        // Expand svg
+        helper.expandArea(svg, legendWidth + xSpacing, 0);
+        // Move dataArea right
+        helper.moveArea(dataArea, legendWidth + xSpacing, 0);
+    } else if (pieInfo.legendPosition === "right") {
+        legendX = renderInfo.dataAreaSize.width + xSpacing;
+        legendY =
+            titleHeight +
+            renderInfo.dataAreaSize.height / 2.0 -
+            legendHeight / 2.0;
+        // Expand svg
+        helper.expandArea(svg, legendWidth + xSpacing, 0);
+    } else {
+        return;
+    }
+    // console.log(`legendX: ${legendX}, legendY: ${legendY}`);
+
+    let legend = chartElements.graphArea
+        .append("g")
+        .attr("id", "legend")
+        .attr("transform", "translate(" + legendX + "," + legendY + ")");
+    // console.log('legendX: %d, legendY: %d', legendX, legendY);
+
+    let legendBg = legend
+        .append("rect")
+        .attr("class", "tracker-legend")
+        .attr("width", legendWidth)
+        .attr("height", legendHeight);
+    if (pieInfo.legendBgColor) {
+        legendBg.style("fill", pieInfo.legendBgColor);
+    }
+    if (pieInfo.legendBorderColor) {
+        legendBg.style("stroke", pieInfo.legendBorderColor);
+    }
+
+    let markerRadius = 5.0;
+    let firstMarkerX = xSpacing;
+    let firstMarkerY = nameHeight;
+    let firstLabelX = firstMarkerX + xSpacing + markerWidth; // xSpacing + 2 * xSpaing
+    let firstLabelY = firstMarkerY;
+
+    if (pieInfo.legendOrientation === "vertical") {
+        // points
+        legend
+            .selectAll("markers")
+            .data(names)
+            .enter()
+            .append("circle")
+            .attr("cx", firstMarkerX + markerWidth / 2.0)
+            .attr("cy", function (name: string, i: number) {
+                return firstMarkerY + i * ySpacing;
+            })
+            .attr("r", function (name: string, i: number) {
+                return markerRadius;
+            })
+            .style("fill", function (name: string, i: number) {
+                return pieInfo.dataColor[i];
+            });
+
+        // names
+        let nameLabels = legend
+            .selectAll("labels")
+            .data(names)
+            .enter()
+            .append("text")
+            .attr("x", firstLabelX)
+            .attr("y", function (name: string, i: number) {
+                return firstLabelY + i * ySpacing;
+            })
+            .text(function (name: string, i: number) {
+                return name;
+            })
+            .style("alignment-baseline", "middle")
+            .attr("class", "tracker-legend-label");
+
+        nameLabels.style("fill", function (name: string, i: number) {
+            return pieInfo.dataColor[i];
+        });
+    } else if (pieInfo.legendOrientation === "horizontal") {
+        let currRenderPosX = 0.0;
+        let currRenderPosX2 = 0.0;
+
+        // points
+        currRenderPosX = 0.0;
+        legend
+            .selectAll("markers")
+            .data(names)
+            .enter()
+            .append("circle")
+            .attr("cx", function (name: string, i: number) {
+                if (i === 0) {
+                    currRenderPosX = firstMarkerX + markerWidth / 2.0;
+                } else {
+                    currRenderPosX +=
+                        nameSizes[i].width + xSpacing + markerWidth + xSpacing;
+                }
+                return currRenderPosX;
+            })
+            .attr("cy", firstMarkerY)
+            .attr("r", function (name: string, i: number) {
+                return markerRadius;
+            })
+            .style("fill", function (name: string, i: number) {
+                return pieInfo.dataColor[i];
+            });
+
+        // names
+        currRenderPosX = 0.0;
+        let nameLabels = legend
+            .selectAll("labels")
+            .data(names)
+            .enter()
+            .append("text")
+            .attr("x", function (name: string, i: number) {
+                if (i === 0) {
+                    currRenderPosX = firstLabelX;
+                } else {
+                    currRenderPosX +=
+                        nameSizes[i].width + xSpacing + markerWidth + xSpacing;
+                }
+                return currRenderPosX;
+            })
+            .attr("y", firstLabelY)
+            .text(function (name: string, i: number) {
+                return name;
+            })
+            .style("alignment-baseline", "middle")
+            .attr("class", "tracker-legend-label");
+
+        nameLabels.style("fill", function (name: string, i: number) {
+            return pieInfo.dataColor[i];
+        });
+    }
 }
 
 function renderPie(
@@ -281,4 +531,8 @@ export function renderPieChart(
     renderTitle(canvas, chartElements, renderInfo, pieInfo);
 
     renderPie(canvas, chartElements, renderInfo, pieInfo);
+
+    if (pieInfo.showLegend) {
+        renderLegend(canvas, chartElements, renderInfo, pieInfo);
+    }
 }

From 67bf1be41d025d905f857c1ca3fa7dce93054662 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 20 Jul 2021 15:27:11 +0800
Subject: [PATCH 144/402] Add parameter hideLabelLessThan

---
 src/data.ts    |  2 ++
 src/parsing.ts |  6 ++++++
 src/pie.ts     | 17 ++++++++++++++++-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/data.ts b/src/data.ts
index 39d0915..28f4f5e 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -740,6 +740,7 @@ export class PieInfo implements IGraph, ILegend {
     dataColor: string[];
     dataName: string[];
     label: string[];
+    hideLabelLessThan: number;
     extLabel: string[];
 
     ratioInnerRadius: number;
@@ -757,6 +758,7 @@ export class PieInfo implements IGraph, ILegend {
         this.dataColor = [];
         this.dataName = [];
         this.label = [];
+        this.hideLabelLessThan = 0.03;
         this.extLabel = [];
         this.ratioInnerRadius = 0.0;
 
diff --git a/src/parsing.ts b/src/parsing.ts
index d36c42b..5e2a0c7 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1723,6 +1723,12 @@ export function getRenderInfoFromYaml(
         pie.label = retLabel;
         // console.log(pie.label);
 
+        // hideLabelLessThan
+        if (typeof yamlPie?.hideLabelLessThan === "number") {
+            pie.hideLabelLessThan = yamlPie.hideLabelLessThan;
+        }
+        // console.log(pie.hideLabelLessThan);
+
         // extLabel
         let retExtLabel = getStringArrayFromInput(
             "extLabel",
diff --git a/src/pie.ts b/src/pie.ts
index c157e1c..ad0b5ab 100644
--- a/src/pie.ts
+++ b/src/pie.ts
@@ -391,6 +391,9 @@ function renderPie(
     }
     // console.log(labels);
 
+    // hideLabelLessThan
+    let hideLabelLessThan = pieInfo.hideLabelLessThan;
+
     // extLabel
     let extLabels: Array<string> = [];
     for (let strExpr of pieInfo.extLabel) {
@@ -445,13 +448,25 @@ function renderPie(
         })
         .attr("d", arc);
 
+    function getFraction(arcObj: any) {
+        // console.log(`start/end: ${arcObj.startAngle}/${arcObj.endAngle}`);
+        let fraction = (arcObj.endAngle - arcObj.startAngle) / (2.0 * Math.PI);
+        return fraction;
+    }
+
     // label elements
     let labelElements = sectorsGroup
         .selectAll("label")
         .data(pie(values))
         .enter()
         .append("text")
-        .text(function (d: any, i: number) {
+        .text(function (arcObj: any, i: number) {
+            let fraction = getFraction(arcObj);
+            // console.log(fraction);
+            // console.log(hideLabelLessThan);
+            if (fraction < hideLabelLessThan) {
+                return "";
+            }
             return labels[i];
         })
         .attr("transform", function (d: any) {

From 5aa1e98db425617cc8d0cdb856fefe04aafd4e21 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 20 Jul 2021 21:29:04 +0800
Subject: [PATCH 145/402] Set version to 1.9.0

---
 manifest.json | 2 +-
 package.json  | 2 +-
 versions.json | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index 5ee61fa..4a7dc0c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-tracker",
 	"name": "Tracker",
-	"version": "1.8.2",
+	"version": "1.9.0",
 	"minAppVersion": "0.9.12",
 	"description": "A plugin tracks occurrences and numbers in your notes",
 	"author": "pyrochlore",
diff --git a/package.json b/package.json
index 5726fdd..fa0698a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.8.2",
+  "version": "1.9.0",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
diff --git a/versions.json b/versions.json
index 28f318c..443e500 100644
--- a/versions.json
+++ b/versions.json
@@ -15,5 +15,6 @@
 	"1.7.0": "0.9.12",
 	"1.8.0": "0.9.12",
 	"1.8.1": "0.9.12",
-	"1.8.2": "0.9.12"
+	"1.8.2": "0.9.12",
+	"1.9.0": "0.9.12"
 }

From 5d45bc22869f071cc4eab6ae50fa0efe7eb2032f Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 20 Jul 2021 22:03:50 +0800
Subject: [PATCH 146/402] Add parameter showExtLabelOnlyIfNoLabel

---
 examples/TestPieChart.md | 28 +++++++++++++++++++++++++++
 src/data.ts              |  2 ++
 src/parsing.ts           |  6 ++++++
 src/pie.ts               | 42 ++++++++++++++++++++++++++++++----------
 4 files changed, 68 insertions(+), 10 deletions(-)

diff --git a/examples/TestPieChart.md b/examples/TestPieChart.md
index 54cf4cc..9c5f083 100644
--- a/examples/TestPieChart.md
+++ b/examples/TestPieChart.md
@@ -81,4 +81,32 @@ pie:
     data: '{{1 + 1}}, {{2 * 2}}, {{12/ 2}}, {{1+(2+3*2)-1}}, {{27%17}}'
     dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
     ratioInnerRadius: 0.5
+```
+
+## External Labels
+``` tracker
+searchType: task.done, task.notdone
+searchTarget: Say I love you, Say I love you
+datasetName: Done, NotDone
+pie:
+    title: Task Done and Not Done
+	label: '2%, 4%, 6%, 8%, 10%'
+	extLabel: '2%, 4%, 6%, 8%, 10%'
+    data: '{{0.5}}, {{2 * 2}}, {{12/ 2}}, {{1+(2+3*2)-1}}, {{27%17}}'
+    dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
+    ratioInnerRadius: 0.5
+```
+
+``` tracker
+searchType: task.done, task.notdone
+searchTarget: Say I love you, Say I love you
+datasetName: Done, NotDone
+pie:
+    title: Task Done and Not Done
+	label: '2%, 4%, 6%, 8%, 10%'
+	extLabel: '2%, 4%, 6%, 8%, 10%'
+    data: '{{0.5}}, {{2 * 2}}, {{12/ 2}}, {{1+(2+3*2)-1}}, {{27%17}}'
+    dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
+    ratioInnerRadius: 0.5
+	showExtLabelOnlyIfNoLabel: true
 ```
\ No newline at end of file
diff --git a/src/data.ts b/src/data.ts
index 28f4f5e..a82b0dc 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -741,6 +741,7 @@ export class PieInfo implements IGraph, ILegend {
     dataName: string[];
     label: string[];
     hideLabelLessThan: number;
+    showExtLabelOnlyIfNoLabel: boolean;
     extLabel: string[];
 
     ratioInnerRadius: number;
@@ -760,6 +761,7 @@ export class PieInfo implements IGraph, ILegend {
         this.label = [];
         this.hideLabelLessThan = 0.03;
         this.extLabel = [];
+        this.showExtLabelOnlyIfNoLabel = false;
         this.ratioInnerRadius = 0.0;
 
         // ILegend
diff --git a/src/parsing.ts b/src/parsing.ts
index 5e2a0c7..a57cd9a 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1744,6 +1744,12 @@ export function getRenderInfoFromYaml(
         pie.extLabel = retExtLabel;
         // console.log(pie.extLabel);
 
+        // showExtLabelOnlyIfNoLabel
+        if (typeof yamlPie?.showExtLabelOnlyIfNoLabel === "boolean") {
+            pie.showExtLabelOnlyIfNoLabel = yamlPie.showExtLabelOnlyIfNoLabel;
+        }
+        // console.log(pie.showExtLabelOnlyIfNoLabel);
+
         // ratioInnerRadius
         if (typeof yamlPie?.ratioInnerRadius === "number") {
             pie.ratioInnerRadius = yamlPie.ratioInnerRadius;
diff --git a/src/pie.ts b/src/pie.ts
index ad0b5ab..a189aaa 100644
--- a/src/pie.ts
+++ b/src/pie.ts
@@ -409,6 +409,8 @@ function renderPie(
     }
     // console.log(extLabels);
 
+    let showExtLabelOnlyIfNoLabel = pieInfo.showExtLabelOnlyIfNoLabel;
+
     // scale
     let colorScale = d3.scaleOrdinal().range(pieInfo.dataColor);
 
@@ -491,8 +493,16 @@ function renderPie(
         .data(pieValues)
         .enter()
         .append("text")
-        .text(function (d: any, i: number) {
-            return extLabels[i];
+        .text(function (arcObj: any, i: number) {
+            if (showExtLabelOnlyIfNoLabel) {
+                let fraction = getFraction(arcObj);
+                if (labels[i] === "" || fraction < hideLabelLessThan) {
+                    return extLabels[i];
+                }
+                return "";
+            } else {
+                return extLabels[i];
+            }
         })
         .attr("transform", function (arcObj: any, i: number) {
             let posLabel = hiddenArc.centroid(arcObj);
@@ -506,6 +516,15 @@ function renderPie(
         })
         .attr("class", "tracker-tick-label");
 
+    function drawConnectionLines(arcObj: any) {
+        let posLabel = arc.centroid(arcObj); // line insertion in the slice
+        let posMiddle = hiddenArc.centroid(arcObj); // line break: we use the other arc generator that has been built only for that
+        let posExtLabel = hiddenArc.centroid(arcObj); // Label position = almost the same as posB
+        let midAngle = getMidAngle(arcObj);
+        posExtLabel[0] = radius * 0.95 * (midAngle < Math.PI ? 1 : -1); // multiply by 1 or -1 to put it on the right or on the left
+        return [posLabel, posMiddle, posExtLabel];
+    }
+
     // Add lines between sectors and external labels
     let lines = sectorsGroup
         .selectAll("line")
@@ -516,14 +535,17 @@ function renderPie(
         .style("fill", "none")
         .attr("stroke-width", 1)
         .attr("points", function (arcObj: any, i: number) {
-            //PieArcDatum
-            if (extLabels[i] !== "") {
-                let posLabel = arc.centroid(arcObj); // line insertion in the slice
-                let posMiddle = hiddenArc.centroid(arcObj); // line break: we use the other arc generator that has been built only for that
-                let posExtLabel = hiddenArc.centroid(arcObj); // Label position = almost the same as posB
-                let midAngle = getMidAngle(arcObj);
-                posExtLabel[0] = radius * 0.95 * (midAngle < Math.PI ? 1 : -1); // multiply by 1 or -1 to put it on the right or on the left
-                return [posLabel, posMiddle, posExtLabel];
+            if (showExtLabelOnlyIfNoLabel) {
+                let fraction = getFraction(arcObj);
+                if (labels[i] === "" || fraction < hideLabelLessThan) {
+                    if (extLabels[i] !== "") {
+                        return drawConnectionLines(arcObj);
+                    }
+                }
+            } else {
+                if (extLabels[i] !== "") {
+                    return drawConnectionLines(arcObj);
+                }
             }
         })
         .attr("class", "tracker-axis");

From 871bdf6ddc14462c0668b657b2d8af034233a341 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Wed, 21 Jul 2021 18:49:27 +0800
Subject: [PATCH 147/402] Fix the position of labels, external labels and
 connecting lines

---
 examples/TestPieChart.md | 12 +++----
 src/pie.ts               | 67 ++++++++++++++++++++++++++++++----------
 2 files changed, 57 insertions(+), 22 deletions(-)

diff --git a/examples/TestPieChart.md b/examples/TestPieChart.md
index 9c5f083..bf99c54 100644
--- a/examples/TestPieChart.md
+++ b/examples/TestPieChart.md
@@ -90,9 +90,9 @@ searchTarget: Say I love you, Say I love you
 datasetName: Done, NotDone
 pie:
     title: Task Done and Not Done
-	label: '2%, 4%, 6%, 8%, 10%'
-	extLabel: '2%, 4%, 6%, 8%, 10%'
-    data: '{{0.5}}, {{2 * 2}}, {{12/ 2}}, {{1+(2+3*2)-1}}, {{27%17}}'
+	label: '{{0.5/28.5*100}}%, {{4/28.5*100}}%, {{6/28.5*100}}%, {{8/28.5*100}}%, {{10/28.5*100}}%'
+	extLabel: '{{0.5/28.5*100}}%, {{4/28.5*100}}%, {{6/28.5*100}}%, {{8/28.5*100}}%, {{10/28.5*100}}%'
+    data: '0.5, 4, 6, 8, 10'
     dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
     ratioInnerRadius: 0.5
 ```
@@ -103,9 +103,9 @@ searchTarget: Say I love you, Say I love you
 datasetName: Done, NotDone
 pie:
     title: Task Done and Not Done
-	label: '2%, 4%, 6%, 8%, 10%'
-	extLabel: '2%, 4%, 6%, 8%, 10%'
-    data: '{{0.5}}, {{2 * 2}}, {{12/ 2}}, {{1+(2+3*2)-1}}, {{27%17}}'
+	label: '{{0.5/28.5*100}}%, {{4/28.5*100}}%, {{6/28.5*100}}%, {{8/28.5*100}}%, {{10/28.5*100}}%'
+	extLabel:  '{{0.5/28.5*100}}%, {{4/28.5*100}}%, {{6/28.5*100}}%, {{8/28.5*100}}%, {{10/28.5*100}}%'
+    data: '0.5, 4, 6, 8, 10'
     dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
     ratioInnerRadius: 0.5
 	showExtLabelOnlyIfNoLabel: true
diff --git a/src/pie.ts b/src/pie.ts
index a189aaa..ea9f0d6 100644
--- a/src/pie.ts
+++ b/src/pie.ts
@@ -394,6 +394,11 @@ function renderPie(
     // hideLabelLessThan
     let hideLabelLessThan = pieInfo.hideLabelLessThan;
 
+    // label sizes
+    let labelSizes = labels.map(function (n) {
+        return helper.measureTextSize(n, "tracker-tick-label");
+    });
+
     // extLabel
     let extLabels: Array<string> = [];
     for (let strExpr of pieInfo.extLabel) {
@@ -409,6 +414,11 @@ function renderPie(
     }
     // console.log(extLabels);
 
+    // extLabel sizes
+    let extLabelSizes = labels.map(function (n) {
+        return helper.measureTextSize(n, "tracker-tick-label");
+    });
+
     let showExtLabelOnlyIfNoLabel = pieInfo.showExtLabelOnlyIfNoLabel;
 
     // scale
@@ -450,10 +460,13 @@ function renderPie(
         })
         .attr("d", arc);
 
-    function getFraction(arcObj: any) {
+    function isLabelHidden(arcObj: any) {
         // console.log(`start/end: ${arcObj.startAngle}/${arcObj.endAngle}`);
         let fraction = (arcObj.endAngle - arcObj.startAngle) / (2.0 * Math.PI);
-        return fraction;
+        if (fraction < hideLabelLessThan) {
+            return true;
+        }
+        return false;
     }
 
     // label elements
@@ -463,10 +476,7 @@ function renderPie(
         .enter()
         .append("text")
         .text(function (arcObj: any, i: number) {
-            let fraction = getFraction(arcObj);
-            // console.log(fraction);
-            // console.log(hideLabelLessThan);
-            if (fraction < hideLabelLessThan) {
+            if (isLabelHidden(arcObj)) {
                 return "";
             }
             return labels[i];
@@ -495,8 +505,7 @@ function renderPie(
         .append("text")
         .text(function (arcObj: any, i: number) {
             if (showExtLabelOnlyIfNoLabel) {
-                let fraction = getFraction(arcObj);
-                if (labels[i] === "" || fraction < hideLabelLessThan) {
+                if (labels[i] === "" || isLabelHidden(arcObj)) {
                     return extLabels[i];
                 }
                 return "";
@@ -507,7 +516,10 @@ function renderPie(
         .attr("transform", function (arcObj: any, i: number) {
             let posLabel = hiddenArc.centroid(arcObj);
             let midAngle = getMidAngle(arcObj);
-            posLabel[0] = radius * 0.99 * (midAngle < Math.PI ? 1 : -1);
+
+            posLabel[0] =
+                (radius * 0.99 - extLabelSizes[i].width) *
+                (midAngle < Math.PI ? 1 : -1);
             return "translate(" + posLabel[0] + "," + posLabel[1] + ")";
         })
         .style("text-anchor", function (arcObj: any) {
@@ -516,12 +528,36 @@ function renderPie(
         })
         .attr("class", "tracker-tick-label");
 
-    function drawConnectionLines(arcObj: any) {
+    function drawConnectionLines(arcObj: any, i: number) {
+        let labelWidth = labelSizes[i].width;
+        let extLabelWidth = extLabelSizes[i].width;
+        let labelHidden = isLabelHidden(arcObj);
+        let midAngle = getMidAngle(arcObj);
+
         let posLabel = arc.centroid(arcObj); // line insertion in the slice
         let posMiddle = hiddenArc.centroid(arcObj); // line break: we use the other arc generator that has been built only for that
         let posExtLabel = hiddenArc.centroid(arcObj); // Label position = almost the same as posB
-        let midAngle = getMidAngle(arcObj);
-        posExtLabel[0] = radius * 0.95 * (midAngle < Math.PI ? 1 : -1); // multiply by 1 or -1 to put it on the right or on the left
+
+        let distLabelToMiddle = Math.sqrt(
+            (posMiddle[0] - posLabel[0]) ** 2 +
+                (posMiddle[1] - posLabel[1]) ** 2
+        );
+
+        if (labels[i] !== "") {
+            // shift posLabel
+            posLabel[0] =
+                posLabel[0] +
+                ((posMiddle[0] - posLabel[0]) * labelWidth) / distLabelToMiddle;
+            posLabel[1] =
+                posLabel[1] +
+                ((posMiddle[1] - posLabel[1]) * labelWidth) / distLabelToMiddle;
+
+            // shift posExtLabel
+            posExtLabel[0] =
+                (radius * 0.99 - extLabelWidth - 3) *
+                (midAngle < Math.PI ? 1 : -1); // multiply by 1 or -1 to put it on the right or on the left
+        }
+
         return [posLabel, posMiddle, posExtLabel];
     }
 
@@ -536,15 +572,14 @@ function renderPie(
         .attr("stroke-width", 1)
         .attr("points", function (arcObj: any, i: number) {
             if (showExtLabelOnlyIfNoLabel) {
-                let fraction = getFraction(arcObj);
-                if (labels[i] === "" || fraction < hideLabelLessThan) {
+                if (labels[i] === "" || isLabelHidden(arcObj)) {
                     if (extLabels[i] !== "") {
-                        return drawConnectionLines(arcObj);
+                        return drawConnectionLines(arcObj, i);
                     }
                 }
             } else {
                 if (extLabels[i] !== "") {
-                    return drawConnectionLines(arcObj);
+                    return drawConnectionLines(arcObj, i);
                 }
             }
         })

From 0b51132c3bd1f4d5c5c1519bcce357219c708818 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 22 Jul 2021 16:26:03 +0800
Subject: [PATCH 148/402] Use two points instead of three points in connection
 lines in pie chart if necessary

---
 examples/TestPieChart.md | 13 +++++++++++++
 src/pie.ts               | 32 ++++++++++++++++++++++++--------
 2 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/examples/TestPieChart.md b/examples/TestPieChart.md
index bf99c54..1316490 100644
--- a/examples/TestPieChart.md
+++ b/examples/TestPieChart.md
@@ -109,4 +109,17 @@ pie:
     dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
     ratioInnerRadius: 0.5
 	showExtLabelOnlyIfNoLabel: true
+```
+
+``` tracker
+searchType: task.done, task.notdone
+searchTarget: Say I love you, Say I love you
+datasetName: Done, NotDone
+pie:
+    title: Task Done and Not Done
+	label: '{{0.5/28.5*100::i}}%, {{4/28.5*100::i}}%, {{6/28.5*100::i}}%, {{8/28.5*100::i}}%, {{10/28.5*100::i}}%'
+	extLabel:  '{{0.5/28.5*100::i}}%, {{4/28.5*100::i}}%, {{6/28.5*100::i}}%, {{8/28.5*100::i}}%, {{10/28.5*100::i}}%'
+    data: '0.5, 4, 6, 8, 10'
+    dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
+    ratioInnerRadius: 0.5
 ```
\ No newline at end of file
diff --git a/src/pie.ts b/src/pie.ts
index ea9f0d6..1e2e1a9 100644
--- a/src/pie.ts
+++ b/src/pie.ts
@@ -356,7 +356,7 @@ function renderPie(
     let errorMessage = "";
 
     let radius = renderInfo.dataAreaSize.width * 0.5;
-    let outterRadius = radius * 0.8;
+    let outterRadius = radius * 0.7;
     let innerRadius = outterRadius * pieInfo.ratioInnerRadius;
 
     // values
@@ -528,7 +528,7 @@ function renderPie(
         })
         .attr("class", "tracker-tick-label");
 
-    function drawConnectionLines(arcObj: any, i: number) {
+    function getPointsForConnectionLines(arcObj: any, i: number) {
         let labelWidth = labelSizes[i].width;
         let extLabelWidth = extLabelSizes[i].width;
         let labelHidden = isLabelHidden(arcObj);
@@ -537,20 +537,22 @@ function renderPie(
         let posLabel = arc.centroid(arcObj); // line insertion in the slice
         let posMiddle = hiddenArc.centroid(arcObj); // line break: we use the other arc generator that has been built only for that
         let posExtLabel = hiddenArc.centroid(arcObj); // Label position = almost the same as posB
+        // console.log(labels[i]);
+        // console.log(`label/middle/extLabel: ${posLabel}/${posMiddle}/${posExtLabel}`);
 
-        let distLabelToMiddle = Math.sqrt(
+        let distMiddleToLabel = Math.sqrt(
             (posMiddle[0] - posLabel[0]) ** 2 +
                 (posMiddle[1] - posLabel[1]) ** 2
         );
 
         if (labels[i] !== "") {
-            // shift posLabel
+            // shift posLabel, toward the middle point
             posLabel[0] =
                 posLabel[0] +
-                ((posMiddle[0] - posLabel[0]) * labelWidth) / distLabelToMiddle;
+                ((posMiddle[0] - posLabel[0]) * labelWidth) / distMiddleToLabel;
             posLabel[1] =
                 posLabel[1] +
-                ((posMiddle[1] - posLabel[1]) * labelWidth) / distLabelToMiddle;
+                ((posMiddle[1] - posLabel[1]) * labelWidth) / distMiddleToLabel;
 
             // shift posExtLabel
             posExtLabel[0] =
@@ -558,6 +560,20 @@ function renderPie(
                 (midAngle < Math.PI ? 1 : -1); // multiply by 1 or -1 to put it on the right or on the left
         }
 
+        distMiddleToLabel = Math.sqrt(
+            (posMiddle[0] - posLabel[0]) ** 2 +
+                (posMiddle[1] - posLabel[1]) ** 2
+        );
+
+        let distExtLabelToLabel = Math.sqrt(
+            (posExtLabel[0] - posLabel[0]) ** 2 +
+                (posExtLabel[1] - posLabel[1]) ** 2
+        );
+
+        if (distMiddleToLabel > distExtLabelToLabel) {
+            // console.log("two points");
+            return [posLabel, posExtLabel];
+        }
         return [posLabel, posMiddle, posExtLabel];
     }
 
@@ -574,12 +590,12 @@ function renderPie(
             if (showExtLabelOnlyIfNoLabel) {
                 if (labels[i] === "" || isLabelHidden(arcObj)) {
                     if (extLabels[i] !== "") {
-                        return drawConnectionLines(arcObj, i);
+                        return getPointsForConnectionLines(arcObj, i);
                     }
                 }
             } else {
                 if (extLabels[i] !== "") {
-                    return drawConnectionLines(arcObj, i);
+                    return getPointsForConnectionLines(arcObj, i);
                 }
             }
         })

From 64efa451b2cbb3a07cae0201b8cd6acaca83c278 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 22 Jul 2021 20:05:14 +0800
Subject: [PATCH 149/402] Add file .hotreload to activate hot-reload plugin

---
 examples/.obsidian/plugins/obsidian-tracker/.hotreload | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 examples/.obsidian/plugins/obsidian-tracker/.hotreload

diff --git a/examples/.obsidian/plugins/obsidian-tracker/.hotreload b/examples/.obsidian/plugins/obsidian-tracker/.hotreload
new file mode 100644
index 0000000..e69de29

From 8cc4f4c6a82c7f71d7d109883b954298ef4827be Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 27 Jul 2021 16:37:02 +0800
Subject: [PATCH 150/402] Update documents

---
 README.md                |  37 ++++-----
 docs/Commands.md         |   2 +-
 docs/Concepts.md         |  12 +--
 docs/Examples.md         |   5 +-
 docs/Expressions.md      |  95 +++++++++++++++++++++
 docs/InputParameters.md  | 175 ++++++++++++++++++++++-----------------
 docs/MathOnDataset.md    |  57 -------------
 docs/Questions.md        |   2 +-
 docs/ReleaseNotes.md     |   5 ++
 docs/RoadMap.md          |  26 +++---
 docs/TargetEvaluation.md |   2 +-
 11 files changed, 242 insertions(+), 176 deletions(-)
 create mode 100644 docs/Expressions.md
 delete mode 100644 docs/MathOnDataset.md

diff --git a/README.md b/README.md
index 9bf79c7..a8d4094 100644
--- a/README.md
+++ b/README.md
@@ -1,38 +1,31 @@
 # Obsidian Tracker Plugin
+
 ![GitHub release](https://img.shields.io/github/v/release/pyrochlore/obsidian-tracker)
 
 <img src="https://raw.githubusercontent.com/pyrochlore/obsidian-tracker/master/docs/images/screenshot_v1.7.png" width="800">
 
-This is an [Obsidian](https://obsidian.md/) plugin that helps you do tracking in notes and represent the collected data comprehensively. 
+This is an [Obsidian](https://obsidian.md/) plugin that helps you collect data from notes and represent it comprehensively.
+
+[Here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Examples.md) is a table containing simplified examples showing what you can track.
+
+## !!! Breaking Changes !!!
 
-[Here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Examples.md) is a simplified table of examples showing what you can track.
+From version 1.9.0, template variables, e.g. '{{sum}}', are deprecated. Instead, Tracker provide operators (+, -, *, /, %) and functions (dataset(), sum(), maxStreak(), ......etc) to help us do data processing. For users having code blocks from previous version, please replace '{{sum}}' by '{{sum()}}' or '{{sum(1)}}' by '{{sum(dataset(1))}}'. More information about the new expressions could be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Expressions.md).
 
 ## What's New
-Version 1.8.0
-- Add a new `searchType` `task`, retrieving data from tasks ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTask.md))
-- Enhancement
-    - Month view ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestCalendar.md))
-        - Add parameter `circleColorByValue` to show color based on the value
-        - Support multiple targets (dataset), change the dataset by clicking the header 
-        - Add a button to show current month
-    - Accept ISO-8601 date as `dateFormat` ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md#iso-8601-date-format))
-    - Relative date input for `startDate` and `endDate` ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md#relative-date-input-for-startdate-and-enddate))
-- Fixed missing dvField values at the last line of files
-
-Version 1.8.1
-- Fixed bugs while using month view with parameter `xDataset`
-
-Version 1.8.2
-- Fixed tasks searching not working for multiple targets
+
+Version 1.9.0
+- Add a new output type `pie`, rendering a pie chart ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestPieChart.md))
+- Allow expressions (operators and functions) as data inputs for output type `summary`, `bullet`, and `pie` (examples: [expression](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestExpression.md), [summary](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestSummary.md), [bullet](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestBullet.md), [pie](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestPieChart.md))
+- Allow formatting evaluated expressions by a follwing format string ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestExpression.md))
 
 ## Usage
+
 1. Have some targets you want to track in daily notes.
 2. Add a new note for displaying the tracker.
-3. Add tracker code blocks manually or using [commands](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Commands.md).
+3. Add tracker code blocks manually ([examples](https://github.com/pyrochlore/obsidian-tracker/tree/master/examples)) or using [commands](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Commands.md).
 4. Switch the document view mode to 'Preview', then the code block will get rendered.
 
-    <img src="https://raw.githubusercontent.com/pyrochlore/obsidian-tracker/master/docs/images/usage_v1.3.gif" width="400">
-
 For more use cases, please download and open the [examples](https://github.com/pyrochlore/obsidian-tracker/tree/master/examples) folder in obsidian with this plugin installed and enabled.
 
 ## More Details You May Want to Know
@@ -40,7 +33,7 @@ For more use cases, please download and open the [examples](https://github.com/p
 - [Concepts](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Concepts.md): Explain how this plugin works and what to setup
     - [Target Evaluation](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TargetEvaluation.md)
     - [Input Parameters](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md)
-    - [Template Variables](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TemplateVariables.md)
+    - [Expressions](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestExpression.md)
 - [Examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Examples.md)
 - [Plugin Settings](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Settings.md)
 - [Release Notes](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/ReleaseNotes.md)
diff --git a/docs/Commands.md b/docs/Commands.md
index b40905b..94d5f5b 100644
--- a/docs/Commands.md
+++ b/docs/Commands.md
@@ -1,5 +1,5 @@
 # Commands 
 
-To smooth the process of making trackers, obsidian-tracker provides three commands (There will be more in the future release), "Add Line Chart Tracker", "Add Bar Chart Tracker", and "Add Summary Tracker; Just type Ctrl/Cmd+P to activate the command palette, then type "Tracker" to search these commands.
+To smooth the process of making trackers, obsidian-tracker provides three commands (There will be more in the future release), "Add Line Chart Tracker", "Add Bar Chart Tracker", and "Add Summary Tracker". Just type Ctrl/Cmd+P to activate the command palette, then type "Tracker" to search these commands.
 
 After a command is executed, a code block will be added to the next line below your cursor position for you. The added code block will contain the most frequently used keys. To see the complete list of input parameters and description, please check [this document](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md).
\ No newline at end of file
diff --git a/docs/Concepts.md b/docs/Concepts.md
index 18b62ff..159a718 100644
--- a/docs/Concepts.md
+++ b/docs/Concepts.md
@@ -16,14 +16,16 @@ To see the detail about the target evaluation, please check the document [Target
 
 ### Rendering Output
 
-Currently, obsidian-tracker provides five kinds of rendering output: `line`, `bar`, `summary`, `bullet`, and `month`. You have to provide at least one output parameter in a code block.
+Currently, obsidian-tracker provides five kinds of rendering output: `line`, `bar`, `summary`, `bullet`, `month` and `pie`. You have to provide at least one output parameter in a code block.
 
-With output set to `line` or `bar`, Tracker plugin will generate a customizable chart. These charts are very good at seeing the variation of collected number in the notes. 
+With output type set to `line` or `bar`, Tracker plugin will generate a customizable chart. These charts are very good at seeing the variation of collected number in the notes. 
 
-With the `summary` output, a text block based on your '**template**' parameter will be created. You can use [pre-defined template variables](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TemplateVariables.md) like '{{sum}}' or '{{maxStreak}}' in the template parameter, to get a statistical summary of collected data.
+With the output type `summary`, a text block based on your '**template**' parameter will be created. You can use [expressions](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Expressions.md) like '{{sum()}}' or '{{maxStreak()}}' in the template parameter, to get a statistical summary of collected data.
 
-`bullet` output creates a [bullet chart](https://en.wikipedia.org/wiki/Bullet_graph) and could serve as a gauge showing the status (level, performance, progress) of a dataset.
+Output type `bullet` creates a [bullet chart](https://en.wikipedia.org/wiki/Bullet_graph) and could serve as a gauge showing the status (level, performance, progress) of a dataset.
 
-`month` output creates a month view with circled dates exceeding the given threshold and streaks showing how long it persisted.
+Output type `month` creates a month view with circled dates exceeding the given threshold and streaks showing how long it persisted.
+
+Output type `pie` creates a pie chart. The `data` parameter should be applied for circular sectors you want to add. Parameter `label` and `extLabel` are used for displaying labels and `dataName` is used for the diplay names on legend.
 
 Detailed description for all parameters of the output types can be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md).
\ No newline at end of file
diff --git a/docs/Examples.md b/docs/Examples.md
index 30f832a..802ce5b 100644
--- a/docs/Examples.md
+++ b/docs/Examples.md
@@ -50,17 +50,18 @@ List of all examples
 - [Calendar](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestCalendar.md)
 - [Date Formats](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md)
 - [Dataview Inline Field](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDvField.md)
+- [Expression](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestExpression.md)
 - [File Meta](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestFileMeta.md)
 - [Legends](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestLegends.md)
 - [Multiple Targets / Multiple Values](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestMultipleTargetsMultipleValues.md)
+- [Pie Chart](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestPieChart.md)
 - [Scaling and Positioning](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestScalingAndPositioning.md)
 - [Table](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTable.md)
 - [Task](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTask.md)
-- [Template Variables](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTemplateVariables.md)
 - [Time Values](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTimeValues.md)
 - [Word Counting](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestWordCounting.md)
 - [X Dataset](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestXDataset.md)
-- [Regular Expression](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TrackUsingRegex.md)
+- [Regular Expression](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestRegex.md)
 - [Weight Tracker](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/WeightTracker.md)
 - [Wiki](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/WikiTracker.md)
 
diff --git a/docs/Expressions.md b/docs/Expressions.md
new file mode 100644
index 0000000..f17039a
--- /dev/null
+++ b/docs/Expressions.md
@@ -0,0 +1,95 @@
+# Expressions
+
+Expressions could help us create new and meaningful data from the original collected data by using operators and functions.
+
+## !!! Breaking Changes !!!
+
+From version 1.9.0, template variables, e.g. '{{sum}}', are deprecated. Instead, Tracker provide operators (+, -, *, /, %) and functions (dataset(), sum(), maxStreak(), ......etc) to help us do data processing. For users having code blocks from previous version, please replace '{{sum}}' by '{{sum()}}' or '{{sum(1)}}' by '{{sum(dataset(1))}}'.
+
+## Where to Use 
+
+Currently, we can only use expressions in some parameters. These includes `template` in `summary` output, `value` in `bullet` output, and `data` `label` `extLabel` in `pie` output. In future release, we might add a parameter `dataset` accepting expressions to be used with other output type.
+
+## How to Use
+
+Expressions should be be wrapped in curly brackets. By Using the combination of operatora and funtions listed beloew, Tracker will try to resolve the whole expression in brackets and then generate a number or a string according to what was requested. 
+
+If the resolved expreasion is a string, we can optionally provide a format string by adding it right after the expression and two extra colons.
+
+The following tables show all the operators and functions available for now. Please make sure the input type and output type when you are combining them together. Examples could be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestExpression.md)).  
+
+## List of Operators
+
+### Uniry Operators
+
+| Function | Description | Operant | Output | 
+|:---------|:------------|:--------|:------|
+| + | positive | number or dataset | number or dataset |
+| - | negative | number or dataset | number or dataset |
+
+### Binary Operators
+
+| Function | Description | Left Operant | Right Operant | Output | 
+|:---------|:------------|:-----|:------|:-------|
+| + | plus | number or dataset | number or dataset | number or dataset |
+| - | minus | number or dataset | number or dataset | number or dataset |
+| * | multiply | number or dataset | number or dataset | number or dataset |
+| / | divide | number or dataset | number or dataset | number or dataset |
+| % | modulo | number or dataset | number or dataset | number or dataset |
+
+e.g.
+number + number --> number
+dataset + number --> dataset
+number + dataset -> dataset
+dataset + dataset --> dataset
+
+## List of Functions
+
+### Get dataset from index
+
+| Function(Input Args): Output | Description |
+|:------------------|:-----------|
+| dataset(id: number): Dataset | Get dataset from dataset id (the order in `searchTarget` |
+
+### Functions Accept Dataset and return a value
+
+If the input dataset is missing, it will use the first available Y dataset found.
+
+| Function(Input Args): Output | Description |
+|:------------------|:-----------|
+| min(dataset: Dataset): number | Minimum value of the dataset |
+| minDate(dataset: Dataset): Date | Latest date of minimum value |
+| max(dataset: Dataset): number | Maximum value of the dataset |
+| maxDate(dataset: Dataset): Date | Latest date of maximum value |
+| startDate(dataset: Dataset): Date | Start date of the dataset |
+| endDate(dataset: Dataset): Date | End date of the dataset |
+| sum(dataset: Dataset): number | Summation of values of the dataset |
+| numTargets(dataset: Dataset): number | Total counts of targets |
+| numDays(dataset: Dataset): number | Days from startDate to endDate |
+| numDaysHavingData(dataset: Dataset): number | Number of days having data |
+| maxStreak(dataset: Dataset): number | Maximum continuous days without breaks |
+| maxStreakStart(dataset: Dataset): Date | Start date of the max streak |
+| maxStreakEnd(dataset: Dataset): Date | End date of the max streak |
+| maxBreaks(dataset: Dataset): number | Maximum break days |
+| maxBreaksStart(dataset: Dataset): Date | Start date of the maximum break days |
+| maxBreaksEnd(dataset: Dataset): Date | End date of the maximum break days |
+| currentStreak(dataset: Dataset): number | Current continuous days |
+| currentStreakStart(dataset: Dataset): Date | Start date of current streak |
+| currentStreakEnd(dataset: Dataset): Date | End date of current streak |
+| currentBreaks(dataset: Dataset): number | Current break days |
+| currentBreaksStart(dataset: Dataset): Date | Start date of current breaks |
+| currentBreaksEnd(dataset: Dataset): Date | End date of current breaks |
+| average(dataset: Dataset): number | Average value of the dataset |
+| median(dataset: Dataset): number | Median value of the dataset |
+| variance(dataset: Dataset): number | Variance value of the dataset |
+
+### Functions Accept Dataset and Return Dataset
+
+| Function | Description |
+|:---------|:-----------|
+| normalize(dataset: Dataset): Dataset | rescale the Y values to [0, 1] |
+| setMissingValues(dataset: Dataset, missingValue: number): Dataset | set the missing values |
+
+## Missing Values
+
+Notice that the missing values (null values) are ignored in function like sum or average. Moreover, a value plus a missing value will leads to null value (missing value). To avoid these, you can set those missing values to a value by using parameter `penalty` or use expression function `setMissingValues`.
diff --git a/docs/InputParameters.md b/docs/InputParameters.md
index 018d3be..44cf30b 100644
--- a/docs/InputParameters.md
+++ b/docs/InputParameters.md
@@ -1,7 +1,8 @@
 # Input Parameters
-Obsidian-tracker parses key-value pairs in your code block in YAML format and uses them as input parameters. The minimum requirements for parameters are `searchType`, `searchTarget` and one output parameter (`line`, `bar`, `frontmatter`, `fileMeta`, `wiki`, `table`, `task`, or `text`).
 
-## Array Input
+Obsidian-tracker parses key-value pairs in your code block in YAML format and uses them as input parameters. The minimum requirements for parameters are `searchType`, `searchTarget` and one output parameter (`line`, `bar`, `summary`, `bullet`, `month`, or `pie`).
+
+## Array Input for a Parameter
 
 Some of the parameters can accept more than one value for each target, thus the maximum number of values of the parameter equals the number of targets (NT). If the number of values is less than the number of targets, the plugin will use the previously provided value or use the default value if nothing is provided.
 
@@ -17,126 +18,148 @@ These key-value pairs are placed under the code block root.
 
 | Key | Description | Number of Values | Default |
 |:--------|:-------|:-----------:|:------|
-| `searchType` | The type of `searchTarget` (tag\|frontmatter\|wiki\|text\|dvField\|table\|filemeta\|task) | 1~NT | Must be provided |
-| `searchTarget` | The target to search<br>[[detail](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TargetEvaluation.md)] | NT (Number of Targets) | Must be provided |
-| `folder` | The root path of notes to search | 1 | Root of this vault |
-| `dateFormat` | The date format you are using<br> or use [iso-8601](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md#iso-8601-date-format) | 1  | 'YYYY-MM-DD' |
-| `dateFormatPrefix` | The prefix before your dateFormat | 1 | '' |
-| `dateFormatSuffix` | The suffix after your dateFormat | 1 | '' |
-| `startDate` | The start date to collect data<br>accept [relative date](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md#relative-date-input-for-startdate-and-enddate) | 1 | Min date found |
-| `endDate` | The end date of to collect data<br>accept [relative date](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md#relative-date-input-for-startdate-and-enddate) | 1 | Max date found |
-| `datasetName` | The name of the dataset for a search target` | 1~NT | untitled |
-| `separator` | The character to separate multiple values appearing in the search target | 1~NT | '/' |
-| `xDataset` | The `searchTarget` of this index will be used as xDataset | 1~NT | -1 (use filename as xDataset) |
-| `constValue` | The constant value of a target if no value attached | 1~NT | 1.0 |
-| `ignoreAttachedValue` | Use a constant value even if the target has a value attached on (true\|false) | 1~NT | false |
+| `searchType` | Type of `searchTarget` (tag\|frontmatter\|wiki\|text\|dvField\|table\|fileMeta\|task) | 1~NT | Must be provided |
+| `searchTarget` | Target to search<br>[[detail](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TargetEvaluation.md)] | NT (Number of Targets) | Must be provided |
+| `folder` | Root path containing notes to search | 1 | Root of this vault |
+| `dateFormat` | Date format<br> Use [Moment.js](https://momentjscom.readthedocs.io/en/latest/moment/04-displaying/01-format/) format or use [iso-8601](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md#iso-8601-date-format) | 1 | 'YYYY-MM-DD' |
+| `dateFormatPrefix` | Prefix before your dateFormat | 1 | '' |
+| `dateFormatSuffix` | Suffix after your dateFormat | 1 | '' |
+| `startDate` | Start date to collect data from<br>accept [relative date](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md#relative-date-input-for-startdate-and-enddate) | 1 | Min date found |
+| `endDate` | End date of to collect data<br>accept [relative date](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md#relative-date-input-for-startdate-and-enddate) | 1 | Max date found |
+| `datasetName` | Name of the dataset for a search target` | 1~NT | untitled |
+| `separator` | Character used to separate multiple values appearing in the search target | 1~NT | '/' |
+| `xDataset` | Index of `searchTarget` used as xDataset | 1~NT | -1 (use filename as xDataset) |
+| `constValue` | Constant value of a target if no value attached | 1~NT | 1.0 |
+| `ignoreAttachedValue` | Use `constValue` even if the target has a value attached on (true\|false) | 1~NT | false |
 | `ignoreZeroValue` | Treat zero value as missing (true\|false) | 1~NT | false |
 | `accum` | Accumulatively sum the values over time (true\|false) | 1~NT | false |
-| `penalty` | The value to use if the search target is missing on the day | 1~NT | |
-| `valueShift` | The amount to shift the collected values | 1~NT | 0 |
+| `penalty` | Value to use if the search target is missing on the day | 1~NT | |
+| `valueShift` | Amount to shift for each collected value | 1~NT | 0 |
 | `valueType` | Not implemented yet | 1~NT | |
-| `fixedScale` | The scaling factor apply to the chart | 1 | 1.0 |
+| `fixedScale` | Uniform scaling factor to the graph dimensions | 1 | 1.0 |
 | `fitPanelWidth` | Auto-fit the width of the chart to the container | 1 | false |
-| `margin` | The four margin (top|right|bottom|left) of the graph | 1~4 | 10 |
+| `margin` | Four margins (top|right|bottom|left) of the graph | 1~4 | 10 |
 | `line` | A container key for parameters related to the line chart | | |
 | `bar` | A container key for parameters related to the bar chart | | |
 | `summary` | A container key for parameters related to the summary output | | |
 | `bullet` | A container key for parameters related to the bullet chart | 
+| `month` | A container key for parameters related to the month view |
+| `pie` | A container key for parameters related to the pie chart |
 
-### Parameters for Common Chart
+### Parameters for Common Charts
 These key-value pairs should be placed under the key `line` or `bar`.
 
 | Key | Description | Number of Values | Default |
 |:--------|:-------|:-----------:|:------|
-| `title` | The title of the chart | 1 | '' |
-| `xAxisLabel` | The label of X axis | 1 | 'Date' |
-| `xAxisColor` | The color of X axis | 1 | 'white'('black'<sup>*</sup>) |
-| `xAxisLabelColor` | The color of X axis label | 1 | 'white'('black'<sup>*</sup>) |
-| `yAxisLabel` | The label of Y axis | 1~2 | 'Value' |
-| `yAxisColor` | The color of Y axis | 1~2 | 'white'('black'<sup>*</sup>) |
-| `yAxisLabelColor` | The color of Y axis label | 1~2 | 'white'('black'<sup>*</sup>) |
-| `yAxisUnit` | The unit displayed aside Y axis label | 1~2 | '' | 
-| `yMin` | The minimum value on Y axis | 1~2 |Minimum Y value found | 
-| `yMax` | The maximum value on Y axis | 1~2 | Maximum Y value found |
-| `reverseYAxis` | Flip the Y Axis or not (true\|false) | 1~2 | false |
+| `title` | Title of this chart | 1 | '' |
+| `xAxisLabel` | Label of X axis | 1 | 'Date' |
+| `xAxisColor` | Color of X axis | 1 | 'white'('black'<sup>*</sup>) |
+| `xAxisLabelColor` | Color of X axis label | 1 | 'white'('black'<sup>*</sup>) |
+| `yAxisLabel` | Label of Y axis | 1~2 | 'Value' |
+| `yAxisColor` | Color of Y axis | 1~2 | 'white'('black'<sup>*</sup>) |
+| `yAxisLabelColor` | Color of Y axis label | 1~2 | 'white'('black'<sup>*</sup>) |
+| `yAxisUnit` | Unit displayed aside Y axis label | 1~2 | '' | 
+| `yMin` | Minimum value on Y axis | 1~2 |Minimum Y value found | 
+| `yMax` | Maximum value on Y axis | 1~2 | Maximum Y value found |
+| `reverseYAxis` | Flip (upside down) the Y Axis or not (true\|false) | 1~2 | false |
 | `allowInspectData` | Show data value when mouse hovered (true\|false) | 1 | true |
-| `showLegend` | Show legend (true\|false) | 1 | false |
+| `showLegend` | Show/Hide legend (true\|false) | 1 | false |
 | `legendPosition` | Legend position (top\|bottom\|left\|right) | 1 | bottom |
 | `legendOrientation` | Legend orientation (vertical\|horizontal) | 1 | horizontal for bottom and top<br>vertical for left and right |
 | `legendBgColor` | Legend background color | 1 | none |
 | `legendBorderColor` | Legend border color | 1 | white |
 
-### Parameters for Line Chart
+### Parameters for a Line Chart
 These key-value pairs should be placed under the key `line`.
 
 | Key | Description | Number of Values | Default |
 |:--------|:-------|:-----------:|:------|
-| `lineColor` | The color of the lines in chart | 1~NT | 'white'('black'<sup>*</sup>) |
-| `lineWidth` | The width of the lines in chart | 1~NT | 1.5 |
-| `showLine` | Show lines (true\|false) | 1~NT | true |
-| `showPoint` | Show data points (true\|false) | 1~NT | true |
-| `pointColor` | The color of data points | 1~NT | #69b3a2 |
-| `pointBorderColor` | The border color of data points | 1~NT | #69b3a2 |
-| `pointBorderWidth` | The border width of data points | 1~NT | 0 |
-| `pointSize` | The size of data points | 1~NT | 3 |
+| `lineColor` | Color of the lines in the chart | 1~NT | 'white'('black'<sup>*</sup>) |
+| `lineWidth` | Width of the lines in the chart | 1~NT | 1.5 |
+| `showLine` | Show/hide lines (true\|false) | 1~NT | true |
+| `showPoint` | Show/hide data points (true\|false) | 1~NT | true |
+| `pointColor` | Color of data points | 1~NT | #69b3a2 |
+| `pointBorderColor` | Border color of data points | 1~NT | #69b3a2 |
+| `pointBorderWidth` | Border width of data points | 1~NT | 0 |
+| `pointSize` | Radius of data points | 1~NT | 3 |
 | `fillGap` | Connect points over missing data (true\|false) | 1~NT | false |
-| `yAxisLocation` | The corresponding Y axis for a specific dataset (left\|right) | 1~NT | left |
+| `yAxisLocation` | Corresponding Y axis for the dataset (left\|right) | 1~NT | left |
 
-### Parameters for Bar Chart
+### Parameters for a Bar Chart
 These key-value pairs should be placed under the key `bar`.
 
 | Key | Description | Number of Values | Default |
 |:--------|:-------|:-----------:|:------|
-| `barColor` | The color of bars in chart | 1~NT | #69b3a2 |
-| `yAxisLocation` |  The corresponding y-axis for a specific dataset (left\|right) | 1~NT | left |
+| `barColor` | Color of bars in the chart | 1~NT | #69b3a2 |
+| `yAxisLocation` |  Corresponding y-axis for the dataset (left\|right) | 1~NT | left |
 
-### Parameters for Summary
+### Parameters for a Summary
 These key-value pairs should be placed under the key `summary`.
 
 | Key | Description | Number of Values | Default |
 |:--------|:-------|:-----------:|:------|
-| `template` | Text template (you may embed [template variables](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TemplateVariables.md) | 1 | '' |
-| `style` | CSS style applied the rendered text block | 1 | '' |
+| `template` | Text template (you may embed [expressions](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Expressions.md) | 1 | '' |
+| `style` | CSS style applied to the rendered text block | 1 | '' |
 
-### Parameters for Bullet Chart
+### Parameters for a Bullet Chart
 These key-value pairs should be placed under the key `bullet`.
 
 | Key | Description | Number of Values | Default |
 |:--------|:-------|:-----------:|:------|
-| `title` | The title of the chart | 1 | '' |
-| `dataset` | The index of the dataset of your interest | 1 | 0 |
+| `title` | Title of this chart | 1 | '' |
+| `dataset` | Index of the dataset of your interest | 1 | 0 |
 | `orientation` | Bar orientation (horizontal\|vertical) | 1 | 'horizontal' |
-| `value` | The actual value of interest<br>(you may embed [template variables](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TemplateVariables.md) | 1 | '' |
-| `valueUnit` | The unit of value displayed aside | 1 | '' |
-| `valueColor` | The color of the value bar | 1 | '#69b3a2' |
-| `range` | The ranges of color bands in background | N | [] |
-| `rangeColor` | The color of range bands | N | [] |
-| `showMarker` | Show marker or not (true\|false) | 1 | true |
-| `markerValue` | The value of the markder | 1 | 0 |
-| `markerColor` | The color of the marker | 1 | 'black' |
-
-### Parameters for Month View
+| `value` | Actual value of interest<br>(you may embed [expressions](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Expressions.md) | 1 | '' |
+| `valueUnit` | Unit of the Y value displayed aside | 1 | '' |
+| `valueColor` | Color of the value bar | 1 | '#69b3a2' |
+| `range` | Data anges of defined by series of numbers | N | [] |
+| `rangeColor` | Color of the range bands | N | [] |
+| `showMarker` | Show/hide the marker line (true\|false) | 1 | true |
+| `markerValue` | Value of the markder | 1 | 0 |
+| `markerColor` | Color of the marker | 1 | 'black' |
+
+### Parameters for a Month View
 These key-value pairs should be placed under the key `month`.
 
 | Key | Description | Number of Values | Default |
 |:--------|:-------|:-----------:|:------|
-| `dataset` | The index of the dataset of your interest | 1~NT | all indices of non-x searchTarget |
+| `dataset` | Index of the dataset of your interest | 1~NT | all indices of non-x searchTarget |
 | `startWeekOn` | First day of a week ('Sun'\|'Mon') | 1 | 'Sun' |
-| `threshold` | The threshold to determine showing a circle on a day or not | 1~NT | 0 |
+| `threshold` | Threshold to determine showing a circle on a day or not | 1~NT | 0 |
 | `yMin` | Minimum value | 1~NT | Minimum value of the dataset |
 | `yMax` | Maximum value | 1~NT | Maximum value of the dataset |
-| `showCircle` | Circle the day label if the collected value reach the threshold (value > threshold) | 1 | true |
+| `showCircle` | Circle the day label if the collected value reach the threshold (value > `threshold`) | 1 | true |
 | `color` | Main color (can be override by other color parameters) | 1 | null |
 | `dimNotInMonth` | Dim the color for days not in current month | 1 | true |
-| `showStreak` | Show streaks between circles | 1 | true |
-| `showTodayRing` | Show a ring on the label today | 1 | true |
-| `showSelectedValue` | Show the value on the selected day | 1 | true |
-| `showSelectedRing` | Show a ring on the label of the selected day | 1 | true |
-| `circleColor` | The color of circles | 1 | '#69b3a2' |
-| `circleColorByValue` | Display colors based on the value | 1 | 1 |
-| `headerYearColor` | The color of year text in header | 1 | 'white' |
-| `headerMonthColor` | The color of the month text in header | 1 | 'white' |
-| `dividingLineColor` | The color of the dividing line | 1 | '#69b3a2' |
-| `todayRingColor` | The color of the ring on today | 1 | 'white' |
-| `selectedRingColor` | The color of the ring on the selected day | 1 | 'firebrick' |
-| `initMonth` | Initial month to show (YYYY-MM) | 1 | last month found |
\ No newline at end of file
+| `showStreak` | Show/hide streaks between circles | 1 | true |
+| `showTodayRing` | Show/hide the ring on the label today | 1 | true |
+| `showSelectedValue` | Show/hide the value on the selected day | 1 | true |
+| `showSelectedRing` | Show/hide a ring on the label of the selected day | 1 | true |
+| `circleColor` | Color of circles | 1 | '#69b3a2' |
+| `circleColorByValue` | Display circle colors based on the value | 1 | false |
+| `headerYearColor` | Color of the year text in header | 1 | 'white' |
+| `headerMonthColor` | Color of the month text in header | 1 | 'white' |
+| `dividingLineColor` | Color of the dividing line | 1 | '#69b3a2' |
+| `todayRingColor` | Color of the ring on today | 1 | 'white' |
+| `selectedRingColor` | Color of the ring on the selected day | 1 | 'firebrick' |
+| `initMonth` | Initial month to show (YYYY-MM) | 1 | last month found |
+
+### Parameters for Pie Chart
+These key-value pairs should be placed under the key `pie`.
+
+| Key | Description | Number of Values | Default |
+|:--------|:-------|:-----------:|:------|
+| `title` | Title of this chart | 1 | '' |
+| `data` | Array of values, each represents the number or fraction of a circular sector | N | '' |
+| `dataColor` | Color of each circular sector | N | '' |
+| `dataName` | Name of each data shown on legend | N | |
+| `label` | Labels for each data shown on circular sector | N | |
+| `hideLabelLessThan` | Hide the label with its fraction number lower than | 1 | 0.03 |
+| `showExtLabelOnlyIfNoLabel` | Show/hide the external label only if the correstponding label is missing or empty (true\|false) | 1 | false |
+| `extLabel` | Labels for each data shown aside out of circular sector | N | |
+| `ratioInnerRadius` | Ratio of donut inner radius to pie radius | 1 | 0 |
+| `showLegend` | Show/hide legend (true\|false) | 1 | false |
+| `legendPosition` | Legend position (top\|bottom\|left\|right) | 1 | right |
+| `legendOrientation` | Legend orientation (vertical\|horizontal) | 1 | horizontal for bottom and top<br>vertical for left and right |
+| `legendBgColor` | Legend background color | 1 | none |
+| `legendBorderColor` | Legend border color | 1 | white |
diff --git a/docs/MathOnDataset.md b/docs/MathOnDataset.md
deleted file mode 100644
index 69b7d04..0000000
--- a/docs/MathOnDataset.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Template Variables
-
-## Importat!!! Changed!!!
-Currently, there are two places you can use template variables. First is the `template` parameter under output type `summary`. The second one is the `value` parameter under output type `bullet`. For each template variable, the plugin will do calculations based on the collected dataset refereed, and render the output with variables replaced by calculated results.
-
-The following table shows all the template variables available for now. The "N" in the table is the ID (the order of a target in `searchTarget` parameter starting from zero) or the name (specified by the parameter `datasetName`) of a dataset. 
-
-Examples using template variables could be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/BloodPressureTracker.md).
-
-## List of Dataset Related Functions
-
-| Function | Description |
-|:------------------|:-----------|
-| dataset(id: number): Dataset | |
-| min(dataset: Dataset): number | Minimum value of the dataset |
-| minDate(dataset: Dataset): Date | Latest date of minimum value |
-| max(dataset: Dataset): number | Maximum value of the dataset |
-| maxDate(dataset: Dataset): Date | Latest date of maximum value |
-| startDate(dataset: Dataset): Date | Start date of the dataset |
-| endDate(dataset: Dataset): Date | End date of the dataset |
-| sum(dataset: Dataset): number | Summation of values of the dataset |
-| numTargets(dataset: Dataset): number | Total counts of targets |
-| numDays(dataset: Dataset): number | Days from startDate to endDate |
-| numDaysHavingData(dataset: Dataset): number | Number of days having data |
-| maxStreak(dataset: Dataset): number | Maximum continuous days without breaks |
-| maxStreakStart(dataset: Dataset): Date | Start date of the max streak |
-| maxStreakEnd(dataset: Dataset): Date | End date of the max streak |
-| maxBreaks(dataset: Dataset): number | Maximum break days |
-| maxBreaksStart(dataset: Dataset): Date | Start date of the maximum break days |
-| maxBreaksEnd(dataset: Dataset): Date | End date of the maximum break days |
-| currentStreak(dataset: Dataset): number | Current continuous days |
-| currentStreakStart(dataset: Dataset): Date | Start date of current streak |
-| currentStreakEnd(dataset: Dataset): Date | End date of current streak |
-| currentBreaks(dataset: Dataset): number | Current break days |
-| currentBreaksStart(dataset: Dataset): Date | Start date of current breaks |
-| currentBreaksEnd(dataset: Dataset): Date | End date of current breaks |
-| average(dataset: Dataset): number | Average value of the dataset |
-| median(dataset: Dataset): number | Median value of the dataset |
-| variance(dataset: Dataset): number | Variance value of the dataset |
-
-## List of Binary Operation
-| Function | Description |
-|:------------------|:-----------|
-| + | |
-| - | |
-| * | |
-| / | |
-| % | |
-
-## List of Deprecated Template Variables
-| Template variable | Description |
-|:------------------|:-----------|
-| count | Use numTargets instead |
-| days | Use numDays instead |
-| lastStreak | Use currentSteak instead |
-
-Notice when doing calculations like sum or average, the missing values are ignored. You can set those missing values to zero by setting the value of key `penalty`  to zero. Moreover, if the key `ignoreZeroValue` is assigned true, zero value will be ignored too. You can check these parameters [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md)
\ No newline at end of file
diff --git a/docs/Questions.md b/docs/Questions.md
index 285c8e5..90852c9 100644
--- a/docs/Questions.md
+++ b/docs/Questions.md
@@ -35,7 +35,7 @@ searchType: text
 searchTarget: 'tagName:\s(?<value>[0-9]+)'
 ......
 ```
-    More cases can be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TrackUsingRegex.md)
+    More cases can be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestRegex.md)
 
 ---
 
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index ca3ecea..d927a33 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,5 +1,10 @@
 # Release Notes
 
+## v1.9.0
+- Add a new output type `pie`, rendering a pie chart ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestPieChart.md))
+- Allow expressions (operators and functions) as data inputs for output type `summary`, `bullet`, and `pie` (examples: [expression](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestExpression.md), [summary](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestSummary.md), [bullet](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestBullet.md), [pie](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestPieChart.md))
+- Allow formatting evaluated expressions by a follwing format string ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestExpression.md))
+
 ## v1.8.2
 - Fixed tasks searching not working for multiple targets
 
diff --git a/docs/RoadMap.md b/docs/RoadMap.md
index 9b21956..861a915 100644
--- a/docs/RoadMap.md
+++ b/docs/RoadMap.md
@@ -6,34 +6,38 @@
     - [x] Support multiple targets and multiple values
     - [x] Add a parameter xDataset to identify targets to be used as x values
     - [x] Allow tracking time values
+    - [ ] Allow tracking date values
     - [x] Get data from a table
     - [x] Collect data from dataview plugin's inline fields
     - [x] Collect meta information from file
     - [x] Support tracking tasks
-    - [ ] Allow manual data input (x and y values)
+    - [ ] Allow manual data input (x and y values) in custom datasets
     - [ ] Allow forced value types
     - [ ] Allow using non-date x values
+    - [ ] Allow multiple points (different time stamp) from a single file
 - Output Type and Graph
-    - [x] New output type 'summary', analyzes the input data and represents it using a user-defined text template
-    - [x] New output type 'bar', rendering a bar chart
-    - [x] New output type 'bullet', rendering
-    - [x] New output type 'month', rendering a month view
-    - [ ] New output type 'heatmap', rendering a heatmap like Github activity chart
+    - [x] Implement output type 'summary', analyzes the input data and represents it using a user-defined text template
+    - [x] Implement output type 'bar', rendering a bar chart
+    - [x] Implement output type 'bullet', rendering
+    - [x] Implement output type 'month', rendering a month view
+    - [ ] Implement output type 'heatmap', rendering a heatmap like Github activity chart
+    - [x] Implement output type 'pie', rendering a pie chart
     - [x] Add parameters for adjusting the size of the graph
     - [ ] Multiple outputs from one code block
-    - [ ] Support graphs showing the correlation between sets of data.
+    - [ ] Support graphs showing the correlation between sets of data
     - [ ] Allow a graph drawing selected dataset.
-    - [ ] Evaluate template variables by arithmetics and predefined functions.
+    - [x] Allow expressions evaluating operators and functions
+    - [x] Allow format string for evaluated expressions
 - Helper
     - [x] Add Commands help create Tracker blocks.
-    - [ ] Add an 'Explode' button to the rendered blocks, it will replace the code block with the rendered result.
+    - [ ] Add an 'Explode' button to the rendered blocks, it will replace the code block with the rendered result
     - [ ] Add a helper panel for adding frequently used tracking targets to article.
 - Data Processing
-    - [ ] Allow arithmetics operation on dataset and generate new datasets
+    - [ ] Allow arithmetics operation on dataset and generate custom datasets
     - [ ] Add data post-process function, e.g. 'moving average'
 - Performance
     - [ ] Use PixiJS to do rendering
 
-And more ...
+And more ... Feature requests are welcome.
 
 P.S. Features may not be implemented in the order above.
\ No newline at end of file
diff --git a/docs/TargetEvaluation.md b/docs/TargetEvaluation.md
index a771ecb..fdcdc9a 100644
--- a/docs/TargetEvaluation.md
+++ b/docs/TargetEvaluation.md
@@ -57,7 +57,7 @@ This search type helps you count wiki links in articles. For example,
 [[B|Link to B]]
 
 ### searchType: text
-searchType `text` is the most powerful one among all. If you simply provide text like 'love', the number of occurrences of tags will be counted. You can provide a regular expression to search for a very complicated target by wrapping it in single quotes. If you want to retrieve a value from it, use the group name in the expression. To see more detail, see [this case](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TrackUsingRegex.md).
+searchType `text` is the most powerful one among all. If you simply provide text like 'love', the number of occurrences of tags will be counted. You can provide a regular expression to search for a very complicated target by wrapping it in single quotes. If you want to retrieve a value from it, use the group name in the expression. To see more detail, see [this case](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestRegex.md).
 
 Multiple values in text search can be achieved by separate regex by comma and wrap them all in single quotes as follows:
 

From 0a543a7be890101c295a7b54d3501223848d41a8 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 27 Jul 2021 18:25:09 +0800
Subject: [PATCH 151/402] Fix error if value parameter in bullet is of type
 number

---
 examples/TestBullet.md | 64 ++++++++++++++++++++++++++++++------------
 src/parsing.ts         |  3 ++
 2 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/examples/TestBullet.md b/examples/TestBullet.md
index b71fee4..2db3601 100644
--- a/examples/TestBullet.md
+++ b/examples/TestBullet.md
@@ -1,5 +1,32 @@
 # Test Bullet
+
+## Manual Input Data
+
+Manual input `value` as 12\.5
+``` tracker
+searchType: tag
+searchTarget: clean-up
+folder: diary
+endDate: 2021-01-31
+fixedScale: 1.1
+bullet:
+    title: "Clean Up"
+    dataset: 0
+    orientation: horizontal
+    range: 10, 20, 40
+    rangeColor: darkgray, silver, lightgray
+    value: 12.5
+    valueUnit: times
+    valueColor: '#69b3a2'
+    showMarker: true
+    markerValue: 30
+    markerColor: black
+```
+
+## Data from Notes
+
 Horizontal bullet chart
+value from expression function currentBreaks()
 ``` tracker
 searchType: tag
 searchTarget: clean-up
@@ -8,19 +35,20 @@ endDate: 2021-01-31
 fixedScale: 1.1
 bullet:
     title: "Clean Up"
-	dataset: 0
+    dataset: 0
     orientation: horizontal
-	range: 10, 20, 40
-	rangeColor: darkgray, silver, lightgray
-	value: "{{currentBreaks()}}"
-	valueUnit: times
-	valueColor: '#69b3a2'
-	showMarker: true
-	markerValue: 24
-	markerColor: black
+    range: 10, 20, 40
+    rangeColor: darkgray, silver, lightgray
+    value: "{{currentBreaks()}}"
+    valueUnit: times
+    valueColor: '#69b3a2'
+    showMarker: true
+    markerValue: 24
+    markerColor: black
 ```
 
 Vertical bullet chart
+value from expression function sum()
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -28,16 +56,16 @@ folder: diary
 endDate: 2021-01-31
 bullet:
     title: "Meditation"
-	dataset: 0
+    dataset: 0
     orientation: vertical
-	range: 30, 60, 100
-	rangeColor: darkgray, silver, lightgray
-	value: "{{sum()}}"
-	valueUnit: times
-	valueColor: steelblue
-	showMarker: true
-	markerValue: 80
-	markerColor: red
+    range: 30, 60, 100
+    rangeColor: darkgray, silver, lightgray
+    value: "{{sum()}}"
+    valueUnit: times
+    valueColor: steelblue
+    showMarker: true
+    markerValue: 80
+    markerColor: red
 ```
 
 Please also check those search targets in markdown files under folder 'diary'.
\ No newline at end of file
diff --git a/src/parsing.ts b/src/parsing.ts
index a57cd9a..13e5040 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -2125,6 +2125,9 @@ export function getRenderInfoFromYaml(
         if (typeof yamlBullet?.value === "string") {
             bullet.value = yamlBullet.value;
         }
+        else if (typeof yamlBullet?.value === "number") {
+            bullet.value = yamlBullet.value.toString();
+        }
         // console.log(bullet.value);
 
         // value unit

From 063c15d35de3b440762d0f7e173eee7dbe063fdd Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 27 Jul 2021 18:26:02 +0800
Subject: [PATCH 152/402] update examples

---
 docs/Examples.md                              |   1 +
 docs/Expressions.md                           |  64 ++++----
 examples/ErrorMessages.md                     |  12 +-
 .../{TestDatasetMath.md => TestExpression.md} | 148 ++++++++++++++----
 examples/{TrackUsingRegex.md => TestRegex.md} |   2 +-
 examples/TestSummary.md                       |  26 +++
 6 files changed, 181 insertions(+), 72 deletions(-)
 rename examples/{TestDatasetMath.md => TestExpression.md} (64%)
 rename examples/{TrackUsingRegex.md => TestRegex.md} (98%)
 create mode 100644 examples/TestSummary.md

diff --git a/docs/Examples.md b/docs/Examples.md
index 802ce5b..ee15fe7 100644
--- a/docs/Examples.md
+++ b/docs/Examples.md
@@ -56,6 +56,7 @@ List of all examples
 - [Multiple Targets / Multiple Values](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestMultipleTargetsMultipleValues.md)
 - [Pie Chart](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestPieChart.md)
 - [Scaling and Positioning](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestScalingAndPositioning.md)
+- [Summary](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestSummary.md)
 - [Table](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTable.md)
 - [Task](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTask.md)
 - [Time Values](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTimeValues.md)
diff --git a/docs/Expressions.md b/docs/Expressions.md
index f17039a..e3c301d 100644
--- a/docs/Expressions.md
+++ b/docs/Expressions.md
@@ -47,48 +47,48 @@ dataset + dataset --> dataset
 
 ### Get dataset from index
 
-| Function(Input Args): Output | Description |
+| Function(InputType): OutputType | Description |
 |:------------------|:-----------|
-| dataset(id: number): Dataset | Get dataset from dataset id (the order in `searchTarget` |
+| dataset(number): Dataset | Get dataset from dataset id (the order in `searchTarget`) |
 
 ### Functions Accept Dataset and return a value
 
-If the input dataset is missing, it will use the first available Y dataset found.
+**If the input dataset is missing, it will use the first available Y dataset found.**
 
-| Function(Input Args): Output | Description |
+| Function(InputType): OutputType | Description |
 |:------------------|:-----------|
-| min(dataset: Dataset): number | Minimum value of the dataset |
-| minDate(dataset: Dataset): Date | Latest date of minimum value |
-| max(dataset: Dataset): number | Maximum value of the dataset |
-| maxDate(dataset: Dataset): Date | Latest date of maximum value |
-| startDate(dataset: Dataset): Date | Start date of the dataset |
-| endDate(dataset: Dataset): Date | End date of the dataset |
-| sum(dataset: Dataset): number | Summation of values of the dataset |
-| numTargets(dataset: Dataset): number | Total counts of targets |
-| numDays(dataset: Dataset): number | Days from startDate to endDate |
-| numDaysHavingData(dataset: Dataset): number | Number of days having data |
-| maxStreak(dataset: Dataset): number | Maximum continuous days without breaks |
-| maxStreakStart(dataset: Dataset): Date | Start date of the max streak |
-| maxStreakEnd(dataset: Dataset): Date | End date of the max streak |
-| maxBreaks(dataset: Dataset): number | Maximum break days |
-| maxBreaksStart(dataset: Dataset): Date | Start date of the maximum break days |
-| maxBreaksEnd(dataset: Dataset): Date | End date of the maximum break days |
-| currentStreak(dataset: Dataset): number | Current continuous days |
-| currentStreakStart(dataset: Dataset): Date | Start date of current streak |
-| currentStreakEnd(dataset: Dataset): Date | End date of current streak |
-| currentBreaks(dataset: Dataset): number | Current break days |
-| currentBreaksStart(dataset: Dataset): Date | Start date of current breaks |
-| currentBreaksEnd(dataset: Dataset): Date | End date of current breaks |
-| average(dataset: Dataset): number | Average value of the dataset |
-| median(dataset: Dataset): number | Median value of the dataset |
-| variance(dataset: Dataset): number | Variance value of the dataset |
+| min(Dataset): number | Minimum value of the dataset |
+| minDate(Dataset): Date | Latest date of minimum value |
+| max(Dataset): number | Maximum value of the dataset |
+| maxDate(Dataset): Date | Latest date of maximum value |
+| startDate(Dataset): Date | Start date of the dataset |
+| endDate(Dataset): Date | End date of the dataset |
+| sum(Dataset): number | Summation of values of the dataset |
+| numTargets(Dataset): number | Total counts of targets |
+| numDays(Dataset): number | Days from startDate to endDate |
+| numDaysHavingData(Dataset): number | Number of days having data |
+| maxStreak(Dataset): number | Maximum continuous days without breaks |
+| maxStreakStart(Dataset): Date | Start date of the max streak |
+| maxStreakEnd(Dataset): Date | End date of the max streak |
+| maxBreaks(Dataset): number | Maximum break days |
+| maxBreaksStart(Dataset): Date | Start date of the maximum break days |
+| maxBreaksEnd(Dataset): Date | End date of the maximum break days |
+| currentStreak(Dataset): number | Current continuous days |
+| currentStreakStart(Dataset): Date | Start date of current streak |
+| currentStreakEnd(Dataset): Date | End date of current streak |
+| currentBreaks(Dataset): number | Current break days |
+| currentBreaksStart(Dataset): Date | Start date of current breaks |
+| currentBreaksEnd(Dataset): Date | End date of current breaks |
+| average(Dataset): number | Average value of the dataset |
+| median(Dataset): number | Median value of the dataset |
+| variance(Dataset): number | Variance value of the dataset |
 
 ### Functions Accept Dataset and Return Dataset
 
-| Function | Description |
+| Function(InputType): OutputType | Description |
 |:---------|:-----------|
-| normalize(dataset: Dataset): Dataset | rescale the Y values to [0, 1] |
-| setMissingValues(dataset: Dataset, missingValue: number): Dataset | set the missing values |
+| normalize(Dataset): Dataset | rescale the Y values to [0, 1] |
+| setMissingValues(Dataset, number): Dataset | set the missing values |
 
 ## Missing Values
 
diff --git a/examples/ErrorMessages.md b/examples/ErrorMessages.md
index a986a5f..3df20b8 100644
--- a/examples/ErrorMessages.md
+++ b/examples/ErrorMessages.md
@@ -101,7 +101,7 @@ yAxisLabel allows only two inputs
 searchType: frontmatter, frontmatter
 searchTarget: bloodpressure[0], bloodpressure[1]
 line:
-	yAxisLabel: BP1, BP2, BP3
+    yAxisLabel: BP1, BP2, BP3
 ```
 
 ## Output
@@ -117,8 +117,8 @@ The Parameter 'lineColor' allows only one input for the single target
 searchType: tag
 searchTarget: weight
 line:
-	title: Line
-	lineColor: red, yellow
+    title: Line
+    lineColor: red, yellow
 ``` 
 
 The parameter name should be 'title', not 'titles'
@@ -136,7 +136,7 @@ searchType: table
 searchTarget: data/Tables[4][0], data/Tables[4][1]
 xDataset: 0
 line:
-	lineColor: none, yellow
+    lineColor: none, yellow
 ```
 
 
@@ -159,7 +159,7 @@ summary:
     template: '{{1+}}'
 ```
 
-No data set found for id
+No dataset found for id
 ``` tracker
 searchType: task
 searchTarget: Say I love you
@@ -175,7 +175,7 @@ summary:
     template: '{{sum()/0}}'
 ```
 
-Invalid datarange
+Invalid data range (data only contains 1 and null)
 ``` tracker
 searchType: tag
 searchTarget: meditation
diff --git a/examples/TestDatasetMath.md b/examples/TestExpression.md
similarity index 64%
rename from examples/TestDatasetMath.md
rename to examples/TestExpression.md
index 959706c..68f1e9f 100644
--- a/examples/TestDatasetMath.md
+++ b/examples/TestExpression.md
@@ -1,7 +1,88 @@
-# Test Dataset Math
+# Test Expression
 
-# Function Dataset to Value
-### min(Dataset): number
+All examples here using the output type `summary`.
+To see examples of `bullet` and `pie`, please check [bullet examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestBullet.md) and [pie examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestPieChart.md).
+
+## Operators
+
+### Dataset and number
+
+Dataset \+ number --> Dataset
+``` tracker
+searchType: dvField
+searchTarget: dataviewTarget
+folder: /diary
+startDate: 2021-01-01
+endDate: 2021-01-03
+summary:
+    template: 'Maximum value: {{max() + 10::i}} <-- should be 48 + 10'
+```
+
+Dataset \- number --> Dataset
+``` tracker
+searchType: dvField
+searchTarget: dataviewTarget
+folder: /diary
+startDate: 2021-01-01
+endDate: 2021-01-03
+summary:
+    template: 'Maximum value: {{max() / 2::i}} <-- should be 48 / 2'
+```
+
+Dataset \* number --> Dataset
+``` tracker
+searchType: dvField
+searchTarget: dataviewTarget
+folder: /diary
+startDate: 2021-01-01
+endDate: 2021-01-03
+summary:
+    template: 'Maximum value: {{max() * 2::i}} <-- should be 48 * 2'
+```
+
+Dataset / number --> Dataset
+``` tracker
+searchType: dvField
+searchTarget: dataviewTarget
+folder: /diary
+startDate: 2021-01-01
+endDate: 2021-01-03
+summary:
+    template: 'Maximum value: {{max() /2::i}} <-- should be 48 / 2'
+```
+
+Dataset % number --> Dataset
+``` tracker
+searchType: dvField
+searchTarget: dataviewTarget
+folder: /diary
+startDate: 2021-01-01
+endDate: 2021-01-03
+summary:
+    template: 'Maximum value: {{max() % 5::i}} <-- should be 48 % 5'
+```
+
+### Dataset and Dataset
+
+Dataset1 \+ Dataset2 --> Dataset
+==> Dataset[i] = Dataset1[i] + Dataset2[i]
+``` tracker
+searchType: dvField
+searchTarget: dataviewTarget
+folder: /diary
+startDate: 2021-01-01
+endDate: 2021-01-03
+summary:
+    template: 'Maximum value: {{max(dataset(0) + dataset(0))::i}} <-- should be 48 + 48'
+```
+
+## Functions
+
+**If the input dataset is missing, it will use the first available Y dataset found.**
+
+### Functions Accept Dataset and Return a Value
+
+min(Dataset): number
 ``` tracker
 searchType: dvField
 searchTarget: dataviewTarget
@@ -11,7 +92,7 @@ summary:
     template: 'Minimum value: {{min()::i}} <-- should be 12'
 ```
 
-### minDate(Dataset): Date
+minDate(Dataset): Date
 ``` tracker
 searchType: dvField
 searchTarget: dataviewTarget
@@ -21,7 +102,7 @@ summary:
     template: 'Latest date of minimum value: {{minDate()}} <-- should be 2021-01-03'
 ```
 
-### max(Dataset): number
+max(Dataset): number
 ``` tracker
 searchType: dvField
 searchTarget: dataviewTarget
@@ -31,7 +112,7 @@ summary:
     template: 'Maximum value: {{max()::i}} <-- should be 48'
 ```
 
-### maxDate()
+maxDate(Dataset): Date
 ``` tracker
 searchType: dvField
 searchTarget: dataviewTarget
@@ -41,7 +122,7 @@ summary:
     template: 'Latest date of maximum value: {{maxDate()}} <-- should be 2021-01-01'
 ```
 
-### startDate()
+startDate(Dataset): Date
 ``` tracker
 searchType: dvField
 searchTarget: dataviewTarget
@@ -51,7 +132,7 @@ summary:
     template: 'Start date: {{startDate()}} <-- should be 2021-01-01'
 ```
 
-### endDate()
+endDate(Dataset): Date
 ``` tracker
 searchType: dvField
 searchTarget: dataviewTarget
@@ -61,7 +142,7 @@ summary:
     template: 'End date: {{endDate()}} <-- should be 2021-01-03'
 ```
 
-### sum()
+sum(Dataset): number
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -71,7 +152,7 @@ summary:
     template: 'Sum: {{sum()::i}} <-- should be 3'
 ```
 
-### numTargets()
+numTargets(Dataset): number
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -81,7 +162,7 @@ summary:
     template: 'Number of targets: {{numTargets()::i}} <-- should be 3'
 ```
 
-### numDays()
+numDays(Dataset): number
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -91,7 +172,7 @@ summary:
     template: 'Number of days: {{numDays()::i}} <-- should be 4'
 ```
 
-### numDaysHavingData()
+numDaysHavingData(Dataset): number
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -101,7 +182,7 @@ summary:
     template: 'Number of days having data: {{numDaysHavingData()::i}} <-- should be 3'
 ```
 
-### maxStreak()
+maxStreak(Dataset): number
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -111,7 +192,7 @@ summary:
     template: 'Maximum streak: {{maxStreak()::i}} <-- should be 5'
 ```
 
-### maxStreakStart()
+maxStreakStart(Dataset): Date
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -121,7 +202,7 @@ summary:
     template: 'The start date of maximum streak: {{maxStreakStart()}} <-- should be 2021-01-02'
 ```
 
-### maxStreakEnd()
+maxStreakEnd(Dataset): Date
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -131,7 +212,7 @@ summary:
     template: 'The end date of maximum streak: {{maxStreakEnd()}} <-- should be 2021-01-06'
 ```
 
-### maxBreaks()
+maxBreaks(Dataset): number
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -141,7 +222,7 @@ summary:
     template: 'Maximum breaks: {{maxBreaks()::i}} <-- should be 2'
 ```
 
-### maxBreaksStart()
+maxBreaksStart(Dataset): Date
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -151,7 +232,7 @@ summary:
     template: 'The start date of maximum breaks: {{maxBreaksStart()}} <-- should be 2021-01-07'
 ```
 
-### maxBreaksEnd()
+maxBreaksEnd(Dataset): Date
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -161,7 +242,7 @@ summary:
     template: 'The end date of maximum breaks: {{maxBreaksEnd()}} <-- should be 2021-01-08'
 ```
 
-### currentStreak()
+currentStreak(Dataset): number
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -171,7 +252,7 @@ summary:
     template: 'Latest streak: {{currentStreak()::i}} <-- should be 1'
 ```
 
-### currentStreakStart()
+currentStreakStart(Dataset): Date
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -181,7 +262,7 @@ summary:
     template: 'The start date of current streak: {{currentStreakStart()}} <-- should be 2021-01-24'
 ```
 
-### currentStreakEnd()
+currentStreakEnd(Dataset): Date
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -191,7 +272,7 @@ summary:
     template: 'The end date of current streak: {{currentStreakEnd()}} <-- should be 2021-01-24'
 ```
 
-### currentBreaks()
+currentBreaks(Dataset): number
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -201,7 +282,7 @@ summary:
     template: 'Current breaks: {{currentBreaks()::i}} <-- should be 1'
 ```
 
-### currentBreaksStart()
+currentBreaksStart(Dataset): number
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -211,7 +292,7 @@ summary:
     template: 'The start date of current breaks: {{currentBreaksStart()}} <-- should be 2021-01-22'
 ```
 
-### currentBreaksEnd()
+currentBreaksEnd(Dataset): Date
 ``` tracker
 searchType: tag
 searchTarget: meditation
@@ -221,7 +302,7 @@ summary:
     template: 'The end date of current breaks: {{currentBreaksEnd()}} <-- should be 2021-01-22'
 ```
 
-### average()
+average(Dataset): number
 (48+25+12)/3 = 28.33
 ``` tracker
 searchType: dvField
@@ -232,7 +313,7 @@ summary:
     template: 'Average value: {{average()::.2f}} <-- should be 28.33'
 ```
 
-### median()
+median(Dataset): number
 ``` tracker
 searchType: dvField
 searchTarget: dataviewTarget
@@ -242,7 +323,7 @@ summary:
     template: 'Median value: {{median()::i}} <-- should be 25'
 ```
 
-### variance()
+variance(Dataset): number
 https://mathworld.wolfram.com/SampleVariance.html
 ``` tracker
 searchType: dvField
@@ -253,24 +334,25 @@ summary:
     template: 'Variance value: {{variance()::.2f}} <-- should be 332.33'
 ```
 
-## Function Dataset to Dataset
+### Functions Accept Dataset and Return a Dataset
 
-### setMissingValues()
+normalize(Dataset): Dataset
 ``` tracker
 searchType: tag
 searchTarget: meditation
 folder: /diary
 endDate: 2021-01-04
 summary:
-    template: 'Set missing values to -1 then do summation: {{sum( setMissingValues( dataset(0), -1 ) )::i}} <-- should be 2'
+    template: 'Set missing values to -1, do normalization then do summation: {{sum( normalize( setMissingValues(dataset(0), -1) ) )::i}} <-- sgiydk be 3'
 ```
 
-### Normalize()
+setMissingValues(Dataset): Dataset
 ``` tracker
 searchType: tag
 searchTarget: meditation
 folder: /diary
 endDate: 2021-01-04
 summary:
-    template: 'Set missing values to -1, do normalization then do summation: {{sum( normalize( setMissingValues(dataset(0), -1) ) )::i}} <-- sgiydk be 3'
-```
\ No newline at end of file
+    template: 'Set missing values to -1 then do summation: {{sum( setMissingValues( dataset(0), -1 ) )::i}} <-- should be 2'
+```
+
diff --git a/examples/TrackUsingRegex.md b/examples/TestRegex.md
similarity index 98%
rename from examples/TrackUsingRegex.md
rename to examples/TestRegex.md
index 22471ec..b790cf3 100644
--- a/examples/TrackUsingRegex.md
+++ b/examples/TestRegex.md
@@ -1,4 +1,4 @@
-# Track Text using Regular Expression
+# Search Text using Regular Expression
 
 **Important**!!
 1. Use single quotes to wrap the regular expression, or use double quotes with all back slashes (escape characters) duplicated.
diff --git a/examples/TestSummary.md b/examples/TestSummary.md
new file mode 100644
index 0000000..b9c4c6d
--- /dev/null
+++ b/examples/TestSummary.md
@@ -0,0 +1,26 @@
+# Test Summary
+
+## Multiple Lines
+
+``` tracker
+searchType: tag
+searchTarget: weight
+folder: diary
+summary:
+  template: "Minimum: {{min()}}kg\nMaximum: {{max()}}kg\nMedian: {{median()}}kg\nAverage: {{average()}}kg"
+```
+
+## Styling
+
+``` tracker
+searchType: text
+searchTarget: ⭐
+folder: diary
+summary:
+    template: "I have {{sum()}} stars in total."
+    style: "font-size:20px;color:yellow;margin-left: 50px;margin-top:00px;"
+```
+
+## Using Expressions
+
+Please check [expression examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestExpression.md) for more examples.
\ No newline at end of file

From 4ed2ea5c1b9bf9e31ab061b7f9c295c48487efc5 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 27 Jul 2021 19:16:02 +0800
Subject: [PATCH 153/402] Update examples

---
 examples/TestExpression.md | 13 ++++++
 examples/TestPieChart.md   | 87 +++++++++++++++-----------------------
 2 files changed, 47 insertions(+), 53 deletions(-)

diff --git a/examples/TestExpression.md b/examples/TestExpression.md
index 68f1e9f..8d7f38c 100644
--- a/examples/TestExpression.md
+++ b/examples/TestExpression.md
@@ -5,6 +5,19 @@ To see examples of `bullet` and `pie`, please check [bullet examples](https://gi
 
 ## Operators
 
+### number and number
+
+number \+ number --> number
+``` tracker
+searchType: dvField
+searchTarget: dataviewTarget
+folder: /diary
+startDate: 2021-01-01
+endDate: 2021-01-03
+summary:
+    template: 'Maximum value: {{10 + 10::i}} <-- should be 20'
+```
+
 ### Dataset and number
 
 Dataset \+ number --> Dataset
diff --git a/examples/TestPieChart.md b/examples/TestPieChart.md
index 1316490..6600c8f 100644
--- a/examples/TestPieChart.md
+++ b/examples/TestPieChart.md
@@ -1,37 +1,40 @@
 # Test Pie Chart
 
+Expressions could be used in parameter `data`, `label`, and `extLabel`.
+
 ## Manual Input Data
-### Numbers
-To be fixed,
-If numeric data not wrapped by single quotes
+
+### Numbers as Data
+Pie chart with labels showing percentages
 ``` tracker
 searchType: task.done, task.notdone
 searchTarget: Say I love you, Say I love you
 pie:
-    title: Manual Input Data
+    title: Pie Chart
     label: '{{2/30*100}}%, {{4/30*100}}%, {{6/30*100}}%, {{8/30*100}}%, {{10/30*100}}%'
-    data: '2, 4, 6, 8, 10'
+    data: 2, 4, 6, 8, 10
     dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
     ratioInnerRadius: 0.5
 ```
 
-### Expression
-To be fixed,
-If numeric data not wrapped by single quotes
-2,4,6,8,10
-????? errro?????
+### Arithmetic
+
+Pie chart with labels showing percentages
 ``` tracker
 searchType: task.done, task.notdone
 searchTarget: Say I love you, Say I love you
 datasetName: Done, NotDone
 pie:
-    title: Manual Input Data
+    title: Arithmetic
     data: '{{1 + 1}}, {{2 * 2}}, {{12/ 2}}, {{1+(2+3*2)-1}}, {{27%17}}'
+    label: '{{2/30*100}}%, {{4/30*100}}%, {{6/30*100}}%, {{8/30*100}}%, {{10/30*100}}%'
     dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
     ratioInnerRadius: 0.5
 ```
 
 ### Legend
+
+Use parameter `dataName` for the name on the legend
 ``` tracker
 searchType: task.done, task.notdone
 searchTarget: Say I love you, Say I love you
@@ -41,27 +44,30 @@ pie:
 	label: '{{2/30*100}}%, {{4/30*100}}%, {{6/30*100}}%, {{8/30*100}}%, {{10/30*100}}%'
     data: '2, 4, 6, 8, 10'
     dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
-	dataName: A, B, C, D, E
+    dataName: Data1, Data2, Data3, Data4, Data5
     ratioInnerRadius: 0.5
-	showLegend: true
-	legendPosition: right
-	legendOrientation: vertical	
+    showLegend: true
+    legendPosition: right
+    legendOrientation: vertical	
 ```
 
 ## Data from Notes
+
+Using function dataset() to get Dataset then use function sum() to get the summation
 ``` tracker
 searchType: task.done, task.notdone
 searchTarget: Say I love you, Say I love you
 folder: diary
 datasetName: Done, NotDone
 pie:
-    title: Task Done and Not Done
+    title: Love is Action
     data: '{{sum(dataset(0))}},{{sum(dataset(1))}}'
     dataColor: '#4daf4a,#377eb8'
-    ratioInnerRadius: 0.5
+	label: Say👍,Not Say💔
+    ratioInnerRadius: 0.3
 ```
 
-
+Summary
 ``` tracker
 searchType: task.done, task.notdone
 searchTarget: Say I love you, Say I love you
@@ -70,56 +76,31 @@ summary:
     template: "How many days I said love: {{sum(dataset(0))}}\nHow many days I didn't say love: {{sum(dataset(1))}}"
 ```
 
-``` tracker
-searchType: task.done, task.notdone
-searchTarget: Say I love you, Say I love you
-datasetName: Done, NotDone
-pie:
-    title: Task Done and Not Done
-	label: '2%, 4%, 6%, 8%, 10%'
-	extLabel: A, B, C, D
-    data: '{{1 + 1}}, {{2 * 2}}, {{12/ 2}}, {{1+(2+3*2)-1}}, {{27%17}}'
-    dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
-    ratioInnerRadius: 0.5
-```
-
 ## External Labels
 ``` tracker
 searchType: task.done, task.notdone
 searchTarget: Say I love you, Say I love you
 datasetName: Done, NotDone
 pie:
-    title: Task Done and Not Done
-	label: '{{0.5/28.5*100}}%, {{4/28.5*100}}%, {{6/28.5*100}}%, {{8/28.5*100}}%, {{10/28.5*100}}%'
-	extLabel: '{{0.5/28.5*100}}%, {{4/28.5*100}}%, {{6/28.5*100}}%, {{8/28.5*100}}%, {{10/28.5*100}}%'
+    label: '{{0.5/28.5*100}}%, {{4/28.5*100}}%, {{6/28.5*100}}%, {{8/28.5*100}}%, {{10/28.5*100}}%'
+    extLabel: 'A {{0.5/28.5*100}}%, B, C, D, E'
     data: '0.5, 4, 6, 8, 10'
     dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
-    ratioInnerRadius: 0.5
+    ratioInnerRadius: 0.6
 ```
 
+1. Label for the first data was hidden because the fraction of it is too small (less than 0.03, 3%).
+2. showExtLabelOnlyIfNoLabel was set to true, thus the external label of the first data was shown due to the hidden label.
 ``` tracker
 searchType: task.done, task.notdone
 searchTarget: Say I love you, Say I love you
 datasetName: Done, NotDone
 pie:
-    title: Task Done and Not Done
-	label: '{{0.5/28.5*100}}%, {{4/28.5*100}}%, {{6/28.5*100}}%, {{8/28.5*100}}%, {{10/28.5*100}}%'
-	extLabel:  '{{0.5/28.5*100}}%, {{4/28.5*100}}%, {{6/28.5*100}}%, {{8/28.5*100}}%, {{10/28.5*100}}%'
+    label: '{{0.5/28.5*100}}%, B {{4/28.5*100}}%, C {{6/28.5*100}}%, D {{8/28.5*100}}%, E {{10/28.5*100}}%'
+    extLabel:  'A {{0.5/28.5*100}}%, {{4/28.5*100}}%, {{6/28.5*100}}%, {{8/28.5*100}}%, {{10/28.5*100}}%'
     data: '0.5, 4, 6, 8, 10'
     dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
-    ratioInnerRadius: 0.5
-	showExtLabelOnlyIfNoLabel: true
+    ratioInnerRadius: 0.4
+	hideLabelLessThan: 0.03
+    showExtLabelOnlyIfNoLabel: true
 ```
-
-``` tracker
-searchType: task.done, task.notdone
-searchTarget: Say I love you, Say I love you
-datasetName: Done, NotDone
-pie:
-    title: Task Done and Not Done
-	label: '{{0.5/28.5*100::i}}%, {{4/28.5*100::i}}%, {{6/28.5*100::i}}%, {{8/28.5*100::i}}%, {{10/28.5*100::i}}%'
-	extLabel:  '{{0.5/28.5*100::i}}%, {{4/28.5*100::i}}%, {{6/28.5*100::i}}%, {{8/28.5*100::i}}%, {{10/28.5*100::i}}%'
-    data: '0.5, 4, 6, 8, 10'
-    dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
-    ratioInnerRadius: 0.5
-```
\ No newline at end of file

From f0189e3abbe166f4ec0bac401b78ef15fc3f0bfe Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 27 Jul 2021 19:36:34 +0800
Subject: [PATCH 154/402] Update TestPieChart.md

---
 examples/TestPieChart.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/TestPieChart.md b/examples/TestPieChart.md
index 6600c8f..29102af 100644
--- a/examples/TestPieChart.md
+++ b/examples/TestPieChart.md
@@ -14,7 +14,7 @@ pie:
     label: '{{2/30*100}}%, {{4/30*100}}%, {{6/30*100}}%, {{8/30*100}}%, {{10/30*100}}%'
     data: 2, 4, 6, 8, 10
     dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
-    ratioInnerRadius: 0.5
+    ratioInnerRadius: 0.0
 ```
 
 ### Arithmetic

From 430c50160e5c3c0a16d6b4bd97a09e79fae08d46 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 27 Jul 2021 19:48:09 +0800
Subject: [PATCH 155/402] Remove examples of future features

---
 examples/TestCustomDataset.md  | 48 ----------------------------------
 examples/TestHeatmap.md        | 12 ---------
 examples/TestMultipleGraphs.md | 24 -----------------
 3 files changed, 84 deletions(-)
 delete mode 100644 examples/TestCustomDataset.md
 delete mode 100644 examples/TestHeatmap.md
 delete mode 100644 examples/TestMultipleGraphs.md

diff --git a/examples/TestCustomDataset.md b/examples/TestCustomDataset.md
deleted file mode 100644
index 6ea1faf..0000000
--- a/examples/TestCustomDataset.md
+++ /dev/null
@@ -1,48 +0,0 @@
-# Test Custom Dataset
-
-## Normalize
-``` tracker
-searchType: tag
-searchTarget: weight
-folder: diary
-startDate: 2021-01-01
-endDate: 2021-01-31
-dataset1:
-    name: A
-    xData: 1, 2
-	yData: 3, 4
-dataset2:
-    name: B
-    xData: 5, 6
-	yData: 7, 8
-line:
-    title: Weight Log
-    yAxisLabel: Weight
-    yAxisUnit: kg
-    lineColor: yellow
-```
-
-<!--
-## Moving Average
-
-## Manual Input
-Custom dataset only (no searchType and searchTarget)
-``` tracker
-
-```
-
-Dataset and custom dataset
-``` tracker
-
-```
-
-
-
-``` tracker
-searchType: task.done, task.notdone
-searchTarget: Say I love you, Say I love you
-folder: diary
-summary:
-    template: "How many days I said love: {{sum(dataset(0))}}\nHow many days I didn't say love: {{sum( dataset(0) + dataset(0) + 1)}}"
-```
-
diff --git a/examples/TestHeatmap.md b/examples/TestHeatmap.md
deleted file mode 100644
index 5bc362c..0000000
--- a/examples/TestHeatmap.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Test Heat Map
-
-``` tracker
-searchType: tag
-searchTarget: exercise-pushup
-folder: diary
-heatmap:
-```
-
-
-Please also check those search targets in markdown files under folder 'diary'.
-
diff --git a/examples/TestMultipleGraphs.md b/examples/TestMultipleGraphs.md
deleted file mode 100644
index d2262dd..0000000
--- a/examples/TestMultipleGraphs.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# Test Multiple Graphs
-
-``` tracker
-searchType: tag
-searchTarget: weight
-endDate: 2021-01-31
-fixedScale: 0.5
-line:
-
-line1:
-    
-```
-
-<!--
-``` tracker
-searchType: tag
-searchTarget: weight
-endDate: 2021-01-31
-line:
-
-summary:
-    template: "{{average}}"
-```
-

From a2ef56a820ddb9c1d0e179dc741f292748bcd84d Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 27 Jul 2021 20:11:48 +0800
Subject: [PATCH 156/402] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a8d4094..ee325dc 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ For more use cases, please download and open the [examples](https://github.com/p
 - [Concepts](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Concepts.md): Explain how this plugin works and what to setup
     - [Target Evaluation](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TargetEvaluation.md)
     - [Input Parameters](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md)
-    - [Expressions](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestExpression.md)
+    - [Expressions](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Expressions.md)
 - [Examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Examples.md)
 - [Plugin Settings](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Settings.md)
 - [Release Notes](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/ReleaseNotes.md)

From e6e5cc283c79d30fed0c49f7f459c802f9191a6d Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 27 Jul 2021 20:22:41 +0800
Subject: [PATCH 157/402] Add a screenshot image for version 1.9

---
 docs/images/screenshot_v1.9.png | Bin 0 -> 267803 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 docs/images/screenshot_v1.9.png

diff --git a/docs/images/screenshot_v1.9.png b/docs/images/screenshot_v1.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a86a4f70ed5ea1d8af9f038f0f9d9a30077f6b4
GIT binary patch
literal 267803
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

literal 0
HcmV?d00001


From d0f9fdad9dafd9f0046ca2caaca82d095989b318 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 27 Jul 2021 20:23:58 +0800
Subject: [PATCH 158/402] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ee325dc..0316e48 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 ![GitHub release](https://img.shields.io/github/v/release/pyrochlore/obsidian-tracker)
 
-<img src="https://raw.githubusercontent.com/pyrochlore/obsidian-tracker/master/docs/images/screenshot_v1.7.png" width="800">
+<img src="https://raw.githubusercontent.com/pyrochlore/obsidian-tracker/master/docs/images/screenshot_v1.9.png" width="800">
 
 This is an [Obsidian](https://obsidian.md/) plugin that helps you collect data from notes and represent it comprehensively.
 

From 4266dc5d53715818dff29691718a7678058946b2 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 27 Jul 2021 20:32:31 +0800
Subject: [PATCH 159/402] Update Expressions.md

---
 docs/Expressions.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/Expressions.md b/docs/Expressions.md
index e3c301d..4855eeb 100644
--- a/docs/Expressions.md
+++ b/docs/Expressions.md
@@ -16,7 +16,7 @@ Expressions should be be wrapped in curly brackets. By Using the combination of
 
 If the resolved expreasion is a string, we can optionally provide a format string by adding it right after the expression and two extra colons.
 
-The following tables show all the operators and functions available for now. Please make sure the input type and output type when you are combining them together. Examples could be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestExpression.md)).  
+The following tables show all the operators and functions available for now. Please make sure the input type and output type when you are combining them together. Examples could be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestExpression.md).  
 
 ## List of Operators
 
@@ -38,10 +38,10 @@ The following tables show all the operators and functions available for now. Ple
 | % | modulo | number or dataset | number or dataset | number or dataset |
 
 e.g.
-number + number --> number
-dataset + number --> dataset
-number + dataset -> dataset
-dataset + dataset --> dataset
+- number + number --> number
+- dataset + number --> dataset
+- number + dataset -> dataset
+- dataset + dataset --> dataset
 
 ## List of Functions
 

From daa3da1ce2bd29fc7c3e6eae053ed5511079e4f7 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 29 Jul 2021 11:01:47 +0800
Subject: [PATCH 160/402] Fix collecting time values from dvField

---
 src/collecting.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/collecting.ts b/src/collecting.ts
index 080f1b4..f22521b 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -623,11 +623,11 @@ export function collectDataFromDvField(
     dvTarget = dvTarget.replace("-", "[\\s\\-]");
 
     // Test this in Regex101
-    // (^|\s)\*{0,2}dvTarget\*{0,2}(::\s*(?<values>[\d\.\/\-\w,@;\s]*))(\s|$)
+    // (^|\s)\*{0,2}dvTarget\*{0,2}(::\s*(?<values>[\d\.\/\-\w,@;\s:]*))(\s|$)
     let strHashtagRegex =
         "(^|\\s)\\*{0,2}" +
         dvTarget +
-        "\\*{0,2}(::\\s*(?<values>[\\d\\.\\/\\-\\w,@;\\s]*))(\r?\n|\r|$)";
+        "\\*{0,2}(::\\s*(?<values>[\\d\\.\\/\\-\\w,@;\\s:]*))(\r?\n|\r|$)";
     // console.log(strHashtagRegex);
     let hashTagRegex = new RegExp(strHashtagRegex, "gm");
     let match;

From fccd3ffc7c7035fa75fa0338e71f9a860ee7d30a Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 29 Jul 2021 17:39:28 +0800
Subject: [PATCH 161/402] Fix breaking on collecting wiki if fileCache.links is
 undefined

---
 src/collecting.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/collecting.ts b/src/collecting.ts
index f22521b..4764029 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -399,6 +399,7 @@ export function collectDataFromWiki(
     xValueMap: XValueMap
 ) {
     let links = fileCache.links;
+    if (!links) return;
 
     let linkMeasure = 0.0;
     let linkExist = false;

From 24a4dbcce5a0e9f4071a5277f18e702f3d6b0229 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 30 Jul 2021 11:06:56 +0800
Subject: [PATCH 162/402] Set version to 1.9.1

---
 manifest.json | 2 +-
 package.json  | 2 +-
 versions.json | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index 4a7dc0c..6e9e55e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-tracker",
 	"name": "Tracker",
-	"version": "1.9.0",
+	"version": "1.9.1",
 	"minAppVersion": "0.9.12",
 	"description": "A plugin tracks occurrences and numbers in your notes",
 	"author": "pyrochlore",
diff --git a/package.json b/package.json
index fa0698a..b044f8f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
diff --git a/versions.json b/versions.json
index 443e500..e0a6f5a 100644
--- a/versions.json
+++ b/versions.json
@@ -16,5 +16,6 @@
 	"1.8.0": "0.9.12",
 	"1.8.1": "0.9.12",
 	"1.8.2": "0.9.12",
-	"1.9.0": "0.9.12"
+	"1.9.0": "0.9.12",
+	"1.9.1": "0.9.12"
 }

From 45566d109a1c02dc2cbc86637d6fd587d4558a80 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 30 Jul 2021 11:10:48 +0800
Subject: [PATCH 163/402] Update documents

---
 README.md            | 4 ++++
 docs/ReleaseNotes.md | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/README.md b/README.md
index 0316e48..a24e3a2 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,10 @@ Version 1.9.0
 - Allow expressions (operators and functions) as data inputs for output type `summary`, `bullet`, and `pie` (examples: [expression](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestExpression.md), [summary](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestSummary.md), [bullet](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestBullet.md), [pie](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestPieChart.md))
 - Allow formatting evaluated expressions by a follwing format string ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestExpression.md))
 
+Version 1.9.1
+- Fixed errors on collecting time values from dvField
+- Fixed errors on collecting wiki while fileCache.links is undefined
+
 ## Usage
 
 1. Have some targets you want to track in daily notes.
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index d927a33..8654286 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,5 +1,9 @@
 # Release Notes
 
+## v1.9.1
+- Fixed errors on collecting time values from dvField
+- Fixed errors on collecting wiki while fileCache.links is undefined
+
 ## v1.9.0
 - Add a new output type `pie`, rendering a pie chart ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestPieChart.md))
 - Allow expressions (operators and functions) as data inputs for output type `summary`, `bullet`, and `pie` (examples: [expression](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestExpression.md), [summary](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestSummary.md), [bullet](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestBullet.md), [pie](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestPieChart.md))

From 7ea557b86733c0a0bf6985197b0fb5f5aa750043 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 29 Jul 2021 21:22:28 +0800
Subject: [PATCH 164/402] Add annotation to month view

---
 src/data.ts  |  48 +++++++++++++------
 src/month.ts | 129 +++++++++++++++++++++++++++++++++++++--------------
 styles.css   |  14 ++++++
 3 files changed, 142 insertions(+), 49 deletions(-)

diff --git a/src/data.ts b/src/data.ts
index a82b0dc..1cc0039 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -792,54 +792,74 @@ export class SummaryInfo implements IGraph {
 }
 
 export class MonthInfo implements IGraph {
-    mode: string;
     dataset: number[];
     startWeekOn: string;
     threshold: number[];
     yMin: number[];
     yMax: number[];
-    showCircle: boolean;
     color: string;
     dimNotInMonth: boolean;
+    initMonth: string; // YYYY-MM
+    showSelectedValue: boolean;
+
+    // header
+    headerYearColor: string;
+    headerMonthColor: string;
+    showTargetRotator: boolean;
+    dividingLineColor: string;
+
+    // circles and rings
+    showCircle: boolean;
     showStreak: boolean;
     showTodayRing: boolean;
-    showSelectedValue: boolean;
     showSelectedRing: boolean;
     circleColor: string;
     circleColorByValue: boolean;
-    headerYearColor: string;
-    headerMonthColor: string;
-    dividingLineColor: string;
     todayRingColor: string;
     selectedRingColor: string;
-    initMonth: string; // YYYY-MM
 
+    // annotations
+    showAnnotation: boolean;
+    annotation: string[];
+    showAnnotationOfAllTargets: boolean;
+
+    // internal
     selectedDate: string;
     selectedDataset: number;
 
     constructor() {
-        this.mode = "circle"; // circle, symbol
         this.dataset = [];
         this.startWeekOn = "Sun";
         this.threshold = []; // if value > threshold, will show dot
         this.yMin = [];
         this.yMax = [];
-        this.showCircle = true;
         this.color = null;
         this.dimNotInMonth = true;
+        this.initMonth = "";
+        this.showSelectedValue = true;
+
+        // header
+        this.headerYearColor = null;
+        this.headerMonthColor = null;
+        this.showTargetRotator = true;
+        this.dividingLineColor = null;
+
+        // circles and rings
+        this.showCircle = true;
         this.showStreak = true; // a streak connects neigbor dots
         this.showTodayRing = true;
-        this.showSelectedValue = true;
         this.showSelectedRing = true;
         this.circleColor = null;
         this.circleColorByValue = false;
-        this.headerYearColor = null;
-        this.headerMonthColor = null;
-        this.dividingLineColor = null;
         this.todayRingColor = ""; // white
         this.selectedRingColor = "firebrick";
-        this.initMonth = "";
 
+        // annotations
+        this.showAnnotation = false;
+        this.annotation = []; // annotation for each dataset, accept expression thus value
+        this.showAnnotationOfAllTargets = true;
+
+        // internal
         this.selectedDate = ""; // selected date
         this.selectedDataset = null; // selected index of dataset
     }
diff --git a/src/month.ts b/src/month.ts
index 3b5b3ed..bf4927d 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -30,6 +30,7 @@ interface DayInfo {
     showCircle: boolean;
     streakIn: boolean;
     streakOut: boolean;
+    annotation: string;
 }
 
 function toNextDataset(renderInfo: RenderInfo, monthInfo: MonthInfo): boolean {
@@ -182,7 +183,7 @@ function renderMonthHeader(
     let curDaysInMonth = curMonthDate.daysInMonth(); // 28~31
     let curYear = curMonthDate.year();
 
-    let maxDayTextSize = helper.measureTextSize("30", "tracker-axis-label");
+    let maxDayTextSize = helper.measureTextSize("30", "tracker-month-label");
     let cellSize =
         Math.max(maxDayTextSize.width, maxDayTextSize.height) * ratioCellToText;
     let dotRadius = ((cellSize / ratioCellToText) * ratioDotToText) / 2.0;
@@ -271,31 +272,37 @@ function renderMonthHeader(
         datasetName,
         "tracker-month-title-rotator"
     );
-    let datasetRotator = headerGroup
-        .append("text")
-        .text(datasetName)
-        .attr(
-            "transform",
-            "translate(" + 3.5 * cellSize + "," + datasetNameSize.height + ")"
-        )
-        .attr("class", "tracker-month-title-rotator")
-        .style("cursor", "pointer")
-        .on("click", function (event: any) {
-            // show next target
-            if (toNextDataset(renderInfo, monthInfo)) {
-                // clear circles
-                clearSelection(chartElements, monthInfo);
-
-                refresh(
-                    canvas,
-                    chartElements,
-                    renderInfo,
-                    monthInfo,
-                    curMonthDate
-                );
-            }
-        });
-    chartElements["rotator"] = datasetRotator;
+    if (monthInfo.showTargetRotator) {
+        let datasetRotator = headerGroup
+            .append("text")
+            .text(datasetName)
+            .attr(
+                "transform",
+                "translate(" +
+                    3.5 * cellSize +
+                    "," +
+                    datasetNameSize.height +
+                    ")"
+            )
+            .attr("class", "tracker-month-title-rotator")
+            .style("cursor", "pointer")
+            .on("click", function (event: any) {
+                // show next target
+                if (toNextDataset(renderInfo, monthInfo)) {
+                    // clear circles
+                    clearSelection(chartElements, monthInfo);
+
+                    refresh(
+                        canvas,
+                        chartElements,
+                        renderInfo,
+                        monthInfo,
+                        curMonthDate
+                    );
+                }
+            });
+        chartElements["rotator"] = datasetRotator;
+    }
 
     // value monitor
     let monitorTextSize = helper.measureTextSize(
@@ -486,12 +493,13 @@ function renderMonthDays(
     let curDatasetIndex = monthInfo.dataset.findIndex((id) => {
         return id === curDatasetId;
     });
+    if (curDatasetId < 0) curDatasetIndex = 0;
     let threshold = monthInfo.threshold[curDatasetIndex];
 
     let curMonth = curMonthDate.month(); // 0~11
     let curDaysInMonth = curMonthDate.daysInMonth(); // 28~31
 
-    let maxDayTextSize = helper.measureTextSize("30", "tracker-axis-label");
+    let maxDayTextSize = helper.measureTextSize("30", "tracker-month-label");
     let cellSize =
         Math.max(maxDayTextSize.width, maxDayTextSize.height) * ratioCellToText;
     let dotRadius = ((cellSize / ratioCellToText) * ratioDotToText) / 2.0;
@@ -533,6 +541,12 @@ function renderMonthDays(
     // console.log(monthStartDate.format("YYYY-MM-DD"));
     // console.log(startDate.format("YYYY-MM-DD"));
 
+    // annotations
+    let showAnnotation = monthInfo.showAnnotation;
+    let annotations = monthInfo.annotation;
+    let curAnnotation = annotations[curDatasetIndex];
+    let showAnnotationOfAllTargets = monthInfo.showAnnotationOfAllTargets;
+
     // Prepare data for graph
     let daysInMonthView: Array<DayInfo> = [];
     let indCol = 0;
@@ -634,6 +648,30 @@ function renderMonthDays(
         //     logToConsole = false;
         // }
 
+        let textAnnotation = "";
+        if (showAnnotation) {
+            if (!showAnnotationOfAllTargets) {
+                if (curValue > threshold) {
+                    textAnnotation = curAnnotation;
+                }
+            } else {
+                for (let datasetId of monthInfo.dataset) {
+                    let datasetIndex = monthInfo.dataset.findIndex((id) => {
+                        return id === datasetId;
+                    });
+                    if (datasetIndex >= 0) {
+                        let v = renderInfo.datasets
+                            .getDatasetById(datasetId)
+                            .getValue(curDate);
+                        let t = monthInfo.threshold[datasetIndex];
+                        if (v !== null && v > t) {
+                            textAnnotation += annotations[datasetIndex];
+                        }
+                    }
+                }
+            }
+        }
+
         daysInMonthView.push({
             date: helper.dateToStr(curDate, renderInfo.dateFormat),
             value: curValue,
@@ -646,6 +684,7 @@ function renderMonthDays(
             showCircle: showCircle,
             streakIn: streakIn,
             streakOut: streakOut,
+            annotation: textAnnotation,
         });
 
         ind++;
@@ -667,7 +706,7 @@ function renderMonthDays(
         .range([0, totalDayBlockWidth]);
 
     // streak lines
-    if (monthInfo.showStreak) {
+    if (monthInfo.showCircle && monthInfo.showStreak) {
         let streakColor = "#69b3a2";
         if (monthInfo.circleColor) {
             streakColor = monthInfo.circleColor;
@@ -883,12 +922,9 @@ function renderMonthDays(
             return d.dayInMonth.toString();
         })
         .attr("transform", function (d: DayInfo) {
-            let strTranslate =
-                "translate(" +
-                scale(d.col) +
-                "," +
-                (scale(d.row) + maxDayTextSize.height / 4) +
-                ")";
+            let transX = scale(d.col);
+            let transY = scale(d.row) + maxDayTextSize.height / 4;
+            let strTranslate = "translate(" + transX + "," + transY + ")";
 
             return strTranslate;
         })
@@ -910,7 +946,7 @@ function renderMonthDays(
         .attr("valueType", function (d: DayInfo) {
             return ValueType[dataset.valueType];
         })
-        .attr("class", "tracker-axis-label")
+        .attr("class", "tracker-month-label")
         .on("click", function (event: any) {
             // clear circles
             clearSelection(chartElements, monthInfo);
@@ -942,6 +978,29 @@ function renderMonthDays(
         })
         .style("cursor", "pointer");
 
+    // annotation
+    if (showAnnotation) {
+        let dayAnnotation = chartElements.dataArea
+            .selectAll("dayAnnotation")
+            .data(daysInMonthView)
+            .enter()
+            .append("text")
+            .text(function (d: DayInfo) {
+                return d.annotation;
+            })
+            .attr("transform", function (d: DayInfo) {
+                let transX = scale(d.col);
+                let transY = scale(d.row) + maxDayTextSize.height / 4;
+                if (d.annotation) {
+                    transY += dotRadius;
+                }
+                let strTranslate = "translate(" + transX + "," + transY + ")";
+
+                return strTranslate;
+            })
+            .attr("class", "tracker-month-annotation");
+    }
+
     // Expand areas
     let svgWidth = parseFloat(chartElements.svg.attr("width"));
     let svgHeight = parseFloat(chartElements.svg.attr("height"));
diff --git a/styles.css b/styles.css
index ca9163a..4e31eca 100644
--- a/styles.css
+++ b/styles.css
@@ -159,4 +159,18 @@
     fill: none;
     stroke: "red";
     stroke-width: 2px;
+}
+
+.tracker-month-label {
+    fill: var(--color-axis-label);
+    text-anchor: middle;
+    font-size: 14px;
+    stroke: none;
+}
+
+.tracker-month-annotation {
+    fill: var(--color-axis-label);
+    text-anchor: middle;
+    font-size: 10px;
+    stroke: none;
 }
\ No newline at end of file

From 1a16d1a70baefb49bdacf694b1f36d018550f837 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 30 Jul 2021 10:41:12 +0800
Subject: [PATCH 165/402] Add parameter mode to month view

---
 examples/TestCalendar.md | 35 +++++++++++++++++++++++++++++++++++
 src/data.ts              |  6 +++---
 src/month.ts             | 19 ++++++++++++++-----
 src/parsing.ts           | 40 ++++++++++++++++++++++++++++++++++++++--
 4 files changed, 90 insertions(+), 10 deletions(-)

diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
index a58ab08..e93c5bd 100644
--- a/examples/TestCalendar.md
+++ b/examples/TestCalendar.md
@@ -95,5 +95,40 @@ month:
     showSelectedValue: true
 ```
 
+## Annotations
+One target at a time
+``` tracker
+searchType: tag
+searchTarget: exercise-pushup, meditation
+datasetName: PushUp, Meditation
+folder: diary
+month:
+    mode: annotation
+    startWeekOn: 'Sun'
+    threshold: 40, 0
+    color: green
+    headerMonthColor: orange
+    dimNotInMonth: false
+	annotation: 💪,🧘‍♂️
+	showAnnotationOfAllTargets: false
+```
+
+All targets
+``` tracker
+searchType: tag
+searchTarget: exercise-pushup, meditation
+datasetName: PushUp, Meditation
+folder: diary
+month:
+    mode: annotation
+    startWeekOn: 'Sun'
+    threshold: 40, 0
+    color: green
+    headerMonthColor: orange
+    dimNotInMonth: false
+	annotation: 💪,🧘‍♂️
+	showAnnotationOfAllTargets: true
+```
+
 Please also check those search targets in markdown files under folder 'diary'.
 
diff --git a/src/data.ts b/src/data.ts
index 1cc0039..8bb1bb8 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -792,6 +792,7 @@ export class SummaryInfo implements IGraph {
 }
 
 export class MonthInfo implements IGraph {
+    mode: string;
     dataset: number[];
     startWeekOn: string;
     threshold: number[];
@@ -805,7 +806,6 @@ export class MonthInfo implements IGraph {
     // header
     headerYearColor: string;
     headerMonthColor: string;
-    showTargetRotator: boolean;
     dividingLineColor: string;
 
     // circles and rings
@@ -828,6 +828,7 @@ export class MonthInfo implements IGraph {
     selectedDataset: number;
 
     constructor() {
+        this.mode = "circle"; // circle, annotation
         this.dataset = [];
         this.startWeekOn = "Sun";
         this.threshold = []; // if value > threshold, will show dot
@@ -841,7 +842,6 @@ export class MonthInfo implements IGraph {
         // header
         this.headerYearColor = null;
         this.headerMonthColor = null;
-        this.showTargetRotator = true;
         this.dividingLineColor = null;
 
         // circles and rings
@@ -855,7 +855,7 @@ export class MonthInfo implements IGraph {
         this.selectedRingColor = "firebrick";
 
         // annotations
-        this.showAnnotation = false;
+        this.showAnnotation = true;
         this.annotation = []; // annotation for each dataset, accept expression thus value
         this.showAnnotationOfAllTargets = true;
 
diff --git a/src/month.ts b/src/month.ts
index bf4927d..6fdd488 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -272,7 +272,11 @@ function renderMonthHeader(
         datasetName,
         "tracker-month-title-rotator"
     );
-    if (monthInfo.showTargetRotator) {
+    if (
+        monthInfo.mode === "circle" ||
+        (monthInfo.mode === "annotation" &&
+            !monthInfo.showAnnotationOfAllTargets)
+    ) {
         let datasetRotator = headerGroup
             .append("text")
             .text(datasetName)
@@ -485,6 +489,11 @@ function renderMonthDays(
     // console.log(renderInfo);
     if (!renderInfo || !monthInfo) return;
 
+    let mode = monthInfo.mode;
+    if (mode !== "circle" && mode !== "annotation") {
+        return "Unknown month view mode";
+    }
+
     let curDatasetId = monthInfo.selectedDataset;
     if (curDatasetId === null) return;
     let dataset = renderInfo.datasets.getDatasetById(curDatasetId);
@@ -706,7 +715,7 @@ function renderMonthDays(
         .range([0, totalDayBlockWidth]);
 
     // streak lines
-    if (monthInfo.showCircle && monthInfo.showStreak) {
+    if (mode === "circle" && monthInfo.showCircle && monthInfo.showStreak) {
         let streakColor = "#69b3a2";
         if (monthInfo.circleColor) {
             streakColor = monthInfo.circleColor;
@@ -817,7 +826,7 @@ function renderMonthDays(
     } else if (monthInfo.color) {
         circleColor = monthInfo.color;
     }
-    if (monthInfo.showCircle) {
+    if (mode === "circle" && monthInfo.showCircle) {
         let dots = chartElements.dataArea
             .selectAll("dot")
             .data(daysInMonthView)
@@ -863,7 +872,7 @@ function renderMonthDays(
 
     // today rings
     let today = helper.dateToStr(window.moment(), renderInfo.dateFormat);
-    if (monthInfo.showTodayRing) {
+    if (mode === "circle" && monthInfo.showTodayRing) {
         let todayRings = chartElements.dataArea
             .selectAll("todayRing")
             .data(
@@ -891,7 +900,7 @@ function renderMonthDays(
     }
 
     // selected rings
-    if (monthInfo.showSelectedRing) {
+    if (mode === "circle" && monthInfo.showSelectedRing) {
         let selectedRings = chartElements.dataArea
             .selectAll("selectedRing")
             .data(daysInMonthView)
diff --git a/src/parsing.ts b/src/parsing.ts
index 13e5040..fdeb16b 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1846,6 +1846,12 @@ export function getRenderInfoFromYaml(
             }
         }
 
+        // mode
+        if (typeof yamlMonth?.mode === "string") {
+            month.mode = yamlMonth.mode;
+        }
+        // console.log(month.mode);
+
         // dataset
         let retDataset = getNumberArray("dataset", yamlMonth?.dataset);
         if (typeof retDataset === "string") {
@@ -2013,6 +2019,37 @@ export function getRenderInfoFromYaml(
         }
         // console.log(month.initMonth);
 
+        // showAnnotation
+        if (typeof yamlMonth?.showAnnotation === "boolean") {
+            month.showAnnotation = yamlMonth.showAnnotation;
+        }
+        // console.log(month.showAnnotation);
+
+        // annotation
+        let retAnnotation = getStringArray("annotation", yamlMonth?.annotation);
+        if (typeof retAnnotation === "string") {
+            return retAnnotation;
+        }
+        month.annotation = retAnnotation;
+        if (month.annotation.length === 0) {
+            for (let indDataset = 0; indDataset < numDataset; indDataset++) {
+                month.annotation.push(null);
+            }
+        }
+        if (month.annotation.length !== month.dataset.length) {
+            const errorMessage =
+                "The number of inputs of annotation and dataset not matched";
+            return errorMessage;
+        }
+        // console.log(month.annotation);
+
+        // showAnnotationOfAllTargets
+        if (typeof yamlMonth?.showAnnotationOfAllTargets === "boolean") {
+            month.showAnnotationOfAllTargets =
+                yamlMonth.showAnnotationOfAllTargets;
+        }
+        // console.log(month.showAnnotationOfAllTargets);
+
         renderInfo.month.push(month);
     } // Month related parameters
     // console.log(renderInfo.month);
@@ -2124,8 +2161,7 @@ export function getRenderInfoFromYaml(
         // actual value, can possess template variable
         if (typeof yamlBullet?.value === "string") {
             bullet.value = yamlBullet.value;
-        }
-        else if (typeof yamlBullet?.value === "number") {
+        } else if (typeof yamlBullet?.value === "number") {
             bullet.value = yamlBullet.value.toString();
         }
         // console.log(bullet.value);

From 25db8e671a8ee6273a9b78fe357d176158d23fd7 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 30 Jul 2021 11:46:50 +0800
Subject: [PATCH 166/402] Fix annotation shown in circle mode

---
 src/month.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/month.ts b/src/month.ts
index 6fdd488..35dea32 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -988,7 +988,7 @@ function renderMonthDays(
         .style("cursor", "pointer");
 
     // annotation
-    if (showAnnotation) {
+    if (mode === "annotation" && showAnnotation) {
         let dayAnnotation = chartElements.dataArea
             .selectAll("dayAnnotation")
             .data(daysInMonthView)

From 83e194668cd1b6c4382b1d2d835c47b114656d82 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 30 Jul 2021 15:26:06 +0800
Subject: [PATCH 167/402] Include seconds to the format of time values

---
 src/helper.ts | 44 ++++++++++++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/src/helper.ts b/src/helper.ts
index 8449bd6..997cae3 100644
--- a/src/helper.ts
+++ b/src/helper.ts
@@ -5,20 +5,36 @@ import * as d3 from "d3";
 import { Moment } from "moment";
 
 // date and time
-const timeFormat = [
-    "HH:mm",
-    "HH:m",
-    "H:mm",
-    "H:m",
-    "hh:mm A",
-    "hh:mm a",
-    "hh:m A",
-    "hh:m a",
-    "h:mm A",
-    "h:mm a",
-    "h:m A",
-    "h:m a",
-];
+function makeTimeFormat() {
+    //HH: 2-digits hours (24 hour time) from 0 to 23, H:, 2-digits hours (24 hour time) from 0 to 23 without leading 0
+    // hh: 2-digits hours (12 hour time), h: 2-digits hours (12 hour time) without leading 0
+    // a/A: am or pm
+    const fmtHours = ["HH", "H", "hh", "h"];
+    //mm: 2-digits minutes, m: 2-digits minutes without leading zero
+    const fmtMins = ["mm", "m"];
+    // ss: 2-digits seconds, s: 2-digits seconds without leading zero
+    // can be empty
+    const fmtSecs = ["ss", "s", ""];
+
+    let timeFormat = [];
+    for (let fmtHour of fmtHours) {
+        for (let fmtMin of fmtMins) {
+            for (let fmtSec of fmtSecs) {
+                let fmt = `${fmtHour}:${fmtMin}`;
+                if (fmtSec !== "") {
+                    fmt += `:${fmtSec}`;
+                }
+                if (fmtHour.contains("h")) {
+                    fmt += " a";
+                }
+                timeFormat.push(fmt);
+            }
+        }
+    }
+    //console.log(timeFormat);
+    return timeFormat;
+}
+const timeFormat = makeTimeFormat();
 
 export function strToDate(strDate: string, dateFormat: string): Moment {
     let format: any = dateFormat;

From 17f13e071d29c3105dd92febfe76b57fdb06fac3 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 30 Jul 2021 16:47:40 +0800
Subject: [PATCH 168/402] Fix regex for dvField

---
 src/collecting.ts | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/collecting.ts b/src/collecting.ts
index 4764029..9794df1 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -156,11 +156,12 @@ export function getDateFromDvField(
     dvTarget = dvTarget.replace("-", "[\\s\\-]");
 
     // Test this in Regex101
-    // (^|\s)\*{0,2}dvTarget\*{0,2}(::\s*(?<values>[\d\.\/\-\w,@;\s]*))(\s|$)
+    // remember '\s' includes new line
+    // (^| |\t)\*{0,2}dvTarget\*{0,2}(::[ |\t]*(?<values>[\d\.\/\-\w,@; \t:]*))(\r?\n|\r|$)
     let strHashtagRegex =
-        "(^|\\s)\\*{0,2}" +
+        "(^| |\\t)\\*{0,2}" +
         dvTarget +
-        "\\*{0,2}(::\\s*(?<values>[\\d\\.\\/\\-\\w,@;\\s]*))(\r?\n|\r)";
+        "\\*{0,2}(::[ |\\t]*(?<values>[\\d\\.\\/\\-\\w,@; \\t:]*))(\\r\\?\\n|\\r|$)";
     // console.log(strHashtagRegex);
     let hashTagRegex = new RegExp(strHashtagRegex, "gm");
     let match;
@@ -624,11 +625,12 @@ export function collectDataFromDvField(
     dvTarget = dvTarget.replace("-", "[\\s\\-]");
 
     // Test this in Regex101
-    // (^|\s)\*{0,2}dvTarget\*{0,2}(::\s*(?<values>[\d\.\/\-\w,@;\s:]*))(\s|$)
+    // remember '\s' includes new line
+    // (^| |\t)\*{0,2}dvTarget\*{0,2}(::[ |\t]*(?<values>[\d\.\/\-\w,@; \t:]*))(\r?\n|\r|$)
     let strHashtagRegex =
-        "(^|\\s)\\*{0,2}" +
+        "(^| |\\t)\\*{0,2}" +
         dvTarget +
-        "\\*{0,2}(::\\s*(?<values>[\\d\\.\\/\\-\\w,@;\\s:]*))(\r?\n|\r|$)";
+        "\\*{0,2}(::[ |\\t]*(?<values>[\\d\\.\\/\\-\\w,@; \\t:]*))(\\r\\?\\n|\\r|$)";
     // console.log(strHashtagRegex);
     let hashTagRegex = new RegExp(strHashtagRegex, "gm");
     let match;
@@ -649,6 +651,7 @@ export function collectDataFromDvField(
             if (splitted.length === 1) {
                 // console.log("single-value");
                 let toParse = splitted[0];
+                // console.log(toParse);
                 let retParse = helper.parseFloatFromAny(toParse);
                 if (retParse.value !== null) {
                     if (retParse.type === ValueType.Time) {

From 866c02a99abd022c6856fe48e4f155e31ee9f429 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 30 Jul 2021 15:26:06 +0800
Subject: [PATCH 169/402] Include seconds to the format of time values

---
 src/helper.ts | 44 ++++++++++++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/src/helper.ts b/src/helper.ts
index 8449bd6..997cae3 100644
--- a/src/helper.ts
+++ b/src/helper.ts
@@ -5,20 +5,36 @@ import * as d3 from "d3";
 import { Moment } from "moment";
 
 // date and time
-const timeFormat = [
-    "HH:mm",
-    "HH:m",
-    "H:mm",
-    "H:m",
-    "hh:mm A",
-    "hh:mm a",
-    "hh:m A",
-    "hh:m a",
-    "h:mm A",
-    "h:mm a",
-    "h:m A",
-    "h:m a",
-];
+function makeTimeFormat() {
+    //HH: 2-digits hours (24 hour time) from 0 to 23, H:, 2-digits hours (24 hour time) from 0 to 23 without leading 0
+    // hh: 2-digits hours (12 hour time), h: 2-digits hours (12 hour time) without leading 0
+    // a/A: am or pm
+    const fmtHours = ["HH", "H", "hh", "h"];
+    //mm: 2-digits minutes, m: 2-digits minutes without leading zero
+    const fmtMins = ["mm", "m"];
+    // ss: 2-digits seconds, s: 2-digits seconds without leading zero
+    // can be empty
+    const fmtSecs = ["ss", "s", ""];
+
+    let timeFormat = [];
+    for (let fmtHour of fmtHours) {
+        for (let fmtMin of fmtMins) {
+            for (let fmtSec of fmtSecs) {
+                let fmt = `${fmtHour}:${fmtMin}`;
+                if (fmtSec !== "") {
+                    fmt += `:${fmtSec}`;
+                }
+                if (fmtHour.contains("h")) {
+                    fmt += " a";
+                }
+                timeFormat.push(fmt);
+            }
+        }
+    }
+    //console.log(timeFormat);
+    return timeFormat;
+}
+const timeFormat = makeTimeFormat();
 
 export function strToDate(strDate: string, dateFormat: string): Moment {
     let format: any = dateFormat;

From a761cf16df9fd0e5f138a1e487a166a516873e9e Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 30 Jul 2021 16:47:40 +0800
Subject: [PATCH 170/402] Fix regex for dvField

---
 src/collecting.ts | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/collecting.ts b/src/collecting.ts
index 4764029..9794df1 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -156,11 +156,12 @@ export function getDateFromDvField(
     dvTarget = dvTarget.replace("-", "[\\s\\-]");
 
     // Test this in Regex101
-    // (^|\s)\*{0,2}dvTarget\*{0,2}(::\s*(?<values>[\d\.\/\-\w,@;\s]*))(\s|$)
+    // remember '\s' includes new line
+    // (^| |\t)\*{0,2}dvTarget\*{0,2}(::[ |\t]*(?<values>[\d\.\/\-\w,@; \t:]*))(\r?\n|\r|$)
     let strHashtagRegex =
-        "(^|\\s)\\*{0,2}" +
+        "(^| |\\t)\\*{0,2}" +
         dvTarget +
-        "\\*{0,2}(::\\s*(?<values>[\\d\\.\\/\\-\\w,@;\\s]*))(\r?\n|\r)";
+        "\\*{0,2}(::[ |\\t]*(?<values>[\\d\\.\\/\\-\\w,@; \\t:]*))(\\r\\?\\n|\\r|$)";
     // console.log(strHashtagRegex);
     let hashTagRegex = new RegExp(strHashtagRegex, "gm");
     let match;
@@ -624,11 +625,12 @@ export function collectDataFromDvField(
     dvTarget = dvTarget.replace("-", "[\\s\\-]");
 
     // Test this in Regex101
-    // (^|\s)\*{0,2}dvTarget\*{0,2}(::\s*(?<values>[\d\.\/\-\w,@;\s:]*))(\s|$)
+    // remember '\s' includes new line
+    // (^| |\t)\*{0,2}dvTarget\*{0,2}(::[ |\t]*(?<values>[\d\.\/\-\w,@; \t:]*))(\r?\n|\r|$)
     let strHashtagRegex =
-        "(^|\\s)\\*{0,2}" +
+        "(^| |\\t)\\*{0,2}" +
         dvTarget +
-        "\\*{0,2}(::\\s*(?<values>[\\d\\.\\/\\-\\w,@;\\s:]*))(\r?\n|\r|$)";
+        "\\*{0,2}(::[ |\\t]*(?<values>[\\d\\.\\/\\-\\w,@; \\t:]*))(\\r\\?\\n|\\r|$)";
     // console.log(strHashtagRegex);
     let hashTagRegex = new RegExp(strHashtagRegex, "gm");
     let match;
@@ -649,6 +651,7 @@ export function collectDataFromDvField(
             if (splitted.length === 1) {
                 // console.log("single-value");
                 let toParse = splitted[0];
+                // console.log(toParse);
                 let retParse = helper.parseFloatFromAny(toParse);
                 if (retParse.value !== null) {
                     if (retParse.type === ValueType.Time) {

From 808f9a24786833eef630a476da650546fea76898 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 30 Jul 2021 16:54:30 +0800
Subject: [PATCH 171/402] Set version to 1.9.2

---
 manifest.json | 2 +-
 package.json  | 2 +-
 versions.json | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index 6e9e55e..8635ef3 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-tracker",
 	"name": "Tracker",
-	"version": "1.9.1",
+	"version": "1.9.2",
 	"minAppVersion": "0.9.12",
 	"description": "A plugin tracks occurrences and numbers in your notes",
 	"author": "pyrochlore",
diff --git a/package.json b/package.json
index b044f8f..38fb7b0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
diff --git a/versions.json b/versions.json
index e0a6f5a..4ea18cc 100644
--- a/versions.json
+++ b/versions.json
@@ -17,5 +17,6 @@
 	"1.8.1": "0.9.12",
 	"1.8.2": "0.9.12",
 	"1.9.0": "0.9.12",
-	"1.9.1": "0.9.12"
+	"1.9.1": "0.9.12",
+	"1.9.2": "0.9.12"
 }

From 1c198a96e540bb5642be14ace8d2002610e4a9d2 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 30 Jul 2021 17:00:37 +0800
Subject: [PATCH 172/402] Update documents

---
 README.md            | 6 +++++-
 docs/ReleaseNotes.md | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a24e3a2..c07cda0 100644
--- a/README.md
+++ b/README.md
@@ -20,9 +20,13 @@ Version 1.9.0
 - Allow formatting evaluated expressions by a follwing format string ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestExpression.md))
 
 Version 1.9.1
-- Fixed errors on collecting time values from dvField
+- Fixed errors on collecting time values from `dvField`
 - Fixed errors on collecting wiki while fileCache.links is undefined
 
+Version 1.9.2
+- Allow using seconds in time values
+- Fixed error parsing `dvField`
+
 ## Usage
 
 1. Have some targets you want to track in daily notes.
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index 8654286..2a5f8d4 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,7 +1,11 @@
 # Release Notes
 
+## v1.9.2
+- Allow using seconds in time values
+- Fixed error parsing `dvField`
+
 ## v1.9.1
-- Fixed errors on collecting time values from dvField
+- Fixed errors on collecting time values from `dvField`
 - Fixed errors on collecting wiki while fileCache.links is undefined
 
 ## v1.9.0

From e770ac6abf5f0320bfa69717a85d78f8909985ba Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 30 Jul 2021 18:03:54 +0800
Subject: [PATCH 173/402] Update examples for time values

---
 examples/TestTimeValues.md    | 36 +++++++++++++++++++++++++++++++++++
 examples/diary/2021-01-01.md  |  5 +++++
 examples/diary/2021-01-02.md  |  5 +++++
 examples/diary/2021-01-03.md  |  5 +++++
 examples/diary/2021-01-04.md  |  5 +++++
 examples/diary/2021-01-05.md  |  5 +++++
 examples/diary/2021-01-06.md  |  5 +++++
 examples/diary/2021-01-07.md  |  5 +++++
 examples/diary/2021-01-08.md  |  5 +++++
 examples/diary/2021-01-09.md  |  5 +++++
 examples/diary/2021-01-10.md  |  5 +++++
 examples/diary/2021-01-11.md  |  5 +++++
 examples/diary/2021-01-12.md  |  5 +++++
 examples/diary/2021-01-13.md  |  5 +++++
 examples/diary/2021-01-14.md  |  5 +++++
 examples/diary/2021-01-15.md  |  5 +++++
 examples/diary/2021-01-16.md  |  5 +++++
 examples/diary/2021-01-17.md  |  5 +++++
 examples/diary/2021-01-18.md  |  5 +++++
 examples/diary/2021-01-19.md  |  5 +++++
 examples/diary/2021-01-20.md  |  5 +++++
 examples/diary/2021-01-21.md  |  5 +++++
 examples/diary/2021-01-22.md  |  5 +++++
 examples/diary/2021-01-23.md  |  5 +++++
 examples/diary/2021-01-24.md  |  5 +++++
 examples/diary/2021-01-25.md  |  5 +++++
 examples/diary/2021-01-26.md  |  5 +++++
 examples/diary/2021-01-27.md  |  5 +++++
 examples/diary/2021-01-28.md  |  5 +++++
 examples/diary/2021-01-29.md  |  5 +++++
 examples/diary/2021-01-30.md  |  5 +++++
 examples/diary/2021-01-31.md  |  5 +++++
 examples/example_generator.ts | 11 +++++++++++
 33 files changed, 202 insertions(+)

diff --git a/examples/TestTimeValues.md b/examples/TestTimeValues.md
index 66f5506..b668a25 100644
--- a/examples/TestTimeValues.md
+++ b/examples/TestTimeValues.md
@@ -1,5 +1,7 @@
 # Test Time Values
 
+## From frontmatter
+Clock-In & Clock-Out from front matter
 ``` tracker
 searchType: frontmatter
 searchTarget: clock-in, clock-out
@@ -15,6 +17,7 @@ line:
 	showLegend: true
 ```
 
+Sleep time separated by / from front matter
 ``` tracker
 searchType: frontmatter
 searchTarget: sleep[0], sleep[1]
@@ -30,4 +33,37 @@ line:
 	showLegend: true
 ```
 
+## From dvField
+Clock-In & Clock-Out from dvField
+``` tracker
+searchType: dvField
+searchTarget: clock-in, clock-out
+endDate: 2021-01-15
+folder: diary
+datasetName: Clock-In, Clock-Out
+line:
+    title: "Working Hours"
+    yAxisLabel: "Time (24h)"
+	reverseYAxis: true
+    lineColor: yellow, red
+    showPoint: true
+	showLegend: true
+```
+
+Sleep time separated by / from dvField
+``` tracker
+searchType: dvField
+searchTarget: sleep[0], sleep[1]
+endDate: 2021-01-15
+folder: diary
+valueShift: -24:00, 00:00
+datasetName: Sleep, WakeUp
+line:
+    title: "Sleep"
+    yAxisLabel: "Time (24h)"
+    lineColor: yellow, red
+    showPoint: true
+	showLegend: true
+```
+
 Please also check those search targets in markdown files under folder 'diary'.
\ No newline at end of file
diff --git a/examples/diary/2021-01-01.md b/examples/diary/2021-01-01.md
index 010e31d..4cddc43 100644
--- a/examples/diary/2021-01-01.md
+++ b/examples/diary/2021-01-01.md
@@ -44,6 +44,11 @@ dataviewTarget1:: 48/29
 dataviewTarget2:: 29 @ 88
 dataviewTarget3:: 29, 88
 
+clock-in:: 10:45
+clock-out:: 20:51
+
+sleep:: 10:11 pm/7:5 am
+
 #sin:0.00000/0.20791/0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452
 
 #sinsquare:0.00000/0.04323/0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907
diff --git a/examples/diary/2021-01-02.md b/examples/diary/2021-01-02.md
index b8e826f..796aac3 100644
--- a/examples/diary/2021-01-02.md
+++ b/examples/diary/2021-01-02.md
@@ -44,6 +44,11 @@ dataviewTarget1:: 25/5
 dataviewTarget2:: 5 @ 72
 dataviewTarget3:: 5, 72
 
+clock-in:: 8:7
+clock-out:: 20:10
+
+sleep:: 9:37 pm/7:57 am
+
 #sin:0.20791/0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452/0.95106
 
 #sinsquare:0.04323/0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451
diff --git a/examples/diary/2021-01-03.md b/examples/diary/2021-01-03.md
index ff62c5a..275ff2a 100644
--- a/examples/diary/2021-01-03.md
+++ b/examples/diary/2021-01-03.md
@@ -44,6 +44,11 @@ dataviewTarget1:: 12/14
 dataviewTarget2:: 14 @ 82
 dataviewTarget3:: 14, 82
 
+clock-in:: 10:49
+clock-out:: 16:33
+
+sleep:: 9:17 pm/6:48 am
+
 #sin:0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452/0.95106/0.86603
 
 #sinsquare:0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000
diff --git a/examples/diary/2021-01-04.md b/examples/diary/2021-01-04.md
index 19d43a8..f1f2ee0 100644
--- a/examples/diary/2021-01-04.md
+++ b/examples/diary/2021-01-04.md
@@ -47,6 +47,11 @@ dataviewTarget1:: 43/29
 dataviewTarget2:: 29 @ 74
 dataviewTarget3:: 29, 74
 
+clock-in:: 10:41
+clock-out:: 20:52
+
+sleep:: 10:10 pm/6:37 am
+
 #sin:0.58779/0.74314/0.86603/0.95106/0.99452/0.99452/0.95106/0.86603/0.74314
 
 #sinsquare:0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000/0.55226
diff --git a/examples/diary/2021-01-05.md b/examples/diary/2021-01-05.md
index 3265595..2c92189 100644
--- a/examples/diary/2021-01-05.md
+++ b/examples/diary/2021-01-05.md
@@ -46,6 +46,11 @@ dataviewTarget1:: 86/24
 dataviewTarget2:: 24 @ 90
 dataviewTarget3:: 24, 90
 
+clock-in:: 9:1
+clock-out:: 18:57
+
+sleep:: 9:9 pm/5:57 am
+
 #sin:0.74314/0.86603/0.95106/0.99452/0.99452/0.95106/0.86603/0.74314/0.58779
 
 #sinsquare:0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000/0.55226/0.34549
diff --git a/examples/diary/2021-01-06.md b/examples/diary/2021-01-06.md
index 3a092b0..82e20c5 100644
--- a/examples/diary/2021-01-06.md
+++ b/examples/diary/2021-01-06.md
@@ -45,6 +45,11 @@ dataviewTarget1:: 98/46
 dataviewTarget2:: 46 @ 75
 dataviewTarget3:: 46, 75
 
+clock-in:: 10:27
+clock-out:: 19:26
+
+sleep:: 10:30 pm/5:29 am
+
 #sin:0.86603/0.95106/0.99452/0.99452/0.95106/0.86603/0.74314/0.58779/0.40674
 
 #sinsquare:0.75000/0.90451/0.98907/0.98907/0.90451/0.75000/0.55226/0.34549/0.16543
diff --git a/examples/diary/2021-01-07.md b/examples/diary/2021-01-07.md
index 8498898..1c517d7 100644
--- a/examples/diary/2021-01-07.md
+++ b/examples/diary/2021-01-07.md
@@ -45,6 +45,11 @@ dataviewTarget1:: 43/6
 dataviewTarget2:: 6 @ 77
 dataviewTarget3:: 6, 77
 
+clock-in:: 9:53
+clock-out:: 17:39
+
+sleep:: 10:53 pm/7:13 am
+
 #sin:0.95106/0.99452/0.99452/0.95106/0.86603/0.74314/0.58779/0.40674/0.20791
 
 #sinsquare:0.90451/0.98907/0.98907/0.90451/0.75000/0.55226/0.34549/0.16543/0.04323
diff --git a/examples/diary/2021-01-08.md b/examples/diary/2021-01-08.md
index bd277b9..2c731c3 100644
--- a/examples/diary/2021-01-08.md
+++ b/examples/diary/2021-01-08.md
@@ -45,6 +45,11 @@ dataviewTarget1:: 39/25
 dataviewTarget2:: 25 @ 77
 dataviewTarget3:: 25, 77
 
+clock-in:: 8:5
+clock-out:: 16:5
+
+sleep:: 9:1 pm/6:56 am
+
 #sin:0.99452/0.99452/0.95106/0.86603/0.74314/0.58779/0.40674/0.20791/0.00000
 
 #sinsquare:0.98907/0.98907/0.90451/0.75000/0.55226/0.34549/0.16543/0.04323/0.00000
diff --git a/examples/diary/2021-01-09.md b/examples/diary/2021-01-09.md
index 1d4f394..b36b002 100644
--- a/examples/diary/2021-01-09.md
+++ b/examples/diary/2021-01-09.md
@@ -47,6 +47,11 @@ dataviewTarget1:: 37/36
 dataviewTarget2:: 36 @ 53
 dataviewTarget3:: 36, 53
 
+clock-in:: 8:37
+clock-out:: 17:9
+
+sleep:: 9:23 pm/5:51 am
+
 #sin:0.99452/0.95106/0.86603/0.74314/0.58779/0.40674/0.20791/0.00000/-0.20791
 
 #sinsquare:0.98907/0.90451/0.75000/0.55226/0.34549/0.16543/0.04323/0.00000/0.04323
diff --git a/examples/diary/2021-01-10.md b/examples/diary/2021-01-10.md
index 2d9ecc9..e03ac02 100644
--- a/examples/diary/2021-01-10.md
+++ b/examples/diary/2021-01-10.md
@@ -44,6 +44,11 @@ dataviewTarget1:: 4/10
 dataviewTarget2:: 10 @ 92
 dataviewTarget3:: 10, 92
 
+clock-in:: 10:25
+clock-out:: 17:55
+
+sleep:: 10:11 pm/5:31 am
+
 #sin:0.95106/0.86603/0.74314/0.58779/0.40674/0.20791/0.00000/-0.20791/-0.40674
 
 #sinsquare:0.90451/0.75000/0.55226/0.34549/0.16543/0.04323/0.00000/0.04323/0.16543
diff --git a/examples/diary/2021-01-11.md b/examples/diary/2021-01-11.md
index e8fe2dd..8e7cb24 100644
--- a/examples/diary/2021-01-11.md
+++ b/examples/diary/2021-01-11.md
@@ -43,6 +43,11 @@ dataviewTarget1:: 97/19
 dataviewTarget2:: 19 @ 82
 dataviewTarget3:: 19, 82
 
+clock-in:: 9:42
+clock-out:: 20:35
+
+sleep:: 11:47 pm/6:8 am
+
 #sin:0.86603/0.74314/0.58779/0.40674/0.20791/0.00000/-0.20791/-0.40674/-0.58779
 
 #sinsquare:0.75000/0.55226/0.34549/0.16543/0.04323/0.00000/0.04323/0.16543/0.34549
diff --git a/examples/diary/2021-01-12.md b/examples/diary/2021-01-12.md
index 406957a..71a716c 100644
--- a/examples/diary/2021-01-12.md
+++ b/examples/diary/2021-01-12.md
@@ -45,6 +45,11 @@ dataviewTarget1:: 79/36
 dataviewTarget2:: 36 @ 66
 dataviewTarget3:: 36, 66
 
+clock-in:: 8:54
+clock-out:: 16:19
+
+sleep:: 11:23 pm/6:15 am
+
 #sin:0.74314/0.58779/0.40674/0.20791/0.00000/-0.20791/-0.40674/-0.58779/-0.74314
 
 #sinsquare:0.55226/0.34549/0.16543/0.04323/0.00000/0.04323/0.16543/0.34549/0.55226
diff --git a/examples/diary/2021-01-13.md b/examples/diary/2021-01-13.md
index 20ffccd..f502eb1 100644
--- a/examples/diary/2021-01-13.md
+++ b/examples/diary/2021-01-13.md
@@ -43,6 +43,11 @@ dataviewTarget1:: 87/46
 dataviewTarget2:: 46 @ 73
 dataviewTarget3:: 46, 73
 
+clock-in:: 8:1
+clock-out:: 17:0
+
+sleep:: 9:2 pm/6:37 am
+
 #sin:0.58779/0.40674/0.20791/0.00000/-0.20791/-0.40674/-0.58779/-0.74314/-0.86603
 
 #sinsquare:0.34549/0.16543/0.04323/0.00000/0.04323/0.16543/0.34549/0.55226/0.75000
diff --git a/examples/diary/2021-01-14.md b/examples/diary/2021-01-14.md
index 110f0a2..6299113 100644
--- a/examples/diary/2021-01-14.md
+++ b/examples/diary/2021-01-14.md
@@ -45,6 +45,11 @@ dataviewTarget1:: 43/5
 dataviewTarget2:: 5 @ 92
 dataviewTarget3:: 5, 92
 
+clock-in:: 8:53
+clock-out:: 17:19
+
+sleep:: 9:40 pm/7:25 am
+
 #sin:0.40674/0.20791/0.00000/-0.20791/-0.40674/-0.58779/-0.74314/-0.86603/-0.95106
 
 #sinsquare:0.16543/0.04323/0.00000/0.04323/0.16543/0.34549/0.55226/0.75000/0.90451
diff --git a/examples/diary/2021-01-15.md b/examples/diary/2021-01-15.md
index 06f6b03..adfd02b 100644
--- a/examples/diary/2021-01-15.md
+++ b/examples/diary/2021-01-15.md
@@ -45,6 +45,11 @@ dataviewTarget1:: 60/7
 dataviewTarget2:: 7 @ 81
 dataviewTarget3:: 7, 81
 
+clock-in:: 9:20
+clock-out:: 18:40
+
+sleep:: 11:14 pm/6:44 am
+
 #sin:0.20791/0.00000/-0.20791/-0.40674/-0.58779/-0.74314/-0.86603/-0.95106/-0.99452
 
 #sinsquare:0.04323/0.00000/0.04323/0.16543/0.34549/0.55226/0.75000/0.90451/0.98907
diff --git a/examples/diary/2021-01-16.md b/examples/diary/2021-01-16.md
index 0f0b883..0852904 100644
--- a/examples/diary/2021-01-16.md
+++ b/examples/diary/2021-01-16.md
@@ -43,6 +43,11 @@ dataviewTarget1:: 17/21
 dataviewTarget2:: 21 @ 93
 dataviewTarget3:: 21, 93
 
+clock-in:: 9:54
+clock-out:: 18:3
+
+sleep:: 11:24 pm/6:40 am
+
 #sin:0.00000/-0.20791/-0.40674/-0.58779/-0.74314/-0.86603/-0.95106/-0.99452/-0.99452
 
 #sinsquare:0.00000/0.04323/0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907
diff --git a/examples/diary/2021-01-17.md b/examples/diary/2021-01-17.md
index dfa7263..38092f4 100644
--- a/examples/diary/2021-01-17.md
+++ b/examples/diary/2021-01-17.md
@@ -45,6 +45,11 @@ dataviewTarget1:: 46/38
 dataviewTarget2:: 38 @ 82
 dataviewTarget3:: 38, 82
 
+clock-in:: 8:3
+clock-out:: 16:23
+
+sleep:: 10:42 pm/6:30 am
+
 #sin:-0.20791/-0.40674/-0.58779/-0.74314/-0.86603/-0.95106/-0.99452/-0.99452/-0.95106
 
 #sinsquare:0.04323/0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451
diff --git a/examples/diary/2021-01-18.md b/examples/diary/2021-01-18.md
index 8183400..9082868 100644
--- a/examples/diary/2021-01-18.md
+++ b/examples/diary/2021-01-18.md
@@ -45,6 +45,11 @@ dataviewTarget1:: 28/40
 dataviewTarget2:: 40 @ 81
 dataviewTarget3:: 40, 81
 
+clock-in:: 8:48
+clock-out:: 19:49
+
+sleep:: 9:10 pm/7:51 am
+
 #sin:-0.40674/-0.58779/-0.74314/-0.86603/-0.95106/-0.99452/-0.99452/-0.95106/-0.86603
 
 #sinsquare:0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000
diff --git a/examples/diary/2021-01-19.md b/examples/diary/2021-01-19.md
index 7ff9028..6fb9b46 100644
--- a/examples/diary/2021-01-19.md
+++ b/examples/diary/2021-01-19.md
@@ -45,6 +45,11 @@ dataviewTarget1:: 73/8
 dataviewTarget2:: 8 @ 59
 dataviewTarget3:: 8, 59
 
+clock-in:: 8:30
+clock-out:: 17:42
+
+sleep:: 9:34 pm/7:2 am
+
 #sin:-0.58779/-0.74314/-0.86603/-0.95106/-0.99452/-0.99452/-0.95106/-0.86603/-0.74314
 
 #sinsquare:0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000/0.55226
diff --git a/examples/diary/2021-01-20.md b/examples/diary/2021-01-20.md
index 9ccb474..0e23250 100644
--- a/examples/diary/2021-01-20.md
+++ b/examples/diary/2021-01-20.md
@@ -43,6 +43,11 @@ dataviewTarget1:: 64/0
 dataviewTarget2:: 0 @ 54
 dataviewTarget3:: 0, 54
 
+clock-in:: 9:30
+clock-out:: 20:13
+
+sleep:: 9:28 pm/7:58 am
+
 #sin:-0.74314/-0.86603/-0.95106/-0.99452/-0.99452/-0.95106/-0.86603/-0.74314/-0.58779
 
 #sinsquare:0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000/0.55226/0.34549
diff --git a/examples/diary/2021-01-21.md b/examples/diary/2021-01-21.md
index ab257cc..b5e71e3 100644
--- a/examples/diary/2021-01-21.md
+++ b/examples/diary/2021-01-21.md
@@ -45,6 +45,11 @@ dataviewTarget1:: 88/41
 dataviewTarget2:: 41 @ 75
 dataviewTarget3:: 41, 75
 
+clock-in:: 9:4
+clock-out:: 19:29
+
+sleep:: 10:43 pm/6:37 am
+
 #sin:-0.86603/-0.95106/-0.99452/-0.99452/-0.95106/-0.86603/-0.74314/-0.58779/-0.40674
 
 #sinsquare:0.75000/0.90451/0.98907/0.98907/0.90451/0.75000/0.55226/0.34549/0.16543
diff --git a/examples/diary/2021-01-22.md b/examples/diary/2021-01-22.md
index 26f4263..0d1f88e 100644
--- a/examples/diary/2021-01-22.md
+++ b/examples/diary/2021-01-22.md
@@ -44,6 +44,11 @@ dataviewTarget1:: 36/0
 dataviewTarget2:: 0 @ 91
 dataviewTarget3:: 0, 91
 
+clock-in:: 9:32
+clock-out:: 20:27
+
+sleep:: 10:25 pm/5:12 am
+
 #sin:-0.95106/-0.99452/-0.99452/-0.95106/-0.86603/-0.74314/-0.58779/-0.40674/-0.20791
 
 #sinsquare:0.90451/0.98907/0.98907/0.90451/0.75000/0.55226/0.34549/0.16543/0.04323
diff --git a/examples/diary/2021-01-23.md b/examples/diary/2021-01-23.md
index a9fd95d..206bac1 100644
--- a/examples/diary/2021-01-23.md
+++ b/examples/diary/2021-01-23.md
@@ -44,6 +44,11 @@ dataviewTarget1:: 45/27
 dataviewTarget2:: 27 @ 95
 dataviewTarget3:: 27, 95
 
+clock-in:: 10:36
+clock-out:: 19:31
+
+sleep:: 10:9 pm/7:30 am
+
 #sin:-0.99452/-0.99452/-0.95106/-0.86603/-0.74314/-0.58779/-0.40674/-0.20791/-0.00000
 
 #sinsquare:0.98907/0.98907/0.90451/0.75000/0.55226/0.34549/0.16543/0.04323/0.00000
diff --git a/examples/diary/2021-01-24.md b/examples/diary/2021-01-24.md
index 40a9ffb..48523fc 100644
--- a/examples/diary/2021-01-24.md
+++ b/examples/diary/2021-01-24.md
@@ -46,6 +46,11 @@ dataviewTarget1:: 63/23
 dataviewTarget2:: 23 @ 60
 dataviewTarget3:: 23, 60
 
+clock-in:: 8:1
+clock-out:: 18:9
+
+sleep:: 10:53 pm/5:33 am
+
 #sin:-0.99452/-0.95106/-0.86603/-0.74314/-0.58779/-0.40674/-0.20791/-0.00000/0.20791
 
 #sinsquare:0.98907/0.90451/0.75000/0.55226/0.34549/0.16543/0.04323/0.00000/0.04323
diff --git a/examples/diary/2021-01-25.md b/examples/diary/2021-01-25.md
index f1c93f4..061c0ce 100644
--- a/examples/diary/2021-01-25.md
+++ b/examples/diary/2021-01-25.md
@@ -43,6 +43,11 @@ dataviewTarget1:: 88/12
 dataviewTarget2:: 12 @ 96
 dataviewTarget3:: 12, 96
 
+clock-in:: 9:52
+clock-out:: 17:55
+
+sleep:: 10:53 pm/6:3 am
+
 #sin:-0.95106/-0.86603/-0.74314/-0.58779/-0.40674/-0.20791/-0.00000/0.20791/0.40674
 
 #sinsquare:0.90451/0.75000/0.55226/0.34549/0.16543/0.04323/0.00000/0.04323/0.16543
diff --git a/examples/diary/2021-01-26.md b/examples/diary/2021-01-26.md
index f99c94c..0beb595 100644
--- a/examples/diary/2021-01-26.md
+++ b/examples/diary/2021-01-26.md
@@ -44,6 +44,11 @@ dataviewTarget1:: 42/19
 dataviewTarget2:: 19 @ 93
 dataviewTarget3:: 19, 93
 
+clock-in:: 10:24
+clock-out:: 19:12
+
+sleep:: 11:36 pm/6:2 am
+
 #sin:-0.86603/-0.74314/-0.58779/-0.40674/-0.20791/-0.00000/0.20791/0.40674/0.58779
 
 #sinsquare:0.75000/0.55226/0.34549/0.16543/0.04323/0.00000/0.04323/0.16543/0.34549
diff --git a/examples/diary/2021-01-27.md b/examples/diary/2021-01-27.md
index 2fbbb88..ca96bc8 100644
--- a/examples/diary/2021-01-27.md
+++ b/examples/diary/2021-01-27.md
@@ -45,6 +45,11 @@ dataviewTarget1:: 59/31
 dataviewTarget2:: 31 @ 67
 dataviewTarget3:: 31, 67
 
+clock-in:: 10:28
+clock-out:: 18:4
+
+sleep:: 11:34 pm/6:12 am
+
 #sin:-0.74314/-0.58779/-0.40674/-0.20791/-0.00000/0.20791/0.40674/0.58779/0.74314
 
 #sinsquare:0.55226/0.34549/0.16543/0.04323/0.00000/0.04323/0.16543/0.34549/0.55226
diff --git a/examples/diary/2021-01-28.md b/examples/diary/2021-01-28.md
index c8b3927..52b8c9e 100644
--- a/examples/diary/2021-01-28.md
+++ b/examples/diary/2021-01-28.md
@@ -45,6 +45,11 @@ dataviewTarget1:: 36/33
 dataviewTarget2:: 33 @ 92
 dataviewTarget3:: 33, 92
 
+clock-in:: 10:44
+clock-out:: 16:41
+
+sleep:: 10:27 pm/5:11 am
+
 #sin:-0.58779/-0.40674/-0.20791/-0.00000/0.20791/0.40674/0.58779/0.74314/0.86603
 
 #sinsquare:0.34549/0.16543/0.04323/0.00000/0.04323/0.16543/0.34549/0.55226/0.75000
diff --git a/examples/diary/2021-01-29.md b/examples/diary/2021-01-29.md
index 8b74a63..7f338dc 100644
--- a/examples/diary/2021-01-29.md
+++ b/examples/diary/2021-01-29.md
@@ -44,6 +44,11 @@ dataviewTarget1:: 96/44
 dataviewTarget2:: 44 @ 90
 dataviewTarget3:: 44, 90
 
+clock-in:: 8:19
+clock-out:: 16:35
+
+sleep:: 11:47 pm/6:39 am
+
 #sin:-0.40674/-0.20791/-0.00000/0.20791/0.40674/0.58779/0.74314/0.86603/0.95106
 
 #sinsquare:0.16543/0.04323/0.00000/0.04323/0.16543/0.34549/0.55226/0.75000/0.90451
diff --git a/examples/diary/2021-01-30.md b/examples/diary/2021-01-30.md
index a6196d3..2e5c791 100644
--- a/examples/diary/2021-01-30.md
+++ b/examples/diary/2021-01-30.md
@@ -47,6 +47,11 @@ dataviewTarget1:: 44/48
 dataviewTarget2:: 48 @ 84
 dataviewTarget3:: 48, 84
 
+clock-in:: 10:24
+clock-out:: 18:4
+
+sleep:: 11:10 pm/5:46 am
+
 #sin:-0.20791/-0.00000/0.20791/0.40674/0.58779/0.74314/0.86603/0.95106/0.99452
 
 #sinsquare:0.04323/0.00000/0.04323/0.16543/0.34549/0.55226/0.75000/0.90451/0.98907
diff --git a/examples/diary/2021-01-31.md b/examples/diary/2021-01-31.md
index dbc610f..c03a1b5 100644
--- a/examples/diary/2021-01-31.md
+++ b/examples/diary/2021-01-31.md
@@ -44,6 +44,11 @@ dataviewTarget1:: 59/22
 dataviewTarget2:: 22 @ 55
 dataviewTarget3:: 22, 55
 
+clock-in:: 10:5
+clock-out:: 17:3
+
+sleep:: 9:14 pm/5:9 am
+
 #sin:-0.00000/0.20791/0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452
 
 #sinsquare:0.00000/0.04323/0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907
diff --git a/examples/example_generator.ts b/examples/example_generator.ts
index 4318129..a78a153 100644
--- a/examples/example_generator.ts
+++ b/examples/example_generator.ts
@@ -227,6 +227,17 @@ for (
 
     content += "\n";
 
+    // clock-in clock-out in dvField
+    content += "clock-in:: " + time_clock_in + "\n";
+    content += "clock-out:: " + time_clock_out + "\n";
+
+    content += "\n";
+
+    // sleep in dvField
+    content += "sleep:: " + time_in_bed + "/" + time_out_of_bed + "\n";
+
+    content += "\n";
+
     let amplitude = 1.0;
     let period = 30; // how many days to complete a sin period
     let numSinValues = 9;

From dae713f88b2a2e115631ffebd9fb2ce64b2035e4 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 30 Jul 2021 18:11:37 +0800
Subject: [PATCH 174/402] Update examples for time values

---
 examples/TestTimeValues.md    | 1 +
 examples/diary/2021-01-01.md  | 4 ++--
 examples/diary/2021-01-02.md  | 4 ++--
 examples/diary/2021-01-03.md  | 4 ++--
 examples/diary/2021-01-04.md  | 4 ++--
 examples/diary/2021-01-05.md  | 4 ++--
 examples/diary/2021-01-06.md  | 4 ++--
 examples/diary/2021-01-07.md  | 4 ++--
 examples/diary/2021-01-08.md  | 4 ++--
 examples/diary/2021-01-09.md  | 4 ++--
 examples/diary/2021-01-10.md  | 4 ++--
 examples/diary/2021-01-11.md  | 4 ++--
 examples/diary/2021-01-12.md  | 4 ++--
 examples/diary/2021-01-13.md  | 4 ++--
 examples/diary/2021-01-14.md  | 4 ++--
 examples/diary/2021-01-15.md  | 4 ++--
 examples/diary/2021-01-16.md  | 4 ++--
 examples/diary/2021-01-17.md  | 4 ++--
 examples/diary/2021-01-18.md  | 4 ++--
 examples/diary/2021-01-19.md  | 4 ++--
 examples/diary/2021-01-20.md  | 4 ++--
 examples/diary/2021-01-21.md  | 4 ++--
 examples/diary/2021-01-22.md  | 4 ++--
 examples/diary/2021-01-23.md  | 4 ++--
 examples/diary/2021-01-24.md  | 4 ++--
 examples/diary/2021-01-25.md  | 4 ++--
 examples/diary/2021-01-26.md  | 4 ++--
 examples/diary/2021-01-27.md  | 4 ++--
 examples/diary/2021-01-28.md  | 4 ++--
 examples/diary/2021-01-29.md  | 4 ++--
 examples/diary/2021-01-30.md  | 4 ++--
 examples/diary/2021-01-31.md  | 4 ++--
 examples/example_generator.ts | 5 +++--
 33 files changed, 66 insertions(+), 64 deletions(-)

diff --git a/examples/TestTimeValues.md b/examples/TestTimeValues.md
index b668a25..3432d57 100644
--- a/examples/TestTimeValues.md
+++ b/examples/TestTimeValues.md
@@ -35,6 +35,7 @@ line:
 
 ## From dvField
 Clock-In & Clock-Out from dvField
+time granularity to one second
 ``` tracker
 searchType: dvField
 searchTarget: clock-in, clock-out
diff --git a/examples/diary/2021-01-01.md b/examples/diary/2021-01-01.md
index 4cddc43..35a7e5e 100644
--- a/examples/diary/2021-01-01.md
+++ b/examples/diary/2021-01-01.md
@@ -44,8 +44,8 @@ dataviewTarget1:: 48/29
 dataviewTarget2:: 29 @ 88
 dataviewTarget3:: 29, 88
 
-clock-in:: 10:45
-clock-out:: 20:51
+clock-in:: 10:45:29
+clock-out:: 20:51:29
 
 sleep:: 10:11 pm/7:5 am
 
diff --git a/examples/diary/2021-01-02.md b/examples/diary/2021-01-02.md
index 796aac3..57200a3 100644
--- a/examples/diary/2021-01-02.md
+++ b/examples/diary/2021-01-02.md
@@ -44,8 +44,8 @@ dataviewTarget1:: 25/5
 dataviewTarget2:: 5 @ 72
 dataviewTarget3:: 5, 72
 
-clock-in:: 8:7
-clock-out:: 20:10
+clock-in:: 8:7:5
+clock-out:: 20:10:5
 
 sleep:: 9:37 pm/7:57 am
 
diff --git a/examples/diary/2021-01-03.md b/examples/diary/2021-01-03.md
index 275ff2a..3b59717 100644
--- a/examples/diary/2021-01-03.md
+++ b/examples/diary/2021-01-03.md
@@ -44,8 +44,8 @@ dataviewTarget1:: 12/14
 dataviewTarget2:: 14 @ 82
 dataviewTarget3:: 14, 82
 
-clock-in:: 10:49
-clock-out:: 16:33
+clock-in:: 10:49:14
+clock-out:: 16:33:14
 
 sleep:: 9:17 pm/6:48 am
 
diff --git a/examples/diary/2021-01-04.md b/examples/diary/2021-01-04.md
index f1f2ee0..f846803 100644
--- a/examples/diary/2021-01-04.md
+++ b/examples/diary/2021-01-04.md
@@ -47,8 +47,8 @@ dataviewTarget1:: 43/29
 dataviewTarget2:: 29 @ 74
 dataviewTarget3:: 29, 74
 
-clock-in:: 10:41
-clock-out:: 20:52
+clock-in:: 10:41:29
+clock-out:: 20:52:29
 
 sleep:: 10:10 pm/6:37 am
 
diff --git a/examples/diary/2021-01-05.md b/examples/diary/2021-01-05.md
index 2c92189..6878a3c 100644
--- a/examples/diary/2021-01-05.md
+++ b/examples/diary/2021-01-05.md
@@ -46,8 +46,8 @@ dataviewTarget1:: 86/24
 dataviewTarget2:: 24 @ 90
 dataviewTarget3:: 24, 90
 
-clock-in:: 9:1
-clock-out:: 18:57
+clock-in:: 9:1:24
+clock-out:: 18:57:24
 
 sleep:: 9:9 pm/5:57 am
 
diff --git a/examples/diary/2021-01-06.md b/examples/diary/2021-01-06.md
index 82e20c5..f5dfd71 100644
--- a/examples/diary/2021-01-06.md
+++ b/examples/diary/2021-01-06.md
@@ -45,8 +45,8 @@ dataviewTarget1:: 98/46
 dataviewTarget2:: 46 @ 75
 dataviewTarget3:: 46, 75
 
-clock-in:: 10:27
-clock-out:: 19:26
+clock-in:: 10:27:46
+clock-out:: 19:26:46
 
 sleep:: 10:30 pm/5:29 am
 
diff --git a/examples/diary/2021-01-07.md b/examples/diary/2021-01-07.md
index 1c517d7..f3981f0 100644
--- a/examples/diary/2021-01-07.md
+++ b/examples/diary/2021-01-07.md
@@ -45,8 +45,8 @@ dataviewTarget1:: 43/6
 dataviewTarget2:: 6 @ 77
 dataviewTarget3:: 6, 77
 
-clock-in:: 9:53
-clock-out:: 17:39
+clock-in:: 9:53:6
+clock-out:: 17:39:6
 
 sleep:: 10:53 pm/7:13 am
 
diff --git a/examples/diary/2021-01-08.md b/examples/diary/2021-01-08.md
index 2c731c3..8febc8c 100644
--- a/examples/diary/2021-01-08.md
+++ b/examples/diary/2021-01-08.md
@@ -45,8 +45,8 @@ dataviewTarget1:: 39/25
 dataviewTarget2:: 25 @ 77
 dataviewTarget3:: 25, 77
 
-clock-in:: 8:5
-clock-out:: 16:5
+clock-in:: 8:5:25
+clock-out:: 16:5:25
 
 sleep:: 9:1 pm/6:56 am
 
diff --git a/examples/diary/2021-01-09.md b/examples/diary/2021-01-09.md
index b36b002..b3d3266 100644
--- a/examples/diary/2021-01-09.md
+++ b/examples/diary/2021-01-09.md
@@ -47,8 +47,8 @@ dataviewTarget1:: 37/36
 dataviewTarget2:: 36 @ 53
 dataviewTarget3:: 36, 53
 
-clock-in:: 8:37
-clock-out:: 17:9
+clock-in:: 8:37:36
+clock-out:: 17:9:36
 
 sleep:: 9:23 pm/5:51 am
 
diff --git a/examples/diary/2021-01-10.md b/examples/diary/2021-01-10.md
index e03ac02..f6261c7 100644
--- a/examples/diary/2021-01-10.md
+++ b/examples/diary/2021-01-10.md
@@ -44,8 +44,8 @@ dataviewTarget1:: 4/10
 dataviewTarget2:: 10 @ 92
 dataviewTarget3:: 10, 92
 
-clock-in:: 10:25
-clock-out:: 17:55
+clock-in:: 10:25:10
+clock-out:: 17:55:10
 
 sleep:: 10:11 pm/5:31 am
 
diff --git a/examples/diary/2021-01-11.md b/examples/diary/2021-01-11.md
index 8e7cb24..c9f40f1 100644
--- a/examples/diary/2021-01-11.md
+++ b/examples/diary/2021-01-11.md
@@ -43,8 +43,8 @@ dataviewTarget1:: 97/19
 dataviewTarget2:: 19 @ 82
 dataviewTarget3:: 19, 82
 
-clock-in:: 9:42
-clock-out:: 20:35
+clock-in:: 9:42:19
+clock-out:: 20:35:19
 
 sleep:: 11:47 pm/6:8 am
 
diff --git a/examples/diary/2021-01-12.md b/examples/diary/2021-01-12.md
index 71a716c..a0652a0 100644
--- a/examples/diary/2021-01-12.md
+++ b/examples/diary/2021-01-12.md
@@ -45,8 +45,8 @@ dataviewTarget1:: 79/36
 dataviewTarget2:: 36 @ 66
 dataviewTarget3:: 36, 66
 
-clock-in:: 8:54
-clock-out:: 16:19
+clock-in:: 8:54:36
+clock-out:: 16:19:36
 
 sleep:: 11:23 pm/6:15 am
 
diff --git a/examples/diary/2021-01-13.md b/examples/diary/2021-01-13.md
index f502eb1..97f5314 100644
--- a/examples/diary/2021-01-13.md
+++ b/examples/diary/2021-01-13.md
@@ -43,8 +43,8 @@ dataviewTarget1:: 87/46
 dataviewTarget2:: 46 @ 73
 dataviewTarget3:: 46, 73
 
-clock-in:: 8:1
-clock-out:: 17:0
+clock-in:: 8:1:46
+clock-out:: 17:0:46
 
 sleep:: 9:2 pm/6:37 am
 
diff --git a/examples/diary/2021-01-14.md b/examples/diary/2021-01-14.md
index 6299113..66d378e 100644
--- a/examples/diary/2021-01-14.md
+++ b/examples/diary/2021-01-14.md
@@ -45,8 +45,8 @@ dataviewTarget1:: 43/5
 dataviewTarget2:: 5 @ 92
 dataviewTarget3:: 5, 92
 
-clock-in:: 8:53
-clock-out:: 17:19
+clock-in:: 8:53:5
+clock-out:: 17:19:5
 
 sleep:: 9:40 pm/7:25 am
 
diff --git a/examples/diary/2021-01-15.md b/examples/diary/2021-01-15.md
index adfd02b..19995b0 100644
--- a/examples/diary/2021-01-15.md
+++ b/examples/diary/2021-01-15.md
@@ -45,8 +45,8 @@ dataviewTarget1:: 60/7
 dataviewTarget2:: 7 @ 81
 dataviewTarget3:: 7, 81
 
-clock-in:: 9:20
-clock-out:: 18:40
+clock-in:: 9:20:7
+clock-out:: 18:40:7
 
 sleep:: 11:14 pm/6:44 am
 
diff --git a/examples/diary/2021-01-16.md b/examples/diary/2021-01-16.md
index 0852904..2787b95 100644
--- a/examples/diary/2021-01-16.md
+++ b/examples/diary/2021-01-16.md
@@ -43,8 +43,8 @@ dataviewTarget1:: 17/21
 dataviewTarget2:: 21 @ 93
 dataviewTarget3:: 21, 93
 
-clock-in:: 9:54
-clock-out:: 18:3
+clock-in:: 9:54:21
+clock-out:: 18:3:21
 
 sleep:: 11:24 pm/6:40 am
 
diff --git a/examples/diary/2021-01-17.md b/examples/diary/2021-01-17.md
index 38092f4..7329c6e 100644
--- a/examples/diary/2021-01-17.md
+++ b/examples/diary/2021-01-17.md
@@ -45,8 +45,8 @@ dataviewTarget1:: 46/38
 dataviewTarget2:: 38 @ 82
 dataviewTarget3:: 38, 82
 
-clock-in:: 8:3
-clock-out:: 16:23
+clock-in:: 8:3:38
+clock-out:: 16:23:38
 
 sleep:: 10:42 pm/6:30 am
 
diff --git a/examples/diary/2021-01-18.md b/examples/diary/2021-01-18.md
index 9082868..de902ae 100644
--- a/examples/diary/2021-01-18.md
+++ b/examples/diary/2021-01-18.md
@@ -45,8 +45,8 @@ dataviewTarget1:: 28/40
 dataviewTarget2:: 40 @ 81
 dataviewTarget3:: 40, 81
 
-clock-in:: 8:48
-clock-out:: 19:49
+clock-in:: 8:48:40
+clock-out:: 19:49:40
 
 sleep:: 9:10 pm/7:51 am
 
diff --git a/examples/diary/2021-01-19.md b/examples/diary/2021-01-19.md
index 6fb9b46..06eb314 100644
--- a/examples/diary/2021-01-19.md
+++ b/examples/diary/2021-01-19.md
@@ -45,8 +45,8 @@ dataviewTarget1:: 73/8
 dataviewTarget2:: 8 @ 59
 dataviewTarget3:: 8, 59
 
-clock-in:: 8:30
-clock-out:: 17:42
+clock-in:: 8:30:8
+clock-out:: 17:42:8
 
 sleep:: 9:34 pm/7:2 am
 
diff --git a/examples/diary/2021-01-20.md b/examples/diary/2021-01-20.md
index 0e23250..c460221 100644
--- a/examples/diary/2021-01-20.md
+++ b/examples/diary/2021-01-20.md
@@ -43,8 +43,8 @@ dataviewTarget1:: 64/0
 dataviewTarget2:: 0 @ 54
 dataviewTarget3:: 0, 54
 
-clock-in:: 9:30
-clock-out:: 20:13
+clock-in:: 9:30:0
+clock-out:: 20:13:0
 
 sleep:: 9:28 pm/7:58 am
 
diff --git a/examples/diary/2021-01-21.md b/examples/diary/2021-01-21.md
index b5e71e3..be9961a 100644
--- a/examples/diary/2021-01-21.md
+++ b/examples/diary/2021-01-21.md
@@ -45,8 +45,8 @@ dataviewTarget1:: 88/41
 dataviewTarget2:: 41 @ 75
 dataviewTarget3:: 41, 75
 
-clock-in:: 9:4
-clock-out:: 19:29
+clock-in:: 9:4:41
+clock-out:: 19:29:41
 
 sleep:: 10:43 pm/6:37 am
 
diff --git a/examples/diary/2021-01-22.md b/examples/diary/2021-01-22.md
index 0d1f88e..77cf0e7 100644
--- a/examples/diary/2021-01-22.md
+++ b/examples/diary/2021-01-22.md
@@ -44,8 +44,8 @@ dataviewTarget1:: 36/0
 dataviewTarget2:: 0 @ 91
 dataviewTarget3:: 0, 91
 
-clock-in:: 9:32
-clock-out:: 20:27
+clock-in:: 9:32:0
+clock-out:: 20:27:0
 
 sleep:: 10:25 pm/5:12 am
 
diff --git a/examples/diary/2021-01-23.md b/examples/diary/2021-01-23.md
index 206bac1..e10d6a0 100644
--- a/examples/diary/2021-01-23.md
+++ b/examples/diary/2021-01-23.md
@@ -44,8 +44,8 @@ dataviewTarget1:: 45/27
 dataviewTarget2:: 27 @ 95
 dataviewTarget3:: 27, 95
 
-clock-in:: 10:36
-clock-out:: 19:31
+clock-in:: 10:36:27
+clock-out:: 19:31:27
 
 sleep:: 10:9 pm/7:30 am
 
diff --git a/examples/diary/2021-01-24.md b/examples/diary/2021-01-24.md
index 48523fc..318da6f 100644
--- a/examples/diary/2021-01-24.md
+++ b/examples/diary/2021-01-24.md
@@ -46,8 +46,8 @@ dataviewTarget1:: 63/23
 dataviewTarget2:: 23 @ 60
 dataviewTarget3:: 23, 60
 
-clock-in:: 8:1
-clock-out:: 18:9
+clock-in:: 8:1:23
+clock-out:: 18:9:23
 
 sleep:: 10:53 pm/5:33 am
 
diff --git a/examples/diary/2021-01-25.md b/examples/diary/2021-01-25.md
index 061c0ce..c55952c 100644
--- a/examples/diary/2021-01-25.md
+++ b/examples/diary/2021-01-25.md
@@ -43,8 +43,8 @@ dataviewTarget1:: 88/12
 dataviewTarget2:: 12 @ 96
 dataviewTarget3:: 12, 96
 
-clock-in:: 9:52
-clock-out:: 17:55
+clock-in:: 9:52:12
+clock-out:: 17:55:12
 
 sleep:: 10:53 pm/6:3 am
 
diff --git a/examples/diary/2021-01-26.md b/examples/diary/2021-01-26.md
index 0beb595..919a6db 100644
--- a/examples/diary/2021-01-26.md
+++ b/examples/diary/2021-01-26.md
@@ -44,8 +44,8 @@ dataviewTarget1:: 42/19
 dataviewTarget2:: 19 @ 93
 dataviewTarget3:: 19, 93
 
-clock-in:: 10:24
-clock-out:: 19:12
+clock-in:: 10:24:19
+clock-out:: 19:12:19
 
 sleep:: 11:36 pm/6:2 am
 
diff --git a/examples/diary/2021-01-27.md b/examples/diary/2021-01-27.md
index ca96bc8..d27ce18 100644
--- a/examples/diary/2021-01-27.md
+++ b/examples/diary/2021-01-27.md
@@ -45,8 +45,8 @@ dataviewTarget1:: 59/31
 dataviewTarget2:: 31 @ 67
 dataviewTarget3:: 31, 67
 
-clock-in:: 10:28
-clock-out:: 18:4
+clock-in:: 10:28:31
+clock-out:: 18:4:31
 
 sleep:: 11:34 pm/6:12 am
 
diff --git a/examples/diary/2021-01-28.md b/examples/diary/2021-01-28.md
index 52b8c9e..dea9212 100644
--- a/examples/diary/2021-01-28.md
+++ b/examples/diary/2021-01-28.md
@@ -45,8 +45,8 @@ dataviewTarget1:: 36/33
 dataviewTarget2:: 33 @ 92
 dataviewTarget3:: 33, 92
 
-clock-in:: 10:44
-clock-out:: 16:41
+clock-in:: 10:44:33
+clock-out:: 16:41:33
 
 sleep:: 10:27 pm/5:11 am
 
diff --git a/examples/diary/2021-01-29.md b/examples/diary/2021-01-29.md
index 7f338dc..bb20ef6 100644
--- a/examples/diary/2021-01-29.md
+++ b/examples/diary/2021-01-29.md
@@ -44,8 +44,8 @@ dataviewTarget1:: 96/44
 dataviewTarget2:: 44 @ 90
 dataviewTarget3:: 44, 90
 
-clock-in:: 8:19
-clock-out:: 16:35
+clock-in:: 8:19:44
+clock-out:: 16:35:44
 
 sleep:: 11:47 pm/6:39 am
 
diff --git a/examples/diary/2021-01-30.md b/examples/diary/2021-01-30.md
index 2e5c791..e140f7e 100644
--- a/examples/diary/2021-01-30.md
+++ b/examples/diary/2021-01-30.md
@@ -47,8 +47,8 @@ dataviewTarget1:: 44/48
 dataviewTarget2:: 48 @ 84
 dataviewTarget3:: 48, 84
 
-clock-in:: 10:24
-clock-out:: 18:4
+clock-in:: 10:24:48
+clock-out:: 18:4:48
 
 sleep:: 11:10 pm/5:46 am
 
diff --git a/examples/diary/2021-01-31.md b/examples/diary/2021-01-31.md
index c03a1b5..e5c4a74 100644
--- a/examples/diary/2021-01-31.md
+++ b/examples/diary/2021-01-31.md
@@ -44,8 +44,8 @@ dataviewTarget1:: 59/22
 dataviewTarget2:: 22 @ 55
 dataviewTarget3:: 22, 55
 
-clock-in:: 10:5
-clock-out:: 17:3
+clock-in:: 10:5:22
+clock-out:: 17:3:22
 
 sleep:: 9:14 pm/5:9 am
 
diff --git a/examples/example_generator.ts b/examples/example_generator.ts
index a78a153..6f95545 100644
--- a/examples/example_generator.ts
+++ b/examples/example_generator.ts
@@ -228,8 +228,9 @@ for (
     content += "\n";
 
     // clock-in clock-out in dvField
-    content += "clock-in:: " + time_clock_in + "\n";
-    content += "clock-out:: " + time_clock_out + "\n";
+    let seconds = dataviewValue1;
+    content += "clock-in:: " + time_clock_in + ":" + seconds + "\n";
+    content += "clock-out:: " + time_clock_out + ":" + seconds +"\n";
 
     content += "\n";
 

From 824231b0167ec9cc09dab113ef047d04d8a99f2c Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 31 Jul 2021 17:29:30 +0800
Subject: [PATCH 175/402] Allow using regex in dataFormatPrefix and
 dateFormatSuffix

---
 docs/InputParameters.md                    |  4 +-
 examples/TestDateFormats.md                | 27 ++++++++++
 examples/diary/Jeffrey-20210101-Diary.md   | 28 +++++++++++
 examples/diary/Jeffrey-20210101-Journal.md | 28 +++++++++++
 examples/diary/Jeffrey-20210102-Diary.md   | 28 +++++++++++
 examples/diary/Jeffrey-20210102-Journal.md | 28 +++++++++++
 examples/diary/Jeffrey-20210103-Diary.md   | 30 +++++++++++
 examples/diary/Jeffrey-20210103-Journal.md | 30 +++++++++++
 examples/diary/Jeffrey-20210104-Diary.md   | 27 ++++++++++
 examples/diary/Jeffrey-20210104-Journal.md | 27 ++++++++++
 examples/diary/Jeffrey-20210105-Diary.md   | 28 +++++++++++
 examples/diary/Jeffrey-20210105-Journal.md | 28 +++++++++++
 examples/diary/Lucas-20210101-Diary.md     | 28 +++++++++++
 examples/diary/Lucas-20210101-Journal.md   | 28 +++++++++++
 examples/diary/Lucas-20210102-Diary.md     | 28 +++++++++++
 examples/diary/Lucas-20210102-Journal.md   | 28 +++++++++++
 examples/diary/Lucas-20210103-Diary.md     | 30 +++++++++++
 examples/diary/Lucas-20210103-Journal.md   | 30 +++++++++++
 examples/diary/Lucas-20210104-Diary.md     | 27 ++++++++++
 examples/diary/Lucas-20210104-Journal.md   | 27 ++++++++++
 examples/diary/Lucas-20210105-Diary.md     | 28 +++++++++++
 examples/diary/Lucas-20210105-Journal.md   | 28 +++++++++++
 src/collecting.ts                          | 58 +++++++++++++++-------
 src/helper.ts                              | 36 ++++++++++++++
 src/parsing.ts                             | 49 ++++++------------
 25 files changed, 684 insertions(+), 54 deletions(-)
 create mode 100644 examples/diary/Jeffrey-20210101-Diary.md
 create mode 100644 examples/diary/Jeffrey-20210101-Journal.md
 create mode 100644 examples/diary/Jeffrey-20210102-Diary.md
 create mode 100644 examples/diary/Jeffrey-20210102-Journal.md
 create mode 100644 examples/diary/Jeffrey-20210103-Diary.md
 create mode 100644 examples/diary/Jeffrey-20210103-Journal.md
 create mode 100644 examples/diary/Jeffrey-20210104-Diary.md
 create mode 100644 examples/diary/Jeffrey-20210104-Journal.md
 create mode 100644 examples/diary/Jeffrey-20210105-Diary.md
 create mode 100644 examples/diary/Jeffrey-20210105-Journal.md
 create mode 100644 examples/diary/Lucas-20210101-Diary.md
 create mode 100644 examples/diary/Lucas-20210101-Journal.md
 create mode 100644 examples/diary/Lucas-20210102-Diary.md
 create mode 100644 examples/diary/Lucas-20210102-Journal.md
 create mode 100644 examples/diary/Lucas-20210103-Diary.md
 create mode 100644 examples/diary/Lucas-20210103-Journal.md
 create mode 100644 examples/diary/Lucas-20210104-Diary.md
 create mode 100644 examples/diary/Lucas-20210104-Journal.md
 create mode 100644 examples/diary/Lucas-20210105-Diary.md
 create mode 100644 examples/diary/Lucas-20210105-Journal.md

diff --git a/docs/InputParameters.md b/docs/InputParameters.md
index 44cf30b..f2a8944 100644
--- a/docs/InputParameters.md
+++ b/docs/InputParameters.md
@@ -22,8 +22,8 @@ These key-value pairs are placed under the code block root.
 | `searchTarget` | Target to search<br>[[detail](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TargetEvaluation.md)] | NT (Number of Targets) | Must be provided |
 | `folder` | Root path containing notes to search | 1 | Root of this vault |
 | `dateFormat` | Date format<br> Use [Moment.js](https://momentjscom.readthedocs.io/en/latest/moment/04-displaying/01-format/) format or use [iso-8601](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md#iso-8601-date-format) | 1 | 'YYYY-MM-DD' |
-| `dateFormatPrefix` | Prefix before your dateFormat | 1 | '' |
-| `dateFormatSuffix` | Suffix after your dateFormat | 1 | '' |
+| `dateFormatPrefix` | Prefix before your dateFormat (accept regex) | 1 | '' |
+| `dateFormatSuffix` | Suffix after your dateFormat (accept regex) | 1 | '' |
 | `startDate` | Start date to collect data from<br>accept [relative date](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md#relative-date-input-for-startdate-and-enddate) | 1 | Min date found |
 | `endDate` | End date of to collect data<br>accept [relative date](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md#relative-date-input-for-startdate-and-enddate) | 1 | Max date found |
 | `datasetName` | Name of the dataset for a search target` | 1~NT | untitled |
diff --git a/examples/TestDateFormats.md b/examples/TestDateFormats.md
index a98b946..e2b481c 100644
--- a/examples/TestDateFormats.md
+++ b/examples/TestDateFormats.md
@@ -119,6 +119,7 @@ The string provided in dateFormatPrefix and dateFormatSuffix will be removed bef
 searchType: tag
 searchTarget: weight
 folder: diary
+dateFormat: YYYYMMDD
 dateFormatPrefix: D-
 startDate: D-20210101
 endDate: D-20210105
@@ -135,6 +136,7 @@ line:
 searchType: tag
 searchTarget: weight
 folder: diary
+dateFormat: YYYYMMDD
 dateFormatSuffix: -D
 startDate: 20210101-D
 endDate: 20210105-D
@@ -145,6 +147,31 @@ line:
     lineColor: yellow
 ```
 
+### Using prefix and suffix with regular expression
+
+Examples of file name
+- Jeffrey-20210101-Journal
+- Jeffrey-20210102-Diary
+- Lucas-2021-0103-Journal
+- Lucas-2021-0104-Diary
+
+Data from the same days will be summed up.
+``` tracker
+searchType: tag
+searchTarget: exercise-pushup
+folder: diary
+dateFormat: YYYYMMDD
+dateFormatPrefix: '(Jeffrey-|Lucas-)'
+dateFormatSuffix: '(-Journal|-Diary)'
+startDate: 20210101
+endDate: 20210105
+line:
+    title: PushUp
+    yAxisLabel: Count
+    yAxisUnit: times
+    lineColor: yellow
+```
+
 ## Relative Date Input for startDate and endDate
 
 The reference date of the relative date input is 'today' (The current date of your computer), So
diff --git a/examples/diary/Jeffrey-20210101-Diary.md b/examples/diary/Jeffrey-20210101-Diary.md
new file mode 100644
index 0000000..294ce1a
--- /dev/null
+++ b/examples/diary/Jeffrey-20210101-Diary.md
@@ -0,0 +1,28 @@
+---
+tags: work_log
+mood: 10
+bloodpressure: 177.4/121.8
+---
+
+#weight:74.0kg
+
+#exercise-pushup:44
+#exercise-plank:37sec
+
+
+⭐⭐⭐⭐⭐
+
+#finance/bank1:-3.4USD
+
+[[todo_family|To-Do @Family]]
+[[todo_work|To-Do @Work]]
+
+obsidian-tracker+1@gmail.com
+obsidian-tracker@yahoo.com
+
+weightlifting: 10
+
+#sin:0.00000/0.20791/0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452
+
+#sinsquare:0.00000/0.04323/0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907
+
diff --git a/examples/diary/Jeffrey-20210101-Journal.md b/examples/diary/Jeffrey-20210101-Journal.md
new file mode 100644
index 0000000..294ce1a
--- /dev/null
+++ b/examples/diary/Jeffrey-20210101-Journal.md
@@ -0,0 +1,28 @@
+---
+tags: work_log
+mood: 10
+bloodpressure: 177.4/121.8
+---
+
+#weight:74.0kg
+
+#exercise-pushup:44
+#exercise-plank:37sec
+
+
+⭐⭐⭐⭐⭐
+
+#finance/bank1:-3.4USD
+
+[[todo_family|To-Do @Family]]
+[[todo_work|To-Do @Work]]
+
+obsidian-tracker+1@gmail.com
+obsidian-tracker@yahoo.com
+
+weightlifting: 10
+
+#sin:0.00000/0.20791/0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452
+
+#sinsquare:0.00000/0.04323/0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907
+
diff --git a/examples/diary/Jeffrey-20210102-Diary.md b/examples/diary/Jeffrey-20210102-Diary.md
new file mode 100644
index 0000000..f9425bd
--- /dev/null
+++ b/examples/diary/Jeffrey-20210102-Diary.md
@@ -0,0 +1,28 @@
+---
+tags: 
+mood: 8
+bloodpressure: 174.8/121.6
+---
+
+#weight:68.8kg
+
+#exercise-pushup:38
+#exercise-plank:112sec
+
+
+⭐⭐⭐
+
+#finance/bank1:-2.7USD
+
+[[todo_family|To-Do @Family]]
+[[todo_work|To-Do @Work]]
+
+obsidian-tracker@gmail.com
+obsidian-tracker@yahoo.com
+
+weightlifting: 16
+
+#sin:0.20791/0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452/0.95106
+
+#sinsquare:0.04323/0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451
+
diff --git a/examples/diary/Jeffrey-20210102-Journal.md b/examples/diary/Jeffrey-20210102-Journal.md
new file mode 100644
index 0000000..f9425bd
--- /dev/null
+++ b/examples/diary/Jeffrey-20210102-Journal.md
@@ -0,0 +1,28 @@
+---
+tags: 
+mood: 8
+bloodpressure: 174.8/121.6
+---
+
+#weight:68.8kg
+
+#exercise-pushup:38
+#exercise-plank:112sec
+
+
+⭐⭐⭐
+
+#finance/bank1:-2.7USD
+
+[[todo_family|To-Do @Family]]
+[[todo_work|To-Do @Work]]
+
+obsidian-tracker@gmail.com
+obsidian-tracker@yahoo.com
+
+weightlifting: 16
+
+#sin:0.20791/0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452/0.95106
+
+#sinsquare:0.04323/0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451
+
diff --git a/examples/diary/Jeffrey-20210103-Diary.md b/examples/diary/Jeffrey-20210103-Diary.md
new file mode 100644
index 0000000..3a89f50
--- /dev/null
+++ b/examples/diary/Jeffrey-20210103-Diary.md
@@ -0,0 +1,30 @@
+---
+tags: 
+mood: 7
+bloodpressure: 178.2/119.4
+---
+
+#weight:74.9kg
+
+#exercise-pushup:32
+#exercise-plank:56sec
+
+#meditation
+
+⭐⭐⭐⭐⭐
+
+#finance/bank1:-3.7USD
+
+[[todo_family|To-Do @Family]]
+[[todo_work|To-Do @Work]]
+
+obsidian-tracker@gmail.com
+obsidian-tracker+1@gmail.com
+obsidian-tracker@yahoo.com
+
+weightlifting: 16
+
+#sin:0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452/0.95106/0.86603
+
+#sinsquare:0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000
+
diff --git a/examples/diary/Jeffrey-20210103-Journal.md b/examples/diary/Jeffrey-20210103-Journal.md
new file mode 100644
index 0000000..3a89f50
--- /dev/null
+++ b/examples/diary/Jeffrey-20210103-Journal.md
@@ -0,0 +1,30 @@
+---
+tags: 
+mood: 7
+bloodpressure: 178.2/119.4
+---
+
+#weight:74.9kg
+
+#exercise-pushup:32
+#exercise-plank:56sec
+
+#meditation
+
+⭐⭐⭐⭐⭐
+
+#finance/bank1:-3.7USD
+
+[[todo_family|To-Do @Family]]
+[[todo_work|To-Do @Work]]
+
+obsidian-tracker@gmail.com
+obsidian-tracker+1@gmail.com
+obsidian-tracker@yahoo.com
+
+weightlifting: 16
+
+#sin:0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452/0.95106/0.86603
+
+#sinsquare:0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000
+
diff --git a/examples/diary/Jeffrey-20210104-Diary.md b/examples/diary/Jeffrey-20210104-Diary.md
new file mode 100644
index 0000000..6ee80be
--- /dev/null
+++ b/examples/diary/Jeffrey-20210104-Diary.md
@@ -0,0 +1,27 @@
+---
+tags: work_log
+mood: 3
+bloodpressure: 178.6/119.2
+---
+
+#weight:73.5kg
+
+#exercise-pushup:40
+#exercise-plank:74sec
+
+#meditation
+
+⭐⭐⭐⭐⭐
+
+#finance/bank1:-2.5USD
+
+[[todo_family|To-Do @Family]]
+[[todo_work|To-Do @Work]]
+
+
+weightlifting: 19
+
+#sin:0.58779/0.74314/0.86603/0.95106/0.99452/0.99452/0.95106/0.86603/0.74314
+
+#sinsquare:0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000/0.55226
+
diff --git a/examples/diary/Jeffrey-20210104-Journal.md b/examples/diary/Jeffrey-20210104-Journal.md
new file mode 100644
index 0000000..6ee80be
--- /dev/null
+++ b/examples/diary/Jeffrey-20210104-Journal.md
@@ -0,0 +1,27 @@
+---
+tags: work_log
+mood: 3
+bloodpressure: 178.6/119.2
+---
+
+#weight:73.5kg
+
+#exercise-pushup:40
+#exercise-plank:74sec
+
+#meditation
+
+⭐⭐⭐⭐⭐
+
+#finance/bank1:-2.5USD
+
+[[todo_family|To-Do @Family]]
+[[todo_work|To-Do @Work]]
+
+
+weightlifting: 19
+
+#sin:0.58779/0.74314/0.86603/0.95106/0.99452/0.99452/0.95106/0.86603/0.74314
+
+#sinsquare:0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000/0.55226
+
diff --git a/examples/diary/Jeffrey-20210105-Diary.md b/examples/diary/Jeffrey-20210105-Diary.md
new file mode 100644
index 0000000..c836d81
--- /dev/null
+++ b/examples/diary/Jeffrey-20210105-Diary.md
@@ -0,0 +1,28 @@
+---
+tags: work_log
+mood: 1
+bloodpressure: 177/119
+---
+
+#weight:70.0kg
+
+#exercise-pushup:35
+#exercise-plank:34sec
+
+#meditation
+
+⭐⭐
+
+#finance/bank1:-2.6USD
+
+[[todo_family|To-Do @Family]]
+[[todo_work|To-Do @Work]]
+
+obsidian-tracker@gmail.com
+
+weightlifting: 10
+
+#sin:0.74314/0.86603/0.95106/0.99452/0.99452/0.95106/0.86603/0.74314/0.58779
+
+#sinsquare:0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000/0.55226/0.34549
+
diff --git a/examples/diary/Jeffrey-20210105-Journal.md b/examples/diary/Jeffrey-20210105-Journal.md
new file mode 100644
index 0000000..c836d81
--- /dev/null
+++ b/examples/diary/Jeffrey-20210105-Journal.md
@@ -0,0 +1,28 @@
+---
+tags: work_log
+mood: 1
+bloodpressure: 177/119
+---
+
+#weight:70.0kg
+
+#exercise-pushup:35
+#exercise-plank:34sec
+
+#meditation
+
+⭐⭐
+
+#finance/bank1:-2.6USD
+
+[[todo_family|To-Do @Family]]
+[[todo_work|To-Do @Work]]
+
+obsidian-tracker@gmail.com
+
+weightlifting: 10
+
+#sin:0.74314/0.86603/0.95106/0.99452/0.99452/0.95106/0.86603/0.74314/0.58779
+
+#sinsquare:0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000/0.55226/0.34549
+
diff --git a/examples/diary/Lucas-20210101-Diary.md b/examples/diary/Lucas-20210101-Diary.md
new file mode 100644
index 0000000..294ce1a
--- /dev/null
+++ b/examples/diary/Lucas-20210101-Diary.md
@@ -0,0 +1,28 @@
+---
+tags: work_log
+mood: 10
+bloodpressure: 177.4/121.8
+---
+
+#weight:74.0kg
+
+#exercise-pushup:44
+#exercise-plank:37sec
+
+
+⭐⭐⭐⭐⭐
+
+#finance/bank1:-3.4USD
+
+[[todo_family|To-Do @Family]]
+[[todo_work|To-Do @Work]]
+
+obsidian-tracker+1@gmail.com
+obsidian-tracker@yahoo.com
+
+weightlifting: 10
+
+#sin:0.00000/0.20791/0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452
+
+#sinsquare:0.00000/0.04323/0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907
+
diff --git a/examples/diary/Lucas-20210101-Journal.md b/examples/diary/Lucas-20210101-Journal.md
new file mode 100644
index 0000000..294ce1a
--- /dev/null
+++ b/examples/diary/Lucas-20210101-Journal.md
@@ -0,0 +1,28 @@
+---
+tags: work_log
+mood: 10
+bloodpressure: 177.4/121.8
+---
+
+#weight:74.0kg
+
+#exercise-pushup:44
+#exercise-plank:37sec
+
+
+⭐⭐⭐⭐⭐
+
+#finance/bank1:-3.4USD
+
+[[todo_family|To-Do @Family]]
+[[todo_work|To-Do @Work]]
+
+obsidian-tracker+1@gmail.com
+obsidian-tracker@yahoo.com
+
+weightlifting: 10
+
+#sin:0.00000/0.20791/0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452
+
+#sinsquare:0.00000/0.04323/0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907
+
diff --git a/examples/diary/Lucas-20210102-Diary.md b/examples/diary/Lucas-20210102-Diary.md
new file mode 100644
index 0000000..f9425bd
--- /dev/null
+++ b/examples/diary/Lucas-20210102-Diary.md
@@ -0,0 +1,28 @@
+---
+tags: 
+mood: 8
+bloodpressure: 174.8/121.6
+---
+
+#weight:68.8kg
+
+#exercise-pushup:38
+#exercise-plank:112sec
+
+
+⭐⭐⭐
+
+#finance/bank1:-2.7USD
+
+[[todo_family|To-Do @Family]]
+[[todo_work|To-Do @Work]]
+
+obsidian-tracker@gmail.com
+obsidian-tracker@yahoo.com
+
+weightlifting: 16
+
+#sin:0.20791/0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452/0.95106
+
+#sinsquare:0.04323/0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451
+
diff --git a/examples/diary/Lucas-20210102-Journal.md b/examples/diary/Lucas-20210102-Journal.md
new file mode 100644
index 0000000..f9425bd
--- /dev/null
+++ b/examples/diary/Lucas-20210102-Journal.md
@@ -0,0 +1,28 @@
+---
+tags: 
+mood: 8
+bloodpressure: 174.8/121.6
+---
+
+#weight:68.8kg
+
+#exercise-pushup:38
+#exercise-plank:112sec
+
+
+⭐⭐⭐
+
+#finance/bank1:-2.7USD
+
+[[todo_family|To-Do @Family]]
+[[todo_work|To-Do @Work]]
+
+obsidian-tracker@gmail.com
+obsidian-tracker@yahoo.com
+
+weightlifting: 16
+
+#sin:0.20791/0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452/0.95106
+
+#sinsquare:0.04323/0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451
+
diff --git a/examples/diary/Lucas-20210103-Diary.md b/examples/diary/Lucas-20210103-Diary.md
new file mode 100644
index 0000000..3a89f50
--- /dev/null
+++ b/examples/diary/Lucas-20210103-Diary.md
@@ -0,0 +1,30 @@
+---
+tags: 
+mood: 7
+bloodpressure: 178.2/119.4
+---
+
+#weight:74.9kg
+
+#exercise-pushup:32
+#exercise-plank:56sec
+
+#meditation
+
+⭐⭐⭐⭐⭐
+
+#finance/bank1:-3.7USD
+
+[[todo_family|To-Do @Family]]
+[[todo_work|To-Do @Work]]
+
+obsidian-tracker@gmail.com
+obsidian-tracker+1@gmail.com
+obsidian-tracker@yahoo.com
+
+weightlifting: 16
+
+#sin:0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452/0.95106/0.86603
+
+#sinsquare:0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000
+
diff --git a/examples/diary/Lucas-20210103-Journal.md b/examples/diary/Lucas-20210103-Journal.md
new file mode 100644
index 0000000..3a89f50
--- /dev/null
+++ b/examples/diary/Lucas-20210103-Journal.md
@@ -0,0 +1,30 @@
+---
+tags: 
+mood: 7
+bloodpressure: 178.2/119.4
+---
+
+#weight:74.9kg
+
+#exercise-pushup:32
+#exercise-plank:56sec
+
+#meditation
+
+⭐⭐⭐⭐⭐
+
+#finance/bank1:-3.7USD
+
+[[todo_family|To-Do @Family]]
+[[todo_work|To-Do @Work]]
+
+obsidian-tracker@gmail.com
+obsidian-tracker+1@gmail.com
+obsidian-tracker@yahoo.com
+
+weightlifting: 16
+
+#sin:0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452/0.95106/0.86603
+
+#sinsquare:0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000
+
diff --git a/examples/diary/Lucas-20210104-Diary.md b/examples/diary/Lucas-20210104-Diary.md
new file mode 100644
index 0000000..6ee80be
--- /dev/null
+++ b/examples/diary/Lucas-20210104-Diary.md
@@ -0,0 +1,27 @@
+---
+tags: work_log
+mood: 3
+bloodpressure: 178.6/119.2
+---
+
+#weight:73.5kg
+
+#exercise-pushup:40
+#exercise-plank:74sec
+
+#meditation
+
+⭐⭐⭐⭐⭐
+
+#finance/bank1:-2.5USD
+
+[[todo_family|To-Do @Family]]
+[[todo_work|To-Do @Work]]
+
+
+weightlifting: 19
+
+#sin:0.58779/0.74314/0.86603/0.95106/0.99452/0.99452/0.95106/0.86603/0.74314
+
+#sinsquare:0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000/0.55226
+
diff --git a/examples/diary/Lucas-20210104-Journal.md b/examples/diary/Lucas-20210104-Journal.md
new file mode 100644
index 0000000..6ee80be
--- /dev/null
+++ b/examples/diary/Lucas-20210104-Journal.md
@@ -0,0 +1,27 @@
+---
+tags: work_log
+mood: 3
+bloodpressure: 178.6/119.2
+---
+
+#weight:73.5kg
+
+#exercise-pushup:40
+#exercise-plank:74sec
+
+#meditation
+
+⭐⭐⭐⭐⭐
+
+#finance/bank1:-2.5USD
+
+[[todo_family|To-Do @Family]]
+[[todo_work|To-Do @Work]]
+
+
+weightlifting: 19
+
+#sin:0.58779/0.74314/0.86603/0.95106/0.99452/0.99452/0.95106/0.86603/0.74314
+
+#sinsquare:0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000/0.55226
+
diff --git a/examples/diary/Lucas-20210105-Diary.md b/examples/diary/Lucas-20210105-Diary.md
new file mode 100644
index 0000000..c836d81
--- /dev/null
+++ b/examples/diary/Lucas-20210105-Diary.md
@@ -0,0 +1,28 @@
+---
+tags: work_log
+mood: 1
+bloodpressure: 177/119
+---
+
+#weight:70.0kg
+
+#exercise-pushup:35
+#exercise-plank:34sec
+
+#meditation
+
+⭐⭐
+
+#finance/bank1:-2.6USD
+
+[[todo_family|To-Do @Family]]
+[[todo_work|To-Do @Work]]
+
+obsidian-tracker@gmail.com
+
+weightlifting: 10
+
+#sin:0.74314/0.86603/0.95106/0.99452/0.99452/0.95106/0.86603/0.74314/0.58779
+
+#sinsquare:0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000/0.55226/0.34549
+
diff --git a/examples/diary/Lucas-20210105-Journal.md b/examples/diary/Lucas-20210105-Journal.md
new file mode 100644
index 0000000..c836d81
--- /dev/null
+++ b/examples/diary/Lucas-20210105-Journal.md
@@ -0,0 +1,28 @@
+---
+tags: work_log
+mood: 1
+bloodpressure: 177/119
+---
+
+#weight:70.0kg
+
+#exercise-pushup:35
+#exercise-plank:34sec
+
+#meditation
+
+⭐⭐
+
+#finance/bank1:-2.6USD
+
+[[todo_family|To-Do @Family]]
+[[todo_work|To-Do @Work]]
+
+obsidian-tracker@gmail.com
+
+weightlifting: 10
+
+#sin:0.74314/0.86603/0.95106/0.99452/0.99452/0.95106/0.86603/0.74314/0.58779
+
+#sinsquare:0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000/0.55226/0.34549
+
diff --git a/src/collecting.ts b/src/collecting.ts
index 9794df1..77eaae2 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -14,24 +14,14 @@ import * as helper from "./helper";
 export function getDateFromFilename(file: TFile, renderInfo: RenderInfo) {
     let fileBaseName = file.basename;
 
-    if (
-        renderInfo.dateFormatPrefix &&
-        fileBaseName.startsWith(renderInfo.dateFormatPrefix)
-    ) {
-        fileBaseName = fileBaseName.slice(renderInfo.dateFormatPrefix.length);
-    }
-    if (
-        renderInfo.dateFormatSuffix &&
-        fileBaseName.endsWith(renderInfo.dateFormatSuffix)
-    ) {
-        fileBaseName = fileBaseName.slice(
-            0,
-            fileBaseName.length - renderInfo.dateFormatSuffix.length
-        );
-    }
-    // console.log(fileBaseName);
-
-    let fileDate = helper.strToDate(fileBaseName, renderInfo.dateFormat);
+    let dateString = helper.getDateStringFromInputString(
+        fileBaseName,
+        renderInfo.dateFormatPrefix,
+        renderInfo.dateFormatSuffix
+    );
+    // console.log(dateString);
+
+    let fileDate = helper.strToDate(dateString, renderInfo.dateFormat);
     // console.log(fileDate);
 
     return fileDate;
@@ -53,6 +43,12 @@ export function getDateFromFrontmatter(
         if (helper.deepValue(frontMatter, query.getTarget())) {
             let strDate = helper.deepValue(frontMatter, query.getTarget());
 
+            strDate = helper.getDateStringFromInputString(
+                strDate,
+                renderInfo.dateFormatPrefix,
+                renderInfo.dateFormatSuffix
+            );
+
             date = helper.strToDate(strDate, renderInfo.dateFormat);
             // console.log(date);
         }
@@ -92,6 +88,13 @@ export function getDateFromTag(
             typeof match.groups.values !== "undefined"
         ) {
             let strDate = match.groups.values;
+
+            strDate = helper.getDateStringFromInputString(
+                strDate,
+                renderInfo.dateFormatPrefix,
+                renderInfo.dateFormatSuffix
+            );
+
             date = helper.strToDate(strDate, renderInfo.dateFormat);
             if (date.isValid()) {
                 break;
@@ -126,6 +129,12 @@ export function getDateFromText(
             let strDate = match.groups.value.trim();
             // console.log(strDate);
 
+            strDate = helper.getDateStringFromInputString(
+                strDate,
+                renderInfo.dateFormatPrefix,
+                renderInfo.dateFormatSuffix
+            );
+
             date = helper.strToDate(strDate, renderInfo.dateFormat);
             if (date.isValid()) {
                 break;
@@ -172,6 +181,13 @@ export function getDateFromDvField(
             typeof match.groups.values !== "undefined"
         ) {
             let strDate = match.groups.values.trim();
+
+            strDate = helper.getDateStringFromInputString(
+                strDate,
+                renderInfo.dateFormatPrefix,
+                renderInfo.dateFormatSuffix
+            );
+
             date = helper.strToDate(strDate, renderInfo.dateFormat);
             if (date.isValid()) {
                 break;
@@ -247,6 +263,12 @@ export function getDateFromTask(
             let strDate = match.groups.value.trim();
             // console.log(strDate);
 
+            strDate = helper.getDateStringFromInputString(
+                strDate,
+                renderInfo.dateFormatPrefix,
+                renderInfo.dateFormatSuffix
+            );
+
             date = helper.strToDate(strDate, renderInfo.dateFormat);
             if (date.isValid()) {
                 break;
diff --git a/src/helper.ts b/src/helper.ts
index 997cae3..8c2c905 100644
--- a/src/helper.ts
+++ b/src/helper.ts
@@ -36,6 +36,42 @@ function makeTimeFormat() {
 }
 const timeFormat = makeTimeFormat();
 
+export function getDateStringFromInputString(
+    inputString: string,
+    dateFormatPrefix: string,
+    dateFormatSuffix: string
+) {
+    if (!dateFormatPrefix && !dateFormatSuffix) return inputString;
+
+    let dateString = inputString;
+    if (dateString.startsWith("^")) {
+        dateString = dateString.slice(1);
+    }
+    // console.log(dateString);
+
+    if (dateFormatPrefix) {
+        let strRegex = "^(" + dateFormatPrefix + ")";
+        // console.log(strRegex);
+        let regex = new RegExp(strRegex, "gm");
+        if (regex.test(dateString)) {
+            dateString = dateString.replace(regex, "");
+        }
+    }
+    // console.log(dateString);
+
+    if (dateFormatSuffix) {
+        let strRegex = "(" + dateFormatSuffix + ")$";
+        // console.log(strRegex);
+        let regex = new RegExp(strRegex, "gm");
+        if (regex.test(dateString)) {
+            dateString = dateString.replace(regex, "");
+        }
+    }
+    // console.log(dateString);
+
+    return dateString;
+}
+
 export function strToDate(strDate: string, dateFormat: string): Moment {
     let format: any = dateFormat;
 
diff --git a/src/parsing.ts b/src/parsing.ts
index fdeb16b..45e724f 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1123,31 +1123,22 @@ export function getRenderInfoFromYaml(
     // startDate, endDate
     // console.log("Parsing startDate");
     if (typeof yaml.startDate === "string") {
-        let strStartDate = yaml.startDate;
-        if (
-            renderInfo.dateFormatPrefix &&
-            strStartDate.startsWith(renderInfo.dateFormatPrefix)
-        ) {
-            strStartDate = strStartDate.slice(
-                renderInfo.dateFormatPrefix.length
-            );
-        }
-        if (
-            renderInfo.dateFormatSuffix &&
-            strStartDate.endsWith(renderInfo.dateFormatSuffix)
-        ) {
-            strStartDate = strStartDate.slice(
-                0,
-                strStartDate.length - renderInfo.dateFormatSuffix.length
-            );
-        }
+        let strStartDate = helper.getDateStringFromInputString(
+            yaml.startDate,
+            renderInfo.dateFormatPrefix,
+            renderInfo.dateFormatSuffix
+        );
+        // console.log(strStartDate);
 
+        // relative date
         let startDate = null;
         let isStartDateValid = false;
         startDate = helper.relDateStringToDate(
             strStartDate,
             renderInfo.dateFormat
         );
+        // console.log(startDate);
+
         if (startDate) {
             isStartDateValid = true;
         } else {
@@ -1156,6 +1147,7 @@ export function getRenderInfoFromYaml(
                 isStartDateValid = true;
             }
         }
+        // console.log(startDate);
 
         if (!isStartDateValid || startDate === null) {
             let errorMessage =
@@ -1168,22 +1160,11 @@ export function getRenderInfoFromYaml(
 
     // console.log("Parsing endDate");
     if (typeof yaml.endDate === "string") {
-        let strEndDate = yaml.endDate;
-        if (
-            renderInfo.dateFormatPrefix &&
-            strEndDate.startsWith(renderInfo.dateFormatPrefix)
-        ) {
-            strEndDate = strEndDate.slice(renderInfo.dateFormatPrefix.length);
-        }
-        if (
-            renderInfo.dateFormatSuffix &&
-            strEndDate.endsWith(renderInfo.dateFormatSuffix)
-        ) {
-            strEndDate = strEndDate.slice(
-                0,
-                strEndDate.length - renderInfo.dateFormatSuffix.length
-            );
-        }
+        let strEndDate = helper.getDateStringFromInputString(
+            yaml.endDate,
+            renderInfo.dateFormatPrefix,
+            renderInfo.dateFormatSuffix
+        );
 
         let endDate = null;
         let isEndDateValid = false;

From 255c3fb404e55360e4b79f1ca8f06001d1bd9e78 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 5 Aug 2021 22:45:14 +0800
Subject: [PATCH 176/402] Add four parameters xAxisTickInterval,
 yAxisTickInterval, xAxisTickLabelFormat, yAxisTickLabelFormat

---
 examples/TestAxisIntervalAndFormat.md | 102 ++++++++
 src/data.ts                           |   8 +
 src/helper.ts                         | 202 +++++++++++++---
 src/parsing.ts                        |  76 +++++-
 src/rendering.ts                      | 321 ++++++++++++++++++--------
 5 files changed, 586 insertions(+), 123 deletions(-)
 create mode 100644 examples/TestAxisIntervalAndFormat.md

diff --git a/examples/TestAxisIntervalAndFormat.md b/examples/TestAxisIntervalAndFormat.md
new file mode 100644
index 0000000..3a8dee1
--- /dev/null
+++ b/examples/TestAxisIntervalAndFormat.md
@@ -0,0 +1,102 @@
+# Test Axis Interval and Tick Label Format
+
+## Y Axis Interval
+
+Numeric Y values
+``` tracker
+searchType: tag
+searchTarget: weight
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-31
+line:
+    title: Weight Log
+    yAxisLabel: Weight
+    yAxisUnit: kg
+    lineColor: yellow
+	yAxisTickInterval: 5
+	yMin: 55
+```
+
+Y values in time
+``` tracker
+searchType: frontmatter
+searchTarget: clock-in, clock-out
+endDate: 2021-01-15
+folder: diary
+datasetName: Clock-In, Clock-Out
+line:
+    title: "Working Hours"
+    yAxisLabel: "Time (24h)"
+	reverseYAxis: true
+    lineColor: yellow, red
+    showPoint: true
+	showLegend: true
+    yAxisTickInterval: 3h
+```
+
+## Y Axis Tick Label Format
+Float numbers with precision of 1 decimal digits
+``` tracker
+searchType: tag
+searchTarget: weight
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-31
+line:
+    title: Weight Log
+    yAxisLabel: Weight
+    yAxisUnit: kg
+    lineColor: yellow
+	yAxisTickInterval: 5
+    yAxisTickLabelFormat: .2f
+	yMin: 55
+```
+
+Y values in time
+``` tracker
+searchType: frontmatter
+searchTarget: clock-in, clock-out
+endDate: 2021-01-15
+folder: diary
+datasetName: Clock-In, Clock-Out
+line:
+    title: "Working Hours"
+    yAxisLabel: "Time (24h)"
+	reverseYAxis: true
+    lineColor: yellow, red
+    showPoint: true
+    yAxisTickInterval: 3h
+	yAxisTickLabelFormat: .1f
+```
+
+## X Axis Interval
+``` tracker
+searchType: tag
+searchTarget: weight
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-31
+line:
+    title: Weight Log
+    yAxisLabel: Weight
+    yAxisUnit: kg
+    lineColor: yellow
+    xAxisTickInterval: 1w
+```
+
+## X Axis Tick Label Format
+``` tracker
+searchType: tag
+searchTarget: weight
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-31
+line:
+    title: Weight Log
+    yAxisLabel: Weight
+    yAxisUnit: kg
+    lineColor: yellow
+    xAxisTickInterval: 7d
+	xAxisTickLabelFormat: M-DD
+```
\ No newline at end of file
diff --git a/src/data.ts b/src/data.ts
index 8bb1bb8..6c1827f 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -649,6 +649,10 @@ export class CommonChartInfo implements IGraph, ILegend {
     yAxisColor: string[];
     yAxisLabelColor: string[];
     yAxisUnit: string[];
+    xAxisTickInterval: string;
+    yAxisTickInterval: string[];
+    xAxisTickLabelFormat: string;
+    yAxisTickLabelFormat: string[];
     yMin: number[];
     yMax: number[];
     reverseYAxis: boolean[];
@@ -670,6 +674,10 @@ export class CommonChartInfo implements IGraph, ILegend {
         this.yAxisColor = []; // "", 2 elements
         this.yAxisLabelColor = []; // "", 2 elements
         this.yAxisUnit = []; // "", 2 elements
+        this.xAxisTickInterval = null; // the string will be converted to Duration (a month is not nesscesary to 30 days)
+        this.yAxisTickInterval = []; // null, 2 elements
+        this.xAxisTickLabelFormat = null;
+        this.yAxisTickLabelFormat = []; // null, 2 elements
         this.yMin = []; // null, 2 elements
         this.yMax = []; // null, 2 elements
         this.reverseYAxis = []; // false, 2 elements
diff --git a/src/helper.ts b/src/helper.ts
index 8c2c905..9eb9077 100644
--- a/src/helper.ts
+++ b/src/helper.ts
@@ -2,7 +2,7 @@ import { RenderInfo, Size, Transform } from "./data";
 import { TFile, TFolder, normalizePath } from "obsidian";
 import { ValueType } from "./data";
 import * as d3 from "d3";
-import { Moment } from "moment";
+import { Moment, Duration } from "moment";
 
 // date and time
 function makeTimeFormat() {
@@ -95,39 +95,187 @@ export function strToDate(strDate: string, dateFormat: string): Moment {
     return date;
 }
 
-export function relDateStringToDate(
+function extractValueFromDurationString(
+    strDuration: string,
+    units: Array<string>,
+    removePattern: boolean = true
+): [number, string] {
+    if (!strDuration || !units || units.length === 0) {
+        return [null, strDuration];
+    }
+
+    let value = null;
+    const strRegex = "(?<value>[0-9]+)(" + units.join("|") + ")";
+    // console.log(strRegex);
+    const regex = new RegExp(strRegex, "gm");
+    let match = regex.exec(strDuration);
+    if (
+        match &&
+        typeof match.groups !== "undefined" &&
+        typeof match.groups.value !== "undefined"
+    ) {
+        // console.log(match);
+        value = parseFloat(match.groups.value);
+        if (Number.isNumber(value) && !Number.isNaN(value)) {
+            if (removePattern) {
+                strDuration = strDuration.replace(regex, "");
+            }
+            // console.log(value);
+            // console.log(strDuration);
+            return [value, strDuration];
+        }
+    }
+
+    return [null, strDuration];
+}
+
+export function parseDurationString(strDuration: string) {
+    //duration string format:
+    //year (years, y, Y),
+    //month (months, M), // m will conflict with minute!!!
+    //week (weeks, w, W),
+    //day (days, d, D),
+    //hour (hours, h, H),
+    //minute (minutes, m), // M will conflict with month!!!
+    //second (seconds, s, S)
+    if (!strDuration) return null;
+
+    let duration: Duration = window.moment.duration(0);
+    let hasValue = false;
+
+    let negativeValue = false;
+    if (strDuration.startsWith("+")) {
+        negativeValue = false;
+        strDuration = strDuration.substring(1);
+    }
+    if (strDuration.startsWith("-")) {
+        negativeValue = true;
+        strDuration = strDuration.substring(1);
+    }
+
+    let yearValue = null;
+    [yearValue, strDuration] = extractValueFromDurationString(strDuration, [
+        "year",
+        "years",
+        "Y",
+        "y",
+    ]);
+    if (yearValue !== null) {
+        if (negativeValue) {
+            yearValue *= -1;
+        }
+        duration.add(yearValue, "years");
+        hasValue = true;
+    }
+
+    let monthValue = null;
+    [monthValue, strDuration] = extractValueFromDurationString(strDuration, [
+        "month",
+        "months",
+        "M",
+    ]);
+    if (monthValue !== null) {
+        if (negativeValue) {
+            monthValue *= -1;
+        }
+        duration.add(monthValue, "months");
+        hasValue = true;
+    }
+
+    let weekValue = null;
+    [weekValue, strDuration] = extractValueFromDurationString(strDuration, [
+        "week",
+        "weeks",
+        "W",
+        "w",
+    ]);
+    if (weekValue !== null) {
+        if (negativeValue) {
+            weekValue *= -1;
+        }
+        duration.add(weekValue, "weeks");
+        hasValue = true;
+    }
+
+    let dayValue = null;
+    [dayValue, strDuration] = extractValueFromDurationString(strDuration, [
+        "day",
+        "days",
+        "D",
+        "d",
+    ]);
+    if (dayValue !== null) {
+        if (negativeValue) {
+            dayValue *= -1;
+        }
+        duration.add(dayValue, "days");
+        hasValue = true;
+    }
+
+    let hourValue = null;
+    [hourValue, strDuration] = extractValueFromDurationString(strDuration, [
+        "hour",
+        "hours",
+        "H",
+        "h",
+    ]);
+    if (hourValue !== null) {
+        if (negativeValue) {
+            hourValue *= -1;
+        }
+        duration.add(hourValue, "hours");
+        hasValue = true;
+    }
+
+    let minuteValue = null;
+    [minuteValue, strDuration] = extractValueFromDurationString(strDuration, [
+        "minute",
+        "minutes",
+        "m",
+    ]);
+    if (minuteValue !== null) {
+        if (negativeValue) {
+            minuteValue *= -1;
+        }
+        duration.add(minuteValue, "minutes");
+        hasValue = true;
+    }
+
+    let secondValue = null;
+    [secondValue, strDuration] = extractValueFromDurationString(strDuration, [
+        "second",
+        "seconds",
+        "S",
+        "s",
+    ]);
+    if (secondValue !== null) {
+        if (negativeValue) {
+            secondValue *= -1;
+        }
+        duration.add(secondValue, "seconds");
+        hasValue = true;
+    }
+
+    if (!hasValue) return null;
+    return duration;
+}
+
+export function getDateByDurationToToday(
     relDateString: string,
     dateFormat: string
 ): Moment {
     let date = null;
-    const relDateRegex = /^(?<value>[\-\+]?[0-9]+)(?<unit>[dwmy])$/;
-    if (relDateRegex.test(relDateString)) {
-        let match = relDateRegex.exec(relDateString);
-        if (
-            typeof match.groups !== "undefined" &&
-            typeof match.groups.value !== "undefined" &&
-            typeof match.groups.unit !== "undefined"
-        ) {
-            let value = parseFloat(match.groups.value);
-            let unit = match.groups.unit;
-            date = getDateToday(dateFormat);
-            if (unit === "d") {
-                date = date.add(value, "days");
-            } else if (unit === "w") {
-                date = date.add(value, "weeks");
-            } else if (unit === "m") {
-                date = date.add(value, "months");
-            } else if (unit === "y") {
-                date = date.add(value, "years");
-            }
-        }
-    }
+    let duration = parseDurationString(relDateString);
+    if (duration && window.moment.isDuration(duration)) {
+        date = getDateToday(dateFormat);
+        date = date.add(duration);
 
-    if (date && date.isValid()) {
-        return date;
+        if (date && date.isValid()) {
+            return date;
+        }
     }
 
-    return null;
+    return date;
 }
 
 export function dateToStr(date: Moment, dateFormat: string): string {
diff --git a/src/parsing.ts b/src/parsing.ts
index 45e724f..481a8af 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -496,6 +496,25 @@ function getStringArrayFromInput(
                 }
             }
         }
+    } else if (typeof input === "number") {
+        let strNumber = input.toString();
+        if (validator) {
+            if (validator(strNumber)) {
+                array[0] = strNumber;
+                numValidValue++;
+                for (let ind = 1; ind < array.length; ind++) {
+                    array[ind] = strNumber;
+                }
+            } else {
+                errorMessage = "Invalid inputs for " + name;
+            }
+        } else {
+            array[0] = strNumber;
+            numValidValue++;
+            for (let ind = 1; ind < array.length; ind++) {
+                array[ind] = strNumber;
+            }
+        }
     } else {
         errorMessage = "Invalid inputs for " + name;
     }
@@ -745,6 +764,56 @@ function parseCommonChartInfo(yaml: any, renderInfo: CommonChartInfo) {
     renderInfo.yAxisUnit = retYAxisUnit;
     // console.log(renderInfo.yAxisUnit);
 
+    // xAxisTickInterval
+    if (typeof yaml.xAxisTickInterval === "string") {
+        renderInfo.xAxisTickInterval = yaml.xAxisTickInterval;
+    } else if (typeof yaml.xAxisTickInterval === "number") {
+        renderInfo.xAxisTickInterval = yaml.xAxisTickInterval.toString();
+    }
+    // console.log(renderInfo.xAxisTickInterval);
+
+    // yAxisTickInterval
+    let retYAxisTickInterval = getStringArrayFromInput(
+        "yAxisTickInterval",
+        yaml.yAxisTickInterval,
+        2,
+        null,
+        null,
+        true
+    );
+    if (typeof retYAxisTickInterval === "string") {
+        return retYAxisTickInterval; // errorMessage
+    }
+    if (retYAxisTickInterval.length > 2) {
+        return "yAxisTickInterval accepts not more than two values for left and right y-axes";
+    }
+    renderInfo.yAxisTickInterval = retYAxisTickInterval;
+    // console.log(renderInfo.yAxisTickInterval);
+
+    // xAxisTickLabelFormat
+    if (typeof yaml.xAxisTickLabelFormat === "string") {
+        renderInfo.xAxisTickLabelFormat = yaml.xAxisTickLabelFormat;
+    }
+    // console.log(renderInfo.xAxisTickLabelFormat);
+
+    // yAxisTickLabelFormat
+    let retYAxisTickLabelFormat = getStringArrayFromInput(
+        "yAxisTickLabelFormat",
+        yaml.yAxisTickLabelFormat,
+        2,
+        null,
+        null,
+        true
+    );
+    if (typeof retYAxisTickLabelFormat === "string") {
+        return retYAxisTickLabelFormat; // errorMessage
+    }
+    if (retYAxisTickLabelFormat.length > 2) {
+        return "yAxisTickLabelFormat accepts not more than two values for left and right y-axes";
+    }
+    renderInfo.yAxisTickLabelFormat = retYAxisTickLabelFormat;
+    // console.log(renderInfo.yAxisTickLabelFormat);
+
     // yMin
     let retYMin = getNumberArrayFromInput("yMin", yaml?.yMin, 2, null, true);
     if (typeof retYMin === "string") {
@@ -1133,7 +1202,7 @@ export function getRenderInfoFromYaml(
         // relative date
         let startDate = null;
         let isStartDateValid = false;
-        startDate = helper.relDateStringToDate(
+        startDate = helper.getDateByDurationToToday(
             strStartDate,
             renderInfo.dateFormat
         );
@@ -1168,7 +1237,10 @@ export function getRenderInfoFromYaml(
 
         let endDate = null;
         let isEndDateValid = false;
-        endDate = helper.relDateStringToDate(strEndDate, renderInfo.dateFormat);
+        endDate = helper.getDateByDurationToToday(
+            strEndDate,
+            renderInfo.dateFormat
+        );
         if (endDate) {
             isEndDateValid = true;
         } else {
diff --git a/src/rendering.ts b/src/rendering.ts
index 8b7a6b0..46d33d6 100644
--- a/src/rendering.ts
+++ b/src/rendering.ts
@@ -1,5 +1,5 @@
 import * as d3 from "d3";
-import { Moment } from "moment";
+import { Moment, Duration } from "moment";
 import {
     Datasets,
     DataPoint,
@@ -25,107 +25,186 @@ import * as month from "./month";
 import * as heatmap from "./heatmap";
 import * as bullet from "./bullet";
 import * as helper from "./helper";
-
-function getXTickInterval(datasets: Datasets) {
-    let tickInterval;
-    let days = datasets.getDates().length;
-
-    if (days <= 15) {
-        // number of ticks: 0-15
-        tickInterval = d3.timeDay;
-    } else if (days <= 4 * 15) {
-        // number of ticks: 4-15
-        tickInterval = d3.timeDay.every(4);
-    } else if (days <= 7 * 15) {
-        // number of ticks: 8-15
-        tickInterval = d3.timeWeek;
-    } else if (days <= 15 * 30) {
-        // number of ticks: 4-15
-        tickInterval = d3.timeMonth;
-    } else if (days <= 15 * 60) {
-        // number of ticks: 8-15
-        tickInterval = d3.timeMonth.every(2);
+import { sprintf } from "sprintf-js";
+
+function getXTickValues(
+    dates: Moment[],
+    interval: Duration
+): [Array<Date>, d3.TimeInterval] {
+    // The input interval could be null,
+    // generate tick values even if interval is null
+
+    // console.log(interval);
+
+    let tickValues: Array<Date> = [];
+    let tickInterval = null;
+
+    // y values are time values
+    if (interval) {
+        let firstDate = dates[0];
+        let lastDate = dates[dates.length - 1];
+        tickValues = d3.timeDay.range(
+            firstDate.toDate(),
+            lastDate.toDate(),
+            interval.asDays()
+        );
     } else {
-        tickInterval = d3.timeYear;
+        let days = dates.length;
+        if (days <= 15) {
+            // number of ticks: 0-15
+            tickInterval = d3.timeDay;
+        } else if (days <= 4 * 15) {
+            // number of ticks: 4-15
+            tickInterval = d3.timeDay.every(4);
+        } else if (days <= 7 * 15) {
+            // number of ticks: 8-15
+            tickInterval = d3.timeWeek;
+        } else if (days <= 15 * 30) {
+            // number of ticks: 4-15
+            tickInterval = d3.timeMonth;
+        } else if (days <= 15 * 60) {
+            // number of ticks: 8-15
+            tickInterval = d3.timeMonth.every(2);
+        } else {
+            tickInterval = d3.timeYear;
+        }
     }
 
-    return tickInterval;
+    return [tickValues, tickInterval];
 }
 
-function getXTickFormat(datasets: Datasets) {
-    let tickFormat;
-    let days = datasets.getDates().length;
-
-    if (days <= 15) {
-        // number of ticks: 0-15
-        tickFormat = d3.timeFormat("%y-%m-%d");
-    } else if (days <= 4 * 15) {
-        // number of ticks: 4-15
-        tickFormat = d3.timeFormat("%y-%m-%d");
-    } else if (days <= 7 * 15) {
-        // number of ticks: 8-15
-        tickFormat = d3.timeFormat("%y-%m-%d");
-    } else if (days <= 15 * 30) {
-        // number of ticks: 4-15
-        tickFormat = d3.timeFormat("%y %b");
-    } else if (days <= 15 * 60) {
-        // number of ticks: 8-15
-        tickFormat = d3.timeFormat("%y %b");
+function getXTickLabelFormat(dates: Moment[], inTickLabelFormat: string) {
+    if (inTickLabelFormat) {
+        function fnTickLabelFormat(date: Date): string {
+            return helper.dateToStr(window.moment(date), inTickLabelFormat);
+        }
+        return fnTickLabelFormat;
     } else {
-        tickFormat = d3.timeFormat("%Y");
-    }
+        let tickLabelFormat = null;
+        let days = dates.length;
+
+        if (days <= 15) {
+            // number of ticks: 0-15
+            tickLabelFormat = d3.timeFormat("%y-%m-%d");
+        } else if (days <= 4 * 15) {
+            // number of ticks: 4-15
+            tickLabelFormat = d3.timeFormat("%y-%m-%d");
+        } else if (days <= 7 * 15) {
+            // number of ticks: 8-15
+            tickLabelFormat = d3.timeFormat("%y-%m-%d");
+        } else if (days <= 15 * 30) {
+            // number of ticks: 4-15
+            tickLabelFormat = d3.timeFormat("%y %b");
+        } else if (days <= 15 * 60) {
+            // number of ticks: 8-15
+            tickLabelFormat = d3.timeFormat("%y %b");
+        } else {
+            tickLabelFormat = d3.timeFormat("%Y");
+        }
 
-    return tickFormat;
+        return tickLabelFormat;
+    }
 }
 
-function getYTickValues(yLower: number, yUpper: number) {
-    // currently used for time value tick only, value in seconds
+function getYTickValues(
+    yLower: number,
+    yUpper: number,
+    interval: number | Duration,
+    isTimeValue = false
+) {
+    // The input interval could be null,
+    // generate tick values for time values even if interval is null
+
+    // console.log(interval);
+    // console.log(isTimeValue);
+
     const absExtent = Math.abs(yUpper - yLower);
-    let tickValues = [];
-    if (absExtent > 5 * 60 * 60) {
-        // extent over than 5 hours
-        // tick on the hour
-        yLower = Math.floor(yLower / 3600) * 3600;
-        yUpper = Math.ceil(yUpper / 3600) * 3600;
-
-        tickValues = d3.range(yLower, yUpper, 3600);
+    let tickValues: Array<number> = [];
+
+    if (!isTimeValue) {
+        // y values are numbers
+        if (interval && typeof interval === "number") {
+            // !==null && !== 0
+            tickValues = d3.range(yLower, yUpper, interval);
+        }
     } else {
-        // tick on the half hour
-        yLower = Math.floor(yLower / 1800) * 1800;
-        yUpper = Math.ceil(yUpper / 1800) * 1800;
+        // y values are time values
+        if (interval && window.moment.isDuration(interval)) {
+            let intervalInSeconds = Math.abs(interval.asSeconds());
+            tickValues = d3.range(yLower, yUpper, intervalInSeconds);
+        } else {
+            // auto interval for time values
+            if (absExtent > 5 * 60 * 60) {
+                // extent over than 5 hours
+                // tick on the hour
+                yLower = Math.floor(yLower / 3600) * 3600;
+                yUpper = Math.ceil(yUpper / 3600) * 3600;
+
+                tickValues = d3.range(yLower, yUpper, 3600);
+            } else {
+                // tick on the half hour
+                yLower = Math.floor(yLower / 1800) * 1800;
+                yUpper = Math.ceil(yUpper / 1800) * 1800;
 
-        tickValues = d3.range(yLower, yUpper, 1800);
+                tickValues = d3.range(yLower, yUpper, 1800);
+            }
+        }
     }
 
+    if (tickValues.length === 0) return null;
     return tickValues;
 }
 
-function getYTickFormat(yLower: number, yUpper: number, skip: boolean = true) {
-    // currently used for time value tick only
+function getYTickLabelFormat(
+    yLower: number,
+    yUpper: number,
+    inTickLabelFormat: string,
+    isTimeValue = false
+) {
     // return a function convert value to time string
-    function tickFormat(value: number): string {
-        const absExtent = Math.abs(yUpper - yLower);
-        let dayStart = window.moment("00:00", "HH:mm", true);
-        let tickTime = dayStart.add(value, "seconds");
-        let format = tickTime.format("HH:mm");
-        if (skip && absExtent > 12 * 60 * 60) {
-            let devHour = (value - yLower) / 3600;
-            let interleave = devHour % 2;
-            if (value <= yLower) {
-                format = "";
-            } else if (value >= yUpper) {
-                format = "";
-            } else if (interleave > 1.0) {
-                format = tickTime.format("HH:mm");
-            } else {
-                format = "";
+
+    if (!isTimeValue) {
+        if (inTickLabelFormat) {
+            function tickFormat(value: number): string {
+                let strValue = sprintf("%" + inTickLabelFormat, value);
+                return strValue;
             }
+
+            return tickFormat;
         }
+        return null;
+    } else {
+        if (inTickLabelFormat) {
+            // null, let d3js decide what to do
+        } else {
+            let skip = true;
+            function tickFormat(value: number): string {
+                const absExtent = Math.abs(yUpper - yLower);
+                let dayStart = window.moment("00:00", "HH:mm", true);
+                let tickTime = dayStart.add(value, "seconds");
+                let format = tickTime.format("HH:mm");
+                if (skip && absExtent > 12 * 60 * 60) {
+                    let devHour = (value - yLower) / 3600;
+                    let interleave = devHour % 2;
+                    if (value <= yLower) {
+                        format = "";
+                    } else if (value >= yUpper) {
+                        format = "";
+                    } else if (interleave > 1.0) {
+                        format = tickTime.format("HH:mm");
+                    } else {
+                        format = "";
+                    }
+                }
+
+                return format;
+            }
 
-        return format;
+            return tickFormat;
+        }
     }
 
-    return tickFormat;
+    return null;
 }
 
 export function render(canvas: HTMLElement, renderInfo: RenderInfo) {
@@ -210,13 +289,30 @@ function renderXAxis(
         .range([0, renderInfo.dataAreaSize.width]);
     chartElements["xScale"] = xScale;
 
-    let tickInterval = getXTickInterval(datasets);
-    let tickFormat = getXTickFormat(datasets);
+    let tickIntervalInDuration = helper.parseDurationString(
+        chartInfo.xAxisTickInterval
+    );
+
+    let [tickValues, tickInterval] = getXTickValues(
+        datasets.getDates(),
+        tickIntervalInDuration
+    );
+    let tickFormat = getXTickLabelFormat(
+        datasets.getDates(),
+        chartInfo.xAxisTickLabelFormat
+    );
+
+    let xAxisGen = d3.axisBottom(xScale);
+
+    if (tickValues && tickValues.length !== 0) {
+        xAxisGen.tickValues(tickValues);
+    } else if (tickInterval) {
+        xAxisGen.ticks(tickInterval);
+    }
+    if (tickFormat) {
+        xAxisGen.tickFormat(tickFormat);
+    }
 
-    let xAxisGen = d3
-        .axisBottom(xScale)
-        .ticks(tickInterval)
-        .tickFormat(tickFormat);
     let xAxis = chartElements.dataArea // axis includes ticks
         .append("g")
         .attr("id", "xAxis")
@@ -413,10 +509,26 @@ function renderYAxis(
     }
 
     let yAxisUnitText = "";
+    let yAxisTickInterval = null;
+    let yAxisTickLabelFormat = null;
     if (yAxisLocation === "left") {
         yAxisUnitText = chartInfo.yAxisUnit[0];
+        yAxisTickInterval = chartInfo.yAxisTickInterval[0]; // string
+        yAxisTickLabelFormat = chartInfo.yAxisTickLabelFormat[0];
     } else if (yAxisLocation === "right") {
         yAxisUnitText = chartInfo.yAxisUnit[1];
+        yAxisTickInterval = chartInfo.yAxisTickInterval[1]; // string
+        yAxisTickLabelFormat = chartInfo.yAxisTickLabelFormat[1];
+    }
+    // get interval from string
+    let tickInterval = null;
+    if (valueIsTime) {
+        tickInterval = helper.parseDurationString(yAxisTickInterval);
+    } else {
+        tickInterval = parseFloat(yAxisTickInterval);
+        if (!Number.isNumber(tickInterval) || Number.isNaN(tickInterval)) {
+            tickInterval = null;
+        }
     }
 
     let yAxisGen;
@@ -425,10 +537,25 @@ function renderYAxis(
     } else if (yAxisLocation === "right") {
         yAxisGen = d3.axisRight(yScale);
     }
-    if (yAxisGen && valueIsTime) {
-        let tickFormat = getYTickFormat(yLower, yUpper);
-        let tickValues = getYTickValues(yLower, yUpper);
-        yAxisGen.tickValues(tickValues).tickFormat(tickFormat);
+    if (yAxisGen) {
+        let tickLabelFormat = getYTickLabelFormat(
+            yLower,
+            yUpper,
+            yAxisTickLabelFormat,
+            valueIsTime
+        );
+        if (tickLabelFormat) {
+            yAxisGen.tickFormat(tickLabelFormat);
+        }
+        let tickValues = getYTickValues(
+            yLower,
+            yUpper,
+            tickInterval,
+            valueIsTime
+        );
+        if (tickValues) {
+            yAxisGen.tickValues(tickValues);
+        }
     }
 
     let yAxis = chartElements.dataArea
@@ -466,16 +593,22 @@ function renderYAxis(
     }
 
     // Get max tick label width
-    let yTickFormat = d3.tickFormat(yLower, yUpper, 10);
-    if (valueIsTime) {
-        yTickFormat = getYTickFormat(yLower, yUpper, false);
+    let yTickLabelFormat = getYTickLabelFormat(
+        yLower,
+        yUpper,
+        yAxisTickLabelFormat,
+        valueIsTime
+    );
+    if (!yTickLabelFormat) {
+        yTickLabelFormat = d3.tickFormat(yLower, yUpper, 10);
     }
+
     let yLowerLabelSize = helper.measureTextSize(
-        yTickFormat(yLower),
+        yTickLabelFormat(yLower),
         "tracker-axis-label"
     );
     let yUpperLabelSize = helper.measureTextSize(
-        yTickFormat(yUpper),
+        yTickLabelFormat(yUpper),
         "tracker-axis-label"
     );
     let maxTickLabelWidth = Math.max(

From d34fb7813f7ea2e93a39dac5544b6c21ba24a4a2 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 6 Aug 2021 10:44:23 +0800
Subject: [PATCH 177/402] Fix yAxisTickLabelFormat for time values

---
 examples/TestAxisIntervalAndFormat.md | 11 +++++---
 src/rendering.ts                      | 37 +++++++++++++++------------
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/examples/TestAxisIntervalAndFormat.md b/examples/TestAxisIntervalAndFormat.md
index 3a8dee1..b3a8733 100644
--- a/examples/TestAxisIntervalAndFormat.md
+++ b/examples/TestAxisIntervalAndFormat.md
@@ -31,8 +31,9 @@ line:
 	reverseYAxis: true
     lineColor: yellow, red
     showPoint: true
-	showLegend: true
-    yAxisTickInterval: 3h
+    yAxisTickInterval: 1h
+	yMin: 06:00
+	yMax: 23:00
 ```
 
 ## Y Axis Tick Label Format
@@ -66,8 +67,10 @@ line:
 	reverseYAxis: true
     lineColor: yellow, red
     showPoint: true
-    yAxisTickInterval: 3h
-	yAxisTickLabelFormat: .1f
+    yMin: 05:00
+    yMax: 22:00
+    yAxisTickInterval: 50m
+    yAxisTickLabelFormat: H---m
 ```
 
 ## X Axis Interval
diff --git a/src/rendering.ts b/src/rendering.ts
index 46d33d6..75cef80 100644
--- a/src/rendering.ts
+++ b/src/rendering.ts
@@ -172,27 +172,35 @@ function getYTickLabelFormat(
 
             return tickFormat;
         }
-        return null;
+        return d3.tickFormat(yLower, yUpper, 10);
     } else {
+        // values in seconds
         if (inTickLabelFormat) {
-            // null, let d3js decide what to do
+            function fnTickLabelFormat(value: number): string {
+                let dayStart = window.moment("00:00", "HH:mm", true);
+                let tickTime = dayStart.add(value, "seconds");
+                let format = tickTime.format(inTickLabelFormat);
+
+                let devHour = (value - yLower) / 3600;
+                let interleave = devHour % 2;
+
+                return format;
+            }
+            return fnTickLabelFormat;
         } else {
-            let skip = true;
-            function tickFormat(value: number): string {
+            function fnTickLabelFormat(value: number): string {
                 const absExtent = Math.abs(yUpper - yLower);
                 let dayStart = window.moment("00:00", "HH:mm", true);
                 let tickTime = dayStart.add(value, "seconds");
                 let format = tickTime.format("HH:mm");
-                if (skip && absExtent > 12 * 60 * 60) {
+                // console.log(`yLower/yUpper: ${yLower}/${yUpper}`)
+                // console.log(`value/extent/inter:${value}/${absExtent}/${(value-yLower)/3600}`);
+
+                // auto interleave if extent over 12 hours
+                if (absExtent > 12 * 60 * 60) {
                     let devHour = (value - yLower) / 3600;
                     let interleave = devHour % 2;
-                    if (value <= yLower) {
-                        format = "";
-                    } else if (value >= yUpper) {
-                        format = "";
-                    } else if (interleave > 1.0) {
-                        format = tickTime.format("HH:mm");
-                    } else {
+                    if (value < yLower || value > yUpper || interleave < 1.0) {
                         format = "";
                     }
                 }
@@ -200,7 +208,7 @@ function getYTickLabelFormat(
                 return format;
             }
 
-            return tickFormat;
+            return fnTickLabelFormat;
         }
     }
 
@@ -599,9 +607,6 @@ function renderYAxis(
         yAxisTickLabelFormat,
         valueIsTime
     );
-    if (!yTickLabelFormat) {
-        yTickLabelFormat = d3.tickFormat(yLower, yUpper, 10);
-    }
 
     let yLowerLabelSize = helper.measureTextSize(
         yTickLabelFormat(yLower),

From 444e6f3ed0e2ba66f6ecf3b385eff23762d4dcad Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 7 Aug 2021 14:51:52 +0800
Subject: [PATCH 178/402] Add a parameter textValueMap

---
 .../{MoodTracker.md => TestTextValueMap.md}   | 14 +++-
 examples/diary/2021-01-01.md                  |  2 +-
 examples/diary/2021-01-02.md                  |  2 +-
 examples/diary/2021-01-03.md                  |  2 +-
 examples/diary/2021-01-04.md                  |  2 +-
 examples/diary/2021-01-05.md                  |  2 +-
 examples/diary/2021-01-06.md                  |  2 +-
 examples/diary/2021-01-07.md                  |  2 +-
 examples/diary/2021-01-08.md                  |  2 +-
 examples/diary/2021-01-09.md                  |  2 +-
 examples/diary/2021-01-10.md                  |  2 +-
 examples/diary/2021-01-11.md                  |  2 +-
 examples/diary/2021-01-12.md                  |  2 +-
 examples/diary/2021-01-13.md                  |  2 +-
 examples/diary/2021-01-14.md                  |  2 +-
 examples/diary/2021-01-15.md                  |  2 +-
 examples/diary/2021-01-16.md                  |  2 +-
 examples/diary/2021-01-17.md                  |  2 +-
 examples/diary/2021-01-18.md                  |  2 +-
 examples/diary/2021-01-19.md                  |  2 +-
 examples/diary/2021-01-20.md                  |  2 +-
 examples/diary/2021-01-21.md                  |  2 +-
 examples/diary/2021-01-22.md                  |  2 +-
 examples/diary/2021-01-23.md                  |  2 +-
 examples/diary/2021-01-24.md                  |  2 +-
 examples/diary/2021-01-25.md                  |  2 +-
 examples/diary/2021-01-26.md                  |  2 +-
 examples/diary/2021-01-27.md                  |  2 +-
 examples/diary/2021-01-28.md                  |  2 +-
 examples/diary/2021-01-29.md                  |  2 +-
 examples/diary/2021-01-30.md                  |  2 +-
 examples/diary/2021-01-31.md                  |  2 +-
 examples/example_generator.ts                 |  5 +-
 src/collecting.ts                             | 71 +++++++++++++------
 src/data.ts                                   |  6 ++
 src/helper.ts                                 | 19 ++++-
 src/parsing.ts                                | 11 +++
 37 files changed, 129 insertions(+), 59 deletions(-)
 rename examples/{MoodTracker.md => TestTextValueMap.md} (51%)

diff --git a/examples/MoodTracker.md b/examples/TestTextValueMap.md
similarity index 51%
rename from examples/MoodTracker.md
rename to examples/TestTextValueMap.md
index 48c83c8..fe2118f 100644
--- a/examples/MoodTracker.md
+++ b/examples/TestTextValueMap.md
@@ -1,14 +1,22 @@
-# Mood Tracker
+# Test textValueMap
 
+## Mood
 ``` tracker
 searchType: frontmatter
 searchTarget: "mood"
 folder: diary
 endDate: 2021-01-31
+textValueMap:
+    😀: 5
+    🙂: 4
+    😐: 3
+    🙁: 2
+    😞: 1
 line:
     title: "Mood"
     yAxisLabel: Mood
     lineColor: "#d65d0e"
+	yAxisTickInterval: 1
+	yAxisTickLabelFormat: i
+	yMin: 0
 ```
-
-Please also check those search targets in markdown files under folder 'diary'.
\ No newline at end of file
diff --git a/examples/diary/2021-01-01.md b/examples/diary/2021-01-01.md
index 35a7e5e..b476f3e 100644
--- a/examples/diary/2021-01-01.md
+++ b/examples/diary/2021-01-01.md
@@ -1,6 +1,6 @@
 ---
 tags: work_log
-mood: 8
+mood: 🙁
 bloodpressure: 184.4/118.8
 bloodpressure1: 184.4, 118.8
 bloodpressure2: [184.4, 118.8]
diff --git a/examples/diary/2021-01-02.md b/examples/diary/2021-01-02.md
index 57200a3..d0fd77d 100644
--- a/examples/diary/2021-01-02.md
+++ b/examples/diary/2021-01-02.md
@@ -1,6 +1,6 @@
 ---
 tags: 
-mood: 7
+mood: 🙁
 bloodpressure: 180.8/120.6
 bloodpressure1: 180.8, 120.6
 bloodpressure2: [180.8, 120.6]
diff --git a/examples/diary/2021-01-03.md b/examples/diary/2021-01-03.md
index 3b59717..40eb66b 100644
--- a/examples/diary/2021-01-03.md
+++ b/examples/diary/2021-01-03.md
@@ -1,6 +1,6 @@
 ---
 tags: 
-mood: 7
+mood: 🙁
 bloodpressure: 180.2/118.4
 bloodpressure1: 180.2, 118.4
 bloodpressure2: [180.2, 118.4]
diff --git a/examples/diary/2021-01-04.md b/examples/diary/2021-01-04.md
index f846803..f134f1b 100644
--- a/examples/diary/2021-01-04.md
+++ b/examples/diary/2021-01-04.md
@@ -1,6 +1,6 @@
 ---
 tags: work_log
-mood: 3
+mood: 🙂
 bloodpressure: 176.6/121.2
 bloodpressure1: 176.6, 121.2
 bloodpressure2: [176.6, 121.2]
diff --git a/examples/diary/2021-01-05.md b/examples/diary/2021-01-05.md
index 6878a3c..1b08f7c 100644
--- a/examples/diary/2021-01-05.md
+++ b/examples/diary/2021-01-05.md
@@ -1,6 +1,6 @@
 ---
 tags: work_log
-mood: 2
+mood: 😀
 bloodpressure: 180/118
 bloodpressure1: 180, 118
 bloodpressure2: [180, 118]
diff --git a/examples/diary/2021-01-06.md b/examples/diary/2021-01-06.md
index f5dfd71..5d7d791 100644
--- a/examples/diary/2021-01-06.md
+++ b/examples/diary/2021-01-06.md
@@ -1,6 +1,6 @@
 ---
 tags: work_log
-mood: 8
+mood: 🙁
 bloodpressure: 171.4/118.8
 bloodpressure1: 171.4, 118.8
 bloodpressure2: [171.4, 118.8]
diff --git a/examples/diary/2021-01-07.md b/examples/diary/2021-01-07.md
index f3981f0..edf1242 100644
--- a/examples/diary/2021-01-07.md
+++ b/examples/diary/2021-01-07.md
@@ -1,6 +1,6 @@
 ---
 tags: work_log
-mood: 1
+mood: 😀
 bloodpressure: 175.8/120.6
 bloodpressure1: 175.8, 120.6
 bloodpressure2: [175.8, 120.6]
diff --git a/examples/diary/2021-01-08.md b/examples/diary/2021-01-08.md
index 8febc8c..dd0ec4d 100644
--- a/examples/diary/2021-01-08.md
+++ b/examples/diary/2021-01-08.md
@@ -1,6 +1,6 @@
 ---
 tags: work_log
-mood: 1
+mood: 😀
 bloodpressure: 172.2/116.4
 bloodpressure1: 172.2, 116.4
 bloodpressure2: [172.2, 116.4]
diff --git a/examples/diary/2021-01-09.md b/examples/diary/2021-01-09.md
index b3d3266..a374751 100644
--- a/examples/diary/2021-01-09.md
+++ b/examples/diary/2021-01-09.md
@@ -1,6 +1,6 @@
 ---
 tags: 
-mood: 1
+mood: 😀
 bloodpressure: 175.6/118.2
 bloodpressure1: 175.6, 118.2
 bloodpressure2: [175.6, 118.2]
diff --git a/examples/diary/2021-01-10.md b/examples/diary/2021-01-10.md
index f6261c7..ad8320c 100644
--- a/examples/diary/2021-01-10.md
+++ b/examples/diary/2021-01-10.md
@@ -1,6 +1,6 @@
 ---
 tags: 
-mood: 3
+mood: 🙂
 bloodpressure: 179/116
 bloodpressure1: 179, 116
 bloodpressure2: [179, 116]
diff --git a/examples/diary/2021-01-11.md b/examples/diary/2021-01-11.md
index c9f40f1..998afde 100644
--- a/examples/diary/2021-01-11.md
+++ b/examples/diary/2021-01-11.md
@@ -1,6 +1,6 @@
 ---
 tags: work_log
-mood: 5
+mood: 😐
 bloodpressure: 173.4/117.8
 bloodpressure1: 173.4, 117.8
 bloodpressure2: [173.4, 117.8]
diff --git a/examples/diary/2021-01-12.md b/examples/diary/2021-01-12.md
index a0652a0..f7d0390 100644
--- a/examples/diary/2021-01-12.md
+++ b/examples/diary/2021-01-12.md
@@ -1,6 +1,6 @@
 ---
 tags: work_log
-mood: 1
+mood: 😀
 bloodpressure: 176.8/118.6
 bloodpressure1: 176.8, 118.6
 bloodpressure2: [176.8, 118.6]
diff --git a/examples/diary/2021-01-13.md b/examples/diary/2021-01-13.md
index 97f5314..5a4b868 100644
--- a/examples/diary/2021-01-13.md
+++ b/examples/diary/2021-01-13.md
@@ -1,6 +1,6 @@
 ---
 tags: work_log
-mood: 10
+mood: 😞
 bloodpressure: 168.2/116.4
 bloodpressure1: 168.2, 116.4
 bloodpressure2: [168.2, 116.4]
diff --git a/examples/diary/2021-01-14.md b/examples/diary/2021-01-14.md
index 66d378e..daa9d4a 100644
--- a/examples/diary/2021-01-14.md
+++ b/examples/diary/2021-01-14.md
@@ -1,6 +1,6 @@
 ---
 tags: work_log
-mood: 5
+mood: 😐
 bloodpressure: 175.6/117.2
 bloodpressure1: 175.6, 117.2
 bloodpressure2: [175.6, 117.2]
diff --git a/examples/diary/2021-01-15.md b/examples/diary/2021-01-15.md
index 19995b0..38b5d09 100644
--- a/examples/diary/2021-01-15.md
+++ b/examples/diary/2021-01-15.md
@@ -1,6 +1,6 @@
 ---
 tags: work_log
-mood: 1
+mood: 😀
 bloodpressure: 176/115
 bloodpressure1: 176, 115
 bloodpressure2: [176, 115]
diff --git a/examples/diary/2021-01-16.md b/examples/diary/2021-01-16.md
index 2787b95..4acb9dc 100644
--- a/examples/diary/2021-01-16.md
+++ b/examples/diary/2021-01-16.md
@@ -1,6 +1,6 @@
 ---
 tags: 
-mood: 9
+mood: 😞
 bloodpressure: 168.4/114.8
 bloodpressure1: 168.4, 114.8
 bloodpressure2: [168.4, 114.8]
diff --git a/examples/diary/2021-01-17.md b/examples/diary/2021-01-17.md
index 7329c6e..b59f1b8 100644
--- a/examples/diary/2021-01-17.md
+++ b/examples/diary/2021-01-17.md
@@ -1,6 +1,6 @@
 ---
 tags: 
-mood: 3
+mood: 🙂
 bloodpressure: 165.8/114.6
 bloodpressure1: 165.8, 114.6
 bloodpressure2: [165.8, 114.6]
diff --git a/examples/diary/2021-01-18.md b/examples/diary/2021-01-18.md
index de902ae..5dc50d8 100644
--- a/examples/diary/2021-01-18.md
+++ b/examples/diary/2021-01-18.md
@@ -1,6 +1,6 @@
 ---
 tags: work_log
-mood: 2
+mood: 😀
 bloodpressure: 167.2/118.4
 bloodpressure1: 167.2, 118.4
 bloodpressure2: [167.2, 118.4]
diff --git a/examples/diary/2021-01-19.md b/examples/diary/2021-01-19.md
index 06eb314..919b95c 100644
--- a/examples/diary/2021-01-19.md
+++ b/examples/diary/2021-01-19.md
@@ -1,6 +1,6 @@
 ---
 tags: work_log
-mood: 6
+mood: 😐
 bloodpressure: 165.6/117.2
 bloodpressure1: 165.6, 117.2
 bloodpressure2: [165.6, 117.2]
diff --git a/examples/diary/2021-01-20.md b/examples/diary/2021-01-20.md
index c460221..9b2557b 100644
--- a/examples/diary/2021-01-20.md
+++ b/examples/diary/2021-01-20.md
@@ -1,6 +1,6 @@
 ---
 tags: work_log
-mood: 4
+mood: 🙂
 bloodpressure: 163/117
 bloodpressure1: 163, 117
 bloodpressure2: [163, 117]
diff --git a/examples/diary/2021-01-21.md b/examples/diary/2021-01-21.md
index be9961a..89aad3a 100644
--- a/examples/diary/2021-01-21.md
+++ b/examples/diary/2021-01-21.md
@@ -1,6 +1,6 @@
 ---
 tags: work_log
-mood: 4
+mood: 🙂
 bloodpressure: 170.4/113.8
 bloodpressure1: 170.4, 113.8
 bloodpressure2: [170.4, 113.8]
diff --git a/examples/diary/2021-01-22.md b/examples/diary/2021-01-22.md
index 77cf0e7..9dd9917 100644
--- a/examples/diary/2021-01-22.md
+++ b/examples/diary/2021-01-22.md
@@ -1,6 +1,6 @@
 ---
 tags: work_log
-mood: 9
+mood: 😞
 bloodpressure: 165.8/116.6
 bloodpressure1: 165.8, 116.6
 bloodpressure2: [165.8, 116.6]
diff --git a/examples/diary/2021-01-23.md b/examples/diary/2021-01-23.md
index e10d6a0..bf1dec0 100644
--- a/examples/diary/2021-01-23.md
+++ b/examples/diary/2021-01-23.md
@@ -1,6 +1,6 @@
 ---
 tags: 
-mood: 1
+mood: 😀
 bloodpressure: 164.2/115.4
 bloodpressure1: 164.2, 115.4
 bloodpressure2: [164.2, 115.4]
diff --git a/examples/diary/2021-01-24.md b/examples/diary/2021-01-24.md
index 318da6f..a317ff4 100644
--- a/examples/diary/2021-01-24.md
+++ b/examples/diary/2021-01-24.md
@@ -1,6 +1,6 @@
 ---
 tags: 
-mood: 4
+mood: 🙂
 bloodpressure: 170.6/113.2
 bloodpressure1: 170.6, 113.2
 bloodpressure2: [170.6, 113.2]
diff --git a/examples/diary/2021-01-25.md b/examples/diary/2021-01-25.md
index c55952c..cb44595 100644
--- a/examples/diary/2021-01-25.md
+++ b/examples/diary/2021-01-25.md
@@ -1,6 +1,6 @@
 ---
 tags: work_log
-mood: 9
+mood: 😞
 bloodpressure: 167/114
 bloodpressure1: 167, 114
 bloodpressure2: [167, 114]
diff --git a/examples/diary/2021-01-26.md b/examples/diary/2021-01-26.md
index 919a6db..f2f5bd1 100644
--- a/examples/diary/2021-01-26.md
+++ b/examples/diary/2021-01-26.md
@@ -1,6 +1,6 @@
 ---
 tags: work_log
-mood: 3
+mood: 🙂
 bloodpressure: 162.4/114.8
 bloodpressure1: 162.4, 114.8
 bloodpressure2: [162.4, 114.8]
diff --git a/examples/diary/2021-01-27.md b/examples/diary/2021-01-27.md
index d27ce18..b0b16b4 100644
--- a/examples/diary/2021-01-27.md
+++ b/examples/diary/2021-01-27.md
@@ -1,6 +1,6 @@
 ---
 tags: work_log
-mood: 4
+mood: 🙂
 bloodpressure: 165.8/113.6
 bloodpressure1: 165.8, 113.6
 bloodpressure2: [165.8, 113.6]
diff --git a/examples/diary/2021-01-28.md b/examples/diary/2021-01-28.md
index dea9212..93ec564 100644
--- a/examples/diary/2021-01-28.md
+++ b/examples/diary/2021-01-28.md
@@ -1,6 +1,6 @@
 ---
 tags: work_log
-mood: 2
+mood: 😀
 bloodpressure: 158.2/115.4
 bloodpressure1: 158.2, 115.4
 bloodpressure2: [158.2, 115.4]
diff --git a/examples/diary/2021-01-29.md b/examples/diary/2021-01-29.md
index bb20ef6..a42a5ce 100644
--- a/examples/diary/2021-01-29.md
+++ b/examples/diary/2021-01-29.md
@@ -1,6 +1,6 @@
 ---
 tags: work_log
-mood: 8
+mood: 🙁
 bloodpressure: 163.6/112.2
 bloodpressure1: 163.6, 112.2
 bloodpressure2: [163.6, 112.2]
diff --git a/examples/diary/2021-01-30.md b/examples/diary/2021-01-30.md
index e140f7e..fc9d82c 100644
--- a/examples/diary/2021-01-30.md
+++ b/examples/diary/2021-01-30.md
@@ -1,6 +1,6 @@
 ---
 tags: 
-mood: 5
+mood: 😐
 bloodpressure: 159/114
 bloodpressure1: 159, 114
 bloodpressure2: [159, 114]
diff --git a/examples/diary/2021-01-31.md b/examples/diary/2021-01-31.md
index e5c4a74..dd8a29d 100644
--- a/examples/diary/2021-01-31.md
+++ b/examples/diary/2021-01-31.md
@@ -1,6 +1,6 @@
 ---
 tags: 
-mood: 4
+mood: 🙂
 bloodpressure: 160.4/115.8
 bloodpressure1: 160.4, 115.8
 bloodpressure2: [160.4, 115.8]
diff --git a/examples/example_generator.ts b/examples/example_generator.ts
index 6f95545..4b98337 100644
--- a/examples/example_generator.ts
+++ b/examples/example_generator.ts
@@ -52,8 +52,9 @@ for (
         frontmatter += "tags: " + "work_log" + "\n";
     }
     // frontmatter mood
-    let mood = randomIntFromInterval(1, 10);
-    frontmatter += "mood: " + mood + "\n";
+    let moodSymbols = ["😀", "🙂", "😐", "🙁", "😞"];
+    let indMood = randomIntFromInterval(0, 4);
+    frontmatter += "mood: " + moodSymbols[indMood] + "\n";
 
     // blood pressure
     let progress = dayCount;
diff --git a/src/collecting.ts b/src/collecting.ts
index 77eaae2..17dfe1f 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -359,7 +359,10 @@ export function collectDataFromFrontmatterKey(
     if (frontMatter) {
         if (helper.deepValue(frontMatter, query.getTarget())) {
             let toParse = helper.deepValue(frontMatter, query.getTarget());
-            let retParse = helper.parseFloatFromAny(toParse);
+            let retParse = helper.parseFloatFromAny(
+                toParse,
+                renderInfo.textValueMap
+            );
             if (retParse.value !== null) {
                 if (retParse.type === ValueType.Time) {
                     query.valueType = ValueType.Time;
@@ -482,7 +485,10 @@ export function collectDataFromInlineTag(
             if (splitted.length === 1) {
                 // console.log("single-value");
                 let toParse = splitted[0].trim();
-                let retParse = helper.parseFloatFromAny(toParse);
+                let retParse = helper.parseFloatFromAny(
+                    toParse,
+                    renderInfo.textValueMap
+                );
                 if (retParse.value !== null) {
                     if (retParse.type === ValueType.Time) {
                         tagMeasure = retParse.value;
@@ -505,7 +511,10 @@ export function collectDataFromInlineTag(
                 query.getAccessor() >= 0
             ) {
                 let toParse = splitted[query.getAccessor()].trim();
-                let retParse = helper.parseFloatFromAny(toParse);
+                let retParse = helper.parseFloatFromAny(
+                    toParse,
+                    renderInfo.textValueMap
+                );
                 //console.log(retParse);
                 if (retParse.value !== null) {
                     if (retParse.type === ValueType.Time) {
@@ -559,16 +568,25 @@ export function collectDataFromText(
             // console.log("valued-text");
             if (typeof match.groups.value !== "undefined") {
                 // set as null for missing value if it is valued-tag
-                let value = parseFloat(match.groups.value);
-                // console.log(value);
-                if (!Number.isNaN(value)) {
-                    if (
-                        !renderInfo.ignoreZeroValue[query.getId()] ||
-                        value !== 0
-                    ) {
-                        textMeasure += value;
+                let retParse = helper.parseFloatFromAny(
+                    match.groups.value,
+                    renderInfo.textValueMap
+                );
+                if (retParse.value !== null) {
+                    if (retParse.type === ValueType.Time) {
+                        textMeasure = retParse.value;
                         textExist = true;
+                        query.valueType = ValueType.Time;
                         query.addNumTargets();
+                    } else {
+                        if (
+                            !renderInfo.ignoreZeroValue[query.getId()] ||
+                            retParse.value !== 0
+                        ) {
+                            textMeasure += retParse.value;
+                            textExist = true;
+                            query.addNumTargets();
+                        }
                     }
                 }
             }
@@ -674,7 +692,10 @@ export function collectDataFromDvField(
                 // console.log("single-value");
                 let toParse = splitted[0];
                 // console.log(toParse);
-                let retParse = helper.parseFloatFromAny(toParse);
+                let retParse = helper.parseFloatFromAny(
+                    toParse,
+                    renderInfo.textValueMap
+                );
                 if (retParse.value !== null) {
                     if (retParse.type === ValueType.Time) {
                         tagMeasure = retParse.value;
@@ -699,7 +720,10 @@ export function collectDataFromDvField(
                 // TODO: it's not efficent to retrieve one value at a time, enhance this
                 // console.log("multiple-values");
                 let toParse = splitted[query.getAccessor()].trim();
-                let retParse = helper.parseFloatFromAny(toParse);
+                let retParse = helper.parseFloatFromAny(
+                    toParse,
+                    renderInfo.textValueMap
+                );
                 if (retParse.value !== null) {
                     if (retParse.type === ValueType.Time) {
                         tagMeasure = retParse.value;
@@ -766,16 +790,23 @@ export function collectDataFromTask(
             // console.log("valued-text");
             if (typeof match.groups.value !== "undefined") {
                 // set as null for missing value if it is valued-tag
-                let value = parseFloat(match.groups.value);
+                let retParse = helper.parseFloatFromAny(match.groups.value);
                 // console.log(value);
-                if (!Number.isNaN(value)) {
-                    if (
-                        !renderInfo.ignoreZeroValue[query.getId()] ||
-                        value !== 0
-                    ) {
-                        textMeasure += value;
+                if (retParse.value !== null) {
+                    if (retParse.type === ValueType.Time) {
+                        textMeasure = retParse.value;
                         textExist = true;
+                        query.valueType = ValueType.Time;
                         query.addNumTargets();
+                    } else {
+                        if (
+                            !renderInfo.ignoreZeroValue[query.getId()] ||
+                            retParse.value !== 0
+                        ) {
+                            textMeasure += retParse.value;
+                            textExist = true;
+                            query.addNumTargets();
+                        }
                     }
                 }
             }
diff --git a/src/data.ts b/src/data.ts
index 6c1827f..775d070 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -35,6 +35,10 @@ export enum ValueType {
     String,
 }
 
+export type TextValueMap = {
+    [key: string]: number;
+};
+
 export class DataPoint {
     date: Moment;
     value: number;
@@ -547,6 +551,7 @@ export class RenderInfo {
     penalty: number[];
     valueShift: number[];
     valueType: string[]; // number/float, int, string, boolean, date, time, datetime
+    textValueMap: TextValueMap;
 
     dataAreaSize: Size;
     margin: Margin;
@@ -584,6 +589,7 @@ export class RenderInfo {
         this.penalty = []; // null, use this value instead of null value
         this.valueShift = [];
         this.valueType = [];
+        this.textValueMap = {};
 
         this.dataAreaSize = new Size(300, 300);
         this.margin = new Margin(10, 10, 10, 10); // top, right, bottom, left
diff --git a/src/helper.ts b/src/helper.ts
index 9eb9077..524bef3 100644
--- a/src/helper.ts
+++ b/src/helper.ts
@@ -1,4 +1,4 @@
-import { RenderInfo, Size, Transform } from "./data";
+import { RenderInfo, Size, TextValueMap, Transform } from "./data";
 import { TFile, TFolder, normalizePath } from "obsidian";
 import { ValueType } from "./data";
 import * as d3 from "d3";
@@ -328,7 +328,10 @@ export function trimByChar(str: string, char: string) {
 }
 
 // Parsing
-export function parseFloatFromAny(toParse: any) {
+export function parseFloatFromAny(
+    toParse: any,
+    textValueMap: TextValueMap = null
+) {
     let value = null;
     let valueType = ValueType.Number;
     if (typeof toParse === "string") {
@@ -351,7 +354,17 @@ export function parseFloatFromAny(toParse: any) {
                 valueType = ValueType.Time;
             }
         } else {
-            value = parseFloat(toParse);
+            if (textValueMap) {
+                const keys = Object.keys(textValueMap) as Array<keyof string>;
+                for (let key of keys) {
+                    if (toParse === key) {
+                        value = textValueMap[key];
+                        break;
+                    }
+                }
+            } else {
+                value = parseFloat(toParse);
+            }
         }
     } else if (typeof toParse === "number") {
         value = toParse;
diff --git a/src/parsing.ts b/src/parsing.ts
index 481a8af..19a099a 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1393,6 +1393,17 @@ export function getRenderInfoFromYaml(
     renderInfo.valueShift = retValueShift;
     // console.log(renderInfo.valueShift);
 
+    // textValueMap
+    if (typeof yaml.textValueMap !== "undefined") {
+        let keys = getAvailableKeysOfClass(yaml.textValueMap);
+        // console.log(texts);
+        for (let key of keys) {
+            let text = key.trim();
+            renderInfo.textValueMap[text] = yaml.textValueMap[text];
+        }
+    }
+    // console.log(renderInfo.textValueMap);
+
     // fixedScale
     if (typeof yaml.fixedScale === "number") {
         renderInfo.fixedScale = yaml.fixedScale;

From 6306d84ce943ff0cbb33c96fe6ee91be2d4b73c0 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 7 Aug 2021 15:57:53 +0800
Subject: [PATCH 179/402] Fix no value from textValueMap

---
 src/collecting.ts | 10 ++++++++--
 src/helper.ts     |  5 +++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/collecting.ts b/src/collecting.ts
index 17dfe1f..6ae718d 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -401,7 +401,10 @@ export function collectDataFromFrontmatterKey(
             ) {
                 // TODO: it's not efficent to retrieve one value at a time, enhance this
                 let splittedPart = splitted[query.getAccessor()].trim();
-                let retParse = helper.parseFloatFromAny(splittedPart);
+                let retParse = helper.parseFloatFromAny(
+                    splittedPart,
+                    renderInfo.textValueMap
+                );
                 if (retParse.value !== null) {
                     if (retParse.type === ValueType.Time) {
                         query.valueType = ValueType.Time;
@@ -790,7 +793,10 @@ export function collectDataFromTask(
             // console.log("valued-text");
             if (typeof match.groups.value !== "undefined") {
                 // set as null for missing value if it is valued-tag
-                let retParse = helper.parseFloatFromAny(match.groups.value);
+                let retParse = helper.parseFloatFromAny(
+                    match.groups.value,
+                    renderInfo.textValueMap
+                );
                 // console.log(value);
                 if (retParse.value !== null) {
                     if (retParse.type === ValueType.Time) {
diff --git a/src/helper.ts b/src/helper.ts
index 524bef3..d05d18e 100644
--- a/src/helper.ts
+++ b/src/helper.ts
@@ -355,13 +355,18 @@ export function parseFloatFromAny(
             }
         } else {
             if (textValueMap) {
+                let anyMatch = false;
                 const keys = Object.keys(textValueMap) as Array<keyof string>;
                 for (let key of keys) {
                     if (toParse === key) {
                         value = textValueMap[key];
+                        anyMatch = true;
                         break;
                     }
                 }
+                if (!anyMatch) {
+                    value = parseFloat(toParse);
+                }
             } else {
                 value = parseFloat(toParse);
             }

From 0d2c7ff6aed664f3c0197b13628c4c8e727d2a5e Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 8 Aug 2021 00:23:13 +0800
Subject: [PATCH 180/402] Fix null yaml for parameters related to tick interval
 and format

---
 src/parsing.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/parsing.ts b/src/parsing.ts
index 19a099a..ca05502 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -765,9 +765,9 @@ function parseCommonChartInfo(yaml: any, renderInfo: CommonChartInfo) {
     // console.log(renderInfo.yAxisUnit);
 
     // xAxisTickInterval
-    if (typeof yaml.xAxisTickInterval === "string") {
+    if (typeof yaml?.xAxisTickInterval === "string") {
         renderInfo.xAxisTickInterval = yaml.xAxisTickInterval;
-    } else if (typeof yaml.xAxisTickInterval === "number") {
+    } else if (typeof yaml?.xAxisTickInterval === "number") {
         renderInfo.xAxisTickInterval = yaml.xAxisTickInterval.toString();
     }
     // console.log(renderInfo.xAxisTickInterval);
@@ -775,7 +775,7 @@ function parseCommonChartInfo(yaml: any, renderInfo: CommonChartInfo) {
     // yAxisTickInterval
     let retYAxisTickInterval = getStringArrayFromInput(
         "yAxisTickInterval",
-        yaml.yAxisTickInterval,
+        yaml?.yAxisTickInterval,
         2,
         null,
         null,
@@ -791,7 +791,7 @@ function parseCommonChartInfo(yaml: any, renderInfo: CommonChartInfo) {
     // console.log(renderInfo.yAxisTickInterval);
 
     // xAxisTickLabelFormat
-    if (typeof yaml.xAxisTickLabelFormat === "string") {
+    if (typeof yaml?.xAxisTickLabelFormat === "string") {
         renderInfo.xAxisTickLabelFormat = yaml.xAxisTickLabelFormat;
     }
     // console.log(renderInfo.xAxisTickLabelFormat);
@@ -799,7 +799,7 @@ function parseCommonChartInfo(yaml: any, renderInfo: CommonChartInfo) {
     // yAxisTickLabelFormat
     let retYAxisTickLabelFormat = getStringArrayFromInput(
         "yAxisTickLabelFormat",
-        yaml.yAxisTickLabelFormat,
+        yaml?.yAxisTickLabelFormat,
         2,
         null,
         null,

From 2e831f3291ac831c65527327e1f4f04db0bc5d70 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 9 Aug 2021 11:13:45 +0800
Subject: [PATCH 181/402] Set default month view dataColor if no dataColor
 provided

---
 examples/TestPieChart.md | 11 +++++++++++
 src/parsing.ts           |  2 +-
 src/pie.ts               |  8 ++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/examples/TestPieChart.md b/examples/TestPieChart.md
index 29102af..d84f357 100644
--- a/examples/TestPieChart.md
+++ b/examples/TestPieChart.md
@@ -51,6 +51,17 @@ pie:
     legendOrientation: vertical	
 ```
 
+### Default data colors
+``` tracker
+searchType: task.done, task.notdone
+searchTarget: Say I love you, Say I love you
+pie:
+    title: Pie Chart
+    label: '{{2/30*100}}%, {{4/30*100}}%, {{6/30*100}}%, {{8/30*100}}%, {{10/30*100}}%'
+    data: 2, 4, 6, 8, 10
+    ratioInnerRadius: 0.0
+```
+
 ## Data from Notes
 
 Using function dataset() to get Dataset then use function sum() to get the summation
diff --git a/src/parsing.ts b/src/parsing.ts
index ca05502..9b0c26d 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1747,7 +1747,7 @@ export function getRenderInfoFromYaml(
             "dataColor",
             yamlPie?.dataColor,
             numData,
-            "none",
+            null,
             validateColor,
             true
         );
diff --git a/src/pie.ts b/src/pie.ts
index 1e2e1a9..da298c5 100644
--- a/src/pie.ts
+++ b/src/pie.ts
@@ -616,6 +616,14 @@ export function renderPieChart(
     let chartElements: ChartElements = {};
     chartElements = createAreas(chartElements, canvas, renderInfo, pieInfo);
 
+    // Set default dataColor if no dataColor provided
+    let defaultDataColor = d3.schemeSpectral[pieInfo.dataColor.length];
+    for (let i = 0; i < pieInfo.dataColor.length; i++) {
+        if (pieInfo.dataColor[i] === null) {
+            pieInfo.dataColor[i] = defaultDataColor[i];
+        }
+    }
+
     renderTitle(canvas, chartElements, renderInfo, pieInfo);
 
     renderPie(canvas, chartElements, renderInfo, pieInfo);

From a4cd8574152b9198d6786ff1dcdeda18d37fb680 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 9 Aug 2021 11:54:10 +0800
Subject: [PATCH 182/402] Fix the example for relative startDate and endDate
 (use M for month)

---
 examples/TestRelativeStartEndDate.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/TestRelativeStartEndDate.md b/examples/TestRelativeStartEndDate.md
index ef8e417..1b0e02f 100644
--- a/examples/TestRelativeStartEndDate.md
+++ b/examples/TestRelativeStartEndDate.md
@@ -4,8 +4,8 @@
 searchType: tag
 searchTarget: exercise-pushup
 folder: diary
-startDate: -2m
-endDate: -1m
+startDate: -2M
+endDate: -1M
 line:
     title: PushUp
     yAxisLabel: Count

From 3ef454002e88fae370be54ea28d85356b9caa9af Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 9 Aug 2021 13:03:00 +0800
Subject: [PATCH 183/402] Fix multi lines in summary template not split if
 input text wrapped in single quotes

---
 src/summary.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/summary.ts b/src/summary.ts
index 6c64ba9..053155c 100644
--- a/src/summary.ts
+++ b/src/summary.ts
@@ -15,6 +15,7 @@ export function renderSummary(
     // console.log(renderInfo);
     if (!renderInfo || !summaryInfo) return;
 
+    // console.log(summaryInfo.template);
     let outputSummary = "";
     if (checkSummaryTemplateValid(summaryInfo.template)) {
         outputSummary = summaryInfo.template;
@@ -31,9 +32,11 @@ export function renderSummary(
 
     if (outputSummary !== "") {
         let textBlock = d3.select(canvas).append("div");
-        if (outputSummary.includes("\n")) {
-            let outputLines = outputSummary.split("\n");
+        if (outputSummary.includes("\n") || outputSummary.includes("\\n")) {
+            let outputLines = outputSummary.split(/(\n|\\n)/);
+            // console.log(outputLines);
             for (let outputLine of outputLines) {
+                if (outputLine !== "\n" && outputLine !== "\\n")
                 textBlock.append("div").text(outputLine);
             }
         } else {

From e1727df4ac3d762cd9708f51e0348fae3f24fe77 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 9 Aug 2021 17:10:58 +0800
Subject: [PATCH 184/402] Provide error messages for "no valid x values" and
 "no valid y values"

---
 examples/ErrorMessages.md     | 20 ++++++++++
 examples/diary/2021-01-01.md  |  1 +
 examples/diary/2021-01-02.md  |  1 +
 examples/diary/2021-01-03.md  |  1 +
 examples/diary/2021-01-04.md  |  1 +
 examples/diary/2021-01-05.md  |  1 +
 examples/diary/2021-01-06.md  |  1 +
 examples/diary/2021-01-07.md  |  1 +
 examples/diary/2021-01-08.md  |  1 +
 examples/diary/2021-01-09.md  |  1 +
 examples/diary/2021-01-10.md  |  1 +
 examples/diary/2021-01-11.md  |  1 +
 examples/diary/2021-01-12.md  |  1 +
 examples/diary/2021-01-13.md  |  1 +
 examples/diary/2021-01-14.md  |  1 +
 examples/diary/2021-01-15.md  |  1 +
 examples/diary/2021-01-16.md  |  1 +
 examples/diary/2021-01-17.md  |  1 +
 examples/diary/2021-01-18.md  |  1 +
 examples/diary/2021-01-19.md  |  1 +
 examples/diary/2021-01-20.md  |  1 +
 examples/diary/2021-01-21.md  |  1 +
 examples/diary/2021-01-22.md  |  1 +
 examples/diary/2021-01-23.md  |  1 +
 examples/diary/2021-01-24.md  |  1 +
 examples/diary/2021-01-25.md  |  1 +
 examples/diary/2021-01-26.md  |  1 +
 examples/diary/2021-01-27.md  |  1 +
 examples/diary/2021-01-28.md  |  1 +
 examples/diary/2021-01-29.md  |  1 +
 examples/diary/2021-01-30.md  |  1 +
 examples/diary/2021-01-31.md  |  1 +
 examples/example_generator.ts |  6 ++-
 src/collecting.ts             | 61 ++++++++++++++++++++++-------
 src/helper.ts                 | 15 +++++++-
 src/main.ts                   | 72 ++++++++++++++++++++++++-----------
 36 files changed, 166 insertions(+), 39 deletions(-)

diff --git a/examples/ErrorMessages.md b/examples/ErrorMessages.md
index 3df20b8..bf2a519 100644
--- a/examples/ErrorMessages.md
+++ b/examples/ErrorMessages.md
@@ -104,6 +104,26 @@ line:
     yAxisLabel: BP1, BP2, BP3
 ```
 
+## Input
+No valid X values, add "xDataset: 0" to fix it
+``` tracker
+searchType: fileMeta, dvField
+searchTarget: cDate, dataviewTarget
+folder: data
+line:
+    fillGap: true
+```
+
+No valid Y values!!!!!
+Use parameter `textValueMap` to map a text to a value.
+``` tracker
+searchType: frontmatter
+searchTarget: randchar
+folder: diary
+line:
+    fillGap: true
+```
+
 ## Output
 No output type provided, choose 'line', 'bar', or 'summary'.
 ``` tracker
diff --git a/examples/diary/2021-01-01.md b/examples/diary/2021-01-01.md
index b476f3e..1e43b42 100644
--- a/examples/diary/2021-01-01.md
+++ b/examples/diary/2021-01-01.md
@@ -17,6 +17,7 @@ deepValue:
                 very: 
                     very: 
                         deep: 27.4
+randchar: D
 ---
 
 #weight:74.1kg
diff --git a/examples/diary/2021-01-02.md b/examples/diary/2021-01-02.md
index d0fd77d..f81816e 100644
--- a/examples/diary/2021-01-02.md
+++ b/examples/diary/2021-01-02.md
@@ -17,6 +17,7 @@ deepValue:
                 very: 
                     very: 
                         deep: 13.3
+randchar: D
 ---
 
 #weight:76.2kg
diff --git a/examples/diary/2021-01-03.md b/examples/diary/2021-01-03.md
index 40eb66b..7d0cc2e 100644
--- a/examples/diary/2021-01-03.md
+++ b/examples/diary/2021-01-03.md
@@ -17,6 +17,7 @@ deepValue:
                 very: 
                     very: 
                         deep: 73.0
+randchar: D
 ---
 
 #weight:63.2kg
diff --git a/examples/diary/2021-01-04.md b/examples/diary/2021-01-04.md
index f134f1b..307cc70 100644
--- a/examples/diary/2021-01-04.md
+++ b/examples/diary/2021-01-04.md
@@ -17,6 +17,7 @@ deepValue:
                 very: 
                     very: 
                         deep: 88.6
+randchar: B
 ---
 
 #weight:61.6kg
diff --git a/examples/diary/2021-01-05.md b/examples/diary/2021-01-05.md
index 1b08f7c..4d60cee 100644
--- a/examples/diary/2021-01-05.md
+++ b/examples/diary/2021-01-05.md
@@ -17,6 +17,7 @@ deepValue:
                 very: 
                     very: 
                         deep: 13.1
+randchar: A
 ---
 
 #weight:72.5kg
diff --git a/examples/diary/2021-01-06.md b/examples/diary/2021-01-06.md
index 5d7d791..cc68d46 100644
--- a/examples/diary/2021-01-06.md
+++ b/examples/diary/2021-01-06.md
@@ -17,6 +17,7 @@ deepValue:
                 very: 
                     very: 
                         deep: 20.7
+randchar: D
 ---
 
 #weight:60.1kg
diff --git a/examples/diary/2021-01-07.md b/examples/diary/2021-01-07.md
index edf1242..a0d5d32 100644
--- a/examples/diary/2021-01-07.md
+++ b/examples/diary/2021-01-07.md
@@ -17,6 +17,7 @@ deepValue:
                 very: 
                     very: 
                         deep: 47.8
+randchar: A
 ---
 
 #weight:70.2kg
diff --git a/examples/diary/2021-01-08.md b/examples/diary/2021-01-08.md
index dd0ec4d..8b6f63b 100644
--- a/examples/diary/2021-01-08.md
+++ b/examples/diary/2021-01-08.md
@@ -17,6 +17,7 @@ deepValue:
                 very: 
                     very: 
                         deep: 68.6
+randchar: A
 ---
 
 #weight:74.0kg
diff --git a/examples/diary/2021-01-09.md b/examples/diary/2021-01-09.md
index a374751..96fe317 100644
--- a/examples/diary/2021-01-09.md
+++ b/examples/diary/2021-01-09.md
@@ -17,6 +17,7 @@ deepValue:
                 very: 
                     very: 
                         deep: 68.6
+randchar: A
 ---
 
 #weight:68.8kg
diff --git a/examples/diary/2021-01-10.md b/examples/diary/2021-01-10.md
index ad8320c..fda03e0 100644
--- a/examples/diary/2021-01-10.md
+++ b/examples/diary/2021-01-10.md
@@ -17,6 +17,7 @@ deepValue:
                 very: 
                     very: 
                         deep: 17.7
+randchar: B
 ---
 
 #weight:62.1kg
diff --git a/examples/diary/2021-01-11.md b/examples/diary/2021-01-11.md
index 998afde..892656f 100644
--- a/examples/diary/2021-01-11.md
+++ b/examples/diary/2021-01-11.md
@@ -17,6 +17,7 @@ deepValue:
                 very: 
                     very: 
                         deep: 26.2
+randchar: C
 ---
 
 #weight:80.8kg
diff --git a/examples/diary/2021-01-12.md b/examples/diary/2021-01-12.md
index f7d0390..94e3967 100644
--- a/examples/diary/2021-01-12.md
+++ b/examples/diary/2021-01-12.md
@@ -17,6 +17,7 @@ deepValue:
                 very: 
                     very: 
                         deep: 45.0
+randchar: A
 ---
 
 #weight:61.7kg
diff --git a/examples/diary/2021-01-13.md b/examples/diary/2021-01-13.md
index 5a4b868..f2e12ef 100644
--- a/examples/diary/2021-01-13.md
+++ b/examples/diary/2021-01-13.md
@@ -17,6 +17,7 @@ deepValue:
                 very: 
                     very: 
                         deep: 64.5
+randchar: E
 ---
 
 #weight:71.7kg
diff --git a/examples/diary/2021-01-14.md b/examples/diary/2021-01-14.md
index daa9d4a..8ef4cbc 100644
--- a/examples/diary/2021-01-14.md
+++ b/examples/diary/2021-01-14.md
@@ -17,6 +17,7 @@ deepValue:
                 very: 
                     very: 
                         deep: 61.5
+randchar: C
 ---
 
 #weight:77.1kg
diff --git a/examples/diary/2021-01-15.md b/examples/diary/2021-01-15.md
index 38b5d09..ac1f2fc 100644
--- a/examples/diary/2021-01-15.md
+++ b/examples/diary/2021-01-15.md
@@ -17,6 +17,7 @@ deepValue:
                 very: 
                     very: 
                         deep: 44.0
+randchar: A
 ---
 
 #weight:69.6kg
diff --git a/examples/diary/2021-01-16.md b/examples/diary/2021-01-16.md
index 4acb9dc..f84dfa1 100644
--- a/examples/diary/2021-01-16.md
+++ b/examples/diary/2021-01-16.md
@@ -17,6 +17,7 @@ deepValue:
                 very: 
                     very: 
                         deep: 81.6
+randchar: E
 ---
 
 #weight:70.0kg
diff --git a/examples/diary/2021-01-17.md b/examples/diary/2021-01-17.md
index b59f1b8..99efd48 100644
--- a/examples/diary/2021-01-17.md
+++ b/examples/diary/2021-01-17.md
@@ -17,6 +17,7 @@ deepValue:
                 very: 
                     very: 
                         deep: 43.0
+randchar: B
 ---
 
 #weight:64.6kg
diff --git a/examples/diary/2021-01-18.md b/examples/diary/2021-01-18.md
index 5dc50d8..ec91c1a 100644
--- a/examples/diary/2021-01-18.md
+++ b/examples/diary/2021-01-18.md
@@ -17,6 +17,7 @@ deepValue:
                 very: 
                     very: 
                         deep: 19.5
+randchar: A
 ---
 
 #weight:78.7kg
diff --git a/examples/diary/2021-01-19.md b/examples/diary/2021-01-19.md
index 919b95c..ded2151 100644
--- a/examples/diary/2021-01-19.md
+++ b/examples/diary/2021-01-19.md
@@ -17,6 +17,7 @@ deepValue:
                 very: 
                     very: 
                         deep: 29.5
+randchar: C
 ---
 
 #weight:69.3kg
diff --git a/examples/diary/2021-01-20.md b/examples/diary/2021-01-20.md
index 9b2557b..99daaa1 100644
--- a/examples/diary/2021-01-20.md
+++ b/examples/diary/2021-01-20.md
@@ -17,6 +17,7 @@ deepValue:
                 very: 
                     very: 
                         deep: 56.2
+randchar: B
 ---
 
 #weight:80.7kg
diff --git a/examples/diary/2021-01-21.md b/examples/diary/2021-01-21.md
index 89aad3a..fd0233b 100644
--- a/examples/diary/2021-01-21.md
+++ b/examples/diary/2021-01-21.md
@@ -17,6 +17,7 @@ deepValue:
                 very: 
                     very: 
                         deep: 11.1
+randchar: B
 ---
 
 #weight:67.3kg
diff --git a/examples/diary/2021-01-22.md b/examples/diary/2021-01-22.md
index 9dd9917..43a6889 100644
--- a/examples/diary/2021-01-22.md
+++ b/examples/diary/2021-01-22.md
@@ -17,6 +17,7 @@ deepValue:
                 very: 
                     very: 
                         deep: 83.3
+randchar: E
 ---
 
 #weight:64.7kg
diff --git a/examples/diary/2021-01-23.md b/examples/diary/2021-01-23.md
index bf1dec0..c793861 100644
--- a/examples/diary/2021-01-23.md
+++ b/examples/diary/2021-01-23.md
@@ -17,6 +17,7 @@ deepValue:
                 very: 
                     very: 
                         deep: 28.8
+randchar: A
 ---
 
 #weight:67.3kg
diff --git a/examples/diary/2021-01-24.md b/examples/diary/2021-01-24.md
index a317ff4..5a726f8 100644
--- a/examples/diary/2021-01-24.md
+++ b/examples/diary/2021-01-24.md
@@ -17,6 +17,7 @@ deepValue:
                 very: 
                     very: 
                         deep: 39.4
+randchar: B
 ---
 
 #weight:64.1kg
diff --git a/examples/diary/2021-01-25.md b/examples/diary/2021-01-25.md
index cb44595..811eea5 100644
--- a/examples/diary/2021-01-25.md
+++ b/examples/diary/2021-01-25.md
@@ -17,6 +17,7 @@ deepValue:
                 very: 
                     very: 
                         deep: 81.4
+randchar: E
 ---
 
 #weight:62.4kg
diff --git a/examples/diary/2021-01-26.md b/examples/diary/2021-01-26.md
index f2f5bd1..4b37aab 100644
--- a/examples/diary/2021-01-26.md
+++ b/examples/diary/2021-01-26.md
@@ -17,6 +17,7 @@ deepValue:
                 very: 
                     very: 
                         deep: 73.1
+randchar: B
 ---
 
 #weight:72.7kg
diff --git a/examples/diary/2021-01-27.md b/examples/diary/2021-01-27.md
index b0b16b4..27c95a9 100644
--- a/examples/diary/2021-01-27.md
+++ b/examples/diary/2021-01-27.md
@@ -17,6 +17,7 @@ deepValue:
                 very: 
                     very: 
                         deep: 78.5
+randchar: B
 ---
 
 #weight:63.7kg
diff --git a/examples/diary/2021-01-28.md b/examples/diary/2021-01-28.md
index 93ec564..e239cd0 100644
--- a/examples/diary/2021-01-28.md
+++ b/examples/diary/2021-01-28.md
@@ -17,6 +17,7 @@ deepValue:
                 very: 
                     very: 
                         deep: 80.6
+randchar: A
 ---
 
 #weight:79.2kg
diff --git a/examples/diary/2021-01-29.md b/examples/diary/2021-01-29.md
index a42a5ce..d57ebc4 100644
--- a/examples/diary/2021-01-29.md
+++ b/examples/diary/2021-01-29.md
@@ -17,6 +17,7 @@ deepValue:
                 very: 
                     very: 
                         deep: 18.6
+randchar: D
 ---
 
 #weight:63.5kg
diff --git a/examples/diary/2021-01-30.md b/examples/diary/2021-01-30.md
index fc9d82c..024410e 100644
--- a/examples/diary/2021-01-30.md
+++ b/examples/diary/2021-01-30.md
@@ -17,6 +17,7 @@ deepValue:
                 very: 
                     very: 
                         deep: 17.9
+randchar: C
 ---
 
 #weight:63.3kg
diff --git a/examples/diary/2021-01-31.md b/examples/diary/2021-01-31.md
index dd8a29d..4e82ad9 100644
--- a/examples/diary/2021-01-31.md
+++ b/examples/diary/2021-01-31.md
@@ -17,6 +17,7 @@ deepValue:
                 very: 
                     very: 
                         deep: 56.8
+randchar: B
 ---
 
 #weight:72.2kg
diff --git a/examples/example_generator.ts b/examples/example_generator.ts
index 4b98337..805fd11 100644
--- a/examples/example_generator.ts
+++ b/examples/example_generator.ts
@@ -44,8 +44,9 @@ for (
 
     // fontmatter
     let frontmatter = "---\n";
-    let weekday = curDate.weekday();
+
     // front matter tags
+    let weekday = curDate.weekday();
     if (weekday == 0 || weekday == 6) {
         frontmatter += "tags: " + "\n";
     } else {
@@ -119,6 +120,9 @@ for (
     }
     frontmatter += indent + "deep: " + deepValue.toFixed(1) + "\n";
 
+    // random character
+    frontmatter += "randchar: " + String.fromCharCode(65+indMood) + "\n";
+
     frontmatter += "---\n";
     content += frontmatter;
 
diff --git a/src/collecting.ts b/src/collecting.ts
index 6ae718d..528af6b 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -301,7 +301,7 @@ export function collectDataFromFrontmatterTag(
     renderInfo: RenderInfo,
     dataMap: DataMap,
     xValueMap: XValueMap
-) {
+): boolean {
     // console.log("collectDataFromFrontmatterTag");
     // console.log(query);
     // console.log(dataMap);
@@ -342,8 +342,11 @@ export function collectDataFromFrontmatterTag(
             }
             let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
             addToDataMap(dataMap, xValue, query, value);
+            return true;
         }
     }
+
+    return false;
 }
 
 export function collectDataFromFrontmatterKey(
@@ -352,7 +355,7 @@ export function collectDataFromFrontmatterKey(
     renderInfo: RenderInfo,
     dataMap: DataMap,
     xValueMap: XValueMap
-) {
+): boolean {
     // console.log("collectDataFromFrontmatterKey");
 
     let frontMatter = fileCache.frontmatter;
@@ -370,6 +373,7 @@ export function collectDataFromFrontmatterKey(
                 query.addNumTargets();
                 let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
                 addToDataMap(dataMap, xValue, query, retParse.value);
+                return true;
             }
         } else if (
             query.getParentTarget() &&
@@ -414,10 +418,13 @@ export function collectDataFromFrontmatterKey(
                         renderInfo.xDataset[query.getId()]
                     );
                     addToDataMap(dataMap, xValue, query, retParse.value);
+                    return true;
                 }
             }
         }
     }
+
+    return false;
 }
 
 export function collectDataFromWiki(
@@ -426,7 +433,7 @@ export function collectDataFromWiki(
     renderInfo: RenderInfo,
     dataMap: DataMap,
     xValueMap: XValueMap
-) {
+): boolean {
     let links = fileCache.links;
     if (!links) return;
 
@@ -444,8 +451,14 @@ export function collectDataFromWiki(
     if (linkExist) {
         linkValue = linkMeasure;
     }
-    let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
-    addToDataMap(dataMap, xValue, query, linkValue);
+
+    if (linkValue !== null) {
+        let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
+        addToDataMap(dataMap, xValue, query, linkValue);
+        return true;
+    }
+
+    return false;
 }
 
 export function collectDataFromInlineTag(
@@ -454,7 +467,7 @@ export function collectDataFromInlineTag(
     renderInfo: RenderInfo,
     dataMap: DataMap,
     xValueMap: XValueMap
-) {
+): boolean {
     // console.log(content);
     // Test this in Regex101
     // (^|\s)#tagName(\/[\w-]+)*(:(?<values>[\d\.\/-]*)[a-zA-Z]*)?([\\.!,\\?;~-]*)?(\s|$)
@@ -544,8 +557,13 @@ export function collectDataFromInlineTag(
     if (tagExist) {
         value = tagMeasure;
     }
-    let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
-    addToDataMap(dataMap, xValue, query, value);
+    if (value !== null) {
+        let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
+        addToDataMap(dataMap, xValue, query, value);
+        return true;
+    }
+
+    return false;
 }
 
 export function collectDataFromText(
@@ -554,7 +572,7 @@ export function collectDataFromText(
     renderInfo: RenderInfo,
     dataMap: DataMap,
     xValueMap: XValueMap
-) {
+): boolean {
     let strTextRegex = query.getTarget();
     // console.log(strTextRegex);
     let textRegex = new RegExp(strTextRegex, "gm");
@@ -604,7 +622,10 @@ export function collectDataFromText(
     if (textExist) {
         let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
         addToDataMap(dataMap, xValue, query, textMeasure);
+        return true;
     }
+
+    return false;
 }
 
 export function collectDataFromFileMeta(
@@ -614,7 +635,7 @@ export function collectDataFromFileMeta(
     renderInfo: RenderInfo,
     dataMap: DataMap,
     xValueMap: XValueMap
-) {
+): boolean {
     // console.log("collectDataFromFileMeta");
 
     if (file && file instanceof TFile) {
@@ -649,7 +670,11 @@ export function collectDataFromFileMeta(
             query.addNumTargets();
             addToDataMap(dataMap, xValue, query, numSentences);
         }
+
+        return true;
     }
+
+    return false;
 }
 
 export function collectDataFromDvField(
@@ -658,7 +683,7 @@ export function collectDataFromDvField(
     renderInfo: RenderInfo,
     dataMap: DataMap,
     xValueMap: XValueMap
-) {
+): boolean {
     let dvTarget = query.getTarget();
     if (query.getParentTarget()) {
         dvTarget = query.getParentTarget(); // use parent tag name for multiple values
@@ -752,8 +777,13 @@ export function collectDataFromDvField(
     if (tagExist) {
         value = tagMeasure;
     }
-    let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
-    addToDataMap(dataMap, xValue, query, value);
+    if (value !== null) {
+        let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
+        addToDataMap(dataMap, xValue, query, value);
+        return true;
+    }
+
+    return false;
 }
 
 export function collectDataFromTask(
@@ -762,7 +792,7 @@ export function collectDataFromTask(
     renderInfo: RenderInfo,
     dataMap: DataMap,
     xValueMap: XValueMap
-) {
+): boolean {
     let searchType = query.getType();
     // console.log(searchType);
 
@@ -827,5 +857,8 @@ export function collectDataFromTask(
     if (textExist) {
         let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
         addToDataMap(dataMap, xValue, query, textMeasure);
+        return true;
     }
+
+    return false;
 }
diff --git a/src/helper.ts b/src/helper.ts
index d05d18e..cc74735 100644
--- a/src/helper.ts
+++ b/src/helper.ts
@@ -311,10 +311,15 @@ export function deepValue(obj: any, str: string) {
         if (k in obj) {
             obj = obj[k];
         } else {
-            return;
+            return null;
         }
     }
-    return obj;
+    if (typeof obj === "string" || Array.isArray(obj)) {
+        return obj;
+    } else if (typeof obj === "number") {
+        return obj.toString();
+    }
+    return null;
 }
 
 // String helpers
@@ -366,9 +371,15 @@ export function parseFloatFromAny(
                 }
                 if (!anyMatch) {
                     value = parseFloat(toParse);
+                    if (Number.isNaN(value)) {
+                        value = null;
+                    }
                 }
             } else {
                 value = parseFloat(toParse);
+                if (Number.isNaN(value)) {
+                    value = null;
+                }
             }
         }
     } else if (typeof toParse === "number") {
diff --git a/src/main.ts b/src/main.ts
index 6aa4f39..8a865ee 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -160,6 +160,8 @@ export default class Tracker extends Plugin {
         let fileCounter = 0;
 
         let dataMap: DataMap = new Map(); // {strDate: [query: value, ...]}
+        let gotAnyValidXValue = false;
+        let gotAnyValidYValue = false;
         // Collect data from files, each file has one data point for each query
         const loopFilePromises = files.map(async (file) => {
             // console.log(file.basename);
@@ -292,6 +294,7 @@ export default class Tracker extends Plugin {
                     }
 
                     if (!skipThisFile) {
+                        gotAnyValidXValue ||= true;
                         xValueMap.set(
                             xDatasetId,
                             helper.dateToStr(xDate, renderInfo.dateFormat)
@@ -322,6 +325,7 @@ export default class Tracker extends Plugin {
             let yDatasetQueries = renderInfo.queries.filter((q) => {
                 return q.getType() !== SearchType.Table && !q.usedAsXDataset;
             });
+
             const loopQueryPromises = yDatasetQueries.map(async (query) => {
                 // Get xValue from file if xDataset assigned
                 // if (renderInfo.xDataset !== null)
@@ -330,13 +334,14 @@ export default class Tracker extends Plugin {
                 // console.log("Search frontmatter tags");
                 if (fileCache && query.getType() === SearchType.Tag) {
                     // Add frontmatter tags, allow simple tag only
-                    collecting.collectDataFromFrontmatterTag(
-                        fileCache,
-                        query,
-                        renderInfo,
-                        dataMap,
-                        xValueMap
-                    );
+                    gotAnyValidYValue ||=
+                        collecting.collectDataFromFrontmatterTag(
+                            fileCache,
+                            query,
+                            renderInfo,
+                            dataMap,
+                            xValueMap
+                        );
                 } // Search frontmatter tags
 
                 // console.log("Search frontmatter keys");
@@ -345,18 +350,19 @@ export default class Tracker extends Plugin {
                     query.getType() === SearchType.Frontmatter &&
                     query.getTarget() !== "tags"
                 ) {
-                    collecting.collectDataFromFrontmatterKey(
-                        fileCache,
-                        query,
-                        renderInfo,
-                        dataMap,
-                        xValueMap
-                    );
+                    gotAnyValidYValue ||=
+                        collecting.collectDataFromFrontmatterKey(
+                            fileCache,
+                            query,
+                            renderInfo,
+                            dataMap,
+                            xValueMap
+                        );
                 } // console.log("Search frontmatter keys");
 
                 // console.log("Search wiki links");
                 if (fileCache && query.getType() === SearchType.Wiki) {
-                    collecting.collectDataFromWiki(
+                    gotAnyValidYValue ||= collecting.collectDataFromWiki(
                         fileCache,
                         query,
                         renderInfo,
@@ -367,7 +373,7 @@ export default class Tracker extends Plugin {
 
                 // console.log("Search inline tags");
                 if (content && query.getType() === SearchType.Tag) {
-                    collecting.collectDataFromInlineTag(
+                    gotAnyValidYValue ||= collecting.collectDataFromInlineTag(
                         content,
                         query,
                         renderInfo,
@@ -378,7 +384,7 @@ export default class Tracker extends Plugin {
 
                 // console.log("Search Text");
                 if (content && query.getType() === SearchType.Text) {
-                    collecting.collectDataFromText(
+                    gotAnyValidYValue ||= collecting.collectDataFromText(
                         content,
                         query,
                         renderInfo,
@@ -389,7 +395,7 @@ export default class Tracker extends Plugin {
 
                 // console.log("Search FileMeta");
                 if (query.getType() === SearchType.FileMeta) {
-                    collecting.collectDataFromFileMeta(
+                    gotAnyValidYValue ||= collecting.collectDataFromFileMeta(
                         file,
                         content,
                         query,
@@ -401,7 +407,7 @@ export default class Tracker extends Plugin {
 
                 // console.log("Search dvField");
                 if (content && query.getType() === SearchType.dvField) {
-                    collecting.collectDataFromDvField(
+                    gotAnyValidYValue ||= collecting.collectDataFromDvField(
                         content,
                         query,
                         renderInfo,
@@ -417,7 +423,7 @@ export default class Tracker extends Plugin {
                         query.getType() === SearchType.TaskDone ||
                         query.getType() === SearchType.TaskNotDone)
                 ) {
-                    collecting.collectDataFromTask(
+                    gotAnyValidYValue ||= collecting.collectDataFromTask(
                         content,
                         query,
                         renderInfo,
@@ -593,11 +599,17 @@ export default class Tracker extends Plugin {
             }
             // console.log(xValues);
 
-            if (xValues.every((v) => v === null)) {
-                let errorMessage = "No valid X value found";
+            if (
+                xValues.every((v) => {
+                    return v === null;
+                })
+            ) {
+                let errorMessage = "No valid X value found in table";
                 renderErrorMessage(canvas, errorMessage);
                 el.appendChild(canvas);
                 return;
+            } else {
+                gotAnyValidXValue ||= true;
             }
 
             // get y data
@@ -621,6 +633,7 @@ export default class Tracker extends Plugin {
                                     indLine < xValues.length &&
                                     xValues[indLine]
                                 ) {
+                                    gotAnyValidYValue ||= true;
                                     collecting.addToDataMap(
                                         dataMap,
                                         helper.dateToStr(
@@ -645,6 +658,7 @@ export default class Tracker extends Plugin {
                                     indLine < xValues.length &&
                                     xValues[indLine]
                                 ) {
+                                    gotAnyValidYValue ||= true;
                                     collecting.addToDataMap(
                                         dataMap,
                                         helper.dateToStr(
@@ -664,6 +678,20 @@ export default class Tracker extends Plugin {
             }
         }
 
+        if (!gotAnyValidXValue) {
+            let errorMessage = "No valid X values found in notes";
+            renderErrorMessage(canvas, errorMessage);
+            el.appendChild(canvas);
+            return;
+        }
+
+        if (!gotAnyValidYValue) {
+            let errorMessage = "No valid Y values found in notes";
+            renderErrorMessage(canvas, errorMessage);
+            el.appendChild(canvas);
+            return;
+        }
+
         if (fileCounter === 0) {
             let errorMessage =
                 "No notes found under the given search condition";

From c7cc31dbe175592dbd875009d6c507fe446443ba Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 9 Aug 2021 17:38:17 +0800
Subject: [PATCH 185/402] Fix type mismatch

---
 src/collecting.ts | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/collecting.ts b/src/collecting.ts
index 528af6b..67f2b27 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -43,14 +43,17 @@ export function getDateFromFrontmatter(
         if (helper.deepValue(frontMatter, query.getTarget())) {
             let strDate = helper.deepValue(frontMatter, query.getTarget());
 
-            strDate = helper.getDateStringFromInputString(
-                strDate,
-                renderInfo.dateFormatPrefix,
-                renderInfo.dateFormatSuffix
-            );
+            // We only support single value for now
+            if (typeof strDate === "string") {
+                strDate = helper.getDateStringFromInputString(
+                    strDate,
+                    renderInfo.dateFormatPrefix,
+                    renderInfo.dateFormatSuffix
+                );
 
-            date = helper.strToDate(strDate, renderInfo.dateFormat);
-            // console.log(date);
+                date = helper.strToDate(strDate, renderInfo.dateFormat);
+                // console.log(date);
+            }
         }
     }
 

From 2767285e5decdfebe5fd41364d446bea60b58d82 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 9 Aug 2021 18:02:12 +0800
Subject: [PATCH 186/402] Fix wrong external label sizes

---
 examples/TestPieChart.md | 2 +-
 src/pie.ts               | 9 +++++----
 styles.css               | 6 ++++++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/examples/TestPieChart.md b/examples/TestPieChart.md
index d84f357..480b9d4 100644
--- a/examples/TestPieChart.md
+++ b/examples/TestPieChart.md
@@ -94,7 +94,7 @@ searchTarget: Say I love you, Say I love you
 datasetName: Done, NotDone
 pie:
     label: '{{0.5/28.5*100}}%, {{4/28.5*100}}%, {{6/28.5*100}}%, {{8/28.5*100}}%, {{10/28.5*100}}%'
-    extLabel: 'A {{0.5/28.5*100}}%, B, C, D, E'
+    extLabel: 'DataA {{0.5/28.5*100}}%, DataB, DataC, DataD, DataE'
     data: '0.5, 4, 6, 8, 10'
     dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
     ratioInnerRadius: 0.6
diff --git a/src/pie.ts b/src/pie.ts
index da298c5..46080a3 100644
--- a/src/pie.ts
+++ b/src/pie.ts
@@ -415,9 +415,10 @@ function renderPie(
     // console.log(extLabels);
 
     // extLabel sizes
-    let extLabelSizes = labels.map(function (n) {
-        return helper.measureTextSize(n, "tracker-tick-label");
+    let extLabelSizes = extLabels.map(function (n) {
+        return helper.measureTextSize(n, "tracker-pie-label");
     });
+    // console.log(extLabelSizes);
 
     let showExtLabelOnlyIfNoLabel = pieInfo.showExtLabelOnlyIfNoLabel;
 
@@ -491,7 +492,7 @@ function renderPie(
             );
         })
         .style("text-anchor", "middle")
-        .attr("class", "tracker-tick-label");
+        .attr("class", "tracker-pie-label");
 
     function getMidAngle(arcObj: any) {
         return arcObj.startAngle + (arcObj.endAngle - arcObj.startAngle) / 2;
@@ -526,7 +527,7 @@ function renderPie(
             let midAngle = getMidAngle(arcObj);
             return midAngle < Math.PI ? "start" : "end";
         })
-        .attr("class", "tracker-tick-label");
+        .attr("class", "tracker-pie-label");
 
     function getPointsForConnectionLines(arcObj: any, i: number) {
         let labelWidth = labelSizes[i].width;
diff --git a/styles.css b/styles.css
index 4e31eca..9cd8b4c 100644
--- a/styles.css
+++ b/styles.css
@@ -173,4 +173,10 @@
     text-anchor: middle;
     font-size: 10px;
     stroke: none;
+}
+
+.tracker-pie-label {
+    fill: var(--color-tick-label);
+    stroke: none;
+    font-size: 12px;
 }
\ No newline at end of file

From c6f2dd1c427abe2084263d4bf6508783835921f7 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Wed, 11 Aug 2021 13:30:21 +0800
Subject: [PATCH 187/402] Set version to 1.10.0

---
 manifest.json | 2 +-
 package.json  | 2 +-
 versions.json | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index 8635ef3..b6036da 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-tracker",
 	"name": "Tracker",
-	"version": "1.9.2",
+	"version": "1.10.0",
 	"minAppVersion": "0.9.12",
 	"description": "A plugin tracks occurrences and numbers in your notes",
 	"author": "pyrochlore",
diff --git a/package.json b/package.json
index 38fb7b0..9fc8906 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.9.2",
+  "version": "1.10.0",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
diff --git a/versions.json b/versions.json
index 4ea18cc..0f2082e 100644
--- a/versions.json
+++ b/versions.json
@@ -18,5 +18,6 @@
 	"1.8.2": "0.9.12",
 	"1.9.0": "0.9.12",
 	"1.9.1": "0.9.12",
-	"1.9.2": "0.9.12"
+	"1.9.2": "0.9.12",
+	"1.10.0": "0.9.12"
 }

From 9abb5d870598be36e83ca0178b9006f914cfdf15 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Wed, 11 Aug 2021 14:40:36 +0800
Subject: [PATCH 188/402] Replace tab by spaces in examples

---
 examples/TestAxisIntervalAndFormat.md | 18 +++++++++---------
 examples/TestDvField.md               |  8 ++++----
 examples/TestPieChart.md              |  9 ++++++++-
 examples/TestSummary.md               |  2 +-
 examples/TestTextValueMap.md          |  6 +++---
 examples/TestTimeValues.md            | 10 +++++-----
 examples/TestWordCounting.md          |  8 ++++----
 examples/TestXDataset.md              |  8 ++++----
 examples/WeightTracker.md             |  2 +-
 9 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/examples/TestAxisIntervalAndFormat.md b/examples/TestAxisIntervalAndFormat.md
index b3a8733..35f1689 100644
--- a/examples/TestAxisIntervalAndFormat.md
+++ b/examples/TestAxisIntervalAndFormat.md
@@ -14,8 +14,8 @@ line:
     yAxisLabel: Weight
     yAxisUnit: kg
     lineColor: yellow
-	yAxisTickInterval: 5
-	yMin: 55
+    yAxisTickInterval: 5
+    yMin: 55
 ```
 
 Y values in time
@@ -28,12 +28,12 @@ datasetName: Clock-In, Clock-Out
 line:
     title: "Working Hours"
     yAxisLabel: "Time (24h)"
-	reverseYAxis: true
+    reverseYAxis: true
     lineColor: yellow, red
     showPoint: true
     yAxisTickInterval: 1h
-	yMin: 06:00
-	yMax: 23:00
+    yMin: 06:00
+    yMax: 23:00
 ```
 
 ## Y Axis Tick Label Format
@@ -49,9 +49,9 @@ line:
     yAxisLabel: Weight
     yAxisUnit: kg
     lineColor: yellow
-	yAxisTickInterval: 5
+    yAxisTickInterval: 5
     yAxisTickLabelFormat: .2f
-	yMin: 55
+    yMin: 55
 ```
 
 Y values in time
@@ -64,7 +64,7 @@ datasetName: Clock-In, Clock-Out
 line:
     title: "Working Hours"
     yAxisLabel: "Time (24h)"
-	reverseYAxis: true
+    reverseYAxis: true
     lineColor: yellow, red
     showPoint: true
     yMin: 05:00
@@ -101,5 +101,5 @@ line:
     yAxisUnit: kg
     lineColor: yellow
     xAxisTickInterval: 7d
-	xAxisTickLabelFormat: M-DD
+    xAxisTickLabelFormat: M-DD
 ```
\ No newline at end of file
diff --git a/examples/TestDvField.md b/examples/TestDvField.md
index 7fb7877..5f0add1 100644
--- a/examples/TestDvField.md
+++ b/examples/TestDvField.md
@@ -9,7 +9,7 @@ startDate: 2021-01-01
 endDate: 2021-01-31
 line:
     title: dvField
-	lineColor: green
+    lineColor: green
 ```
 
 Field with a space
@@ -21,7 +21,7 @@ startDate: 2021-01-01
 endDate: 2021-01-31
 line:
     title: dvField
-	lineColor: yellow
+    lineColor: yellow
 ```
 
 Field with a dash line
@@ -33,7 +33,7 @@ startDate: 2021-01-01
 endDate: 2021-01-31
 line:
     title: dvField
-	lineColor: red
+    lineColor: red
 ```
 
 Extract the first value from multiple values
@@ -45,7 +45,7 @@ startDate: 2021-01-01
 endDate: 2021-01-31
 line:
     title: dvField
-	lineColor: blue
+    lineColor: blue
 ```
 
 Multiple values separated by '/' (default)
diff --git a/examples/TestPieChart.md b/examples/TestPieChart.md
index 480b9d4..b6927a9 100644
--- a/examples/TestPieChart.md
+++ b/examples/TestPieChart.md
@@ -1,5 +1,12 @@
 # Test Pie Chart
-
+``` tracker
+searchType: task.done, task.notdone
+searchTarget: Say I love you, Say I love you
+folder: diary
+summary:
+    template: "How many days I said love: {{sum(dataset(0))::i}}\nHow many days I didn't say love: {{sum(dataset(1))::i}}"
+```
+<!--
 Expressions could be used in parameter `data`, `label`, and `extLabel`.
 
 ## Manual Input Data
diff --git a/examples/TestSummary.md b/examples/TestSummary.md
index b9c4c6d..fb3d158 100644
--- a/examples/TestSummary.md
+++ b/examples/TestSummary.md
@@ -7,7 +7,7 @@ searchType: tag
 searchTarget: weight
 folder: diary
 summary:
-  template: "Minimum: {{min()}}kg\nMaximum: {{max()}}kg\nMedian: {{median()}}kg\nAverage: {{average()}}kg"
+    template: "Minimum: {{min()}}kg\nMaximum: {{max()}}kg\nMedian: {{median()}}kg\nAverage: {{average()}}kg"
 ```
 
 ## Styling
diff --git a/examples/TestTextValueMap.md b/examples/TestTextValueMap.md
index fe2118f..93a1d0b 100644
--- a/examples/TestTextValueMap.md
+++ b/examples/TestTextValueMap.md
@@ -16,7 +16,7 @@ line:
     title: "Mood"
     yAxisLabel: Mood
     lineColor: "#d65d0e"
-	yAxisTickInterval: 1
-	yAxisTickLabelFormat: i
-	yMin: 0
+    yAxisTickInterval: 1
+    yAxisTickLabelFormat: i
+    yMin: 0
 ```
diff --git a/examples/TestTimeValues.md b/examples/TestTimeValues.md
index 3432d57..31a3994 100644
--- a/examples/TestTimeValues.md
+++ b/examples/TestTimeValues.md
@@ -11,7 +11,7 @@ datasetName: Clock-In, Clock-Out
 line:
     title: "Working Hours"
     yAxisLabel: "Time (24h)"
-	reverseYAxis: true
+    reverseYAxis: true
     lineColor: yellow, red
     showPoint: true
 	showLegend: true
@@ -30,7 +30,7 @@ line:
     yAxisLabel: "Time (24h)"
     lineColor: yellow, red
     showPoint: true
-	showLegend: true
+    showLegend: true
 ```
 
 ## From dvField
@@ -45,10 +45,10 @@ datasetName: Clock-In, Clock-Out
 line:
     title: "Working Hours"
     yAxisLabel: "Time (24h)"
-	reverseYAxis: true
+    reverseYAxis: true
     lineColor: yellow, red
     showPoint: true
-	showLegend: true
+    showLegend: true
 ```
 
 Sleep time separated by / from dvField
@@ -64,7 +64,7 @@ line:
     yAxisLabel: "Time (24h)"
     lineColor: yellow, red
     showPoint: true
-	showLegend: true
+    showLegend: true
 ```
 
 Please also check those search targets in markdown files under folder 'diary'.
\ No newline at end of file
diff --git a/examples/TestWordCounting.md b/examples/TestWordCounting.md
index 727b809..8d59613 100644
--- a/examples/TestWordCounting.md
+++ b/examples/TestWordCounting.md
@@ -11,10 +11,10 @@ endDate: 2021-01-05
 datasetName: words, chars
 line:
     title: Word Counting
-	yAxisLocation: left, right
-	yAxisLabel: Words, Characters
-	lineColor: red, yellow
-	showLegend: true
+    yAxisLocation: left, right
+    yAxisLabel: Words, Characters
+    lineColor: red, yellow
+    showLegend: true
 ```
 
 ``` tracker
diff --git a/examples/TestXDataset.md b/examples/TestXDataset.md
index 288284c..c657268 100644
--- a/examples/TestXDataset.md
+++ b/examples/TestXDataset.md
@@ -18,7 +18,7 @@ xDataset: 0
 folder: data
 line:
     title: Dataview Inline Field
-	fillGap: true
+    fillGap: true
 ```
 
 Use dates from date-attached tags as x values
@@ -29,7 +29,7 @@ xDataset: 0
 folder: data
 line:
     title: Dataview Inline Field
-	fillGap: true
+    fillGap: true
 ```
 
 Ue dates from Dataview inline fields as x values
@@ -40,7 +40,7 @@ xDataset: 0
 folder: data
 line:
     title: Dataview Inline Field
-	fillGap: true
+    fillGap: true
 ```
 
 Ue dates from formatted text as x values
@@ -51,7 +51,7 @@ xDataset: 0
 folder: data
 line:
     title: Dataview Inline Field
-	fillGap: true
+    fillGap: true
 ```
 
 Please also check those search targets in markdown files under folder 'data'.
\ No newline at end of file
diff --git a/examples/WeightTracker.md b/examples/WeightTracker.md
index 0c1f671..abc4881 100644
--- a/examples/WeightTracker.md
+++ b/examples/WeightTracker.md
@@ -19,7 +19,7 @@ searchType: tag
 searchTarget: weight
 folder: diary
 summary:
-  template: "Minimum: {{min()}}kg\nMaximum: {{max()}}kg\nMedian: {{median()}}kg\nAverage: {{average()}}kg"
+    template: "Minimum: {{min()}}kg\nMaximum: {{max()}}kg\nMedian: {{median()}}kg\nAverage: {{average()}}kg"
 ```
 
 ``` tracker

From 70b85ce7fcee44e2e7b98049e304c20a17b5d17b Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 12 Aug 2021 01:24:50 +0800
Subject: [PATCH 189/402] Refactor table data collecting to function
 collectDataFromTable

---
 src/data.ts |  18 ++
 src/main.ts | 465 +++++++++++++++++++++++++++-------------------------
 2 files changed, 261 insertions(+), 222 deletions(-)

diff --git a/src/data.ts b/src/data.ts
index 775d070..d4d14de 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -999,5 +999,23 @@ export class TableData {
     }
 }
 
+export class CollectingProcessInfo {
+    fileCounter: number;
+    errorMessage: string;
+    minDate: Moment;
+    maxDate: Moment;
+    gotAnyValidXValue: boolean;
+    gotAnyValidYValue: boolean;
+
+    constructor() {
+        this.fileCounter = 0;
+        this.errorMessage = "";
+        this.minDate = window.moment(""); // invalid date
+        this.maxDate = window.moment(""); // invalid date
+        this.gotAnyValidXValue = false;
+        this.gotAnyValidYValue = false;
+    }
+}
+
 export type XValueMap = Map<number, string>;
 export type DataMap = Map<string, Array<QueryValuePair>>;
diff --git a/src/main.ts b/src/main.ts
index 8a865ee..dc238cc 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -14,6 +14,7 @@ import {
     XValueMap,
     DataMap,
     CustomDatasetInfo,
+    CollectingProcessInfo,
 } from "./data";
 import * as collecting from "./collecting";
 import {
@@ -155,13 +156,9 @@ export default class Tracker extends Plugin {
         // Use own settings panel for now
 
         // Collecting data to dataMap first
-        let minDate = window.moment("");
-        let maxDate = window.moment("");
-        let fileCounter = 0;
-
         let dataMap: DataMap = new Map(); // {strDate: [query: value, ...]}
-        let gotAnyValidXValue = false;
-        let gotAnyValidYValue = false;
+        let processInfo = new CollectingProcessInfo();
+
         // Collect data from files, each file has one data point for each query
         const loopFilePromises = files.map(async (file) => {
             // console.log(file.basename);
@@ -216,6 +213,7 @@ export default class Tracker extends Plugin {
             let skipThisFile = false;
             // console.log(renderInfo.xDataset);
             for (let xDatasetId of renderInfo.xDataset) {
+                // console.log(`xDatasetId: ${xDatasetId}`);
                 if (!xValueMap.has(xDatasetId)) {
                     let xDate = window.moment("");
                     if (xDatasetId === -1) {
@@ -294,23 +292,23 @@ export default class Tracker extends Plugin {
                     }
 
                     if (!skipThisFile) {
-                        gotAnyValidXValue ||= true;
+                        processInfo.gotAnyValidXValue ||= true;
                         xValueMap.set(
                             xDatasetId,
                             helper.dateToStr(xDate, renderInfo.dateFormat)
                         );
-                        fileCounter++;
+                        processInfo.fileCounter++;
 
                         // Get min/max date
-                        if (fileCounter == 1) {
-                            minDate = xDate.clone();
-                            maxDate = xDate.clone();
+                        if (processInfo.fileCounter == 1) {
+                            processInfo.minDate = xDate.clone();
+                            processInfo.maxDate = xDate.clone();
                         } else {
-                            if (xDate < minDate) {
-                                minDate = xDate.clone();
+                            if (xDate < processInfo.minDate) {
+                                processInfo.minDate = xDate.clone();
                             }
-                            if (xDate > maxDate) {
-                                maxDate = xDate.clone();
+                            if (xDate > processInfo.maxDate) {
+                                processInfo.maxDate = xDate.clone();
                             }
                         }
                     }
@@ -325,6 +323,7 @@ export default class Tracker extends Plugin {
             let yDatasetQueries = renderInfo.queries.filter((q) => {
                 return q.getType() !== SearchType.Table && !q.usedAsXDataset;
             });
+            // console.log(yDatasetQueries);
 
             const loopQueryPromises = yDatasetQueries.map(async (query) => {
                 // Get xValue from file if xDataset assigned
@@ -334,7 +333,7 @@ export default class Tracker extends Plugin {
                 // console.log("Search frontmatter tags");
                 if (fileCache && query.getType() === SearchType.Tag) {
                     // Add frontmatter tags, allow simple tag only
-                    gotAnyValidYValue ||=
+                    processInfo.gotAnyValidYValue ||=
                         collecting.collectDataFromFrontmatterTag(
                             fileCache,
                             query,
@@ -350,7 +349,7 @@ export default class Tracker extends Plugin {
                     query.getType() === SearchType.Frontmatter &&
                     query.getTarget() !== "tags"
                 ) {
-                    gotAnyValidYValue ||=
+                    processInfo.gotAnyValidYValue ||=
                         collecting.collectDataFromFrontmatterKey(
                             fileCache,
                             query,
@@ -362,58 +361,63 @@ export default class Tracker extends Plugin {
 
                 // console.log("Search wiki links");
                 if (fileCache && query.getType() === SearchType.Wiki) {
-                    gotAnyValidYValue ||= collecting.collectDataFromWiki(
-                        fileCache,
-                        query,
-                        renderInfo,
-                        dataMap,
-                        xValueMap
-                    );
+                    processInfo.gotAnyValidYValue ||=
+                        collecting.collectDataFromWiki(
+                            fileCache,
+                            query,
+                            renderInfo,
+                            dataMap,
+                            xValueMap
+                        );
                 }
 
                 // console.log("Search inline tags");
                 if (content && query.getType() === SearchType.Tag) {
-                    gotAnyValidYValue ||= collecting.collectDataFromInlineTag(
-                        content,
-                        query,
-                        renderInfo,
-                        dataMap,
-                        xValueMap
-                    );
+                    processInfo.gotAnyValidYValue ||=
+                        collecting.collectDataFromInlineTag(
+                            content,
+                            query,
+                            renderInfo,
+                            dataMap,
+                            xValueMap
+                        );
                 } // Search inline tags
 
                 // console.log("Search Text");
                 if (content && query.getType() === SearchType.Text) {
-                    gotAnyValidYValue ||= collecting.collectDataFromText(
-                        content,
-                        query,
-                        renderInfo,
-                        dataMap,
-                        xValueMap
-                    );
+                    processInfo.gotAnyValidYValue ||=
+                        collecting.collectDataFromText(
+                            content,
+                            query,
+                            renderInfo,
+                            dataMap,
+                            xValueMap
+                        );
                 } // Search text
 
                 // console.log("Search FileMeta");
                 if (query.getType() === SearchType.FileMeta) {
-                    gotAnyValidYValue ||= collecting.collectDataFromFileMeta(
-                        file,
-                        content,
-                        query,
-                        renderInfo,
-                        dataMap,
-                        xValueMap
-                    );
+                    processInfo.gotAnyValidYValue ||=
+                        collecting.collectDataFromFileMeta(
+                            file,
+                            content,
+                            query,
+                            renderInfo,
+                            dataMap,
+                            xValueMap
+                        );
                 } // Search FileMeta
 
                 // console.log("Search dvField");
                 if (content && query.getType() === SearchType.dvField) {
-                    gotAnyValidYValue ||= collecting.collectDataFromDvField(
-                        content,
-                        query,
-                        renderInfo,
-                        dataMap,
-                        xValueMap
-                    );
+                    processInfo.gotAnyValidYValue ||=
+                        collecting.collectDataFromDvField(
+                            content,
+                            query,
+                            renderInfo,
+                            dataMap,
+                            xValueMap
+                        );
                 } // search dvField
 
                 // console.log("Search Task");
@@ -423,13 +427,14 @@ export default class Tracker extends Plugin {
                         query.getType() === SearchType.TaskDone ||
                         query.getType() === SearchType.TaskNotDone)
                 ) {
-                    gotAnyValidYValue ||= collecting.collectDataFromTask(
-                        content,
-                        query,
-                        renderInfo,
-                        dataMap,
-                        xValueMap
-                    );
+                    processInfo.gotAnyValidYValue ||=
+                        collecting.collectDataFromTask(
+                            content,
+                            query,
+                            renderInfo,
+                            dataMap,
+                            xValueMap
+                        );
                 } // search Task
             });
             await Promise.all(loopQueryPromises);
@@ -438,6 +443,168 @@ export default class Tracker extends Plugin {
         // console.log(dataMap);
 
         // Collect data from a file, one file contains full dataset
+        await this.collectDataFromTable(dataMap, renderInfo, processInfo);
+        if (processInfo.errorMessage) {
+            renderErrorMessage(canvas, processInfo.errorMessage);
+            el.appendChild(canvas);
+            return;
+        }
+
+        if (!processInfo.gotAnyValidXValue) {
+            let errorMessage = "No valid X values found in notes";
+            renderErrorMessage(canvas, errorMessage);
+            el.appendChild(canvas);
+            return;
+        }
+
+        if (!processInfo.gotAnyValidYValue) {
+            let errorMessage = "No valid Y values found in notes";
+            renderErrorMessage(canvas, errorMessage);
+            el.appendChild(canvas);
+            return;
+        }
+
+        if (processInfo.fileCounter === 0) {
+            let errorMessage =
+                "No notes found under the given search condition";
+            renderErrorMessage(canvas, errorMessage);
+            el.appendChild(canvas);
+            return;
+        }
+        // console.log(minDate);
+        // console.log(maxDate);
+        // console.log(dataMap);
+
+        // Check date range
+        if (!processInfo.minDate.isValid() || !processInfo.maxDate.isValid()) {
+            let errorMessage = "Invalid date range";
+            renderErrorMessage(canvas, errorMessage);
+            el.appendChild(canvas);
+            return;
+        }
+        if (renderInfo.startDate === null && renderInfo.endDate === null) {
+            // No date arguments
+            renderInfo.startDate = processInfo.minDate.clone();
+            renderInfo.endDate = processInfo.maxDate.clone();
+        } else if (
+            renderInfo.startDate !== null &&
+            renderInfo.endDate === null
+        ) {
+            if (renderInfo.startDate < processInfo.maxDate) {
+                renderInfo.endDate = processInfo.maxDate.clone();
+            } else {
+                let errorMessage = "Invalid date range";
+                renderErrorMessage(canvas, errorMessage);
+                el.appendChild(canvas);
+                return;
+            }
+        } else if (
+            renderInfo.endDate !== null &&
+            renderInfo.startDate === null
+        ) {
+            if (renderInfo.endDate > processInfo.minDate) {
+                renderInfo.startDate = processInfo.minDate.clone();
+            } else {
+                let errorMessage = "Invalid date range";
+                renderErrorMessage(canvas, errorMessage);
+                el.appendChild(canvas);
+                return;
+            }
+        } else {
+            // startDate and endDate are valid
+            if (
+                (renderInfo.startDate < processInfo.minDate &&
+                    renderInfo.endDate < processInfo.minDate) ||
+                (renderInfo.startDate > processInfo.maxDate &&
+                    renderInfo.endDate > processInfo.maxDate)
+            ) {
+                let errorMessage = "Invalid date range";
+                renderErrorMessage(canvas, errorMessage);
+                el.appendChild(canvas);
+                return;
+            }
+        }
+        // console.log(renderInfo.startDate);
+        // console.log(renderInfo.endDate);
+
+        // Reshape data for rendering
+        let datasets = new Datasets(renderInfo.startDate, renderInfo.endDate);
+        for (let query of renderInfo.queries) {
+            // We still create a dataset for xDataset,
+            // to keep the sequence and order of targets
+            let dataset = datasets.createDataset(query, renderInfo);
+            // Add number of targets to the dataset
+            // Number of targets has been accumulated while collecting data
+            dataset.addNumTargets(query.getNumTargets());
+            for (
+                let curDate = renderInfo.startDate.clone();
+                curDate <= renderInfo.endDate;
+                curDate.add(1, "days")
+            ) {
+                // console.log(curDate);
+
+                // dataMap --> {date: [query: value, ...]}
+                if (
+                    dataMap.has(
+                        helper.dateToStr(curDate, renderInfo.dateFormat)
+                    )
+                ) {
+                    let queryValuePairs = dataMap
+                        .get(helper.dateToStr(curDate, renderInfo.dateFormat))
+                        .filter(function (pair) {
+                            return pair.query.equalTo(query);
+                        });
+                    if (queryValuePairs.length > 0) {
+                        // Merge values of the same day same query
+                        let value = null;
+                        for (
+                            let indPair = 0;
+                            indPair < queryValuePairs.length;
+                            indPair++
+                        ) {
+                            let collected = queryValuePairs[indPair].value;
+                            if (
+                                Number.isNumber(collected) &&
+                                !Number.isNaN(collected)
+                            ) {
+                                if (value === null) {
+                                    value = collected;
+                                } else {
+                                    value += collected;
+                                }
+                            }
+                        }
+                        // console.log(hasValue);
+                        // console.log(value);
+                        if (value !== null) {
+                            dataset.setValue(curDate, value);
+                        }
+                    }
+                }
+            }
+        }
+        renderInfo.datasets = datasets;
+        // console.log(renderInfo.datasets);
+
+        let result = render(canvas, renderInfo);
+        if (typeof result === "string") {
+            let errorMessage = result;
+            renderErrorMessage(canvas, errorMessage);
+            el.appendChild(canvas);
+            return;
+        }
+
+        el.appendChild(canvas);
+    }
+
+    // TODO: remove this.app and move to collecting.ts
+    async collectDataFromTable(
+        dataMap: DataMap,
+        renderInfo: RenderInfo,
+        processInfo: CollectingProcessInfo
+    ) {
+        // console.log("collectDataFromTable");
+
         let tableQueries = renderInfo.queries.filter(
             (q) => q.getType() === SearchType.Table
         );
@@ -481,9 +648,7 @@ export default class Tracker extends Plugin {
 
         if (tableFileNotFound) {
             let errorMessage = "File containing tables not found";
-            renderErrorMessage(canvas, errorMessage);
-            el.appendChild(canvas);
-            return;
+            return errorMessage;
         }
 
         for (let tableData of tables) {
@@ -504,7 +669,7 @@ export default class Tracker extends Plugin {
                 normalizePath(filePath)
             );
             if (file && file instanceof TFile) {
-                fileCounter++;
+                processInfo.fileCounter++;
                 let content = await this.app.vault.adapter.read(file.path);
                 // console.log(content);
 
@@ -578,15 +743,18 @@ export default class Tracker extends Plugin {
                     if (date.isValid()) {
                         xValues.push(date);
 
-                        if (!minDate.isValid() && !maxDate.isValid()) {
-                            minDate = date.clone();
-                            maxDate = date.clone();
+                        if (
+                            !processInfo.minDate.isValid() &&
+                            !processInfo.maxDate.isValid()
+                        ) {
+                            processInfo.minDate = date.clone();
+                            processInfo.maxDate = date.clone();
                         } else {
-                            if (date < minDate) {
-                                minDate = date.clone();
+                            if (date < processInfo.minDate) {
+                                processInfo.minDate = date.clone();
                             }
-                            if (date > maxDate) {
-                                maxDate = date.clone();
+                            if (date > processInfo.maxDate) {
+                                processInfo.maxDate = date.clone();
                             }
                         }
                     } else {
@@ -605,11 +773,9 @@ export default class Tracker extends Plugin {
                 })
             ) {
                 let errorMessage = "No valid X value found in table";
-                renderErrorMessage(canvas, errorMessage);
-                el.appendChild(canvas);
-                return;
+                return errorMessage;
             } else {
-                gotAnyValidXValue ||= true;
+                processInfo.gotAnyValidXValue ||= true;
             }
 
             // get y data
@@ -633,7 +799,7 @@ export default class Tracker extends Plugin {
                                     indLine < xValues.length &&
                                     xValues[indLine]
                                 ) {
-                                    gotAnyValidYValue ||= true;
+                                    processInfo.gotAnyValidYValue ||= true;
                                     collecting.addToDataMap(
                                         dataMap,
                                         helper.dateToStr(
@@ -658,7 +824,7 @@ export default class Tracker extends Plugin {
                                     indLine < xValues.length &&
                                     xValues[indLine]
                                 ) {
-                                    gotAnyValidYValue ||= true;
+                                    processInfo.gotAnyValidYValue ||= true;
                                     collecting.addToDataMap(
                                         dataMap,
                                         helper.dateToStr(
@@ -677,151 +843,6 @@ export default class Tracker extends Plugin {
                 } // Loop over tableLines
             }
         }
-
-        if (!gotAnyValidXValue) {
-            let errorMessage = "No valid X values found in notes";
-            renderErrorMessage(canvas, errorMessage);
-            el.appendChild(canvas);
-            return;
-        }
-
-        if (!gotAnyValidYValue) {
-            let errorMessage = "No valid Y values found in notes";
-            renderErrorMessage(canvas, errorMessage);
-            el.appendChild(canvas);
-            return;
-        }
-
-        if (fileCounter === 0) {
-            let errorMessage =
-                "No notes found under the given search condition";
-            renderErrorMessage(canvas, errorMessage);
-            el.appendChild(canvas);
-            return;
-        }
-        // console.log(minDate);
-        // console.log(maxDate);
-        // console.log(dataMap);
-
-        // Check date range
-        if (!minDate.isValid() || !maxDate.isValid()) {
-            let errorMessage = "Invalid date range";
-            renderErrorMessage(canvas, errorMessage);
-            el.appendChild(canvas);
-            return;
-        }
-        if (renderInfo.startDate === null && renderInfo.endDate === null) {
-            // No date arguments
-            renderInfo.startDate = minDate.clone();
-            renderInfo.endDate = maxDate.clone();
-        } else if (
-            renderInfo.startDate !== null &&
-            renderInfo.endDate === null
-        ) {
-            if (renderInfo.startDate < maxDate) {
-                renderInfo.endDate = maxDate.clone();
-            } else {
-                let errorMessage = "Invalid date range";
-                renderErrorMessage(canvas, errorMessage);
-                el.appendChild(canvas);
-                return;
-            }
-        } else if (
-            renderInfo.endDate !== null &&
-            renderInfo.startDate === null
-        ) {
-            if (renderInfo.endDate > minDate) {
-                renderInfo.startDate = minDate.clone();
-            } else {
-                let errorMessage = "Invalid date range";
-                renderErrorMessage(canvas, errorMessage);
-                el.appendChild(canvas);
-                return;
-            }
-        } else {
-            // startDate and endDate are valid
-            if (
-                (renderInfo.startDate < minDate &&
-                    renderInfo.endDate < minDate) ||
-                (renderInfo.startDate > maxDate && renderInfo.endDate > maxDate)
-            ) {
-                let errorMessage = "Invalid date range";
-                renderErrorMessage(canvas, errorMessage);
-                el.appendChild(canvas);
-                return;
-            }
-        }
-        // console.log(renderInfo.startDate);
-        // console.log(renderInfo.endDate);
-
-        // Reshape data for rendering
-        let datasets = new Datasets(renderInfo.startDate, renderInfo.endDate);
-        for (let query of renderInfo.queries) {
-            // We still create a dataset for xDataset,
-            // to keep the sequence and order of targets
-            let dataset = datasets.createDataset(query, renderInfo);
-            // Add number of targets to the dataset
-            // Number of targets has been accumulated while collecting data
-            dataset.addNumTargets(query.getNumTargets());
-            for (
-                let curDate = renderInfo.startDate.clone();
-                curDate <= renderInfo.endDate;
-                curDate.add(1, "days")
-            ) {
-                // console.log(curDate);
-
-                // dataMap --> {date: [query: value, ...]}
-                if (
-                    dataMap.has(
-                        helper.dateToStr(curDate, renderInfo.dateFormat)
-                    )
-                ) {
-                    let queryValuePairs = dataMap
-                        .get(helper.dateToStr(curDate, renderInfo.dateFormat))
-                        .filter(function (pair) {
-                            return pair.query.equalTo(query);
-                        });
-                    if (queryValuePairs.length > 0) {
-                        // Merge values of the same day same query
-                        let value = null;
-                        for (
-                            let indPair = 0;
-                            indPair < queryValuePairs.length;
-                            indPair++
-                        ) {
-                            let collected = queryValuePairs[indPair].value;
-                            if (
-                                Number.isNumber(collected) &&
-                                !Number.isNaN(collected)
-                            ) {
-                                if (value === null) {
-                                    value = collected;
-                                } else {
-                                    value += collected;
-                                }
-                            }
-                        }
-                        // console.log(hasValue);
-                        // console.log(value);
-                        if (value !== null) {
-                            dataset.setValue(curDate, value);
-                        }
-                    }
-                }
-            }
-        }
-        renderInfo.datasets = datasets;
-        // console.log(renderInfo.datasets);
-
-        let result = render(canvas, renderInfo);
-        if (typeof result === "string") {
-            let errorMessage = result;
-            renderErrorMessage(canvas, errorMessage);
-            el.appendChild(canvas);
-            return;
-        }
-
-        el.appendChild(canvas);
     }
 
     getEditor(): Editor {

From ea37615c453ac21cf87fcc47fca7019e90039590 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 12 Aug 2021 02:13:47 +0800
Subject: [PATCH 190/402] Fix using logical unary assignment operators

---
 src/collecting.ts |   2 +
 src/main.ts       | 131 +++++++++++++++++++++++-----------------------
 2 files changed, 68 insertions(+), 65 deletions(-)

diff --git a/src/collecting.ts b/src/collecting.ts
index 67f2b27..fcf95ae 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -12,6 +12,7 @@ import {
 import * as helper from "./helper";
 
 export function getDateFromFilename(file: TFile, renderInfo: RenderInfo) {
+    // console.log(`getDateFromFilename: ${file.name}`);
     let fileBaseName = file.basename;
 
     let dateString = helper.getDateStringFromInputString(
@@ -796,6 +797,7 @@ export function collectDataFromTask(
     dataMap: DataMap,
     xValueMap: XValueMap
 ): boolean {
+    // console.log("collectDataFromTask");
     let searchType = query.getType();
     // console.log(searchType);
 
diff --git a/src/main.ts b/src/main.ts
index dc238cc..e46dbb2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -329,18 +329,19 @@ export default class Tracker extends Plugin {
                 // Get xValue from file if xDataset assigned
                 // if (renderInfo.xDataset !== null)
                 // let xDatasetId = renderInfo.xDataset;
+                // console.log(query);
 
                 // console.log("Search frontmatter tags");
                 if (fileCache && query.getType() === SearchType.Tag) {
                     // Add frontmatter tags, allow simple tag only
-                    processInfo.gotAnyValidYValue ||=
-                        collecting.collectDataFromFrontmatterTag(
-                            fileCache,
-                            query,
-                            renderInfo,
-                            dataMap,
-                            xValueMap
-                        );
+                    let gotAnyValue = collecting.collectDataFromFrontmatterTag(
+                        fileCache,
+                        query,
+                        renderInfo,
+                        dataMap,
+                        xValueMap
+                    );
+                    processInfo.gotAnyValidYValue ||= gotAnyValue;
                 } // Search frontmatter tags
 
                 // console.log("Search frontmatter keys");
@@ -349,75 +350,75 @@ export default class Tracker extends Plugin {
                     query.getType() === SearchType.Frontmatter &&
                     query.getTarget() !== "tags"
                 ) {
-                    processInfo.gotAnyValidYValue ||=
-                        collecting.collectDataFromFrontmatterKey(
-                            fileCache,
-                            query,
-                            renderInfo,
-                            dataMap,
-                            xValueMap
-                        );
+                    let gotAnyValue = collecting.collectDataFromFrontmatterKey(
+                        fileCache,
+                        query,
+                        renderInfo,
+                        dataMap,
+                        xValueMap
+                    );
+                    processInfo.gotAnyValidYValue ||= gotAnyValue;
                 } // console.log("Search frontmatter keys");
 
                 // console.log("Search wiki links");
                 if (fileCache && query.getType() === SearchType.Wiki) {
-                    processInfo.gotAnyValidYValue ||=
-                        collecting.collectDataFromWiki(
-                            fileCache,
-                            query,
-                            renderInfo,
-                            dataMap,
-                            xValueMap
-                        );
+                    let gotAnyValue = collecting.collectDataFromWiki(
+                        fileCache,
+                        query,
+                        renderInfo,
+                        dataMap,
+                        xValueMap
+                    );
+                    processInfo.gotAnyValidYValue ||= gotAnyValue;
                 }
 
                 // console.log("Search inline tags");
                 if (content && query.getType() === SearchType.Tag) {
-                    processInfo.gotAnyValidYValue ||=
-                        collecting.collectDataFromInlineTag(
-                            content,
-                            query,
-                            renderInfo,
-                            dataMap,
-                            xValueMap
-                        );
+                    let gotAnyValue = collecting.collectDataFromInlineTag(
+                        content,
+                        query,
+                        renderInfo,
+                        dataMap,
+                        xValueMap
+                    );
+                    processInfo.gotAnyValidYValue ||= gotAnyValue;
                 } // Search inline tags
 
                 // console.log("Search Text");
                 if (content && query.getType() === SearchType.Text) {
-                    processInfo.gotAnyValidYValue ||=
-                        collecting.collectDataFromText(
-                            content,
-                            query,
-                            renderInfo,
-                            dataMap,
-                            xValueMap
-                        );
+                    let gotAnyValue = collecting.collectDataFromText(
+                        content,
+                        query,
+                        renderInfo,
+                        dataMap,
+                        xValueMap
+                    );
+                    processInfo.gotAnyValidYValue ||= gotAnyValue;
                 } // Search text
 
                 // console.log("Search FileMeta");
                 if (query.getType() === SearchType.FileMeta) {
-                    processInfo.gotAnyValidYValue ||=
-                        collecting.collectDataFromFileMeta(
-                            file,
-                            content,
-                            query,
-                            renderInfo,
-                            dataMap,
-                            xValueMap
-                        );
+                    let gotAnyValue = collecting.collectDataFromFileMeta(
+                        file,
+                        content,
+                        query,
+                        renderInfo,
+                        dataMap,
+                        xValueMap
+                    );
+                    processInfo.gotAnyValidYValue ||= gotAnyValue;
                 } // Search FileMeta
 
                 // console.log("Search dvField");
                 if (content && query.getType() === SearchType.dvField) {
-                    processInfo.gotAnyValidYValue ||=
-                        collecting.collectDataFromDvField(
-                            content,
-                            query,
-                            renderInfo,
-                            dataMap,
-                            xValueMap
-                        );
+                    let gotAnyValue = collecting.collectDataFromDvField(
+                        content,
+                        query,
+                        renderInfo,
+                        dataMap,
+                        xValueMap
+                    );
+                    processInfo.gotAnyValidYValue ||= gotAnyValue;
                 } // search dvField
 
                 // console.log("Search Task");
@@ -427,14 +428,14 @@ export default class Tracker extends Plugin {
                         query.getType() === SearchType.TaskDone ||
                         query.getType() === SearchType.TaskNotDone)
                 ) {
-                    processInfo.gotAnyValidYValue ||=
-                        collecting.collectDataFromTask(
-                            content,
-                            query,
-                            renderInfo,
-                            dataMap,
-                            xValueMap
-                        );
+                    let gotAnyValue = collecting.collectDataFromTask(
+                        content,
+                        query,
+                        renderInfo,
+                        dataMap,
+                        xValueMap
+                    );
+                    processInfo.gotAnyValidYValue ||= gotAnyValue;
                 } // search Task
             });
             await Promise.all(loopQueryPromises);

From fc20ce26b11cdcada7ee822c6c42ce781b77a71a Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 12 Aug 2021 02:15:27 +0800
Subject: [PATCH 191/402] Update example TestPieChart.md

---
 examples/TestPieChart.md | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/examples/TestPieChart.md b/examples/TestPieChart.md
index b6927a9..999f677 100644
--- a/examples/TestPieChart.md
+++ b/examples/TestPieChart.md
@@ -1,12 +1,5 @@
 # Test Pie Chart
-``` tracker
-searchType: task.done, task.notdone
-searchTarget: Say I love you, Say I love you
-folder: diary
-summary:
-    template: "How many days I said love: {{sum(dataset(0))::i}}\nHow many days I didn't say love: {{sum(dataset(1))::i}}"
-```
-<!--
+
 Expressions could be used in parameter `data`, `label`, and `extLabel`.
 
 ## Manual Input Data
@@ -48,7 +41,7 @@ searchTarget: Say I love you, Say I love you
 datasetName: Done, NotDone
 pie:
     title: Manual Input Data
-	label: '{{2/30*100}}%, {{4/30*100}}%, {{6/30*100}}%, {{8/30*100}}%, {{10/30*100}}%'
+    label: '{{2/30*100}}%, {{4/30*100}}%, {{6/30*100}}%, {{8/30*100}}%, {{10/30*100}}%'
     data: '2, 4, 6, 8, 10'
     dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
     dataName: Data1, Data2, Data3, Data4, Data5
@@ -81,7 +74,7 @@ pie:
     title: Love is Action
     data: '{{sum(dataset(0))}},{{sum(dataset(1))}}'
     dataColor: '#4daf4a,#377eb8'
-	label: Say👍,Not Say💔
+    label: Say👍,Not Say💔
     ratioInnerRadius: 0.3
 ```
 
@@ -91,7 +84,7 @@ searchType: task.done, task.notdone
 searchTarget: Say I love you, Say I love you
 folder: diary
 summary:
-    template: "How many days I said love: {{sum(dataset(0))}}\nHow many days I didn't say love: {{sum(dataset(1))}}"
+    template: "How many days I said love: {{sum(dataset(0))::i}}\nHow many days I didn't say love: {{sum(dataset(1))::i}}"
 ```
 
 ## External Labels
@@ -119,6 +112,6 @@ pie:
     data: '0.5, 4, 6, 8, 10'
     dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c'
     ratioInnerRadius: 0.4
-	hideLabelLessThan: 0.03
+    hideLabelLessThan: 0.03
     showExtLabelOnlyIfNoLabel: true
 ```

From ffede03162b45ce651b44d47c1f24e2a3f326a69 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 15 Aug 2021 15:07:36 +0800
Subject: [PATCH 192/402] Add target 'name' for fileMeta type

---
 src/collecting.ts | 60 ++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 51 insertions(+), 9 deletions(-)

diff --git a/src/collecting.ts b/src/collecting.ts
index fcf95ae..4ba7648 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -10,8 +10,12 @@ import {
     ValueType,
 } from "./data";
 import * as helper from "./helper";
+import { Moment } from "moment";
 
-export function getDateFromFilename(file: TFile, renderInfo: RenderInfo) {
+export function getDateFromFilename(
+    file: TFile,
+    renderInfo: RenderInfo
+): Moment {
     // console.log(`getDateFromFilename: ${file.name}`);
     let fileBaseName = file.basename;
 
@@ -34,7 +38,7 @@ export function getDateFromFrontmatter(
     fileCache: CachedMetadata,
     query: Query,
     renderInfo: RenderInfo
-) {
+): Moment {
     // console.log("getDateFromFrontmatter");
 
     let date = window.moment("");
@@ -68,7 +72,7 @@ export function getDateFromTag(
     content: string,
     query: Query,
     renderInfo: RenderInfo
-) {
+): Moment {
     // console.log("getDateFromTag");
 
     let date = window.moment("");
@@ -223,7 +227,8 @@ export function getDateFromFileMeta(
         } else if (target === "mDate") {
             let mtime = file.stat.mtime;
             date = helper.getDateFromUnixTime(mtime, renderInfo.dateFormat);
-        } else if (target === "size") {
+        } else if (target === "name") {
+            date = getDateFromFilename(file, renderInfo);
         }
     }
 
@@ -649,33 +654,70 @@ export function collectDataFromFileMeta(
         let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
 
         if (target === "cDate") {
-            let ctime = file.stat.ctime;
+            let ctime = file.stat.ctime; // number in seconds
             query.valueType = ValueType.Date;
             query.addNumTargets();
             addToDataMap(dataMap, xValue, query, ctime);
+            return true;
         } else if (target === "mDate") {
-            let mtime = file.stat.mtime;
+            let mtime = file.stat.mtime; // number in seconds
             query.valueType = ValueType.Date;
             query.addNumTargets();
             addToDataMap(dataMap, xValue, query, mtime);
+            return true;
         } else if (target === "size") {
-            let size = file.stat.size;
+            let size = file.stat.size; // number in
             query.addNumTargets();
             addToDataMap(dataMap, xValue, query, size);
+            return true;
         } else if (target === "numWords") {
             let numWords = helper.getWordCount(content);
             addToDataMap(dataMap, xValue, query, numWords);
+            return true;
         } else if (target === "numChars") {
             let numChars = helper.getCharacterCount(content);
             query.addNumTargets();
             addToDataMap(dataMap, xValue, query, numChars);
+            return true;
         } else if (target === "numSentences") {
             let numSentences = helper.getSentenceCount(content);
             query.addNumTargets();
             addToDataMap(dataMap, xValue, query, numSentences);
-        }
+            return true;
+        } else if (target === "name") {
+            let targetMeasure = 0.0;
+            let targetExist = false;
+            let retParse = helper.parseFloatFromAny(
+                file.basename,
+                renderInfo.textValueMap
+            );
+            if (retParse.value !== null) {
+                if (retParse.type === ValueType.Time) {
+                    targetMeasure = retParse.value;
+                    targetExist = true;
+                    query.valueType = ValueType.Time;
+                    query.addNumTargets();
+                } else {
+                    if (
+                        !renderInfo.ignoreZeroValue[query.getId()] ||
+                        retParse.value !== 0
+                    ) {
+                        targetMeasure += retParse.value;
+                        targetExist = true;
+                        query.addNumTargets();
+                    }
+                }
+            }
 
-        return true;
+            let value = null;
+            if (targetExist) {
+                value = targetMeasure;
+            }
+            if (value !== null) {
+                addToDataMap(dataMap, xValue, query, value);
+                return true;
+            }
+        }
     }
 
     return false;

From e016e124d1b897ff1bb2349231a360098e019e06 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 16 Aug 2021 00:18:07 +0800
Subject: [PATCH 193/402] Add wiki.link and wiki.display; Add function
 getDateFromWiki

---
 src/collecting.ts | 130 ++++++++++++++++++++++++++++++++++++++--------
 src/data.ts       |   2 +
 src/main.ts       |  11 +++-
 src/parsing.ts    |   8 +++
 4 files changed, 128 insertions(+), 23 deletions(-)

diff --git a/src/collecting.ts b/src/collecting.ts
index 4ba7648..0b51bdb 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -17,6 +17,8 @@ export function getDateFromFilename(
     renderInfo: RenderInfo
 ): Moment {
     // console.log(`getDateFromFilename: ${file.name}`);
+    // Get date form fileBaseName
+
     let fileBaseName = file.basename;
 
     let dateString = helper.getDateStringFromInputString(
@@ -33,13 +35,14 @@ export function getDateFromFilename(
 }
 
 // Not support multiple targets
-// May merge with collectDataFromFrontmatterKey
+// key-value type
 export function getDateFromFrontmatter(
     fileCache: CachedMetadata,
     query: Query,
     renderInfo: RenderInfo
 ): Moment {
     // console.log("getDateFromFrontmatter");
+    // Get date from 'frontMatterKey: date'
 
     let date = window.moment("");
 
@@ -65,15 +68,16 @@ export function getDateFromFrontmatter(
     return date;
 }
 
-// Inline tags only
 // Not support multiple targets
-// May merge with collectDataFromInlineTag
+// key-value type
 export function getDateFromTag(
     content: string,
     query: Query,
     renderInfo: RenderInfo
 ): Moment {
     // console.log("getDateFromTag");
+    // Get date from '#tagName: date'
+    // Inline value-attached tag only
 
     let date = window.moment("");
 
@@ -85,7 +89,7 @@ export function getDateFromTag(
     let strHashtagRegex =
         "(^|\\s)#" +
         tagName +
-        "(\\/[\\w-]+)*(:(?<values>[\\d\\.\\/-]*)[a-zA-Z]*)?([\\.!,\\?;~-]*)?(\\s|$)";
+        "(\\/[\\w-]+)*(:(?<value>[\\d\\.\\/-]*)[a-zA-Z]*)?([\\.!,\\?;~-]*)?(\\s|$)";
     // console.log(strHashtagRegex);
     let hashTagRegex = new RegExp(strHashtagRegex, "gm");
     let match;
@@ -93,9 +97,9 @@ export function getDateFromTag(
         // console.log(match);
         if (
             typeof match.groups !== "undefined" &&
-            typeof match.groups.values !== "undefined"
+            typeof match.groups.value !== "undefined"
         ) {
-            let strDate = match.groups.values;
+            let strDate = match.groups.value;
 
             strDate = helper.getDateStringFromInputString(
                 strDate,
@@ -115,12 +119,14 @@ export function getDateFromTag(
 
 // Not support multiple targets
 // May merge with colllectDataFromText
+// regex-value type
 export function getDateFromText(
     content: string,
     query: Query,
     renderInfo: RenderInfo
-) {
+): Moment {
     // console.log("getDateFromText");
+    // Get date from text using regex with value
 
     let date = window.moment("");
 
@@ -154,13 +160,14 @@ export function getDateFromText(
 }
 
 // Not support multiple targets
-// May merge with colllectDataFromDvField
+// key-value type
 export function getDateFromDvField(
     content: string,
     query: Query,
     renderInfo: RenderInfo
-) {
+): Moment {
     // console.log("getDateFromDvField");
+    // Get date form 'targetName:: date'
 
     let date = window.moment("");
 
@@ -178,7 +185,7 @@ export function getDateFromDvField(
     let strHashtagRegex =
         "(^| |\\t)\\*{0,2}" +
         dvTarget +
-        "\\*{0,2}(::[ |\\t]*(?<values>[\\d\\.\\/\\-\\w,@; \\t:]*))(\\r\\?\\n|\\r|$)";
+        "\\*{0,2}(::[ |\\t]*(?<value>[\\d\\.\\/\\-\\w,@; \\t:]*))(\\r\\?\\n|\\r|$)";
     // console.log(strHashtagRegex);
     let hashTagRegex = new RegExp(strHashtagRegex, "gm");
     let match;
@@ -186,9 +193,9 @@ export function getDateFromDvField(
         // console.log(match);
         if (
             typeof match.groups !== "undefined" &&
-            typeof match.groups.values !== "undefined"
+            typeof match.groups.value !== "undefined"
         ) {
-            let strDate = match.groups.values.trim();
+            let strDate = match.groups.value.trim();
 
             strDate = helper.getDateStringFromInputString(
                 strDate,
@@ -207,13 +214,86 @@ export function getDateFromDvField(
 }
 
 // Not support multiple targets
-// May merge with colllectDataFromFileMeta
+// regex-value type
+export function getDateFromWiki(
+    fileCache: CachedMetadata,
+    query: Query,
+    renderInfo: RenderInfo
+): Moment {
+    //console.log("getDateFromWiki");
+    // Get date from '[[regex with value]]'
+
+    let date = window.moment("");
+
+    let links = fileCache.links;
+    if (!links) return date;
+
+    let searchTarget = query.getTarget();
+    let searchType = query.getType();
+
+    for (let link of links) {
+        if (!link) continue;
+
+        let wikiText = "";
+        if (searchType === SearchType.Wiki) {
+            if (link.displayText) {
+                wikiText = link.displayText;
+            } else {
+                wikiText = link.link;
+            }
+        } else if (searchType === SearchType.WikiLink) {
+            // wiki.link point to a file name
+            // a colon is not allowed be in file name
+            wikiText = link.link;
+        } else if (searchType === SearchType.WikiDisplay) {
+            if (link.displayText) {
+                wikiText = link.displayText;
+            }
+        } else {
+            if (link.displayText) {
+                wikiText = link.displayText;
+            } else {
+                wikiText = link.link;
+            }
+        }
+        wikiText = wikiText.trim();
+
+        //
+        let strRegex = "^" + searchTarget + "$";
+        let regex = new RegExp(strRegex, "gm");
+        let match;
+        while ((match = regex.exec(wikiText))) {
+            // console.log(match);
+            if (
+                typeof match.groups !== "undefined" &&
+                typeof match.groups.value !== "undefined"
+            ) {
+                let strDate = match.groups.value.trim();
+                // console.log(strDate);
+
+                strDate = helper.getDateStringFromInputString(
+                    strDate,
+                    renderInfo.dateFormatPrefix,
+                    renderInfo.dateFormatSuffix
+                );
+
+                date = helper.strToDate(strDate, renderInfo.dateFormat);
+                if (date.isValid()) {
+                    break;
+                }
+            }
+        }
+    }
+}
+
+// Not support multiple targets
 export function getDateFromFileMeta(
     file: TFile,
     query: Query,
     renderInfo: RenderInfo
-) {
+): Moment {
     // console.log("getDateFromFileMeta");
+    // Get date from cDate, mDate or baseFileName
 
     let date = window.moment("");
 
@@ -222,10 +302,10 @@ export function getDateFromFileMeta(
 
         let target = query.getTarget();
         if (target === "cDate") {
-            let ctime = file.stat.ctime;
+            let ctime = file.stat.ctime; // unix time
             date = helper.getDateFromUnixTime(ctime, renderInfo.dateFormat);
         } else if (target === "mDate") {
-            let mtime = file.stat.mtime;
+            let mtime = file.stat.mtime; // unix time
             date = helper.getDateFromUnixTime(mtime, renderInfo.dateFormat);
         } else if (target === "name") {
             date = getDateFromFilename(file, renderInfo);
@@ -237,13 +317,14 @@ export function getDateFromFileMeta(
 }
 
 // Not support multiple targets
-// May merge with colllectDataFromTask
+// regex-value type
 export function getDateFromTask(
     content: string,
     query: Query,
     renderInfo: RenderInfo
-) {
+): Moment {
     // console.log("getDateFromTask");
+    // Get date from '- [ ] regex with value' or '- [x] regex with value'
 
     let date = window.moment("");
     let searchType = query.getType();
@@ -304,6 +385,7 @@ export function addToDataMap(
     }
 }
 
+// no value
 export function collectDataFromFrontmatterTag(
     fileCache: CachedMetadata,
     query: Query,
@@ -315,6 +397,7 @@ export function collectDataFromFrontmatterTag(
     // console.log(query);
     // console.log(dataMap);
     // console.log(xValueMap);
+
     let frontMatter = fileCache.frontmatter;
     let frontMatterTags: string[] = [];
     if (frontMatter && frontMatter.tags) {
@@ -358,6 +441,7 @@ export function collectDataFromFrontmatterTag(
     return false;
 }
 
+// key-value
 export function collectDataFromFrontmatterKey(
     fileCache: CachedMetadata,
     query: Query,
@@ -436,6 +520,7 @@ export function collectDataFromFrontmatterKey(
     return false;
 }
 
+// regex-value
 export function collectDataFromWiki(
     fileCache: CachedMetadata,
     query: Query,
@@ -449,7 +534,7 @@ export function collectDataFromWiki(
     let linkMeasure = 0.0;
     let linkExist = false;
     for (let link of links) {
-        if (link.link === query.getTarget()) {
+        if (link.link.startsWith(query.getTarget())) {
             linkExist = true;
             linkMeasure = linkMeasure + renderInfo.constValue[query.getId()];
             query.addNumTargets();
@@ -470,6 +555,7 @@ export function collectDataFromWiki(
     return false;
 }
 
+// key-value
 export function collectDataFromInlineTag(
     content: string,
     query: Query,
@@ -654,13 +740,13 @@ export function collectDataFromFileMeta(
         let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
 
         if (target === "cDate") {
-            let ctime = file.stat.ctime; // number in seconds
+            let ctime = file.stat.ctime; // unix time
             query.valueType = ValueType.Date;
             query.addNumTargets();
             addToDataMap(dataMap, xValue, query, ctime);
             return true;
         } else if (target === "mDate") {
-            let mtime = file.stat.mtime; // number in seconds
+            let mtime = file.stat.mtime; // unix time
             query.valueType = ValueType.Date;
             query.addNumTargets();
             addToDataMap(dataMap, xValue, query, mtime);
@@ -723,6 +809,7 @@ export function collectDataFromFileMeta(
     return false;
 }
 
+// key-value
 export function collectDataFromDvField(
     content: string,
     query: Query,
@@ -832,6 +919,7 @@ export function collectDataFromDvField(
     return false;
 }
 
+// regex-value
 export function collectDataFromTask(
     content: string,
     query: Query,
diff --git a/src/data.ts b/src/data.ts
index d4d14de..596ac19 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -4,6 +4,8 @@ export enum SearchType {
     Tag,
     Frontmatter,
     Wiki,
+    WikiLink,
+    WikiDisplay,
     Text,
     dvField,
     Table,
diff --git a/src/main.ts b/src/main.ts
index e46dbb2..cee0e3b 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -170,7 +170,9 @@ export default class Tracker extends Plugin {
                 if (
                     type === SearchType.Frontmatter ||
                     type === SearchType.Tag ||
-                    type === SearchType.Wiki
+                    type === SearchType.Wiki ||
+                    type === SearchType.WikiLink ||
+                    type === SearchType.WikiDisplay
                 ) {
                     return true;
                 }
@@ -361,7 +363,12 @@ export default class Tracker extends Plugin {
                 } // console.log("Search frontmatter keys");
 
                 // console.log("Search wiki links");
-                if (fileCache && query.getType() === SearchType.Wiki) {
+                if (
+                    fileCache &&
+                    (query.getType() === SearchType.Wiki ||
+                        query.getType() === SearchType.WikiLink ||
+                        query.getType() === SearchType.WikiDisplay)
+                ) {
                     let gotAnyValue = collecting.collectDataFromWiki(
                         fileCache,
                         query,
diff --git a/src/parsing.ts b/src/parsing.ts
index 9b0c26d..a38b163 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -43,6 +43,8 @@ function validateSearchType(searchType: string): boolean {
         searchType.toLowerCase() === "text" ||
         searchType.toLowerCase() === "frontmatter" ||
         searchType.toLowerCase() === "wiki" ||
+        searchType.toLowerCase() === "wiki.link" ||
+        searchType.toLowerCase() === "wiki.display" ||
         searchType.toLowerCase() === "dvfield" ||
         searchType.toLowerCase() === "table" ||
         searchType.toLowerCase() === "filemeta" ||
@@ -962,6 +964,12 @@ export function getRenderInfoFromYaml(
             case "wiki":
                 searchType.push(SearchType.Wiki);
                 break;
+            case "wiki.link":
+                searchType.push(SearchType.WikiLink);
+                break;
+            case "wiki.display":
+                searchType.push(SearchType.WikiDisplay);
+                break;
             case "text":
                 searchType.push(SearchType.Text);
                 break;

From 98ab6a4f3f1ee9cbe5d0f8cfded4bd7bb2ba3a78 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 16 Aug 2021 11:07:29 +0800
Subject: [PATCH 194/402] Do refactoring on collecting module

---
 src/collecting.ts | 465 ++++++++++++++++++++--------------------------
 1 file changed, 202 insertions(+), 263 deletions(-)

diff --git a/src/collecting.ts b/src/collecting.ts
index 0b51bdb..d1d24eb 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -12,6 +12,7 @@ import {
 import * as helper from "./helper";
 import { Moment } from "moment";
 
+// fileBaseName is a string contains dateFormat only
 export function getDateFromFilename(
     file: TFile,
     renderInfo: RenderInfo
@@ -35,7 +36,7 @@ export function getDateFromFilename(
 }
 
 // Not support multiple targets
-// key-value type
+// In form 'key: value', target used to identify 'key'
 export function getDateFromFrontmatter(
     fileCache: CachedMetadata,
     query: Query,
@@ -68,38 +69,27 @@ export function getDateFromFrontmatter(
     return date;
 }
 
-// Not support multiple targets
-// key-value type
-export function getDateFromTag(
-    content: string,
-    query: Query,
+// helper function
+// strRegex must have name group 'value'
+// Named group 'value' could be provided from users or plugin
+function extractDateUsingRegexWithValue(
+    text: string,
+    strRegex: string,
     renderInfo: RenderInfo
-): Moment {
-    // console.log("getDateFromTag");
-    // Get date from '#tagName: date'
-    // Inline value-attached tag only
-
+) {
     let date = window.moment("");
 
-    let tagName = query.getTarget();
-    if (query.getParentTarget()) {
-        tagName = query.getParentTarget(); // use parent tag name for multiple values
-    }
-    // console.log(tagName);
-    let strHashtagRegex =
-        "(^|\\s)#" +
-        tagName +
-        "(\\/[\\w-]+)*(:(?<value>[\\d\\.\\/-]*)[a-zA-Z]*)?([\\.!,\\?;~-]*)?(\\s|$)";
-    // console.log(strHashtagRegex);
-    let hashTagRegex = new RegExp(strHashtagRegex, "gm");
+    let regex = new RegExp(strRegex, "gm");
     let match;
-    while ((match = hashTagRegex.exec(content))) {
+    while ((match = regex.exec(text))) {
         // console.log(match);
         if (
             typeof match.groups !== "undefined" &&
             typeof match.groups.value !== "undefined"
         ) {
-            let strDate = match.groups.value;
+            // must have group name 'value'
+            let strDate = match.groups.value.trim();
+            // console.log(strDate);
 
             strDate = helper.getDateStringFromInputString(
                 strDate,
@@ -109,17 +99,44 @@ export function getDateFromTag(
 
             date = helper.strToDate(strDate, renderInfo.dateFormat);
             if (date.isValid()) {
-                break;
+                return date;
             }
         }
     }
-    // console.log(date);
+
     return date;
 }
 
 // Not support multiple targets
-// May merge with colllectDataFromText
-// regex-value type
+// In form 'key: value', name group 'value' from plugin, not from users
+export function getDateFromTag(
+    content: string,
+    query: Query,
+    renderInfo: RenderInfo
+): Moment {
+    // console.log("getDateFromTag");
+    // Get date from '#tagName: date'
+    // Inline value-attached tag only
+
+    let date = window.moment("");
+
+    let tagName = query.getTarget();
+    if (query.getParentTarget()) {
+        tagName = query.getParentTarget(); // use parent tag name for multiple values
+    }
+    // console.log(tagName);
+
+    let strRegex =
+        "(^|\\s)#" +
+        tagName +
+        "(\\/[\\w-]+)*(:(?<value>[\\d\\.\\/-]*)[a-zA-Z]*)?([\\.!,\\?;~-]*)?(\\s|$)";
+    // console.log(strRegex);
+
+    return extractDateUsingRegexWithValue(content, strRegex, renderInfo);
+}
+
+// Not support multiple targets
+// In form 'regex with value', name group 'value' from users
 export function getDateFromText(
     content: string,
     query: Query,
@@ -130,37 +147,14 @@ export function getDateFromText(
 
     let date = window.moment("");
 
-    let strTextRegex = query.getTarget();
+    let strRegex = query.getTarget();
     // console.log(strTextRegex);
-    let textRegex = new RegExp(strTextRegex, "gm");
-    let match;
-    while ((match = textRegex.exec(content))) {
-        // console.log(match);
-        if (
-            typeof match.groups !== "undefined" &&
-            typeof match.groups.value !== "undefined"
-        ) {
-            let strDate = match.groups.value.trim();
-            // console.log(strDate);
 
-            strDate = helper.getDateStringFromInputString(
-                strDate,
-                renderInfo.dateFormatPrefix,
-                renderInfo.dateFormatSuffix
-            );
-
-            date = helper.strToDate(strDate, renderInfo.dateFormat);
-            if (date.isValid()) {
-                break;
-            }
-        }
-    }
-    // console.log(date);
-    return date;
+    return extractDateUsingRegexWithValue(content, strRegex, renderInfo);
 }
 
 // Not support multiple targets
-// key-value type
+// In form 'key::value', named group 'value' from plugin
 export function getDateFromDvField(
     content: string,
     query: Query,
@@ -182,39 +176,17 @@ export function getDateFromDvField(
     // Test this in Regex101
     // remember '\s' includes new line
     // (^| |\t)\*{0,2}dvTarget\*{0,2}(::[ |\t]*(?<values>[\d\.\/\-\w,@; \t:]*))(\r?\n|\r|$)
-    let strHashtagRegex =
+    let strRegex =
         "(^| |\\t)\\*{0,2}" +
         dvTarget +
         "\\*{0,2}(::[ |\\t]*(?<value>[\\d\\.\\/\\-\\w,@; \\t:]*))(\\r\\?\\n|\\r|$)";
-    // console.log(strHashtagRegex);
-    let hashTagRegex = new RegExp(strHashtagRegex, "gm");
-    let match;
-    while ((match = hashTagRegex.exec(content))) {
-        // console.log(match);
-        if (
-            typeof match.groups !== "undefined" &&
-            typeof match.groups.value !== "undefined"
-        ) {
-            let strDate = match.groups.value.trim();
+    // console.log(strRegex);
 
-            strDate = helper.getDateStringFromInputString(
-                strDate,
-                renderInfo.dateFormatPrefix,
-                renderInfo.dateFormatSuffix
-            );
-
-            date = helper.strToDate(strDate, renderInfo.dateFormat);
-            if (date.isValid()) {
-                break;
-            }
-        }
-    }
-    // console.log(date);
-    return date;
+    return extractDateUsingRegexWithValue(content, strRegex, renderInfo);
 }
 
 // Not support multiple targets
-// regex-value type
+// In form 'regex with value', name group 'value' from users
 export function getDateFromWiki(
     fileCache: CachedMetadata,
     query: Query,
@@ -258,32 +230,11 @@ export function getDateFromWiki(
         }
         wikiText = wikiText.trim();
 
-        //
         let strRegex = "^" + searchTarget + "$";
-        let regex = new RegExp(strRegex, "gm");
-        let match;
-        while ((match = regex.exec(wikiText))) {
-            // console.log(match);
-            if (
-                typeof match.groups !== "undefined" &&
-                typeof match.groups.value !== "undefined"
-            ) {
-                let strDate = match.groups.value.trim();
-                // console.log(strDate);
-
-                strDate = helper.getDateStringFromInputString(
-                    strDate,
-                    renderInfo.dateFormatPrefix,
-                    renderInfo.dateFormatSuffix
-                );
-
-                date = helper.strToDate(strDate, renderInfo.dateFormat);
-                if (date.isValid()) {
-                    break;
-                }
-            }
-        }
+        return extractDateUsingRegexWithValue(wikiText, strRegex, renderInfo);
     }
+
+    return date;
 }
 
 // Not support multiple targets
@@ -317,7 +268,7 @@ export function getDateFromFileMeta(
 }
 
 // Not support multiple targets
-// regex-value type
+// In form 'regex with value', name group 'value' from users
 export function getDateFromTask(
     content: string,
     query: Query,
@@ -330,43 +281,19 @@ export function getDateFromTask(
     let searchType = query.getType();
     // console.log(searchType);
 
-    let strTextRegex = query.getTarget();
+    let strRegex = query.getTarget();
     if (searchType === SearchType.Task) {
-        strTextRegex = "\\[[\\sx]\\]\\s" + strTextRegex;
+        strRegex = "\\[[\\sx]\\]\\s" + strRegex;
     } else if (searchType === SearchType.TaskDone) {
-        strTextRegex = "\\[x\\]\\s" + strTextRegex;
+        strRegex = "\\[x\\]\\s" + strRegex;
     } else if (searchType === SearchType.TaskNotDone) {
-        strTextRegex = "\\[\\s\\]\\s" + strTextRegex;
+        strRegex = "\\[\\s\\]\\s" + strRegex;
     } else {
-        strTextRegex = "\\[[\\sx]\\]\\s" + strTextRegex;
+        strRegex = "\\[[\\sx]\\]\\s" + strRegex;
     }
     // console.log(strTextRegex);
 
-    let textRegex = new RegExp(strTextRegex, "gm");
-    let match;
-    while ((match = textRegex.exec(content))) {
-        // console.log(match);
-        if (
-            typeof match.groups !== "undefined" &&
-            typeof match.groups.value !== "undefined"
-        ) {
-            let strDate = match.groups.value.trim();
-            // console.log(strDate);
-
-            strDate = helper.getDateStringFromInputString(
-                strDate,
-                renderInfo.dateFormatPrefix,
-                renderInfo.dateFormatSuffix
-            );
-
-            date = helper.strToDate(strDate, renderInfo.dateFormat);
-            if (date.isValid()) {
-                break;
-            }
-        }
-    }
-    // console.log(date);
-    return date;
+    return extractDateUsingRegexWithValue(content, strRegex, renderInfo);
 }
 
 export function addToDataMap(
@@ -385,6 +312,76 @@ export function addToDataMap(
     }
 }
 
+// regex with value --> extract value
+// regex without value --> count occurrencies
+function extractDataUsingRegex(
+    text: string,
+    strRegex: string,
+    query: Query,
+    dataMap: DataMap,
+    xValueMap: XValueMap,
+    renderInfo: RenderInfo
+) {
+    let textRegex = new RegExp(strRegex, "gm");
+    let match;
+    let measure = 0.0;
+    let extracted = false;
+    while ((match = textRegex.exec(text))) {
+        // console.log(match);
+        // match[0] whole match
+        if (!renderInfo.ignoreAttachedValue[query.getId()]) {
+            if (
+                typeof match.groups !== "undefined" &&
+                typeof match.groups.value !== "undefined"
+            ) {
+                // set as null for missing value if it is valued-tag
+                let retParse = helper.parseFloatFromAny(
+                    match.groups.value,
+                    renderInfo.textValueMap
+                );
+                // console.log(value);
+                if (retParse.value !== null) {
+                    if (retParse.type === ValueType.Time) {
+                        measure = retParse.value;
+                        extracted = true;
+                        query.valueType = ValueType.Time;
+                        query.addNumTargets();
+                    } else {
+                        if (
+                            !renderInfo.ignoreZeroValue[query.getId()] ||
+                            retParse.value !== 0
+                        ) {
+                            measure += retParse.value;
+                            extracted = true;
+                            query.addNumTargets();
+                        }
+                    }
+                }
+            } else {
+                // no named groups, count occurrencies
+                // console.log("count occurrencies");
+                measure += renderInfo.constValue[query.getId()];
+                extracted = true;
+                query.addNumTargets();
+            }
+        } else {
+            // force to count occurrencies
+            // console.log("count occurrencies");
+            measure += renderInfo.constValue[query.getId()];
+            extracted = true;
+            query.addNumTargets();
+        }
+    }
+
+    if (extracted) {
+        let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
+        addToDataMap(dataMap, xValue, query, measure);
+        return true;
+    }
+
+    return false;
+}
+
 // no value
 export function collectDataFromFrontmatterTag(
     fileCache: CachedMetadata,
@@ -520,7 +517,9 @@ export function collectDataFromFrontmatterKey(
     return false;
 }
 
-// regex-value
+// no key
+// regex with value --> extract value
+// regex without value --> count occurrencies
 export function collectDataFromWiki(
     fileCache: CachedMetadata,
     query: Query,
@@ -529,27 +528,49 @@ export function collectDataFromWiki(
     xValueMap: XValueMap
 ): boolean {
     let links = fileCache.links;
-    if (!links) return;
+    if (!links) return false;
+
+    let searchTarget = query.getTarget();
+    let searchType = query.getType();
 
-    let linkMeasure = 0.0;
-    let linkExist = false;
     for (let link of links) {
-        if (link.link.startsWith(query.getTarget())) {
-            linkExist = true;
-            linkMeasure = linkMeasure + renderInfo.constValue[query.getId()];
-            query.addNumTargets();
+        if (!link) continue;
+
+        let wikiText = "";
+        if (searchType === SearchType.Wiki) {
+            if (link.displayText) {
+                wikiText = link.displayText;
+            } else {
+                wikiText = link.link;
+            }
+        } else if (searchType === SearchType.WikiLink) {
+            // wiki.link point to a file name
+            // a colon is not allowed be in file name
+            wikiText = link.link;
+        } else if (searchType === SearchType.WikiDisplay) {
+            if (link.displayText) {
+                wikiText = link.displayText;
+            }
+        } else {
+            if (link.displayText) {
+                wikiText = link.displayText;
+            } else {
+                wikiText = link.link;
+            }
         }
-    }
+        wikiText = wikiText.trim();
 
-    let linkValue = null;
-    if (linkExist) {
-        linkValue = linkMeasure;
-    }
+        let strRegex = "^" + searchTarget + "$";
 
-    if (linkValue !== null) {
-        let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
-        addToDataMap(dataMap, xValue, query, linkValue);
-        return true;
+        let extracted = extractDataUsingRegex(
+            wikiText,
+            strRegex,
+            query,
+            dataMap,
+            xValueMap,
+            renderInfo
+        );
+        if (extracted) return true;
     }
 
     return false;
@@ -661,6 +682,9 @@ export function collectDataFromInlineTag(
     return false;
 }
 
+// no key
+// regex with value --> extract value
+// regex without value --> count occurrencies
 export function collectDataFromText(
     content: string,
     query: Query,
@@ -668,59 +692,17 @@ export function collectDataFromText(
     dataMap: DataMap,
     xValueMap: XValueMap
 ): boolean {
-    let strTextRegex = query.getTarget();
+    let strRegex = query.getTarget();
     // console.log(strTextRegex);
-    let textRegex = new RegExp(strTextRegex, "gm");
-    let match;
-    let textMeasure = 0.0;
-    let textExist = false;
-    while ((match = textRegex.exec(content))) {
-        // console.log(match);
-        if (
-            !renderInfo.ignoreAttachedValue[query.getId()] &&
-            typeof match.groups !== "undefined"
-        ) {
-            // match[0] whole match
-            // console.log("valued-text");
-            if (typeof match.groups.value !== "undefined") {
-                // set as null for missing value if it is valued-tag
-                let retParse = helper.parseFloatFromAny(
-                    match.groups.value,
-                    renderInfo.textValueMap
-                );
-                if (retParse.value !== null) {
-                    if (retParse.type === ValueType.Time) {
-                        textMeasure = retParse.value;
-                        textExist = true;
-                        query.valueType = ValueType.Time;
-                        query.addNumTargets();
-                    } else {
-                        if (
-                            !renderInfo.ignoreZeroValue[query.getId()] ||
-                            retParse.value !== 0
-                        ) {
-                            textMeasure += retParse.value;
-                            textExist = true;
-                            query.addNumTargets();
-                        }
-                    }
-                }
-            }
-        } else {
-            // console.log("simple-text");
-            textMeasure = textMeasure + renderInfo.constValue[query.getId()];
-            textExist = true;
-            query.addNumTargets();
-        }
-    }
-
-    if (textExist) {
-        let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
-        addToDataMap(dataMap, xValue, query, textMeasure);
-        return true;
-    }
 
-    return false;
+    return extractDataUsingRegex(
+        content,
+        strRegex,
+        query,
+        dataMap,
+        xValueMap,
+        renderInfo
+    );
 }
 
 export function collectDataFromFileMeta(
@@ -919,7 +901,8 @@ export function collectDataFromDvField(
     return false;
 }
 
-// regex-value
+// no key
+
 export function collectDataFromTask(
     content: string,
     query: Query,
@@ -931,69 +914,25 @@ export function collectDataFromTask(
     let searchType = query.getType();
     // console.log(searchType);
 
-    let strTextRegex = query.getTarget();
+    let strRegex = query.getTarget();
     if (searchType === SearchType.Task) {
-        strTextRegex = "\\[[\\sx]\\]\\s" + strTextRegex;
+        strRegex = "\\[[\\sx]\\]\\s" + strRegex;
     } else if (searchType === SearchType.TaskDone) {
-        strTextRegex = "\\[x\\]\\s" + strTextRegex;
+        strRegex = "\\[x\\]\\s" + strRegex;
     } else if (searchType === SearchType.TaskNotDone) {
-        strTextRegex = "\\[\\s\\]\\s" + strTextRegex;
+        strRegex = "\\[\\s\\]\\s" + strRegex;
     } else {
         // all
-        strTextRegex = "\\[[\\sx]\\]\\s" + strTextRegex;
+        strRegex = "\\[[\\sx]\\]\\s" + strRegex;
     }
-    // console.log(strTextRegex);
-
-    let textRegex = new RegExp(strTextRegex, "gm");
-    let match;
-    let textMeasure = 0.0;
-    let textExist = false;
-    while ((match = textRegex.exec(content))) {
-        // console.log(match);
-        if (
-            !renderInfo.ignoreAttachedValue[query.getId()] &&
-            typeof match.groups !== "undefined"
-        ) {
-            // match[0] whole match
-            // console.log("valued-text");
-            if (typeof match.groups.value !== "undefined") {
-                // set as null for missing value if it is valued-tag
-                let retParse = helper.parseFloatFromAny(
-                    match.groups.value,
-                    renderInfo.textValueMap
-                );
-                // console.log(value);
-                if (retParse.value !== null) {
-                    if (retParse.type === ValueType.Time) {
-                        textMeasure = retParse.value;
-                        textExist = true;
-                        query.valueType = ValueType.Time;
-                        query.addNumTargets();
-                    } else {
-                        if (
-                            !renderInfo.ignoreZeroValue[query.getId()] ||
-                            retParse.value !== 0
-                        ) {
-                            textMeasure += retParse.value;
-                            textExist = true;
-                            query.addNumTargets();
-                        }
-                    }
-                }
-            }
-        } else {
-            // console.log("simple-text");
-            textMeasure = textMeasure + renderInfo.constValue[query.getId()];
-            textExist = true;
-            query.addNumTargets();
-        }
-    }
-
-    if (textExist) {
-        let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
-        addToDataMap(dataMap, xValue, query, textMeasure);
-        return true;
-    }
-
-    return false;
+    // console.log(strRegex);
+
+    return extractDataUsingRegex(
+        content,
+        strRegex,
+        query,
+        dataMap,
+        xValueMap,
+        renderInfo
+    );
 }

From 28dde8276b2b54d13416cd8d537294087fc562ce Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 16 Aug 2021 14:37:20 +0800
Subject: [PATCH 195/402] Do refactoring on collecting module

---
 src/collecting.ts | 319 +++++++++++++++++++---------------------------
 1 file changed, 132 insertions(+), 187 deletions(-)

diff --git a/src/collecting.ts b/src/collecting.ts
index d1d24eb..dc949ca 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -36,7 +36,7 @@ export function getDateFromFilename(
 }
 
 // Not support multiple targets
-// In form 'key: value', target used to identify 'key'
+// In form 'key: value', target used to identify 'frontmatter key'
 export function getDateFromFrontmatter(
     fileCache: CachedMetadata,
     query: Query,
@@ -76,7 +76,7 @@ function extractDateUsingRegexWithValue(
     text: string,
     strRegex: string,
     renderInfo: RenderInfo
-) {
+): Moment {
     let date = window.moment("");
 
     let regex = new RegExp(strRegex, "gm");
@@ -314,14 +314,14 @@ export function addToDataMap(
 
 // regex with value --> extract value
 // regex without value --> count occurrencies
-function extractDataUsingRegex(
+function extractDataUsingRegexWithSingleValue(
     text: string,
     strRegex: string,
     query: Query,
     dataMap: DataMap,
     xValueMap: XValueMap,
     renderInfo: RenderInfo
-) {
+): boolean {
     let textRegex = new RegExp(strRegex, "gm");
     let match;
     let measure = 0.0;
@@ -382,7 +382,104 @@ function extractDataUsingRegex(
     return false;
 }
 
-// no value
+function extractDataUsingRegexWithMultipleValues(
+    text: string,
+    strRegex: string,
+    query: Query,
+    dataMap: DataMap,
+    xValueMap: XValueMap,
+    renderInfo: RenderInfo
+): boolean {
+    let regex = new RegExp(strRegex, "gm");
+    let match;
+    let measure = 0.0;
+    let extracted = false;
+    while ((match = regex.exec(text))) {
+        // console.log(match);
+        if (!renderInfo.ignoreAttachedValue[query.getId()]) {
+        }
+
+        if (
+            typeof match.groups !== "undefined" &&
+            typeof match.groups.values !== "undefined"
+        ) {
+            let values = match.groups.values.trim();
+            // console.log(values);
+            // console.log(query.getSeparator());
+            let splitted = values.split(query.getSeparator());
+            // console.log(splitted);
+            if (!splitted) continue;
+            if (splitted.length === 1) {
+                // console.log("single-value");
+                let toParse = splitted[0].trim();
+                // console.log(toParse);
+                let retParse = helper.parseFloatFromAny(
+                    toParse,
+                    renderInfo.textValueMap
+                );
+                if (retParse.value !== null) {
+                    if (retParse.type === ValueType.Time) {
+                        measure = retParse.value;
+                        extracted = true;
+                        query.valueType = ValueType.Time;
+                        query.addNumTargets();
+                    } else {
+                        if (
+                            !renderInfo.ignoreZeroValue[query.getId()] ||
+                            retParse.value !== 0
+                        ) {
+                            measure += retParse.value;
+                            extracted = true;
+                            query.addNumTargets();
+                        }
+                    }
+                }
+            } else if (
+                splitted.length > query.getAccessor() &&
+                query.getAccessor() >= 0
+            ) {
+                // TODO: it's not efficent to retrieve one value at a time, enhance this
+                // console.log("multiple-values");
+                let toParse = splitted[query.getAccessor()].trim();
+                let retParse = helper.parseFloatFromAny(
+                    toParse,
+                    renderInfo.textValueMap
+                );
+                //console.log(retParse);
+                if (retParse.value !== null) {
+                    if (retParse.type === ValueType.Time) {
+                        measure = retParse.value;
+                        extracted = true;
+                        query.valueType = ValueType.Time;
+                        query.addNumTargets();
+                    } else {
+                        measure += retParse.value;
+                        extracted = true;
+                        query.addNumTargets();
+                    }
+                }
+            }
+        } else {
+            measure += renderInfo.constValue[query.getId()];
+            extracted = true;
+            query.addNumTargets();
+        }
+    }
+
+    let value = null;
+    if (extracted) {
+        value = measure;
+    }
+    if (value !== null) {
+        let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
+        addToDataMap(dataMap, xValue, query, value);
+        return true;
+    }
+
+    return false;
+}
+
+// no value, count occurrences only
 export function collectDataFromFrontmatterTag(
     fileCache: CachedMetadata,
     query: Query,
@@ -423,7 +520,7 @@ export function collectDataFromFrontmatterTag(
             }
 
             // valued-tag in frontmatter is not supported
-            // because the "tag:value" in frontmatter will be consider as a new tag for different values
+            // because the "tag:value" in frontmatter will be consider as a new tag for each existing value
 
             let value = null;
             if (tagExist) {
@@ -438,7 +535,7 @@ export function collectDataFromFrontmatterTag(
     return false;
 }
 
-// key-value
+// In form 'key: value', target used to identify 'frontmatter key'
 export function collectDataFromFrontmatterKey(
     fileCache: CachedMetadata,
     query: Query,
@@ -517,9 +614,7 @@ export function collectDataFromFrontmatterKey(
     return false;
 }
 
-// no key
-// regex with value --> extract value
-// regex without value --> count occurrencies
+// In form 'regex with value', name group 'value' from users
 export function collectDataFromWiki(
     fileCache: CachedMetadata,
     query: Query,
@@ -562,7 +657,7 @@ export function collectDataFromWiki(
 
         let strRegex = "^" + searchTarget + "$";
 
-        let extracted = extractDataUsingRegex(
+        let extracted = extractDataUsingRegexWithSingleValue(
             wikiText,
             strRegex,
             query,
@@ -576,7 +671,7 @@ export function collectDataFromWiki(
     return false;
 }
 
-// key-value
+// In form 'key: value', name group 'value' from plugin, not from users
 export function collectDataFromInlineTag(
     content: string,
     query: Query,
@@ -594,97 +689,23 @@ export function collectDataFromInlineTag(
     if (tagName.length > 1 && tagName.startsWith("#")) {
         tagName = tagName.substring(1);
     }
-    let strHashtagRegex =
+    let strRegex =
         "(^|\\s)#" +
         tagName +
         "(\\/[\\w-]+)*(:(?<values>[\\d\\.\\/-]*)[a-zA-Z]*)?([\\.!,\\?;~-]*)?(\\s|$)";
-    // console.log(strHashtagRegex);
-    let hashTagRegex = new RegExp(strHashtagRegex, "gm");
-    let match;
-    let tagMeasure = 0.0;
-    let tagExist = false;
-    while ((match = hashTagRegex.exec(content))) {
-        // console.log(match);
-        if (
-            !renderInfo.ignoreAttachedValue[query.getId()] &&
-            typeof match.groups !== "undefined" &&
-            typeof match.groups.values !== "undefined"
-        ) {
-            // console.log("value-attached tag");
-            let values = match.groups.values;
-            let splitted = values.split(query.getSeparator());
-            if (!splitted) continue;
-            if (splitted.length === 1) {
-                // console.log("single-value");
-                let toParse = splitted[0].trim();
-                let retParse = helper.parseFloatFromAny(
-                    toParse,
-                    renderInfo.textValueMap
-                );
-                if (retParse.value !== null) {
-                    if (retParse.type === ValueType.Time) {
-                        tagMeasure = retParse.value;
-                        tagExist = true;
-                        query.valueType = ValueType.Time;
-                        query.addNumTargets();
-                    } else {
-                        if (
-                            !renderInfo.ignoreZeroValue[query.getId()] ||
-                            retParse.value !== 0
-                        ) {
-                            tagMeasure += retParse.value;
-                            tagExist = true;
-                            query.addNumTargets();
-                        }
-                    }
-                }
-            } else if (
-                splitted.length > query.getAccessor() &&
-                query.getAccessor() >= 0
-            ) {
-                let toParse = splitted[query.getAccessor()].trim();
-                let retParse = helper.parseFloatFromAny(
-                    toParse,
-                    renderInfo.textValueMap
-                );
-                //console.log(retParse);
-                if (retParse.value !== null) {
-                    if (retParse.type === ValueType.Time) {
-                        tagMeasure = retParse.value;
-                        tagExist = true;
-                        query.valueType = ValueType.Time;
-                        query.addNumTargets();
-                    } else {
-                        tagMeasure += retParse.value;
-                        tagExist = true;
-                        query.addNumTargets();
-                    }
-                }
-            }
-        } else {
-            // console.log("simple-tag");
-            tagMeasure = tagMeasure + renderInfo.constValue[query.getId()];
-            tagExist = true;
-            query.addNumTargets();
-        }
-    }
-
-    let value = null;
-    if (tagExist) {
-        value = tagMeasure;
-    }
-    if (value !== null) {
-        let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
-        addToDataMap(dataMap, xValue, query, value);
-        return true;
-    }
+    // console.log(strRegex);
 
-    return false;
+    return extractDataUsingRegexWithMultipleValues(
+        content,
+        strRegex,
+        query,
+        dataMap,
+        xValueMap,
+        renderInfo
+    );
 }
 
-// no key
-// regex with value --> extract value
-// regex without value --> count occurrencies
+// In form 'regex with value', name group 'value' from users
 export function collectDataFromText(
     content: string,
     query: Query,
@@ -695,7 +716,7 @@ export function collectDataFromText(
     let strRegex = query.getTarget();
     // console.log(strTextRegex);
 
-    return extractDataUsingRegex(
+    return extractDataUsingRegexWithMultipleValues(
         content,
         strRegex,
         query,
@@ -791,7 +812,7 @@ export function collectDataFromFileMeta(
     return false;
 }
 
-// key-value
+// In form 'key::value', named group 'value' from plugin
 export function collectDataFromDvField(
     content: string,
     query: Query,
@@ -810,99 +831,23 @@ export function collectDataFromDvField(
     // Test this in Regex101
     // remember '\s' includes new line
     // (^| |\t)\*{0,2}dvTarget\*{0,2}(::[ |\t]*(?<values>[\d\.\/\-\w,@; \t:]*))(\r?\n|\r|$)
-    let strHashtagRegex =
+    let strRegex =
         "(^| |\\t)\\*{0,2}" +
         dvTarget +
         "\\*{0,2}(::[ |\\t]*(?<values>[\\d\\.\\/\\-\\w,@; \\t:]*))(\\r\\?\\n|\\r|$)";
-    // console.log(strHashtagRegex);
-    let hashTagRegex = new RegExp(strHashtagRegex, "gm");
-    let match;
-    let tagMeasure = 0.0;
-    let tagExist = false;
-    while ((match = hashTagRegex.exec(content))) {
-        // console.log(match);
-        if (
-            typeof match.groups !== "undefined" &&
-            typeof match.groups.values !== "undefined"
-        ) {
-            let values = match.groups.values.trim();
-            // console.log(values);
-            // console.log(query.getSeparator());
-            let splitted = values.split(query.getSeparator());
-            // console.log(splitted);
-            if (!splitted) continue;
-            if (splitted.length === 1) {
-                // console.log("single-value");
-                let toParse = splitted[0];
-                // console.log(toParse);
-                let retParse = helper.parseFloatFromAny(
-                    toParse,
-                    renderInfo.textValueMap
-                );
-                if (retParse.value !== null) {
-                    if (retParse.type === ValueType.Time) {
-                        tagMeasure = retParse.value;
-                        tagExist = true;
-                        query.valueType = ValueType.Time;
-                        query.addNumTargets();
-                    } else {
-                        if (
-                            !renderInfo.ignoreZeroValue[query.getId()] ||
-                            retParse.value !== 0
-                        ) {
-                            tagMeasure += retParse.value;
-                            tagExist = true;
-                            query.addNumTargets();
-                        }
-                    }
-                }
-            } else if (
-                splitted.length > query.getAccessor() &&
-                query.getAccessor() >= 0
-            ) {
-                // TODO: it's not efficent to retrieve one value at a time, enhance this
-                // console.log("multiple-values");
-                let toParse = splitted[query.getAccessor()].trim();
-                let retParse = helper.parseFloatFromAny(
-                    toParse,
-                    renderInfo.textValueMap
-                );
-                if (retParse.value !== null) {
-                    if (retParse.type === ValueType.Time) {
-                        tagMeasure = retParse.value;
-                        tagExist = true;
-                        query.valueType = ValueType.Time;
-                        query.addNumTargets();
-                    } else {
-                        tagMeasure += retParse.value;
-                        tagExist = true;
-                        query.addNumTargets();
-                    }
-                }
-            }
-        } else {
-            // console.log("simple-tag");
-            tagMeasure = tagMeasure + renderInfo.constValue[query.getId()];
-            tagExist = true;
-            query.addNumTargets();
-        }
-    }
-
-    let value = null;
-    if (tagExist) {
-        value = tagMeasure;
-    }
-    if (value !== null) {
-        let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
-        addToDataMap(dataMap, xValue, query, value);
-        return true;
-    }
+    // console.log(strRegex);
 
-    return false;
+    return extractDataUsingRegexWithMultipleValues(
+        content,
+        strRegex,
+        query,
+        dataMap,
+        xValueMap,
+        renderInfo
+    );
 }
 
-// no key
-
+// In form 'regex with value', name group 'value' from users
 export function collectDataFromTask(
     content: string,
     query: Query,
@@ -927,7 +872,7 @@ export function collectDataFromTask(
     }
     // console.log(strRegex);
 
-    return extractDataUsingRegex(
+    return extractDataUsingRegexWithSingleValue(
         content,
         strRegex,
         query,

From 58cf5cd719e674c603923a112da32f8c15f13207 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 16 Aug 2021 14:44:59 +0800
Subject: [PATCH 196/402] Fix extractDataUsingRegexWithMultipleValues for
 ignoreAttachedValue

---
 src/collecting.ts | 129 +++++++++++++++++++++++++---------------------
 1 file changed, 69 insertions(+), 60 deletions(-)

diff --git a/src/collecting.ts b/src/collecting.ts
index dc949ca..6f812fc 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -397,82 +397,91 @@ function extractDataUsingRegexWithMultipleValues(
     while ((match = regex.exec(text))) {
         // console.log(match);
         if (!renderInfo.ignoreAttachedValue[query.getId()]) {
-        }
-
-        if (
-            typeof match.groups !== "undefined" &&
-            typeof match.groups.values !== "undefined"
-        ) {
-            let values = match.groups.values.trim();
-            // console.log(values);
-            // console.log(query.getSeparator());
-            let splitted = values.split(query.getSeparator());
-            // console.log(splitted);
-            if (!splitted) continue;
-            if (splitted.length === 1) {
-                // console.log("single-value");
-                let toParse = splitted[0].trim();
-                // console.log(toParse);
-                let retParse = helper.parseFloatFromAny(
-                    toParse,
-                    renderInfo.textValueMap
-                );
-                if (retParse.value !== null) {
-                    if (retParse.type === ValueType.Time) {
-                        measure = retParse.value;
-                        extracted = true;
-                        query.valueType = ValueType.Time;
-                        query.addNumTargets();
-                    } else {
-                        if (
-                            !renderInfo.ignoreZeroValue[query.getId()] ||
-                            retParse.value !== 0
-                        ) {
-                            measure += retParse.value;
+            if (
+                typeof match.groups !== "undefined" &&
+                typeof match.groups.values !== "undefined"
+            ) {
+                let values = match.groups.values.trim();
+                // console.log(values);
+                // console.log(query.getSeparator());
+                let splitted = values.split(query.getSeparator());
+                // console.log(splitted);
+                if (!splitted) continue;
+                if (splitted.length === 1) {
+                    // console.log("single-value");
+                    let toParse = splitted[0].trim();
+                    // console.log(toParse);
+                    let retParse = helper.parseFloatFromAny(
+                        toParse,
+                        renderInfo.textValueMap
+                    );
+                    if (retParse.value !== null) {
+                        if (retParse.type === ValueType.Time) {
+                            measure = retParse.value;
                             extracted = true;
+                            query.valueType = ValueType.Time;
                             query.addNumTargets();
+                        } else {
+                            if (
+                                !renderInfo.ignoreZeroValue[query.getId()] ||
+                                retParse.value !== 0
+                            ) {
+                                measure += retParse.value;
+                                extracted = true;
+                                query.addNumTargets();
+                            }
                         }
                     }
-                }
-            } else if (
-                splitted.length > query.getAccessor() &&
-                query.getAccessor() >= 0
-            ) {
-                // TODO: it's not efficent to retrieve one value at a time, enhance this
-                // console.log("multiple-values");
-                let toParse = splitted[query.getAccessor()].trim();
-                let retParse = helper.parseFloatFromAny(
-                    toParse,
-                    renderInfo.textValueMap
-                );
-                //console.log(retParse);
-                if (retParse.value !== null) {
-                    if (retParse.type === ValueType.Time) {
-                        measure = retParse.value;
-                        extracted = true;
-                        query.valueType = ValueType.Time;
-                        query.addNumTargets();
-                    } else {
-                        measure += retParse.value;
-                        extracted = true;
-                        query.addNumTargets();
+                } else if (
+                    splitted.length > query.getAccessor() &&
+                    query.getAccessor() >= 0
+                ) {
+                    // TODO: it's not efficent to retrieve one value at a time, enhance this
+                    // console.log("multiple-values");
+                    let toParse = splitted[query.getAccessor()].trim();
+                    let retParse = helper.parseFloatFromAny(
+                        toParse,
+                        renderInfo.textValueMap
+                    );
+                    //console.log(retParse);
+                    if (retParse.value !== null) {
+                        if (retParse.type === ValueType.Time) {
+                            measure = retParse.value;
+                            extracted = true;
+                            query.valueType = ValueType.Time;
+                            query.addNumTargets();
+                        } else {
+                            measure += retParse.value;
+                            extracted = true;
+                            query.addNumTargets();
+                        }
                     }
+                } else {
+                    // no named groups, count occurrencies
+                    // console.log("count occurrencies");
+                    measure += renderInfo.constValue[query.getId()];
+                    extracted = true;
+                    query.addNumTargets();
                 }
+            } else {
+                // no named groups, count occurrencies
+                // console.log("count occurrencies");
+                measure += renderInfo.constValue[query.getId()];
+                extracted = true;
+                query.addNumTargets();
             }
         } else {
+            // force to count occurrencies
+            // console.log("count occurrencies");
             measure += renderInfo.constValue[query.getId()];
             extracted = true;
             query.addNumTargets();
         }
     }
 
-    let value = null;
     if (extracted) {
-        value = measure;
-    }
-    if (value !== null) {
         let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
-        addToDataMap(dataMap, xValue, query, value);
+        addToDataMap(dataMap, xValue, query, measure);
         return true;
     }
 

From 615b4591addb2fc398c5c54efc9620e8d1ee083c Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 16 Aug 2021 14:55:07 +0800
Subject: [PATCH 197/402] Using extractDataUsingRegexWithMultipleValues for all
 data collecting

---
 src/collecting.ts | 76 ++++-------------------------------------------
 1 file changed, 5 insertions(+), 71 deletions(-)

diff --git a/src/collecting.ts b/src/collecting.ts
index 6f812fc..0cef8fb 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -312,76 +312,10 @@ export function addToDataMap(
     }
 }
 
+// Helper function
+// Accept multiple values using custom separators
 // regex with value --> extract value
 // regex without value --> count occurrencies
-function extractDataUsingRegexWithSingleValue(
-    text: string,
-    strRegex: string,
-    query: Query,
-    dataMap: DataMap,
-    xValueMap: XValueMap,
-    renderInfo: RenderInfo
-): boolean {
-    let textRegex = new RegExp(strRegex, "gm");
-    let match;
-    let measure = 0.0;
-    let extracted = false;
-    while ((match = textRegex.exec(text))) {
-        // console.log(match);
-        // match[0] whole match
-        if (!renderInfo.ignoreAttachedValue[query.getId()]) {
-            if (
-                typeof match.groups !== "undefined" &&
-                typeof match.groups.value !== "undefined"
-            ) {
-                // set as null for missing value if it is valued-tag
-                let retParse = helper.parseFloatFromAny(
-                    match.groups.value,
-                    renderInfo.textValueMap
-                );
-                // console.log(value);
-                if (retParse.value !== null) {
-                    if (retParse.type === ValueType.Time) {
-                        measure = retParse.value;
-                        extracted = true;
-                        query.valueType = ValueType.Time;
-                        query.addNumTargets();
-                    } else {
-                        if (
-                            !renderInfo.ignoreZeroValue[query.getId()] ||
-                            retParse.value !== 0
-                        ) {
-                            measure += retParse.value;
-                            extracted = true;
-                            query.addNumTargets();
-                        }
-                    }
-                }
-            } else {
-                // no named groups, count occurrencies
-                // console.log("count occurrencies");
-                measure += renderInfo.constValue[query.getId()];
-                extracted = true;
-                query.addNumTargets();
-            }
-        } else {
-            // force to count occurrencies
-            // console.log("count occurrencies");
-            measure += renderInfo.constValue[query.getId()];
-            extracted = true;
-            query.addNumTargets();
-        }
-    }
-
-    if (extracted) {
-        let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
-        addToDataMap(dataMap, xValue, query, measure);
-        return true;
-    }
-
-    return false;
-}
-
 function extractDataUsingRegexWithMultipleValues(
     text: string,
     strRegex: string,
@@ -488,7 +422,7 @@ function extractDataUsingRegexWithMultipleValues(
     return false;
 }
 
-// no value, count occurrences only
+// No value, count occurrences only
 export function collectDataFromFrontmatterTag(
     fileCache: CachedMetadata,
     query: Query,
@@ -666,7 +600,7 @@ export function collectDataFromWiki(
 
         let strRegex = "^" + searchTarget + "$";
 
-        let extracted = extractDataUsingRegexWithSingleValue(
+        let extracted = extractDataUsingRegexWithMultipleValues(
             wikiText,
             strRegex,
             query,
@@ -881,7 +815,7 @@ export function collectDataFromTask(
     }
     // console.log(strRegex);
 
-    return extractDataUsingRegexWithSingleValue(
+    return extractDataUsingRegexWithMultipleValues(
         content,
         strRegex,
         query,

From db64d8e8951eb16a573f22f3aed75be55e34eafc Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 16 Aug 2021 15:41:57 +0800
Subject: [PATCH 198/402] Not force a full match for wiki data extraction

---
 src/collecting.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/collecting.ts b/src/collecting.ts
index 0cef8fb..2937287 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -598,7 +598,7 @@ export function collectDataFromWiki(
         }
         wikiText = wikiText.trim();
 
-        let strRegex = "^" + searchTarget + "$";
+        let strRegex = searchTarget;
 
         let extracted = extractDataUsingRegexWithMultipleValues(
             wikiText,

From 15e577fbf6ddf33d28e1886aec9d860b0a0eff5c Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 16 Aug 2021 15:44:52 +0800
Subject: [PATCH 199/402] Update examples

---
 examples/TestDateFormats.md          |  4 ++--
 examples/TestRegex.md                |  6 +++++-
 examples/TestRelativeStartEndDate.md |  1 +
 examples/TestWordCounting.md         |  2 +-
 examples/WikiTracker.md              | 29 +++++++++++++++++++++++-----
 examples/diary/2021-01-04.md         |  1 +
 examples/diary/2021-01-06.md         |  1 +
 examples/diary/2021-01-14.md         |  1 +
 examples/diary/2021-01-16.md         |  1 +
 examples/example_generator.ts        |  2 +-
 10 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/examples/TestDateFormats.md b/examples/TestDateFormats.md
index e2b481c..d332f08 100644
--- a/examples/TestDateFormats.md
+++ b/examples/TestDateFormats.md
@@ -178,14 +178,14 @@ The reference date of the relative date input is 'today' (The current date of yo
 - 0d ==> today
 - -1d ==> yesterday
 - -1w ==> last week
-- -1m ==> last month
+- -1M ==> last month
 - -1y ==> last year
 
 ``` tracker
 searchType: tag
 searchTarget: weight
 folder: diary
-startDate: -1m
+startDate: -1M
 endDate: 0d
 line:
     title: Weight Log
diff --git a/examples/TestRegex.md b/examples/TestRegex.md
index b790cf3..482bb15 100644
--- a/examples/TestRegex.md
+++ b/examples/TestRegex.md
@@ -18,6 +18,10 @@ line:
     title: Email Occurencies
     yAxisLabel: Count
     lineColor: yellow
+	yAxisTickInterval: 1.0
+	yAxisTickLabelFormat: i
+	yMin: 0
+	yMax: 5
 ```
 
 ``` tracker
@@ -27,7 +31,7 @@ folder: diary
 startDate: 2021-01-01
 endDate: 2021-01-31
 summary:
-    template: "Total number of emails found: {{sum()}}"
+    template: "Total number of emails found: {{sum()::i}}"
     style: "font-size:20px;color:red;margin-left: 50px;margin-top:00px;"
 ```
 
diff --git a/examples/TestRelativeStartEndDate.md b/examples/TestRelativeStartEndDate.md
index 1b0e02f..aac55e0 100644
--- a/examples/TestRelativeStartEndDate.md
+++ b/examples/TestRelativeStartEndDate.md
@@ -10,4 +10,5 @@ line:
     title: PushUp
     yAxisLabel: Count
     lineColor: "#d65d0e"
+	yAxisTickInterval: 2
 ```
\ No newline at end of file
diff --git a/examples/TestWordCounting.md b/examples/TestWordCounting.md
index 8d59613..eba5234 100644
--- a/examples/TestWordCounting.md
+++ b/examples/TestWordCounting.md
@@ -37,7 +37,7 @@ summary:
     template: 'Total number of characters: {{sum()}}'
 ```
 
-## Word counts of any notes
+## Word counts of all notes
 Use file creation dates as x values then sum the counts up
 ``` tracker
 searchType: fileMeta
diff --git a/examples/WikiTracker.md b/examples/WikiTracker.md
index ba551e5..dc92a6c 100644
--- a/examples/WikiTracker.md
+++ b/examples/WikiTracker.md
@@ -1,15 +1,34 @@
 # Wiki Tracker
 
+wiki --> Try parse the display text first, if it does not exist, parse the link text
+wiki.link --> Parse the link text
+wiki.display --> Parse the display text
+
+In the exaample notes, we have
+[[todo_family|To-Do @Family]]
+[[todo_work|To-Do @Work]]
+
+## wiki.link
 ``` tracker
-searchType: wiki
+searchType: wiki.link
 searchTarget: todo_work
 folder: diary
 startDate: 2021-01-01
 endDate: 2021-01-31
-line:
-    title: Wiki Links
-    yAxisLabel: Count
-    lineColor: yellow
+summary:
+    template: '{{sum()::i}}'
 ```
 
+## wiki.display
+``` tracker
+searchType: wiki.display
+searchTarget: To
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-31
+summary:
+    template: '{{sum()::i}}'
+```
+
+
 Please also check those search targets in markdown files under folder 'diary'.
\ No newline at end of file
diff --git a/examples/diary/2021-01-04.md b/examples/diary/2021-01-04.md
index 307cc70..dd68aa2 100644
--- a/examples/diary/2021-01-04.md
+++ b/examples/diary/2021-01-04.md
@@ -29,6 +29,7 @@ randchar: B
 
 ⭐
 
+#clean-up
 
 #finance/bank1:-3.8USD
 
diff --git a/examples/diary/2021-01-06.md b/examples/diary/2021-01-06.md
index cc68d46..b63f5b6 100644
--- a/examples/diary/2021-01-06.md
+++ b/examples/diary/2021-01-06.md
@@ -29,6 +29,7 @@ randchar: D
 
 ⭐⭐⭐
 
+#clean-up
 
 #finance/bank1:-2.4USD
 
diff --git a/examples/diary/2021-01-14.md b/examples/diary/2021-01-14.md
index 8ef4cbc..ef3a44a 100644
--- a/examples/diary/2021-01-14.md
+++ b/examples/diary/2021-01-14.md
@@ -29,6 +29,7 @@ randchar: C
 
 ⭐
 
+#clean-up
 
 #finance/bank1:-2.5USD
 
diff --git a/examples/diary/2021-01-16.md b/examples/diary/2021-01-16.md
index f84dfa1..866fb52 100644
--- a/examples/diary/2021-01-16.md
+++ b/examples/diary/2021-01-16.md
@@ -28,6 +28,7 @@ randchar: E
 
 ⭐⭐
 
+#clean-up
 
 #finance/bank1:-2.6USD
 
diff --git a/examples/example_generator.ts b/examples/example_generator.ts
index 805fd11..3362727 100644
--- a/examples/example_generator.ts
+++ b/examples/example_generator.ts
@@ -165,7 +165,7 @@ for (
 
     // clean up
     let tagCleanUp = "#clean-up";
-    let doCleanUp = randomIntFromInterval(0, 30);
+    let doCleanUp = randomIntFromInterval(0, 5);
     if (doCleanUp === 1) {
         content += tagCleanUp + "\n";
     }

From 76daeff870d22119ec84789d35996395afb31c5f Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 16 Aug 2021 18:05:03 +0800
Subject: [PATCH 200/402] Fix the returning of error message in function
 collectDataFromTable

---
 src/main.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main.ts b/src/main.ts
index cee0e3b..74d5106 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -655,8 +655,8 @@ export default class Tracker extends Plugin {
         // console.log(tables);
 
         if (tableFileNotFound) {
-            let errorMessage = "File containing tables not found";
-            return errorMessage;
+            processInfo.errorMessage = "File containing tables not found";
+            return;
         }
 
         for (let tableData of tables) {
@@ -780,8 +780,8 @@ export default class Tracker extends Plugin {
                     return v === null;
                 })
             ) {
-                let errorMessage = "No valid X value found in table";
-                return errorMessage;
+                processInfo.errorMessage = "No valid X value found in table";
+                return;
             } else {
                 processInfo.gotAnyValidXValue ||= true;
             }

From 7aba0240bc7c63bec2aea13f41c055a3152f9e0f Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 16 Aug 2021 18:33:08 +0800
Subject: [PATCH 201/402] Use named group 'value' instead of 'values' in regex

---
 src/collecting.ts | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/collecting.ts b/src/collecting.ts
index 2937287..6f54884 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -175,7 +175,7 @@ export function getDateFromDvField(
 
     // Test this in Regex101
     // remember '\s' includes new line
-    // (^| |\t)\*{0,2}dvTarget\*{0,2}(::[ |\t]*(?<values>[\d\.\/\-\w,@; \t:]*))(\r?\n|\r|$)
+    // (^| |\t)\*{0,2}dvTarget\*{0,2}(::[ |\t]*(?<value>[\d\.\/\-\w,@; \t:]*))(\r?\n|\r|$)
     let strRegex =
         "(^| |\\t)\\*{0,2}" +
         dvTarget +
@@ -324,6 +324,8 @@ function extractDataUsingRegexWithMultipleValues(
     xValueMap: XValueMap,
     renderInfo: RenderInfo
 ): boolean {
+    // console.log("extractDataUsingRegexWithMultipleValues");
+
     let regex = new RegExp(strRegex, "gm");
     let match;
     let measure = 0.0;
@@ -333,9 +335,9 @@ function extractDataUsingRegexWithMultipleValues(
         if (!renderInfo.ignoreAttachedValue[query.getId()]) {
             if (
                 typeof match.groups !== "undefined" &&
-                typeof match.groups.values !== "undefined"
+                typeof match.groups.value !== "undefined"
             ) {
-                let values = match.groups.values.trim();
+                let values = match.groups.value.trim();
                 // console.log(values);
                 // console.log(query.getSeparator());
                 let splitted = values.split(query.getSeparator());
@@ -370,7 +372,6 @@ function extractDataUsingRegexWithMultipleValues(
                     splitted.length > query.getAccessor() &&
                     query.getAccessor() >= 0
                 ) {
-                    // TODO: it's not efficent to retrieve one value at a time, enhance this
                     // console.log("multiple-values");
                     let toParse = splitted[query.getAccessor()].trim();
                     let retParse = helper.parseFloatFromAny(
@@ -390,12 +391,6 @@ function extractDataUsingRegexWithMultipleValues(
                             query.addNumTargets();
                         }
                     }
-                } else {
-                    // no named groups, count occurrencies
-                    // console.log("count occurrencies");
-                    measure += renderInfo.constValue[query.getId()];
-                    extracted = true;
-                    query.addNumTargets();
                 }
             } else {
                 // no named groups, count occurrencies
@@ -406,7 +401,7 @@ function extractDataUsingRegexWithMultipleValues(
             }
         } else {
             // force to count occurrencies
-            // console.log("count occurrencies");
+            // console.log("forced count occurrencies");
             measure += renderInfo.constValue[query.getId()];
             extracted = true;
             query.addNumTargets();
@@ -624,7 +619,7 @@ export function collectDataFromInlineTag(
 ): boolean {
     // console.log(content);
     // Test this in Regex101
-    // (^|\s)#tagName(\/[\w-]+)*(:(?<values>[\d\.\/-]*)[a-zA-Z]*)?([\\.!,\\?;~-]*)?(\s|$)
+    // (^|\s)#tagName(\/[\w-]+)*(:(?<value>[\d\.\/-]*)[a-zA-Z]*)?([\\.!,\\?;~-]*)?(\s|$)
     let tagName = query.getTarget();
     if (query.getParentTarget()) {
         tagName = query.getParentTarget(); // use parent tag name for multiple values
@@ -635,7 +630,7 @@ export function collectDataFromInlineTag(
     let strRegex =
         "(^|\\s)#" +
         tagName +
-        "(\\/[\\w-]+)*(:(?<values>[\\d\\.\\/-]*)[a-zA-Z]*)?([\\.!,\\?;~-]*)?(\\s|$)";
+        "(\\/[\\w-]+)*(:(?<value>[\\d\\.\\/-]*)[a-zA-Z]*)?([\\.!,\\?;~-]*)?(\\s|$)";
     // console.log(strRegex);
 
     return extractDataUsingRegexWithMultipleValues(
@@ -656,8 +651,10 @@ export function collectDataFromText(
     dataMap: DataMap,
     xValueMap: XValueMap
 ): boolean {
+    // console.log("collectDataFromText");
+
     let strRegex = query.getTarget();
-    // console.log(strTextRegex);
+    // console.log(strRegex);
 
     return extractDataUsingRegexWithMultipleValues(
         content,
@@ -773,11 +770,11 @@ export function collectDataFromDvField(
 
     // Test this in Regex101
     // remember '\s' includes new line
-    // (^| |\t)\*{0,2}dvTarget\*{0,2}(::[ |\t]*(?<values>[\d\.\/\-\w,@; \t:]*))(\r?\n|\r|$)
+    // (^| |\t)\*{0,2}dvTarget\*{0,2}(::[ |\t]*(?<value>[\d\.\/\-\w,@; \t:]*))(\r?\n|\r|$)
     let strRegex =
         "(^| |\\t)\\*{0,2}" +
         dvTarget +
-        "\\*{0,2}(::[ |\\t]*(?<values>[\\d\\.\\/\\-\\w,@; \\t:]*))(\\r\\?\\n|\\r|$)";
+        "\\*{0,2}(::[ |\\t]*(?<value>[\\d\\.\\/\\-\\w,@; \\t:]*))(\\r\\?\\n|\\r|$)";
     // console.log(strRegex);
 
     return extractDataUsingRegexWithMultipleValues(

From 32953013c78832b680d3b63be193f20fb468f840 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 16 Aug 2021 18:55:25 +0800
Subject: [PATCH 202/402] Fix wiki counting

---
 src/collecting.ts | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/collecting.ts b/src/collecting.ts
index 6f54884..20a172e 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -566,6 +566,10 @@ export function collectDataFromWiki(
     let searchTarget = query.getTarget();
     let searchType = query.getType();
 
+    let textToSearch = "";
+    let strRegex = searchTarget;
+
+    // Prepare textToSearch
     for (let link of links) {
         if (!link) continue;
 
@@ -593,20 +597,17 @@ export function collectDataFromWiki(
         }
         wikiText = wikiText.trim();
 
-        let strRegex = searchTarget;
-
-        let extracted = extractDataUsingRegexWithMultipleValues(
-            wikiText,
-            strRegex,
-            query,
-            dataMap,
-            xValueMap,
-            renderInfo
-        );
-        if (extracted) return true;
+        textToSearch += wikiText + "\n";
     }
 
-    return false;
+    return extractDataUsingRegexWithMultipleValues(
+        textToSearch,
+        strRegex,
+        query,
+        dataMap,
+        xValueMap,
+        renderInfo
+    );
 }
 
 // In form 'key: value', name group 'value' from plugin, not from users

From df273c09bad744a230f4931570cd6327649a0850 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 16 Aug 2021 19:12:39 +0800
Subject: [PATCH 203/402] Update example TestFrontmatter

---
 examples/TestFrontmatter.md | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/examples/TestFrontmatter.md b/examples/TestFrontmatter.md
index c8f547b..b54acdc 100644
--- a/examples/TestFrontmatter.md
+++ b/examples/TestFrontmatter.md
@@ -1,6 +1,13 @@
 # Test Frontmatter
 
-
+## Deep Values
+deepValue:
+    very:
+	    very:
+		    very:
+			    very: 
+				    very:
+					    deep: 27.4
 ``` tracker
 searchType: frontmatter
 searchTarget: deepValue.very.very.very.very.very.deep
@@ -10,4 +17,22 @@ line:
     title: Deep Values
 ```
 
+## Multiple Values
+bloodpressure: 184.4/118.8
+``` tracker
+searchType: frontmatter
+searchTarget: bloodpressure[0], bloodpressure[1]
+datasetName: systolic, diastolic
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-31
+line:
+    title: Blood Pressures
+    yAxisLabel: BP
+    yAxisUnit: mmHg
+    lineColor: yellow, red
+    showLegend: true
+    legendPosition: bottom
+```
+
 Please also check those search targets in markdown files under folder 'diary'.
\ No newline at end of file

From 898cd8753baa3cd7c036105fa526bcfb27275b33 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 16 Aug 2021 20:12:25 +0800
Subject: [PATCH 204/402] Do refactoring on renderErrorMessage

---
 src/main.ts | 102 ++++++++++++++++++++++++++++------------------------
 1 file changed, 55 insertions(+), 47 deletions(-)

diff --git a/src/main.ts b/src/main.ts
index 74d5106..c01d31f 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,7 +1,7 @@
 import { App, CachedMetadata, Plugin } from "obsidian";
 import { MarkdownPostProcessorContext, MarkdownView, Editor } from "obsidian";
 import { TFile, TFolder, normalizePath } from "obsidian";
-import { render, renderErrorMessage } from "./rendering";
+import * as rendering from "./rendering";
 import { getRenderInfoFromYaml } from "./parsing";
 import {
     Datasets,
@@ -79,6 +79,12 @@ export default class Tracker extends Plugin {
         await this.saveData(this.settings);
     }
 
+    renderErrorMessage(message: string, canvas: HTMLElement, el: HTMLElement) {
+        rendering.renderErrorMessage(canvas, message);
+        el.appendChild(canvas);
+        return;
+    }
+
     onunload() {
         console.log("unloading obsidian-tracker plugin");
     }
@@ -130,10 +136,7 @@ export default class Tracker extends Plugin {
         let yamlText = source.trim();
         let retRenderInfo = getRenderInfoFromYaml(yamlText, this);
         if (typeof retRenderInfo === "string") {
-            let errorMessage = retRenderInfo;
-            renderErrorMessage(canvas, errorMessage);
-            el.appendChild(canvas);
-            return;
+            return this.renderErrorMessage(retRenderInfo, canvas, el);
         }
         let renderInfo = retRenderInfo as RenderInfo;
         // console.log(renderInfo);
@@ -143,10 +146,14 @@ export default class Tracker extends Plugin {
         try {
             files = this.getFiles(renderInfo.folder);
         } catch (e) {
-            let errorMessage = e.message;
-            renderErrorMessage(canvas, errorMessage);
-            el.appendChild(canvas);
-            return;
+            return this.renderErrorMessage(e.message, canvas, el);
+        }
+        if (files.length === 0) {
+            return this.renderErrorMessage(
+                "No files found in folder",
+                canvas,
+                el
+            );
         }
         // console.log(files);
 
@@ -453,31 +460,35 @@ export default class Tracker extends Plugin {
         // Collect data from a file, one file contains full dataset
         await this.collectDataFromTable(dataMap, renderInfo, processInfo);
         if (processInfo.errorMessage) {
-            renderErrorMessage(canvas, processInfo.errorMessage);
-            el.appendChild(canvas);
-            return;
+            return this.renderErrorMessage(
+                processInfo.errorMessage,
+                canvas,
+                el
+            );
         }
 
         if (!processInfo.gotAnyValidXValue) {
-            let errorMessage = "No valid X values found in notes";
-            renderErrorMessage(canvas, errorMessage);
-            el.appendChild(canvas);
-            return;
+            return this.renderErrorMessage(
+                "No valid X values found in notes",
+                canvas,
+                el
+            );
         }
 
         if (!processInfo.gotAnyValidYValue) {
-            let errorMessage = "No valid Y values found in notes";
-            renderErrorMessage(canvas, errorMessage);
-            el.appendChild(canvas);
-            return;
+            return this.renderErrorMessage(
+                "No valid Y values found in notes",
+                canvas,
+                el
+            );
         }
 
         if (processInfo.fileCounter === 0) {
-            let errorMessage =
-                "No notes found under the given search condition";
-            renderErrorMessage(canvas, errorMessage);
-            el.appendChild(canvas);
-            return;
+            return this.renderErrorMessage(
+                "No notes found under the given search condition",
+                canvas,
+                el
+            );
         }
         // console.log(minDate);
         // console.log(maxDate);
@@ -485,10 +496,7 @@ export default class Tracker extends Plugin {
 
         // Check date range
         if (!processInfo.minDate.isValid() || !processInfo.maxDate.isValid()) {
-            let errorMessage = "Invalid date range";
-            renderErrorMessage(canvas, errorMessage);
-            el.appendChild(canvas);
-            return;
+            return this.renderErrorMessage("Invalid date range", canvas, el);
         }
         if (renderInfo.startDate === null && renderInfo.endDate === null) {
             // No date arguments
@@ -501,10 +509,11 @@ export default class Tracker extends Plugin {
             if (renderInfo.startDate < processInfo.maxDate) {
                 renderInfo.endDate = processInfo.maxDate.clone();
             } else {
-                let errorMessage = "Invalid date range";
-                renderErrorMessage(canvas, errorMessage);
-                el.appendChild(canvas);
-                return;
+                return this.renderErrorMessage(
+                    "Invalid date range",
+                    canvas,
+                    el
+                );
             }
         } else if (
             renderInfo.endDate !== null &&
@@ -513,10 +522,11 @@ export default class Tracker extends Plugin {
             if (renderInfo.endDate > processInfo.minDate) {
                 renderInfo.startDate = processInfo.minDate.clone();
             } else {
-                let errorMessage = "Invalid date range";
-                renderErrorMessage(canvas, errorMessage);
-                el.appendChild(canvas);
-                return;
+                return this.renderErrorMessage(
+                    "Invalid date range",
+                    canvas,
+                    el
+                );
             }
         } else {
             // startDate and endDate are valid
@@ -526,10 +536,11 @@ export default class Tracker extends Plugin {
                 (renderInfo.startDate > processInfo.maxDate &&
                     renderInfo.endDate > processInfo.maxDate)
             ) {
-                let errorMessage = "Invalid date range";
-                renderErrorMessage(canvas, errorMessage);
-                el.appendChild(canvas);
-                return;
+                return this.renderErrorMessage(
+                    "Invalid date range",
+                    canvas,
+                    el
+                );
             }
         }
         // console.log(renderInfo.startDate);
@@ -594,12 +605,9 @@ export default class Tracker extends Plugin {
         renderInfo.datasets = datasets;
         // console.log(renderInfo.datasets);
 
-        let result = render(canvas, renderInfo);
-        if (typeof result === "string") {
-            let errorMessage = result;
-            renderErrorMessage(canvas, errorMessage);
-            el.appendChild(canvas);
-            return;
+        let retRender = rendering.render(canvas, renderInfo);
+        if (typeof retRender === "string") {
+            return this.renderErrorMessage(retRender, canvas, el);
         }
 
         el.appendChild(canvas);

From 6b5b3d44c7c1de3667276117a6a962343202722d Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 16 Aug 2021 21:34:29 +0800
Subject: [PATCH 205/402] Modify error message "No markdown files found in
 folder'

---
 examples/ErrorMessages.md | 28 ++++++++++++++++++++--------
 src/main.ts               |  2 +-
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/examples/ErrorMessages.md b/examples/ErrorMessages.md
index bf2a519..41c5078 100644
--- a/examples/ErrorMessages.md
+++ b/examples/ErrorMessages.md
@@ -8,21 +8,24 @@ searchTarget: "\"
 line:
 ```
 
-'searchTypes' wrong, 'searchType' right
+'searchTypes' --> typo
+'searchType' --> correct
 ``` tracker
 searchTypes: tag
 searchTarget: weight
 line:
 ```
 
-'searchTargets' wrong, searchTarget right
+'searchTargets' --> typo
+'searchTarget' --> correct
 ``` tracker
 searchType: tag
 searchTargets: weight
 line:
 ```
 
-'lines' wrong, 'line' right
+'lines' --> typo
+'line' --> correct
 ``` tracker
 searchType: tag
 searchTarget: weight
@@ -36,15 +39,15 @@ searchTarget: weight
 line:
 ```
 
-## Target
-Missing search target
+## searchTarget
+Missing searchTarget
 ``` tracker
 searchType: tag
 searchTarget: 
 line:
 ```
 
-Invalid search target, '#' is not allowed
+Invalid searchTarget, '#' is a special character to YAML, use single quotes to wrap it
 ``` tracker
 searchType: tag
 searchTarget: #weight 
@@ -60,7 +63,16 @@ folder: abc
 line:
 ```
 
-## Date
+## Files
+No file in folder
+``` tracker
+searchType: tag
+searchTarget: weight
+folder: empty
+line:
+```
+
+## X Values (Date)
 The format of startDate or endDate does not match dateFormat in the plugin settings. Change the settings or Add a dateFormat parameter into YAML.
 ``` tracker
 searchType: tag
@@ -104,7 +116,7 @@ line:
     yAxisLabel: BP1, BP2, BP3
 ```
 
-## Input
+## Y Values
 No valid X values, add "xDataset: 0" to fix it
 ``` tracker
 searchType: fileMeta, dvField
diff --git a/src/main.ts b/src/main.ts
index c01d31f..6e99c7d 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -150,7 +150,7 @@ export default class Tracker extends Plugin {
         }
         if (files.length === 0) {
             return this.renderErrorMessage(
-                "No files found in folder",
+                "No markdown files found in folder",
                 canvas,
                 el
             );

From 3954ea11ab279dbc4a7ea8bed9bebe0aec7c8699 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 17 Aug 2021 10:42:34 +0800
Subject: [PATCH 206/402] Record fileTotal, fileAvailable, fileNotInFormat,
 fileOutOfDateRange and use them for error messages

---
 examples/ErrorMessages.md   | 45 +++++++++----------
 examples/TestDateFormats.md |  4 ++
 src/data.ts                 | 10 ++++-
 src/main.ts                 | 86 ++++++++++++++++++-------------------
 4 files changed, 76 insertions(+), 69 deletions(-)

diff --git a/examples/ErrorMessages.md b/examples/ErrorMessages.md
index 41c5078..fdf61ba 100644
--- a/examples/ErrorMessages.md
+++ b/examples/ErrorMessages.md
@@ -72,22 +72,29 @@ folder: empty
 line:
 ```
 
-## X Values (Date)
-The format of startDate or endDate does not match dateFormat in the plugin settings. Change the settings or Add a dateFormat parameter into YAML.
+## Number of parameters
+Two search targets provided, the number of search types shouldn't be more than two.
 ``` tracker
-searchType: tag
-searchTarget: weight
-startDate: 2020-01-01_Fri
-endDate: 2020-01-31_Mon
+searchType: frontmatter, frontmatter, frontmatter
+searchTarget: bloodpressure[0], bloodpressure[1]
 line:
 ```
 
-No note found in the given date range
+yAxisLabel allows only two inputs
+``` tracker
+searchType: frontmatter, frontmatter
+searchTarget: bloodpressure[0], bloodpressure[1]
+line:
+    yAxisLabel: BP1, BP2, BP3
+```
+
+## startDate & endDate
+The format of startDate or endDate does not match dateFormat in the plugin settings. Change the settings or Add a dateFormat parameter into YAML.
 ``` tracker
 searchType: tag
 searchTarget: weight
-startDate: 2020-01-01
-endDate: 2020-01-31
+startDate: 2020-01-01_Fri
+endDate: 2020-01-31_Mon
 line:
 ```
 
@@ -100,23 +107,16 @@ endDate: 2021-02-30
 line:
 ```
 
-## Number of parameters
-Two search targets provided, the number of search types shouldn't be more than two.
-``` tracker
-searchType: frontmatter, frontmatter, frontmatter
-searchTarget: bloodpressure[0], bloodpressure[1]
-line:
-```
-
-yAxisLabel allows only two inputs
+## X Values (Dates)
+No note found in the given date range
 ``` tracker
-searchType: frontmatter, frontmatter
-searchTarget: bloodpressure[0], bloodpressure[1]
+searchType: tag
+searchTarget: weight
+startDate: 2020-01-01
+endDate: 2020-01-31
 line:
-    yAxisLabel: BP1, BP2, BP3
 ```
 
-## Y Values
 No valid X values, add "xDataset: 0" to fix it
 ``` tracker
 searchType: fileMeta, dvField
@@ -126,6 +126,7 @@ line:
     fillGap: true
 ```
 
+## Y Values
 No valid Y values!!!!!
 Use parameter `textValueMap` to map a text to a value.
 ``` tracker
diff --git a/examples/TestDateFormats.md b/examples/TestDateFormats.md
index d332f08..ff6fc79 100644
--- a/examples/TestDateFormats.md
+++ b/examples/TestDateFormats.md
@@ -181,6 +181,10 @@ The reference date of the relative date input is 'today' (The current date of yo
 - -1M ==> last month
 - -1y ==> last year
 
+Notice!! 
+- small 'm' represent 'minute'
+- If the date range is less than 1 day, you will get the error message 'No valid date as X value found in notes'.
+
 ``` tracker
 searchType: tag
 searchTarget: weight
diff --git a/src/data.ts b/src/data.ts
index 596ac19..cae3b88 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -1002,7 +1002,10 @@ export class TableData {
 }
 
 export class CollectingProcessInfo {
-    fileCounter: number;
+    fileTotal: number; // total number of files
+    fileAvailable: number; // total available count
+    fileOutOfDateRange: number;
+    fileNotInFormat: number;
     errorMessage: string;
     minDate: Moment;
     maxDate: Moment;
@@ -1010,7 +1013,10 @@ export class CollectingProcessInfo {
     gotAnyValidYValue: boolean;
 
     constructor() {
-        this.fileCounter = 0;
+        this.fileTotal = 0;
+        this.fileAvailable = 0;
+        this.fileOutOfDateRange = 0;
+        this.fileNotInFormat = 0;
         this.errorMessage = "";
         this.minDate = window.moment(""); // invalid date
         this.maxDate = window.moment(""); // invalid date
diff --git a/src/main.ts b/src/main.ts
index 6e99c7d..f6af687 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -165,6 +165,7 @@ export default class Tracker extends Plugin {
         // Collecting data to dataMap first
         let dataMap: DataMap = new Map(); // {strDate: [query: value, ...]}
         let processInfo = new CollectingProcessInfo();
+        processInfo.fileTotal = files.length;
 
         // Collect data from files, each file has one data point for each query
         const loopFilePromises = files.map(async (file) => {
@@ -286,16 +287,19 @@ export default class Tracker extends Plugin {
                     if (!xDate.isValid()) {
                         // console.log("Invalid xDate");
                         skipThisFile = true;
+                        processInfo.fileNotInFormat++;
                     } else {
                         // console.log("file " + file.basename + " accepted");
                         if (renderInfo.startDate !== null) {
                             if (xDate < renderInfo.startDate) {
                                 skipThisFile = true;
+                                processInfo.fileOutOfDateRange++;
                             }
                         }
                         if (renderInfo.endDate !== null) {
                             if (xDate > renderInfo.endDate) {
                                 skipThisFile = true;
+                                processInfo.fileOutOfDateRange++;
                             }
                         }
                     }
@@ -306,10 +310,10 @@ export default class Tracker extends Plugin {
                             xDatasetId,
                             helper.dateToStr(xDate, renderInfo.dateFormat)
                         );
-                        processInfo.fileCounter++;
+                        processInfo.fileAvailable++;
 
                         // Get min/max date
-                        if (processInfo.fileCounter == 1) {
+                        if (processInfo.fileAvailable == 1) {
                             processInfo.minDate = xDate.clone();
                             processInfo.maxDate = xDate.clone();
                         } else {
@@ -466,37 +470,30 @@ export default class Tracker extends Plugin {
                 el
             );
         }
-
-        if (!processInfo.gotAnyValidXValue) {
-            return this.renderErrorMessage(
-                "No valid X values found in notes",
-                canvas,
-                el
-            );
-        }
-
-        if (!processInfo.gotAnyValidYValue) {
-            return this.renderErrorMessage(
-                "No valid Y values found in notes",
-                canvas,
-                el
-            );
-        }
-
-        if (processInfo.fileCounter === 0) {
-            return this.renderErrorMessage(
-                "No notes found under the given search condition",
-                canvas,
-                el
-            );
-        }
         // console.log(minDate);
         // console.log(maxDate);
         // console.log(dataMap);
 
         // Check date range
-        if (!processInfo.minDate.isValid() || !processInfo.maxDate.isValid()) {
-            return this.renderErrorMessage("Invalid date range", canvas, el);
+        // minDate and maxDate are collected without knowing startDate and endDate
+        // console.log(`fileTotal: ${processInfo.fileTotal}`);
+        // console.log(`fileAvailable: ${processInfo.fileAvailable}`);
+        // console.log(`fileNotInFormat: ${processInfo.fileNotInFormat}`);
+        // console.log(`fileOutOfDateRange: ${processInfo.fileOutOfDateRange}`);
+        let dateErrorMessage = "";
+        if (
+            !processInfo.minDate.isValid() ||
+            !processInfo.maxDate.isValid() ||
+            processInfo.fileAvailable === 0 ||
+            !processInfo.gotAnyValidXValue
+        ) {
+            dateErrorMessage = `No valid date as X value found in notes.`;
+            if (processInfo.fileOutOfDateRange > 0) {
+                dateErrorMessage += `\n${processInfo.fileOutOfDateRange} files are out of the date range.`;
+            }
+            if (processInfo.fileNotInFormat) {
+                dateErrorMessage += `\n${processInfo.fileNotInFormat} files are not in the right format.`;
+            }
         }
         if (renderInfo.startDate === null && renderInfo.endDate === null) {
             // No date arguments
@@ -509,11 +506,7 @@ export default class Tracker extends Plugin {
             if (renderInfo.startDate < processInfo.maxDate) {
                 renderInfo.endDate = processInfo.maxDate.clone();
             } else {
-                return this.renderErrorMessage(
-                    "Invalid date range",
-                    canvas,
-                    el
-                );
+                dateErrorMessage = "Invalid date range";
             }
         } else if (
             renderInfo.endDate !== null &&
@@ -522,11 +515,7 @@ export default class Tracker extends Plugin {
             if (renderInfo.endDate > processInfo.minDate) {
                 renderInfo.startDate = processInfo.minDate.clone();
             } else {
-                return this.renderErrorMessage(
-                    "Invalid date range",
-                    canvas,
-                    el
-                );
+                dateErrorMessage = "Invalid date range";
             }
         } else {
             // startDate and endDate are valid
@@ -536,16 +525,23 @@ export default class Tracker extends Plugin {
                 (renderInfo.startDate > processInfo.maxDate &&
                     renderInfo.endDate > processInfo.maxDate)
             ) {
-                return this.renderErrorMessage(
-                    "Invalid date range",
-                    canvas,
-                    el
-                );
+                dateErrorMessage = "Invalid date range";
             }
         }
+        if (dateErrorMessage) {
+            return this.renderErrorMessage(dateErrorMessage, canvas, el);
+        }
         // console.log(renderInfo.startDate);
         // console.log(renderInfo.endDate);
 
+        if (!processInfo.gotAnyValidYValue) {
+            return this.renderErrorMessage(
+                "No valid Y value found in notes",
+                canvas,
+                el
+            );
+        }
+
         // Reshape data for rendering
         let datasets = new Datasets(renderInfo.startDate, renderInfo.endDate);
         for (let query of renderInfo.queries) {
@@ -685,7 +681,7 @@ export default class Tracker extends Plugin {
                 normalizePath(filePath)
             );
             if (file && file instanceof TFile) {
-                processInfo.fileCounter++;
+                processInfo.fileAvailable++;
                 let content = await this.app.vault.adapter.read(file.path);
                 // console.log(content);
 
@@ -788,7 +784,7 @@ export default class Tracker extends Plugin {
                     return v === null;
                 })
             ) {
-                processInfo.errorMessage = "No valid X value found in table";
+                processInfo.errorMessage = "No valid date as X value found in table";
                 return;
             } else {
                 processInfo.gotAnyValidXValue ||= true;

From 92f3355925dfc967d5e67b97eb1dc56bee6c554b Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 17 Aug 2021 13:58:03 +0800
Subject: [PATCH 207/402] Support specifying files and files from links

---
 README.md                      | 20 ++++------
 docs/Examples.md               |  2 +-
 docs/Expressions.md            |  4 ++
 docs/InputParameters.md        |  8 ++++
 docs/Questions.md              | 15 +++++--
 docs/ReleaseNotes.md           |  3 ++
 examples/TestSpecifiedFiles.md | 25 ++++++++++++
 examples/data/MTG-Card-1.md    |  3 ++
 examples/data/MTG-Card-2.md    |  3 ++
 examples/data/MTG-Card-3.md    |  3 ++
 examples/data/MTG-Deck-1.md    |  5 +++
 src/data.ts                    |  6 +++
 src/main.ts                    | 71 ++++++++++++++++++++++++++++------
 src/parsing.ts                 | 29 ++++++++++++++
 14 files changed, 168 insertions(+), 29 deletions(-)
 create mode 100644 examples/TestSpecifiedFiles.md
 create mode 100644 examples/data/MTG-Card-1.md
 create mode 100644 examples/data/MTG-Card-2.md
 create mode 100644 examples/data/MTG-Card-3.md
 create mode 100644 examples/data/MTG-Deck-1.md

diff --git a/README.md b/README.md
index c07cda0..f04d9b4 100644
--- a/README.md
+++ b/README.md
@@ -13,19 +13,13 @@ This is an [Obsidian](https://obsidian.md/) plugin that helps you collect data f
 From version 1.9.0, template variables, e.g. '{{sum}}', are deprecated. Instead, Tracker provide operators (+, -, *, /, %) and functions (dataset(), sum(), maxStreak(), ......etc) to help us do data processing. For users having code blocks from previous version, please replace '{{sum}}' by '{{sum()}}' or '{{sum(1)}}' by '{{sum(dataset(1))}}'. More information about the new expressions could be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Expressions.md).
 
 ## What's New
-
-Version 1.9.0
-- Add a new output type `pie`, rendering a pie chart ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestPieChart.md))
-- Allow expressions (operators and functions) as data inputs for output type `summary`, `bullet`, and `pie` (examples: [expression](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestExpression.md), [summary](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestSummary.md), [bullet](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestBullet.md), [pie](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestPieChart.md))
-- Allow formatting evaluated expressions by a follwing format string ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestExpression.md))
-
-Version 1.9.1
-- Fixed errors on collecting time values from `dvField`
-- Fixed errors on collecting wiki while fileCache.links is undefined
-
-Version 1.9.2
-- Allow using seconds in time values
-- Fixed error parsing `dvField`
+Version 1.10.0
+- Add annotation mode to month view ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestPieChart.md))
+- Add parameter `yAxisTickInterval` and `yAxisTickFormat` for the line and bar chart ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestPieChart.md))
+- Allow using regular expression in parameter `dateFormatPrefix` and `dateFormatSuffix` ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestPieChart.md))
+- Fixed external label positioning in the pie chart
+- Enhanced error messages for 'no values found'
+- Fixed using double quotes for multiple lines in summary template
 
 ## Usage
 
diff --git a/docs/Examples.md b/docs/Examples.md
index ee15fe7..38a2fa0 100644
--- a/docs/Examples.md
+++ b/docs/Examples.md
@@ -28,7 +28,7 @@ The following table lists use cases with information of target location (Locatio
 | content | I walked 10000 steps today. | searchType: text<br>searchTarget: 'walked\\s+(?\<value\>[0-9]+)\\s+steps' | V |
 | content | myvalues 1/2/3 | searchType: text<br>searchTarget: 'myvalues\\s+(?\<value\>[0-9]+)/([0-9]+)/([0-9]+), myvalues\\s+([0-9]+)/(?\<value\>[0-9]+)/([0-9]+), myvalues\\s+([0-9]+)/([0-9]+)/(?\<value\>[0-9]+)' | V |
 | table content | { a table filled with dates and values }<br>[example table](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/data/Tables.md) | searchType: table<br>searchTarget: filePath[0][0], filePath[0][1] | V |
-| talbe content | { a table filled with dates and values }<br>[example table](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/data/Tables.md) | searchType: table<br>searchTarget: filePath[1][0], filePath[1][1][0], filePath[1][1][1] | V |
+| table content | { a table filled with dates and values }<br>[example table](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/data/Tables.md) | searchType: table<br>searchTarget: filePath[1][0], filePath[1][1][0], filePath[1][1][1] | V |
 | file meta | meta data from files <br>(size, cDate, mDate, numWords, numChars, numSentences) | searchType: fileMeta<br>searchTarget: size | V |
 | content | - [x] Say love<br>- [ ] Say love | searchType:task<br>searchTarget: Say love | O |
 | content | - [x] Say love | searchType:task.done<br>searchTarget: Say love | O |
diff --git a/docs/Expressions.md b/docs/Expressions.md
index 4855eeb..a26ebe5 100644
--- a/docs/Expressions.md
+++ b/docs/Expressions.md
@@ -93,3 +93,7 @@ e.g.
 ## Missing Values
 
 Notice that the missing values (null values) are ignored in function like sum or average. Moreover, a value plus a missing value will leads to null value (missing value). To avoid these, you can set those missing values to a value by using parameter `penalty` or use expression function `setMissingValues`.
+
+## String Output Format
+
+If the output of an expression is string, you can assign the format by using
\ No newline at end of file
diff --git a/docs/InputParameters.md b/docs/InputParameters.md
index f2a8944..7a916cd 100644
--- a/docs/InputParameters.md
+++ b/docs/InputParameters.md
@@ -59,6 +59,9 @@ These key-value pairs should be placed under the key `line` or `bar`.
 | `yAxisColor` | Color of Y axis | 1~2 | 'white'('black'<sup>*</sup>) |
 | `yAxisLabelColor` | Color of Y axis label | 1~2 | 'white'('black'<sup>*</sup>) |
 | `yAxisUnit` | Unit displayed aside Y axis label | 1~2 | '' | 
+yAxisTickInterval
+yAxisTickFormat
+
 | `yMin` | Minimum value on Y axis | 1~2 |Minimum Y value found | 
 | `yMax` | Maximum value on Y axis | 1~2 | Maximum Y value found |
 | `reverseYAxis` | Flip (upside down) the Y Axis or not (true\|false) | 1~2 | false |
@@ -123,6 +126,7 @@ These key-value pairs should be placed under the key `month`.
 
 | Key | Description | Number of Values | Default |
 |:--------|:-------|:-----------:|:------|
+| `mode` | () | 1 | 
 | `dataset` | Index of the dataset of your interest | 1~NT | all indices of non-x searchTarget |
 | `startWeekOn` | First day of a week ('Sun'\|'Mon') | 1 | 'Sun' |
 | `threshold` | Threshold to determine showing a circle on a day or not | 1~NT | 0 |
@@ -143,6 +147,10 @@ These key-value pairs should be placed under the key `month`.
 | `todayRingColor` | Color of the ring on today | 1 | 'white' |
 | `selectedRingColor` | Color of the ring on the selected day | 1 | 'firebrick' |
 | `initMonth` | Initial month to show (YYYY-MM) | 1 | last month found |
+showAnnotation
+annotation
+showAnnotationOfAllTargets
+
 
 ### Parameters for Pie Chart
 These key-value pairs should be placed under the key `pie`.
diff --git a/docs/Questions.md b/docs/Questions.md
index 90852c9..b14daff 100644
--- a/docs/Questions.md
+++ b/docs/Questions.md
@@ -1,22 +1,29 @@
 # Frequently Asked Questions
 
-- Does Tracker only track data in daily notes (notes named by dates)?
+- Does Tracker only track data in daily notes (file names contain dates)?
 
-    No. From version 1.6.0, you can use collect date data from file meta data with search type `fileMeta` and use that dataset as `xDataset`. So any notes can be included.
+    No. You can get date from any `searchType` including `fileMeta`. The collected dates  use that dataset as `xDataset`. So any notes can be included.
 
 - Does Tracker only track data over dates?
 
     Yes. The data type of x values should be in the form of date for now. This constrain might be relaxed in future.
 
-- Why my line chart looks broken at some points?
+- Why my line chart looks broken (not connected) at some points?
 
     The plugin only connects adjacent points (by date) by default. To force it connecting points over missing data, set the parameter `fillGap` under `line` to true.
 
+- Why the plugin shows error 'No valid X values found in notes'?
+
+    The default X values were extracted from the title of your notes. By assigning proper `dateFormat`, and combine with `dateFormatPrefix` and `dateFormatSuffix`. The date could be extracted from your title successfully.
+    The X values in Tracker should be of Date type. No files or x data values matched the dateFormat you gave in the given folder
+
+- Wny the plugin shows error 'No valid Y values found in notes'?
+    No y data values found
+
 - Why the plugin shows 'No notes found under the given search condition'?
 
     There are few possibilities for this error messages.
     1. No files in the given folder
-    2. No files or x data values matched the dateFormat you gave in the given folder
     3. No files in the date range you gave (from startDate to endDate)
 
 - Why the plugin shows 'Error parsing YAML'?
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index 2a5f8d4..0bd5de2 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,5 +1,8 @@
 # Release Notes
 
+## v1.10.0
+-
+
 ## v1.9.2
 - Allow using seconds in time values
 - Fixed error parsing `dvField`
diff --git a/examples/TestSpecifiedFiles.md b/examples/TestSpecifiedFiles.md
new file mode 100644
index 0000000..17e82dc
--- /dev/null
+++ b/examples/TestSpecifiedFiles.md
@@ -0,0 +1,25 @@
+# Test Specified Files
+
+## Collect Data from the Specified Files Only
+``` tracker
+searchType: frontmatter, dvField
+searchTarget: date, dataviewTarget
+xDataset: 0
+file: data/data1, data/data2, data/data3
+specifiedFilesOnly: true
+line:
+```
+
+## Collect Data from the Linked Files Only
+Count the MTG mana cost in linked files
+``` tracker
+searchType: fileMeta, text
+searchTarget: 'cDate, {R}, {G}, {B}'
+fileContainsLinkedFiles: data/MTG-Deck-1
+specifiedFilesOnly: true
+xDataset: 0
+pie:
+    label: '{{sum(dataset(1))::i}},{{sum(dataset(2))::i}}, {{sum(dataset(3))::i}}'
+    data: '{{sum(dataset(1))}},{{sum(dataset(2))}}, {{sum(dataset(3))}}'
+	dataColor: red, green, blue
+```
\ No newline at end of file
diff --git a/examples/data/MTG-Card-1.md b/examples/data/MTG-Card-1.md
new file mode 100644
index 0000000..fdeb29c
--- /dev/null
+++ b/examples/data/MTG-Card-1.md
@@ -0,0 +1,3 @@
+
+
+{R}{R}
\ No newline at end of file
diff --git a/examples/data/MTG-Card-2.md b/examples/data/MTG-Card-2.md
new file mode 100644
index 0000000..916a10c
--- /dev/null
+++ b/examples/data/MTG-Card-2.md
@@ -0,0 +1,3 @@
+
+
+{B}{R}
\ No newline at end of file
diff --git a/examples/data/MTG-Card-3.md b/examples/data/MTG-Card-3.md
new file mode 100644
index 0000000..1d95e77
--- /dev/null
+++ b/examples/data/MTG-Card-3.md
@@ -0,0 +1,3 @@
+
+
+{G}{G}{G}{G}{G}
\ No newline at end of file
diff --git a/examples/data/MTG-Deck-1.md b/examples/data/MTG-Deck-1.md
new file mode 100644
index 0000000..ca577d3
--- /dev/null
+++ b/examples/data/MTG-Deck-1.md
@@ -0,0 +1,5 @@
+
+
+[[MTG-Card-1]]
+[[MTG-Card-2]]
+[[MTG-Card-3]]
\ No newline at end of file
diff --git a/src/data.ts b/src/data.ts
index cae3b88..2cdfb11 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -540,6 +540,9 @@ export class RenderInfo {
     queries: Query[];
     xDataset: number[];
     folder: string;
+    file: string[];
+    specifiedFilesOnly: boolean;
+    fileContainsLinkedFiles: string[];
     dateFormat: string;
     dateFormatPrefix: string;
     dateFormatSuffix: string;
@@ -578,6 +581,9 @@ export class RenderInfo {
         this.queries = queries;
         this.xDataset = []; // use file name
         this.folder = "/";
+        this.file = []; // extra files to use
+        this.specifiedFilesOnly = false; // if true, use files specified only
+        this.fileContainsLinkedFiles = [];
         this.dateFormat = "YYYY-MM-DD";
         this.dateFormatPrefix = "";
         this.dateFormatSuffix = "";
diff --git a/src/main.ts b/src/main.ts
index f6af687..e4bcb3b 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,4 +1,4 @@
-import { App, CachedMetadata, Plugin } from "obsidian";
+import { App, CachedMetadata, getLinkpath, Plugin } from "obsidian";
 import { MarkdownPostProcessorContext, MarkdownView, Editor } from "obsidian";
 import { TFile, TFolder, normalizePath } from "obsidian";
 import * as rendering from "./rendering";
@@ -110,18 +110,66 @@ export default class Tracker extends Plugin {
         return files;
     }
 
-    getFiles(folderToSearch: string, includeSubFolders: boolean = true) {
+    getFiles(renderInfo: RenderInfo, includeSubFolders: boolean = true) {
         let files: TFile[] = [];
 
-        let folder = this.app.vault.getAbstractFileByPath(
-            normalizePath(folderToSearch)
-        );
-        if (!folder || !(folder instanceof TFolder)) {
-            // Folder not exists
-        } else {
-            files = files.concat(this.getFilesInFolder(folder));
+        let folderToSearch = renderInfo.folder;
+        let useSpecifiedFilesOnly = renderInfo.specifiedFilesOnly;
+        let specifiedFiles = renderInfo.file;
+        let filesContainsLinkedFiles = renderInfo.fileContainsLinkedFiles;
+
+        // Include files in folder
+        if (!useSpecifiedFilesOnly) {
+            let folder = this.app.vault.getAbstractFileByPath(
+                normalizePath(folderToSearch)
+            );
+            if (folder && folder instanceof TFolder) {
+                files = files.concat(this.getFilesInFolder(folder));
+            }
+        }
+
+        // Include specified file
+        for (let filePath of specifiedFiles) {
+            if (!filePath.endsWith(".md")) {
+                filePath += ".md";
+            }
+            let file = this.app.vault.getAbstractFileByPath(
+                normalizePath(filePath)
+            );
+            if (file && file instanceof TFile) {
+                files.push(file);
+            }
         }
 
+        // Include files in pointed by links in file
+        for (let filePath of filesContainsLinkedFiles) {
+            if (!filePath.endsWith(".md")) {
+                filePath += ".md";
+            }
+            let file = this.app.vault.getAbstractFileByPath(
+                normalizePath(filePath)
+            );
+            if (file && file instanceof TFile) {
+                // Get linked files
+                let fileCache = this.app.metadataCache.getFileCache(file);
+                // this.app.metadataCache.
+                if (fileCache?.links) {
+                    for (let link of fileCache.links) {
+                        if (!link) continue;
+                        let linkedFile =
+                            this.app.metadataCache.getFirstLinkpathDest(
+                                link.link,
+                                filePath
+                            );
+                        if (linkedFile && linkedFile instanceof TFile) {
+                            files.push(linkedFile);
+                        }
+                    }
+                }
+            }
+        }
+
+        // console.log(files);
         return files;
     }
 
@@ -144,7 +192,7 @@ export default class Tracker extends Plugin {
         // Get files
         let files: TFile[];
         try {
-            files = this.getFiles(renderInfo.folder);
+            files = this.getFiles(renderInfo);
         } catch (e) {
             return this.renderErrorMessage(e.message, canvas, el);
         }
@@ -784,7 +832,8 @@ export default class Tracker extends Plugin {
                     return v === null;
                 })
             ) {
-                processInfo.errorMessage = "No valid date as X value found in table";
+                processInfo.errorMessage =
+                    "No valid date as X value found in table";
                 return;
             } else {
                 processInfo.gotAnyValidXValue ||= true;
diff --git a/src/parsing.ts b/src/parsing.ts
index a38b163..345652b 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1172,6 +1172,35 @@ export function getRenderInfoFromYaml(
         return errorMessage;
     }
 
+    // file
+    if (typeof yaml.file === "string") {
+        let retFiles = getStringArray("file", yaml.file);
+        if (typeof retFiles === "string") {
+            return retFiles; // error message
+        }
+        renderInfo.file = retFiles;
+    }
+    // console.log(renderInfo.file);
+
+    // specifiedFilesOnly
+    if (typeof yaml.specifiedFilesOnly === "boolean") {
+        renderInfo.specifiedFilesOnly = yaml.specifiedFilesOnly;
+    }
+    // console.log(renderInfo.specifiedFilesOnly);
+
+    // fileContainsLinkedFiles
+    if (typeof yaml.fileContainsLinkedFiles === "string") {
+        let retFiles = getStringArray(
+            "fileContainsLinkedFiles",
+            yaml.fileContainsLinkedFiles
+        );
+        if (typeof retFiles === "string") {
+            return retFiles;
+        }
+        renderInfo.fileContainsLinkedFiles = retFiles;
+    }
+    // console.log(renderInfo.fileContainsLinkedFiles);
+
     // Date format
     const dateFormat = yaml.dateFormat;
     //?? not sure why I need this to make it works,

From 58cc8b14e2641d920aa13934e4c2ce7bec707bed Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 17 Aug 2021 15:05:05 +0800
Subject: [PATCH 208/402] Fix spaces in file names

---
 src/main.ts    | 57 +++++++++++++++++++++++++++++++-------------------
 src/parsing.ts |  4 ++--
 2 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/src/main.ts b/src/main.ts
index e4bcb3b..7f574e6 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -110,8 +110,12 @@ export default class Tracker extends Plugin {
         return files;
     }
 
-    getFiles(renderInfo: RenderInfo, includeSubFolders: boolean = true) {
-        let files: TFile[] = [];
+    getFiles(
+        files: TFile[],
+        renderInfo: RenderInfo,
+        includeSubFolders: boolean = true
+    ) {
+        if (!files) return;
 
         let folderToSearch = renderInfo.folder;
         let useSpecifiedFilesOnly = renderInfo.specifiedFilesOnly;
@@ -119,29 +123,39 @@ export default class Tracker extends Plugin {
         let filesContainsLinkedFiles = renderInfo.fileContainsLinkedFiles;
 
         // Include files in folder
+        // console.log(useSpecifiedFilesOnly);
         if (!useSpecifiedFilesOnly) {
             let folder = this.app.vault.getAbstractFileByPath(
                 normalizePath(folderToSearch)
             );
             if (folder && folder instanceof TFolder) {
-                files = files.concat(this.getFilesInFolder(folder));
+                let folderFiles = this.getFilesInFolder(folder);
+                for (let file of folderFiles) {
+                    files.push(file);
+                }
             }
         }
 
         // Include specified file
+        // console.log(specifiedFiles);
         for (let filePath of specifiedFiles) {
-            if (!filePath.endsWith(".md")) {
-                filePath += ".md";
+            let path = filePath;
+            if (!path.endsWith(".md")) {
+                path += ".md";
             }
-            let file = this.app.vault.getAbstractFileByPath(
-                normalizePath(filePath)
-            );
+            path = normalizePath(path);
+            // console.log(path);
+
+            let file = this.app.vault.getAbstractFileByPath(path);
+            // console.log(file);
             if (file && file instanceof TFile) {
                 files.push(file);
             }
         }
+        // console.log(files);
 
         // Include files in pointed by links in file
+        // console.log(filesContainsLinkedFiles);
         for (let filePath of filesContainsLinkedFiles) {
             if (!filePath.endsWith(".md")) {
                 filePath += ".md";
@@ -153,24 +167,23 @@ export default class Tracker extends Plugin {
                 // Get linked files
                 let fileCache = this.app.metadataCache.getFileCache(file);
                 // this.app.metadataCache.
-                if (fileCache?.links) {
-                    for (let link of fileCache.links) {
-                        if (!link) continue;
-                        let linkedFile =
-                            this.app.metadataCache.getFirstLinkpathDest(
-                                link.link,
-                                filePath
-                            );
-                        if (linkedFile && linkedFile instanceof TFile) {
-                            files.push(linkedFile);
-                        }
+                if (!fileCache?.links) continue;
+
+                for (let link of fileCache.links) {
+                    if (!link) continue;
+                    let linkedFile =
+                        this.app.metadataCache.getFirstLinkpathDest(
+                            link.link,
+                            filePath
+                        );
+                    if (linkedFile && linkedFile instanceof TFile) {
+                        files.push(linkedFile);
                     }
                 }
             }
         }
 
         // console.log(files);
-        return files;
     }
 
     async postprocessor(
@@ -190,9 +203,9 @@ export default class Tracker extends Plugin {
         // console.log(renderInfo);
 
         // Get files
-        let files: TFile[];
+        let files: TFile[] = [];
         try {
-            files = this.getFiles(renderInfo);
+            this.getFiles(files, renderInfo);
         } catch (e) {
             return this.renderErrorMessage(e.message, canvas, el);
         }
diff --git a/src/parsing.ts b/src/parsing.ts
index 345652b..9c5705e 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -595,7 +595,7 @@ function getStringArray(name: string, input: any): Array<string> | string {
         if (Array.isArray(input)) {
             for (let elem of input) {
                 if (typeof elem === "string") {
-                    strArray.push(elem);
+                    strArray.push(elem.trim());
                 }
             }
         }
@@ -604,7 +604,7 @@ function getStringArray(name: string, input: any): Array<string> | string {
         // console.log(splitted);
         if (splitted.length > 1) {
             for (let piece of splitted) {
-                strArray.push(piece);
+                strArray.push(piece.trim());
             }
         } else if (input === "") {
             let errorMessage = `Empty ${name} is not allowed.`;

From 56d3afc62eaa1c57b196eb4326d3049c838176ab Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 19 Aug 2021 01:28:03 +0800
Subject: [PATCH 209/402] Add parameter fileMultiplierAfterLink

---
 examples/TestSpecifiedFiles.md |  9 ++---
 examples/data/MTG-Card-2.md    |  2 +-
 examples/data/MTG-Card-3.md    |  2 +-
 examples/data/MTG-Deck-1.md    |  7 ++--
 src/data.ts                    |  2 ++
 src/main.ts                    | 64 +++++++++++++++++++++++++++++++---
 src/parsing.ts                 | 10 ++++++
 7 files changed, 83 insertions(+), 13 deletions(-)

diff --git a/examples/TestSpecifiedFiles.md b/examples/TestSpecifiedFiles.md
index 17e82dc..92df344 100644
--- a/examples/TestSpecifiedFiles.md
+++ b/examples/TestSpecifiedFiles.md
@@ -14,12 +14,13 @@ line:
 Count the MTG mana cost in linked files
 ``` tracker
 searchType: fileMeta, text
-searchTarget: 'cDate, {R}, {G}, {B}'
+searchTarget: 'cDate, {W}, {R}, {G}, {B}, {(?<value>[0-9]+)}'
 fileContainsLinkedFiles: data/MTG-Deck-1
 specifiedFilesOnly: true
+fileMultiplierAfterLink: 'x(?<value>[0-9]+)'
 xDataset: 0
 pie:
-    label: '{{sum(dataset(1))::i}},{{sum(dataset(2))::i}}, {{sum(dataset(3))::i}}'
-    data: '{{sum(dataset(1))}},{{sum(dataset(2))}}, {{sum(dataset(3))}}'
-	dataColor: red, green, blue
+    label: '{{sum(dataset(1))::i}},{{sum(dataset(2))::i}},{{sum(dataset(3))::i}},{{sum(dataset(4))::i}},{{sum(dataset(5))::i}}'
+    data: '{{sum(dataset(1))}},{{sum(dataset(2))}}, {{sum(dataset(3))}}, {{sum(dataset(4))}},{{sum(dataset(5))}}'
+	dataColor: lightgray, red, green, blue, gray
 ```
\ No newline at end of file
diff --git a/examples/data/MTG-Card-2.md b/examples/data/MTG-Card-2.md
index 916a10c..b2d5956 100644
--- a/examples/data/MTG-Card-2.md
+++ b/examples/data/MTG-Card-2.md
@@ -1,3 +1,3 @@
 
 
-{B}{R}
\ No newline at end of file
+{B}{B}{R}{2}
\ No newline at end of file
diff --git a/examples/data/MTG-Card-3.md b/examples/data/MTG-Card-3.md
index 1d95e77..b591837 100644
--- a/examples/data/MTG-Card-3.md
+++ b/examples/data/MTG-Card-3.md
@@ -1,3 +1,3 @@
 
 
-{G}{G}{G}{G}{G}
\ No newline at end of file
+{G}{G}{G}{G}{G}{0}
\ No newline at end of file
diff --git a/examples/data/MTG-Deck-1.md b/examples/data/MTG-Deck-1.md
index ca577d3..6194350 100644
--- a/examples/data/MTG-Deck-1.md
+++ b/examples/data/MTG-Deck-1.md
@@ -1,5 +1,6 @@
 
 
-[[MTG-Card-1]]
-[[MTG-Card-2]]
-[[MTG-Card-3]]
\ No newline at end of file
+[[MTG-Card-1]] x1
+[[MTG-Card-2]] x2
+[[MTG-Card-3]] x2
+[[MTG-Card-4]] x5
\ No newline at end of file
diff --git a/src/data.ts b/src/data.ts
index 2cdfb11..a3c99b9 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -543,6 +543,7 @@ export class RenderInfo {
     file: string[];
     specifiedFilesOnly: boolean;
     fileContainsLinkedFiles: string[];
+    fileMultiplierAfterLink: string;
     dateFormat: string;
     dateFormatPrefix: string;
     dateFormatSuffix: string;
@@ -584,6 +585,7 @@ export class RenderInfo {
         this.file = []; // extra files to use
         this.specifiedFilesOnly = false; // if true, use files specified only
         this.fileContainsLinkedFiles = [];
+        this.fileMultiplierAfterLink = ""; // regex pattern to extract multiplier after link
         this.dateFormat = "YYYY-MM-DD";
         this.dateFormatPrefix = "";
         this.dateFormatSuffix = "";
diff --git a/src/main.ts b/src/main.ts
index 7f574e6..5c46b4d 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -110,7 +110,7 @@ export default class Tracker extends Plugin {
         return files;
     }
 
-    getFiles(
+    async getFiles(
         files: TFile[],
         renderInfo: RenderInfo,
         includeSubFolders: boolean = true
@@ -121,6 +121,7 @@ export default class Tracker extends Plugin {
         let useSpecifiedFilesOnly = renderInfo.specifiedFilesOnly;
         let specifiedFiles = renderInfo.file;
         let filesContainsLinkedFiles = renderInfo.fileContainsLinkedFiles;
+        let fileMultiplierAfterLink = renderInfo.fileMultiplierAfterLink;
 
         // Include files in folder
         // console.log(useSpecifiedFilesOnly);
@@ -156,6 +157,18 @@ export default class Tracker extends Plugin {
 
         // Include files in pointed by links in file
         // console.log(filesContainsLinkedFiles);
+        // console.log(fileMultiplierAfterLink);
+        let linkedFileMultiplier = 1;
+        let searchFileMultifpierAfterLink = true;
+        if (fileMultiplierAfterLink === "") {
+            searchFileMultifpierAfterLink = false;
+        } else if (/^[0-9]+$/.test(fileMultiplierAfterLink)) {
+            linkedFileMultiplier = parseFloat(fileMultiplierAfterLink);
+            searchFileMultifpierAfterLink = false;
+        } else if (!/\?<value>/.test(fileMultiplierAfterLink)) {
+            // no 'value' named group
+            searchFileMultifpierAfterLink = false;
+        }
         for (let filePath of filesContainsLinkedFiles) {
             if (!filePath.endsWith(".md")) {
                 filePath += ".md";
@@ -166,7 +179,12 @@ export default class Tracker extends Plugin {
             if (file && file instanceof TFile) {
                 // Get linked files
                 let fileCache = this.app.metadataCache.getFileCache(file);
-                // this.app.metadataCache.
+                let fileContent = await this.app.vault.adapter.read(file.path);
+                let lines = fileContent.split(
+                    /\r\n|[\n\v\f\r\x85\u2028\u2029]/
+                );
+                // console.log(lines);
+
                 if (!fileCache?.links) continue;
 
                 for (let link of fileCache.links) {
@@ -177,7 +195,45 @@ export default class Tracker extends Plugin {
                             filePath
                         );
                     if (linkedFile && linkedFile instanceof TFile) {
-                        files.push(linkedFile);
+                        if (searchFileMultifpierAfterLink) {
+                            // Get the line of link in file
+                            let lineNumber = link.position.end.line;
+                            // console.log(lineNumber);
+                            if (lineNumber >= 0 && lineNumber < lines.length) {
+                                let line = lines[lineNumber];
+                                // console.log(line);
+
+                                // Try extract multiplier
+                                // if (link.position)
+                                let splitted = line.split(link.original);
+                                console.log(splitted);
+                                if (splitted.length === 2) {
+                                    let toParse = splitted[1].trim();
+                                    let strRegex = fileMultiplierAfterLink;
+                                    let regex = new RegExp(strRegex, "gm");
+                                    let match;
+                                    while ((match = regex.exec(toParse))) {
+                                        // console.log(match);
+                                        if (
+                                            typeof match.groups !==
+                                                "undefined" &&
+                                            typeof match.groups.value !==
+                                                "undefined"
+                                        ) {
+                                            // must have group name 'value'
+                                            linkedFileMultiplier = parseFloat(
+                                                match.groups.value.trim()
+                                            );
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        for (let i = 0; i < linkedFileMultiplier; i++) {
+                            files.push(linkedFile);
+                        }
                     }
                 }
             }
@@ -205,7 +261,7 @@ export default class Tracker extends Plugin {
         // Get files
         let files: TFile[] = [];
         try {
-            this.getFiles(files, renderInfo);
+            await this.getFiles(files, renderInfo);
         } catch (e) {
             return this.renderErrorMessage(e.message, canvas, el);
         }
diff --git a/src/parsing.ts b/src/parsing.ts
index 9c5705e..9eb294a 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1201,6 +1201,16 @@ export function getRenderInfoFromYaml(
     }
     // console.log(renderInfo.fileContainsLinkedFiles);
 
+    // fileMultiplierAfterLink
+    if (typeof yaml.fileMultiplierAfterLink === "string") {
+        renderInfo.fileMultiplierAfterLink = yaml.fileMultiplierAfterLink;
+    }
+    if (typeof yaml.fileMultiplierAfterLink === "number") {
+        renderInfo.fileMultiplierAfterLink =
+            yaml.fileMultiplierAfterLink.toString();
+    }
+    // console.log(renderInfo.fileMultiplierAfterLink);
+
     // Date format
     const dateFormat = yaml.dateFormat;
     //?? not sure why I need this to make it works,

From 8486ef1c1a183d13d869d09f0694232cc843aff4 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 19 Aug 2021 09:39:04 +0800
Subject: [PATCH 210/402] Add error messages for using minute in startDate or
 endDate

---
 src/parsing.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/parsing.ts b/src/parsing.ts
index 9eb294a..e71a387 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1239,6 +1239,11 @@ export function getRenderInfoFromYaml(
     // startDate, endDate
     // console.log("Parsing startDate");
     if (typeof yaml.startDate === "string") {
+        if (/^([\-]?[0-9]+[\.][0-9]+|[\-]?[0-9]+)m$/.test(yaml.startDate)) {
+            let errorMessage =
+                "'m' for 'minute' is too small for parameter startDate, please use 'd' for 'day' or 'M' for month";
+            return errorMessage;
+        }
         let strStartDate = helper.getDateStringFromInputString(
             yaml.startDate,
             renderInfo.dateFormatPrefix,
@@ -1276,6 +1281,11 @@ export function getRenderInfoFromYaml(
 
     // console.log("Parsing endDate");
     if (typeof yaml.endDate === "string") {
+        if (/^([\-]?[0-9]+[\.][0-9]+|[\-]?[0-9]+)m$/.test(yaml.endDate)) {
+            let errorMessage =
+                "'m' for 'minute' is too small for parameter endDate, please use 'd' for 'day' or 'M' for month";
+            return errorMessage;
+        }
         let strEndDate = helper.getDateStringFromInputString(
             yaml.endDate,
             renderInfo.dateFormatPrefix,

From bc540bef5c132bcb9e895a03768f1443bbf69e59 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 19 Aug 2021 16:58:22 +0800
Subject: [PATCH 211/402] Comment out console.log

---
 src/main.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main.ts b/src/main.ts
index 5c46b4d..aa74221 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -206,7 +206,7 @@ export default class Tracker extends Plugin {
                                 // Try extract multiplier
                                 // if (link.position)
                                 let splitted = line.split(link.original);
-                                console.log(splitted);
+                                // console.log(splitted);
                                 if (splitted.length === 2) {
                                     let toParse = splitted[1].trim();
                                     let strRegex = fileMultiplierAfterLink;
@@ -604,7 +604,7 @@ export default class Tracker extends Plugin {
             processInfo.fileAvailable === 0 ||
             !processInfo.gotAnyValidXValue
         ) {
-            dateErrorMessage = `No valid date as X value found in notes.`;
+            dateErrorMessage = `No valid date as X value found in notes`;
             if (processInfo.fileOutOfDateRange > 0) {
                 dateErrorMessage += `\n${processInfo.fileOutOfDateRange} files are out of the date range.`;
             }

From 4a084aff7c646cb2155b0a85ecbe8b48214bc9e8 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 19 Aug 2021 17:38:19 +0800
Subject: [PATCH 212/402] Update documents

---
 README.md               | 19 +++++++++--------
 docs/Examples.md        | 11 +++++++---
 docs/Expressions.md     | 16 +++++++-------
 docs/InputParameters.md | 36 ++++++++++++++++++--------------
 docs/Questions.md       | 46 +++++++++++------------------------------
 docs/ReleaseNotes.md    |  8 ++++++-
 6 files changed, 65 insertions(+), 71 deletions(-)

diff --git a/README.md b/README.md
index f04d9b4..1724dc5 100644
--- a/README.md
+++ b/README.md
@@ -8,19 +8,20 @@ This is an [Obsidian](https://obsidian.md/) plugin that helps you collect data f
 
 [Here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Examples.md) is a table containing simplified examples showing what you can track.
 
+## What's New
+Version 1.10.0
+- Add annotation mode for month view ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestCalendar.md))
+- Add parameters `xAxisTickInterval`, `yAxisTickInterval`, `xAxisTickLabelFormat` and `yAxisTickLabelFormat` for the line and bar chart ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestAxisIntervalAndFormat.md))
+- Allow using regular expression in parameter `dateFormatPrefix` and `dateFormatSuffix` ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md))
+- Add parameters `file`, `specifiedFilesOnly`, `fileContainsLinkedFiles`, and `fileMultiplierAfterLink` to retrieve data from specified files ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestSpecifiedFiles.md))
+- Add a parameter `textValueMap` to convert texts or emojis to specified values ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTextValueMap.md))
+- Fixed bugs
+- Enhanced error messages
+
 ## !!! Breaking Changes !!!
 
 From version 1.9.0, template variables, e.g. '{{sum}}', are deprecated. Instead, Tracker provide operators (+, -, *, /, %) and functions (dataset(), sum(), maxStreak(), ......etc) to help us do data processing. For users having code blocks from previous version, please replace '{{sum}}' by '{{sum()}}' or '{{sum(1)}}' by '{{sum(dataset(1))}}'. More information about the new expressions could be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Expressions.md).
 
-## What's New
-Version 1.10.0
-- Add annotation mode to month view ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestPieChart.md))
-- Add parameter `yAxisTickInterval` and `yAxisTickFormat` for the line and bar chart ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestPieChart.md))
-- Allow using regular expression in parameter `dateFormatPrefix` and `dateFormatSuffix` ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestPieChart.md))
-- Fixed external label positioning in the pie chart
-- Enhanced error messages for 'no values found'
-- Fixed using double quotes for multiple lines in summary template
-
 ## Usage
 
 1. Have some targets you want to track in daily notes.
diff --git a/docs/Examples.md b/docs/Examples.md
index 38a2fa0..d05045d 100644
--- a/docs/Examples.md
+++ b/docs/Examples.md
@@ -1,10 +1,12 @@
 # Examples
 
-The following table lists use cases with information of target location (Location), target to track (Target to Track), simplified tracker block (Tracker), and what kind of data you will get ((((O)ccurence/(V)alue). Various kinds of full examples can also be found in the following section after the table.
+We provide a simplified table of use cases and full examples including data.
 
 ## Table of Use Cases
 
-| Location | Target to Track  | Tracker | Get (O)ccurrence/(V)alue |
+Check where (Location) and what (Target to Track) is your target and find the settings (Tracker) you need.
+
+| Location | Target to Track  | Tracker | Get (O)ccurrences/(V)alues |
 |:--------|:-------|:---------|:--:|
 | content | #meditation | searchType: tag<br>searchTarget: meditation | O |
 | frontmatter | ---<br>tags: meditation<br>--- | searchType: tag<br>searchTarget: meditation | O |
@@ -36,7 +38,7 @@ The following table lists use cases with information of target location (Locatio
 
 ## Full examples
 
-Full tracker code blocks can be found in [this folder](https://github.com/pyrochlore/obsidian-tracker/tree/master/examples) and the corresponding notes can be found under folder 'diary' and 'data'.
+Full tracker code blocks can be found in folder [examples](https://github.com/pyrochlore/obsidian-tracker/tree/master/examples) and the corresponding notes (data) can be found under folder '[diary](https://github.com/pyrochlore/obsidian-tracker/tree/master/examples/diary)' and '[data](https://github.com/pyrochlore/obsidian-tracker/tree/master/examples/data)'.
 
 List of all examples
 - [Bloodpressure Tracker](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/BloodPressureTracker.md)
@@ -46,6 +48,7 @@ List of all examples
 - [Mood Tracker](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/MoodTracker.md)
 - [Star Tracker](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/StarTracker.md)
 - [Bar Chart](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestBarChart.md)
+- [Axis Interval and Format](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestAxisIntervalAndFormat.md)
 - [Bullet Chart](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestBullet.md)
 - [Calendar](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestCalendar.md)
 - [Date Formats](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md)
@@ -56,9 +59,11 @@ List of all examples
 - [Multiple Targets / Multiple Values](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestMultipleTargetsMultipleValues.md)
 - [Pie Chart](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestPieChart.md)
 - [Scaling and Positioning](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestScalingAndPositioning.md)
+- [Specified Files](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestSpecifiedFiles.md))
 - [Summary](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestSummary.md)
 - [Table](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTable.md)
 - [Task](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTask.md)
+- [Text-value Map](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTextValueMap.md)
 - [Time Values](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTimeValues.md)
 - [Word Counting](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestWordCounting.md)
 - [X Dataset](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestXDataset.md)
diff --git a/docs/Expressions.md b/docs/Expressions.md
index a26ebe5..fe17aee 100644
--- a/docs/Expressions.md
+++ b/docs/Expressions.md
@@ -8,15 +8,17 @@ From version 1.9.0, template variables, e.g. '{{sum}}', are deprecated. Instead,
 
 ## Where to Use 
 
-Currently, we can only use expressions in some parameters. These includes `template` in `summary` output, `value` in `bullet` output, and `data` `label` `extLabel` in `pie` output. In future release, we might add a parameter `dataset` accepting expressions to be used with other output type.
+Currently, we can only use expressions in some parameters. These includes `template` in `summary` output, `value` in `bullet` output, and `data` `label` `extLabel` in `pie` output. In future release, there will be more parameters using expressiones as input.
 
 ## How to Use
 
-Expressions should be be wrapped in curly brackets. By Using the combination of operatora and funtions listed beloew, Tracker will try to resolve the whole expression in brackets and then generate a number or a string according to what was requested. 
+Expressions should be be wrapped in curly brackets. By using the combination of operators and funtions, Tracker can resolve the whole expression in brackets and then generate a number or a string according to what was requested. 
 
-If the resolved expreasion is a string, we can optionally provide a format string by adding it right after the expression and two extra colons.
+If the resolved output of an expression is a string, we can assign a format string to it. The format string should be placed after the expression in curly brackets following by two colons. For example, The expression '{{sum()::i}}' will force the output number represented as an integer (i for integer).  
 
-The following tables show all the operators and functions available for now. Please make sure the input type and output type when you are combining them together. Examples could be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestExpression.md).  
+For the number output, use '[Printf Format String](https://en.wikipedia.org/wiki/Printf_format_string)' for the format string. For the date output, use the date format string defined in [Moment.js](https://momentjscom.readthedocs.io/en/latest/moment/04-displaying/01-format/).
+
+The following tables show all the operators and functions available for now. Please make sure the input type and output type when you are combining them together. Examples could be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestExpression.md). Requests for operators or functions are welcome.
 
 ## List of Operators
 
@@ -45,7 +47,7 @@ e.g.
 
 ## List of Functions
 
-### Get dataset from index
+### Get Dataset by Index
 
 | Function(InputType): OutputType | Description |
 |:------------------|:-----------|
@@ -93,7 +95,3 @@ e.g.
 ## Missing Values
 
 Notice that the missing values (null values) are ignored in function like sum or average. Moreover, a value plus a missing value will leads to null value (missing value). To avoid these, you can set those missing values to a value by using parameter `penalty` or use expression function `setMissingValues`.
-
-## String Output Format
-
-If the output of an expression is string, you can assign the format by using
\ No newline at end of file
diff --git a/docs/InputParameters.md b/docs/InputParameters.md
index 7a916cd..903adff 100644
--- a/docs/InputParameters.md
+++ b/docs/InputParameters.md
@@ -1,26 +1,30 @@
 # Input Parameters
 
-Obsidian-tracker parses key-value pairs in your code block in YAML format and uses them as input parameters. The minimum requirements for parameters are `searchType`, `searchTarget` and one output parameter (`line`, `bar`, `summary`, `bullet`, `month`, or `pie`).
+Obsidian-tracker parses key-value pairs in YAML format in your code block and uses them as input parameters. The minimum requirements for parameters are `searchType`, `searchTarget` and at least one output parameter (`line`, `bar`, `summary`, `bullet`, `month`, or `pie`).
 
 ## Array Input for a Parameter
 
-Some of the parameters can accept more than one value for each target, thus the maximum number of values of the parameter equals the number of targets (NT). If the number of values is less than the number of targets, the plugin will use the previously provided value or use the default value if nothing is provided.
+Some of the parameters can accept more than one value for each target. For those parameters accept different value for each given search target, the maximum number of values should equal to the number of search target (NT). If the number of values are less than the number of targets, Tracker will use the previously provided one in sequence or use the default value if nothing is provided.
 
-Also, some y-axis related parameters for chart (`line` or `bar`), like `yMin`, `yMax`, and `yAxisLabel` accept one value for each y-axis (`left` and `right`). If you only use one axis, or the values for the two axes are the same, only one value is required. If you need the two axes to have different values, assign two values to them. The first one will be used for the left axis and the second one for the right axis.
+For Y axis related parameters, like `yMin`, `yMax`, or `yAxisLabel`, they accept one value for each Y axis (`left` and `right`). If you only use one axis, or the values for the two axes are the same, only one value is required. If you need the two axes to have different values, provide two values to do the work. The first one will be used for the left Y axis and the second one for the right Y axis.
 
-To enter array of values, Use YAML array (e.g. ['value1', 'value2', 'value3']) or simply values separated by comma (e.g. value1, value2, value3). The second method is a syntax surgar of Tracker to simplify the inputs. If YAML special characters are included, be sure to wrap the whole values by single quotes (e.g. 'value1, value2, value3'). Please also check [this](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TargetEvaluation.md) for more information about YAML in Tracker.
+To enter array of values, we can use YAML array (e.g. ['value1', 'value2', 'value3']) or simply values separated by comma (e.g. value1, value2, value3). The second method is a syntax surgar of Tracker to simplify input process. If YAML special characters are required in the inputs, be sure to wrap the whole values by single quotes (e.g. 'value1, value2, value3'). Please also check [this](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/YAML.md) for more information about YAML in Tracker.
 
 ## List of Parameters
 
 ### Root Parameters
 
-These key-value pairs are placed under the code block root.
+These key-value pairs are placed under the root of the code block.
 
 | Key | Description | Number of Values | Default |
 |:--------|:-------|:-----------:|:------|
 | `searchType` | Type of `searchTarget` (tag\|frontmatter\|wiki\|text\|dvField\|table\|fileMeta\|task) | 1~NT | Must be provided |
 | `searchTarget` | Target to search<br>[[detail](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TargetEvaluation.md)] | NT (Number of Targets) | Must be provided |
 | `folder` | Root path containing notes to search | 1 | Root of this vault |
+| `file` | Files to include for searching | N | null |
+| `specifiedFilesOnly` | Ignore files found in `folder` | 1 | false |
+| `fileContainsLinkedFiles` | Include the linked files in the specified files here | N | null |
+| `fileMultiplierAfterLink` | Regex string include named group 'value' <br>to search the multiplier after link | 1 | '' |
 | `dateFormat` | Date format<br> Use [Moment.js](https://momentjscom.readthedocs.io/en/latest/moment/04-displaying/01-format/) format or use [iso-8601](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md#iso-8601-date-format) | 1 | 'YYYY-MM-DD' |
 | `dateFormatPrefix` | Prefix before your dateFormat (accept regex) | 1 | '' |
 | `dateFormatSuffix` | Suffix after your dateFormat (accept regex) | 1 | '' |
@@ -36,15 +40,16 @@ These key-value pairs are placed under the code block root.
 | `penalty` | Value to use if the search target is missing on the day | 1~NT | |
 | `valueShift` | Amount to shift for each collected value | 1~NT | 0 |
 | `valueType` | Not implemented yet | 1~NT | |
+| `textValueMap` | A container key for multiple text-value mapping | | |
 | `fixedScale` | Uniform scaling factor to the graph dimensions | 1 | 1.0 |
 | `fitPanelWidth` | Auto-fit the width of the chart to the container | 1 | false |
 | `margin` | Four margins (top|right|bottom|left) of the graph | 1~4 | 10 |
 | `line` | A container key for parameters related to the line chart | | |
 | `bar` | A container key for parameters related to the bar chart | | |
 | `summary` | A container key for parameters related to the summary output | | |
-| `bullet` | A container key for parameters related to the bullet chart | 
-| `month` | A container key for parameters related to the month view |
-| `pie` | A container key for parameters related to the pie chart |
+| `bullet` | A container key for parameters related to the bullet chart | | | 
+| `month` | A container key for parameters related to the month view | | |
+| `pie` | A container key for parameters related to the pie chart | | |
 
 ### Parameters for Common Charts
 These key-value pairs should be placed under the key `line` or `bar`.
@@ -59,9 +64,10 @@ These key-value pairs should be placed under the key `line` or `bar`.
 | `yAxisColor` | Color of Y axis | 1~2 | 'white'('black'<sup>*</sup>) |
 | `yAxisLabelColor` | Color of Y axis label | 1~2 | 'white'('black'<sup>*</sup>) |
 | `yAxisUnit` | Unit displayed aside Y axis label | 1~2 | '' | 
-yAxisTickInterval
-yAxisTickFormat
-
+| `xAxisTickInterval` | X axis interval between ticks | 1~2 | null |
+| `xAxisTickLabelFormat` | Format of tick label on X axis<br> | 1~2 | null |
+| `yAxisTickInterval` | Y axis interval between ticks | 1~2 | null |
+| `yAxisTickLabelFormat` | Format of tick label on Y axis<br> | 1~2 | null |
 | `yMin` | Minimum value on Y axis | 1~2 |Minimum Y value found | 
 | `yMax` | Maximum value on Y axis | 1~2 | Maximum Y value found |
 | `reverseYAxis` | Flip (upside down) the Y Axis or not (true\|false) | 1~2 | false |
@@ -126,7 +132,7 @@ These key-value pairs should be placed under the key `month`.
 
 | Key | Description | Number of Values | Default |
 |:--------|:-------|:-----------:|:------|
-| `mode` | () | 1 | 
+| `mode` | Pick one mode of the two(circle\|annotation) | 1 | 
 | `dataset` | Index of the dataset of your interest | 1~NT | all indices of non-x searchTarget |
 | `startWeekOn` | First day of a week ('Sun'\|'Mon') | 1 | 'Sun' |
 | `threshold` | Threshold to determine showing a circle on a day or not | 1~NT | 0 |
@@ -147,9 +153,9 @@ These key-value pairs should be placed under the key `month`.
 | `todayRingColor` | Color of the ring on today | 1 | 'white' |
 | `selectedRingColor` | Color of the ring on the selected day | 1 | 'firebrick' |
 | `initMonth` | Initial month to show (YYYY-MM) | 1 | last month found |
-showAnnotation
-annotation
-showAnnotationOfAllTargets
+| `showAnnotation` | Show/hide annotation | 1 | false |
+| `annotation` | Annotation for each piece of data | NT | '' |
+| `showAnnotationOfAllTargets` | Show annotation of all targets at the same time | 1 | false |
 
 
 ### Parameters for Pie Chart
diff --git a/docs/Questions.md b/docs/Questions.md
index b14daff..d6ca037 100644
--- a/docs/Questions.md
+++ b/docs/Questions.md
@@ -2,53 +2,31 @@
 
 - Does Tracker only track data in daily notes (file names contain dates)?
 
-    No. You can get date from any `searchType` including `fileMeta`. The collected dates  use that dataset as `xDataset`. So any notes can be included.
-
-- Does Tracker only track data over dates?
-
-    Yes. The data type of x values should be in the form of date for now. This constrain might be relaxed in future.
+    No. The file name of your notes could be any string. But we do need a date from each file. If it is not from the file name, we should add one more `searchTarget` and use that target as the source of X values by setting parameter `xDataset` to its index. The searchType `fileMeta` with `searchTarget` cDate (creation date) and mDate (modification date) are always accessible as date sources if you don't have any. Examples of these use cases could be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestXDataset.md).
 
 - Why my line chart looks broken (not connected) at some points?
 
-    The plugin only connects adjacent points (by date) by default. To force it connecting points over missing data, set the parameter `fillGap` under `line` to true.
-
-- Why the plugin shows error 'No valid X values found in notes'?
+    Tracker only connects adjacent points (neighbor points by date) by default. To force it connecting points over missing data, set the parameter `fillGap` under `line` or `bar` to true.
 
-    The default X values were extracted from the title of your notes. By assigning proper `dateFormat`, and combine with `dateFormatPrefix` and `dateFormatSuffix`. The date could be extracted from your title successfully.
-    The X values in Tracker should be of Date type. No files or x data values matched the dateFormat you gave in the given folder
+- Why the plugin shows error 'No valid date as X value found in notes'?
 
-- Wny the plugin shows error 'No valid Y values found in notes'?
-    No y data values found
+    First we have to confirm where is the source of your X values. Tracker always needs X values in dates. The default source of X values are the file names of your notes. As long as a proper `dateFormat` was assigned, and combine with `dateFormatPrefix` and `dateFormatSuffix`, the dates in file names could be extracted from your file names successfully.
 
-- Why the plugin shows 'No notes found under the given search condition'?
+    If the date values are from front matter, dataview inline field, or other places, choose the right `searchType` and `searchTarget` and mark them as `xDataset`, Tracker will collect X values for you.
 
-    There are few possibilities for this error messages.
-    1. No files in the given folder
-    3. No files in the date range you gave (from startDate to endDate)
-
-- Why the plugin shows 'Error parsing YAML'?
+    If you don't have any date values, and you just want to count the number of occurrences of a target. As a trick, you can use the creation date (cDate) or modification date (mDate) of the file as X data source. 
 
-    There are syntax errors in your code block. Please check [this document](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/YAML.md) for common mistakes.
+    Examples of these use cases could be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestXDataset.md).
 
-- Why no data (points or lines) is shown in my chart?
+- Wny the plugin shows error 'No valid Y value found in notes'?
 
-    That means no matched data found in your notes. Please check `searchType` and `searchTarget` in your notes and the document for [target evaluation](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TargetEvaluation.md).
+    That means no matched data found in your notes. Please check the document for the detail of [target evaluation](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TargetEvaluation.md).
 
-    For example, if you were doing tag search (`searchType` input is `tag`), an additional space between the colon and the value will leads to data missing. If the space in between is a must, you can use `text` search with regular expression instead of `tag`. Here is an example.
-
-    To Track '#tagName: 10' in daily notes. Use
-```
-searchType: text
-searchTarget: 'tagName:\s(?<value>[0-9]+)'
-......
-```
-    More cases can be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestRegex.md)
-
----
+- Why the plugin shows 'Error parsing YAML'?
 
-Please also check [these trackers](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/ErrorMessages.md) for more cases leading to error messages.
+    There are syntax errors in your code block. Please check [this document](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/YAML.md) for common issues.
 
 ---
 
-Still have problems?? You might encounter bugs.
+Still have problems?? You might encounter a bug.
 Welcome to leave an issue [here](https://github.com/pyrochlore/obsidian-tracker/issues).
\ No newline at end of file
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index 0bd5de2..de38252 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,7 +1,13 @@
 # Release Notes
 
 ## v1.10.0
--
+- Add annotation mode for month view ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestCalendar.md))
+- Add parameters `xAxisTickInterval`, `yAxisTickInterval`, `xAxisTickLabelFormat` and `yAxisTickLabelFormat` for the line and bar chart ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestAxisIntervalAndFormat.md))
+- Allow using regular expression in parameter `dateFormatPrefix` and `dateFormatSuffix` ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md))
+- Add parameters `file`, `specifiedFilesOnly`, `fileContainsLinkedFiles`, and `fileMultiplierAfterLink` to retrieve data from specified files ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestSpecifiedFiles.md))
+- Add a parameter `textValueMap` to convert texts or emojis to specified values ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTextValueMap.md))
+- Fixed bugs
+- Enhanced error messages
 
 ## v1.9.2
 - Allow using seconds in time values

From ae43fe58534635db7fc12b7732924fe69b074535 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 19 Aug 2021 17:38:49 +0800
Subject: [PATCH 213/402] Add missing example data

---
 examples/data/MTG-Card-4.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 examples/data/MTG-Card-4.md

diff --git a/examples/data/MTG-Card-4.md b/examples/data/MTG-Card-4.md
new file mode 100644
index 0000000..fa7a98c
--- /dev/null
+++ b/examples/data/MTG-Card-4.md
@@ -0,0 +1,3 @@
+
+
+{W}
\ No newline at end of file

From b2eda6f9653eb1ed82e9819486c1dc642c240bb5 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 19 Aug 2021 22:42:35 +0800
Subject: [PATCH 214/402] Fix using separator in collectDataFromFrontmatterTag;
 Allow using escaped comma as separator;

---
 src/collecting.ts | 10 ++++++++--
 src/parsing.ts    | 14 +++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/collecting.ts b/src/collecting.ts
index 20a172e..8128544 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -438,8 +438,14 @@ export function collectDataFromFrontmatterTag(
         let tagExist = false;
         if (Array.isArray(frontMatter.tags)) {
             frontMatterTags = frontMatterTags.concat(frontMatter.tags);
-        } else {
-            frontMatterTags.push(frontMatter.tags);
+        } else if (typeof frontMatter.tags === "string") {
+            let splitted = frontMatter.tags.split(query.getSeparator());
+            for (let splittedPart of splitted) {
+                let part = splittedPart.trim();
+                if (part !== "") {
+                    frontMatterTags.push(part);
+                }
+            }
         }
 
         for (let tag of frontMatterTags) {
diff --git a/src/parsing.ts b/src/parsing.ts
index e71a387..3c96adc 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -134,7 +134,7 @@ function getBoolArrayFromInput(
             }
         }
     } else if (typeof input === "string") {
-        let splitted = input.split(",");
+        let splitted = input.split("(?<!\\\\),");
         if (splitted.length > 1) {
             if (splitted.length > numDataset) {
                 errorMessage = "Too many inputs for parameter '" + name + "'";
@@ -275,7 +275,7 @@ function getNumberArrayFromInput(
             }
         }
     } else if (typeof input === "string") {
-        let splitted = input.split(",");
+        let splitted = input.split("(?<!\\\\),");
         if (splitted.length > 1) {
             if (splitted.length > numDataset) {
                 errorMessage = "Too many inputs for parameter '" + name + "'";
@@ -432,7 +432,7 @@ function getStringArrayFromInput(
             }
         }
     } else if (typeof input === "string") {
-        let splitted = input.split(",");
+        let splitted = input.split("(?<!\\\\),");
         if (splitted.length > 1) {
             if (splitted.length > numDataset) {
                 errorMessage = "Too many inputs for parameter '" + name + "'";
@@ -552,7 +552,7 @@ function getNumberArray(name: string, input: any): Array<number> | string {
             }
         }
     } else if (typeof input === "string") {
-        let splitted = input.split(",");
+        let splitted = input.split("(?<!\\\\),");
         if (splitted.length > 1) {
             for (let piece of splitted) {
                 let v = parseFloat(piece.trim());
@@ -600,7 +600,7 @@ function getStringArray(name: string, input: any): Array<string> | string {
             }
         }
     } else if (typeof input === "string") {
-        let splitted = input.split(",");
+        let splitted = input.split("(?<!\\\\),");
         // console.log(splitted);
         if (splitted.length > 1) {
             for (let piece of splitted) {
@@ -909,7 +909,7 @@ export function getRenderInfoFromYaml(
             }
         }
     } else if (typeof yaml.searchTarget === "string") {
-        let splitted = yaml.searchTarget.split(",");
+        let splitted = yaml.searchTarget.split("(?<!\\\\),");
         if (splitted.length > 1) {
             for (let piece of splitted) {
                 piece = piece.trim();
@@ -1021,7 +1021,7 @@ export function getRenderInfoFromYaml(
         return retMultipleValueSparator; // errorMessage
     }
     multipleValueSparator = retMultipleValueSparator.map((sep) => {
-        if (sep === "comma") {
+        if (sep === "comma" || sep === "\\,") {
             return ",";
         }
         return sep;

From 0974440978047dce64885bc519f5b8235ab54781 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 19 Aug 2021 22:56:40 +0800
Subject: [PATCH 215/402] Use textValueMap where we need it

---
 src/main.ts | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/main.ts b/src/main.ts
index aa74221..4d09648 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -163,6 +163,7 @@ export default class Tracker extends Plugin {
         if (fileMultiplierAfterLink === "") {
             searchFileMultifpierAfterLink = false;
         } else if (/^[0-9]+$/.test(fileMultiplierAfterLink)) {
+            // integer
             linkedFileMultiplier = parseFloat(fileMultiplierAfterLink);
             searchFileMultifpierAfterLink = false;
         } else if (!/\?<value>/.test(fileMultiplierAfterLink)) {
@@ -221,10 +222,15 @@ export default class Tracker extends Plugin {
                                                 "undefined"
                                         ) {
                                             // must have group name 'value'
-                                            linkedFileMultiplier = parseFloat(
-                                                match.groups.value.trim()
-                                            );
-                                            break;
+                                            let retParse =
+                                                helper.parseFloatFromAny(
+                                                    match.groups.value.trim(),
+                                                    renderInfo.textValueMap
+                                                );
+                                            if (Number.isNumber(retParse)) {
+                                                linkedFileMultiplier = retParse;
+                                                break;
+                                            }
                                         }
                                     }
                                 }
@@ -923,8 +929,12 @@ export default class Tracker extends Plugin {
                         let splitted = data.split(yDatasetQuery.getSeparator());
                         if (!splitted) continue;
                         if (splitted.length === 1) {
-                            let value = parseFloat(splitted[0]);
-                            if (Number.isNumber(value)) {
+                            let retParse = helper.parseFloatFromAny(
+                                splitted[0],
+                                renderInfo.textValueMap
+                            );
+                            if (Number.isNumber(retParse)) {
+                                let value = retParse as number;
                                 if (
                                     indLine < xValues.length &&
                                     xValues[indLine]
@@ -948,8 +958,12 @@ export default class Tracker extends Plugin {
                             let value = null;
                             let splittedPart =
                                 splitted[yDatasetQuery.getAccessor(2)].trim();
-                            value = parseFloat(splittedPart);
-                            if (Number.isNumber(value)) {
+                            let retParse = helper.parseFloatFromAny(
+                                splittedPart,
+                                renderInfo.textValueMap
+                            );
+                            if (Number.isNumber(retParse)) {
+                                value = retParse as number;
                                 if (
                                     indLine < xValues.length &&
                                     xValues[indLine]

From f9a2017f776b0cf3973323ded465733b2a1cc281 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 19 Aug 2021 23:58:19 +0800
Subject: [PATCH 216/402] Fix making regex for separators

---
 src/collecting.ts | 11 ++++++++---
 src/parsing.ts    | 13 +++++++------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/collecting.ts b/src/collecting.ts
index 8128544..cb71cae 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -491,12 +491,16 @@ export function collectDataFromFrontmatterKey(
 
     let frontMatter = fileCache.frontmatter;
     if (frontMatter) {
-        if (helper.deepValue(frontMatter, query.getTarget())) {
-            let toParse = helper.deepValue(frontMatter, query.getTarget());
+        // console.log(frontMatter);
+        // console.log(query.getTarget());
+        let deepValue = helper.deepValue(frontMatter, query.getTarget());
+        // console.log(deepValue);
+        if (deepValue) {
             let retParse = helper.parseFloatFromAny(
-                toParse,
+                deepValue,
                 renderInfo.textValueMap
             );
+            // console.log(retParse);
             if (retParse.value !== null) {
                 if (retParse.type === ValueType.Time) {
                     query.valueType = ValueType.Time;
@@ -529,6 +533,7 @@ export function collectDataFromFrontmatterKey(
             } else if (typeof toParse === "string") {
                 splitted = toParse.split(query.getSeparator());
             }
+            // console.log(splitted);
             if (
                 splitted &&
                 splitted.length > query.getAccessor() &&
diff --git a/src/parsing.ts b/src/parsing.ts
index 3c96adc..fd0ab58 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -134,7 +134,7 @@ function getBoolArrayFromInput(
             }
         }
     } else if (typeof input === "string") {
-        let splitted = input.split("(?<!\\\\),");
+        let splitted = input.split(/(?<!\\),/);
         if (splitted.length > 1) {
             if (splitted.length > numDataset) {
                 errorMessage = "Too many inputs for parameter '" + name + "'";
@@ -275,7 +275,7 @@ function getNumberArrayFromInput(
             }
         }
     } else if (typeof input === "string") {
-        let splitted = input.split("(?<!\\\\),");
+        let splitted = input.split(/(?<!\\),/);
         if (splitted.length > 1) {
             if (splitted.length > numDataset) {
                 errorMessage = "Too many inputs for parameter '" + name + "'";
@@ -432,7 +432,7 @@ function getStringArrayFromInput(
             }
         }
     } else if (typeof input === "string") {
-        let splitted = input.split("(?<!\\\\),");
+        let splitted = input.split(/(?<!\\),/);
         if (splitted.length > 1) {
             if (splitted.length > numDataset) {
                 errorMessage = "Too many inputs for parameter '" + name + "'";
@@ -552,7 +552,7 @@ function getNumberArray(name: string, input: any): Array<number> | string {
             }
         }
     } else if (typeof input === "string") {
-        let splitted = input.split("(?<!\\\\),");
+        let splitted = input.split(/(?<!\\),/);
         if (splitted.length > 1) {
             for (let piece of splitted) {
                 let v = parseFloat(piece.trim());
@@ -600,7 +600,7 @@ function getStringArray(name: string, input: any): Array<string> | string {
             }
         }
     } else if (typeof input === "string") {
-        let splitted = input.split("(?<!\\\\),");
+        let splitted = input.split(/(?<!\\),/);
         // console.log(splitted);
         if (splitted.length > 1) {
             for (let piece of splitted) {
@@ -909,7 +909,8 @@ export function getRenderInfoFromYaml(
             }
         }
     } else if (typeof yaml.searchTarget === "string") {
-        let splitted = yaml.searchTarget.split("(?<!\\\\),");
+        let splitted = yaml.searchTarget.split(/(?<!\\),/);
+        // console.log(splitted);
         if (splitted.length > 1) {
             for (let piece of splitted) {
                 piece = piece.trim();

From cc54ad4c410fd21fca26edf0084986e61891b5a5 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 20 Aug 2021 00:36:09 +0800
Subject: [PATCH 217/402] Fix using the return value of function
 parseFloatFromAny

---
 src/main.ts    | 17 +++++++++++------
 src/parsing.ts |  6 +++---
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/main.ts b/src/main.ts
index 4d09648..699b33c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -227,8 +227,9 @@ export default class Tracker extends Plugin {
                                                     match.groups.value.trim(),
                                                     renderInfo.textValueMap
                                                 );
-                                            if (Number.isNumber(retParse)) {
-                                                linkedFileMultiplier = retParse;
+                                            if (retParse.value !== null) {
+                                                linkedFileMultiplier =
+                                                    retParse.value;
                                                 break;
                                             }
                                         }
@@ -927,14 +928,16 @@ export default class Tracker extends Plugin {
                     if (columnOfInterest < dataRowSplitted.length) {
                         let data = dataRowSplitted[columnOfInterest].trim();
                         let splitted = data.split(yDatasetQuery.getSeparator());
+                        // console.log(splitted);
                         if (!splitted) continue;
                         if (splitted.length === 1) {
                             let retParse = helper.parseFloatFromAny(
                                 splitted[0],
                                 renderInfo.textValueMap
                             );
-                            if (Number.isNumber(retParse)) {
-                                let value = retParse as number;
+                            // console.log(retParse);
+                            if (retParse.value !== null) {
+                                let value = retParse.value;
                                 if (
                                     indLine < xValues.length &&
                                     xValues[indLine]
@@ -958,12 +961,14 @@ export default class Tracker extends Plugin {
                             let value = null;
                             let splittedPart =
                                 splitted[yDatasetQuery.getAccessor(2)].trim();
+                            // console.log(splittedPart);
                             let retParse = helper.parseFloatFromAny(
                                 splittedPart,
                                 renderInfo.textValueMap
                             );
-                            if (Number.isNumber(retParse)) {
-                                value = retParse as number;
+                            // console.log(retParse);
+                            if (retParse.value !== null) {
+                                value = retParse.value;
                                 if (
                                     indLine < xValues.length &&
                                     xValues[indLine]
diff --git a/src/parsing.ts b/src/parsing.ts
index fd0ab58..794227c 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -298,7 +298,7 @@ function getNumberArrayFromInput(
                         }
                     } else {
                         let currNum = helper.parseFloatFromAny(curr).value;
-                        if (Number.isNumber(currNum)) {
+                        if (currNum !== null) {
                             array[ind] = currNum;
                             numValidValue++;
                         } else {
@@ -311,7 +311,7 @@ function getNumberArrayFromInput(
                     let last = helper.parseFloatFromAny(
                         splitted[input.length - 1].trim()
                     ).value;
-                    if (numValidValue > 0 && Number.isNumber(last)) {
+                    if (numValidValue > 0 && last !== null) {
                         array[ind] = last;
                     } else {
                         array[ind] = defaultValue;
@@ -323,7 +323,7 @@ function getNumberArrayFromInput(
                 // all defaultValue
             } else {
                 let inputNum = helper.parseFloatFromAny(input).value;
-                if (Number.isNumber(inputNum)) {
+                if (inputNum !== null) {
                     array[0] = inputNum;
                     numValidValue++;
                     for (let ind = 1; ind < array.length; ind++) {

From c8002ec50270d15e21e721093678483ab70f2bd1 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 20 Aug 2021 09:47:57 +0800
Subject: [PATCH 218/402] Fix wrong curValue in month view for front matter
 tags

---
 examples/TestFrontmatter.md    | 13 ++++++++++
 examples/TestSpecifiedFiles.md |  2 +-
 examples/diary/2021-01-01.md   |  2 +-
 examples/diary/2021-01-04.md   |  2 +-
 examples/diary/2021-01-05.md   |  2 +-
 examples/diary/2021-01-06.md   |  2 +-
 examples/diary/2021-01-07.md   |  2 +-
 examples/diary/2021-01-08.md   |  2 +-
 examples/diary/2021-01-11.md   |  2 +-
 examples/diary/2021-01-12.md   |  2 +-
 examples/diary/2021-01-13.md   |  2 +-
 examples/diary/2021-01-14.md   |  2 +-
 examples/diary/2021-01-15.md   |  2 +-
 examples/diary/2021-01-18.md   |  2 +-
 examples/diary/2021-01-19.md   |  2 +-
 examples/diary/2021-01-20.md   |  2 +-
 examples/diary/2021-01-21.md   |  2 +-
 examples/diary/2021-01-22.md   |  2 +-
 examples/diary/2021-01-25.md   |  2 +-
 examples/diary/2021-01-26.md   |  2 +-
 examples/diary/2021-01-27.md   |  2 +-
 examples/diary/2021-01-28.md   |  2 +-
 examples/diary/2021-01-29.md   |  2 +-
 examples/example_generator.ts  |  2 +-
 src/month.ts                   | 43 ++++++++++++++++++++++++----------
 25 files changed, 67 insertions(+), 35 deletions(-)

diff --git a/examples/TestFrontmatter.md b/examples/TestFrontmatter.md
index b54acdc..dc31cbd 100644
--- a/examples/TestFrontmatter.md
+++ b/examples/TestFrontmatter.md
@@ -35,4 +35,17 @@ line:
     legendPosition: bottom
 ```
 
+## Multiple Tags in Front Matter
+Use 'comma', or '\,' in parameter `separator`
+Notice the comma character should be escaped
+``` tracker
+searchType: tag
+searchTarget: work_log, work_log2
+folder: diary
+datasetName: Work1, Work2
+separator: '\,'
+month:
+    initMonth: 2021-01
+```
+
 Please also check those search targets in markdown files under folder 'diary'.
\ No newline at end of file
diff --git a/examples/TestSpecifiedFiles.md b/examples/TestSpecifiedFiles.md
index 92df344..857180d 100644
--- a/examples/TestSpecifiedFiles.md
+++ b/examples/TestSpecifiedFiles.md
@@ -22,5 +22,5 @@ xDataset: 0
 pie:
     label: '{{sum(dataset(1))::i}},{{sum(dataset(2))::i}},{{sum(dataset(3))::i}},{{sum(dataset(4))::i}},{{sum(dataset(5))::i}}'
     data: '{{sum(dataset(1))}},{{sum(dataset(2))}}, {{sum(dataset(3))}}, {{sum(dataset(4))}},{{sum(dataset(5))}}'
-	dataColor: lightgray, red, green, blue, gray
+	dataColor: lightgray, firebrick, yellowgreen, lightblue, gray
 ```
\ No newline at end of file
diff --git a/examples/diary/2021-01-01.md b/examples/diary/2021-01-01.md
index 1e43b42..9539ed2 100644
--- a/examples/diary/2021-01-01.md
+++ b/examples/diary/2021-01-01.md
@@ -1,5 +1,5 @@
 ---
-tags: work_log
+tags: work_log, work_log2
 mood: 🙁
 bloodpressure: 184.4/118.8
 bloodpressure1: 184.4, 118.8
diff --git a/examples/diary/2021-01-04.md b/examples/diary/2021-01-04.md
index dd68aa2..05cf37f 100644
--- a/examples/diary/2021-01-04.md
+++ b/examples/diary/2021-01-04.md
@@ -1,5 +1,5 @@
 ---
-tags: work_log
+tags: work_log, work_log2
 mood: 🙂
 bloodpressure: 176.6/121.2
 bloodpressure1: 176.6, 121.2
diff --git a/examples/diary/2021-01-05.md b/examples/diary/2021-01-05.md
index 4d60cee..cea72c4 100644
--- a/examples/diary/2021-01-05.md
+++ b/examples/diary/2021-01-05.md
@@ -1,5 +1,5 @@
 ---
-tags: work_log
+tags: work_log, work_log2
 mood: 😀
 bloodpressure: 180/118
 bloodpressure1: 180, 118
diff --git a/examples/diary/2021-01-06.md b/examples/diary/2021-01-06.md
index b63f5b6..45daced 100644
--- a/examples/diary/2021-01-06.md
+++ b/examples/diary/2021-01-06.md
@@ -1,5 +1,5 @@
 ---
-tags: work_log
+tags: work_log, work_log2
 mood: 🙁
 bloodpressure: 171.4/118.8
 bloodpressure1: 171.4, 118.8
diff --git a/examples/diary/2021-01-07.md b/examples/diary/2021-01-07.md
index a0d5d32..b99af2e 100644
--- a/examples/diary/2021-01-07.md
+++ b/examples/diary/2021-01-07.md
@@ -1,5 +1,5 @@
 ---
-tags: work_log
+tags: work_log, work_log2
 mood: 😀
 bloodpressure: 175.8/120.6
 bloodpressure1: 175.8, 120.6
diff --git a/examples/diary/2021-01-08.md b/examples/diary/2021-01-08.md
index 8b6f63b..ca1e559 100644
--- a/examples/diary/2021-01-08.md
+++ b/examples/diary/2021-01-08.md
@@ -1,5 +1,5 @@
 ---
-tags: work_log
+tags: work_log, work_log2
 mood: 😀
 bloodpressure: 172.2/116.4
 bloodpressure1: 172.2, 116.4
diff --git a/examples/diary/2021-01-11.md b/examples/diary/2021-01-11.md
index 892656f..3a751fb 100644
--- a/examples/diary/2021-01-11.md
+++ b/examples/diary/2021-01-11.md
@@ -1,5 +1,5 @@
 ---
-tags: work_log
+tags: work_log, work_log2
 mood: 😐
 bloodpressure: 173.4/117.8
 bloodpressure1: 173.4, 117.8
diff --git a/examples/diary/2021-01-12.md b/examples/diary/2021-01-12.md
index 94e3967..3999d50 100644
--- a/examples/diary/2021-01-12.md
+++ b/examples/diary/2021-01-12.md
@@ -1,5 +1,5 @@
 ---
-tags: work_log
+tags: work_log, work_log2
 mood: 😀
 bloodpressure: 176.8/118.6
 bloodpressure1: 176.8, 118.6
diff --git a/examples/diary/2021-01-13.md b/examples/diary/2021-01-13.md
index f2e12ef..d49e5e6 100644
--- a/examples/diary/2021-01-13.md
+++ b/examples/diary/2021-01-13.md
@@ -1,5 +1,5 @@
 ---
-tags: work_log
+tags: work_log, work_log2
 mood: 😞
 bloodpressure: 168.2/116.4
 bloodpressure1: 168.2, 116.4
diff --git a/examples/diary/2021-01-14.md b/examples/diary/2021-01-14.md
index ef3a44a..5d6e37f 100644
--- a/examples/diary/2021-01-14.md
+++ b/examples/diary/2021-01-14.md
@@ -1,5 +1,5 @@
 ---
-tags: work_log
+tags: work_log, work_log2
 mood: 😐
 bloodpressure: 175.6/117.2
 bloodpressure1: 175.6, 117.2
diff --git a/examples/diary/2021-01-15.md b/examples/diary/2021-01-15.md
index ac1f2fc..7da38fe 100644
--- a/examples/diary/2021-01-15.md
+++ b/examples/diary/2021-01-15.md
@@ -1,5 +1,5 @@
 ---
-tags: work_log
+tags: work_log, work_log2
 mood: 😀
 bloodpressure: 176/115
 bloodpressure1: 176, 115
diff --git a/examples/diary/2021-01-18.md b/examples/diary/2021-01-18.md
index ec91c1a..b06ee71 100644
--- a/examples/diary/2021-01-18.md
+++ b/examples/diary/2021-01-18.md
@@ -1,5 +1,5 @@
 ---
-tags: work_log
+tags: work_log, work_log2
 mood: 😀
 bloodpressure: 167.2/118.4
 bloodpressure1: 167.2, 118.4
diff --git a/examples/diary/2021-01-19.md b/examples/diary/2021-01-19.md
index ded2151..11ce05b 100644
--- a/examples/diary/2021-01-19.md
+++ b/examples/diary/2021-01-19.md
@@ -1,5 +1,5 @@
 ---
-tags: work_log
+tags: work_log, work_log2
 mood: 😐
 bloodpressure: 165.6/117.2
 bloodpressure1: 165.6, 117.2
diff --git a/examples/diary/2021-01-20.md b/examples/diary/2021-01-20.md
index 99daaa1..e4a2a0a 100644
--- a/examples/diary/2021-01-20.md
+++ b/examples/diary/2021-01-20.md
@@ -1,5 +1,5 @@
 ---
-tags: work_log
+tags: work_log, work_log2
 mood: 🙂
 bloodpressure: 163/117
 bloodpressure1: 163, 117
diff --git a/examples/diary/2021-01-21.md b/examples/diary/2021-01-21.md
index fd0233b..94eecce 100644
--- a/examples/diary/2021-01-21.md
+++ b/examples/diary/2021-01-21.md
@@ -1,5 +1,5 @@
 ---
-tags: work_log
+tags: work_log, work_log2
 mood: 🙂
 bloodpressure: 170.4/113.8
 bloodpressure1: 170.4, 113.8
diff --git a/examples/diary/2021-01-22.md b/examples/diary/2021-01-22.md
index 43a6889..1d59f28 100644
--- a/examples/diary/2021-01-22.md
+++ b/examples/diary/2021-01-22.md
@@ -1,5 +1,5 @@
 ---
-tags: work_log
+tags: work_log, work_log2
 mood: 😞
 bloodpressure: 165.8/116.6
 bloodpressure1: 165.8, 116.6
diff --git a/examples/diary/2021-01-25.md b/examples/diary/2021-01-25.md
index 811eea5..569cbf6 100644
--- a/examples/diary/2021-01-25.md
+++ b/examples/diary/2021-01-25.md
@@ -1,5 +1,5 @@
 ---
-tags: work_log
+tags: work_log, work_log2
 mood: 😞
 bloodpressure: 167/114
 bloodpressure1: 167, 114
diff --git a/examples/diary/2021-01-26.md b/examples/diary/2021-01-26.md
index 4b37aab..c189d61 100644
--- a/examples/diary/2021-01-26.md
+++ b/examples/diary/2021-01-26.md
@@ -1,5 +1,5 @@
 ---
-tags: work_log
+tags: work_log, work_log2
 mood: 🙂
 bloodpressure: 162.4/114.8
 bloodpressure1: 162.4, 114.8
diff --git a/examples/diary/2021-01-27.md b/examples/diary/2021-01-27.md
index 27c95a9..e7c320e 100644
--- a/examples/diary/2021-01-27.md
+++ b/examples/diary/2021-01-27.md
@@ -1,5 +1,5 @@
 ---
-tags: work_log
+tags: work_log, work_log2
 mood: 🙂
 bloodpressure: 165.8/113.6
 bloodpressure1: 165.8, 113.6
diff --git a/examples/diary/2021-01-28.md b/examples/diary/2021-01-28.md
index e239cd0..efc0f2d 100644
--- a/examples/diary/2021-01-28.md
+++ b/examples/diary/2021-01-28.md
@@ -1,5 +1,5 @@
 ---
-tags: work_log
+tags: work_log, work_log2
 mood: 😀
 bloodpressure: 158.2/115.4
 bloodpressure1: 158.2, 115.4
diff --git a/examples/diary/2021-01-29.md b/examples/diary/2021-01-29.md
index d57ebc4..d2f984a 100644
--- a/examples/diary/2021-01-29.md
+++ b/examples/diary/2021-01-29.md
@@ -1,5 +1,5 @@
 ---
-tags: work_log
+tags: work_log, work_log2
 mood: 🙁
 bloodpressure: 163.6/112.2
 bloodpressure1: 163.6, 112.2
diff --git a/examples/example_generator.ts b/examples/example_generator.ts
index 3362727..53e67ae 100644
--- a/examples/example_generator.ts
+++ b/examples/example_generator.ts
@@ -50,7 +50,7 @@ for (
     if (weekday == 0 || weekday == 6) {
         frontmatter += "tags: " + "\n";
     } else {
-        frontmatter += "tags: " + "work_log" + "\n";
+        frontmatter += "tags: " + "work_log" + ", " + "work_log2" + "\n";
     }
     // frontmatter mood
     let moodSymbols = ["😀", "🙂", "😐", "🙁", "😞"];
diff --git a/src/month.ts b/src/month.ts
index 35dea32..e4352c3 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -487,6 +487,7 @@ function renderMonthDays(
 ) {
     // console.log("renderMonthDays");
     // console.log(renderInfo);
+    // console.log(monthInfo);
     if (!renderInfo || !monthInfo) return;
 
     let mode = monthInfo.mode;
@@ -498,6 +499,7 @@ function renderMonthDays(
     if (curDatasetId === null) return;
     let dataset = renderInfo.datasets.getDatasetById(curDatasetId);
     if (!dataset) return;
+    // console.log(dataset);
 
     let curDatasetIndex = monthInfo.dataset.findIndex((id) => {
         return id === curDatasetId;
@@ -566,6 +568,16 @@ function renderMonthDays(
         curDate <= endDate;
         curDate.add(1, "days")
     ) {
+        // not sure why we need to do this to stablize the date
+        // sometimes, curValue is wrong without doing this
+        curDate = helper.strToDate(
+            helper.dateToStr(curDate, renderInfo.dateFormat),
+            renderInfo.dateFormat
+        );
+        if (curDate.format("YYYY-MM-DD") === "2021-01-02") {
+            logToConsole = false; // Change this to do dubugging
+        }
+
         if (monthInfo.startWeekOn.toLowerCase() === "mon") {
             indCol = curDate.day() - 1;
             if (indCol < 0) {
@@ -596,8 +608,13 @@ function renderMonthDays(
             isOutOfDataRange = false;
         }
 
-        // curValue
-        let curValue = dataset.getValue(curDate);
+        const curValue = dataset.getValue(curDate);
+        if (logToConsole) {
+            console.log(dataset);
+            console.log(helper.dateToStr(curDate, renderInfo.dateFormat));
+            console.log(dataset.getValue(window.moment("2021-01-02")));
+            console.log(curValue);
+        }
 
         // showCircle
         let showCircle = false;
@@ -631,10 +648,6 @@ function renderMonthDays(
         // console.log(yMax);
         // console.log(scaledValue);
 
-        // if (curDate.format("YYYY-MM-DD") === "2021-11-02") {
-        //     logToConsole = true;
-        // }
-
         // streakIn and streakOut
         let nextValue = dataset.getValue(curDate, 1);
         let prevValue = dataset.getValue(curDate, -1);
@@ -650,12 +663,13 @@ function renderMonthDays(
                 streakOut = true;
             }
         }
-        // if (logToConsole) {
-        //     console.log(`preValue: ${prevValue}, curValue: ${curValue}, nextValue: ${nextValue}`);
-        //     console.log(monthInfo.threshold);
-        //     console.log(`streakIn: ${streakIn}, streakOut: ${streakOut}`);
-        //     logToConsole = false;
-        // }
+        if (logToConsole) {
+            console.log(
+                `preValue: ${prevValue}, curValue: ${curValue}, nextValue: ${nextValue}`
+            );
+            console.log(monthInfo.threshold);
+            console.log(`streakIn: ${streakIn}, streakOut: ${streakOut}`);
+        }
 
         let textAnnotation = "";
         if (showAnnotation) {
@@ -697,6 +711,11 @@ function renderMonthDays(
         });
 
         ind++;
+
+        // Disable logging starts at the beginning of each loop
+        if (logToConsole) {
+            logToConsole = false;
+        }
     }
     // console.log(daysInMonthView);
     // console.log(daysInMonthView.filter(function (d: DayInfo) {

From 76c7fa4ef79d1503124ac0207fd610c617ac7c2f Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 20 Aug 2021 10:54:05 +0800
Subject: [PATCH 219/402] Fix default separator

---
 docs/InputParameters.md     |  2 +-
 examples/TestFrontmatter.md | 23 ++++++++++++++++++++---
 src/collecting.ts           |  4 +++-
 src/data.ts                 | 10 ++++++++--
 src/parsing.ts              |  2 +-
 5 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/docs/InputParameters.md b/docs/InputParameters.md
index 903adff..cddcc93 100644
--- a/docs/InputParameters.md
+++ b/docs/InputParameters.md
@@ -31,7 +31,7 @@ These key-value pairs are placed under the root of the code block.
 | `startDate` | Start date to collect data from<br>accept [relative date](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md#relative-date-input-for-startdate-and-enddate) | 1 | Min date found |
 | `endDate` | End date of to collect data<br>accept [relative date](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md#relative-date-input-for-startdate-and-enddate) | 1 | Max date found |
 | `datasetName` | Name of the dataset for a search target` | 1~NT | untitled |
-| `separator` | Character used to separate multiple values appearing in the search target | 1~NT | '/' |
+| `separator` | Character used to separate multiple values appearing in the search target | 1~NT | '/' <br> ',' in front matter tags |
 | `xDataset` | Index of `searchTarget` used as xDataset | 1~NT | -1 (use filename as xDataset) |
 | `constValue` | Constant value of a target if no value attached | 1~NT | 1.0 |
 | `ignoreAttachedValue` | Use `constValue` even if the target has a value attached on (true\|false) | 1~NT | false |
diff --git a/examples/TestFrontmatter.md b/examples/TestFrontmatter.md
index dc31cbd..1494036 100644
--- a/examples/TestFrontmatter.md
+++ b/examples/TestFrontmatter.md
@@ -36,14 +36,31 @@ line:
 ```
 
 ## Multiple Tags in Front Matter
-Use 'comma', or '\,' in parameter `separator`
-Notice the comma character should be escaped
+Extract data of one tag from multiple tags
+The default separator in front matter tags is comma (,)
+``` tracker
+searchType: tag
+searchTarget: work_log
+folder: diary
+accum: true
+startDate: 2021-01-01
+endDate: 2021-01-31
+line:
+    title: Work Log
+    yAxisLabel: Count
+    pointSize: 5
+    pointColor: white
+    pointBorderWidth: 2
+    pointBorderColor: "#d65d0e"
+```
+
+Use the data of two tags
+The default separator in front matter tags is comma (,)
 ``` tracker
 searchType: tag
 searchTarget: work_log, work_log2
 folder: diary
 datasetName: Work1, Work2
-separator: '\,'
 month:
     initMonth: 2021-01
 ```
diff --git a/src/collecting.ts b/src/collecting.ts
index cb71cae..7c3fe09 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -439,7 +439,7 @@ export function collectDataFromFrontmatterTag(
         if (Array.isArray(frontMatter.tags)) {
             frontMatterTags = frontMatterTags.concat(frontMatter.tags);
         } else if (typeof frontMatter.tags === "string") {
-            let splitted = frontMatter.tags.split(query.getSeparator());
+            let splitted = frontMatter.tags.split(query.getSeparator(true));
             for (let splittedPart of splitted) {
                 let part = splittedPart.trim();
                 if (part !== "") {
@@ -447,6 +447,8 @@ export function collectDataFromFrontmatterTag(
                 }
             }
         }
+        // console.log(frontMatterTags);
+        // console.log(query.getTarget());
 
         for (let tag of frontMatterTags) {
             if (tag === query.getTarget()) {
diff --git a/src/data.ts b/src/data.ts
index a3c99b9..4ddd92f 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -68,7 +68,7 @@ export class Query {
     constructor(id: number, searchType: SearchType, searchTarget: string) {
         this.type = searchType;
         this.target = searchTarget;
-        this.separator = "/";
+        this.separator = "";// separator to separate multiple values
         this.id = id;
         this.accessor = -1;
         this.accessor1 = -1;
@@ -172,7 +172,13 @@ export class Query {
         this.separator = sep;
     }
 
-    public getSeparator() {
+    public getSeparator(isForFrontmatterTags: boolean = false) {
+        if (this.separator === "") {
+            if (isForFrontmatterTags) {
+                return ",";
+            }
+            return "/";
+        }
         return this.separator;
     }
 
diff --git a/src/parsing.ts b/src/parsing.ts
index 794227c..c4326e4 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1014,7 +1014,7 @@ export function getRenderInfoFromYaml(
         "separator",
         yaml.separator,
         numDatasets,
-        "/",
+        "",// set the default value later
         null,
         true
     );

From 44d7cb087b2a85cc23c68e3fd3b077665a184add Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 20 Aug 2021 12:19:00 +0800
Subject: [PATCH 220/402] Add warning for current situation on mobile

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 1724dc5..ee77f4a 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,9 @@ This is an [Obsidian](https://obsidian.md/) plugin that helps you collect data f
 [Here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Examples.md) is a table containing simplified examples showing what you can track.
 
 ## What's New
+
+!!! Warning: For some reasons version 1.10.0 is not working on mobile. If you need Tracker on your mobile, do not update it until the issue is fixed.
+
 Version 1.10.0
 - Add annotation mode for month view ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestCalendar.md))
 - Add parameters `xAxisTickInterval`, `yAxisTickInterval`, `xAxisTickLabelFormat` and `yAxisTickLabelFormat` for the line and bar chart ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestAxisIntervalAndFormat.md))

From 0cf11afa0836c2ae82660181e4286b98fcfd0f62 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 20 Aug 2021 14:15:17 +0800
Subject: [PATCH 221/402] Fix lookbehind regex not supported on current iOS

---
 src/parsing.ts | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/parsing.ts b/src/parsing.ts
index c4326e4..7a3c875 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -69,6 +69,18 @@ function validateColor(color: string): boolean {
     return true;
 }
 
+function splitInputByComma(input: string) {
+    // Split string by ',' but not by '\,'
+    // let splitted = input.split(/(?<!\\),/); // -->lookbehind not support in Safari for now
+    const dummy = "::::::tracker::::::";
+    let temp = input.replaceAll("\\,", dummy);
+    let splitted = temp.split(",");
+    for (let ind = 0; ind < splitted.length; ind++) {
+        splitted[ind] = splitted[ind].replaceAll(dummy, ",");
+    }
+    return splitted;
+}
+
 function getBoolArrayFromInput(
     name: string,
     input: any,
@@ -134,7 +146,7 @@ function getBoolArrayFromInput(
             }
         }
     } else if (typeof input === "string") {
-        let splitted = input.split(/(?<!\\),/);
+        let splitted = splitInputByComma(input);
         if (splitted.length > 1) {
             if (splitted.length > numDataset) {
                 errorMessage = "Too many inputs for parameter '" + name + "'";
@@ -275,7 +287,7 @@ function getNumberArrayFromInput(
             }
         }
     } else if (typeof input === "string") {
-        let splitted = input.split(/(?<!\\),/);
+        let splitted = splitInputByComma(input);
         if (splitted.length > 1) {
             if (splitted.length > numDataset) {
                 errorMessage = "Too many inputs for parameter '" + name + "'";
@@ -432,7 +444,7 @@ function getStringArrayFromInput(
             }
         }
     } else if (typeof input === "string") {
-        let splitted = input.split(/(?<!\\),/);
+        let splitted = splitInputByComma(input);
         if (splitted.length > 1) {
             if (splitted.length > numDataset) {
                 errorMessage = "Too many inputs for parameter '" + name + "'";
@@ -552,7 +564,7 @@ function getNumberArray(name: string, input: any): Array<number> | string {
             }
         }
     } else if (typeof input === "string") {
-        let splitted = input.split(/(?<!\\),/);
+        let splitted = splitInputByComma(input);
         if (splitted.length > 1) {
             for (let piece of splitted) {
                 let v = parseFloat(piece.trim());
@@ -600,7 +612,7 @@ function getStringArray(name: string, input: any): Array<string> | string {
             }
         }
     } else if (typeof input === "string") {
-        let splitted = input.split(/(?<!\\),/);
+        let splitted = splitInputByComma(input);
         // console.log(splitted);
         if (splitted.length > 1) {
             for (let piece of splitted) {
@@ -909,7 +921,7 @@ export function getRenderInfoFromYaml(
             }
         }
     } else if (typeof yaml.searchTarget === "string") {
-        let splitted = yaml.searchTarget.split(/(?<!\\),/);
+        let splitted = splitInputByComma(yaml.searchTarget);
         // console.log(splitted);
         if (splitted.length > 1) {
             for (let piece of splitted) {
@@ -1014,7 +1026,7 @@ export function getRenderInfoFromYaml(
         "separator",
         yaml.separator,
         numDatasets,
-        "",// set the default value later
+        "", // set the default value later
         null,
         true
     );
@@ -1022,7 +1034,7 @@ export function getRenderInfoFromYaml(
         return retMultipleValueSparator; // errorMessage
     }
     multipleValueSparator = retMultipleValueSparator.map((sep) => {
-        if (sep === "comma" || sep === "\\,") {
+        if (sep === "comma") {
             return ",";
         }
         return sep;

From 84faa823c1531ef2b5147f65e84db2d5d2857fe6 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 20 Aug 2021 14:16:51 +0800
Subject: [PATCH 222/402] Set version to 1.10.1

---
 manifest.json | 2 +-
 package.json  | 2 +-
 versions.json | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index b6036da..43774cc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-tracker",
 	"name": "Tracker",
-	"version": "1.10.0",
+	"version": "1.10.1",
 	"minAppVersion": "0.9.12",
 	"description": "A plugin tracks occurrences and numbers in your notes",
 	"author": "pyrochlore",
diff --git a/package.json b/package.json
index 9fc8906..4cc4e3e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.10.0",
+  "version": "1.10.1",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
diff --git a/versions.json b/versions.json
index 0f2082e..944f15d 100644
--- a/versions.json
+++ b/versions.json
@@ -19,5 +19,6 @@
 	"1.9.0": "0.9.12",
 	"1.9.1": "0.9.12",
 	"1.9.2": "0.9.12",
-	"1.10.0": "0.9.12"
+	"1.10.0": "0.9.12",
+	"1.10.1": "0.9.12"
 }

From 94e909ee59d784d4be02492b172ae4de9686346b Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 20 Aug 2021 14:20:27 +0800
Subject: [PATCH 223/402] Update documents

---
 README.md            | 5 +++--
 docs/ReleaseNotes.md | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ee77f4a..11e55bf 100644
--- a/README.md
+++ b/README.md
@@ -10,8 +10,6 @@ This is an [Obsidian](https://obsidian.md/) plugin that helps you collect data f
 
 ## What's New
 
-!!! Warning: For some reasons version 1.10.0 is not working on mobile. If you need Tracker on your mobile, do not update it until the issue is fixed.
-
 Version 1.10.0
 - Add annotation mode for month view ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestCalendar.md))
 - Add parameters `xAxisTickInterval`, `yAxisTickInterval`, `xAxisTickLabelFormat` and `yAxisTickLabelFormat` for the line and bar chart ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestAxisIntervalAndFormat.md))
@@ -21,6 +19,9 @@ Version 1.10.0
 - Fixed bugs
 - Enhanced error messages
 
+Version 1.10.1
+- Fixed 'failed to load plugin' on iOS
+
 ## !!! Breaking Changes !!!
 
 From version 1.9.0, template variables, e.g. '{{sum}}', are deprecated. Instead, Tracker provide operators (+, -, *, /, %) and functions (dataset(), sum(), maxStreak(), ......etc) to help us do data processing. For users having code blocks from previous version, please replace '{{sum}}' by '{{sum()}}' or '{{sum(1)}}' by '{{sum(dataset(1))}}'. More information about the new expressions could be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Expressions.md).
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index de38252..ccc38dd 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,5 +1,8 @@
 # Release Notes
 
+## v1.10.1
+- Fixed 'failed to load plugin' on iOS
+
 ## v1.10.0
 - Add annotation mode for month view ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestCalendar.md))
 - Add parameters `xAxisTickInterval`, `yAxisTickInterval`, `xAxisTickLabelFormat` and `yAxisTickLabelFormat` for the line and bar chart ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestAxisIntervalAndFormat.md))

From 7aaca6cabfb8b61b5f3d5c47393b2d63d10f9630 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 24 Aug 2021 08:15:01 +0800
Subject: [PATCH 224/402] Stop using function replaceAll

---
 src/expr.ts    | 4 +++-
 src/parsing.ts | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/expr.ts b/src/expr.ts
index 38671e6..65562c2 100644
--- a/src/expr.ts
+++ b/src/expr.ts
@@ -964,6 +964,7 @@ export function resolveTemplate(
     let exprMap = retResolve as Array<ExprResolved>;
 
     for (let exprResolved of exprMap) {
+        let source = exprResolved.source;
         let value = exprResolved.value;
         let format = exprResolved.format;
         let strValue = "";
@@ -982,7 +983,8 @@ export function resolveTemplate(
         }
 
         if (strValue) {
-            template = template.replaceAll(exprResolved.source, strValue);
+            // console.log(exprResolved);
+            template = template.split(source).join(strValue);
         }
     }
 
diff --git a/src/parsing.ts b/src/parsing.ts
index 7a3c875..b53d692 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -73,10 +73,10 @@ function splitInputByComma(input: string) {
     // Split string by ',' but not by '\,'
     // let splitted = input.split(/(?<!\\),/); // -->lookbehind not support in Safari for now
     const dummy = "::::::tracker::::::";
-    let temp = input.replaceAll("\\,", dummy);
+    let temp = input.split("\\,").join(dummy);
     let splitted = temp.split(",");
     for (let ind = 0; ind < splitted.length; ind++) {
-        splitted[ind] = splitted[ind].replaceAll(dummy, ",");
+        splitted[ind] = splitted[ind].split(dummy).join(",");
     }
     return splitted;
 }

From 59477f728dae2185f217efa97a252bac45bfe177 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 24 Aug 2021 08:24:00 +0800
Subject: [PATCH 225/402] Fix using separator '\,'

---
 examples/TestDvField.md | 13 +++++++++++++
 src/parsing.ts          |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/examples/TestDvField.md b/examples/TestDvField.md
index 5f0add1..34b5680 100644
--- a/examples/TestDvField.md
+++ b/examples/TestDvField.md
@@ -73,6 +73,19 @@ line:
     lineColor: green, red
 ```
 
+Multiple values seprated by '\,'
+``` tracker
+searchType: dvField
+searchTarget: dataviewTarget3[0], dataviewTarget3[1]
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-31
+separator: '\,'
+line:
+    title: dvField
+    lineColor: green, red
+```
+
 Use custom multiple value separator
 ``` tracker
 searchType: dvField
diff --git a/src/parsing.ts b/src/parsing.ts
index b53d692..40926b5 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1034,7 +1034,7 @@ export function getRenderInfoFromYaml(
         return retMultipleValueSparator; // errorMessage
     }
     multipleValueSparator = retMultipleValueSparator.map((sep) => {
-        if (sep === "comma") {
+        if (sep === "comma" || sep === "\\,") {
             return ",";
         }
         return sep;

From f1958b73c112b040aec34db7022d174cb29d736f Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 24 Aug 2021 08:35:29 +0800
Subject: [PATCH 226/402] Set version to 1.10.2

---
 manifest.json | 2 +-
 package.json  | 2 +-
 versions.json | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index 43774cc..8c35915 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-tracker",
 	"name": "Tracker",
-	"version": "1.10.1",
+	"version": "1.10.2",
 	"minAppVersion": "0.9.12",
 	"description": "A plugin tracks occurrences and numbers in your notes",
 	"author": "pyrochlore",
diff --git a/package.json b/package.json
index 4cc4e3e..38c4609 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.10.1",
+  "version": "1.10.2",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
diff --git a/versions.json b/versions.json
index 944f15d..d97d431 100644
--- a/versions.json
+++ b/versions.json
@@ -20,5 +20,6 @@
 	"1.9.1": "0.9.12",
 	"1.9.2": "0.9.12",
 	"1.10.0": "0.9.12",
-	"1.10.1": "0.9.12"
+	"1.10.1": "0.9.12",
+	"1.10.2": "0.9.12"
 }

From 99c368eb2e47626a7b57ca810061d338d86d370a Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 24 Aug 2021 09:10:27 +0800
Subject: [PATCH 227/402] Update documents

---
 README.md            | 3 +++
 docs/ReleaseNotes.md | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 11e55bf..ec97a29 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,9 @@ Version 1.10.0
 Version 1.10.1
 - Fixed 'failed to load plugin' on iOS
 
+Version 1.10.2
+- Fixed plugin not rendering on some macOS machines
+
 ## !!! Breaking Changes !!!
 
 From version 1.9.0, template variables, e.g. '{{sum}}', are deprecated. Instead, Tracker provide operators (+, -, *, /, %) and functions (dataset(), sum(), maxStreak(), ......etc) to help us do data processing. For users having code blocks from previous version, please replace '{{sum}}' by '{{sum()}}' or '{{sum(1)}}' by '{{sum(dataset(1))}}'. More information about the new expressions could be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Expressions.md).
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index ccc38dd..d9b96e1 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,5 +1,8 @@
 # Release Notes
 
+## v1.10.2
+- Fixed plugin not rendering on some macOS machines
+
 ## v1.10.1
 - Fixed 'failed to load plugin' on iOS
 

From 4457b761dad5c352a2e58f0a1e31413664a90748 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 24 Aug 2021 09:55:37 +0800
Subject: [PATCH 228/402] Remove tabs in examples

---
 examples/TestCalendar.md             |  8 ++++----
 examples/TestFileMeta.md             |  4 ++--
 examples/TestFrontmatter.md          | 10 +++++-----
 examples/TestRegex.md                |  8 ++++----
 examples/TestRelativeStartEndDate.md |  2 +-
 examples/TestSpecifiedFiles.md       |  2 +-
 examples/TestTimeValues.md           |  2 +-
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
index e93c5bd..893fa3a 100644
--- a/examples/TestCalendar.md
+++ b/examples/TestCalendar.md
@@ -109,8 +109,8 @@ month:
     color: green
     headerMonthColor: orange
     dimNotInMonth: false
-	annotation: 💪,🧘‍♂️
-	showAnnotationOfAllTargets: false
+    annotation: 💪,🧘‍♂️
+    showAnnotationOfAllTargets: false
 ```
 
 All targets
@@ -126,8 +126,8 @@ month:
     color: green
     headerMonthColor: orange
     dimNotInMonth: false
-	annotation: 💪,🧘‍♂️
-	showAnnotationOfAllTargets: true
+    annotation: 💪,🧘‍♂️
+    showAnnotationOfAllTargets: true
 ```
 
 Please also check those search targets in markdown files under folder 'diary'.
diff --git a/examples/TestFileMeta.md b/examples/TestFileMeta.md
index d1436a9..da7634b 100644
--- a/examples/TestFileMeta.md
+++ b/examples/TestFileMeta.md
@@ -7,8 +7,8 @@ folder: diary
 endDate: 2021-01-31
 line:
     title: File Size Variation
-	yAxisLabel: Size
-	yAxisUnit: bytes
+    yAxisLabel: Size
+    yAxisUnit: bytes
 ```
 
 Use file created dates (cDate) as x values
diff --git a/examples/TestFrontmatter.md b/examples/TestFrontmatter.md
index 1494036..f3eca7c 100644
--- a/examples/TestFrontmatter.md
+++ b/examples/TestFrontmatter.md
@@ -3,11 +3,11 @@
 ## Deep Values
 deepValue:
     very:
-	    very:
-		    very:
-			    very: 
-				    very:
-					    deep: 27.4
+        very:
+            very:
+                very: 
+                    very:
+                        deep: 27.4
 ``` tracker
 searchType: frontmatter
 searchTarget: deepValue.very.very.very.very.very.deep
diff --git a/examples/TestRegex.md b/examples/TestRegex.md
index 482bb15..9e8fc51 100644
--- a/examples/TestRegex.md
+++ b/examples/TestRegex.md
@@ -18,10 +18,10 @@ line:
     title: Email Occurencies
     yAxisLabel: Count
     lineColor: yellow
-	yAxisTickInterval: 1.0
-	yAxisTickLabelFormat: i
-	yMin: 0
-	yMax: 5
+    yAxisTickInterval: 1.0
+    yAxisTickLabelFormat: i
+    yMin: 0
+    yMax: 5
 ```
 
 ``` tracker
diff --git a/examples/TestRelativeStartEndDate.md b/examples/TestRelativeStartEndDate.md
index aac55e0..4c3f0e4 100644
--- a/examples/TestRelativeStartEndDate.md
+++ b/examples/TestRelativeStartEndDate.md
@@ -10,5 +10,5 @@ line:
     title: PushUp
     yAxisLabel: Count
     lineColor: "#d65d0e"
-	yAxisTickInterval: 2
+    yAxisTickInterval: 2
 ```
\ No newline at end of file
diff --git a/examples/TestSpecifiedFiles.md b/examples/TestSpecifiedFiles.md
index 857180d..d9a4c06 100644
--- a/examples/TestSpecifiedFiles.md
+++ b/examples/TestSpecifiedFiles.md
@@ -22,5 +22,5 @@ xDataset: 0
 pie:
     label: '{{sum(dataset(1))::i}},{{sum(dataset(2))::i}},{{sum(dataset(3))::i}},{{sum(dataset(4))::i}},{{sum(dataset(5))::i}}'
     data: '{{sum(dataset(1))}},{{sum(dataset(2))}}, {{sum(dataset(3))}}, {{sum(dataset(4))}},{{sum(dataset(5))}}'
-	dataColor: lightgray, firebrick, yellowgreen, lightblue, gray
+    dataColor: lightgray, firebrick, yellowgreen, lightblue, gray
 ```
\ No newline at end of file
diff --git a/examples/TestTimeValues.md b/examples/TestTimeValues.md
index 31a3994..52ea234 100644
--- a/examples/TestTimeValues.md
+++ b/examples/TestTimeValues.md
@@ -14,7 +14,7 @@ line:
     reverseYAxis: true
     lineColor: yellow, red
     showPoint: true
-	showLegend: true
+    showLegend: true
 ```
 
 Sleep time separated by / from front matter

From 0b35810149e7f2a7eb8729ddbff652999340fe62 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Wed, 25 Aug 2021 19:11:34 +0800
Subject: [PATCH 229/402] Allow using fitPanelWidth in output type month and
 pie

---
 src/month.ts | 30 ++++++++++++++++++++++++++++++
 src/pie.ts   | 30 ++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)

diff --git a/src/month.ts b/src/month.ts
index e4352c3..9b5a09d 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -33,6 +33,34 @@ interface DayInfo {
     annotation: string;
 }
 
+function setChartScale(
+    _canvas: HTMLElement,
+    chartElements: ChartElements,
+    renderInfo: RenderInfo
+) {
+    let canvas = d3.select(_canvas);
+    let svg = chartElements.svg;
+    let svgWidth = parseFloat(svg.attr("width"));
+    let svgHeight = parseFloat(svg.attr("height"));
+    svg.attr("width", null)
+        .attr("height", null)
+        .attr("viewBox", `0 0 ${svgWidth} ${svgHeight}`)
+        .attr("preserveAspectRatio", "xMidYMid meet");
+
+    if (renderInfo.fitPanelWidth) {
+        canvas.style("width", "100%");
+    } else {
+        canvas.style(
+            "width",
+            (svgWidth * renderInfo.fixedScale).toString() + "px"
+        );
+        canvas.style(
+            "height",
+            (svgHeight * renderInfo.fixedScale).toString() + "px"
+        );
+    }
+}
+
 function toNextDataset(renderInfo: RenderInfo, monthInfo: MonthInfo): boolean {
     let datasetIds = monthInfo.dataset;
     if (datasetIds.length === 0) return false; // false if selected dataset not changed
@@ -1127,4 +1155,6 @@ export function renderMonth(
     renderMonthHeader(canvas, chartElements, renderInfo, monthInfo, monthDate);
 
     renderMonthDays(canvas, chartElements, renderInfo, monthInfo, monthDate);
+
+    setChartScale(canvas, chartElements, renderInfo);
 }
diff --git a/src/pie.ts b/src/pie.ts
index 46080a3..992cef6 100644
--- a/src/pie.ts
+++ b/src/pie.ts
@@ -17,6 +17,34 @@ import * as d3 from "d3";
 import * as expr from "./expr";
 import { pie } from "d3";
 
+function setChartScale(
+    _canvas: HTMLElement,
+    chartElements: ChartElements,
+    renderInfo: RenderInfo
+) {
+    let canvas = d3.select(_canvas);
+    let svg = chartElements.svg;
+    let svgWidth = parseFloat(svg.attr("width"));
+    let svgHeight = parseFloat(svg.attr("height"));
+    svg.attr("width", null)
+        .attr("height", null)
+        .attr("viewBox", `0 0 ${svgWidth} ${svgHeight}`)
+        .attr("preserveAspectRatio", "xMidYMid meet");
+
+    if (renderInfo.fitPanelWidth) {
+        canvas.style("width", "100%");
+    } else {
+        canvas.style(
+            "width",
+            (svgWidth * renderInfo.fixedScale).toString() + "px"
+        );
+        canvas.style(
+            "height",
+            (svgHeight * renderInfo.fixedScale).toString() + "px"
+        );
+    }
+}
+
 function createAreas(
     chartElements: ChartElements,
     canvas: HTMLElement,
@@ -632,4 +660,6 @@ export function renderPieChart(
     if (pieInfo.showLegend) {
         renderLegend(canvas, chartElements, renderInfo, pieInfo);
     }
+
+    setChartScale(canvas, chartElements, renderInfo);
 }

From c9c46a7766b61a3894b0c6113e0a29e7b24ca65d Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Wed, 25 Aug 2021 19:13:06 +0800
Subject: [PATCH 230/402] Set version to 1.10.3

---
 manifest.json | 2 +-
 package.json  | 2 +-
 versions.json | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index 8c35915..3d603d2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-tracker",
 	"name": "Tracker",
-	"version": "1.10.2",
+	"version": "1.10.3",
 	"minAppVersion": "0.9.12",
 	"description": "A plugin tracks occurrences and numbers in your notes",
 	"author": "pyrochlore",
diff --git a/package.json b/package.json
index 38c4609..7f3e322 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.10.2",
+  "version": "1.10.3",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
diff --git a/versions.json b/versions.json
index d97d431..9a9c9f3 100644
--- a/versions.json
+++ b/versions.json
@@ -21,5 +21,6 @@
 	"1.9.2": "0.9.12",
 	"1.10.0": "0.9.12",
 	"1.10.1": "0.9.12",
-	"1.10.2": "0.9.12"
+	"1.10.2": "0.9.12",
+	"1.10.3": "0.9.12"
 }

From 91050fe5655f5f2c6985926b0eb6ca03920122c0 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Wed, 25 Aug 2021 19:16:27 +0800
Subject: [PATCH 231/402] Update documents

---
 README.md            | 3 +++
 docs/ReleaseNotes.md | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/README.md b/README.md
index ec97a29..efc9dae 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,9 @@ Version 1.10.1
 Version 1.10.2
 - Fixed plugin not rendering on some macOS machines
 
+Version 1.10.3
+- Allow using a parameter `fitPanelWidth` with the output type `month` and `pie`
+
 ## !!! Breaking Changes !!!
 
 From version 1.9.0, template variables, e.g. '{{sum}}', are deprecated. Instead, Tracker provide operators (+, -, *, /, %) and functions (dataset(), sum(), maxStreak(), ......etc) to help us do data processing. For users having code blocks from previous version, please replace '{{sum}}' by '{{sum()}}' or '{{sum(1)}}' by '{{sum(dataset(1))}}'. More information about the new expressions could be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Expressions.md).
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index d9b96e1..9561271 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,5 +1,8 @@
 # Release Notes
 
+## v1.10.3
+- Allow using a parameter `fitPanelWidth` with the output type `month` and `pie`
+
 ## v1.10.2
 - Fixed plugin not rendering on some macOS machines
 

From ca0566dc56280b2bb3493bc4c1fa37270f6e84ab Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 27 Aug 2021 21:52:02 +0800
Subject: [PATCH 232/402] Fix the sizing and positioning of the chart tooltip

---
 src/data.ts      |   2 -
 src/rendering.ts | 166 +++++++++++++++++++++++++++++------------------
 2 files changed, 103 insertions(+), 65 deletions(-)

diff --git a/src/data.ts b/src/data.ts
index 4ddd92f..66fb19c 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -567,7 +567,6 @@ export class RenderInfo {
 
     dataAreaSize: Size;
     margin: Margin;
-    tooltipSize: Size;
 
     fixedScale: number;
     fitPanelWidth: boolean;
@@ -609,7 +608,6 @@ export class RenderInfo {
 
         this.dataAreaSize = new Size(300, 300);
         this.margin = new Margin(10, 10, 10, 10); // top, right, bottom, left
-        this.tooltipSize = new Size(90, 45);
 
         this.fixedScale = 1.0;
         this.fitPanelWidth = false;
diff --git a/src/rendering.ts b/src/rendering.ts
index 75cef80..4db7156 100644
--- a/src/rendering.ts
+++ b/src/rendering.ts
@@ -787,73 +787,113 @@ function renderPoints(
         }
 
         if (lineInfo.allowInspectData) {
-            let tooltip = chartElements.svg.append("g").style("opacity", 0);
-            let tooltipBg = tooltip
-                .append("rect")
-                .attr("width", renderInfo.tooltipSize.width)
-                .attr("height", renderInfo.tooltipSize.height)
-                .attr("class", "tracker-tooltip");
-            let tooltipLabel = tooltip
-                .append("text")
-                .attr("width", renderInfo.tooltipSize.width)
-                .attr("height", renderInfo.tooltipSize.height)
-                .attr("class", "tracker-tooltip-label");
-            let tooltipLabelDate = tooltipLabel
-                .append("tspan")
-                .attr("x", 4)
-                .attr("y", (renderInfo.tooltipSize.height / 5) * 2);
-            let tooltipLabelValue = tooltipLabel
-                .append("tspan")
-                .attr("x", 4)
-                .attr("y", (renderInfo.tooltipSize.height / 5) * 4);
-
-            dots.on("mouseenter", function (event: any) {
-                // Date
-                tooltipLabelDate.text("date:" + d3.select(this).attr("date"));
-                // Value
-                let valueType = d3.select(this).attr("valueType");
-                let strValue = d3.select(this).attr("value");
-                if (valueType === "Time") {
-                    let dayStart = window.moment("00:00", "HH:mm", true);
-                    let tickTime = dayStart.add(
-                        parseFloat(strValue),
-                        "seconds"
-                    );
-                    let dateValue = tickTime.format("HH:mm");
-                    tooltipLabelValue.text("value:" + dateValue);
-                } else {
-                    tooltipLabelValue.text("value:" + strValue);
-                }
-
-                const [x, y] = d3.pointer(event);
-                if (x < renderInfo.dataAreaSize.width / 2) {
-                    tooltip.attr(
-                        "transform",
-                        "translate(" +
-                            (x + renderInfo.tooltipSize.width * 1.3) +
-                            "," +
-                            (y - renderInfo.tooltipSize.height * 1.0) +
-                            ")"
-                    );
-                } else {
-                    tooltip.attr(
-                        "transform",
-                        "translate(" +
-                            (x - renderInfo.tooltipSize.width * 0.0) +
-                            "," +
-                            (y - renderInfo.tooltipSize.height * 1.0) +
-                            ")"
-                    );
-                }
-
-                tooltip.transition().duration(200).style("opacity", 1);
-            }).on("mouseleave", function () {
-                tooltip.transition().duration(500).style("opacity", 0);
-            });
+            renderTooltip(dots, chartElements, renderInfo);
         }
     }
 }
 
+function renderTooltip(
+    targetElements: any,
+    chartElements: ChartElements,
+    renderInfo: RenderInfo
+) {
+    let tooltip = chartElements.dataArea.append("svg").style("opacity", 0);
+    let tooltipBg = tooltip.append("rect").attr("x", 0).attr("y", 0);
+    let tooltipLabel = tooltip.append("text");
+    let tooltipLabelDate = tooltipLabel
+        .append("tspan")
+        .attr("class", "tracker-tooltip-label");
+    let tooltipLabelValue = tooltipLabel
+        .append("tspan")
+        .attr("class", "tracker-tooltip-label");
+
+    let xSpacing = 3;
+    let ySpacing = 3;
+
+    targetElements
+        .on("mouseenter", function (event: any) {
+            const [x, y] = d3.pointer(event);
+            let tooltipBgWidth = 0;
+            let tooltipBgHeight = 0;
+            // Date
+            let labelDateText = "date: " + d3.select(this).attr("date");
+            // labelDateText = x.toString();// debug
+            let labelDateSize = helper.measureTextSize(
+                labelDateText,
+                "tracker-tooltip-label"
+            );
+            tooltipLabelDate.text(labelDateText);
+            if (labelDateSize.width > tooltipBgWidth) {
+                tooltipBgWidth = labelDateSize.width;
+            }
+            tooltipBgHeight += labelDateSize.height;
+            tooltipLabelDate.attr("x", xSpacing).attr("y", tooltipBgHeight);
+
+            // Value
+            let labelValueText = "value: ";
+            let valueType = d3.select(this).attr("valueType");
+            let strValue = d3.select(this).attr("value");
+            // strValue += y.toString();//debug
+            if (valueType === "Time") {
+                let dayStart = window.moment("00:00", "HH:mm", true);
+                let tickTime = dayStart.add(parseFloat(strValue), "seconds");
+                let dateValue = tickTime.format("HH:mm");
+                labelValueText += dateValue;
+                tooltipLabelValue.text(labelValueText);
+            } else {
+                labelValueText += strValue;
+                tooltipLabelValue.text(labelValueText);
+            }
+            let labelValueSize = helper.measureTextSize(
+                labelValueText,
+                "tracker-tooltip-label"
+            );
+            if (labelValueSize.width > tooltipBgWidth) {
+                tooltipBgWidth = labelValueSize.width;
+            }
+            tooltipBgHeight += ySpacing + labelValueSize.height;
+            tooltipLabelValue.attr("x", xSpacing).attr("y", tooltipBgHeight);
+
+            tooltipBgWidth += 2 * xSpacing;
+            tooltipBgHeight += 2 * ySpacing;
+            tooltipLabel
+                .attr("width", tooltipBgWidth)
+                .attr("height", tooltipBgHeight);
+
+            tooltipBg
+                .attr("width", tooltipBgWidth)
+                .attr("height", tooltipBgHeight)
+                .attr("class", "tracker-tooltip");
+
+            let tooltipPosX = x;
+            let tooltipPosY = y;
+            let tooltipXOffset = 12;
+            let tooltipYOffset = 12;
+            if (
+                x + tooltipXOffset + tooltipBgWidth >
+                renderInfo.dataAreaSize.width
+            ) {
+                // move tooltip to left
+                tooltipPosX = x - tooltipBgWidth - tooltipXOffset;
+            } else {
+                // default at the right side
+                tooltipPosX = x + tooltipXOffset;
+            }
+            if (y - tooltipYOffset - tooltipBgHeight < 0) {
+                // down side
+                tooltipPosY = y + tooltipYOffset;
+            } else {
+                // default move to up side
+                tooltipPosY = y - tooltipYOffset - tooltipBgHeight;
+            }
+            tooltip.attr("x", tooltipPosX).attr("y", tooltipPosY);
+            tooltip.transition().duration(200).style("opacity", 1);
+        })
+        .on("mouseleave", function () {
+            tooltip.transition().duration(500).style("opacity", 0);
+        });
+}
+
 function renderBar(
     chartElements: ChartElements,
     renderInfo: RenderInfo,

From cf7b8afb85eb103d4250365d27b62df864031a84 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 27 Aug 2021 23:26:27 +0800
Subject: [PATCH 233/402] Update documents

---
 README.md            | 3 ++-
 docs/ReleaseNotes.md | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index efc9dae..a9c6b74 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,8 @@ Version 1.10.2
 - Fixed plugin not rendering on some macOS machines
 
 Version 1.10.3
-- Allow using a parameter `fitPanelWidth` with the output type `month` and `pie`
+- Allow using the parameter `fitPanelWidth` with the output type `month` and `pie`
+- Fixed the resizing and positioning of the chart tooltip
 
 ## !!! Breaking Changes !!!
 
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index 9561271..814a40a 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,7 +1,8 @@
 # Release Notes
 
 ## v1.10.3
-- Allow using a parameter `fitPanelWidth` with the output type `month` and `pie`
+- Allow using the parameter `fitPanelWidth` with the output type `month` and `pie`
+- Fixed the resizing and positioning of the chart tooltip
 
 ## v1.10.2
 - Fixed plugin not rendering on some macOS machines

From 437a856f1626a4c3723898360ac48b0a4ce0027a Mon Sep 17 00:00:00 2001
From: cgourlay <cgourlay@users.noreply.github.com>
Date: Sun, 29 Aug 2021 19:51:13 +0100
Subject: [PATCH 234/402] Fix typo in the description

---
 src/settings.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/settings.ts b/src/settings.ts
index 81375be..75ed0a1 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -27,7 +27,7 @@ export class TrackerSettingTab extends PluginSettingTab {
         new Setting(containerEl)
             .setName("Default folder location")
             .setDesc(
-                "Files in this folder will be parsed and used as input data of the tracker plugin.\nYou can also override it using 'folder' argument int the tracker codeblock."
+                "Files in this folder will be parsed and used as input data of the tracker plugin.\nYou can also override it using 'folder' argument in the tracker codeblock."
             )
             .addText((text) =>
                 text

From 6768547ab08aca4eb158163e7a655417744a91f6 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 30 Aug 2021 11:35:02 +0800
Subject: [PATCH 235/402] Allow using regex in textValueMap

---
 src/helper.ts | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/helper.ts b/src/helper.ts
index cc74735..a0649e9 100644
--- a/src/helper.ts
+++ b/src/helper.ts
@@ -337,6 +337,9 @@ export function parseFloatFromAny(
     toParse: any,
     textValueMap: TextValueMap = null
 ) {
+    // console.log("parseFloatFromAny");
+    // console.log(toParse);
+
     let value = null;
     let valueType = ValueType.Number;
     if (typeof toParse === "string") {
@@ -363,17 +366,25 @@ export function parseFloatFromAny(
                 let anyMatch = false;
                 const keys = Object.keys(textValueMap) as Array<keyof string>;
                 for (let key of keys) {
-                    if (toParse === key) {
-                        value = textValueMap[key];
-                        anyMatch = true;
-                        break;
+                    if (typeof key === "string") {
+                        let regex = new RegExp(key, "gm");
+                        // console.log(toParse);
+                        if (
+                            regex.test(toParse) &&
+                            Number.isNumber(textValueMap[key])
+                        ) {
+                            let strReplacedValue = textValueMap[key].toString();
+                            toParse = toParse.replace(regex, strReplacedValue);
+                            // console.log(toParse);
+                            anyMatch = true;
+                            break;
+                        }
                     }
                 }
-                if (!anyMatch) {
-                    value = parseFloat(toParse);
-                    if (Number.isNaN(value)) {
-                        value = null;
-                    }
+
+                value = parseFloat(toParse);
+                if (Number.isNaN(value)) {
+                    value = null;
                 }
             } else {
                 value = parseFloat(toParse);

From 74ce3dd0ddd32e99c70f24a523bb61207aefb7bf Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 30 Aug 2021 12:11:25 +0800
Subject: [PATCH 236/402] Set version to 1.10.4

---
 manifest.json | 2 +-
 package.json  | 2 +-
 versions.json | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index 3d603d2..e285058 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-tracker",
 	"name": "Tracker",
-	"version": "1.10.3",
+	"version": "1.10.4",
 	"minAppVersion": "0.9.12",
 	"description": "A plugin tracks occurrences and numbers in your notes",
 	"author": "pyrochlore",
diff --git a/package.json b/package.json
index 7f3e322..ae68025 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.10.3",
+  "version": "1.10.4",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
diff --git a/versions.json b/versions.json
index 9a9c9f3..c0d572d 100644
--- a/versions.json
+++ b/versions.json
@@ -22,5 +22,6 @@
 	"1.10.0": "0.9.12",
 	"1.10.1": "0.9.12",
 	"1.10.2": "0.9.12",
-	"1.10.3": "0.9.12"
+	"1.10.3": "0.9.12",
+	"1.10.4": "0.9.12"
 }

From 18a6181d5a15c76739387501de2f6b6590b00936 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Mon, 30 Aug 2021 12:22:56 +0800
Subject: [PATCH 237/402] Correct an example for the right error message

---
 examples/ErrorMessages.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/examples/ErrorMessages.md b/examples/ErrorMessages.md
index fdf61ba..1274219 100644
--- a/examples/ErrorMessages.md
+++ b/examples/ErrorMessages.md
@@ -212,6 +212,7 @@ Invalid data range (data only contains 1 and null)
 ``` tracker
 searchType: tag
 searchTarget: meditation
+folder: diary
 summary:
     template: '{{sum(normalize(dataset(0)))}}'
 ```

From bdd9017727311507f5d3984de0d5f9487ab14e10 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 31 Aug 2021 19:39:42 +0800
Subject: [PATCH 238/402] Update documents

---
 README.md            | 4 ++++
 docs/ReleaseNotes.md | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/README.md b/README.md
index a9c6b74..34926a7 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,10 @@ Version 1.10.3
 - Allow using the parameter `fitPanelWidth` with the output type `month` and `pie`
 - Fixed the resizing and positioning of the chart tooltip
 
+Version 1.10.4
+- Allow using a regular expression as a key of the parameter `textValueMap`
+- Fixed typo in plugin settings
+
 ## !!! Breaking Changes !!!
 
 From version 1.9.0, template variables, e.g. '{{sum}}', are deprecated. Instead, Tracker provide operators (+, -, *, /, %) and functions (dataset(), sum(), maxStreak(), ......etc) to help us do data processing. For users having code blocks from previous version, please replace '{{sum}}' by '{{sum()}}' or '{{sum(1)}}' by '{{sum(dataset(1))}}'. More information about the new expressions could be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Expressions.md).
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index 814a40a..cdcbc57 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,5 +1,9 @@
 # Release Notes
 
+## v1.10.4
+- Allow using a regular expression as a key of the parameter `textValueMap`
+- Fixed typo in plugin settings
+
 ## v1.10.3
 - Allow using the parameter `fitPanelWidth` with the output type `month` and `pie`
 - Fixed the resizing and positioning of the chart tooltip

From 564196ae4ecbbcb67afcffd79ee6cf336e1a6c9d Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 7 Sep 2021 22:18:19 +0800
Subject: [PATCH 239/402] Fix using time values in a table

---
 src/main.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main.ts b/src/main.ts
index 699b33c..5a392bb 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -15,6 +15,7 @@ import {
     DataMap,
     CustomDatasetInfo,
     CollectingProcessInfo,
+    ValueType,
 } from "./data";
 import * as collecting from "./collecting";
 import {
@@ -937,6 +938,9 @@ export default class Tracker extends Plugin {
                             );
                             // console.log(retParse);
                             if (retParse.value !== null) {
+                                if (retParse.type === ValueType.Time) {
+                                    yDatasetQuery.valueType = ValueType.Time;
+                                }
                                 let value = retParse.value;
                                 if (
                                     indLine < xValues.length &&
@@ -968,6 +972,9 @@ export default class Tracker extends Plugin {
                             );
                             // console.log(retParse);
                             if (retParse.value !== null) {
+                                if (retParse.type === ValueType.Time) {
+                                    yDatasetQuery.valueType = ValueType.Time;
+                                }
                                 value = retParse.value;
                                 if (
                                     indLine < xValues.length &&

From 3f3b554fb93fbdce2f9dbee369c4173c77e4d19b Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 10 Sep 2021 11:49:29 +0800
Subject: [PATCH 240/402] Add parameter shiftOnlyValueLargerThan

---
 src/data.ts      | 23 ++++++++++++++++++-----
 src/parsing.ts   | 16 ++++++++++++++++
 src/rendering.ts |  8 ++++++--
 3 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/src/data.ts b/src/data.ts
index 66fb19c..46fa250 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -68,7 +68,7 @@ export class Query {
     constructor(id: number, searchType: SearchType, searchTarget: string) {
         this.type = searchType;
         this.target = searchTarget;
-        this.separator = "";// separator to separate multiple values
+        this.separator = ""; // separator to separate multiple values
         this.id = id;
         this.accessor = -1;
         this.accessor1 = -1;
@@ -336,14 +336,25 @@ export class Dataset implements IterableIterator<DataPoint> {
         return this.endDate;
     }
 
-    public shift(shiftAmount: number) {
+    public shift(shiftAmount: number, doLargerthan: number) {
+        let anyShifted = false;
         for (let ind = 0; ind < this.values.length; ind++) {
             if (this.values[ind] !== null) {
-                this.values[ind] = this.values[ind] + shiftAmount;
+                if (doLargerthan === null) {
+                    this.values[ind] = this.values[ind] + shiftAmount;
+                    anyShifted = true;
+                } else {
+                    if (this.values[ind] >= doLargerthan) {
+                        this.values[ind] = this.values[ind] + shiftAmount;
+                        anyShifted = true;
+                    }
+                }
             }
         }
-        this.yMin = this.yMin + shiftAmount;
-        this.yMax = this.yMax + shiftAmount;
+        if (anyShifted) {
+            this.yMin = this.yMin + shiftAmount;
+            this.yMax = this.yMax + shiftAmount;
+        }
     }
 
     public setPenalty(penalty: number) {
@@ -562,6 +573,7 @@ export class RenderInfo {
     accum: boolean[];
     penalty: number[];
     valueShift: number[];
+    shiftOnlyValueLargerThan: number[];
     valueType: string[]; // number/float, int, string, boolean, date, time, datetime
     textValueMap: TextValueMap;
 
@@ -603,6 +615,7 @@ export class RenderInfo {
         this.accum = []; // false, accum values start from zero over days
         this.penalty = []; // null, use this value instead of null value
         this.valueShift = [];
+        this.shiftOnlyValueLargerThan = [];
         this.valueType = [];
         this.textValueMap = {};
 
diff --git a/src/parsing.ts b/src/parsing.ts
index 40926b5..0ffa668 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -229,6 +229,8 @@ function getNumberArrayFromInput(
     defaultValue: number,
     allowNoValidValue: boolean
 ): Array<number> | string {
+    console.log("getNumberArrayFromInput");
+
     let array: Array<number> = [];
     let errorMessage = "";
     let numValidValue = 0;
@@ -1463,6 +1465,20 @@ export function getRenderInfoFromYaml(
     renderInfo.valueShift = retValueShift;
     // console.log(renderInfo.valueShift);
 
+    // shiftOnlyValueLargerThan
+    let retShiftOnlyValueLargerThan = getNumberArrayFromInput(
+        "shiftOnlyValueLargerThan",
+        yaml.shiftOnlyValueLargerThan,
+        numDatasets,
+        null,
+        true
+    );
+    if (typeof retShiftOnlyValueLargerThan === "string") {
+        return retShiftOnlyValueLargerThan;
+    }
+    renderInfo.shiftOnlyValueLargerThan = retShiftOnlyValueLargerThan;
+    // console.log(renderInfo.shiftOnlyValueLargerThan);
+
     // textValueMap
     if (typeof yaml.textValueMap !== "undefined") {
         let keys = getAvailableKeysOfClass(yaml.textValueMap);
diff --git a/src/rendering.ts b/src/rendering.ts
index 4db7156..543bcaa 100644
--- a/src/rendering.ts
+++ b/src/rendering.ts
@@ -223,8 +223,12 @@ export function render(canvas: HTMLElement, renderInfo: RenderInfo) {
     for (let dataset of renderInfo.datasets) {
         if (dataset.getQuery().usedAsXDataset) continue;
         // valueShift
-        if (renderInfo.valueShift[dataset.getId()] !== null) {
-            dataset.shift(renderInfo.valueShift[dataset.getId()]);
+        let shiftAmount = renderInfo.valueShift[dataset.getId()];
+        if (shiftAmount !== null && shiftAmount !== 0) {
+            dataset.shift(
+                shiftAmount,
+                renderInfo.shiftOnlyValueLargerThan[dataset.getId()]
+            );
         }
         // penalty
         if (renderInfo.penalty[dataset.getId()] !== null) {

From 58eb41c2ea537a6a5c4a1fed0a0fcae5e9cc6812 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 10 Sep 2021 13:20:52 +0800
Subject: [PATCH 241/402] Fix measuring maxTickLabelWidth in a Y axis

---
 src/parsing.ts   |  2 +-
 src/rendering.ts | 33 ++++++++++++++-------------------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/parsing.ts b/src/parsing.ts
index 0ffa668..72272a0 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -229,7 +229,7 @@ function getNumberArrayFromInput(
     defaultValue: number,
     allowNoValidValue: boolean
 ): Array<number> | string {
-    console.log("getNumberArrayFromInput");
+    // console.log("getNumberArrayFromInput");
 
     let array: Array<number> = [];
     let errorMessage = "";
diff --git a/src/rendering.ts b/src/rendering.ts
index 543bcaa..65e80a2 100644
--- a/src/rendering.ts
+++ b/src/rendering.ts
@@ -605,25 +605,20 @@ function renderYAxis(
     }
 
     // Get max tick label width
-    let yTickLabelFormat = getYTickLabelFormat(
-        yLower,
-        yUpper,
-        yAxisTickLabelFormat,
-        valueIsTime
-    );
-
-    let yLowerLabelSize = helper.measureTextSize(
-        yTickLabelFormat(yLower),
-        "tracker-axis-label"
-    );
-    let yUpperLabelSize = helper.measureTextSize(
-        yTickLabelFormat(yUpper),
-        "tracker-axis-label"
-    );
-    let maxTickLabelWidth = Math.max(
-        yLowerLabelSize.width,
-        yUpperLabelSize.width
-    );
+    let maxTickLabelWidth = 0;
+    for (let label of yAxisTickLabels) {
+        // console.log(label.textContent);
+        if (label.textContent) {
+            let labelSize = helper.measureTextSize(
+                label.textContent,
+                "tracker-axis-label"
+            );
+            if (labelSize.width > maxTickLabelWidth) {
+                maxTickLabelWidth = labelSize.width;
+            }
+        }
+    }
+    // console.log(maxTickLabelWidth);
 
     if (yAxisUnitText !== "") {
         yAxisLabelText += " (" + yAxisUnitText + ")";

From d3f3190e581e3fd99a4a696a40e2765f65133e12 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 11 Sep 2021 17:03:30 +0800
Subject: [PATCH 242/402] Fix the position of elements in the legend

---
 src/rendering.ts | 120 +++++++++++++++++++++--------------------------
 1 file changed, 53 insertions(+), 67 deletions(-)

diff --git a/src/rendering.ts b/src/rendering.ts
index 65e80a2..bdfed31 100644
--- a/src/rendering.ts
+++ b/src/rendering.ts
@@ -1256,8 +1256,6 @@ function renderLegend(
             });
         }
     } else if (chartInfo.legendOrientation === "horizontal") {
-        let currRenderPosX = 0.0;
-        let currRenderPosX2 = 0.0;
         if (chartInfo.GetGraphType() === GraphType.Line) {
             // lines
             legend
@@ -1266,36 +1264,30 @@ function renderLegend(
                 .enter()
                 .append("line")
                 .attr("x1", function (name: string, i: number) {
-                    let numElemsExcluded = xDatasetIds.filter((id) => {
-                        return id < i;
-                    }).length;
-                    i = i - numElemsExcluded;
-                    if (i === 0) {
-                        currRenderPosX = firstMarkerX;
-                    } else {
-                        currRenderPosX +=
-                            nameSizes[i].width +
-                            xSpacing +
-                            markerWidth +
-                            xSpacing;
+                    let posX = xSpacing;
+                    for (let [ind, size] of nameSizes.entries()) {
+                        if (xDatasetIds.includes(i)) continue;
+                        if (ind < i) {
+                            posX +=
+                                markerWidth + xSpacing + size.width + xSpacing;
+                        } else {
+                            break;
+                        }
                     }
-                    return currRenderPosX;
+                    return posX;
                 })
                 .attr("x2", function (name: string, i: number) {
-                    let numElemsExcluded = xDatasetIds.filter((id) => {
-                        return id < i;
-                    }).length;
-                    i = i - numElemsExcluded;
-                    if (i === 0) {
-                        currRenderPosX2 = firstMarkerX + markerWidth;
-                    } else {
-                        currRenderPosX2 +=
-                            nameSizes[i].width +
-                            xSpacing +
-                            markerWidth +
-                            xSpacing;
+                    let posX = xSpacing + markerWidth;
+                    for (let [ind, size] of nameSizes.entries()) {
+                        if (xDatasetIds.includes(i)) continue;
+                        if (ind < i) {
+                            posX +=
+                                xSpacing + size.width + xSpacing + markerWidth;
+                        } else {
+                            break;
+                        }
                     }
-                    return currRenderPosX2;
+                    return posX;
                 })
                 .attr("y1", firstMarkerY)
                 .attr("y2", firstMarkerY)
@@ -1305,27 +1297,27 @@ function renderLegend(
                 });
 
             // points
-            currRenderPosX = 0.0;
             legend
                 .selectAll("markers")
                 .data(names)
                 .enter()
                 .append("circle")
                 .attr("cx", function (name: string, i: number) {
-                    let numElemsExcluded = xDatasetIds.filter((id) => {
-                        return id < i;
-                    }).length;
-                    i = i - numElemsExcluded;
-                    if (i === 0) {
-                        currRenderPosX = firstMarkerX + markerWidth / 2.0;
-                    } else {
-                        currRenderPosX +=
-                            nameSizes[i].width +
-                            xSpacing +
-                            markerWidth +
-                            xSpacing;
+                    let posX = xSpacing + markerWidth / 2.0;
+                    for (let [ind, size] of nameSizes.entries()) {
+                        if (xDatasetIds.includes(i)) continue;
+                        if (ind < i) {
+                            posX +=
+                                markerWidth / 2.0 +
+                                xSpacing +
+                                size.width +
+                                xSpacing +
+                                markerWidth / 2.0;
+                        } else {
+                            break;
+                        }
                     }
-                    return currRenderPosX;
+                    return posX;
                 })
                 .attr("cy", firstMarkerY)
                 .attr("r", function (name: string, i: number) {
@@ -1341,7 +1333,6 @@ function renderLegend(
                 });
         } else if (chartInfo.GetGraphType() === GraphType.Bar) {
             // bars
-            currRenderPosX = 0.0;
             legend
                 .selectAll("markers")
                 .data(
@@ -1352,20 +1343,17 @@ function renderLegend(
                 .enter()
                 .append("rect")
                 .attr("x", function (name: string, i: number) {
-                    let numElemsExcluded = xDatasetIds.filter((id) => {
-                        return id < i;
-                    }).length;
-                    i = i - numElemsExcluded;
-                    if (i === 0) {
-                        currRenderPosX = firstMarkerX;
-                    } else {
-                        currRenderPosX +=
-                            nameSizes[i].width +
-                            xSpacing +
-                            markerWidth +
-                            xSpacing;
+                    let posX = xSpacing;
+                    for (let [ind, size] of nameSizes.entries()) {
+                        if (xDatasetIds.includes(i)) continue;
+                        if (ind < i) {
+                            posX +=
+                                markerWidth + xSpacing + size.width + xSpacing;
+                        } else {
+                            break;
+                        }
                     }
-                    return currRenderPosX;
+                    return posX;
                 })
                 .attr("y", firstMarkerY - nameHeight / 2.0)
                 .attr("width", markerWidth)
@@ -1377,24 +1365,22 @@ function renderLegend(
         }
 
         // names
-        currRenderPosX = 0.0;
         let nameLabels = legend
             .selectAll("labels")
             .data(names)
             .enter()
             .append("text")
             .attr("x", function (name: string, i: number) {
-                let numElemsExcluded = xDatasetIds.filter((id) => {
-                    return id < i;
-                }).length;
-                i = i - numElemsExcluded;
-                if (i === 0) {
-                    currRenderPosX = firstLabelX;
-                } else {
-                    currRenderPosX +=
-                        nameSizes[i].width + xSpacing + markerWidth + xSpacing;
+                let posX = xSpacing + markerWidth + xSpacing;
+                for (let [ind, size] of nameSizes.entries()) {
+                    if (xDatasetIds.includes(i)) continue;
+                    if (ind < i) {
+                        posX += size.width + xSpacing + markerWidth + xSpacing;
+                    } else {
+                        break;
+                    }
                 }
-                return currRenderPosX;
+                return posX;
             })
             .attr("y", firstLabelY)
             .text(function (name: string, i: number) {

From ad25bf20b63954f4b1a75272f5754d6100c7a046 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 11 Sep 2021 17:09:22 +0800
Subject: [PATCH 243/402] Fix the position of elements in the legend for custom
 xDataset

---
 src/rendering.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/rendering.ts b/src/rendering.ts
index bdfed31..2d62188 100644
--- a/src/rendering.ts
+++ b/src/rendering.ts
@@ -1266,7 +1266,7 @@ function renderLegend(
                 .attr("x1", function (name: string, i: number) {
                     let posX = xSpacing;
                     for (let [ind, size] of nameSizes.entries()) {
-                        if (xDatasetIds.includes(i)) continue;
+                        if (xDatasetIds.includes(ind)) continue;
                         if (ind < i) {
                             posX +=
                                 markerWidth + xSpacing + size.width + xSpacing;
@@ -1279,7 +1279,7 @@ function renderLegend(
                 .attr("x2", function (name: string, i: number) {
                     let posX = xSpacing + markerWidth;
                     for (let [ind, size] of nameSizes.entries()) {
-                        if (xDatasetIds.includes(i)) continue;
+                        if (xDatasetIds.includes(ind)) continue;
                         if (ind < i) {
                             posX +=
                                 xSpacing + size.width + xSpacing + markerWidth;
@@ -1305,7 +1305,7 @@ function renderLegend(
                 .attr("cx", function (name: string, i: number) {
                     let posX = xSpacing + markerWidth / 2.0;
                     for (let [ind, size] of nameSizes.entries()) {
-                        if (xDatasetIds.includes(i)) continue;
+                        if (xDatasetIds.includes(ind)) continue;
                         if (ind < i) {
                             posX +=
                                 markerWidth / 2.0 +
@@ -1345,7 +1345,7 @@ function renderLegend(
                 .attr("x", function (name: string, i: number) {
                     let posX = xSpacing;
                     for (let [ind, size] of nameSizes.entries()) {
-                        if (xDatasetIds.includes(i)) continue;
+                        if (xDatasetIds.includes(ind)) continue;
                         if (ind < i) {
                             posX +=
                                 markerWidth + xSpacing + size.width + xSpacing;
@@ -1373,7 +1373,7 @@ function renderLegend(
             .attr("x", function (name: string, i: number) {
                 let posX = xSpacing + markerWidth + xSpacing;
                 for (let [ind, size] of nameSizes.entries()) {
-                    if (xDatasetIds.includes(i)) continue;
+                    if (xDatasetIds.includes(ind)) continue;
                     if (ind < i) {
                         posX += size.width + xSpacing + markerWidth + xSpacing;
                     } else {

From 66dc3984918f6a81c5022adce6ba082e2e942d0e Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 11 Sep 2021 17:37:19 +0800
Subject: [PATCH 244/402] Update documents

---
 README.md               | 3 +++
 docs/InputParameters.md | 1 +
 docs/ReleaseNotes.md    | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/README.md b/README.md
index 34926a7..2945379 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,9 @@ Version 1.10.3
 
 Version 1.10.4
 - Allow using a regular expression as a key of the parameter `textValueMap`
+- Allow using a relative date value in `initMonth` in the month view
+- Add a parameter `shiftOnlyValueLargerThan` to determine when to do `valueShift`
+- Fixed bugs reported by users
 - Fixed typo in plugin settings
 
 ## !!! Breaking Changes !!!
diff --git a/docs/InputParameters.md b/docs/InputParameters.md
index cddcc93..5a35949 100644
--- a/docs/InputParameters.md
+++ b/docs/InputParameters.md
@@ -39,6 +39,7 @@ These key-value pairs are placed under the root of the code block.
 | `accum` | Accumulatively sum the values over time (true\|false) | 1~NT | false |
 | `penalty` | Value to use if the search target is missing on the day | 1~NT | |
 | `valueShift` | Amount to shift for each collected value | 1~NT | 0 |
+| `shiftOnlyValueLargerThan` | Do `valueShift` only if the value is larger then the specifed one | 1~NT | null |
 | `valueType` | Not implemented yet | 1~NT | |
 | `textValueMap` | A container key for multiple text-value mapping | | |
 | `fixedScale` | Uniform scaling factor to the graph dimensions | 1 | 1.0 |
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index cdcbc57..5c6bc26 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -2,6 +2,9 @@
 
 ## v1.10.4
 - Allow using a regular expression as a key of the parameter `textValueMap`
+- Allow using a relative date value in `initMonth` in the month view
+- Add a parameter `shiftOnlyValueLargerThan` to determine when to do `valueShift`
+- Fixed bugs reported by users
 - Fixed typo in plugin settings
 
 ## v1.10.3

From d0c2f2644be21c7b8669cc30924e4e352ddd7e16 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 11 Sep 2021 18:48:13 +0800
Subject: [PATCH 245/402] Set version to 1.10.5

---
 manifest.json | 2 +-
 package.json  | 2 +-
 versions.json | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index e285058..6c2a71c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-tracker",
 	"name": "Tracker",
-	"version": "1.10.4",
+	"version": "1.10.5",
 	"minAppVersion": "0.9.12",
 	"description": "A plugin tracks occurrences and numbers in your notes",
 	"author": "pyrochlore",
diff --git a/package.json b/package.json
index ae68025..4faef08 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.10.4",
+  "version": "1.10.5",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
diff --git a/versions.json b/versions.json
index c0d572d..d3efe8e 100644
--- a/versions.json
+++ b/versions.json
@@ -23,5 +23,6 @@
 	"1.10.1": "0.9.12",
 	"1.10.2": "0.9.12",
 	"1.10.3": "0.9.12",
-	"1.10.4": "0.9.12"
+	"1.10.4": "0.9.12",
+	"1.10.5": "0.9.12"
 }

From 9baee06e1c9276e254251e510dca6adaa53c5aa6 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 11 Sep 2021 18:51:39 +0800
Subject: [PATCH 246/402] Allow using a relative date value in initMonth in
 month view

---
 src/month.ts | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/month.ts b/src/month.ts
index 9b5a09d..b2285ad 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -1139,15 +1139,20 @@ export function renderMonth(
 
     let monthDate: Moment = null;
     if (monthInfo.initMonth) {
-        let initMonth = window.moment(monthInfo.initMonth, "YYYY-MM", true);
-        // console.log(initMonth);
-        if (initMonth.isValid()) {
-            monthDate = initMonth;
-        } else {
-            return "Invalid initMonth";
+        monthDate = helper.getDateByDurationToToday(
+            monthInfo.initMonth,
+            renderInfo.dateFormat
+        );
+        if (!monthDate) {
+            let initMonth = window.moment(monthInfo.initMonth, "YYYY-MM", true);
+            // console.log(initMonth);
+            if (initMonth.isValid()) {
+                monthDate = initMonth;
+            } else {
+                return "Invalid initMonth";
+            }
         }
     } else {
-        let today = window.moment();
         monthDate = renderInfo.datasets.getDates().last();
     }
     if (!monthDate) return;

From 0fa726e8232e84d0a9ee71c3c5d71abab497508d Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 11 Sep 2021 18:52:22 +0800
Subject: [PATCH 247/402] Update documents and examples

---
 README.md                |  4 +++-
 docs/ReleaseNotes.md     |  4 +++-
 examples/TestCalendar.md | 40 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2945379..cb84b02 100644
--- a/README.md
+++ b/README.md
@@ -31,11 +31,13 @@ Version 1.10.3
 
 Version 1.10.4
 - Allow using a regular expression as a key of the parameter `textValueMap`
-- Allow using a relative date value in `initMonth` in the month view
 - Add a parameter `shiftOnlyValueLargerThan` to determine when to do `valueShift`
 - Fixed bugs reported by users
 - Fixed typo in plugin settings
 
+Version 1.10.5
+- Allow using a relative date value in `initMonth` in the month view
+
 ## !!! Breaking Changes !!!
 
 From version 1.9.0, template variables, e.g. '{{sum}}', are deprecated. Instead, Tracker provide operators (+, -, *, /, %) and functions (dataset(), sum(), maxStreak(), ......etc) to help us do data processing. For users having code blocks from previous version, please replace '{{sum}}' by '{{sum()}}' or '{{sum(1)}}' by '{{sum(dataset(1))}}'. More information about the new expressions could be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Expressions.md).
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index 5c6bc26..c085aca 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,8 +1,10 @@
 # Release Notes
 
+## v1.10.5
+- Allow using a relative date value in `initMonth` in the month view
+
 ## v1.10.4
 - Allow using a regular expression as a key of the parameter `textValueMap`
-- Allow using a relative date value in `initMonth` in the month view
 - Add a parameter `shiftOnlyValueLargerThan` to determine when to do `valueShift`
 - Fixed bugs reported by users
 - Fixed typo in plugin settings
diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
index 893fa3a..df752f4 100644
--- a/examples/TestCalendar.md
+++ b/examples/TestCalendar.md
@@ -72,6 +72,46 @@ summary:
     template: "minDate: {{minDate()}}\nminValue: {{min()}}\nmaxDate: {{maxDate()}}\nmaxValue: {{max()}}"
 ```
 
+### initMonth
+
+Specify the initial month in YYYY-MM format
+``` tracker
+searchType: tag
+searchTarget: exercise-pushup
+datasetName: PushUp
+folder: diary
+month:
+    startWeekOn:
+    threshold: 40
+    color: green
+    headerMonthColor: orange
+    dimNotInMonth: false
+    todayRingColor: orange
+    selectedRingColor: steelblue
+    circleColorByValue: true
+    showSelectedValue: true
+	initMonth: 2021-09
+```
+
+Specify the initial month by relative date
+``` tracker
+searchType: tag
+searchTarget: exercise-pushup
+datasetName: PushUp
+folder: diary
+month:
+    startWeekOn:
+    threshold: 40
+    color: green
+    headerMonthColor: orange
+    dimNotInMonth: false
+    todayRingColor: orange
+    selectedRingColor: steelblue
+    circleColorByValue: true
+    showSelectedValue: true
+	initMonth: -1M
+```
+
 ## Multiple targets
 1. Use parameter `datasetName` to specify the name of each dataset
 2. Use parameter `dataset` to include dataset we are going to view

From 1f780200a8c5ee95b794f230ca8084830c9c872a Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 12 Sep 2021 10:27:56 +0800
Subject: [PATCH 248/402] Fix null scaledValue showing color in the month view

---
 src/month.ts | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/month.ts b/src/month.ts
index b2285ad..73af68d 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -602,8 +602,8 @@ function renderMonthDays(
             helper.dateToStr(curDate, renderInfo.dateFormat),
             renderInfo.dateFormat
         );
-        if (curDate.format("YYYY-MM-DD") === "2021-01-02") {
-            logToConsole = false; // Change this to do dubugging
+        if (curDate.format("YYYY-MM-DD") === "2021-09-13") {
+            logToConsole = true; // Change this to do dubugging
         }
 
         if (monthInfo.startWeekOn.toLowerCase() === "mon") {
@@ -640,7 +640,6 @@ function renderMonthDays(
         if (logToConsole) {
             console.log(dataset);
             console.log(helper.dateToStr(curDate, renderInfo.dateFormat));
-            console.log(dataset.getValue(window.moment("2021-01-02")));
             console.log(curValue);
         }
 
@@ -672,9 +671,11 @@ function renderMonthDays(
                 scaledValue = (curValue - yMin) / (yMax - yMin);
             }
         }
-        // console.log(yMin);
-        // console.log(yMax);
-        // console.log(scaledValue);
+        if (logToConsole) {
+            console.log(yMin);
+            console.log(yMax);
+            console.log(scaledValue);
+        }
 
         // streakIn and streakOut
         let nextValue = dataset.getValue(curDate, 1);
@@ -745,7 +746,7 @@ function renderMonthDays(
             logToConsole = false;
         }
     }
-    // console.log(daysInMonthView);
+    console.log(daysInMonthView);
     // console.log(daysInMonthView.filter(function (d: DayInfo) {
     //     return d.streakIn;
     // }));
@@ -803,7 +804,7 @@ function renderMonthDays(
                             streakColor
                         )(d.scaledValue * 0.8 + 0.2);
                     } else {
-                        return streakColor;
+                        return "none";
                     }
                 }
                 return "none";
@@ -850,7 +851,7 @@ function renderMonthDays(
                             streakColor
                         )(d.scaledValue * 0.8 + 0.2);
                     } else {
-                        return streakColor;
+                        return "none";
                     }
                 }
                 return "none";
@@ -900,7 +901,7 @@ function renderMonthDays(
                         // console.log(scaledColor);
                         return scaledColor;
                     } else {
-                        return circleColor;
+                        return "none";
                     }
                 }
                 return "none";

From 310bafc8bf65ad39155afa90644d1f07c0207136 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 12 Sep 2021 10:34:34 +0800
Subject: [PATCH 249/402] Disable logToConsole in month view

---
 src/month.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/month.ts b/src/month.ts
index 73af68d..d4eba3f 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -603,7 +603,7 @@ function renderMonthDays(
             renderInfo.dateFormat
         );
         if (curDate.format("YYYY-MM-DD") === "2021-09-13") {
-            logToConsole = true; // Change this to do dubugging
+            logToConsole = false; // Change this to do dubugging
         }
 
         if (monthInfo.startWeekOn.toLowerCase() === "mon") {
@@ -746,7 +746,7 @@ function renderMonthDays(
             logToConsole = false;
         }
     }
-    console.log(daysInMonthView);
+    // console.log(daysInMonthView);
     // console.log(daysInMonthView.filter(function (d: DayInfo) {
     //     return d.streakIn;
     // }));

From a26d84edd12dcbb5f46f6c52641e4ad6e8b28baa Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 12 Sep 2021 10:36:39 +0800
Subject: [PATCH 250/402] Set version to 1.10.6

---
 manifest.json | 2 +-
 package.json  | 2 +-
 versions.json | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index 6c2a71c..0e1e60c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-tracker",
 	"name": "Tracker",
-	"version": "1.10.5",
+	"version": "1.10.6",
 	"minAppVersion": "0.9.12",
 	"description": "A plugin tracks occurrences and numbers in your notes",
 	"author": "pyrochlore",
diff --git a/package.json b/package.json
index 4faef08..8d29e07 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.10.5",
+  "version": "1.10.6",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
diff --git a/versions.json b/versions.json
index d3efe8e..08d0e18 100644
--- a/versions.json
+++ b/versions.json
@@ -24,5 +24,6 @@
 	"1.10.2": "0.9.12",
 	"1.10.3": "0.9.12",
 	"1.10.4": "0.9.12",
-	"1.10.5": "0.9.12"
+	"1.10.5": "0.9.12",
+	"1.10.6": "0.9.12"
 }

From 06a8f0c55df8883ad3fffe40232ae526c3c91c05 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 12 Sep 2021 13:54:24 +0800
Subject: [PATCH 251/402] Update documents

---
 README.md            | 3 +++
 docs/ReleaseNotes.md | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/README.md b/README.md
index cb84b02..54267da 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,9 @@ Version 1.10.4
 Version 1.10.5
 - Allow using a relative date value in `initMonth` in the month view
 
+Version 1.10.6
+- Fix the coloring for missing data in the month view
+
 ## !!! Breaking Changes !!!
 
 From version 1.9.0, template variables, e.g. '{{sum}}', are deprecated. Instead, Tracker provide operators (+, -, *, /, %) and functions (dataset(), sum(), maxStreak(), ......etc) to help us do data processing. For users having code blocks from previous version, please replace '{{sum}}' by '{{sum()}}' or '{{sum(1)}}' by '{{sum(dataset(1))}}'. More information about the new expressions could be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Expressions.md).
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index c085aca..202dc37 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,5 +1,8 @@
 # Release Notes
 
+## v1.10.6
+- Fix the coloring for missing data in the month view
+
 ## v1.10.5
 - Allow using a relative date value in `initMonth` in the month view
 

From e69d751b7d449c3aa1cef5665af115340e376df8 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sun, 12 Sep 2021 19:07:48 +0800
Subject: [PATCH 252/402] Fix typo

---
 README.md            | 2 +-
 docs/ReleaseNotes.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 54267da..73cd1dd 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ Version 1.10.5
 - Allow using a relative date value in `initMonth` in the month view
 
 Version 1.10.6
-- Fix the coloring for missing data in the month view
+- Fixed the coloring for missing data in the month view
 
 ## !!! Breaking Changes !!!
 
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index 202dc37..f06ba35 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,7 +1,7 @@
 # Release Notes
 
 ## v1.10.6
-- Fix the coloring for missing data in the month view
+- Fixed the coloring for missing data in the month view
 
 ## v1.10.5
 - Allow using a relative date value in `initMonth` in the month view

From 3810a63ce71502173389ecfc6438f0977b03a25a Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 16 Sep 2021 10:46:38 +0800
Subject: [PATCH 253/402] Replace emoji img tag by emoji

---
 src/helper.ts  | 19 +++++++++++++++++++
 src/parsing.ts | 11 +++++++++++
 2 files changed, 30 insertions(+)

diff --git a/src/helper.ts b/src/helper.ts
index a0649e9..aad7c85 100644
--- a/src/helper.ts
+++ b/src/helper.ts
@@ -332,6 +332,25 @@ export function trimByChar(str: string, char: string) {
         : str.substring(first, str.length - last);
 }
 
+export function replaceEmojiImgTagByEmoji(input: string) {
+    if (input === null) return null;
+
+    // <img[^>]*?alt\s*=\s*[""']?(?<emoji>[^'"" >]+?)[ '""][^>]*?>
+    let strRegex =
+        '<img[^>]*?alt\\s*=\\s*[""\']?(?<emoji>[^\'"" >]+?)[ \'""][^>]*?>';
+    // console.log(strRegex);
+    let regex = new RegExp(strRegex, "g");
+
+    let output = input.replace(regex, (...args) => {
+        let groups = args[args.length - 1];
+        if (groups && groups.emoji) {
+            return groups.emoji.trim();
+        }
+        return "";
+    });
+
+    return output;
+}
 // Parsing
 export function parseFloatFromAny(
     toParse: any,
diff --git a/src/parsing.ts b/src/parsing.ts
index 72272a0..16ba62e 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -543,6 +543,10 @@ function getStringArrayFromInput(
         return errorMessage;
     }
 
+    for (let ind = 0; ind < array.length; ind++) {
+        array[ind] = helper.replaceEmojiImgTagByEmoji(array[ind]);
+    }
+
     return array;
 }
 
@@ -631,6 +635,10 @@ function getStringArray(name: string, input: any): Array<string> | string {
         return errorMessage;
     }
 
+    for (let ind = 0; ind < strArray.length; ind++) {
+        strArray[ind] = helper.replaceEmojiImgTagByEmoji(strArray[ind]);
+    }
+
     return strArray;
 }
 
@@ -943,6 +951,9 @@ export function getRenderInfoFromYaml(
     } else {
         errorMessage = "Invalid search target (searchTarget)";
     }
+    for (let ind = 0; ind < searchTarget.length; ind++) {
+        searchTarget[ind] = helper.replaceEmojiImgTagByEmoji(searchTarget[ind]);
+    }
     // console.log(searchTarget);
 
     if (errorMessage !== "") {

From af0711a86508867dc9bbc5c66768f567848a0b12 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 16 Sep 2021 10:48:33 +0800
Subject: [PATCH 254/402] Set version to 1.10.7

---
 manifest.json | 2 +-
 package.json  | 2 +-
 versions.json | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index 0e1e60c..c298533 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-tracker",
 	"name": "Tracker",
-	"version": "1.10.6",
+	"version": "1.10.7",
 	"minAppVersion": "0.9.12",
 	"description": "A plugin tracks occurrences and numbers in your notes",
 	"author": "pyrochlore",
diff --git a/package.json b/package.json
index 8d29e07..42574b5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.10.6",
+  "version": "1.10.7",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
diff --git a/versions.json b/versions.json
index 08d0e18..c0ea03d 100644
--- a/versions.json
+++ b/versions.json
@@ -25,5 +25,6 @@
 	"1.10.3": "0.9.12",
 	"1.10.4": "0.9.12",
 	"1.10.5": "0.9.12",
-	"1.10.6": "0.9.12"
+	"1.10.6": "0.9.12",
+	"1.10.7": "0.9.12"
 }

From cd870af44bd59796f9fdd1bb9eb16add0fa80ca1 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Thu, 16 Sep 2021 11:11:17 +0800
Subject: [PATCH 255/402] Rename function replaceEmojiImgTagByEmoji to
 replaceImgTagByAlt

---
 src/helper.ts  | 2 +-
 src/parsing.ts | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/helper.ts b/src/helper.ts
index aad7c85..7523e62 100644
--- a/src/helper.ts
+++ b/src/helper.ts
@@ -332,7 +332,7 @@ export function trimByChar(str: string, char: string) {
         : str.substring(first, str.length - last);
 }
 
-export function replaceEmojiImgTagByEmoji(input: string) {
+export function replaceImgTagByAlt(input: string) {
     if (input === null) return null;
 
     // <img[^>]*?alt\s*=\s*[""']?(?<emoji>[^'"" >]+?)[ '""][^>]*?>
diff --git a/src/parsing.ts b/src/parsing.ts
index 16ba62e..38e46ca 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -544,7 +544,7 @@ function getStringArrayFromInput(
     }
 
     for (let ind = 0; ind < array.length; ind++) {
-        array[ind] = helper.replaceEmojiImgTagByEmoji(array[ind]);
+        array[ind] = helper.replaceImgTagByAlt(array[ind]);
     }
 
     return array;
@@ -636,7 +636,7 @@ function getStringArray(name: string, input: any): Array<string> | string {
     }
 
     for (let ind = 0; ind < strArray.length; ind++) {
-        strArray[ind] = helper.replaceEmojiImgTagByEmoji(strArray[ind]);
+        strArray[ind] = helper.replaceImgTagByAlt(strArray[ind]);
     }
 
     return strArray;
@@ -952,7 +952,7 @@ export function getRenderInfoFromYaml(
         errorMessage = "Invalid search target (searchTarget)";
     }
     for (let ind = 0; ind < searchTarget.length; ind++) {
-        searchTarget[ind] = helper.replaceEmojiImgTagByEmoji(searchTarget[ind]);
+        searchTarget[ind] = helper.replaceImgTagByAlt(searchTarget[ind]);
     }
     // console.log(searchTarget);
 

From 494a6cc58922a0686610178a5bd8f73a17695f9d Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 17 Sep 2021 21:36:40 +0800
Subject: [PATCH 256/402] Use function replaceImgTagByAlt on YAML single value
 fields

---
 src/parsing.ts | 273 ++++++++++++++++++++++++++-----------------------
 1 file changed, 143 insertions(+), 130 deletions(-)

diff --git a/src/parsing.ts b/src/parsing.ts
index 38e46ca..4f5037e 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -373,6 +373,15 @@ function getNumberArrayFromInput(
     return array;
 }
 
+function getStringFromInput(input: any, defaultValue: string): string {
+    if (typeof input === "string") {
+        return helper.replaceImgTagByAlt(input);
+    } else if (typeof input === "number") {
+        return input.toString();
+    }
+    return defaultValue;
+}
+
 function getStringArrayFromInput(
     name: string,
     input: any,
@@ -648,24 +657,25 @@ function parseCommonChartInfo(yaml: any, renderInfo: CommonChartInfo) {
     // single value, use default value if no value from YAML
     if (yaml) {
         // title
-        if (typeof yaml.title === "string") {
-            renderInfo.title = yaml.title;
-        }
+        renderInfo.title = getStringFromInput(yaml?.title, renderInfo.title);
 
         // xAxisLabel
-        if (typeof yaml.xAxisLabel === "string") {
-            renderInfo.xAxisLabel = yaml.xAxisLabel;
-        }
+        renderInfo.xAxisLabel = getStringFromInput(
+            yaml?.xAxisLabel,
+            renderInfo.xAxisLabel
+        );
 
         // xAxisColor
-        if (typeof yaml.xAxisColor === "string") {
-            renderInfo.xAxisColor = yaml.xAxisColor;
-        }
+        renderInfo.xAxisColor = getStringFromInput(
+            yaml?.xAxisColor,
+            renderInfo.xAxisColor
+        );
 
         // xAxisLabelColor
-        if (typeof yaml.xAxisLabelColor === "string") {
-            renderInfo.xAxisLabelColor = yaml.xAxisLabelColor;
-        }
+        renderInfo.xAxisLabelColor = getStringFromInput(
+            yaml?.xAxisLabelColor,
+            renderInfo.xAxisLabelColor
+        );
 
         // allowInspectData
         if (typeof yaml.allowInspectData === "boolean") {
@@ -706,14 +716,16 @@ function parseCommonChartInfo(yaml: any, renderInfo: CommonChartInfo) {
         // console.log(renderInfo.legendOrientation);
 
         // legendBgColor
-        if (typeof yaml.legendBgColor === "string") {
-            renderInfo.legendBgColor = yaml.legendBgColor;
-        }
+        renderInfo.legendBgColor = getStringFromInput(
+            yaml?.legendBgColor,
+            renderInfo.legendBgColor
+        );
 
         // legendBorderColor
-        if (typeof yaml.legendBorderColor === "string") {
-            renderInfo.legendBorderColor = yaml.legendBorderColor;
-        }
+        renderInfo.legendBorderColor = getStringFromInput(
+            yaml?.legendBorderColor,
+            renderInfo.legendBorderColor
+        );
     }
 
     // yAxisLabel
@@ -789,11 +801,10 @@ function parseCommonChartInfo(yaml: any, renderInfo: CommonChartInfo) {
     // console.log(renderInfo.yAxisUnit);
 
     // xAxisTickInterval
-    if (typeof yaml?.xAxisTickInterval === "string") {
-        renderInfo.xAxisTickInterval = yaml.xAxisTickInterval;
-    } else if (typeof yaml?.xAxisTickInterval === "number") {
-        renderInfo.xAxisTickInterval = yaml.xAxisTickInterval.toString();
-    }
+    renderInfo.xAxisTickInterval = getStringFromInput(
+        yaml?.xAxisTickInterval,
+        renderInfo.xAxisTickInterval
+    );
     // console.log(renderInfo.xAxisTickInterval);
 
     // yAxisTickInterval
@@ -815,9 +826,10 @@ function parseCommonChartInfo(yaml: any, renderInfo: CommonChartInfo) {
     // console.log(renderInfo.yAxisTickInterval);
 
     // xAxisTickLabelFormat
-    if (typeof yaml?.xAxisTickLabelFormat === "string") {
-        renderInfo.xAxisTickLabelFormat = yaml.xAxisTickLabelFormat;
-    }
+    renderInfo.xAxisTickLabelFormat = getStringFromInput(
+        yaml?.xAxisTickLabelFormat,
+        renderInfo.xAxisTickLabelFormat
+    );
     // console.log(renderInfo.xAxisTickLabelFormat);
 
     // yAxisTickLabelFormat
@@ -1228,13 +1240,10 @@ export function getRenderInfoFromYaml(
     // console.log(renderInfo.fileContainsLinkedFiles);
 
     // fileMultiplierAfterLink
-    if (typeof yaml.fileMultiplierAfterLink === "string") {
-        renderInfo.fileMultiplierAfterLink = yaml.fileMultiplierAfterLink;
-    }
-    if (typeof yaml.fileMultiplierAfterLink === "number") {
-        renderInfo.fileMultiplierAfterLink =
-            yaml.fileMultiplierAfterLink.toString();
-    }
+    renderInfo.fileMultiplierAfterLink = getStringFromInput(
+        yaml?.fileMultiplierAfterLink,
+        renderInfo.fileMultiplierAfterLink
+    );
     // console.log(renderInfo.fileMultiplierAfterLink);
 
     // Date format
@@ -1253,14 +1262,16 @@ export function getRenderInfoFromYaml(
     // console.log("renderInfo dateFormat: " + renderInfo.dateFormat);
 
     // Date format prefix
-    if (typeof yaml.dateFormatPrefix === "string") {
-        renderInfo.dateFormatPrefix = yaml.dateFormatPrefix;
-    }
+    renderInfo.dateFormatPrefix = getStringFromInput(
+        yaml?.dateFormatPrefix,
+        renderInfo.dateFormatPrefix
+    );
 
     // Date fromat suffix
-    if (typeof yaml.dateFormatSuffix === "string") {
-        renderInfo.dateFormatSuffix = yaml.dateFormatSuffix;
-    }
+    renderInfo.dateFormatSuffix = getStringFromInput(
+        yaml?.dateFormatSuffix,
+        renderInfo.dateFormatSuffix
+    );
 
     // startDate, endDate
     // console.log("Parsing startDate");
@@ -1554,9 +1565,10 @@ export function getRenderInfoFromYaml(
         customDataset.id = customDatasetId;
 
         // name
-        if (typeof yamlCustomDataset?.name === "string") {
-            customDataset.name = yamlCustomDataset.name;
-        }
+        customDataset.name = getStringFromInput(
+            yamlCustomDataset?.name,
+            customDataset.name
+        );
 
         // xData
         let retXData = getStringArray("xData", yamlCustomDataset?.xData);
@@ -1825,9 +1837,7 @@ export function getRenderInfoFromYaml(
         }
 
         // title
-        if (typeof yamlPie?.title === "string") {
-            pie.title = yamlPie.title;
-        }
+        pie.title = getStringFromInput(yamlPie?.title, pie.title);
         // console.log(pie.title);
 
         // data
@@ -1923,42 +1933,41 @@ export function getRenderInfoFromYaml(
         }
 
         // legendPosition
-        if (typeof yamlPie?.legendPosition === "string") {
-            pie.legendPosition = yamlPie.legendPosition;
-        } else {
-            pie.legendPosition = "right";
-        }
+        pie.legendPosition = getStringFromInput(
+            yamlPie?.legendPosition,
+            "right"
+        );
 
         // legendOrient
-        if (typeof yamlPie?.legendOrientation === "string") {
-            pie.legendOrientation = yamlPie.legendOrientation;
+        let defaultLegendOrientation = "horizontal";
+        if (pie.legendPosition === "top" || pie.legendPosition === "bottom") {
+            defaultLegendOrientation = "horizontal";
+        } else if (
+            pie.legendPosition === "left" ||
+            pie.legendPosition === "right"
+        ) {
+            defaultLegendOrientation = "vertical";
         } else {
-            if (
-                pie.legendPosition === "top" ||
-                pie.legendPosition === "bottom"
-            ) {
-                pie.legendOrientation = "horizontal";
-            } else if (
-                pie.legendPosition === "left" ||
-                pie.legendPosition === "right"
-            ) {
-                pie.legendOrientation = "vertical";
-            } else {
-                pie.legendOrientation = "horizontal";
-            }
+            defaultLegendOrientation = "horizontal";
         }
+        pie.legendOrientation = getStringFromInput(
+            yamlPie?.legendOrientation,
+            defaultLegendOrientation
+        );
         // console.log(pie.legendPosition);
         // console.log(pie.legendOrientation);
 
         // legendBgColor
-        if (typeof yamlPie?.legendBgColor === "string") {
-            pie.legendBgColor = yamlPie.legendBgColor;
-        }
+        pie.legendBgColor = getStringFromInput(
+            yamlPie?.legendBgColor,
+            pie.legendBgColor
+        );
 
         // legendBorderColor
-        if (typeof yamlPie?.legendBorderColor === "string") {
-            pie.legendBorderColor = yamlPie.legendBorderColor;
-        }
+        pie.legendBorderColor = getStringFromInput(
+            yamlPie?.legendBorderColor,
+            pie.legendBorderColor
+        );
 
         renderInfo.pie.push(pie);
     } // pie related parameters
@@ -1981,12 +1990,13 @@ export function getRenderInfoFromYaml(
         }
 
         // template
-        if (typeof yamlSummary?.template === "string") {
-            summary.template = yamlSummary.template;
-        }
-        if (typeof yamlSummary?.style === "string") {
-            summary.style = yamlSummary.style;
-        }
+        summary.template = getStringFromInput(
+            yamlSummary?.template,
+            summary.template
+        );
+
+        // style
+        summary.style = getStringFromInput(yamlSummary?.style, summary.style);
 
         renderInfo.summary.push(summary);
     } // summary related parameters
@@ -2008,9 +2018,7 @@ export function getRenderInfoFromYaml(
         }
 
         // mode
-        if (typeof yamlMonth?.mode === "string") {
-            month.mode = yamlMonth.mode;
-        }
+        month.mode = getStringFromInput(yamlMonth?.mode, month.mode);
         // console.log(month.mode);
 
         // dataset
@@ -2029,9 +2037,10 @@ export function getRenderInfoFromYaml(
         let numDataset = month.dataset.length;
 
         // startWeekOn
-        if (typeof yamlMonth?.startWeekOn === "string") {
-            month.startWeekOn = yamlMonth.startWeekOn;
-        }
+        month.startWeekOn = getStringFromInput(
+            yamlMonth?.startWeekOn,
+            month.startWeekOn
+        );
         // console.log(month.startWeekOn);
 
         // showCircle
@@ -2097,9 +2106,7 @@ export function getRenderInfoFromYaml(
         // console.log(month.yMax);
 
         // color
-        if (typeof yamlMonth?.color === "string") {
-            month.color = yamlMonth.color;
-        }
+        month.color = getStringFromInput(yamlMonth?.color, month.color);
         // console.log(month.color);
 
         // dimNotInMonth
@@ -2133,9 +2140,10 @@ export function getRenderInfoFromYaml(
         // console.log(month.showSelectedRing);
 
         // circleColor
-        if (typeof yamlMonth?.circleColor === "string") {
-            month.circleColor = yamlMonth.circleColor;
-        }
+        month.circleColor = getStringFromInput(
+            yamlMonth?.circleColor,
+            month.circleColor
+        );
         // console.log(month.circleColor);
 
         // circleColorByValue
@@ -2145,39 +2153,45 @@ export function getRenderInfoFromYaml(
         // console.log(month.circleColorByValue);
 
         // headerYearColor
-        if (typeof yamlMonth?.headerYearColor === "string") {
-            month.headerYearColor = yamlMonth.headerYearColor;
-        }
+        month.headerYearColor = getStringFromInput(
+            yamlMonth?.headerYearColor,
+            month.headerYearColor
+        );
         // console.log(month.headerYearColor);
 
         // headerMonthColor
-        if (typeof yamlMonth?.headerMonthColor === "string") {
-            month.headerMonthColor = yamlMonth.headerMonthColor;
-        }
+        month.headerMonthColor = getStringFromInput(
+            yamlMonth?.headerMonthColor,
+            month.headerMonthColor
+        );
         // console.log(month.headerMonthColor);
 
         // dividingLineColor
-        if (typeof yamlMonth?.dividingLineColor === "string") {
-            month.dividingLineColor = yamlMonth.dividingLineColor;
-        }
+        month.dividingLineColor = getStringFromInput(
+            yamlMonth?.dividingLineColor,
+            month.dividingLineColor
+        );
         // console.log(month.dividingLineColor);
 
         // todayRingColor
-        if (typeof yamlMonth?.todayRingColor === "string") {
-            month.todayRingColor = yamlMonth.todayRingColor;
-        }
+        month.todayRingColor = getStringFromInput(
+            yamlMonth.todayRingColor,
+            month.todayRingColor
+        );
         // console.log(month.todayRingColor);
 
         // selectedRingColor
-        if (typeof yamlMonth?.selectedRingColor === "string") {
-            month.selectedRingColor = yamlMonth.selectedRingColor;
-        }
+        month.selectedRingColor = getStringFromInput(
+            yamlMonth?.selectedRingColor,
+            month.selectedRingColor
+        );
         // console.log(month.selectedRingColor);
 
         // initMonth
-        if (typeof yamlMonth?.initMonth === "string") {
-            month.initMonth = yamlMonth.initMonth;
-        }
+        month.initMonth = getStringFromInput(
+            yamlMonth?.initMonth,
+            month.initMonth
+        );
         // console.log(month.initMonth);
 
         // showAnnotation
@@ -2252,21 +2266,21 @@ export function getRenderInfoFromYaml(
         }
 
         // title
-        if (typeof yamlBullet?.title === "string") {
-            bullet.title = yamlBullet.title;
-        }
+        bullet.title = getStringFromInput(yamlBullet?.title, bullet.title);
         // console.log(bullet.title);
 
         // dataset
-        if (typeof yamlBullet?.dataset === "string") {
-            bullet.dataset = yamlBullet.dataset;
-        }
+        bullet.dataset = getStringFromInput(
+            yamlBullet?.dataset,
+            bullet.dataset
+        );
         // console.log(bullet.dataset);
 
         // orientation
-        if (typeof yamlBullet?.orientation === "string") {
-            bullet.orientation = yamlBullet.orientation;
-        }
+        bullet.orientation = getStringFromInput(
+            yamlBullet?.orientation,
+            bullet.orientation
+        );
         // console.log(bullet.orientation);
 
         // range
@@ -2320,23 +2334,21 @@ export function getRenderInfoFromYaml(
         // console.log(bullet.rangeColor);
 
         // actual value, can possess template variable
-        if (typeof yamlBullet?.value === "string") {
-            bullet.value = yamlBullet.value;
-        } else if (typeof yamlBullet?.value === "number") {
-            bullet.value = yamlBullet.value.toString();
-        }
+        bullet.value = getStringFromInput(yamlBullet?.value, bullet.value);
         // console.log(bullet.value);
 
         // value unit
-        if (typeof yamlBullet?.valueUnit === "string") {
-            bullet.valueUnit = yamlBullet.valueUnit;
-        }
+        bullet.valueUnit = getStringFromInput(
+            yamlBullet?.valueUnit,
+            bullet.valueUnit
+        );
         // console.log(bullet.valueUnit);
 
         // value color
-        if (typeof yamlBullet?.valueColor === "string") {
-            bullet.valueColor = yamlBullet.valueColor;
-        }
+        bullet.valueColor = getStringFromInput(
+            yamlBullet?.valueColor,
+            bullet.valueColor
+        );
         // console.log(bullet.valueColor);
 
         // show mark
@@ -2352,9 +2364,10 @@ export function getRenderInfoFromYaml(
         // console.log(bullet.markValue);
 
         // mark color
-        if (typeof yamlBullet?.markerColor === "string") {
-            bullet.markerColor = yamlBullet.markerColor;
-        }
+        bullet.markerColor = getStringFromInput(
+            yamlBullet?.markerColor,
+            bullet.markerColor
+        );
         // console.log(bullet.markValue);
 
         renderInfo.bullet.push(bullet);

From b358b74d06d5b670f28e226ec8360dfb63ec6f35 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 18 Sep 2021 11:18:07 +0800
Subject: [PATCH 257/402] Update documents

---
 README.md            | 3 +++
 docs/ReleaseNotes.md | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 73cd1dd..568fdbe 100644
--- a/README.md
+++ b/README.md
@@ -41,6 +41,9 @@ Version 1.10.5
 Version 1.10.6
 - Fixed the coloring for missing data in the month view
 
+Version 1.10.7
+- Allow using html image tags as emoji inputs
+
 ## !!! Breaking Changes !!!
 
 From version 1.9.0, template variables, e.g. '{{sum}}', are deprecated. Instead, Tracker provide operators (+, -, *, /, %) and functions (dataset(), sum(), maxStreak(), ......etc) to help us do data processing. For users having code blocks from previous version, please replace '{{sum}}' by '{{sum()}}' or '{{sum(1)}}' by '{{sum(dataset(1))}}'. More information about the new expressions could be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Expressions.md).
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index f06ba35..7b80e68 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,5 +1,8 @@
 # Release Notes
 
+## v1.10.7
+- Allow using html image tags as emoji inputs
+
 ## v1.10.6
 - Fixed the coloring for missing data in the month view
 

From f7b1e306f3d2879914c470c8b268cc5278973186 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 24 Sep 2021 18:49:17 +0800
Subject: [PATCH 258/402] Fix startDate/endDate being treated as relative dates

---
 src/helper.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/helper.ts b/src/helper.ts
index 7523e62..22aef7d 100644
--- a/src/helper.ts
+++ b/src/helper.ts
@@ -105,7 +105,7 @@ function extractValueFromDurationString(
     }
 
     let value = null;
-    const strRegex = "(?<value>[0-9]+)(" + units.join("|") + ")";
+    const strRegex = "^(?<value>[0-9]+)(" + units.join("|") + ")$";
     // console.log(strRegex);
     const regex = new RegExp(strRegex, "gm");
     let match = regex.exec(strDuration);

From 3a6ad3bd4091e6fecdad834035c70dd2c71be8fe Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 24 Sep 2021 18:50:21 +0800
Subject: [PATCH 259/402] Set version to 1.10.8

---
 manifest.json | 2 +-
 package.json  | 2 +-
 versions.json | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index c298533..9c2dd6c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-tracker",
 	"name": "Tracker",
-	"version": "1.10.7",
+	"version": "1.10.8",
 	"minAppVersion": "0.9.12",
 	"description": "A plugin tracks occurrences and numbers in your notes",
 	"author": "pyrochlore",
diff --git a/package.json b/package.json
index 42574b5..9a9ff4e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.10.7",
+  "version": "1.10.8",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
diff --git a/versions.json b/versions.json
index c0ea03d..30226ea 100644
--- a/versions.json
+++ b/versions.json
@@ -26,5 +26,6 @@
 	"1.10.4": "0.9.12",
 	"1.10.5": "0.9.12",
 	"1.10.6": "0.9.12",
-	"1.10.7": "0.9.12"
+	"1.10.7": "0.9.12",
+	"1.10.8": "0.9.12"
 }

From c5e354dc07af46fb08cc04e44a44073d8ea89182 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 24 Sep 2021 19:09:47 +0800
Subject: [PATCH 260/402] Update documents

---
 README.md            | 3 +++
 docs/ReleaseNotes.md | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 568fdbe..14a17d5 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,9 @@ Version 1.10.6
 Version 1.10.7
 - Allow using html image tags as emoji inputs
 
+Version 1.10.8
+- Fixed startDat/endDate misread as a relative date
+
 ## !!! Breaking Changes !!!
 
 From version 1.9.0, template variables, e.g. '{{sum}}', are deprecated. Instead, Tracker provide operators (+, -, *, /, %) and functions (dataset(), sum(), maxStreak(), ......etc) to help us do data processing. For users having code blocks from previous version, please replace '{{sum}}' by '{{sum()}}' or '{{sum(1)}}' by '{{sum(dataset(1))}}'. More information about the new expressions could be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Expressions.md).
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index 7b80e68..560977f 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,5 +1,8 @@
 # Release Notes
 
+## v1.10.8
+- Fixed startDat/endDate misread as a relative date
+
 ## v1.10.7
 - Allow using html image tags as emoji inputs
 

From 342cdb4c10de40ffae410b10e741e512663d6b3f Mon Sep 17 00:00:00 2001
From: Morteza Mehrdad <79282493+MoriXplus@users.noreply.github.com>
Date: Tue, 28 Sep 2021 19:26:27 +0330
Subject: [PATCH 261/402] Fix Wrong argument name

---
 src/settings.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/settings.ts b/src/settings.ts
index 75ed0a1..bd23a2e 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -42,7 +42,7 @@ export class TrackerSettingTab extends PluginSettingTab {
         new Setting(containerEl)
             .setName("Default date format")
             .setDesc(
-                "This format is used to parse the date in your diary title.\nYou can also override it using 'date-format' argument in the tracker codeblock."
+                "This format is used to parse the date in your diary title.\nYou can also override it using 'dateFormat' argument in the tracker codeblock."
             )
             .addText((text) =>
                 text

From 071b99e57cdfd33b6686e77a87a1798dc9a5c477 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Wed, 29 Sep 2021 11:27:54 +0800
Subject: [PATCH 262/402] Set version to 1.10.9

---
 manifest.json | 2 +-
 package.json  | 2 +-
 versions.json | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index 9c2dd6c..773d983 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-tracker",
 	"name": "Tracker",
-	"version": "1.10.8",
+	"version": "1.10.9",
 	"minAppVersion": "0.9.12",
 	"description": "A plugin tracks occurrences and numbers in your notes",
 	"author": "pyrochlore",
diff --git a/package.json b/package.json
index 9a9ff4e..9c3cde9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.10.8",
+  "version": "1.10.9",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
diff --git a/versions.json b/versions.json
index 30226ea..2e7ef45 100644
--- a/versions.json
+++ b/versions.json
@@ -27,5 +27,6 @@
 	"1.10.5": "0.9.12",
 	"1.10.6": "0.9.12",
 	"1.10.7": "0.9.12",
-	"1.10.8": "0.9.12"
+	"1.10.8": "0.9.12",
+	"1.10.9": "0.9.12"
 }

From 67015bc41d96e1581f56d06deeddfd5a497a629d Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Fri, 1 Oct 2021 07:46:20 +0800
Subject: [PATCH 263/402] Also allow emojis in the folder path

---
 src/parsing.ts | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/parsing.ts b/src/parsing.ts
index 4f5037e..163d890 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1191,13 +1191,11 @@ export function getRenderInfoFromYaml(
     }
 
     // Root folder to search
-    if (typeof yaml.folder === "string") {
-        if (yaml.folder === "") {
-            renderInfo.folder = plugin.settings.folder;
-        } else {
-            renderInfo.folder = yaml.folder;
-        }
-    } else {
+    renderInfo.folder = getStringFromInput(
+        yaml?.folder,
+        plugin.settings.folder
+    );
+    if (renderInfo.folder.trim() === "") {
         renderInfo.folder = plugin.settings.folder;
     }
     // console.log("renderInfo folder: " + renderInfo.folder);

From de456721d7a3fe1a4f65a4001b10f88064b45cef Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 13 Nov 2021 14:00:10 +0800
Subject: [PATCH 264/402] Show error messages for tab indentation in YAML

---
 examples/ErrorMessages.md | 8 ++++++++
 examples/TestCalendar.md  | 4 ++--
 examples/TestCommands.md  | 2 +-
 src/parsing.ts            | 6 ++++++
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/examples/ErrorMessages.md b/examples/ErrorMessages.md
index 1274219..2aad3cd 100644
--- a/examples/ErrorMessages.md
+++ b/examples/ErrorMessages.md
@@ -39,6 +39,14 @@ searchTarget: weight
 line:
 ```
 
+Tabs are not allowed as indentation
+``` tracker
+searchType: tag
+searchTarget: weight
+line:
+	fillGap: true
+```
+
 ## searchTarget
 Missing searchTarget
 ``` tracker
diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
index df752f4..84902b0 100644
--- a/examples/TestCalendar.md
+++ b/examples/TestCalendar.md
@@ -90,7 +90,7 @@ month:
     selectedRingColor: steelblue
     circleColorByValue: true
     showSelectedValue: true
-	initMonth: 2021-09
+    initMonth: 2021-09
 ```
 
 Specify the initial month by relative date
@@ -109,7 +109,7 @@ month:
     selectedRingColor: steelblue
     circleColorByValue: true
     showSelectedValue: true
-	initMonth: -1M
+    initMonth: -1M
 ```
 
 ## Multiple targets
diff --git a/examples/TestCommands.md b/examples/TestCommands.md
index 38c81e1..24b414e 100644
--- a/examples/TestCommands.md
+++ b/examples/TestCommands.md
@@ -33,6 +33,6 @@ folder: /
 startDate:
 endDate:
 summary:
-    template: "Average value of tagName is {{average}}"
+    template: "Average value of tagName is {{average()}}"
     style: "color:white;"
 ```
\ No newline at end of file
diff --git a/src/parsing.ts b/src/parsing.ts
index 163d890..aa73c5c 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -907,6 +907,12 @@ export function getRenderInfoFromYaml(
 ): RenderInfo | string {
     let yaml;
     try {
+        // console.log(yamlText);
+        let result = yamlText.match(/^\t.+/m);
+        if (result !== null) {
+            let errorMessage = "Tabs are not allowed as indentation";
+            return errorMessage;
+        }
         yaml = parseYaml(yamlText);
     } catch (err) {
         let errorMessage = "Error parsing YAML";

From 67fb02c6fbbb5c55053c0158be527317710521fd Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 13 Nov 2021 14:56:13 +0800
Subject: [PATCH 265/402] Fix accessing todayRingColor from null yamlMonth

---
 src/parsing.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/parsing.ts b/src/parsing.ts
index aa73c5c..74807d5 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -2179,7 +2179,7 @@ export function getRenderInfoFromYaml(
 
         // todayRingColor
         month.todayRingColor = getStringFromInput(
-            yamlMonth.todayRingColor,
+            yamlMonth?.todayRingColor,
             month.todayRingColor
         );
         // console.log(month.todayRingColor);

From 070faf121b2ec63017c0e6b3f04bb91098dc8b9f Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 13 Nov 2021 21:52:04 +0800
Subject: [PATCH 266/402] Accept more characters in dvField

---
 src/collecting.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/collecting.ts b/src/collecting.ts
index 7c3fe09..0f91aad 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -12,6 +12,13 @@ import {
 import * as helper from "./helper";
 import { Moment } from "moment";
 
+// ref: https://www.rapidtables.com/code/text/unicode-characters.html
+const CurrencyCodes = "\u0024\u20AC\u00A3\u00A5\u00A2\u20B9\u20A8\u20B1\u20A9\u0E3F\u20AB\u20AA";
+const AlphabetCodes = "\u03B1-\u03C9\u0391-\u03A9";
+const IntellectualPropertyCodes = "\u00A9\u00AE\u2117\u2122\u2120";
+const CJKCodes = "\u4E00-\u9FFF\u3400-\u4DBF\u3000\u3001-\u303F";
+const WordCharacters = "\\w" + CurrencyCodes + AlphabetCodes + IntellectualPropertyCodes + CJKCodes;
+
 // fileBaseName is a string contains dateFormat only
 export function getDateFromFilename(
     file: TFile,
@@ -788,7 +795,9 @@ export function collectDataFromDvField(
     let strRegex =
         "(^| |\\t)\\*{0,2}" +
         dvTarget +
-        "\\*{0,2}(::[ |\\t]*(?<value>[\\d\\.\\/\\-\\w,@; \\t:]*))(\\r\\?\\n|\\r|$)";
+        "\\*{0,2}(::[ |\\t]*(?<value>[\\d\\.\\/\\-,@; \\t:" + 
+        WordCharacters +
+        "]*))(\\r\\?\\n|\\r|$)";
     // console.log(strRegex);
 
     return extractDataUsingRegexWithMultipleValues(

From 7f65dd0dd4ecedb03e65e9954117e8c32265bd0d Mon Sep 17 00:00:00 2001
From: Ganessh Kumar <rpganesshkumar@gmail.com>
Date: Mon, 15 Nov 2021 05:32:47 +0000
Subject: [PATCH 267/402] fixing typos and links

---
 docs/Examples.md           | 4 ++--
 examples/TestExpression.md | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/Examples.md b/docs/Examples.md
index d05045d..c4e15c3 100644
--- a/docs/Examples.md
+++ b/docs/Examples.md
@@ -45,7 +45,7 @@ List of all examples
 - [Error Messages](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/ErrorMessages.md)
 - [Finance Tracker](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/FinanceTracker.md)
 - [Habit Trakcer](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/HabitTracker.md)
-- [Mood Tracker](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/MoodTracker.md)
+- [Mood Tracker](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTextValueMap.md)
 - [Star Tracker](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/StarTracker.md)
 - [Bar Chart](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestBarChart.md)
 - [Axis Interval and Format](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestAxisIntervalAndFormat.md)
@@ -59,7 +59,7 @@ List of all examples
 - [Multiple Targets / Multiple Values](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestMultipleTargetsMultipleValues.md)
 - [Pie Chart](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestPieChart.md)
 - [Scaling and Positioning](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestScalingAndPositioning.md)
-- [Specified Files](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestSpecifiedFiles.md))
+- [Specified Files](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestSpecifiedFiles.md)
 - [Summary](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestSummary.md)
 - [Table](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTable.md)
 - [Task](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTask.md)
diff --git a/examples/TestExpression.md b/examples/TestExpression.md
index 8d7f38c..d14c3f1 100644
--- a/examples/TestExpression.md
+++ b/examples/TestExpression.md
@@ -39,7 +39,7 @@ folder: /diary
 startDate: 2021-01-01
 endDate: 2021-01-03
 summary:
-    template: 'Maximum value: {{max() / 2::i}} <-- should be 48 / 2'
+    template: 'Maximum value: {{max() - 2::i}} <-- should be 48 - 2'
 ```
 
 Dataset \* number --> Dataset
@@ -61,7 +61,7 @@ folder: /diary
 startDate: 2021-01-01
 endDate: 2021-01-03
 summary:
-    template: 'Maximum value: {{max() /2::i}} <-- should be 48 / 2'
+    template: 'Maximum value: {{max() / 2::i}} <-- should be 48 / 2'
 ```
 
 Dataset % number --> Dataset

From 8d0b2973dbf008f315db210971b4df659f11296c Mon Sep 17 00:00:00 2001
From: Joey Seal <joey@seal.tech>
Date: Thu, 25 Nov 2021 11:17:21 -0600
Subject: [PATCH 268/402] correct typo

---
 docs/Examples.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Examples.md b/docs/Examples.md
index d05045d..6a550dc 100644
--- a/docs/Examples.md
+++ b/docs/Examples.md
@@ -44,7 +44,7 @@ List of all examples
 - [Bloodpressure Tracker](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/BloodPressureTracker.md)
 - [Error Messages](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/ErrorMessages.md)
 - [Finance Tracker](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/FinanceTracker.md)
-- [Habit Trakcer](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/HabitTracker.md)
+- [Habit Tracker](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/HabitTracker.md)
 - [Mood Tracker](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/MoodTracker.md)
 - [Star Tracker](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/StarTracker.md)
 - [Bar Chart](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestBarChart.md)

From 857dcd256872cd65ca87eaf066fc2eadacacb02f Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Sat, 27 Nov 2021 13:57:17 +0800
Subject: [PATCH 269/402] Merge links to 'Text-value Map' and 'Mood Tracker'

---
 docs/Examples.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/Examples.md b/docs/Examples.md
index c4e15c3..5612faf 100644
--- a/docs/Examples.md
+++ b/docs/Examples.md
@@ -45,7 +45,6 @@ List of all examples
 - [Error Messages](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/ErrorMessages.md)
 - [Finance Tracker](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/FinanceTracker.md)
 - [Habit Trakcer](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/HabitTracker.md)
-- [Mood Tracker](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTextValueMap.md)
 - [Star Tracker](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/StarTracker.md)
 - [Bar Chart](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestBarChart.md)
 - [Axis Interval and Format](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestAxisIntervalAndFormat.md)
@@ -63,7 +62,7 @@ List of all examples
 - [Summary](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestSummary.md)
 - [Table](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTable.md)
 - [Task](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTask.md)
-- [Text-value Map](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTextValueMap.md)
+- [Text-value Map/ Mood Tracker](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTextValueMap.md)
 - [Time Values](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTimeValues.md)
 - [Word Counting](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestWordCounting.md)
 - [X Dataset](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestXDataset.md)

From 800e12896f7601e702a7e575da903f1129e6e7fc Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 22 Feb 2022 20:21:21 +0800
Subject: [PATCH 270/402] Replace tab characters by spaces

---
 examples/TestTabCharacters.md | 33 +++++++++++++++++++++++++++++++++
 src/main.ts                   | 13 +++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 examples/TestTabCharacters.md

diff --git a/examples/TestTabCharacters.md b/examples/TestTabCharacters.md
new file mode 100644
index 0000000..c9b613d
--- /dev/null
+++ b/examples/TestTabCharacters.md
@@ -0,0 +1,33 @@
+# Test Tab Characters
+
+Tab characters will be replaced by numbers of spaces according to the tabSize defined in your editor settings
+
+## Single Tab
+``` tracker
+searchType: tag
+searchTarget: exercise-pushup
+folder: diary
+endDate: 2021-01-31
+line:
+	title: PushUp
+    yAxisLabel: Count
+    lineColor: "#d65d0e"
+```
+
+## Multiple Tabs
+
+``` tracker
+searchType: tag
+searchTarget: exercise-pushup
+folder: diary
+endDate: 2021-01-31
+line:
+	title: PushUp
+    yAxisLabel: Count
+	lineColor: "#d65d0e"
+```
+
+
+
+
+
diff --git a/src/main.ts b/src/main.ts
index 5a392bb..31d9835 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -34,6 +34,12 @@ declare global {
     }
 }
 
+declare module 'obsidian' {
+    interface Vault {
+        getConfig(prop: string): any;
+    }
+}
+
 export default class Tracker extends Plugin {
     settings: TrackerSettings;
 
@@ -259,6 +265,13 @@ export default class Tracker extends Plugin {
         const canvas = document.createElement("div");
 
         let yamlText = source.trim();
+
+        // Replace all tabs by spaces
+        let tabSize = this.app.vault.getConfig("tabSize");
+        let spaces = Array(tabSize).fill(" ").join("");
+        yamlText = yamlText.replace(/\t/gm, spaces);
+
+        // Get render info
         let retRenderInfo = getRenderInfoFromYaml(yamlText, this);
         if (typeof retRenderInfo === "string") {
             return this.renderErrorMessage(retRenderInfo, canvas, el);

From 757de222f7bd813d3963e50e8de91d53b957df68 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Tue, 22 Feb 2022 20:25:57 +0800
Subject: [PATCH 271/402] Remove error messages for tabs since we have replaced
 them

---
 examples/ErrorMessages.md | 8 --------
 src/parsing.ts            | 5 -----
 2 files changed, 13 deletions(-)

diff --git a/examples/ErrorMessages.md b/examples/ErrorMessages.md
index 2aad3cd..1274219 100644
--- a/examples/ErrorMessages.md
+++ b/examples/ErrorMessages.md
@@ -39,14 +39,6 @@ searchTarget: weight
 line:
 ```
 
-Tabs are not allowed as indentation
-``` tracker
-searchType: tag
-searchTarget: weight
-line:
-	fillGap: true
-```
-
 ## searchTarget
 Missing searchTarget
 ``` tracker
diff --git a/src/parsing.ts b/src/parsing.ts
index 74807d5..dc4c17a 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -908,11 +908,6 @@ export function getRenderInfoFromYaml(
     let yaml;
     try {
         // console.log(yamlText);
-        let result = yamlText.match(/^\t.+/m);
-        if (result !== null) {
-            let errorMessage = "Tabs are not allowed as indentation";
-            return errorMessage;
-        }
         yaml = parseYaml(yamlText);
     } catch (err) {
         let errorMessage = "Error parsing YAML";

From c07e2377e5e97ce9c135dd3f510dd6a485785f73 Mon Sep 17 00:00:00 2001
From: pyrochlore <pyrochlore@gmail.com>
Date: Wed, 23 Feb 2022 20:03:15 +0800
Subject: [PATCH 272/402] Update documents

---
 README.md            | 6 ++++++
 docs/ReleaseNotes.md | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/README.md b/README.md
index 14a17d5..6c6b91d 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,12 @@ Version 1.10.7
 Version 1.10.8
 - Fixed startDat/endDate misread as a relative date
 
+Version 1.10.9
+- Replace tab characters by spaces
+- Accept more unicode characters in dvField
+- Allow emojis in the folder path
+- Fixed bugs
+
 ## !!! Breaking Changes !!!
 
 From version 1.9.0, template variables, e.g. '{{sum}}', are deprecated. Instead, Tracker provide operators (+, -, *, /, %) and functions (dataset(), sum(), maxStreak(), ......etc) to help us do data processing. For users having code blocks from previous version, please replace '{{sum}}' by '{{sum()}}' or '{{sum(1)}}' by '{{sum(dataset(1))}}'. More information about the new expressions could be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Expressions.md).
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index 560977f..9453853 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,5 +1,11 @@
 # Release Notes
 
+## v1.10.9
+- Replace tab characters by spaces
+- Accept more unicode characters in dvField
+- Allow emojis in the folder path
+- Fixed bugs
+
 ## v1.10.8
 - Fixed startDat/endDate misread as a relative date
 

From e1410c9597595913d2e86840173d5a981d268124 Mon Sep 17 00:00:00 2001
From: Gnopps <ibjiba@fastmail.com>
Date: Thu, 24 Mar 2022 09:24:02 +0200
Subject: [PATCH 273/402] Rename TestMultipleTargesMultipleValues.md to
 TestMultipleTargetsMultipleValues.md

Corrected spelling error to fix broken link in https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Examples.md
---
 ...esMultipleValues.md => TestMultipleTargetsMultipleValues.md} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename examples/{TestMultipleTargesMultipleValues.md => TestMultipleTargetsMultipleValues.md} (99%)

diff --git a/examples/TestMultipleTargesMultipleValues.md b/examples/TestMultipleTargetsMultipleValues.md
similarity index 99%
rename from examples/TestMultipleTargesMultipleValues.md
rename to examples/TestMultipleTargetsMultipleValues.md
index bd6a330..b78845b 100644
--- a/examples/TestMultipleTargesMultipleValues.md
+++ b/examples/TestMultipleTargetsMultipleValues.md
@@ -185,4 +185,4 @@ line:
     lineColor: none, yellow, red
 ```
 
-Please also check those search targets in markdown files under folder 'diary' and 'data'.
\ No newline at end of file
+Please also check those search targets in markdown files under folder 'diary' and 'data'.

From fce6d1ef2973dc7352e01ffd68907cf9848537a1 Mon Sep 17 00:00:00 2001
From: BC <orhiannono@gmail.com>
Date: Mon, 4 Apr 2022 22:58:36 +0200
Subject: [PATCH 274/402] Update Questions.md

Fixed some typos.
---
 docs/Questions.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/Questions.md b/docs/Questions.md
index d6ca037..94cafd3 100644
--- a/docs/Questions.md
+++ b/docs/Questions.md
@@ -8,7 +8,7 @@
 
     Tracker only connects adjacent points (neighbor points by date) by default. To force it connecting points over missing data, set the parameter `fillGap` under `line` or `bar` to true.
 
-- Why the plugin shows error 'No valid date as X value found in notes'?
+- Why does the plugin show: error 'No valid date as X value found in notes'?
 
     First we have to confirm where is the source of your X values. Tracker always needs X values in dates. The default source of X values are the file names of your notes. As long as a proper `dateFormat` was assigned, and combine with `dateFormatPrefix` and `dateFormatSuffix`, the dates in file names could be extracted from your file names successfully.
 
@@ -18,15 +18,15 @@
 
     Examples of these use cases could be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestXDataset.md).
 
-- Wny the plugin shows error 'No valid Y value found in notes'?
+- Why does the plugin show: error 'No valid Y value found in notes'?
 
     That means no matched data found in your notes. Please check the document for the detail of [target evaluation](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TargetEvaluation.md).
 
-- Why the plugin shows 'Error parsing YAML'?
+- Why does the plugin show: 'Error parsing YAML'?
 
     There are syntax errors in your code block. Please check [this document](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/YAML.md) for common issues.
 
 ---
 
 Still have problems?? You might encounter a bug.
-Welcome to leave an issue [here](https://github.com/pyrochlore/obsidian-tracker/issues).
\ No newline at end of file
+Welcome to leave an issue [here](https://github.com/pyrochlore/obsidian-tracker/issues).

From 99bd1bc9c3a043d0b0f3c48d7b683619493f1db5 Mon Sep 17 00:00:00 2001
From: Huy Z <huyz@users.noreply.github.com>
Date: Fri, 12 Aug 2022 04:59:52 -0700
Subject: [PATCH 275/402] Fix searchType: `task`

instead of `tasks`
---
 docs/TargetEvaluation.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/TargetEvaluation.md b/docs/TargetEvaluation.md
index fdcdc9a..40beb65 100644
--- a/docs/TargetEvaluation.md
+++ b/docs/TargetEvaluation.md
@@ -120,8 +120,8 @@ With this search type, you can retrieve infomation of files. Currently, three ki
 
 ### searchType: task
 
-You can retrieve infomation from tasks by using `searchType` `tasks`.
+You can retrieve infomation from tasks by using `searchType` `task`.
 The provided `searchTarget` will limit the result with task's contents match the input.
 
 Using type `task` or `task.all` will get you all tasks no matter it is done or not.
-To get task done, use `task.done`. By contrast, use `task.notdone`.
\ No newline at end of file
+To get task done, use `task.done`. By contrast, use `task.notdone`.

From f1c3416336dc85ecc7da62a699f9eca9605af08c Mon Sep 17 00:00:00 2001
From: Huy Z <huyz@users.noreply.github.com>
Date: Sat, 13 Aug 2022 02:11:40 -0700
Subject: [PATCH 276/402] Fix table formatting of `margin` row

`|` needed to be escaped.
---
 docs/InputParameters.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/InputParameters.md b/docs/InputParameters.md
index 5a35949..433a466 100644
--- a/docs/InputParameters.md
+++ b/docs/InputParameters.md
@@ -44,7 +44,7 @@ These key-value pairs are placed under the root of the code block.
 | `textValueMap` | A container key for multiple text-value mapping | | |
 | `fixedScale` | Uniform scaling factor to the graph dimensions | 1 | 1.0 |
 | `fitPanelWidth` | Auto-fit the width of the chart to the container | 1 | false |
-| `margin` | Four margins (top|right|bottom|left) of the graph | 1~4 | 10 |
+| `margin` | Four margins (top\|right\|bottom\|left) of the graph | 1~4 | 10 |
 | `line` | A container key for parameters related to the line chart | | |
 | `bar` | A container key for parameters related to the bar chart | | |
 | `summary` | A container key for parameters related to the summary output | | |

From 3dad78249fd49f392968d73900a2ca5506e88571 Mon Sep 17 00:00:00 2001
From: Channing Walton <channingwalton@mac.com>
Date: Sun, 9 Oct 2022 13:13:29 +0100
Subject: [PATCH 277/402] Fix a typo

---
 examples/WikiTracker.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/WikiTracker.md b/examples/WikiTracker.md
index dc92a6c..d6ccf27 100644
--- a/examples/WikiTracker.md
+++ b/examples/WikiTracker.md
@@ -4,7 +4,7 @@ wiki --> Try parse the display text first, if it does not exist, parse the link
 wiki.link --> Parse the link text
 wiki.display --> Parse the display text
 
-In the exaample notes, we have
+In the example notes, we have
 [[todo_family|To-Do @Family]]
 [[todo_work|To-Do @Work]]
 
@@ -31,4 +31,4 @@ summary:
 ```
 
 
-Please also check those search targets in markdown files under folder 'diary'.
\ No newline at end of file
+Please also check those search targets in markdown files under folder 'diary'.

From 28789e2d01945c4ad5813d339aae6848b6100acc Mon Sep 17 00:00:00 2001
From: Benjamin Bouvier <public@benj.me>
Date: Mon, 12 Dec 2022 00:49:11 +0100
Subject: [PATCH 278/402] Parse booleans from the frontmatter (fixes #79)

---
 src/collecting.ts | 7 +++++++
 src/helper.ts     | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/collecting.ts b/src/collecting.ts
index 0f91aad..1f0325a 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -510,6 +510,13 @@ export function collectDataFromFrontmatterKey(
                 renderInfo.textValueMap
             );
             // console.log(retParse);
+            if (retParse.value === null) {
+                // Try parsing as a boolean: true means 1, false means 0.
+                if (deepValue === 'true' || deepValue === 'false') {
+                    retParse.type = ValueType.Number;
+                    retParse.value = deepValue === 'true' ? 1 : 0;
+                }
+            }
             if (retParse.value !== null) {
                 if (retParse.type === ValueType.Time) {
                     query.valueType = ValueType.Time;
diff --git a/src/helper.ts b/src/helper.ts
index 22aef7d..3c7fd36 100644
--- a/src/helper.ts
+++ b/src/helper.ts
@@ -316,7 +316,7 @@ export function deepValue(obj: any, str: string) {
     }
     if (typeof obj === "string" || Array.isArray(obj)) {
         return obj;
-    } else if (typeof obj === "number") {
+    } else if (typeof obj === "number" || typeof obj === "boolean") {
         return obj.toString();
     }
     return null;

From 0223662db4e16a7e876af23532fa7b111cbcf15a Mon Sep 17 00:00:00 2001
From: Graham Ashton <graham@effectif.com>
Date: Wed, 1 Mar 2023 12:51:13 +0000
Subject: [PATCH 279/402] Fix link to scaling/positioning docs

---
 .../{TestScalingAndPositioing.md => TestScalingAndPositioning.md} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename examples/{TestScalingAndPositioing.md => TestScalingAndPositioning.md} (100%)

diff --git a/examples/TestScalingAndPositioing.md b/examples/TestScalingAndPositioning.md
similarity index 100%
rename from examples/TestScalingAndPositioing.md
rename to examples/TestScalingAndPositioning.md

From d17e186c2627e63b35e8e61fbf16ae572944ac47 Mon Sep 17 00:00:00 2001
From: Ian Hakes <6351790+ianhakes@users.noreply.github.com>
Date: Sun, 9 Apr 2023 12:45:57 -0400
Subject: [PATCH 280/402] Update TestXDataset.md

Two typos ;-)
---
 examples/TestXDataset.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/TestXDataset.md b/examples/TestXDataset.md
index c657268..06d2d37 100644
--- a/examples/TestXDataset.md
+++ b/examples/TestXDataset.md
@@ -32,7 +32,7 @@ line:
     fillGap: true
 ```
 
-Ue dates from Dataview inline fields as x values
+Use dates from Dataview inline fields as x values
 ``` tracker
 searchType: dvField, dvField
 searchTarget: date, dataviewTarget
@@ -43,7 +43,7 @@ line:
     fillGap: true
 ```
 
-Ue dates from formatted text as x values
+Use dates from formatted text as x values
 ``` tracker
 searchType: text, dvField
 searchTarget: 'Today\sis\s(?<value>([0-9]{4})-([0-9]{2})-([0-9]{2})), dataviewTarget'
@@ -54,4 +54,4 @@ line:
     fillGap: true
 ```
 
-Please also check those search targets in markdown files under folder 'data'.
\ No newline at end of file
+Please also check those search targets in markdown files under folder 'data'.

From b94b74930424eeaa5e1f03eee274568fd3dda8b8 Mon Sep 17 00:00:00 2001
From: Martin Holzhauer <martin@holzhauer.eu>
Date: Wed, 2 Aug 2023 21:58:31 +0200
Subject: [PATCH 281/402] added aspect ratio parameter for graphs

---
 docs/InputParameters.md   |  1 +
 examples/WeightTracker.md |  2 ++
 src/data.ts               | 18 ++++++++++++++++++
 src/parsing.ts            | 14 ++++++++++++++
 4 files changed, 35 insertions(+)

diff --git a/docs/InputParameters.md b/docs/InputParameters.md
index 5a35949..6948889 100644
--- a/docs/InputParameters.md
+++ b/docs/InputParameters.md
@@ -44,6 +44,7 @@ These key-value pairs are placed under the root of the code block.
 | `textValueMap` | A container key for multiple text-value mapping | | |
 | `fixedScale` | Uniform scaling factor to the graph dimensions | 1 | 1.0 |
 | `fitPanelWidth` | Auto-fit the width of the chart to the container | 1 | false |
+| `aspectRatio` | Change the 1:1 aspect ratio of the graph | number:number | 1:1 |
 | `margin` | Four margins (top|right|bottom|left) of the graph | 1~4 | 10 |
 | `line` | A container key for parameters related to the line chart | | |
 | `bar` | A container key for parameters related to the bar chart | | |
diff --git a/examples/WeightTracker.md b/examples/WeightTracker.md
index abc4881..2cd0f8d 100644
--- a/examples/WeightTracker.md
+++ b/examples/WeightTracker.md
@@ -6,6 +6,8 @@ searchTarget: weight
 folder: diary
 startDate: 2021-01-01
 endDate: 2021-01-31
+aspectRatio: 20:9
+fitPanelWidth: 1
 line:
     title: Weight Log
     yAxisLabel: Weight
diff --git a/src/data.ts b/src/data.ts
index 46fa250..695c797 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -582,6 +582,7 @@ export class RenderInfo {
 
     fixedScale: number;
     fitPanelWidth: boolean;
+    aspectRatio: AspectRatio;
 
     output: any[];
     line: LineInfo[];
@@ -620,6 +621,7 @@ export class RenderInfo {
         this.textValueMap = {};
 
         this.dataAreaSize = new Size(300, 300);
+        this.aspectRatio = new AspectRatio(1, 1);
         this.margin = new Margin(10, 10, 10, 10); // top, right, bottom, left
 
         this.fixedScale = 1.0;
@@ -974,6 +976,22 @@ export class Size {
     }
 }
 
+export class AspectRatio  {
+    x: number;
+    y: number;
+
+    constructor(x: number, y: number) {
+        this.x = x;
+        this.y = y;
+    }
+
+    public recalculateSize(size: Size): Size {
+        let aspectRatio = this.x / this.y;
+        let width = parseFloat((size.width * aspectRatio).toFixed(2))
+        return new Size(width, size.height);
+    }
+}
+
 export class Margin {
     top: number;
     right: number;
diff --git a/src/parsing.ts b/src/parsing.ts
index dc4c17a..5478811 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -15,6 +15,7 @@ import {
     BulletInfo,
     Dataset,
     CustomDatasetInfo,
+    AspectRatio,
 } from "./data";
 import { TFolder, normalizePath } from "obsidian";
 import { parseYaml } from "obsidian";
@@ -1521,6 +1522,19 @@ export function getRenderInfoFromYaml(
         renderInfo.fitPanelWidth = yaml.fitPanelWidth;
     }
 
+    // aspectRatio
+    if (typeof yaml.aspectRatio === "string") {
+        // yaml.fitPanelWidth
+        let ratioRegEx = /([0-9]*):([0-9]*)/;
+        let parts = yaml.aspectRatio.match(ratioRegEx);
+        parts.shift();
+        parts = parts.map((i: string)=>parseInt(i,10));
+        if (parts.length==2) {
+            renderInfo.aspectRatio = new AspectRatio(parts[0], parts[1]);
+            renderInfo.dataAreaSize = renderInfo.aspectRatio.recalculateSize(renderInfo.dataAreaSize)
+        }
+    }
+
     // margin
     let retMargin = getNumberArrayFromInput("margin", yaml.margin, 4, 10, true);
     if (typeof retMargin === "string") {

From 2e2de022cdaa9e28a60782f5957d1799f35e91ec Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Sun, 5 Nov 2023 16:28:32 -0700
Subject: [PATCH 282/402] Release 1.11.0

---
 .github/dependabot.yml         | 18 ++++++++++++++++++
 .github/workflows/releases.yml | 32 ++++++++++++++++++++++++++++++++
 README.md                      |  4 ++++
 manifest.json                  |  2 +-
 package.json                   |  2 +-
 versions.json                  |  3 ++-
 6 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 .github/dependabot.yml
 create mode 100644 .github/workflows/releases.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..d62873e
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,18 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    # Workflow files stored in the default location of `.github/workflows`. (You don't need to specify `/.github/workflows` for `directory`. You can use `directory: "/"`.)
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  # Maintain dependencies for yarn
+  - package-ecosystem: "yarn" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
new file mode 100644
index 0000000..c695178
--- /dev/null
+++ b/.github/workflows/releases.yml
@@ -0,0 +1,32 @@
+name: Release
+
+on:
+  release:
+    types: [published]
+  
+jobs:
+  build:
+    permissions: 
+      contents: write
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Use Node.js
+      uses: actions/setup-node@v3
+      with:
+        node-version: '18.x'
+    - name: Build
+      run: |
+        yarn
+        yarn build
+        yarn zip
+    - name: Release with Notes
+      uses: softprops/action-gh-release@v1
+      with:
+        files: |
+          main.js
+          manifest.json
+          styles.css
+          obsidian-tracker-*.zip
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/README.md b/README.md
index 6c6b91d..07e1172 100644
--- a/README.md
+++ b/README.md
@@ -53,6 +53,10 @@ Version 1.10.9
 - Allow emojis in the folder path
 - Fixed bugs
 
+Version 1.11.0
+* Add support for checkboxes in new properties added in Obsidian 1.4
+* Fix typos in documentation and examples
+
 ## !!! Breaking Changes !!!
 
 From version 1.9.0, template variables, e.g. '{{sum}}', are deprecated. Instead, Tracker provide operators (+, -, *, /, %) and functions (dataset(), sum(), maxStreak(), ......etc) to help us do data processing. For users having code blocks from previous version, please replace '{{sum}}' by '{{sum()}}' or '{{sum(1)}}' by '{{sum(dataset(1))}}'. More information about the new expressions could be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Expressions.md).
diff --git a/manifest.json b/manifest.json
index 773d983..5340f93 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-tracker",
 	"name": "Tracker",
-	"version": "1.10.9",
+	"version": "1.11.0",
 	"minAppVersion": "0.9.12",
 	"description": "A plugin tracks occurrences and numbers in your notes",
 	"author": "pyrochlore",
diff --git a/package.json b/package.json
index 9c3cde9..4c54b17 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.10.9",
+  "version": "1.11.0",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
diff --git a/versions.json b/versions.json
index 2e7ef45..b1fa38e 100644
--- a/versions.json
+++ b/versions.json
@@ -28,5 +28,6 @@
 	"1.10.6": "0.9.12",
 	"1.10.7": "0.9.12",
 	"1.10.8": "0.9.12",
-	"1.10.9": "0.9.12"
+	"1.10.9": "0.9.12",
+	"1.11.0": "0.9.12"
 }

From 03456020209aba00fd0d6ddcc78ed335c5a82bbe Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Wed, 8 Nov 2023 03:04:50 +0000
Subject: [PATCH 283/402] Update copyright year

Update copyright year from 2021 to 2021-2023
---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index 6098b16..e1d3f7d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Hsuan Hao Chang
+Copyright (c) 2021-2023 Hsuan Hao Chang
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From 4b37f3a86fdc62255c3513e59046ef4433d33300 Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Wed, 8 Nov 2023 03:05:51 +0000
Subject: [PATCH 284/402] Release 1.12.0

---
 README.md     | 66 +++++++++++++++++++++++++++------------------------
 manifest.json | 16 ++++++-------
 package.json  |  2 +-
 versions.json | 63 ++++++++++++++++++++++++------------------------
 4 files changed, 76 insertions(+), 71 deletions(-)

diff --git a/README.md b/README.md
index 07e1172..e47a2e9 100644
--- a/README.md
+++ b/README.md
@@ -10,24 +10,31 @@ This is an [Obsidian](https://obsidian.md/) plugin that helps you collect data f
 
 ## What's New
 
-Version 1.10.0
-- Add annotation mode for month view ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestCalendar.md))
-- Add parameters `xAxisTickInterval`, `yAxisTickInterval`, `xAxisTickLabelFormat` and `yAxisTickLabelFormat` for the line and bar chart ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestAxisIntervalAndFormat.md))
-- Allow using regular expression in parameter `dateFormatPrefix` and `dateFormatSuffix` ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md))
-- Add parameters `file`, `specifiedFilesOnly`, `fileContainsLinkedFiles`, and `fileMultiplierAfterLink` to retrieve data from specified files ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestSpecifiedFiles.md))
-- Add a parameter `textValueMap` to convert texts or emojis to specified values ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTextValueMap.md))
+Version 1.12.0
+* Add aspect ratio parameter for graphs
+* Reorganize release notes in readme to be in descending order (latest release first)
+
+Version 1.11.0
+* Add support for checkboxes in new properties added in Obsidian 1.4
+* Fix typos in documentation and examples
+
+Version 1.10.9
+- Replace tab characters by spaces
+- Accept more unicode characters in dvField
+- Allow emojis in the folder path
 - Fixed bugs
-- Enhanced error messages
 
-Version 1.10.1
-- Fixed 'failed to load plugin' on iOS
+Version 1.10.8
+- Fixed startDat/endDate misread as a relative date
 
-Version 1.10.2
-- Fixed plugin not rendering on some macOS machines
+Version 1.10.7
+- Allow using html image tags as emoji inputs
 
-Version 1.10.3
-- Allow using the parameter `fitPanelWidth` with the output type `month` and `pie`
-- Fixed the resizing and positioning of the chart tooltip
+Version 1.10.6
+- Fixed the coloring for missing data in the month view
+
+Version 1.10.5
+- Allow using a relative date value in `initMonth` in the month view
 
 Version 1.10.4
 - Allow using a regular expression as a key of the parameter `textValueMap`
@@ -35,27 +42,24 @@ Version 1.10.4
 - Fixed bugs reported by users
 - Fixed typo in plugin settings
 
-Version 1.10.5
-- Allow using a relative date value in `initMonth` in the month view
-
-Version 1.10.6
-- Fixed the coloring for missing data in the month view
+Version 1.10.3
+- Allow using the parameter `fitPanelWidth` with the output type `month` and `pie`
+- Fixed the resizing and positioning of the chart tooltip
 
-Version 1.10.7
-- Allow using html image tags as emoji inputs
+Version 1.10.2
+- Fixed plugin not rendering on some macOS machines
 
-Version 1.10.8
-- Fixed startDat/endDate misread as a relative date
+Version 1.10.1
+- Fixed 'failed to load plugin' on iOS
 
-Version 1.10.9
-- Replace tab characters by spaces
-- Accept more unicode characters in dvField
-- Allow emojis in the folder path
+Version 1.10.0
+- Add annotation mode for month view ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestCalendar.md))
+- Add parameters `xAxisTickInterval`, `yAxisTickInterval`, `xAxisTickLabelFormat` and `yAxisTickLabelFormat` for the line and bar chart ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestAxisIntervalAndFormat.md))
+- Allow using regular expression in parameter `dateFormatPrefix` and `dateFormatSuffix` ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md))
+- Add parameters `file`, `specifiedFilesOnly`, `fileContainsLinkedFiles`, and `fileMultiplierAfterLink` to retrieve data from specified files ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestSpecifiedFiles.md))
+- Add a parameter `textValueMap` to convert texts or emojis to specified values ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTextValueMap.md))
 - Fixed bugs
-
-Version 1.11.0
-* Add support for checkboxes in new properties added in Obsidian 1.4
-* Fix typos in documentation and examples
+- Enhanced error messages
 
 ## !!! Breaking Changes !!!
 
diff --git a/manifest.json b/manifest.json
index 5340f93..6b71779 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,10 +1,10 @@
 {
-	"id": "obsidian-tracker",
-	"name": "Tracker",
-	"version": "1.11.0",
-	"minAppVersion": "0.9.12",
-	"description": "A plugin tracks occurrences and numbers in your notes",
-	"author": "pyrochlore",
-	"authorUrl": "",
-	"isDesktopOnly": false
+  "id": "obsidian-tracker",
+  "name": "Tracker",
+  "version": "1.12.0",
+  "minAppVersion": "0.9.12",
+  "description": "A plugin tracks occurrences and numbers in your notes",
+  "author": "pyrochlore",
+  "authorUrl": "",
+  "isDesktopOnly": false
 }
diff --git a/package.json b/package.json
index 4c54b17..0e7d909 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
diff --git a/versions.json b/versions.json
index b1fa38e..93de177 100644
--- a/versions.json
+++ b/versions.json
@@ -1,33 +1,34 @@
 {
-	"1.0.0": "0.9.12",
-	"1.0.1": "0.9.12",
-	"1.0.2": "0.9.12",
-	"1.1.0": "0.9.12",
-	"1.2.0": "0.9.12",
-	"1.2.1": "0.9.12",
-	"1.3.0": "0.9.12",
-	"1.4.0": "0.9.12",
-	"1.4.1": "0.9.12",
-	"1.5.0": "0.9.12",
-	"1.5.1": "0.9.12",
-	"1.6.0": "0.9.12",
-	"1.6.1": "0.9.12",
-	"1.7.0": "0.9.12",
-	"1.8.0": "0.9.12",
-	"1.8.1": "0.9.12",
-	"1.8.2": "0.9.12",
-	"1.9.0": "0.9.12",
-	"1.9.1": "0.9.12",
-	"1.9.2": "0.9.12",
-	"1.10.0": "0.9.12",
-	"1.10.1": "0.9.12",
-	"1.10.2": "0.9.12",
-	"1.10.3": "0.9.12",
-	"1.10.4": "0.9.12",
-	"1.10.5": "0.9.12",
-	"1.10.6": "0.9.12",
-	"1.10.7": "0.9.12",
-	"1.10.8": "0.9.12",
-	"1.10.9": "0.9.12",
-	"1.11.0": "0.9.12"
+  "1.0.0": "0.9.12",
+  "1.0.1": "0.9.12",
+  "1.0.2": "0.9.12",
+  "1.1.0": "0.9.12",
+  "1.2.0": "0.9.12",
+  "1.2.1": "0.9.12",
+  "1.3.0": "0.9.12",
+  "1.4.0": "0.9.12",
+  "1.4.1": "0.9.12",
+  "1.5.0": "0.9.12",
+  "1.5.1": "0.9.12",
+  "1.6.0": "0.9.12",
+  "1.6.1": "0.9.12",
+  "1.7.0": "0.9.12",
+  "1.8.0": "0.9.12",
+  "1.8.1": "0.9.12",
+  "1.8.2": "0.9.12",
+  "1.9.0": "0.9.12",
+  "1.9.1": "0.9.12",
+  "1.9.2": "0.9.12",
+  "1.10.0": "0.9.12",
+  "1.10.1": "0.9.12",
+  "1.10.2": "0.9.12",
+  "1.10.3": "0.9.12",
+  "1.10.4": "0.9.12",
+  "1.10.5": "0.9.12",
+  "1.10.6": "0.9.12",
+  "1.10.7": "0.9.12",
+  "1.10.8": "0.9.12",
+  "1.10.9": "0.9.12",
+  "1.11.0": "0.9.12",
+  "1.12.0": "0.9.12"
 }

From 41e8c714d09586e1ddcd38f211e7e12f716b1594 Mon Sep 17 00:00:00 2001
From: laharah <laharah22@gmail.com>
Date: Thu, 9 Nov 2023 12:36:52 -0800
Subject: [PATCH 285/402] Add support for in-sentence dvfields

---
 examples/TestInSentenceFields.md    | 15 +++++++++++++++
 examples/data/In-Sentence-Fields.md |  9 +++++++++
 src/collecting.ts                   | 22 ++++++++++++++--------
 3 files changed, 38 insertions(+), 8 deletions(-)
 create mode 100644 examples/TestInSentenceFields.md
 create mode 100644 examples/data/In-Sentence-Fields.md

diff --git a/examples/TestInSentenceFields.md b/examples/TestInSentenceFields.md
new file mode 100644
index 0000000..92d460b
--- /dev/null
+++ b/examples/TestInSentenceFields.md
@@ -0,0 +1,15 @@
+
+```tracker
+searchType: frontmatter, dvField
+searchTarget: date, count
+xDataset: 0
+folder: "data"
+bullet:
+	title: Total Counts
+	value: "{{sum()}}"
+	range: 1,5,10,20
+	rangeColor: darkRed, lightBlue, lightGreen, blue
+	showMarker: true
+	markerValue: 2
+	markerColor: red
+```
diff --git a/examples/data/In-Sentence-Fields.md b/examples/data/In-Sentence-Fields.md
new file mode 100644
index 0000000..ca1556e
--- /dev/null
+++ b/examples/data/In-Sentence-Fields.md
@@ -0,0 +1,9 @@
+---
+date: 2021-01-05
+---
+
+I am [count:: 1] inline
+So am (count::2) I
+count:: 3
+| count:: 4 |
+|count:: 5|
\ No newline at end of file
diff --git a/src/collecting.ts b/src/collecting.ts
index 1f0325a..ab352b6 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -13,11 +13,17 @@ import * as helper from "./helper";
 import { Moment } from "moment";
 
 // ref: https://www.rapidtables.com/code/text/unicode-characters.html
-const CurrencyCodes = "\u0024\u20AC\u00A3\u00A5\u00A2\u20B9\u20A8\u20B1\u20A9\u0E3F\u20AB\u20AA";
+const CurrencyCodes =
+    "\u0024\u20AC\u00A3\u00A5\u00A2\u20B9\u20A8\u20B1\u20A9\u0E3F\u20AB\u20AA";
 const AlphabetCodes = "\u03B1-\u03C9\u0391-\u03A9";
 const IntellectualPropertyCodes = "\u00A9\u00AE\u2117\u2122\u2120";
 const CJKCodes = "\u4E00-\u9FFF\u3400-\u4DBF\u3000\u3001-\u303F";
-const WordCharacters = "\\w" + CurrencyCodes + AlphabetCodes + IntellectualPropertyCodes + CJKCodes;
+const WordCharacters =
+    "\\w" +
+    CurrencyCodes +
+    AlphabetCodes +
+    IntellectualPropertyCodes +
+    CJKCodes;
 
 // fileBaseName is a string contains dateFormat only
 export function getDateFromFilename(
@@ -512,9 +518,9 @@ export function collectDataFromFrontmatterKey(
             // console.log(retParse);
             if (retParse.value === null) {
                 // Try parsing as a boolean: true means 1, false means 0.
-                if (deepValue === 'true' || deepValue === 'false') {
+                if (deepValue === "true" || deepValue === "false") {
                     retParse.type = ValueType.Number;
-                    retParse.value = deepValue === 'true' ? 1 : 0;
+                    retParse.value = deepValue === "true" ? 1 : 0;
                 }
             }
             if (retParse.value !== null) {
@@ -798,13 +804,13 @@ export function collectDataFromDvField(
 
     // Test this in Regex101
     // remember '\s' includes new line
-    // (^| |\t)\*{0,2}dvTarget\*{0,2}(::[ |\t]*(?<value>[\d\.\/\-\w,@; \t:]*))(\r?\n|\r|$)
+    // (^| |\t|\|)(\[|\()?\*{0,2}dvTarget\*{0,2}(::[ |\t]*(?<value>[\d\.\/\-\w,@; \t:]*)(\]|\))?)
     let strRegex =
-        "(^| |\\t)\\*{0,2}" +
+        String.raw`(^| |\t|\|)(\[|\()?\*{0,2}` +
         dvTarget +
-        "\\*{0,2}(::[ |\\t]*(?<value>[\\d\\.\\/\\-,@; \\t:" + 
+        String.raw`\*{0,2}(::[ |\t]*(?<value>[\d\.\/\-\w,@; \t:` +
         WordCharacters +
-        "]*))(\\r\\?\\n|\\r|$)";
+        String.raw`]*)(\]|\))?)`;
     // console.log(strRegex);
 
     return extractDataUsingRegexWithMultipleValues(

From 92a901839586cc4b19f04e183e7be640e54a16e8 Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Thu, 16 Nov 2023 19:01:12 -0700
Subject: [PATCH 286/402] Add support for emoji values

---
 examples/TestEmoji.md        | 20 ++++++++++++++++++++
 examples/diary/2023-06-05.md |  1 +
 examples/diary/2023-06-06.md |  1 +
 examples/diary/2023-06-07.md |  1 +
 examples/diary/2023-06-08.md |  1 +
 src/collecting.ts            |  4 ++--
 6 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 examples/TestEmoji.md
 create mode 100644 examples/diary/2023-06-05.md
 create mode 100644 examples/diary/2023-06-06.md
 create mode 100644 examples/diary/2023-06-07.md
 create mode 100644 examples/diary/2023-06-08.md

diff --git a/examples/TestEmoji.md b/examples/TestEmoji.md
new file mode 100644
index 0000000..a5c84b6
--- /dev/null
+++ b/examples/TestEmoji.md
@@ -0,0 +1,20 @@
+
+```tracker
+searchType: dvfield
+searchTarget: Physical
+folder: diary
+startDate: 2023-06-04
+endDate: 2023-06-11
+textValueMap:
+    😀: 5
+    🙂: 4
+    😐: 3
+    🙁: 2
+    😞: 1
+datasetName: 🚹 Physical
+line:
+	lineColor: orange
+	lineWidth: 3
+	showLegend: true
+	legendPosition: right
+```
\ No newline at end of file
diff --git a/examples/diary/2023-06-05.md b/examples/diary/2023-06-05.md
new file mode 100644
index 0000000..80f84e7
--- /dev/null
+++ b/examples/diary/2023-06-05.md
@@ -0,0 +1 @@
+Physical:: 😐
\ No newline at end of file
diff --git a/examples/diary/2023-06-06.md b/examples/diary/2023-06-06.md
new file mode 100644
index 0000000..80f84e7
--- /dev/null
+++ b/examples/diary/2023-06-06.md
@@ -0,0 +1 @@
+Physical:: 😐
\ No newline at end of file
diff --git a/examples/diary/2023-06-07.md b/examples/diary/2023-06-07.md
new file mode 100644
index 0000000..6378774
--- /dev/null
+++ b/examples/diary/2023-06-07.md
@@ -0,0 +1 @@
+Physical:: 😀
\ No newline at end of file
diff --git a/examples/diary/2023-06-08.md b/examples/diary/2023-06-08.md
new file mode 100644
index 0000000..7074a69
--- /dev/null
+++ b/examples/diary/2023-06-08.md
@@ -0,0 +1 @@
+Physical:: 😞
\ No newline at end of file
diff --git a/src/collecting.ts b/src/collecting.ts
index ab352b6..2e7e47a 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -339,7 +339,7 @@ function extractDataUsingRegexWithMultipleValues(
 ): boolean {
     // console.log("extractDataUsingRegexWithMultipleValues");
 
-    let regex = new RegExp(strRegex, "gm");
+    let regex = new RegExp(strRegex, "gmu");
     let match;
     let measure = 0.0;
     let extracted = false;
@@ -808,7 +808,7 @@ export function collectDataFromDvField(
     let strRegex =
         String.raw`(^| |\t|\|)(\[|\()?\*{0,2}` +
         dvTarget +
-        String.raw`\*{0,2}(::[ |\t]*(?<value>[\d\.\/\-\w,@; \t:` +
+        String.raw`\*{0,2}(::[ |\t]*(?<value>[\p{ExtPict}\d\.\/\-\w,@; \t:` +
         WordCharacters +
         String.raw`]*)(\]|\))?)`;
     // console.log(strRegex);

From 54a8b7450805654249208b31502c81280a4422f3 Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Thu, 16 Nov 2023 19:19:23 -0700
Subject: [PATCH 287/402] Update dependencies

---
 .gitignore                                    |    3 +-
 package-lock.json                             | 4825 +++++++++++++++++
 package.json                                  |   38 +-
 ...config.build.js => rollup.config.build.mjs |    2 +-
 rollup.config.dev.js => rollup.config.dev.mjs |    0
 5 files changed, 4845 insertions(+), 23 deletions(-)
 create mode 100644 package-lock.json
 rename rollup.config.build.js => rollup.config.build.mjs (93%)
 rename rollup.config.dev.js => rollup.config.dev.mjs (100%)

diff --git a/.gitignore b/.gitignore
index bb7f74e..1c6405e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
 
 # npm
 node_modules
-package-lock.json
 
 # build
 main.js
@@ -16,4 +15,4 @@ examples/*.js
 .obsidian
 
 # examples for users
-examples/case
\ No newline at end of file
+examples/case
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..29afbe7
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,4825 @@
+{
+  "name": "obsidian-tracker",
+  "version": "1.13.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "obsidian-tracker",
+      "version": "1.13.0",
+      "license": "MIT",
+      "dependencies": {
+        "d3": "^7.8.5",
+        "d3-interpolate": "^3.0.1",
+        "jsep": "^1.3.8",
+        "sprintf-js": "^1.1.3"
+      },
+      "devDependencies": {
+        "@rollup/plugin-commonjs": "^25.0.7",
+        "@rollup/plugin-node-resolve": "^15.2.3",
+        "@rollup/plugin-terser": "^0.4.4",
+        "@rollup/plugin-typescript": "^11.1.5",
+        "@types/d3": "^7.4.3",
+        "@types/node": "^20.9.1",
+        "@types/sprintf-js": "^1.1.4",
+        "gulp": "^3.9.1",
+        "gulp-zip": "^4.2.0",
+        "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
+        "rollup": "^4.4.1",
+        "rollup-plugin-copy": "^3.5.0",
+        "tslib": "^2.6.2",
+        "typescript": "^5.2.2"
+      }
+    },
+    "node_modules/@codemirror/state": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.3.1.tgz",
+      "integrity": "sha512-88e4HhMtKJyw6fKprGaN/yZfiaoGYOi2nM45YCUC6R/kex9sxFWBDGatS1vk4lMgnWmdIIB9tk8Gj1LmL8YfvA==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/@codemirror/view": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.22.0.tgz",
+      "integrity": "sha512-6zLj4YIoIpfTGKrDMTbeZRpa8ih4EymMCKmddEDcJWrCdp/N1D46B38YEz4creTb4T177AVS9EyXkLeC/HL2jA==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@codemirror/state": "^6.1.4",
+        "style-mod": "^4.1.0",
+        "w3c-keyname": "^2.2.4"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
+      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/source-map": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz",
+      "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+      "dev": true
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.20",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz",
+      "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@rollup/plugin-commonjs": {
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-25.0.7.tgz",
+      "integrity": "sha512-nEvcR+LRjEjsaSsc4x3XZfCCvZIaSMenZu/OiwOKGN2UhQpAYI7ru7czFvyWbErlpoGjnSX3D5Ch5FcMA3kRWQ==",
+      "dev": true,
+      "dependencies": {
+        "@rollup/pluginutils": "^5.0.1",
+        "commondir": "^1.0.1",
+        "estree-walker": "^2.0.2",
+        "glob": "^8.0.3",
+        "is-reference": "1.2.1",
+        "magic-string": "^0.30.3"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^2.68.0||^3.0.0||^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/plugin-commonjs/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@rollup/plugin-commonjs/node_modules/glob": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+      "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^5.0.1",
+        "once": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@rollup/plugin-commonjs/node_modules/minimatch": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@rollup/plugin-node-resolve": {
+      "version": "15.2.3",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.3.tgz",
+      "integrity": "sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ==",
+      "dev": true,
+      "dependencies": {
+        "@rollup/pluginutils": "^5.0.1",
+        "@types/resolve": "1.20.2",
+        "deepmerge": "^4.2.2",
+        "is-builtin-module": "^3.2.1",
+        "is-module": "^1.0.0",
+        "resolve": "^1.22.1"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^2.78.0||^3.0.0||^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/plugin-terser": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-terser/-/plugin-terser-0.4.4.tgz",
+      "integrity": "sha512-XHeJC5Bgvs8LfukDwWZp7yeqin6ns8RTl2B9avbejt6tZqsqvVoWI7ZTQrcNsfKEDWBTnTxM8nMDkO2IFFbd0A==",
+      "dev": true,
+      "dependencies": {
+        "serialize-javascript": "^6.0.1",
+        "smob": "^1.0.0",
+        "terser": "^5.17.4"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^2.0.0||^3.0.0||^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/plugin-typescript": {
+      "version": "11.1.5",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-11.1.5.tgz",
+      "integrity": "sha512-rnMHrGBB0IUEv69Q8/JGRD/n4/n6b3nfpufUu26axhUcboUzv/twfZU8fIBbTOphRAe0v8EyxzeDpKXqGHfyDA==",
+      "dev": true,
+      "dependencies": {
+        "@rollup/pluginutils": "^5.0.1",
+        "resolve": "^1.22.1"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^2.14.0||^3.0.0||^4.0.0",
+        "tslib": "*",
+        "typescript": ">=3.7.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        },
+        "tslib": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/pluginutils": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.5.tgz",
+      "integrity": "sha512-6aEYR910NyP73oHiJglti74iRyOwgFU4x3meH/H8OJx6Ry0j6cOVZ5X/wTvub7G7Ao6qaHBEaNsV3GLJkSsF+Q==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "^1.0.0",
+        "estree-walker": "^2.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.4.1.tgz",
+      "integrity": "sha512-Ss4suS/sd+6xLRu+MLCkED2mUrAyqHmmvZB+zpzZ9Znn9S8wCkTQCJaQ8P8aHofnvG5L16u9MVnJjCqioPErwQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.4.1.tgz",
+      "integrity": "sha512-sRSkGTvGsARwWd7TzC8LKRf8FiPn7257vd/edzmvG4RIr9x68KBN0/Ek48CkuUJ5Pj/Dp9vKWv6PEupjKWjTYA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.4.1.tgz",
+      "integrity": "sha512-nz0AiGrrXyaWpsmBXUGOBiRDU0wyfSXbFuF98pPvIO8O6auQsPG6riWsfQqmCCC5FNd8zKQ4JhgugRNAkBJ8mQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.4.1.tgz",
+      "integrity": "sha512-Ogqvf4/Ve/faMaiPRvzsJEqajbqs00LO+8vtrPBVvLgdw4wBg6ZDXdkDAZO+4MLnrc8mhGV6VJAzYScZdPLtJg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.4.1.tgz",
+      "integrity": "sha512-9zc2tqlr6HfO+hx9+wktUlWTRdje7Ub15iJqKcqg5uJZ+iKqmd2CMxlgPpXi7+bU7bjfDIuvCvnGk7wewFEhCg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.4.1.tgz",
+      "integrity": "sha512-phLb1fN3rq2o1j1v+nKxXUTSJnAhzhU0hLrl7Qzb0fLpwkGMHDem+o6d+ZI8+/BlTXfMU4kVWGvy6g9k/B8L6Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.4.1.tgz",
+      "integrity": "sha512-M2sDtw4tf57VPSjbTAN/lz1doWUqO2CbQuX3L9K6GWIR5uw9j+ROKCvvUNBY8WUbMxwaoc8mH9HmmBKsLht7+w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.4.1.tgz",
+      "integrity": "sha512-mHIlRLX+hx+30cD6c4BaBOsSqdnCE4ok7/KDvjHYAHoSuveoMMxIisZFvcLhUnyZcPBXDGZTuBoalcuh43UfQQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.4.1.tgz",
+      "integrity": "sha512-tB+RZuDi3zxFx7vDrjTNGVLu2KNyzYv+UY8jz7e4TMEoAj7iEt8Qk6xVu6mo3pgjnsHj6jnq3uuRsHp97DLwOA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.4.1.tgz",
+      "integrity": "sha512-Hdn39PzOQowK/HZzYpCuZdJC91PE6EaGbTe2VCA9oq2u18evkisQfws0Smh9QQGNNRa/T7MOuGNQoLeXhhE3PQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.4.1.tgz",
+      "integrity": "sha512-tLpKb1Elm9fM8c5w3nl4N1eLTP4bCqTYw9tqUBxX8/hsxqHO3dxc2qPbZ9PNkdK4tg4iLEYn0pOUnVByRd2CbA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.4.1.tgz",
+      "integrity": "sha512-eAhItDX9yQtZVM3yvXS/VR3qPqcnXvnLyx1pLXl4JzyNMBNO3KC986t/iAg2zcMzpAp9JSvxB5VZGnBiNoA98w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@types/codemirror": {
+      "version": "5.60.8",
+      "resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-5.60.8.tgz",
+      "integrity": "sha512-VjFgDF/eB+Aklcy15TtOTLQeMjTo07k7KAjql8OK5Dirr7a6sJY4T1uVBDuTVG9VEmn1uUsohOpYnVfgC6/jyw==",
+      "dev": true,
+      "dependencies": {
+        "@types/tern": "*"
+      }
+    },
+    "node_modules/@types/d3": {
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/@types/d3/-/d3-7.4.3.tgz",
+      "integrity": "sha512-lZXZ9ckh5R8uiFVt8ogUNf+pIrK4EsWrx2Np75WvF/eTpJ0FMHNhjXk8CKEx/+gpHbNQyJWehbFaTvqmHWB3ww==",
+      "dev": true,
+      "dependencies": {
+        "@types/d3-array": "*",
+        "@types/d3-axis": "*",
+        "@types/d3-brush": "*",
+        "@types/d3-chord": "*",
+        "@types/d3-color": "*",
+        "@types/d3-contour": "*",
+        "@types/d3-delaunay": "*",
+        "@types/d3-dispatch": "*",
+        "@types/d3-drag": "*",
+        "@types/d3-dsv": "*",
+        "@types/d3-ease": "*",
+        "@types/d3-fetch": "*",
+        "@types/d3-force": "*",
+        "@types/d3-format": "*",
+        "@types/d3-geo": "*",
+        "@types/d3-hierarchy": "*",
+        "@types/d3-interpolate": "*",
+        "@types/d3-path": "*",
+        "@types/d3-polygon": "*",
+        "@types/d3-quadtree": "*",
+        "@types/d3-random": "*",
+        "@types/d3-scale": "*",
+        "@types/d3-scale-chromatic": "*",
+        "@types/d3-selection": "*",
+        "@types/d3-shape": "*",
+        "@types/d3-time": "*",
+        "@types/d3-time-format": "*",
+        "@types/d3-timer": "*",
+        "@types/d3-transition": "*",
+        "@types/d3-zoom": "*"
+      }
+    },
+    "node_modules/@types/d3-array": {
+      "version": "2.12.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-2.12.7.tgz",
+      "integrity": "sha512-SVvxzxRVnIgtJbNTj5ZVJ9CZkVOANCpW0nQbRi7EOU5Q9G+JQQjXD2SCpr1OYCX09b3Yr7o0+CBofZAgU42rbQ==",
+      "dev": true
+    },
+    "node_modules/@types/d3-axis": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-axis/-/d3-axis-2.1.6.tgz",
+      "integrity": "sha512-X/CazlQun7XcSbRhaxwr605neUIGiUeURvsOGAIdvH1nD6o25pzkdxPNe7XcTKyRJeShlubjsUEG9tNeZZdRaQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/d3-selection": "^2"
+      }
+    },
+    "node_modules/@types/d3-brush": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@types/d3-brush/-/d3-brush-2.1.5.tgz",
+      "integrity": "sha512-ycizd1l+vIceUIO+JA6HAjivlXSGlDbqKXe4Q8cjUPtY/NMkz6CvpcBqzLPRa9iMDqRnUQHwSIEakb0sX+PM2A==",
+      "dev": true,
+      "dependencies": {
+        "@types/d3-selection": "^2"
+      }
+    },
+    "node_modules/@types/d3-chord": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-chord/-/d3-chord-2.0.6.tgz",
+      "integrity": "sha512-PTZyfJ7z9Ttl7joKRfyBl0icMYAMRj4n5trsE9Iinipp8Fe0DlwK6xwboWWMTEaj6Vzko68brnpvpoDl4qAKwA==",
+      "dev": true
+    },
+    "node_modules/@types/d3-color": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-2.0.6.tgz",
+      "integrity": "sha512-tbaFGDmJWHqnenvk3QGSvD3RVwr631BjKRD7Sc7VLRgrdX5mk5hTyoeBL6rXZaeoXzmZwIl1D2HPogEdt1rHBg==",
+      "dev": true
+    },
+    "node_modules/@types/d3-contour": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-contour/-/d3-contour-2.0.7.tgz",
+      "integrity": "sha512-oJNOYtQzKY+04lhEr4aTnW2IrCVK5jiF2YMJf687HV5dIGsOgM8Xc15uSuu9zu4FYOJJ/FTqVaspHFR9pxVNTg==",
+      "dev": true,
+      "dependencies": {
+        "@types/d3-array": "^2",
+        "@types/geojson": "*"
+      }
+    },
+    "node_modules/@types/d3-delaunay": {
+      "version": "5.3.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-delaunay/-/d3-delaunay-5.3.4.tgz",
+      "integrity": "sha512-GEQuDXVKQvHulQ+ecKyCubOmVjXrifAj7VR26rWVAER/IbWemaT/Tmo84ESiTtoDghg5ILdMZH7pYXQEt/Vu9A==",
+      "dev": true
+    },
+    "node_modules/@types/d3-dispatch": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-dispatch/-/d3-dispatch-2.0.4.tgz",
+      "integrity": "sha512-63uJJO3Eflu1tYXjD+Gmkk5Bc/ribIWyCnOfAY+WB9ihBw7Tdd1IRKZ34ASxy+Dzlg+lOT5+ZHCSZw0V+UNAEQ==",
+      "dev": true
+    },
+    "node_modules/@types/d3-drag": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@types/d3-drag/-/d3-drag-2.0.5.tgz",
+      "integrity": "sha512-VbvN7t3TelH6R0cKVXkOXmDiC7pRhtoodiPZ94p0n9TayGqg0Z/5vSxsPelVsZyVzloEo2kdZ7BO1n9ezWux+w==",
+      "dev": true,
+      "dependencies": {
+        "@types/d3-selection": "^2"
+      }
+    },
+    "node_modules/@types/d3-dsv": {
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/@types/d3-dsv/-/d3-dsv-2.0.9.tgz",
+      "integrity": "sha512-mjbmiSz8p7rCCyan4Ai6Rxqtp4MW447RfyKPfE1VaFl61l/nkLsFObF26X279eQMjHqGKDI2kdx26qEdkLAVBQ==",
+      "dev": true
+    },
+    "node_modules/@types/d3-ease": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-2.0.4.tgz",
+      "integrity": "sha512-DGh1MzShlCPTTau4+C8JLJjKt9sT9LgGZokYFx8fSxy+Z6fHns/Lc+lwTc4owuq8FwCDg7Mw2/mp0G8S5DBm7Q==",
+      "dev": true
+    },
+    "node_modules/@types/d3-fetch": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@types/d3-fetch/-/d3-fetch-2.0.5.tgz",
+      "integrity": "sha512-azKhvVVUbAK6sJy22b9t8TtsGmPlauU9aGVLSP5cGYSWMCbtMRf3nGz58Eu+UgP1u3VEK+12JVc4HB1MMeVaSg==",
+      "dev": true,
+      "dependencies": {
+        "@types/d3-dsv": "^2"
+      }
+    },
+    "node_modules/@types/d3-force": {
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-force/-/d3-force-2.1.7.tgz",
+      "integrity": "sha512-x5pvWw0HUBrcpMaMOd70ICEL27gOeC9hyhilTc+OP+4tErgEg3w+fZWA475eTrG7gi8BB0TNdfGRprpy09Vo9A==",
+      "dev": true
+    },
+    "node_modules/@types/d3-format": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@types/d3-format/-/d3-format-2.0.5.tgz",
+      "integrity": "sha512-ntJZQfz4BK8m53vkUVk+3PE7PHr9esrfVkClxebcMNP/4N1F0rPdzv9hKNqx2gZBRHSYg1kQumeUDIrHDpQGwQ==",
+      "dev": true
+    },
+    "node_modules/@types/d3-geo": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-2.0.7.tgz",
+      "integrity": "sha512-RIXlxPdxvX+LAZFv+t78CuYpxYag4zuw9mZc+AwfB8tZpKU90rMEn2il2ADncmeZlb7nER9dDsJpRisA3lRvjA==",
+      "dev": true,
+      "dependencies": {
+        "@types/geojson": "*"
+      }
+    },
+    "node_modules/@types/d3-hierarchy": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@types/d3-hierarchy/-/d3-hierarchy-2.0.5.tgz",
+      "integrity": "sha512-t/xXqB6MXT6Hp0BgFV00ZonpZbs9fUtYPM3QzqOlmghefovpnnxEN7mAdUqE/mNinRI/eR8gewDAobFJA0TNBw==",
+      "dev": true
+    },
+    "node_modules/@types/d3-interpolate": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-2.0.5.tgz",
+      "integrity": "sha512-UINE41RDaUMbulp+bxQMDnhOi51rh5lA2dG+dWZU0UY/IwQiG/u2x8TfnWYU9+xwGdXsJoAvrBYUEQl0r91atg==",
+      "dev": true,
+      "dependencies": {
+        "@types/d3-color": "^2"
+      }
+    },
+    "node_modules/@types/d3-path": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-2.0.4.tgz",
+      "integrity": "sha512-jjZVLBjEX4q6xneKMmv62UocaFJFOTQSb/1aTzs3m3ICTOFoVaqGBHpNLm/4dVi0/FTltfBKgmOK1ECj3/gGjA==",
+      "dev": true
+    },
+    "node_modules/@types/d3-polygon": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-polygon/-/d3-polygon-2.0.3.tgz",
+      "integrity": "sha512-4hwYYp/KDSNDdBFhf08SifGD7YJgMyUuDulnMsAGVi9X2w5QvdB47wlXMiJr+rdiBKALMq3VJ/i8qKy9gUzCbg==",
+      "dev": true
+    },
+    "node_modules/@types/d3-quadtree": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@types/d3-quadtree/-/d3-quadtree-2.0.5.tgz",
+      "integrity": "sha512-4eArsbkJTAAfFCDVtVrOlkmHJ/Er0zuL1bUAM7nMbwufIUHXAWYu+081tylzSdiZpcUo2vSJjfgNDtLnsDUoxw==",
+      "dev": true
+    },
+    "node_modules/@types/d3-random": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-random/-/d3-random-2.2.3.tgz",
+      "integrity": "sha512-Ghs4R3CcgJ3o6svszRzIH4b8PPYex/COo+rhhZjDAs+bVducXwjmVSi27WcDOaLLCBV2t3tfVH9bYXAL76IvQA==",
+      "dev": true
+    },
+    "node_modules/@types/d3-scale": {
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-3.3.5.tgz",
+      "integrity": "sha512-YOpKj0kIEusRf7ofeJcSZQsvKbnTwpe1DUF+P2qsotqG53kEsjm7EzzliqQxMkAWdkZcHrg5rRhB4JiDOQPX+A==",
+      "dev": true,
+      "dependencies": {
+        "@types/d3-time": "^2"
+      }
+    },
+    "node_modules/@types/d3-scale-chromatic": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-2.0.3.tgz",
+      "integrity": "sha512-/G5A5ioXNfOAb6E4X6YkJ9u0ryWLVrSkTwvO2DohXQ2zSvgqDOhWU/uj3JVhBrEnGiG+nQSjqXujsl710jSfMw==",
+      "dev": true
+    },
+    "node_modules/@types/d3-selection": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-2.0.4.tgz",
+      "integrity": "sha512-5a21DF7avVPmiUau8KTsv5r76yGqbMgq4QtByoCBPXUrVFWFkd3Ob4OOhmePNRbQqfUCNFjgB4sO7sUURnKcBg==",
+      "dev": true
+    },
+    "node_modules/@types/d3-shape": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-2.1.6.tgz",
+      "integrity": "sha512-UvUXi3uJk7i9gstNlyh/+lidKy96AVp6lG6it586lYVIHjS2oRKkOSfaWdON6+Ziu+EqB8kbN3onxk+eP2wSmw==",
+      "dev": true,
+      "dependencies": {
+        "@types/d3-path": "^2"
+      }
+    },
+    "node_modules/@types/d3-time": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-2.1.4.tgz",
+      "integrity": "sha512-BTfLsxTeo7yFxI/haOOf1ZwJ6xKgQLT9dCp+EcmQv87Gox6X+oKl4mLKfO6fnWm3P22+A6DknMNEZany8ql2Rw==",
+      "dev": true
+    },
+    "node_modules/@types/d3-time-format": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-3.0.4.tgz",
+      "integrity": "sha512-or9DiDnYI1h38J9hxKEsw513+KVuFbEVhl7qdxcaudoiqWWepapUen+2vAriFGexr6W5+P4l9+HJrB39GG+oRg==",
+      "dev": true
+    },
+    "node_modules/@types/d3-timer": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-2.0.3.tgz",
+      "integrity": "sha512-jhAJzaanK5LqyLQ50jJNIrB8fjL9gwWZTgYjevPvkDLMU+kTAZkYsobI59nYoeSrH1PucuyJEi247Pb90t6XUg==",
+      "dev": true
+    },
+    "node_modules/@types/d3-transition": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-2.0.5.tgz",
+      "integrity": "sha512-G+ne0FD8EK76ejXuB1sszSoPRDdTf+FDx6D3ilwYehfcQpo3WAY0xxkjXTQiP9Tu26qSNA7kyZ07PXZPby/Gdg==",
+      "dev": true,
+      "dependencies": {
+        "@types/d3-selection": "^2"
+      }
+    },
+    "node_modules/@types/d3-zoom": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-2.0.7.tgz",
+      "integrity": "sha512-JWke4E8ZyrKUQ68ESTWSK16fVb0OYnaiJ+WXJRYxKLn4aXU0o4CLYxMWBEiouUfO3TTCoyroOrGPcBG6u1aAxA==",
+      "dev": true,
+      "dependencies": {
+        "@types/d3-interpolate": "^2",
+        "@types/d3-selection": "^2"
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
+      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+      "dev": true
+    },
+    "node_modules/@types/fs-extra": {
+      "version": "8.1.5",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.1.5.tgz",
+      "integrity": "sha512-0dzKcwO+S8s2kuF5Z9oUWatQJj5Uq/iqphEtE3GQJVRRYm/tD1LglU2UnXi2A8jLq5umkGouOXOR9y0n613ZwQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/geojson": {
+      "version": "7946.0.13",
+      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.13.tgz",
+      "integrity": "sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ==",
+      "dev": true
+    },
+    "node_modules/@types/glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
+      "dev": true,
+      "dependencies": {
+        "@types/minimatch": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/minimatch": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
+      "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "20.9.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.1.tgz",
+      "integrity": "sha512-HhmzZh5LSJNS5O8jQKpJ/3ZcrrlG6L70hpGqMIAoM9YVD0YBRNWYsfwcXq8VnSjlNpCpgLzMXdiPo+dxcvSmiA==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/@types/resolve": {
+      "version": "1.20.2",
+      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz",
+      "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==",
+      "dev": true
+    },
+    "node_modules/@types/sprintf-js": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@types/sprintf-js/-/sprintf-js-1.1.4.tgz",
+      "integrity": "sha512-aWK1reDYWxcjgcIIPmQi3u+OQDuYa9b+lr6eIsGWrekJ9vr1NSjr4Eab8oQ1iKuH1ltFHpXGyerAv1a3FMKxzQ==",
+      "dev": true
+    },
+    "node_modules/@types/tern": {
+      "version": "0.23.7",
+      "resolved": "https://registry.npmjs.org/@types/tern/-/tern-0.23.7.tgz",
+      "integrity": "sha512-0YS9XCZ0LAhlP11HV9SqncUYyz9Ggsgc7Om/AmchKvoeFyj0qPaJmX6rJ93mJVExizWDzUMb49gAtVpI1uHd8Q==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "*"
+      }
+    },
+    "node_modules/acorn": {
+      "version": "8.11.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz",
+      "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/ansi-cyan": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz",
+      "integrity": "sha512-eCjan3AVo/SxZ0/MyIYRtkpxIu/H3xZN7URr1vXVrISxeyz8fUFz0FJziamK4sS8I+t35y4rHg1b2PklyBe/7A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ansi-gray": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
+      "integrity": "sha512-HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw==",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ansi-red": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz",
+      "integrity": "sha512-ewaIr5y+9CUTGFwZfpECUbFlGcC0GCw1oqR9RI6h1gQCd9Aj2GxSckCnPsVJnmfMZbwFYE+leZGASgkWl06Jow==",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ansi-wrap": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
+      "integrity": "sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/archy": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
+      "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==",
+      "dev": true
+    },
+    "node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
+      "integrity": "sha512-t5db90jq+qdgk8aFnxEkjqta0B/GHrM1pxzuuZz2zWsOXc5nKu3t+76s/PQBA8FTcM/ipspIH9jWG4OxCBc2eA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-differ": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
+      "integrity": "sha512-LeZY+DZDRnvP7eMuQ6LHfCzUGxAAIViUBliK24P3hWXL6y4SortgR6Nim6xrkfSLlmH0+k+9NYNwVC2s53ZrYQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-each": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
+      "integrity": "sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-slice": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
+      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+      "dev": true,
+      "bin": {
+        "atob": "bin/atob.js"
+      },
+      "engines": {
+        "node": ">= 4.5.0"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "node_modules/base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "dev": true,
+      "dependencies": {
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/beeper": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
+      "integrity": "sha512-3vqtKL1N45I5dV0RdssXZG7X6pCqQrWPNOlBPZPrd+QkE2HEhR57Z04m0KtpbsZH73j+a3F8UD1TQnn+ExTvIA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/braces/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
+    },
+    "node_modules/builtin-modules": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
+      "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "dev": true,
+      "dependencies": {
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^2.2.1",
+        "escape-string-regexp": "^1.0.2",
+        "has-ansi": "^2.0.0",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "dev": true,
+      "dependencies": {
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/clone": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+      "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/clone-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
+      "integrity": "sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/clone-stats": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
+      "integrity": "sha512-dhUqc57gSMCo6TX85FLfe51eC/s+Im2MLkAgJwfaRRexR2tA4dd3eLEW4L6efzHc2iNorrRRXITifnDLlRrhaA==",
+      "dev": true
+    },
+    "node_modules/cloneable-readable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
+      "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "process-nextick-args": "^2.0.0",
+        "readable-stream": "^2.3.5"
+      }
+    },
+    "node_modules/cloneable-readable/node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "dev": true
+    },
+    "node_modules/cloneable-readable/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/cloneable-readable/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
+      "dev": true,
+      "dependencies": {
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/color-support": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+      "dev": true,
+      "bin": {
+        "color-support": "bin.js"
+      }
+    },
+    "node_modules/colorette": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz",
+      "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==",
+      "dev": true
+    },
+    "node_modules/commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
+      "dev": true
+    },
+    "node_modules/component-emitter": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz",
+      "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
+    },
+    "node_modules/copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "dev": true
+    },
+    "node_modules/d3": {
+      "version": "7.8.5",
+      "resolved": "https://registry.npmjs.org/d3/-/d3-7.8.5.tgz",
+      "integrity": "sha512-JgoahDG51ncUfJu6wX/1vWQEqOflgXyl4MaHqlcSruTez7yhaRKR9i8VjjcQGeS2en/jnFivXuaIMnseMMt0XA==",
+      "dependencies": {
+        "d3-array": "3",
+        "d3-axis": "3",
+        "d3-brush": "3",
+        "d3-chord": "3",
+        "d3-color": "3",
+        "d3-contour": "4",
+        "d3-delaunay": "6",
+        "d3-dispatch": "3",
+        "d3-drag": "3",
+        "d3-dsv": "3",
+        "d3-ease": "3",
+        "d3-fetch": "3",
+        "d3-force": "3",
+        "d3-format": "3",
+        "d3-geo": "3",
+        "d3-hierarchy": "3",
+        "d3-interpolate": "3",
+        "d3-path": "3",
+        "d3-polygon": "3",
+        "d3-quadtree": "3",
+        "d3-random": "3",
+        "d3-scale": "4",
+        "d3-scale-chromatic": "3",
+        "d3-selection": "3",
+        "d3-shape": "3",
+        "d3-time": "3",
+        "d3-time-format": "4",
+        "d3-timer": "3",
+        "d3-transition": "3",
+        "d3-zoom": "3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-array": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
+      "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
+      "dependencies": {
+        "internmap": "1 - 2"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-axis": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz",
+      "integrity": "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-brush": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz",
+      "integrity": "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==",
+      "dependencies": {
+        "d3-dispatch": "1 - 3",
+        "d3-drag": "2 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-selection": "3",
+        "d3-transition": "3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-chord": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz",
+      "integrity": "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==",
+      "dependencies": {
+        "d3-path": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-color": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
+      "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-contour": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-4.0.2.tgz",
+      "integrity": "sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==",
+      "dependencies": {
+        "d3-array": "^3.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-delaunay": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
+      "integrity": "sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==",
+      "dependencies": {
+        "delaunator": "5"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-dispatch": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
+      "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-drag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz",
+      "integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==",
+      "dependencies": {
+        "d3-dispatch": "1 - 3",
+        "d3-selection": "3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-dsv": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz",
+      "integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==",
+      "dependencies": {
+        "commander": "7",
+        "iconv-lite": "0.6",
+        "rw": "1"
+      },
+      "bin": {
+        "csv2json": "bin/dsv2json.js",
+        "csv2tsv": "bin/dsv2dsv.js",
+        "dsv2dsv": "bin/dsv2dsv.js",
+        "dsv2json": "bin/dsv2json.js",
+        "json2csv": "bin/json2dsv.js",
+        "json2dsv": "bin/json2dsv.js",
+        "json2tsv": "bin/json2dsv.js",
+        "tsv2csv": "bin/dsv2dsv.js",
+        "tsv2json": "bin/dsv2json.js"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-ease": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
+      "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-fetch": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz",
+      "integrity": "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==",
+      "dependencies": {
+        "d3-dsv": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-force": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz",
+      "integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==",
+      "dependencies": {
+        "d3-dispatch": "1 - 3",
+        "d3-quadtree": "1 - 3",
+        "d3-timer": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-format": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz",
+      "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-geo": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.0.tgz",
+      "integrity": "sha512-JEo5HxXDdDYXCaWdwLRt79y7giK8SbhZJbFWXqbRTolCHFI5jRqteLzCsq51NKbUoX0PjBVSohxrx+NoOUujYA==",
+      "dependencies": {
+        "d3-array": "2.5.0 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-hierarchy": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz",
+      "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-interpolate": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
+      "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
+      "dependencies": {
+        "d3-color": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-path": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
+      "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-polygon": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz",
+      "integrity": "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-quadtree": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz",
+      "integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-random": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz",
+      "integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-scale": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
+      "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
+      "dependencies": {
+        "d3-array": "2.10.0 - 3",
+        "d3-format": "1 - 3",
+        "d3-interpolate": "1.2.0 - 3",
+        "d3-time": "2.1.1 - 3",
+        "d3-time-format": "2 - 4"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-scale-chromatic": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz",
+      "integrity": "sha512-Lx9thtxAKrO2Pq6OO2Ua474opeziKr279P/TKZsMAhYyNDD3EnCffdbgeSYN5O7m2ByQsxtuP2CSDczNUIZ22g==",
+      "dependencies": {
+        "d3-color": "1 - 3",
+        "d3-interpolate": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-selection": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz",
+      "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-shape": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
+      "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
+      "dependencies": {
+        "d3-path": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-time": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
+      "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
+      "dependencies": {
+        "d3-array": "2 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-time-format": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
+      "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
+      "dependencies": {
+        "d3-time": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-timer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
+      "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-transition": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz",
+      "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==",
+      "dependencies": {
+        "d3-color": "1 - 3",
+        "d3-dispatch": "1 - 3",
+        "d3-ease": "1 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-timer": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "d3-selection": "2 - 3"
+      }
+    },
+    "node_modules/d3-zoom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz",
+      "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==",
+      "dependencies": {
+        "d3-dispatch": "1 - 3",
+        "d3-drag": "2 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-selection": "2 - 3",
+        "d3-transition": "2 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/dateformat": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
+      "integrity": "sha512-GODcnWq3YGoTnygPfi02ygEiRxqUxpJwuRHjdhJYuxpcZmDq4rjBiXYmbCCzStxo176ixfLT6i4NPwQooRySnw==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/decode-uri-component": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/deepmerge": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/defaults": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
+      "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
+      "dev": true,
+      "dependencies": {
+        "clone": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/delaunator": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.0.tgz",
+      "integrity": "sha512-AyLvtyJdbv/U1GkiS6gUUzclRoAY4Gs75qkMygJJhU75LW4DNuSF2RMzpxs9jw9Oz1BobHjTdkG3zdP55VxAqw==",
+      "dependencies": {
+        "robust-predicates": "^3.0.0"
+      }
+    },
+    "node_modules/deprecated": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz",
+      "integrity": "sha512-BRACtc6B1mJe2J2mruHFqHWrtLy0Qppu/7LKdqWH3o/9j1L/1phPUaQV+2S3H8ZDW0k6h+NEOKcHBDRikWLiOA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.9"
+      }
+    },
+    "node_modules/detect-file": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
+      "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dev": true,
+      "dependencies": {
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/duplexer2": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+      "integrity": "sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~1.1.9"
+      }
+    },
+    "node_modules/end-of-stream": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
+      "integrity": "sha512-go5TQkd0YRXYhX+Lc3UrXkoKU5j+m72jEP5lHWr2Nh82L8wfZtH8toKgcg4T10o23ELIMGXQdwCbl+qAXIPDrw==",
+      "dev": true,
+      "dependencies": {
+        "once": "~1.3.0"
+      }
+    },
+    "node_modules/end-of-stream/node_modules/once": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+      "integrity": "sha512-6vaNInhu+CHxtONf3zw3vq4SP2DOQhjBvIa3rNcG0+P7eKWlYH6Peu7rHizSloRU2EwMz6GraLieis9Ac9+p1w==",
+      "dev": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/estree-walker": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+      "dev": true
+    },
+    "node_modules/expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-tilde": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+      "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==",
+      "dev": true,
+      "dependencies": {
+        "homedir-polyfill": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true
+    },
+    "node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "dependencies": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fancy-log": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
+      "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
+      "dev": true,
+      "dependencies": {
+        "ansi-gray": "^0.1.1",
+        "color-support": "^1.1.3",
+        "parse-node-version": "^1.0.0",
+        "time-stamp": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/fast-glob": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/fast-glob/node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fast-glob/node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fast-glob/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/fast-glob/node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/fast-glob/node_modules/micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dev": true,
+      "dependencies": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/fast-glob/node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/fastq": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
+      "dev": true,
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fill-range/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/find-index": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz",
+      "integrity": "sha512-uJ5vWrfBKMcE6y2Z8834dwEZj9mNGxYa3t3I53OwFeuZ8D9oc2E5zcsrkuhX6h4iYrjhiv0T3szQmxlAV9uxDg==",
+      "dev": true
+    },
+    "node_modules/findup-sync": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
+      "integrity": "sha512-vs+3unmJT45eczmcAZ6zMJtxN3l/QXeccaXQx5cu/MeJMhewVfoWZqibRkOxPnmoR59+Zy5hjabfQc6JLSah4g==",
+      "dev": true,
+      "dependencies": {
+        "detect-file": "^1.0.0",
+        "is-glob": "^3.1.0",
+        "micromatch": "^3.0.4",
+        "resolve-dir": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/findup-sync/node_modules/is-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+      "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fined": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
+      "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
+      "dev": true,
+      "dependencies": {
+        "expand-tilde": "^2.0.2",
+        "is-plain-object": "^2.0.3",
+        "object.defaults": "^1.1.0",
+        "object.pick": "^1.2.0",
+        "parse-filepath": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/first-chunk-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz",
+      "integrity": "sha512-ArRi5axuv66gEsyl3UuK80CzW7t56hem73YGNYxNWTGNKFJUadSb9Gu9SHijYEUi8ulQMf1bJomYNwSCPHhtTQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/flagged-respawn": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
+      "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/for-own": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
+      "integrity": "sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==",
+      "dev": true,
+      "dependencies": {
+        "for-in": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
+      "dev": true,
+      "dependencies": {
+        "map-cache": "^0.2.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fs-extra": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=6 <7 || >=8"
+      }
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/gaze": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
+      "integrity": "sha512-3IWbXGkDDHFX8zIlNdfnmhvlSMhpBO6tDr4InB8fGku6dh/gjFPGNqcdsXJajZg05x9jRzXbL6gCnCnuMap4tw==",
+      "dev": true,
+      "dependencies": {
+        "globule": "~0.1.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/get-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "integrity": "sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-stream": {
+      "version": "3.1.18",
+      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
+      "integrity": "sha512-owHtlMMXIAbxLjhUAO0HhW1/TB7kV0AwDduI3BLbYsWCaRzNIcLBu8N0wHZft2Za2SCmUXCEOdpZzC7k/H19eg==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^4.3.1",
+        "glob2base": "^0.0.12",
+        "minimatch": "^2.0.1",
+        "ordered-read-streams": "^0.1.0",
+        "through2": "^0.6.1",
+        "unique-stream": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.9"
+      }
+    },
+    "node_modules/glob-stream/node_modules/glob": {
+      "version": "4.5.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+      "integrity": "sha512-I0rTWUKSZKxPSIAIaqhSXTM/DiII6wame+rEC3cFA5Lqmr9YmdL7z6Hj9+bdWtTvoY1Su4/OiMLmb37Y7JzvJQ==",
+      "dev": true,
+      "dependencies": {
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^2.0.1",
+        "once": "^1.3.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/glob-stream/node_modules/minimatch": {
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+      "integrity": "sha512-jQo6o1qSVLEWaw3l+bwYA2X0uLuK2KjNh2wjgO7Q/9UJnXr1Q3yQKR8BI0/Bt/rPg75e6SMW4hW/6cBHVTZUjA==",
+      "deprecated": "Please update to minimatch 3.0.2 or higher to avoid a RegExp DoS issue",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/glob-stream/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/glob-stream/node_modules/through2": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+      "integrity": "sha512-RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": ">=1.0.33-1 <1.1.0-0",
+        "xtend": ">=4.0.0 <4.1.0-0"
+      }
+    },
+    "node_modules/glob-watcher": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
+      "integrity": "sha512-lzYWq1BJLBmtb9rzT6+lgbFlEW6Sc7B+Qs3RmsNA9lbdFSqLHhebfypPR3nbEOMeEQyawVXqSDH0aqjtImldow==",
+      "dev": true,
+      "dependencies": {
+        "gaze": "^0.5.1"
+      },
+      "engines": {
+        "node": ">= 0.9"
+      }
+    },
+    "node_modules/glob2base": {
+      "version": "0.0.12",
+      "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
+      "integrity": "sha512-ZyqlgowMbfj2NPjxaZZ/EtsXlOch28FRXgMd64vqZWk1bT9+wvSRLYD1om9M7QfQru51zJPAT17qXm4/zd+9QA==",
+      "dev": true,
+      "dependencies": {
+        "find-index": "^0.1.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/global-modules": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+      "dev": true,
+      "dependencies": {
+        "global-prefix": "^1.0.1",
+        "is-windows": "^1.0.1",
+        "resolve-dir": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/global-prefix": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+      "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==",
+      "dev": true,
+      "dependencies": {
+        "expand-tilde": "^2.0.2",
+        "homedir-polyfill": "^1.0.1",
+        "ini": "^1.3.4",
+        "is-windows": "^1.0.1",
+        "which": "^1.2.14"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/globby": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.1.tgz",
+      "integrity": "sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==",
+      "dev": true,
+      "dependencies": {
+        "@types/glob": "^7.1.1",
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.0.3",
+        "glob": "^7.1.3",
+        "ignore": "^5.1.1",
+        "merge2": "^1.2.3",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/globule": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
+      "integrity": "sha512-3eIcA2OjPCm4VvwIwZPzIxCVssA8HSpM2C6c6kK5ufJH4FGwWoyqL3In19uuX4oe+TwH3w2P1nQDmW56iehO4A==",
+      "dev": true,
+      "dependencies": {
+        "glob": "~3.1.21",
+        "lodash": "~1.0.1",
+        "minimatch": "~0.2.11"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/globule/node_modules/glob": {
+      "version": "3.1.21",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
+      "integrity": "sha512-ANhy2V2+tFpRajE3wN4DhkNQ08KDr0Ir1qL12/cUe5+a7STEK8jkW4onUYuY8/06qAFuT5je7mjAqzx0eKI2tQ==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "~1.2.0",
+        "inherits": "1",
+        "minimatch": "~0.2.11"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/globule/node_modules/graceful-fs": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz",
+      "integrity": "sha512-iiTUZ5vZ+2ZV+h71XAgwCSu6+NAizhFU3Yw8aC/hH5SQ3SnISqEqAek40imAFGtDcwJKNhXvSY+hzIolnLwcdQ==",
+      "deprecated": "please upgrade to graceful-fs 4 for compatibility with current and future versions of Node.js",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/globule/node_modules/inherits": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz",
+      "integrity": "sha512-Al67oatbRSo3RV5hRqIoln6Y5yMVbJSIn4jEJNL7VCImzq/kLr7vvb6sFRJXqr8rpHc/2kJOM+y0sPKN47VdzA==",
+      "dev": true
+    },
+    "node_modules/globule/node_modules/minimatch": {
+      "version": "0.2.14",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+      "integrity": "sha512-zZ+Jy8lVWlvqqeM8iZB7w7KmQkoJn8djM585z88rywrEbzoqawVa9FR5p2hwD+y74nfuKOjmNvi9gtWJNLqHvA==",
+      "deprecated": "Please update to minimatch 3.0.2 or higher to avoid a RegExp DoS issue",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "2",
+        "sigmund": "~1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/glogg": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
+      "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
+      "dev": true,
+      "dependencies": {
+        "sparkles": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true
+    },
+    "node_modules/gulp": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz",
+      "integrity": "sha512-6FHNdR+VG1LcPz6gZGGqgvimWWGtl4x3FvshAdK/UnAjU7aFOyzft3Fjp35r0Y3ZF4u8vND0S4nGsIB/sxTqzQ==",
+      "dev": true,
+      "dependencies": {
+        "archy": "^1.0.0",
+        "chalk": "^1.0.0",
+        "deprecated": "^0.0.1",
+        "gulp-util": "^3.0.0",
+        "interpret": "^1.0.0",
+        "liftoff": "^2.1.0",
+        "minimist": "^1.1.0",
+        "orchestrator": "^0.3.0",
+        "pretty-hrtime": "^1.0.0",
+        "semver": "^4.1.0",
+        "tildify": "^1.0.0",
+        "v8flags": "^2.0.2",
+        "vinyl-fs": "^0.3.0"
+      },
+      "bin": {
+        "gulp": "bin/gulp.js"
+      },
+      "engines": {
+        "node": ">= 0.9"
+      }
+    },
+    "node_modules/gulp-util": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
+      "integrity": "sha512-q5oWPc12lwSFS9h/4VIjG+1NuNDlJ48ywV2JKItY4Ycc/n1fXJeYPVQsfu5ZrhQi7FGSDBalwUCLar/GyHXKGw==",
+      "deprecated": "gulp-util is deprecated - replace it, following the guidelines at https://medium.com/gulpjs/gulp-util-ca3b1f9f9ac5",
+      "dev": true,
+      "dependencies": {
+        "array-differ": "^1.0.0",
+        "array-uniq": "^1.0.2",
+        "beeper": "^1.0.0",
+        "chalk": "^1.0.0",
+        "dateformat": "^2.0.0",
+        "fancy-log": "^1.1.0",
+        "gulplog": "^1.0.0",
+        "has-gulplog": "^0.1.0",
+        "lodash._reescape": "^3.0.0",
+        "lodash._reevaluate": "^3.0.0",
+        "lodash._reinterpolate": "^3.0.0",
+        "lodash.template": "^3.0.0",
+        "minimist": "^1.1.0",
+        "multipipe": "^0.1.2",
+        "object-assign": "^3.0.0",
+        "replace-ext": "0.0.1",
+        "through2": "^2.0.0",
+        "vinyl": "^0.5.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/gulp-zip": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/gulp-zip/-/gulp-zip-4.2.0.tgz",
+      "integrity": "sha512-I+697f6jf+PncdTrqfuwoauxgnLG1yHRg3vlmvDgmJuEnlEHy4meBktJ/oHgfyg4tp6X25wuZqUOraVeVg97wQ==",
+      "dev": true,
+      "dependencies": {
+        "get-stream": "^3.0.0",
+        "plugin-error": "^0.1.2",
+        "through2": "^2.0.1",
+        "vinyl": "^2.1.0",
+        "yazl": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/gulp-zip/node_modules/clone": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+      "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/gulp-zip/node_modules/clone-stats": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
+      "integrity": "sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==",
+      "dev": true
+    },
+    "node_modules/gulp-zip/node_modules/replace-ext": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
+      "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulp-zip/node_modules/vinyl": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
+      "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
+      "dev": true,
+      "dependencies": {
+        "clone": "^2.1.1",
+        "clone-buffer": "^1.0.0",
+        "clone-stats": "^1.0.0",
+        "cloneable-readable": "^1.0.0",
+        "remove-trailing-separator": "^1.0.1",
+        "replace-ext": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulplog": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
+      "integrity": "sha512-hm6N8nrm3Y08jXie48jsC55eCZz9mnb4OirAStEk2deqeyhXU3C1otDVh+ccttMuc1sBi6RX6ZJ720hs9RCvgw==",
+      "dev": true,
+      "dependencies": {
+        "glogg": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-gulplog": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
+      "integrity": "sha512-+F4GzLjwHNNDEAJW2DC1xXfEoPkRDmUdJ7CBYw4MpqtDwOnqdImJl7GWlpqx+Wko6//J8uKTnIe4wZSv7yCqmw==",
+      "dev": true,
+      "dependencies": {
+        "sparkles": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
+      "dev": true,
+      "dependencies": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/kind-of": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+      "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hasown": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
+      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/homedir-polyfill": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+      "dev": true,
+      "dependencies": {
+        "parse-passwd": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ignore": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
+      "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "dev": true
+    },
+    "node_modules/internmap": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
+      "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/interpret": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/is-absolute": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
+      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
+      "dev": true,
+      "dependencies": {
+        "is-relative": "^1.0.0",
+        "is-windows": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-accessor-descriptor": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz",
+      "integrity": "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==",
+      "dev": true,
+      "dependencies": {
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/is-builtin-module": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
+      "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==",
+      "dev": true,
+      "dependencies": {
+        "builtin-modules": "^3.3.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.13.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
+      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
+      "dev": true,
+      "dependencies": {
+        "hasown": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-data-descriptor": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz",
+      "integrity": "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==",
+      "dev": true,
+      "dependencies": {
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/is-descriptor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
+      "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==",
+      "dev": true
+    },
+    "node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-reference": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
+      "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "*"
+      }
+    },
+    "node_modules/is-relative": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
+      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
+      "dev": true,
+      "dependencies": {
+        "is-unc-path": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-unc-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
+      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+      "dev": true,
+      "dependencies": {
+        "unc-path-regex": "^0.1.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==",
+      "dev": true
+    },
+    "node_modules/is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jsep": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/jsep/-/jsep-1.3.8.tgz",
+      "integrity": "sha512-qofGylTGgYj9gZFsHuyWAN4jr35eJ66qJCK4eKDnldohuUoQFbU3iZn2zjvEbd9wOAhP9Wx5DsAAduTyE1PSWQ==",
+      "engines": {
+        "node": ">= 10.16.0"
+      }
+    },
+    "node_modules/jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
+      "dev": true,
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/liftoff": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz",
+      "integrity": "sha512-01zfGFqfORP1CGmZZP2Zn51zsqz4RltDi0RDOhbGoLYdUT5Lw+I2gX6QdwXhPITF6hPOHEOp+At6/L24hIg9WQ==",
+      "dev": true,
+      "dependencies": {
+        "extend": "^3.0.0",
+        "findup-sync": "^2.0.0",
+        "fined": "^1.0.1",
+        "flagged-respawn": "^1.0.0",
+        "is-plain-object": "^2.0.4",
+        "object.map": "^1.0.0",
+        "rechoir": "^0.6.2",
+        "resolve": "^1.1.7"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz",
+      "integrity": "sha512-0VSEDVec/Me2eATuoiQd8IjyBMMX0fahob8YJ96V1go2RjvCk1m1GxmtfXn8RNSaLaTtop7fsuhhu9oLk3hUgA==",
+      "dev": true,
+      "engines": [
+        "node",
+        "rhino"
+      ]
+    },
+    "node_modules/lodash._basecopy": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
+      "integrity": "sha512-rFR6Vpm4HeCK1WPGvjZSJ+7yik8d8PVUdCJx5rT2pogG4Ve/2ZS7kfmO5l5T2o5V2mqlNIfSF5MZlr1+xOoYQQ==",
+      "dev": true
+    },
+    "node_modules/lodash._basetostring": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
+      "integrity": "sha512-mTzAr1aNAv/i7W43vOR/uD/aJ4ngbtsRaCubp2BfZhlGU/eORUjg/7F6X0orNMdv33JOrdgGybtvMN/po3EWrA==",
+      "dev": true
+    },
+    "node_modules/lodash._basevalues": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
+      "integrity": "sha512-H94wl5P13uEqlCg7OcNNhMQ8KvWSIyqXzOPusRgHC9DK3o54P6P3xtbXlVbRABG4q5gSmp7EDdJ0MSuW9HX6Mg==",
+      "dev": true
+    },
+    "node_modules/lodash._getnative": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
+      "integrity": "sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA==",
+      "dev": true
+    },
+    "node_modules/lodash._isiterateecall": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
+      "integrity": "sha512-De+ZbrMu6eThFti/CSzhRvTKMgQToLxbij58LMfM8JnYDNSOjkjTCIaa8ixglOeGh2nyPlakbt5bJWJ7gvpYlQ==",
+      "dev": true
+    },
+    "node_modules/lodash._reescape": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
+      "integrity": "sha512-Sjlavm5y+FUVIF3vF3B75GyXrzsfYV8Dlv3L4mEpuB9leg8N6yf/7rU06iLPx9fY0Mv3khVp9p7Dx0mGV6V5OQ==",
+      "dev": true
+    },
+    "node_modules/lodash._reevaluate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
+      "integrity": "sha512-OrPwdDc65iJiBeUe5n/LIjd7Viy99bKwDdk7Z5ljfZg0uFRFlfQaCy9tZ4YMAag9WAZmlVpe1iZrkIMMSMHD3w==",
+      "dev": true
+    },
+    "node_modules/lodash._reinterpolate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
+      "integrity": "sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==",
+      "dev": true
+    },
+    "node_modules/lodash._root": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
+      "integrity": "sha512-O0pWuFSK6x4EXhM1dhZ8gchNtG7JMqBtrHdoUFUWXD7dJnNSUze1GuyQr5sOs0aCvgGeI3o/OJW8f4ca7FDxmQ==",
+      "dev": true
+    },
+    "node_modules/lodash.escape": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
+      "integrity": "sha512-n1PZMXgaaDWZDSvuNZ/8XOcYO2hOKDqZel5adtR30VKQAtoWs/5AOeFA0vPV8moiPzlqe7F4cP2tzpFewQyelQ==",
+      "dev": true,
+      "dependencies": {
+        "lodash._root": "^3.0.0"
+      }
+    },
+    "node_modules/lodash.isarguments": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+      "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==",
+      "dev": true
+    },
+    "node_modules/lodash.isarray": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
+      "integrity": "sha512-JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ==",
+      "dev": true
+    },
+    "node_modules/lodash.keys": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+      "integrity": "sha512-CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ==",
+      "dev": true,
+      "dependencies": {
+        "lodash._getnative": "^3.0.0",
+        "lodash.isarguments": "^3.0.0",
+        "lodash.isarray": "^3.0.0"
+      }
+    },
+    "node_modules/lodash.restparam": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
+      "integrity": "sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw==",
+      "dev": true
+    },
+    "node_modules/lodash.template": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
+      "integrity": "sha512-0B4Y53I0OgHUJkt+7RmlDFWKjVAI/YUpWNiL9GQz5ORDr4ttgfQGo+phBWKFLJbBdtOwgMuUkdOHOnPg45jKmQ==",
+      "dev": true,
+      "dependencies": {
+        "lodash._basecopy": "^3.0.0",
+        "lodash._basetostring": "^3.0.0",
+        "lodash._basevalues": "^3.0.0",
+        "lodash._isiterateecall": "^3.0.0",
+        "lodash._reinterpolate": "^3.0.0",
+        "lodash.escape": "^3.0.0",
+        "lodash.keys": "^3.0.0",
+        "lodash.restparam": "^3.0.0",
+        "lodash.templatesettings": "^3.0.0"
+      }
+    },
+    "node_modules/lodash.templatesettings": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
+      "integrity": "sha512-TcrlEr31tDYnWkHFWDCV3dHYroKEXpJZ2YJYvJdhN+y4AkWMDZ5I4I8XDtUKqSAyG81N7w+I1mFEJtcED+tGqQ==",
+      "dev": true,
+      "dependencies": {
+        "lodash._reinterpolate": "^3.0.0",
+        "lodash.escape": "^3.0.0"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
+      "integrity": "sha512-WpibWJ60c3AgAz8a2iYErDrcT2C7OmKnsWhIcHOjkUHFjkXncJhtLxNSqUmxRxRunpb5I8Vprd7aNSd2NtksJQ==",
+      "dev": true
+    },
+    "node_modules/magic-string": {
+      "version": "0.30.5",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
+      "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.4.15"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/make-iterator": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
+      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
+      "dev": true,
+      "dependencies": {
+        "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/mixin-deep": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+      "dev": true,
+      "dependencies": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mkdirp": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.6"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/moment": {
+      "version": "2.29.4",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
+      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/multipipe": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
+      "integrity": "sha512-7ZxrUybYv9NonoXgwoOqtStIu18D1c3eFZj27hqgf5kBrBF8Q+tE8V0MW8dKM5QLkQPh1JhhbKgHLY9kifov4Q==",
+      "dev": true,
+      "dependencies": {
+        "duplexer2": "0.0.2"
+      }
+    },
+    "node_modules/nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/natives": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.6.tgz",
+      "integrity": "sha512-6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA==",
+      "deprecated": "This module relies on Node.js's internals and will break at some point. Do not use it, and update to graceful-fs@4.x.",
+      "dev": true
+    },
+    "node_modules/object-assign": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
+      "integrity": "sha512-jHP15vXVGeVh1HuaA2wY6lxk+whK/x4KBG88VXeRma7CCun7iGD5qPc4eYykQ9sdQvg8jkwFKsSxHln2ybW3xQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
+      "dev": true,
+      "dependencies": {
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object-copy/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.defaults": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
+      "integrity": "sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==",
+      "dev": true,
+      "dependencies": {
+        "array-each": "^1.0.1",
+        "array-slice": "^1.0.0",
+        "for-own": "^1.0.0",
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
+      "integrity": "sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==",
+      "dev": true,
+      "dependencies": {
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/obsidian": {
+      "version": "1.4.11",
+      "resolved": "https://github.com/obsidianmd/obsidian-api/tarball/master",
+      "integrity": "sha512-erAaIpFoS77/0/Z2EdNXMI5Kd0jTZvS17Cl/753klHvV7IFgdqD7GPUmiACPN52yOc6iHBwuDuPR1sv6Lz6DCA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/codemirror": "5.60.8",
+        "moment": "2.29.4"
+      },
+      "peerDependencies": {
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/orchestrator": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz",
+      "integrity": "sha512-DrQ43ngaJ0e36j2CHyoDoIg1K4zbc78GnTQESebK9vu6hj4W5/pvfSFO/kgM620Yd0YnhseSNYsLK3/SszZ5NQ==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "~0.1.5",
+        "sequencify": "~0.0.7",
+        "stream-consume": "~0.1.0"
+      }
+    },
+    "node_modules/ordered-read-streams": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz",
+      "integrity": "sha512-PMX5ehiNri4+lgk9fl09xuPeciGmyPyVUSBwwPT4C/3EHGxoVf7UdgKDE3SLBD4pUDmlzrg1L1cK5igrp+Tyuw==",
+      "dev": true
+    },
+    "node_modules/os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/parse-filepath": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
+      "integrity": "sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==",
+      "dev": true,
+      "dependencies": {
+        "is-absolute": "^1.0.0",
+        "map-cache": "^0.2.0",
+        "path-root": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/parse-node-version": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
+      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/parse-passwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+      "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "node_modules/path-root": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
+      "integrity": "sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==",
+      "dev": true,
+      "dependencies": {
+        "path-root-regex": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-root-regex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
+      "integrity": "sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/plugin-error": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
+      "integrity": "sha512-WzZHcm4+GO34sjFMxQMqZbsz3xiNEgonCskQ9v+IroMmYgk/tas8dG+Hr2D6IbRPybZ12oWpzE/w3cGJ6FJzOw==",
+      "dev": true,
+      "dependencies": {
+        "ansi-cyan": "^0.1.1",
+        "ansi-red": "^0.1.1",
+        "arr-diff": "^1.0.1",
+        "arr-union": "^2.0.1",
+        "extend-shallow": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/plugin-error/node_modules/arr-diff": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
+      "integrity": "sha512-OQwDZUqYaQwyyhDJHThmzId8daf4/RFNLaeh3AevmSeZ5Y7ug4Ga/yKc6l6kTZOBW781rCj103ZuTh8GAsB3+Q==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.0.1",
+        "array-slice": "^0.2.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/plugin-error/node_modules/array-slice": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+      "integrity": "sha512-rlVfZW/1Ph2SNySXwR9QYkChp8EkOEiTMO5Vwx60usw04i4nWemkm9RXmQqgkQFaLHsqLuADvjp6IfgL9l2M8Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/plugin-error/node_modules/extend-shallow": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
+      "integrity": "sha512-L7AGmkO6jhDkEBBGWlLtftA80Xq8DipnrRPr0pyi7GQLXkaq9JYA4xF4z6qnadIC6euiTDKco0cGSU9muw+WTw==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/plugin-error/node_modules/kind-of": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+      "integrity": "sha512-aUH6ElPnMGon2/YkxRIigV32MOpTVcoXQ1Oo8aYn40s+sJ3j+0gFZsT8HKDcxNy7Fi9zuquWtGaGAahOdv5p/g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pretty-hrtime": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
+      "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/rechoir": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+      "integrity": "sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==",
+      "dev": true,
+      "dependencies": {
+        "resolve": "^1.1.6"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
+      "dev": true
+    },
+    "node_modules/repeat-element": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
+      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/replace-ext": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
+      "integrity": "sha512-AFBWBy9EVRTa/LhEcG8QDP3FvpwZqmvN2QFDuJswFeaVhWnZMp8q3E6Zd90SR04PlIwfGdyVjNyLPyen/ek5CQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/resolve": {
+      "version": "1.22.8",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-dir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+      "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==",
+      "dev": true,
+      "dependencies": {
+        "expand-tilde": "^2.0.0",
+        "global-modules": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
+      "deprecated": "https://github.com/lydell/resolve-url#deprecated",
+      "dev": true
+    },
+    "node_modules/ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true,
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/robust-predicates": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.2.tgz",
+      "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="
+    },
+    "node_modules/rollup": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.4.1.tgz",
+      "integrity": "sha512-idZzrUpWSblPJX66i+GzrpjKE3vbYrlWirUHteoAbjKReZwa0cohAErOYA5efoMmNCdvG9yrJS+w9Kl6csaH4w==",
+      "dev": true,
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
+      "engines": {
+        "node": ">=18.0.0",
+        "npm": ">=8.0.0"
+      },
+      "optionalDependencies": {
+        "@rollup/rollup-android-arm-eabi": "4.4.1",
+        "@rollup/rollup-android-arm64": "4.4.1",
+        "@rollup/rollup-darwin-arm64": "4.4.1",
+        "@rollup/rollup-darwin-x64": "4.4.1",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.4.1",
+        "@rollup/rollup-linux-arm64-gnu": "4.4.1",
+        "@rollup/rollup-linux-arm64-musl": "4.4.1",
+        "@rollup/rollup-linux-x64-gnu": "4.4.1",
+        "@rollup/rollup-linux-x64-musl": "4.4.1",
+        "@rollup/rollup-win32-arm64-msvc": "4.4.1",
+        "@rollup/rollup-win32-ia32-msvc": "4.4.1",
+        "@rollup/rollup-win32-x64-msvc": "4.4.1",
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/rollup-plugin-copy": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-copy/-/rollup-plugin-copy-3.5.0.tgz",
+      "integrity": "sha512-wI8D5dvYovRMx/YYKtUNt3Yxaw4ORC9xo6Gt9t22kveWz1enG9QrhVlagzwrxSC455xD1dHMKhIJkbsQ7d48BA==",
+      "dev": true,
+      "dependencies": {
+        "@types/fs-extra": "^8.0.1",
+        "colorette": "^1.1.0",
+        "fs-extra": "^8.1.0",
+        "globby": "10.0.1",
+        "is-plain-object": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8.3"
+      }
+    },
+    "node_modules/rollup-plugin-copy/node_modules/is-plain-object": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.1.tgz",
+      "integrity": "sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rollup/node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "node_modules/rw": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
+      "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ=="
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
+      "dev": true,
+      "dependencies": {
+        "ret": "~0.1.10"
+      }
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "node_modules/semver": {
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
+      "integrity": "sha512-IrpJ+yoG4EOH8DFWuVg+8H1kW1Oaof0Wxe7cPcXW3x9BjkN/eVo54F15LyqemnDIUYskQWr9qvl/RihmSy6+xQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/sequencify": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz",
+      "integrity": "sha512-YL8BPm0tp6SlXef/VqYpA/ijmTsDP2ZEXzsnqjkaWS7NP7Bfvw18NboL0O8WCIjy67sOCG3MYSK1PB4GC9XdtQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/serialize-javascript": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
+      "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/set-value": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/set-value/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/set-value/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sigmund": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+      "integrity": "sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==",
+      "dev": true
+    },
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/smob": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/smob/-/smob-1.4.1.tgz",
+      "integrity": "sha512-9LK+E7Hv5R9u4g4C3p+jjLstaLe11MDsL21UpYaCNmapvMkYhqCV4A/f/3gyH8QjMyh6l68q9xC85vihY9ahMQ==",
+      "dev": true
+    },
+    "node_modules/snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "dev": true,
+      "dependencies": {
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "dev": true,
+      "dependencies": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-util/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-resolve": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
+      "dev": true,
+      "dependencies": {
+        "atob": "^2.1.2",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/source-map-support/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-url": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
+      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
+      "deprecated": "See https://github.com/lydell/source-map-url#deprecated",
+      "dev": true
+    },
+    "node_modules/sparkles": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
+      "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="
+    },
+    "node_modules/static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
+      "dev": true,
+      "dependencies": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/stream-consume": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz",
+      "integrity": "sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==",
+      "dev": true
+    },
+    "node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true
+    },
+    "node_modules/strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
+      "integrity": "sha512-qVAeAIjblKDp/8Cd0tJdxpe3Iq/HooI7En98alEaMbz4Wedlrcj3WI72dDQSrziRW5IQ0zeBo3JXsmS8RcS9jg==",
+      "dev": true,
+      "dependencies": {
+        "first-chunk-stream": "^1.0.0",
+        "is-utf8": "^0.2.0"
+      },
+      "bin": {
+        "strip-bom": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/style-mod": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.0.tgz",
+      "integrity": "sha512-Ca5ib8HrFn+f+0n4N4ScTIA9iTOQ7MaGS1ylHcoVqW9J7w2w8PzN6g9gKmTYgGEBH8e120+RCmhpje6jC5uGWA==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/supports-color": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+      "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/terser": {
+      "version": "5.24.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.24.0.tgz",
+      "integrity": "sha512-ZpGR4Hy3+wBEzVEnHvstMvqpD/nABNelQn/z2r0fjVWGQsN3bpOLzQlqDxmb4CDZnXq5lpjnQ+mHQLAOpfM5iw==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.8.2",
+        "commander": "^2.20.0",
+        "source-map-support": "~0.5.20"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/terser/node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
+    "node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/through2/node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "dev": true
+    },
+    "node_modules/through2/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/through2/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/tildify": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz",
+      "integrity": "sha512-Y9q1GaV/BO65Z9Yf4NOGMuwt3SGdptkZBnaaKfTQakrDyCLiuO1Kc5wxW4xLdsjzunRtqtOdhekiUFmZbklwYQ==",
+      "dev": true,
+      "dependencies": {
+        "os-homedir": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/time-stamp": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
+      "integrity": "sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-object-path/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "dev": true,
+      "dependencies": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/tslib": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
+      "dev": true
+    },
+    "node_modules/typescript": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz",
+      "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==",
+      "dev": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/unc-path-regex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
+      "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true
+    },
+    "node_modules/union-value": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+      "dev": true,
+      "dependencies": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/union-value/node_modules/arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/union-value/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unique-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz",
+      "integrity": "sha512-L8KM6TdpsoBk6TJTXevbmpub3bATS06Znu3BcfVPVQkFtnh1MFeCZ3gFKCQcji7f7YYiigsO5OR99vqhoNT8nQ==",
+      "dev": true
+    },
+    "node_modules/universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
+      "dev": true,
+      "dependencies": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-value": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+      "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
+      "dev": true,
+      "dependencies": {
+        "get-value": "^2.0.3",
+        "has-values": "^0.1.4",
+        "isobject": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+      "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
+      "dev": true,
+      "dependencies": {
+        "isarray": "1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-values": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+      "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "dev": true
+    },
+    "node_modules/urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
+      "deprecated": "Please see https://github.com/lydell/urix#deprecated",
+      "dev": true
+    },
+    "node_modules/use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/user-home": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
+      "integrity": "sha512-aggiKfEEubv3UwRNqTzLInZpAOmKzwdHqEBmW/hBA/mt99eg+b4VrX6i+IRLxU8+WJYfa33rGwRseg4eElUgsQ==",
+      "dev": true,
+      "bin": {
+        "user-home": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "dev": true
+    },
+    "node_modules/v8flags": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz",
+      "integrity": "sha512-SKfhk/LlaXzvtowJabLZwD4K6SGRYeoxA7KJeISlUMAB/NT4CBkZjMq3WceX2Ckm4llwqYVo8TICgsDYCBU2tA==",
+      "dev": true,
+      "dependencies": {
+        "user-home": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/vinyl": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
+      "integrity": "sha512-P5zdf3WB9uzr7IFoVQ2wZTmUwHL8cMZWJGzLBNCHNZ3NB6HTMsYABtt7z8tAGIINLXyAob9B9a1yzVGMFOYKEA==",
+      "dev": true,
+      "dependencies": {
+        "clone": "^1.0.0",
+        "clone-stats": "^0.0.1",
+        "replace-ext": "0.0.1"
+      },
+      "engines": {
+        "node": ">= 0.9"
+      }
+    },
+    "node_modules/vinyl-fs": {
+      "version": "0.3.14",
+      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz",
+      "integrity": "sha512-9CTKjt8378nhdydwFDTwywKio0n8aqq6xA70g0uypcnTNSCow/gQOwv0L9E2GaKd7EQ3kZl/diBxPSCgcBXESw==",
+      "dev": true,
+      "dependencies": {
+        "defaults": "^1.0.0",
+        "glob-stream": "^3.1.5",
+        "glob-watcher": "^0.0.6",
+        "graceful-fs": "^3.0.0",
+        "mkdirp": "^0.5.0",
+        "strip-bom": "^1.0.0",
+        "through2": "^0.6.1",
+        "vinyl": "^0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/vinyl-fs/node_modules/clone": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
+      "integrity": "sha512-g62n3Kb9cszeZvmvBUqP/dsEJD/+80pDA8u8KqHnAPrVnQ2Je9rVV6opxkhuWCd1kCn2gOibzDKxCtBvD3q5kA==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/vinyl-fs/node_modules/graceful-fs": {
+      "version": "3.0.12",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.12.tgz",
+      "integrity": "sha512-J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg==",
+      "dev": true,
+      "dependencies": {
+        "natives": "^1.1.3"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/vinyl-fs/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/vinyl-fs/node_modules/through2": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+      "integrity": "sha512-RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": ">=1.0.33-1 <1.1.0-0",
+        "xtend": ">=4.0.0 <4.1.0-0"
+      }
+    },
+    "node_modules/vinyl-fs/node_modules/vinyl": {
+      "version": "0.4.6",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+      "integrity": "sha512-pmza4M5VA15HOImIQYWhoXGlGNafCm0QK5BpBUXkzzEwrRxKqBsbAhTfkT2zMcJhUX1G1Gkid0xaV8WjOl7DsA==",
+      "dev": true,
+      "dependencies": {
+        "clone": "^0.2.0",
+        "clone-stats": "^0.0.1"
+      },
+      "engines": {
+        "node": ">= 0.9"
+      }
+    },
+    "node_modules/w3c-keyname": {
+      "version": "2.2.8",
+      "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
+      "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true
+    },
+    "node_modules/xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/yazl": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz",
+      "integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==",
+      "dev": true,
+      "dependencies": {
+        "buffer-crc32": "~0.2.3"
+      }
+    }
+  }
+}
diff --git a/package.json b/package.json
index 0e7d909..dce1145 100644
--- a/package.json
+++ b/package.json
@@ -4,35 +4,33 @@
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
-    "dev": "rollup --config rollup.config.dev.js -w",
-    "build": "rollup --config rollup.config.build.js",
+    "dev": "rollup --config rollup.config.dev.mjs -w",
+    "build": "rollup --config rollup.config.build.mjs",
     "zip": "gulp"
   },
   "keywords": [],
   "author": "pyrochlore",
   "license": "MIT",
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^15.1.0",
-    "@rollup/plugin-node-resolve": "^9.0.0",
-    "@rollup/plugin-typescript": "^6.0.0",
-    "@types/d3": "^6.3.0",
-    "@types/moment": "^2.13.0",
-    "@types/node": "^14.14.2",
-    "@types/sprintf-js": "^1.1.2",
-    "@types/yaml": "^1.9.7",
-    "gulp": "^4.0.2",
-    "gulp-zip": "^5.1.0",
+    "@rollup/plugin-commonjs": "^25.0.7",
+    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-terser": "^0.4.4",
+    "@rollup/plugin-typescript": "^11.1.5",
+    "@types/d3": "^7.4.3",
+    "@types/node": "^20.9.1",
+    "@types/sprintf-js": "^1.1.4",
+    "gulp": "^3.9.1",
+    "gulp-zip": "^4.2.0",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-    "rollup": "^2.32.1",
-    "rollup-plugin-copy": "^3.4.0",
-    "rollup-plugin-terser": "^7.0.2",
-    "tslib": "^2.0.3",
-    "typescript": "^4.0.3"
+    "rollup": "^4.4.1",
+    "rollup-plugin-copy": "^3.5.0",
+    "tslib": "^2.6.2",
+    "typescript": "^5.2.2"
   },
   "dependencies": {
-    "d3": "^6.5.0",
+    "d3": "^7.8.5",
     "d3-interpolate": "^3.0.1",
-    "jsep": "^0.4.0",
-    "sprintf-js": "^1.1.2"
+    "jsep": "^1.3.8",
+    "sprintf-js": "^1.1.3"
   }
 }
diff --git a/rollup.config.build.js b/rollup.config.build.mjs
similarity index 93%
rename from rollup.config.build.js
rename to rollup.config.build.mjs
index 9436f78..f5313c8 100644
--- a/rollup.config.build.js
+++ b/rollup.config.build.mjs
@@ -1,7 +1,7 @@
 import typescript from '@rollup/plugin-typescript';
 import { nodeResolve } from '@rollup/plugin-node-resolve';
 import commonjs from '@rollup/plugin-commonjs';
-import { terser } from "rollup-plugin-terser";
+import terser from "@rollup/plugin-terser";
 
 export default {
   input: 'src/main.ts',
diff --git a/rollup.config.dev.js b/rollup.config.dev.mjs
similarity index 100%
rename from rollup.config.dev.js
rename to rollup.config.dev.mjs

From ff4628d004da0cba3a659f1e68d1932ab30612ba Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Thu, 16 Nov 2023 20:00:03 -0700
Subject: [PATCH 288/402] Release 1.13.0

---
 README.md            | 33 ++++++++++++++----
 docs/ReleaseNotes.md | 79 ++++++++++++++++++++++++++++++++++----------
 manifest.json        |  2 +-
 package.json         |  2 +-
 versions.json        |  3 +-
 5 files changed, 92 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md
index e47a2e9..b0acf0e 100644
--- a/README.md
+++ b/README.md
@@ -10,49 +10,66 @@ This is an [Obsidian](https://obsidian.md/) plugin that helps you collect data f
 
 ## What's New
 
+Version 1.13.0
+
+- Add support for inline dataview fields (including emoji support for values)
+- Update dependencies
+
 Version 1.12.0
-* Add aspect ratio parameter for graphs
-* Reorganize release notes in readme to be in descending order (latest release first)
+
+- Add aspect ratio parameter for graphs
+- Reorganize release notes in readme to be in descending order (latest release first)
 
 Version 1.11.0
-* Add support for checkboxes in new properties added in Obsidian 1.4
-* Fix typos in documentation and examples
+
+- Add support for checkboxes in new properties added in Obsidian 1.4
+- Fix typos in documentation and examples
 
 Version 1.10.9
+
 - Replace tab characters by spaces
 - Accept more unicode characters in dvField
 - Allow emojis in the folder path
 - Fixed bugs
 
 Version 1.10.8
+
 - Fixed startDat/endDate misread as a relative date
 
 Version 1.10.7
+
 - Allow using html image tags as emoji inputs
 
 Version 1.10.6
+
 - Fixed the coloring for missing data in the month view
 
 Version 1.10.5
+
 - Allow using a relative date value in `initMonth` in the month view
 
 Version 1.10.4
+
 - Allow using a regular expression as a key of the parameter `textValueMap`
 - Add a parameter `shiftOnlyValueLargerThan` to determine when to do `valueShift`
 - Fixed bugs reported by users
 - Fixed typo in plugin settings
 
 Version 1.10.3
+
 - Allow using the parameter `fitPanelWidth` with the output type `month` and `pie`
 - Fixed the resizing and positioning of the chart tooltip
 
 Version 1.10.2
+
 - Fixed plugin not rendering on some macOS machines
 
 Version 1.10.1
+
 - Fixed 'failed to load plugin' on iOS
 
 Version 1.10.0
+
 - Add annotation mode for month view ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestCalendar.md))
 - Add parameters `xAxisTickInterval`, `yAxisTickInterval`, `xAxisTickLabelFormat` and `yAxisTickLabelFormat` for the line and bar chart ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestAxisIntervalAndFormat.md))
 - Allow using regular expression in parameter `dateFormatPrefix` and `dateFormatSuffix` ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md))
@@ -75,11 +92,12 @@ From version 1.9.0, template variables, e.g. '{{sum}}', are deprecated. Instead,
 For more use cases, please download and open the [examples](https://github.com/pyrochlore/obsidian-tracker/tree/master/examples) folder in obsidian with this plugin installed and enabled.
 
 ## More Details You May Want to Know
+
 - [Installation](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Installation.md): Install the plugin from Obsidian or install it manually
 - [Concepts](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Concepts.md): Explain how this plugin works and what to setup
-    - [Target Evaluation](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TargetEvaluation.md)
-    - [Input Parameters](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md)
-    - [Expressions](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Expressions.md)
+  - [Target Evaluation](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TargetEvaluation.md)
+  - [Input Parameters](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md)
+  - [Expressions](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Expressions.md)
 - [Examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Examples.md)
 - [Plugin Settings](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Settings.md)
 - [Release Notes](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/ReleaseNotes.md)
@@ -87,5 +105,6 @@ For more use cases, please download and open the [examples](https://github.com/p
 - [Frequently Asked Questions](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Questions.md)
 
 ## Support
+
 - If you like this plugin or want to support further development, you can [Buy Me a Coffee](https://www.buymeacoffee.com/pyrochlore).
 - Please report bugs and request features in [GitHub Issues](https://github.com/pyrochlore/obsidian-tracker/issues)
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index 9453853..3876b5e 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,40 +1,65 @@
 # Release Notes
 
+## 1.13.0
+
+- Add support for inline dataview fields (including emoji support for values)
+- Update dependencies
+
+## 1.12.0
+
+- Add aspect ratio parameter for graphs
+- Reorganize release notes in readme to be in descending order (latest release first)
+
+## 1.11.0
+
+- Add support for checkboxes in new properties added in Obsidian 1.4
+- Fix typos in documentation and examples
+
 ## v1.10.9
+
 - Replace tab characters by spaces
 - Accept more unicode characters in dvField
 - Allow emojis in the folder path
 - Fixed bugs
 
 ## v1.10.8
+
 - Fixed startDat/endDate misread as a relative date
 
 ## v1.10.7
+
 - Allow using html image tags as emoji inputs
 
 ## v1.10.6
+
 - Fixed the coloring for missing data in the month view
 
 ## v1.10.5
+
 - Allow using a relative date value in `initMonth` in the month view
 
 ## v1.10.4
+
 - Allow using a regular expression as a key of the parameter `textValueMap`
 - Add a parameter `shiftOnlyValueLargerThan` to determine when to do `valueShift`
 - Fixed bugs reported by users
 - Fixed typo in plugin settings
 
 ## v1.10.3
+
 - Allow using the parameter `fitPanelWidth` with the output type `month` and `pie`
 - Fixed the resizing and positioning of the chart tooltip
 
 ## v1.10.2
+
 - Fixed plugin not rendering on some macOS machines
 
 ## v1.10.1
+
 - Fixed 'failed to load plugin' on iOS
 
 ## v1.10.0
+
 - Add annotation mode for month view ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestCalendar.md))
 - Add parameters `xAxisTickInterval`, `yAxisTickInterval`, `xAxisTickLabelFormat` and `yAxisTickLabelFormat` for the line and bar chart ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestAxisIntervalAndFormat.md))
 - Allow using regular expression in parameter `dateFormatPrefix` and `dateFormatSuffix` ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md))
@@ -44,72 +69,85 @@
 - Enhanced error messages
 
 ## v1.9.2
+
 - Allow using seconds in time values
 - Fixed error parsing `dvField`
 
 ## v1.9.1
+
 - Fixed errors on collecting time values from `dvField`
 - Fixed errors on collecting wiki while fileCache.links is undefined
 
 ## v1.9.0
+
 - Add a new output type `pie`, rendering a pie chart ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestPieChart.md))
 - Allow expressions (operators and functions) as data inputs for output type `summary`, `bullet`, and `pie` (examples: [expression](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestExpression.md), [summary](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestSummary.md), [bullet](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestBullet.md), [pie](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestPieChart.md))
 - Allow formatting evaluated expressions by a follwing format string ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestExpression.md))
 
 ## v1.8.2
+
 - Fixed tasks searching not working for multiple targets
 
 ## v1.8.1
+
 - Fixed bugs while using month view with parameter `xDataset`
 
 ## v1.8.0
+
 - Add a new `searchType` `task`, retrieving data from tasks ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTask.md))
 - Enhancement
-    - Month view ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestCalendar.md))
-        - Add parameter `circleColorByValue` to show color based on the value
-        - Support multiple targets (dataset), change the dataset by clicking the header 
-        - Add a button (◦) to show current month
-    - Accept ISO-8601 date as `dateFormat` ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md#iso-8601-date-format))
-    - Relative date input for `startDate` and `endDate` ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md#relative-date-input-for-startdate-and-enddate))
+  - Month view ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestCalendar.md))
+    - Add parameter `circleColorByValue` to show color based on the value
+    - Support multiple targets (dataset), change the dataset by clicking the header
+    - Add a button (◦) to show current month
+  - Accept ISO-8601 date as `dateFormat` ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md#iso-8601-date-format))
+  - Relative date input for `startDate` and `endDate` ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md#relative-date-input-for-startdate-and-enddate))
 - Fixed missing dvField values at the last line of files
 
 ## v1.7.0
+
 - Add a new output type 'month', rendering a month view for a given dataset ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestCalendar.md))
 
 ## v1.6.1
+
 - Add new targets 'numWords', 'numChars', and 'numSentences' for input type 'fileMeta' ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestWordCounting.md))
 
 ## v1.6.0
+
 - Add a new input type 'fileMeta', getting meta data from a file ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestFileMeta.md))
 - Add a new output type 'bullet', rendering a bullet chart ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestBullet.md))
 - Enhancement
-    - Accept tracking time values ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTimeValues.md))
-    - Allow tracking nested values from front matter
-    - Allow using dataset with date values as xDataset ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestXDataset.md))
-    - Add more template variables ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTemplateVariables.md))
-    - Allow parsing date in wiki brackets
+  - Accept tracking time values ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTimeValues.md))
+  - Allow tracking nested values from front matter
+  - Allow using dataset with date values as xDataset ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestXDataset.md))
+  - Add more template variables ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTemplateVariables.md))
+  - Allow parsing date in wiki brackets
 - Fixed bugs
 
 ## v1.5.1
+
 - Fixed labels not shown in light theme
 - Enhanced error handling for searchType 'table'
 
 ## v1.5.0
+
 - New searchType 'table', searching records from a given table
 - New searchType 'dvField', searching the inline fields used with Dataview plugin
 - Enhance multiple values extraction
-    - Allow using multiple values in searchType 'text'
-    - Allow using array values in searchType 'frontmatter'
-    - Allow using multiple values in searchType 'dvField'
-    - Allow using multiple values in searchType 'table'
-    - Allow using custom separator for multiple values extraction
+  - Allow using multiple values in searchType 'text'
+  - Allow using array values in searchType 'frontmatter'
+  - Allow using multiple values in searchType 'dvField'
+  - Allow using multiple values in searchType 'table'
+  - Allow using custom separator for multiple values extraction
 - Improved performance
 - Reduced package size
 
 ## v1.4.1
+
 - Enhanced error handling
 
 ## v1.4.0
+
 - Add a new parameter (fixedScale) for the scaling of the output chart
 - Add a new parameter (fitPanelWidth) to enable/disable the auto-scaling of the output chart
 - Add a new parameter (margin) to help to position the chart
@@ -117,6 +155,7 @@
 - Fixed bugs
 
 ## v1.3.0
+
 - Support reading and rendering multiple targets
 - Support reading and rendering multiple values (a tuple of values) under a target
 - New output type 'bar', rendering a bar chart
@@ -124,33 +163,39 @@
 - Fixed bugs
 
 ## v1.2.1
+
 - Fixed files with the specified dateFormat are not recognized
 - Restored the plugin's settings panel for dateFormat and folder
 
 ## v1.2.0
+
 - Enable using regular expression in text searching
 - New search type 'frontmatter', searching for key-value pairs in the front matter
 - New search type 'wiki', searching for wiki links
 - Reduced package size
 
 ## v1.1.0
+
 - New output type 'summary'
 - Add commands help create Tracker code blocks
 - Relaxed the regex for searching tags, allowing tags embedded in sentences
 - Fixed issues
 
 ## v1.0.2
+
 - Fixed the searching of nested tag in frontmatter
 - Reduced the package size by using the module from Obsidian
 
 ## v1.0.1
+
 - Remove dependencies to Node.js modules
 - Add example markdown files
 
 ## v1.0.0
+
 First version released at 2021-03-23
 
 - Track simple tags, value-attached tags, and texts using code blocks
 - Represent the tracked data in a customizable line chart
 - Allow tracking in-line tags and tags in frontmatter
-- Allow tracking nested tags
\ No newline at end of file
+- Allow tracking nested tags
diff --git a/manifest.json b/manifest.json
index 6b71779..6d55e6d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "id": "obsidian-tracker",
   "name": "Tracker",
-  "version": "1.12.0",
+  "version": "1.13.0",
   "minAppVersion": "0.9.12",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "author": "pyrochlore",
diff --git a/package.json b/package.json
index dce1145..0e9409f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.12.0",
+  "version": "1.13.0",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
diff --git a/versions.json b/versions.json
index 93de177..acde4e3 100644
--- a/versions.json
+++ b/versions.json
@@ -30,5 +30,6 @@
   "1.10.8": "0.9.12",
   "1.10.9": "0.9.12",
   "1.11.0": "0.9.12",
-  "1.12.0": "0.9.12"
+  "1.12.0": "0.9.12",
+  "1.13.0": "0.9.12"
 }

From d2b443fa7b14e15093cc41f78545d6e53165a93c Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Thu, 16 Nov 2023 20:37:32 -0700
Subject: [PATCH 289/402] Fix packaging script

---
 gulpfile.js       |   13 -
 package-lock.json | 3685 ++++++---------------------------------------
 package.json      |    4 +-
 3 files changed, 432 insertions(+), 3270 deletions(-)
 delete mode 100644 gulpfile.js

diff --git a/gulpfile.js b/gulpfile.js
deleted file mode 100644
index a321f1c..0000000
--- a/gulpfile.js
+++ /dev/null
@@ -1,13 +0,0 @@
-const { src, dest } = require("gulp");
-const zip = require("gulp-zip");
-const fs = require("fs");
-
-const manifest = fs.readFileSync("./manifest.json");
-var version = JSON.parse(manifest)["version"];
-var zipFileName = "obsidian-tracker-v" + version + ".zip";
-
-exports.default = function () {
-    return src(["main.js", "manifest.json", "styles.css"])
-        .pipe(zip(zipFileName))
-        .pipe(dest("."));
-};
diff --git a/package-lock.json b/package-lock.json
index 29afbe7..5387a69 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "obsidian-tracker",
-      "version": "1.13.0",
+      "version": "1.13.1",
       "license": "MIT",
       "dependencies": {
         "d3": "^7.8.5",
@@ -22,8 +22,6 @@
         "@types/d3": "^7.4.3",
         "@types/node": "^20.9.1",
         "@types/sprintf-js": "^1.1.4",
-        "gulp": "^3.9.1",
-        "gulp-zip": "^4.2.0",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
         "rollup": "^4.4.1",
         "rollup-plugin-copy": "^3.5.0",
@@ -168,46 +166,6 @@
         }
       }
     },
-    "node_modules/@rollup/plugin-commonjs/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/@rollup/plugin-commonjs/node_modules/glob": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
-      "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^5.0.1",
-        "once": "^1.3.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/@rollup/plugin-commonjs/node_modules/minimatch": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@rollup/plugin-node-resolve": {
       "version": "15.2.3",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.3.tgz",
@@ -507,218 +465,218 @@
       }
     },
     "node_modules/@types/d3-array": {
-      "version": "2.12.7",
-      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-2.12.7.tgz",
-      "integrity": "sha512-SVvxzxRVnIgtJbNTj5ZVJ9CZkVOANCpW0nQbRi7EOU5Q9G+JQQjXD2SCpr1OYCX09b3Yr7o0+CBofZAgU42rbQ==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.1.tgz",
+      "integrity": "sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg==",
       "dev": true
     },
     "node_modules/@types/d3-axis": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/@types/d3-axis/-/d3-axis-2.1.6.tgz",
-      "integrity": "sha512-X/CazlQun7XcSbRhaxwr605neUIGiUeURvsOGAIdvH1nD6o25pzkdxPNe7XcTKyRJeShlubjsUEG9tNeZZdRaQ==",
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-axis/-/d3-axis-3.0.6.tgz",
+      "integrity": "sha512-pYeijfZuBd87T0hGn0FO1vQ/cgLk6E1ALJjfkC0oJ8cbwkZl3TpgS8bVBLZN+2jjGgg38epgxb2zmoGtSfvgMw==",
       "dev": true,
       "dependencies": {
-        "@types/d3-selection": "^2"
+        "@types/d3-selection": "*"
       }
     },
     "node_modules/@types/d3-brush": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@types/d3-brush/-/d3-brush-2.1.5.tgz",
-      "integrity": "sha512-ycizd1l+vIceUIO+JA6HAjivlXSGlDbqKXe4Q8cjUPtY/NMkz6CvpcBqzLPRa9iMDqRnUQHwSIEakb0sX+PM2A==",
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-brush/-/d3-brush-3.0.6.tgz",
+      "integrity": "sha512-nH60IZNNxEcrh6L1ZSMNA28rj27ut/2ZmI3r96Zd+1jrZD++zD3LsMIjWlvg4AYrHn/Pqz4CF3veCxGjtbqt7A==",
       "dev": true,
       "dependencies": {
-        "@types/d3-selection": "^2"
+        "@types/d3-selection": "*"
       }
     },
     "node_modules/@types/d3-chord": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@types/d3-chord/-/d3-chord-2.0.6.tgz",
-      "integrity": "sha512-PTZyfJ7z9Ttl7joKRfyBl0icMYAMRj4n5trsE9Iinipp8Fe0DlwK6xwboWWMTEaj6Vzko68brnpvpoDl4qAKwA==",
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-chord/-/d3-chord-3.0.6.tgz",
+      "integrity": "sha512-LFYWWd8nwfwEmTZG9PfQxd17HbNPksHBiJHaKuY1XeqscXacsS2tyoo6OdRsjf+NQYeB6XrNL3a25E3gH69lcg==",
       "dev": true
     },
     "node_modules/@types/d3-color": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-2.0.6.tgz",
-      "integrity": "sha512-tbaFGDmJWHqnenvk3QGSvD3RVwr631BjKRD7Sc7VLRgrdX5mk5hTyoeBL6rXZaeoXzmZwIl1D2HPogEdt1rHBg==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz",
+      "integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==",
       "dev": true
     },
     "node_modules/@types/d3-contour": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@types/d3-contour/-/d3-contour-2.0.7.tgz",
-      "integrity": "sha512-oJNOYtQzKY+04lhEr4aTnW2IrCVK5jiF2YMJf687HV5dIGsOgM8Xc15uSuu9zu4FYOJJ/FTqVaspHFR9pxVNTg==",
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-contour/-/d3-contour-3.0.6.tgz",
+      "integrity": "sha512-BjzLgXGnCWjUSYGfH1cpdo41/hgdWETu4YxpezoztawmqsvCeep+8QGfiY6YbDvfgHz/DkjeIkkZVJavB4a3rg==",
       "dev": true,
       "dependencies": {
-        "@types/d3-array": "^2",
+        "@types/d3-array": "*",
         "@types/geojson": "*"
       }
     },
     "node_modules/@types/d3-delaunay": {
-      "version": "5.3.4",
-      "resolved": "https://registry.npmjs.org/@types/d3-delaunay/-/d3-delaunay-5.3.4.tgz",
-      "integrity": "sha512-GEQuDXVKQvHulQ+ecKyCubOmVjXrifAj7VR26rWVAER/IbWemaT/Tmo84ESiTtoDghg5ILdMZH7pYXQEt/Vu9A==",
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
+      "integrity": "sha512-ZMaSKu4THYCU6sV64Lhg6qjf1orxBthaC161plr5KuPHo3CNm8DTHiLw/5Eq2b6TsNP0W0iJrUOFscY6Q450Hw==",
       "dev": true
     },
     "node_modules/@types/d3-dispatch": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/d3-dispatch/-/d3-dispatch-2.0.4.tgz",
-      "integrity": "sha512-63uJJO3Eflu1tYXjD+Gmkk5Bc/ribIWyCnOfAY+WB9ihBw7Tdd1IRKZ34ASxy+Dzlg+lOT5+ZHCSZw0V+UNAEQ==",
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-dispatch/-/d3-dispatch-3.0.6.tgz",
+      "integrity": "sha512-4fvZhzMeeuBJYZXRXrRIQnvUYfyXwYmLsdiN7XXmVNQKKw1cM8a5WdID0g1hVFZDqT9ZqZEY5pD44p24VS7iZQ==",
       "dev": true
     },
     "node_modules/@types/d3-drag": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@types/d3-drag/-/d3-drag-2.0.5.tgz",
-      "integrity": "sha512-VbvN7t3TelH6R0cKVXkOXmDiC7pRhtoodiPZ94p0n9TayGqg0Z/5vSxsPelVsZyVzloEo2kdZ7BO1n9ezWux+w==",
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-drag/-/d3-drag-3.0.7.tgz",
+      "integrity": "sha512-HE3jVKlzU9AaMazNufooRJ5ZpWmLIoc90A37WU2JMmeq28w1FQqCZswHZ3xR+SuxYftzHq6WU6KJHvqxKzTxxQ==",
       "dev": true,
       "dependencies": {
-        "@types/d3-selection": "^2"
+        "@types/d3-selection": "*"
       }
     },
     "node_modules/@types/d3-dsv": {
-      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/@types/d3-dsv/-/d3-dsv-2.0.9.tgz",
-      "integrity": "sha512-mjbmiSz8p7rCCyan4Ai6Rxqtp4MW447RfyKPfE1VaFl61l/nkLsFObF26X279eQMjHqGKDI2kdx26qEdkLAVBQ==",
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-dsv/-/d3-dsv-3.0.7.tgz",
+      "integrity": "sha512-n6QBF9/+XASqcKK6waudgL0pf/S5XHPPI8APyMLLUHd8NqouBGLsU8MgtO7NINGtPBtk9Kko/W4ea0oAspwh9g==",
       "dev": true
     },
     "node_modules/@types/d3-ease": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-2.0.4.tgz",
-      "integrity": "sha512-DGh1MzShlCPTTau4+C8JLJjKt9sT9LgGZokYFx8fSxy+Z6fHns/Lc+lwTc4owuq8FwCDg7Mw2/mp0G8S5DBm7Q==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.2.tgz",
+      "integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==",
       "dev": true
     },
     "node_modules/@types/d3-fetch": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@types/d3-fetch/-/d3-fetch-2.0.5.tgz",
-      "integrity": "sha512-azKhvVVUbAK6sJy22b9t8TtsGmPlauU9aGVLSP5cGYSWMCbtMRf3nGz58Eu+UgP1u3VEK+12JVc4HB1MMeVaSg==",
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-fetch/-/d3-fetch-3.0.7.tgz",
+      "integrity": "sha512-fTAfNmxSb9SOWNB9IoG5c8Hg6R+AzUHDRlsXsDZsNp6sxAEOP0tkP3gKkNSO/qmHPoBFTxNrjDprVHDQDvo5aA==",
       "dev": true,
       "dependencies": {
-        "@types/d3-dsv": "^2"
+        "@types/d3-dsv": "*"
       }
     },
     "node_modules/@types/d3-force": {
-      "version": "2.1.7",
-      "resolved": "https://registry.npmjs.org/@types/d3-force/-/d3-force-2.1.7.tgz",
-      "integrity": "sha512-x5pvWw0HUBrcpMaMOd70ICEL27gOeC9hyhilTc+OP+4tErgEg3w+fZWA475eTrG7gi8BB0TNdfGRprpy09Vo9A==",
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@types/d3-force/-/d3-force-3.0.9.tgz",
+      "integrity": "sha512-IKtvyFdb4Q0LWna6ymywQsEYjK/94SGhPrMfEr1TIc5OBeziTi+1jcCvttts8e0UWZIxpasjnQk9MNk/3iS+kA==",
       "dev": true
     },
     "node_modules/@types/d3-format": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@types/d3-format/-/d3-format-2.0.5.tgz",
-      "integrity": "sha512-ntJZQfz4BK8m53vkUVk+3PE7PHr9esrfVkClxebcMNP/4N1F0rPdzv9hKNqx2gZBRHSYg1kQumeUDIrHDpQGwQ==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-format/-/d3-format-3.0.4.tgz",
+      "integrity": "sha512-fALi2aI6shfg7vM5KiR1wNJnZ7r6UuggVqtDA+xiEdPZQwy/trcQaHnwShLuLdta2rTymCNpxYTiMZX/e09F4g==",
       "dev": true
     },
     "node_modules/@types/d3-geo": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-2.0.7.tgz",
-      "integrity": "sha512-RIXlxPdxvX+LAZFv+t78CuYpxYag4zuw9mZc+AwfB8tZpKU90rMEn2il2ADncmeZlb7nER9dDsJpRisA3lRvjA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-3.1.0.tgz",
+      "integrity": "sha512-856sckF0oP/diXtS4jNsiQw/UuK5fQG8l/a9VVLeSouf1/PPbBE1i1W852zVwKwYCBkFJJB7nCFTbk6UMEXBOQ==",
       "dev": true,
       "dependencies": {
         "@types/geojson": "*"
       }
     },
     "node_modules/@types/d3-hierarchy": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@types/d3-hierarchy/-/d3-hierarchy-2.0.5.tgz",
-      "integrity": "sha512-t/xXqB6MXT6Hp0BgFV00ZonpZbs9fUtYPM3QzqOlmghefovpnnxEN7mAdUqE/mNinRI/eR8gewDAobFJA0TNBw==",
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-hierarchy/-/d3-hierarchy-3.1.6.tgz",
+      "integrity": "sha512-qlmD/8aMk5xGorUvTUWHCiumvgaUXYldYjNVOWtYoTYY/L+WwIEAmJxUmTgr9LoGNG0PPAOmqMDJVDPc7DOpPw==",
       "dev": true
     },
     "node_modules/@types/d3-interpolate": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-2.0.5.tgz",
-      "integrity": "sha512-UINE41RDaUMbulp+bxQMDnhOi51rh5lA2dG+dWZU0UY/IwQiG/u2x8TfnWYU9+xwGdXsJoAvrBYUEQl0r91atg==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz",
+      "integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==",
       "dev": true,
       "dependencies": {
-        "@types/d3-color": "^2"
+        "@types/d3-color": "*"
       }
     },
     "node_modules/@types/d3-path": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-2.0.4.tgz",
-      "integrity": "sha512-jjZVLBjEX4q6xneKMmv62UocaFJFOTQSb/1aTzs3m3ICTOFoVaqGBHpNLm/4dVi0/FTltfBKgmOK1ECj3/gGjA==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.0.2.tgz",
+      "integrity": "sha512-WAIEVlOCdd/NKRYTsqCpOMHQHemKBEINf8YXMYOtXH0GA7SY0dqMB78P3Uhgfy+4X+/Mlw2wDtlETkN6kQUCMA==",
       "dev": true
     },
     "node_modules/@types/d3-polygon": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/d3-polygon/-/d3-polygon-2.0.3.tgz",
-      "integrity": "sha512-4hwYYp/KDSNDdBFhf08SifGD7YJgMyUuDulnMsAGVi9X2w5QvdB47wlXMiJr+rdiBKALMq3VJ/i8qKy9gUzCbg==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-polygon/-/d3-polygon-3.0.2.tgz",
+      "integrity": "sha512-ZuWOtMaHCkN9xoeEMr1ubW2nGWsp4nIql+OPQRstu4ypeZ+zk3YKqQT0CXVe/PYqrKpZAi+J9mTs05TKwjXSRA==",
       "dev": true
     },
     "node_modules/@types/d3-quadtree": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@types/d3-quadtree/-/d3-quadtree-2.0.5.tgz",
-      "integrity": "sha512-4eArsbkJTAAfFCDVtVrOlkmHJ/Er0zuL1bUAM7nMbwufIUHXAWYu+081tylzSdiZpcUo2vSJjfgNDtLnsDUoxw==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@types/d3-quadtree/-/d3-quadtree-3.0.5.tgz",
+      "integrity": "sha512-Cb1f3jyNBnvMMkf4KBZ7IgAQVWd9yzBwYcrxGqg3aPCUgWELAS+nyeB7r76aqu1e3+CGDjhk4BrWaFBekMwigg==",
       "dev": true
     },
     "node_modules/@types/d3-random": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/@types/d3-random/-/d3-random-2.2.3.tgz",
-      "integrity": "sha512-Ghs4R3CcgJ3o6svszRzIH4b8PPYex/COo+rhhZjDAs+bVducXwjmVSi27WcDOaLLCBV2t3tfVH9bYXAL76IvQA==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-random/-/d3-random-3.0.3.tgz",
+      "integrity": "sha512-Imagg1vJ3y76Y2ea0871wpabqp613+8/r0mCLEBfdtqC7xMSfj9idOnmBYyMoULfHePJyxMAw3nWhJxzc+LFwQ==",
       "dev": true
     },
     "node_modules/@types/d3-scale": {
-      "version": "3.3.5",
-      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-3.3.5.tgz",
-      "integrity": "sha512-YOpKj0kIEusRf7ofeJcSZQsvKbnTwpe1DUF+P2qsotqG53kEsjm7EzzliqQxMkAWdkZcHrg5rRhB4JiDOQPX+A==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.8.tgz",
+      "integrity": "sha512-gkK1VVTr5iNiYJ7vWDI+yUFFlszhNMtVeneJ6lUTKPjprsvLLI9/tgEGiXJOnlINJA8FyA88gfnQsHbybVZrYQ==",
       "dev": true,
       "dependencies": {
-        "@types/d3-time": "^2"
+        "@types/d3-time": "*"
       }
     },
     "node_modules/@types/d3-scale-chromatic": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-2.0.3.tgz",
-      "integrity": "sha512-/G5A5ioXNfOAb6E4X6YkJ9u0ryWLVrSkTwvO2DohXQ2zSvgqDOhWU/uj3JVhBrEnGiG+nQSjqXujsl710jSfMw==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.0.2.tgz",
+      "integrity": "sha512-kpKNZMDT3OAX6b5ct5nS/mv6LULagnUy4DmS6yyNjclje1qVe7vbjPwY3q1TGz6+Wr2IUkgFatCzqYUl54fHag==",
       "dev": true
     },
     "node_modules/@types/d3-selection": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-2.0.4.tgz",
-      "integrity": "sha512-5a21DF7avVPmiUau8KTsv5r76yGqbMgq4QtByoCBPXUrVFWFkd3Ob4OOhmePNRbQqfUCNFjgB4sO7sUURnKcBg==",
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.10.tgz",
+      "integrity": "sha512-cuHoUgS/V3hLdjJOLTT691+G2QoqAjCVLmr4kJXR4ha56w1Zdu8UUQ5TxLRqudgNjwXeQxKMq4j+lyf9sWuslg==",
       "dev": true
     },
     "node_modules/@types/d3-shape": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-2.1.6.tgz",
-      "integrity": "sha512-UvUXi3uJk7i9gstNlyh/+lidKy96AVp6lG6it586lYVIHjS2oRKkOSfaWdON6+Ziu+EqB8kbN3onxk+eP2wSmw==",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.5.tgz",
+      "integrity": "sha512-dfEWpZJ1Pdg8meLlICX1M3WBIpxnaH2eQV2eY43Y5ysRJOTAV9f3/R++lgJKFstfrEOE2zdJ0sv5qwr2Bkic6Q==",
       "dev": true,
       "dependencies": {
-        "@types/d3-path": "^2"
+        "@types/d3-path": "*"
       }
     },
     "node_modules/@types/d3-time": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-2.1.4.tgz",
-      "integrity": "sha512-BTfLsxTeo7yFxI/haOOf1ZwJ6xKgQLT9dCp+EcmQv87Gox6X+oKl4mLKfO6fnWm3P22+A6DknMNEZany8ql2Rw==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.3.tgz",
+      "integrity": "sha512-2p6olUZ4w3s+07q3Tm2dbiMZy5pCDfYwtLXXHUnVzXgQlZ/OyPtUz6OL382BkOuGlLXqfT+wqv8Fw2v8/0geBw==",
       "dev": true
     },
     "node_modules/@types/d3-time-format": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-3.0.4.tgz",
-      "integrity": "sha512-or9DiDnYI1h38J9hxKEsw513+KVuFbEVhl7qdxcaudoiqWWepapUen+2vAriFGexr6W5+P4l9+HJrB39GG+oRg==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-4.0.3.tgz",
+      "integrity": "sha512-5xg9rC+wWL8kdDj153qZcsJ0FWiFt0J5RB6LYUNZjwSnesfblqrI/bJ1wBdJ8OQfncgbJG5+2F+qfqnqyzYxyg==",
       "dev": true
     },
     "node_modules/@types/d3-timer": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-2.0.3.tgz",
-      "integrity": "sha512-jhAJzaanK5LqyLQ50jJNIrB8fjL9gwWZTgYjevPvkDLMU+kTAZkYsobI59nYoeSrH1PucuyJEi247Pb90t6XUg==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.2.tgz",
+      "integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==",
       "dev": true
     },
     "node_modules/@types/d3-transition": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-2.0.5.tgz",
-      "integrity": "sha512-G+ne0FD8EK76ejXuB1sszSoPRDdTf+FDx6D3ilwYehfcQpo3WAY0xxkjXTQiP9Tu26qSNA7kyZ07PXZPby/Gdg==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-3.0.8.tgz",
+      "integrity": "sha512-ew63aJfQ/ms7QQ4X7pk5NxQ9fZH/z+i24ZfJ6tJSfqxJMrYLiK01EAs2/Rtw/JreGUsS3pLPNV644qXFGnoZNQ==",
       "dev": true,
       "dependencies": {
-        "@types/d3-selection": "^2"
+        "@types/d3-selection": "*"
       }
     },
     "node_modules/@types/d3-zoom": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-2.0.7.tgz",
-      "integrity": "sha512-JWke4E8ZyrKUQ68ESTWSK16fVb0OYnaiJ+WXJRYxKLn4aXU0o4CLYxMWBEiouUfO3TTCoyroOrGPcBG6u1aAxA==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-3.0.8.tgz",
+      "integrity": "sha512-iqMC4/YlFCSlO8+2Ii1GGGliCAY4XdeG748w5vQUbevlbDu0zSjH/+jojorQVBK/se0j6DUFNPBGSqD3YWYnDw==",
       "dev": true,
       "dependencies": {
-        "@types/d3-interpolate": "^2",
-        "@types/d3-selection": "^2"
+        "@types/d3-interpolate": "*",
+        "@types/d3-selection": "*"
       }
     },
     "node_modules/@types/estree": {
@@ -800,129 +758,6 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/ansi-cyan": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz",
-      "integrity": "sha512-eCjan3AVo/SxZ0/MyIYRtkpxIu/H3xZN7URr1vXVrISxeyz8fUFz0FJziamK4sS8I+t35y4rHg1b2PklyBe/7A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-wrap": "0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ansi-gray": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
-      "integrity": "sha512-HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw==",
-      "dev": true,
-      "dependencies": {
-        "ansi-wrap": "0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ansi-red": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz",
-      "integrity": "sha512-ewaIr5y+9CUTGFwZfpECUbFlGcC0GCw1oqR9RI6h1gQCd9Aj2GxSckCnPsVJnmfMZbwFYE+leZGASgkWl06Jow==",
-      "dev": true,
-      "dependencies": {
-        "ansi-wrap": "0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ansi-wrap": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
-      "integrity": "sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/archy": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-      "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==",
-      "dev": true
-    },
-    "node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/arr-flatten": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/arr-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
-      "integrity": "sha512-t5db90jq+qdgk8aFnxEkjqta0B/GHrM1pxzuuZz2zWsOXc5nKu3t+76s/PQBA8FTcM/ipspIH9jWG4OxCBc2eA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-differ": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
-      "integrity": "sha512-LeZY+DZDRnvP7eMuQ6LHfCzUGxAAIViUBliK24P3hWXL6y4SortgR6Nim6xrkfSLlmH0+k+9NYNwVC2s53ZrYQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-each": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
-      "integrity": "sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-slice": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
-      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/array-union": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
@@ -932,149 +767,31 @@
         "node": ">=8"
       }
     },
-    "node_modules/array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/assign-symbols": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true,
-      "bin": {
-        "atob": "bin/atob.js"
-      },
-      "engines": {
-        "node": ">= 4.5.0"
-      }
-    },
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true
     },
-    "node_modules/base": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-      "dev": true,
-      "dependencies": {
-        "cache-base": "^1.0.1",
-        "class-utils": "^0.3.5",
-        "component-emitter": "^1.2.1",
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.1",
-        "mixin-deep": "^1.2.0",
-        "pascalcase": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/base/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/beeper": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
-      "integrity": "sha512-3vqtKL1N45I5dV0RdssXZG7X6pCqQrWPNOlBPZPrd+QkE2HEhR57Z04m0KtpbsZH73j+a3F8UD1TQnn+ExTvIA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
       "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "balanced-match": "^1.0.0"
       }
     },
     "node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
       "dev": true,
       "dependencies": {
-        "is-extendable": "^0.1.0"
+        "fill-range": "^7.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/braces/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
+        "node": ">=8"
       }
     },
     "node_modules/buffer-from": {
@@ -1095,206 +812,25 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/cache-base": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
-      "dev": true,
-      "dependencies": {
-        "collection-visit": "^1.0.0",
-        "component-emitter": "^1.2.1",
-        "get-value": "^2.0.6",
-        "has-value": "^1.0.0",
-        "isobject": "^3.0.1",
-        "set-value": "^2.0.0",
-        "to-object-path": "^0.3.0",
-        "union-value": "^1.0.0",
-        "unset-value": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
+    "node_modules/colorette": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz",
+      "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==",
+      "dev": true
     },
-    "node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
-      },
+    "node_modules/commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 10"
       }
     },
-    "node_modules/class-utils": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
-      "dev": true,
-      "dependencies": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-descriptor": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
-      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/clone-buffer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
-      "integrity": "sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/clone-stats": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-      "integrity": "sha512-dhUqc57gSMCo6TX85FLfe51eC/s+Im2MLkAgJwfaRRexR2tA4dd3eLEW4L6efzHc2iNorrRRXITifnDLlRrhaA==",
-      "dev": true
-    },
-    "node_modules/cloneable-readable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
-      "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "process-nextick-args": "^2.0.0",
-        "readable-stream": "^2.3.5"
-      }
-    },
-    "node_modules/cloneable-readable/node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "dev": true
-    },
-    "node_modules/cloneable-readable/node_modules/readable-stream": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/cloneable-readable/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "node_modules/collection-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-      "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
-      "dev": true,
-      "dependencies": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/color-support": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-      "dev": true,
-      "bin": {
-        "color-support": "bin.js"
-      }
-    },
-    "node_modules/colorette": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz",
-      "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==",
-      "dev": true
-    },
-    "node_modules/commander": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
-      "dev": true
-    },
-    "node_modules/component-emitter": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz",
-      "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+    "node_modules/commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
+      "dev": true
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
@@ -1302,21 +838,6 @@
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
       "dev": true
     },
-    "node_modules/copy-descriptor": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/core-util-is": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-      "dev": true
-    },
     "node_modules/d3": {
       "version": "7.8.5",
       "resolved": "https://registry.npmjs.org/d3/-/d3-7.8.5.tgz",
@@ -1687,33 +1208,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/dateformat": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
-      "integrity": "sha512-GODcnWq3YGoTnygPfi02ygEiRxqUxpJwuRHjdhJYuxpcZmDq4rjBiXYmbCCzStxo176ixfLT6i4NPwQooRySnw==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/decode-uri-component": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
-      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
     "node_modules/deepmerge": {
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
@@ -1723,31 +1217,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/defaults": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
-      "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
-      "dev": true,
-      "dependencies": {
-        "clone": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/define-property": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/delaunator": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.0.tgz",
@@ -1756,24 +1225,6 @@
         "robust-predicates": "^3.0.0"
       }
     },
-    "node_modules/deprecated": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz",
-      "integrity": "sha512-BRACtc6B1mJe2J2mruHFqHWrtLy0Qppu/7LKdqWH3o/9j1L/1phPUaQV+2S3H8ZDW0k6h+NEOKcHBDRikWLiOA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.9"
-      }
-    },
-    "node_modules/detect-file": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
-      "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/dir-glob": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
@@ -1786,1702 +1237,397 @@
         "node": ">=8"
       }
     },
-    "node_modules/duplexer2": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-      "integrity": "sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~1.1.9"
-      }
-    },
-    "node_modules/end-of-stream": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
-      "integrity": "sha512-go5TQkd0YRXYhX+Lc3UrXkoKU5j+m72jEP5lHWr2Nh82L8wfZtH8toKgcg4T10o23ELIMGXQdwCbl+qAXIPDrw==",
-      "dev": true,
-      "dependencies": {
-        "once": "~1.3.0"
-      }
-    },
-    "node_modules/end-of-stream/node_modules/once": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-      "integrity": "sha512-6vaNInhu+CHxtONf3zw3vq4SP2DOQhjBvIa3rNcG0+P7eKWlYH6Peu7rHizSloRU2EwMz6GraLieis9Ac9+p1w==",
-      "dev": true,
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/estree-walker": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
       "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
       "dev": true
     },
-    "node_modules/expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+    "node_modules/fast-glob": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
       "dev": true,
       "dependencies": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8.6.0"
       }
     },
-    "node_modules/expand-brackets/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+    "node_modules/fastq": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
       "dev": true,
       "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "reusify": "^1.0.4"
       }
     },
-    "node_modules/expand-brackets/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
       "dev": true,
       "dependencies": {
-        "is-extendable": "^0.1.0"
+        "to-regex-range": "^5.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/expand-brackets/node_modules/is-descriptor": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
-      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+    "node_modules/fs-extra": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
       "dev": true,
       "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=6 <7 || >=8"
       }
     },
-    "node_modules/expand-brackets/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
     },
-    "node_modules/expand-tilde": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-      "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==",
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
       "dev": true,
-      "dependencies": {
-        "homedir-polyfill": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
-    },
-    "node_modules/extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+    "node_modules/glob": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+      "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
       "dev": true,
       "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^5.0.1",
+        "once": "^1.3.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
       "dependencies": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
+        "is-glob": "^4.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 6"
       }
     },
-    "node_modules/extglob/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+    "node_modules/globby": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.1.tgz",
+      "integrity": "sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==",
       "dev": true,
       "dependencies": {
-        "is-descriptor": "^1.0.0"
+        "@types/glob": "^7.1.1",
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.0.3",
+        "glob": "^7.1.3",
+        "ignore": "^5.1.1",
+        "merge2": "^1.2.3",
+        "slash": "^3.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/extglob/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+    "node_modules/globby/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
       "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/fancy-log": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
-      "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
-      "dev": true,
-      "dependencies": {
-        "ansi-gray": "^0.1.1",
-        "color-support": "^1.1.3",
-        "parse-node-version": "^1.0.0",
-        "time-stamp": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/fast-glob": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
-      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/fast-glob/node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fast-glob/node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fast-glob/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/fast-glob/node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/fast-glob/node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-      "dev": true,
-      "dependencies": {
-        "braces": "^3.0.2",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/fast-glob/node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/fastq": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
-      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
-      "dev": true,
-      "dependencies": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/fill-range/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/find-index": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz",
-      "integrity": "sha512-uJ5vWrfBKMcE6y2Z8834dwEZj9mNGxYa3t3I53OwFeuZ8D9oc2E5zcsrkuhX6h4iYrjhiv0T3szQmxlAV9uxDg==",
-      "dev": true
-    },
-    "node_modules/findup-sync": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
-      "integrity": "sha512-vs+3unmJT45eczmcAZ6zMJtxN3l/QXeccaXQx5cu/MeJMhewVfoWZqibRkOxPnmoR59+Zy5hjabfQc6JLSah4g==",
-      "dev": true,
-      "dependencies": {
-        "detect-file": "^1.0.0",
-        "is-glob": "^3.1.0",
-        "micromatch": "^3.0.4",
-        "resolve-dir": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/findup-sync/node_modules/is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/fined": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
-      "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
-      "dev": true,
-      "dependencies": {
-        "expand-tilde": "^2.0.2",
-        "is-plain-object": "^2.0.3",
-        "object.defaults": "^1.1.0",
-        "object.pick": "^1.2.0",
-        "parse-filepath": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/first-chunk-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz",
-      "integrity": "sha512-ArRi5axuv66gEsyl3UuK80CzW7t56hem73YGNYxNWTGNKFJUadSb9Gu9SHijYEUi8ulQMf1bJomYNwSCPHhtTQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/flagged-respawn": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
-      "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/for-own": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-      "integrity": "sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==",
-      "dev": true,
-      "dependencies": {
-        "for-in": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/fragment-cache": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-      "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
-      "dev": true,
-      "dependencies": {
-        "map-cache": "^0.2.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/fs-extra": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=6 <7 || >=8"
-      }
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/gaze": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
-      "integrity": "sha512-3IWbXGkDDHFX8zIlNdfnmhvlSMhpBO6tDr4InB8fGku6dh/gjFPGNqcdsXJajZg05x9jRzXbL6gCnCnuMap4tw==",
-      "dev": true,
-      "dependencies": {
-        "globule": "~0.1.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/get-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-      "integrity": "sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/get-value": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/glob-stream": {
-      "version": "3.1.18",
-      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
-      "integrity": "sha512-owHtlMMXIAbxLjhUAO0HhW1/TB7kV0AwDduI3BLbYsWCaRzNIcLBu8N0wHZft2Za2SCmUXCEOdpZzC7k/H19eg==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^4.3.1",
-        "glob2base": "^0.0.12",
-        "minimatch": "^2.0.1",
-        "ordered-read-streams": "^0.1.0",
-        "through2": "^0.6.1",
-        "unique-stream": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.9"
-      }
-    },
-    "node_modules/glob-stream/node_modules/glob": {
-      "version": "4.5.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
-      "integrity": "sha512-I0rTWUKSZKxPSIAIaqhSXTM/DiII6wame+rEC3cFA5Lqmr9YmdL7z6Hj9+bdWtTvoY1Su4/OiMLmb37Y7JzvJQ==",
-      "dev": true,
-      "dependencies": {
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^2.0.1",
-        "once": "^1.3.0"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/glob-stream/node_modules/minimatch": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-      "integrity": "sha512-jQo6o1qSVLEWaw3l+bwYA2X0uLuK2KjNh2wjgO7Q/9UJnXr1Q3yQKR8BI0/Bt/rPg75e6SMW4hW/6cBHVTZUjA==",
-      "deprecated": "Please update to minimatch 3.0.2 or higher to avoid a RegExp DoS issue",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/glob-stream/node_modules/readable-stream": {
-      "version": "1.0.34",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-      "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/glob-stream/node_modules/through2": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-      "integrity": "sha512-RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": ">=1.0.33-1 <1.1.0-0",
-        "xtend": ">=4.0.0 <4.1.0-0"
-      }
-    },
-    "node_modules/glob-watcher": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
-      "integrity": "sha512-lzYWq1BJLBmtb9rzT6+lgbFlEW6Sc7B+Qs3RmsNA9lbdFSqLHhebfypPR3nbEOMeEQyawVXqSDH0aqjtImldow==",
-      "dev": true,
-      "dependencies": {
-        "gaze": "^0.5.1"
-      },
-      "engines": {
-        "node": ">= 0.9"
-      }
-    },
-    "node_modules/glob2base": {
-      "version": "0.0.12",
-      "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
-      "integrity": "sha512-ZyqlgowMbfj2NPjxaZZ/EtsXlOch28FRXgMd64vqZWk1bT9+wvSRLYD1om9M7QfQru51zJPAT17qXm4/zd+9QA==",
-      "dev": true,
-      "dependencies": {
-        "find-index": "^0.1.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/global-modules": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
-      "dev": true,
-      "dependencies": {
-        "global-prefix": "^1.0.1",
-        "is-windows": "^1.0.1",
-        "resolve-dir": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/global-prefix": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-      "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==",
-      "dev": true,
-      "dependencies": {
-        "expand-tilde": "^2.0.2",
-        "homedir-polyfill": "^1.0.1",
-        "ini": "^1.3.4",
-        "is-windows": "^1.0.1",
-        "which": "^1.2.14"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/globby": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.1.tgz",
-      "integrity": "sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==",
-      "dev": true,
-      "dependencies": {
-        "@types/glob": "^7.1.1",
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.0.3",
-        "glob": "^7.1.3",
-        "ignore": "^5.1.1",
-        "merge2": "^1.2.3",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/globule": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
-      "integrity": "sha512-3eIcA2OjPCm4VvwIwZPzIxCVssA8HSpM2C6c6kK5ufJH4FGwWoyqL3In19uuX4oe+TwH3w2P1nQDmW56iehO4A==",
-      "dev": true,
-      "dependencies": {
-        "glob": "~3.1.21",
-        "lodash": "~1.0.1",
-        "minimatch": "~0.2.11"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/globule/node_modules/glob": {
-      "version": "3.1.21",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
-      "integrity": "sha512-ANhy2V2+tFpRajE3wN4DhkNQ08KDr0Ir1qL12/cUe5+a7STEK8jkW4onUYuY8/06qAFuT5je7mjAqzx0eKI2tQ==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "~1.2.0",
-        "inherits": "1",
-        "minimatch": "~0.2.11"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/globule/node_modules/graceful-fs": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz",
-      "integrity": "sha512-iiTUZ5vZ+2ZV+h71XAgwCSu6+NAizhFU3Yw8aC/hH5SQ3SnISqEqAek40imAFGtDcwJKNhXvSY+hzIolnLwcdQ==",
-      "deprecated": "please upgrade to graceful-fs 4 for compatibility with current and future versions of Node.js",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/globule/node_modules/inherits": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz",
-      "integrity": "sha512-Al67oatbRSo3RV5hRqIoln6Y5yMVbJSIn4jEJNL7VCImzq/kLr7vvb6sFRJXqr8rpHc/2kJOM+y0sPKN47VdzA==",
-      "dev": true
-    },
-    "node_modules/globule/node_modules/minimatch": {
-      "version": "0.2.14",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-      "integrity": "sha512-zZ+Jy8lVWlvqqeM8iZB7w7KmQkoJn8djM585z88rywrEbzoqawVa9FR5p2hwD+y74nfuKOjmNvi9gtWJNLqHvA==",
-      "deprecated": "Please update to minimatch 3.0.2 or higher to avoid a RegExp DoS issue",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "2",
-        "sigmund": "~1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/glogg": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
-      "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
-      "dev": true,
-      "dependencies": {
-        "sparkles": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "dev": true
-    },
-    "node_modules/gulp": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz",
-      "integrity": "sha512-6FHNdR+VG1LcPz6gZGGqgvimWWGtl4x3FvshAdK/UnAjU7aFOyzft3Fjp35r0Y3ZF4u8vND0S4nGsIB/sxTqzQ==",
-      "dev": true,
-      "dependencies": {
-        "archy": "^1.0.0",
-        "chalk": "^1.0.0",
-        "deprecated": "^0.0.1",
-        "gulp-util": "^3.0.0",
-        "interpret": "^1.0.0",
-        "liftoff": "^2.1.0",
-        "minimist": "^1.1.0",
-        "orchestrator": "^0.3.0",
-        "pretty-hrtime": "^1.0.0",
-        "semver": "^4.1.0",
-        "tildify": "^1.0.0",
-        "v8flags": "^2.0.2",
-        "vinyl-fs": "^0.3.0"
-      },
-      "bin": {
-        "gulp": "bin/gulp.js"
-      },
-      "engines": {
-        "node": ">= 0.9"
-      }
-    },
-    "node_modules/gulp-util": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
-      "integrity": "sha512-q5oWPc12lwSFS9h/4VIjG+1NuNDlJ48ywV2JKItY4Ycc/n1fXJeYPVQsfu5ZrhQi7FGSDBalwUCLar/GyHXKGw==",
-      "deprecated": "gulp-util is deprecated - replace it, following the guidelines at https://medium.com/gulpjs/gulp-util-ca3b1f9f9ac5",
-      "dev": true,
-      "dependencies": {
-        "array-differ": "^1.0.0",
-        "array-uniq": "^1.0.2",
-        "beeper": "^1.0.0",
-        "chalk": "^1.0.0",
-        "dateformat": "^2.0.0",
-        "fancy-log": "^1.1.0",
-        "gulplog": "^1.0.0",
-        "has-gulplog": "^0.1.0",
-        "lodash._reescape": "^3.0.0",
-        "lodash._reevaluate": "^3.0.0",
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.template": "^3.0.0",
-        "minimist": "^1.1.0",
-        "multipipe": "^0.1.2",
-        "object-assign": "^3.0.0",
-        "replace-ext": "0.0.1",
-        "through2": "^2.0.0",
-        "vinyl": "^0.5.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/gulp-zip": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/gulp-zip/-/gulp-zip-4.2.0.tgz",
-      "integrity": "sha512-I+697f6jf+PncdTrqfuwoauxgnLG1yHRg3vlmvDgmJuEnlEHy4meBktJ/oHgfyg4tp6X25wuZqUOraVeVg97wQ==",
-      "dev": true,
-      "dependencies": {
-        "get-stream": "^3.0.0",
-        "plugin-error": "^0.1.2",
-        "through2": "^2.0.1",
-        "vinyl": "^2.1.0",
-        "yazl": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/gulp-zip/node_modules/clone": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-      "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/gulp-zip/node_modules/clone-stats": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-      "integrity": "sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==",
-      "dev": true
-    },
-    "node_modules/gulp-zip/node_modules/replace-ext": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
-      "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/gulp-zip/node_modules/vinyl": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
-      "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
-      "dev": true,
-      "dependencies": {
-        "clone": "^2.1.1",
-        "clone-buffer": "^1.0.0",
-        "clone-stats": "^1.0.0",
-        "cloneable-readable": "^1.0.0",
-        "remove-trailing-separator": "^1.0.1",
-        "replace-ext": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/gulplog": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
-      "integrity": "sha512-hm6N8nrm3Y08jXie48jsC55eCZz9mnb4OirAStEk2deqeyhXU3C1otDVh+ccttMuc1sBi6RX6ZJ720hs9RCvgw==",
-      "dev": true,
-      "dependencies": {
-        "glogg": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-gulplog": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
-      "integrity": "sha512-+F4GzLjwHNNDEAJW2DC1xXfEoPkRDmUdJ7CBYw4MpqtDwOnqdImJl7GWlpqx+Wko6//J8uKTnIe4wZSv7yCqmw==",
-      "dev": true,
-      "dependencies": {
-        "sparkles": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/has-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-      "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
-      "dev": true,
-      "dependencies": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-      "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values/node_modules/kind-of": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-      "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hasown": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
-      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/homedir-polyfill": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
-      "dev": true,
-      "dependencies": {
-        "parse-passwd": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ignore": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
-      "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "node_modules/ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true
-    },
-    "node_modules/internmap": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
-      "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/interpret": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
-      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/is-absolute": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
-      "dev": true,
-      "dependencies": {
-        "is-relative": "^1.0.0",
-        "is-windows": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-accessor-descriptor": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz",
-      "integrity": "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==",
-      "dev": true,
-      "dependencies": {
-        "hasown": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "node_modules/is-builtin-module": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
-      "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==",
-      "dev": true,
-      "dependencies": {
-        "builtin-modules": "^3.3.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-core-module": {
-      "version": "2.13.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
-      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
-      "dev": true,
-      "dependencies": {
-        "hasown": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-data-descriptor": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz",
-      "integrity": "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==",
-      "dev": true,
-      "dependencies": {
-        "hasown": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/is-descriptor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
       }
     },
-    "node_modules/is-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
-      "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==",
-      "dev": true
-    },
-    "node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+    "node_modules/globby/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "dev": true,
       "dependencies": {
-        "kind-of": "^3.0.2"
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
+        "node": "*"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+    "node_modules/globby/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "dependencies": {
-        "isobject": "^3.0.1"
+        "brace-expansion": "^1.1.7"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "*"
       }
     },
-    "node_modules/is-reference": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
-      "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/estree": "*"
-      }
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true
     },
-    "node_modules/is-relative": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
+    "node_modules/hasown": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
+      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
       "dev": true,
       "dependencies": {
-        "is-unc-path": "^1.0.0"
+        "function-bind": "^1.1.2"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/is-unc-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
-      "dev": true,
+    "node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
       "dependencies": {
-        "unc-path-regex": "^0.1.2"
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-utf8": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==",
-      "dev": true
-    },
-    "node_modules/is-windows": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-      "dev": true
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
-    },
-    "node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/jsep": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/jsep/-/jsep-1.3.8.tgz",
-      "integrity": "sha512-qofGylTGgYj9gZFsHuyWAN4jr35eJ66qJCK4eKDnldohuUoQFbU3iZn2zjvEbd9wOAhP9Wx5DsAAduTyE1PSWQ==",
-      "engines": {
-        "node": ">= 10.16.0"
-      }
-    },
-    "node_modules/jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
-      "dev": true,
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/liftoff": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz",
-      "integrity": "sha512-01zfGFqfORP1CGmZZP2Zn51zsqz4RltDi0RDOhbGoLYdUT5Lw+I2gX6QdwXhPITF6hPOHEOp+At6/L24hIg9WQ==",
+    "node_modules/ignore": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
+      "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==",
       "dev": true,
-      "dependencies": {
-        "extend": "^3.0.0",
-        "findup-sync": "^2.0.0",
-        "fined": "^1.0.1",
-        "flagged-respawn": "^1.0.0",
-        "is-plain-object": "^2.0.4",
-        "object.map": "^1.0.0",
-        "rechoir": "^0.6.2",
-        "resolve": "^1.1.7"
-      },
       "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/lodash": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz",
-      "integrity": "sha512-0VSEDVec/Me2eATuoiQd8IjyBMMX0fahob8YJ96V1go2RjvCk1m1GxmtfXn8RNSaLaTtop7fsuhhu9oLk3hUgA==",
-      "dev": true,
-      "engines": [
-        "node",
-        "rhino"
-      ]
-    },
-    "node_modules/lodash._basecopy": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-      "integrity": "sha512-rFR6Vpm4HeCK1WPGvjZSJ+7yik8d8PVUdCJx5rT2pogG4Ve/2ZS7kfmO5l5T2o5V2mqlNIfSF5MZlr1+xOoYQQ==",
-      "dev": true
-    },
-    "node_modules/lodash._basetostring": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
-      "integrity": "sha512-mTzAr1aNAv/i7W43vOR/uD/aJ4ngbtsRaCubp2BfZhlGU/eORUjg/7F6X0orNMdv33JOrdgGybtvMN/po3EWrA==",
-      "dev": true
-    },
-    "node_modules/lodash._basevalues": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
-      "integrity": "sha512-H94wl5P13uEqlCg7OcNNhMQ8KvWSIyqXzOPusRgHC9DK3o54P6P3xtbXlVbRABG4q5gSmp7EDdJ0MSuW9HX6Mg==",
-      "dev": true
-    },
-    "node_modules/lodash._getnative": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-      "integrity": "sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA==",
-      "dev": true
-    },
-    "node_modules/lodash._isiterateecall": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-      "integrity": "sha512-De+ZbrMu6eThFti/CSzhRvTKMgQToLxbij58LMfM8JnYDNSOjkjTCIaa8ixglOeGh2nyPlakbt5bJWJ7gvpYlQ==",
-      "dev": true
-    },
-    "node_modules/lodash._reescape": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
-      "integrity": "sha512-Sjlavm5y+FUVIF3vF3B75GyXrzsfYV8Dlv3L4mEpuB9leg8N6yf/7rU06iLPx9fY0Mv3khVp9p7Dx0mGV6V5OQ==",
-      "dev": true
-    },
-    "node_modules/lodash._reevaluate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
-      "integrity": "sha512-OrPwdDc65iJiBeUe5n/LIjd7Viy99bKwDdk7Z5ljfZg0uFRFlfQaCy9tZ4YMAag9WAZmlVpe1iZrkIMMSMHD3w==",
-      "dev": true
-    },
-    "node_modules/lodash._reinterpolate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-      "integrity": "sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==",
-      "dev": true
-    },
-    "node_modules/lodash._root": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
-      "integrity": "sha512-O0pWuFSK6x4EXhM1dhZ8gchNtG7JMqBtrHdoUFUWXD7dJnNSUze1GuyQr5sOs0aCvgGeI3o/OJW8f4ca7FDxmQ==",
-      "dev": true
-    },
-    "node_modules/lodash.escape": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
-      "integrity": "sha512-n1PZMXgaaDWZDSvuNZ/8XOcYO2hOKDqZel5adtR30VKQAtoWs/5AOeFA0vPV8moiPzlqe7F4cP2tzpFewQyelQ==",
-      "dev": true,
-      "dependencies": {
-        "lodash._root": "^3.0.0"
-      }
-    },
-    "node_modules/lodash.isarguments": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-      "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==",
-      "dev": true
-    },
-    "node_modules/lodash.isarray": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-      "integrity": "sha512-JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ==",
-      "dev": true
-    },
-    "node_modules/lodash.keys": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-      "integrity": "sha512-CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ==",
-      "dev": true,
-      "dependencies": {
-        "lodash._getnative": "^3.0.0",
-        "lodash.isarguments": "^3.0.0",
-        "lodash.isarray": "^3.0.0"
-      }
-    },
-    "node_modules/lodash.restparam": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-      "integrity": "sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw==",
-      "dev": true
-    },
-    "node_modules/lodash.template": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
-      "integrity": "sha512-0B4Y53I0OgHUJkt+7RmlDFWKjVAI/YUpWNiL9GQz5ORDr4ttgfQGo+phBWKFLJbBdtOwgMuUkdOHOnPg45jKmQ==",
-      "dev": true,
-      "dependencies": {
-        "lodash._basecopy": "^3.0.0",
-        "lodash._basetostring": "^3.0.0",
-        "lodash._basevalues": "^3.0.0",
-        "lodash._isiterateecall": "^3.0.0",
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.escape": "^3.0.0",
-        "lodash.keys": "^3.0.0",
-        "lodash.restparam": "^3.0.0",
-        "lodash.templatesettings": "^3.0.0"
+        "node": ">= 4"
       }
     },
-    "node_modules/lodash.templatesettings": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
-      "integrity": "sha512-TcrlEr31tDYnWkHFWDCV3dHYroKEXpJZ2YJYvJdhN+y4AkWMDZ5I4I8XDtUKqSAyG81N7w+I1mFEJtcED+tGqQ==",
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
       "dev": true,
       "dependencies": {
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.escape": "^3.0.0"
+        "once": "^1.3.0",
+        "wrappy": "1"
       }
     },
-    "node_modules/lru-cache": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
-      "integrity": "sha512-WpibWJ60c3AgAz8a2iYErDrcT2C7OmKnsWhIcHOjkUHFjkXncJhtLxNSqUmxRxRunpb5I8Vprd7aNSd2NtksJQ==",
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true
     },
-    "node_modules/magic-string": {
-      "version": "0.30.5",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
-      "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.4.15"
-      },
+    "node_modules/internmap": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
+      "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
       "engines": {
         "node": ">=12"
       }
     },
-    "node_modules/make-iterator": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/map-cache": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/map-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-      "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
-      "dev": true,
-      "dependencies": {
-        "object-visit": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+    "node_modules/is-builtin-module": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
+      "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==",
       "dev": true,
       "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
+        "builtin-modules": "^3.3.0"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "node": ">=6"
       },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/minimist": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "dev": true,
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/mixin-deep": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
-      "dev": true,
-      "dependencies": {
-        "for-in": "^1.0.2",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+    "node_modules/is-core-module": {
+      "version": "2.13.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
+      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
       "dev": true,
       "dependencies": {
-        "minimist": "^1.2.6"
+        "hasown": "^2.0.0"
       },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/moment": {
-      "version": "2.29.4",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
-      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "dev": true,
       "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/multipipe": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
-      "integrity": "sha512-7ZxrUybYv9NonoXgwoOqtStIu18D1c3eFZj27hqgf5kBrBF8Q+tE8V0MW8dKM5QLkQPh1JhhbKgHLY9kifov4Q==",
-      "dev": true,
-      "dependencies": {
-        "duplexer2": "0.0.2"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/nanomatch": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dev": true,
       "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "fragment-cache": "^0.2.1",
-        "is-windows": "^1.0.2",
-        "kind-of": "^6.0.2",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
+        "is-extglob": "^2.1.1"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/natives": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.6.tgz",
-      "integrity": "sha512-6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA==",
-      "deprecated": "This module relies on Node.js's internals and will break at some point. Do not use it, and update to graceful-fs@4.x.",
+    "node_modules/is-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
+      "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==",
       "dev": true
     },
-    "node_modules/object-assign": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-      "integrity": "sha512-jHP15vXVGeVh1HuaA2wY6lxk+whK/x4KBG88VXeRma7CCun7iGD5qPc4eYykQ9sdQvg8jkwFKsSxHln2ybW3xQ==",
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=0.12.0"
       }
     },
-    "node_modules/object-copy": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-      "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
+    "node_modules/is-plain-object": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.1.tgz",
+      "integrity": "sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==",
       "dev": true,
-      "dependencies": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
-      },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/object-copy/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+    "node_modules/is-reference": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
+      "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==",
       "dev": true,
       "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
+        "@types/estree": "*"
+      }
+    },
+    "node_modules/jsep": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/jsep/-/jsep-1.3.8.tgz",
+      "integrity": "sha512-qofGylTGgYj9gZFsHuyWAN4jr35eJ66qJCK4eKDnldohuUoQFbU3iZn2zjvEbd9wOAhP9Wx5DsAAduTyE1PSWQ==",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 10.16.0"
       }
     },
-    "node_modules/object-copy/node_modules/is-descriptor": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
-      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+    "node_modules/jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
       "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
       }
     },
-    "node_modules/object-copy/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+    "node_modules/magic-string": {
+      "version": "0.30.5",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
+      "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
       "dev": true,
       "dependencies": {
-        "is-buffer": "^1.1.5"
+        "@jridgewell/sourcemap-codec": "^1.4.15"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=12"
       }
     },
-    "node_modules/object-visit": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-      "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.0"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 8"
       }
     },
-    "node_modules/object.defaults": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
-      "integrity": "sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==",
+    "node_modules/micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
       "dev": true,
       "dependencies": {
-        "array-each": "^1.0.1",
-        "array-slice": "^1.0.0",
-        "for-own": "^1.0.0",
-        "isobject": "^3.0.0"
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8.6"
       }
     },
-    "node_modules/object.map": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
-      "integrity": "sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==",
+    "node_modules/minimatch": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
       "dev": true,
       "dependencies": {
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
       }
     },
-    "node_modules/object.pick": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-      "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
+    "node_modules/moment": {
+      "version": "2.29.4",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
+      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
       "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "*"
       }
     },
     "node_modules/obsidian": {
@@ -3508,73 +1654,6 @@
         "wrappy": "1"
       }
     },
-    "node_modules/orchestrator": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz",
-      "integrity": "sha512-DrQ43ngaJ0e36j2CHyoDoIg1K4zbc78GnTQESebK9vu6hj4W5/pvfSFO/kgM620Yd0YnhseSNYsLK3/SszZ5NQ==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "~0.1.5",
-        "sequencify": "~0.0.7",
-        "stream-consume": "~0.1.0"
-      }
-    },
-    "node_modules/ordered-read-streams": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz",
-      "integrity": "sha512-PMX5ehiNri4+lgk9fl09xuPeciGmyPyVUSBwwPT4C/3EHGxoVf7UdgKDE3SLBD4pUDmlzrg1L1cK5igrp+Tyuw==",
-      "dev": true
-    },
-    "node_modules/os-homedir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/parse-filepath": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
-      "integrity": "sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==",
-      "dev": true,
-      "dependencies": {
-        "is-absolute": "^1.0.0",
-        "map-cache": "^0.2.0",
-        "path-root": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/parse-node-version": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
-      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/parse-passwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-      "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pascalcase": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -3590,27 +1669,6 @@
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
-    "node_modules/path-root": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
-      "integrity": "sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==",
-      "dev": true,
-      "dependencies": {
-        "path-root-regex": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-root-regex": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
-      "integrity": "sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/path-type": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
@@ -3632,186 +1690,33 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/plugin-error": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
-      "integrity": "sha512-WzZHcm4+GO34sjFMxQMqZbsz3xiNEgonCskQ9v+IroMmYgk/tas8dG+Hr2D6IbRPybZ12oWpzE/w3cGJ6FJzOw==",
-      "dev": true,
-      "dependencies": {
-        "ansi-cyan": "^0.1.1",
-        "ansi-red": "^0.1.1",
-        "arr-diff": "^1.0.1",
-        "arr-union": "^2.0.1",
-        "extend-shallow": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/plugin-error/node_modules/arr-diff": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
-      "integrity": "sha512-OQwDZUqYaQwyyhDJHThmzId8daf4/RFNLaeh3AevmSeZ5Y7ug4Ga/yKc6l6kTZOBW781rCj103ZuTh8GAsB3+Q==",
-      "dev": true,
-      "dependencies": {
-        "arr-flatten": "^1.0.1",
-        "array-slice": "^0.2.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/plugin-error/node_modules/array-slice": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-      "integrity": "sha512-rlVfZW/1Ph2SNySXwR9QYkChp8EkOEiTMO5Vwx60usw04i4nWemkm9RXmQqgkQFaLHsqLuADvjp6IfgL9l2M8Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/plugin-error/node_modules/extend-shallow": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
-      "integrity": "sha512-L7AGmkO6jhDkEBBGWlLtftA80Xq8DipnrRPr0pyi7GQLXkaq9JYA4xF4z6qnadIC6euiTDKco0cGSU9muw+WTw==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/plugin-error/node_modules/kind-of": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
-      "integrity": "sha512-aUH6ElPnMGon2/YkxRIigV32MOpTVcoXQ1Oo8aYn40s+sJ3j+0gFZsT8HKDcxNy7Fi9zuquWtGaGAahOdv5p/g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/posix-character-classes": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pretty-hrtime": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
-      "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
-    },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
       "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/rechoir": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-      "integrity": "sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==",
-      "dev": true,
-      "dependencies": {
-        "resolve": "^1.1.6"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/regex-not": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^3.0.2",
-        "safe-regex": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/remove-trailing-separator": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
-      "dev": true
-    },
-    "node_modules/repeat-element": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
-      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10"
-      }
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
     },
-    "node_modules/replace-ext": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-      "integrity": "sha512-AFBWBy9EVRTa/LhEcG8QDP3FvpwZqmvN2QFDuJswFeaVhWnZMp8q3E6Zd90SR04PlIwfGdyVjNyLPyen/ek5CQ==",
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
       "dev": true,
-      "engines": {
-        "node": ">= 0.4"
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
       }
     },
     "node_modules/resolve": {
@@ -3831,35 +1736,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/resolve-dir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-      "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==",
-      "dev": true,
-      "dependencies": {
-        "expand-tilde": "^2.0.0",
-        "global-modules": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/resolve-url": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
-      "deprecated": "https://github.com/lydell/resolve-url#deprecated",
-      "dev": true
-    },
-    "node_modules/ret": {
-      "version": "0.1.15",
-      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
     "node_modules/reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -3919,29 +1795,6 @@
         "node": ">=8.3"
       }
     },
-    "node_modules/rollup-plugin-copy/node_modules/is-plain-object": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.1.tgz",
-      "integrity": "sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rollup/node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
     "node_modules/run-parallel": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -3971,377 +1824,78 @@
       "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ=="
     },
     "node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
-    "node_modules/safe-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-      "integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
-      "dev": true,
-      "dependencies": {
-        "ret": "~0.1.10"
-      }
-    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "node_modules/semver": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
-      "integrity": "sha512-IrpJ+yoG4EOH8DFWuVg+8H1kW1Oaof0Wxe7cPcXW3x9BjkN/eVo54F15LyqemnDIUYskQWr9qvl/RihmSy6+xQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/sequencify": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz",
-      "integrity": "sha512-YL8BPm0tp6SlXef/VqYpA/ijmTsDP2ZEXzsnqjkaWS7NP7Bfvw18NboL0O8WCIjy67sOCG3MYSK1PB4GC9XdtQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/serialize-javascript": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
-      "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
-      "dev": true,
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "node_modules/set-value": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-extendable": "^0.1.1",
-        "is-plain-object": "^2.0.3",
-        "split-string": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/set-value/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/set-value/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/sigmund": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
-      "integrity": "sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==",
-      "dev": true
-    },
-    "node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/smob": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/smob/-/smob-1.4.1.tgz",
-      "integrity": "sha512-9LK+E7Hv5R9u4g4C3p+jjLstaLe11MDsL21UpYaCNmapvMkYhqCV4A/f/3gyH8QjMyh6l68q9xC85vihY9ahMQ==",
-      "dev": true
-    },
-    "node_modules/snapdragon": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
       "dev": true,
-      "dependencies": {
-        "base": "^0.11.1",
-        "debug": "^2.2.0",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "map-cache": "^0.2.2",
-        "source-map": "^0.5.6",
-        "source-map-resolve": "^0.5.0",
-        "use": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
-      "dev": true,
-      "dependencies": {
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.0",
-        "snapdragon-util": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-util": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-util/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-descriptor": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
-      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-resolve": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
-      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
-      "dev": true,
-      "dependencies": {
-        "atob": "^2.1.2",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
-      }
-    },
-    "node_modules/source-map-support": {
-      "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-      "dev": true,
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "node_modules/source-map-support/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-url": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
-      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
-      "deprecated": "See https://github.com/lydell/source-map-url#deprecated",
-      "dev": true
-    },
-    "node_modules/sparkles": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
-      "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/split-string": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/sprintf-js": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
-      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="
-    },
-    "node_modules/static-extend": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-      "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
-      "dev": true,
-      "dependencies": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
-    "node_modules/static-extend/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+    "node_modules/serialize-javascript": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
+      "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
       "dev": true,
       "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "randombytes": "^2.1.0"
       }
     },
-    "node_modules/static-extend/node_modules/is-descriptor": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
-      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=8"
       }
     },
-    "node_modules/stream-consume": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz",
-      "integrity": "sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==",
-      "dev": true
-    },
-    "node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+    "node_modules/smob": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/smob/-/smob-1.4.1.tgz",
+      "integrity": "sha512-9LK+E7Hv5R9u4g4C3p+jjLstaLe11MDsL21UpYaCNmapvMkYhqCV4A/f/3gyH8QjMyh6l68q9xC85vihY9ahMQ==",
       "dev": true
     },
-    "node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/strip-bom": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
-      "integrity": "sha512-qVAeAIjblKDp/8Cd0tJdxpe3Iq/HooI7En98alEaMbz4Wedlrcj3WI72dDQSrziRW5IQ0zeBo3JXsmS8RcS9jg==",
+    "node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "dev": true,
       "dependencies": {
-        "first-chunk-stream": "^1.0.0",
-        "is-utf8": "^0.2.0"
-      },
-      "bin": {
-        "strip-bom": "cli.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
       }
     },
+    "node_modules/sprintf-js": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="
+    },
     "node_modules/style-mod": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.0.tgz",
@@ -4349,15 +1903,6 @@
       "dev": true,
       "peer": true
     },
-    "node_modules/supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/supports-preserve-symlinks-flag": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
@@ -4394,117 +1939,16 @@
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
       "dev": true
     },
-    "node_modules/through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
-      }
-    },
-    "node_modules/through2/node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "dev": true
-    },
-    "node_modules/through2/node_modules/readable-stream": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/through2/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "node_modules/tildify": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz",
-      "integrity": "sha512-Y9q1GaV/BO65Z9Yf4NOGMuwt3SGdptkZBnaaKfTQakrDyCLiuO1Kc5wxW4xLdsjzunRtqtOdhekiUFmZbklwYQ==",
-      "dev": true,
-      "dependencies": {
-        "os-homedir": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/time-stamp": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
-      "integrity": "sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-object-path": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-      "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-object-path/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-regex": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-      "dev": true,
-      "dependencies": {
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "regex-not": "^1.0.2",
-        "safe-regex": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
       "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
+        "is-number": "^7.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8.0"
       }
     },
     "node_modules/tslib": {
@@ -4526,60 +1970,12 @@
         "node": ">=14.17"
       }
     },
-    "node_modules/unc-path-regex": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-      "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/undici-types": {
       "version": "5.26.5",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
       "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
       "dev": true
     },
-    "node_modules/union-value": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
-      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
-      "dev": true,
-      "dependencies": {
-        "arr-union": "^3.1.0",
-        "get-value": "^2.0.6",
-        "is-extendable": "^0.1.1",
-        "set-value": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/union-value/node_modules/arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/union-value/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unique-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz",
-      "integrity": "sha512-L8KM6TdpsoBk6TJTXevbmpub3bATS06Znu3BcfVPVQkFtnh1MFeCZ3gFKCQcji7f7YYiigsO5OR99vqhoNT8nQ==",
-      "dev": true
-    },
     "node_modules/universalify": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
@@ -4589,195 +1985,6 @@
         "node": ">= 4.0.0"
       }
     },
-    "node_modules/unset-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-      "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
-      "dev": true,
-      "dependencies": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-value": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-      "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
-      "dev": true,
-      "dependencies": {
-        "get-value": "^2.0.3",
-        "has-values": "^0.1.4",
-        "isobject": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-      "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
-      "dev": true,
-      "dependencies": {
-        "isarray": "1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-values": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-      "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "dev": true
-    },
-    "node_modules/urix": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
-      "deprecated": "Please see https://github.com/lydell/urix#deprecated",
-      "dev": true
-    },
-    "node_modules/use": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/user-home": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
-      "integrity": "sha512-aggiKfEEubv3UwRNqTzLInZpAOmKzwdHqEBmW/hBA/mt99eg+b4VrX6i+IRLxU8+WJYfa33rGwRseg4eElUgsQ==",
-      "dev": true,
-      "bin": {
-        "user-home": "cli.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-      "dev": true
-    },
-    "node_modules/v8flags": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz",
-      "integrity": "sha512-SKfhk/LlaXzvtowJabLZwD4K6SGRYeoxA7KJeISlUMAB/NT4CBkZjMq3WceX2Ckm4llwqYVo8TICgsDYCBU2tA==",
-      "dev": true,
-      "dependencies": {
-        "user-home": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/vinyl": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
-      "integrity": "sha512-P5zdf3WB9uzr7IFoVQ2wZTmUwHL8cMZWJGzLBNCHNZ3NB6HTMsYABtt7z8tAGIINLXyAob9B9a1yzVGMFOYKEA==",
-      "dev": true,
-      "dependencies": {
-        "clone": "^1.0.0",
-        "clone-stats": "^0.0.1",
-        "replace-ext": "0.0.1"
-      },
-      "engines": {
-        "node": ">= 0.9"
-      }
-    },
-    "node_modules/vinyl-fs": {
-      "version": "0.3.14",
-      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz",
-      "integrity": "sha512-9CTKjt8378nhdydwFDTwywKio0n8aqq6xA70g0uypcnTNSCow/gQOwv0L9E2GaKd7EQ3kZl/diBxPSCgcBXESw==",
-      "dev": true,
-      "dependencies": {
-        "defaults": "^1.0.0",
-        "glob-stream": "^3.1.5",
-        "glob-watcher": "^0.0.6",
-        "graceful-fs": "^3.0.0",
-        "mkdirp": "^0.5.0",
-        "strip-bom": "^1.0.0",
-        "through2": "^0.6.1",
-        "vinyl": "^0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/vinyl-fs/node_modules/clone": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
-      "integrity": "sha512-g62n3Kb9cszeZvmvBUqP/dsEJD/+80pDA8u8KqHnAPrVnQ2Je9rVV6opxkhuWCd1kCn2gOibzDKxCtBvD3q5kA==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/vinyl-fs/node_modules/graceful-fs": {
-      "version": "3.0.12",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.12.tgz",
-      "integrity": "sha512-J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg==",
-      "dev": true,
-      "dependencies": {
-        "natives": "^1.1.3"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/vinyl-fs/node_modules/readable-stream": {
-      "version": "1.0.34",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-      "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/vinyl-fs/node_modules/through2": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-      "integrity": "sha512-RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": ">=1.0.33-1 <1.1.0-0",
-        "xtend": ">=4.0.0 <4.1.0-0"
-      }
-    },
-    "node_modules/vinyl-fs/node_modules/vinyl": {
-      "version": "0.4.6",
-      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-      "integrity": "sha512-pmza4M5VA15HOImIQYWhoXGlGNafCm0QK5BpBUXkzzEwrRxKqBsbAhTfkT2zMcJhUX1G1Gkid0xaV8WjOl7DsA==",
-      "dev": true,
-      "dependencies": {
-        "clone": "^0.2.0",
-        "clone-stats": "^0.0.1"
-      },
-      "engines": {
-        "node": ">= 0.9"
-      }
-    },
     "node_modules/w3c-keyname": {
       "version": "2.2.8",
       "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
@@ -4785,41 +1992,11 @@
       "dev": true,
       "peer": true
     },
-    "node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "dev": true
-    },
-    "node_modules/xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
-    "node_modules/yazl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz",
-      "integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==",
-      "dev": true,
-      "dependencies": {
-        "buffer-crc32": "~0.2.3"
-      }
     }
   }
 }
diff --git a/package.json b/package.json
index 0e9409f..d53b330 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "dev": "rollup --config rollup.config.dev.mjs -w",
     "build": "rollup --config rollup.config.build.mjs",
-    "zip": "gulp"
+    "zip": "zip -9 obsidian-tracker-v$npm_package_version.zip main.js manifest.json styles.css"
   },
   "keywords": [],
   "author": "pyrochlore",
@@ -19,8 +19,6 @@
     "@types/d3": "^7.4.3",
     "@types/node": "^20.9.1",
     "@types/sprintf-js": "^1.1.4",
-    "gulp": "^3.9.1",
-    "gulp-zip": "^4.2.0",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
     "rollup": "^4.4.1",
     "rollup-plugin-copy": "^3.5.0",

From ccbca15b8f46bff569cb9dd58389e01d5cae79d8 Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Thu, 16 Nov 2023 20:37:53 -0700
Subject: [PATCH 290/402] Release 1.13.1

---
 README.md            | 4 ++++
 docs/ReleaseNotes.md | 4 ++++
 manifest.json        | 2 +-
 package.json         | 2 +-
 versions.json        | 3 ++-
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index b0acf0e..b2e26aa 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,10 @@ This is an [Obsidian](https://obsidian.md/) plugin that helps you collect data f
 
 ## What's New
 
+Version 1.13.1
+
+- Fix packaging script
+
 Version 1.13.0
 
 - Add support for inline dataview fields (including emoji support for values)
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index 3876b5e..b7ea67b 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,5 +1,9 @@
 # Release Notes
 
+## 1.13.1
+
+- Fix packaging script
+
 ## 1.13.0
 
 - Add support for inline dataview fields (including emoji support for values)
diff --git a/manifest.json b/manifest.json
index 6d55e6d..cc5ce96 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "id": "obsidian-tracker",
   "name": "Tracker",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "minAppVersion": "0.9.12",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "author": "pyrochlore",
diff --git a/package.json b/package.json
index d53b330..04ebf73 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
diff --git a/versions.json b/versions.json
index acde4e3..49a583c 100644
--- a/versions.json
+++ b/versions.json
@@ -31,5 +31,6 @@
   "1.10.9": "0.9.12",
   "1.11.0": "0.9.12",
   "1.12.0": "0.9.12",
-  "1.13.0": "0.9.12"
+  "1.13.0": "0.9.12",
+  "1.13.1": "0.9.12"
 }

From 856ab4b514796eb9f0d30734844be8c3eab81d26 Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Thu, 16 Nov 2023 20:43:28 -0700
Subject: [PATCH 291/402] Switch dependabot to use npm instead of yarn

---
 .github/dependabot.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index d62873e..4a54c35 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -11,8 +11,8 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
-  # Maintain dependencies for yarn
-  - package-ecosystem: "yarn" # See documentation for possible values
+  # Maintain dependencies for npm
+  - package-ecosystem: "npm" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"

From 7b2f54497e3f94526ff659f8e8f36b0db225be5b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 Nov 2023 03:43:55 +0000
Subject: [PATCH 292/402] Bump actions/checkout from 3 to 4

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/releases.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index c695178..f544fe0 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -10,7 +10,7 @@ jobs:
       contents: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Use Node.js
       uses: actions/setup-node@v3
       with:

From d825ee9fcdb2841123d3bea74bd559fc9f0df108 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 Nov 2023 04:24:06 +0000
Subject: [PATCH 293/402] Bump actions/setup-node from 3 to 4

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3 to 4.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/releases.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index f544fe0..e44ee1a 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Use Node.js
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: '18.x'
     - name: Build

From 9b6d1b1c909d1853c1b39fc6d40d02de901431d7 Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Thu, 16 Nov 2023 21:55:22 -0700
Subject: [PATCH 294/402] Add issue and PR templates

---
 .github/ISSUE_TEMPLATE.md        | 24 ++++++++++++++++++++++++
 .github/pull_request_template.md | 20 ++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE.md
 create mode 100644 .github/pull_request_template.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..73f0986
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,24 @@
+<!--- Provide a general summary of the issue in the Title above -->
+
+## Expected Behavior
+<!--- If you're describing a bug, tell us what should happen -->
+<!--- If you're suggesting a change/improvement, tell us how it should work -->
+
+## Current Behavior
+<!--- If describing a bug, tell us what happens instead of the expected behavior -->
+<!--- If suggesting a change/improvement, explain the difference from current behavior -->
+
+## Possible Solution
+<!--- Not obligatory, but suggest a fix/reason for the bug, -->
+<!--- or ideas how to implement the addition or change -->
+
+## Steps to Reproduce (for bugs)
+<!--- Provide an example tracker query as well as one or more sample journal entry -->
+1.
+2.
+3.
+4.
+
+## Context
+<!--- How has this issue affected you? What are you trying to accomplish? -->
+<!--- Providing context helps us come up with a solution that is most useful in the real world -->
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 0000000..e2a3e0d
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,20 @@
+# Description
+
+Please include a summary of the change and which (if any) issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
+
+Fixes # (issue)
+
+## Type of change
+
+Please delete options that are not relevant.
+
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] This change requires a documentation update
+
+# How Has This Been Tested?
+
+- [ ] If this is a bug fix, did you add or update a test file to the examples directory that verifies the bug is fixed?
+- [ ] If this is a new feature, did you add files to the examples directory to demonstrate the feature?
+- [ ] If this is a new feature, did you add documentation to the docs directory for the feature?

From 1f41ea6d1bcf08f7f493690bc5be9664f4a5e025 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Nov 2023 13:55:09 +0000
Subject: [PATCH 295/402] Bump typescript from 5.2.2 to 5.3.2

Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.2.2 to 5.3.2.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v5.2.2...v5.3.2)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5387a69..cbbb7b1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,7 +26,7 @@
         "rollup": "^4.4.1",
         "rollup-plugin-copy": "^3.5.0",
         "tslib": "^2.6.2",
-        "typescript": "^5.2.2"
+        "typescript": "^5.3.2"
       }
     },
     "node_modules/@codemirror/state": {
@@ -1958,9 +1958,9 @@
       "dev": true
     },
     "node_modules/typescript": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz",
-      "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.2.tgz",
+      "integrity": "sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
diff --git a/package.json b/package.json
index 04ebf73..820ae29 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "rollup": "^4.4.1",
     "rollup-plugin-copy": "^3.5.0",
     "tslib": "^2.6.2",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.2"
   },
   "dependencies": {
     "d3": "^7.8.5",

From 95b1439b9e4a781d6461300fc8f39d8d7aaaf76b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Nov 2023 13:55:19 +0000
Subject: [PATCH 296/402] Bump rollup from 4.4.1 to 4.6.0

Bumps [rollup](https://github.com/rollup/rollup) from 4.4.1 to 4.6.0.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v4.4.1...v4.6.0)

---
updated-dependencies:
- dependency-name: rollup
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 104 +++++++++++++++++++++++-----------------------
 package.json      |   2 +-
 2 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5387a69..25951de 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,7 +23,7 @@
         "@types/node": "^20.9.1",
         "@types/sprintf-js": "^1.1.4",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-        "rollup": "^4.4.1",
+        "rollup": "^4.6.0",
         "rollup-plugin-copy": "^3.5.0",
         "tslib": "^2.6.2",
         "typescript": "^5.2.2"
@@ -262,9 +262,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.4.1.tgz",
-      "integrity": "sha512-Ss4suS/sd+6xLRu+MLCkED2mUrAyqHmmvZB+zpzZ9Znn9S8wCkTQCJaQ8P8aHofnvG5L16u9MVnJjCqioPErwQ==",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.6.0.tgz",
+      "integrity": "sha512-keHkkWAe7OtdALGoutLY3utvthkGF+Y17ws9LYT8pxMBYXaCoH/8dXS2uzo6e8+sEhY7y/zi5RFo22Dy2lFpDw==",
       "cpu": [
         "arm"
       ],
@@ -275,9 +275,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.4.1.tgz",
-      "integrity": "sha512-sRSkGTvGsARwWd7TzC8LKRf8FiPn7257vd/edzmvG4RIr9x68KBN0/Ek48CkuUJ5Pj/Dp9vKWv6PEupjKWjTYA==",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.6.0.tgz",
+      "integrity": "sha512-y3Kt+34smKQNWilicPbBz/MXEY7QwDzMFNgwEWeYiOhUt9MTWKjHqe3EVkXwT2fR7izOvHpDWZ0o2IyD9SWX7A==",
       "cpu": [
         "arm64"
       ],
@@ -288,9 +288,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.4.1.tgz",
-      "integrity": "sha512-nz0AiGrrXyaWpsmBXUGOBiRDU0wyfSXbFuF98pPvIO8O6auQsPG6riWsfQqmCCC5FNd8zKQ4JhgugRNAkBJ8mQ==",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.6.0.tgz",
+      "integrity": "sha512-oLzzxcUIHltHxOCmaXl+pkIlU+uhSxef5HfntW7RsLh1eHm+vJzjD9Oo4oUKso4YuP4PpbFJNlZjJuOrxo8dPg==",
       "cpu": [
         "arm64"
       ],
@@ -301,9 +301,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.4.1.tgz",
-      "integrity": "sha512-Ogqvf4/Ve/faMaiPRvzsJEqajbqs00LO+8vtrPBVvLgdw4wBg6ZDXdkDAZO+4MLnrc8mhGV6VJAzYScZdPLtJg==",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.6.0.tgz",
+      "integrity": "sha512-+ANnmjkcOBaV25n0+M0Bere3roeVAnwlKW65qagtuAfIxXF9YxUneRyAn/RDcIdRa7QrjRNJL3jR7T43ObGe8Q==",
       "cpu": [
         "x64"
       ],
@@ -314,9 +314,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.4.1.tgz",
-      "integrity": "sha512-9zc2tqlr6HfO+hx9+wktUlWTRdje7Ub15iJqKcqg5uJZ+iKqmd2CMxlgPpXi7+bU7bjfDIuvCvnGk7wewFEhCg==",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.6.0.tgz",
+      "integrity": "sha512-tBTSIkjSVUyrekddpkAqKOosnj1Fc0ZY0rJL2bIEWPKqlEQk0paORL9pUIlt7lcGJi3LzMIlUGXvtNi1Z6MOCQ==",
       "cpu": [
         "arm"
       ],
@@ -327,9 +327,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.4.1.tgz",
-      "integrity": "sha512-phLb1fN3rq2o1j1v+nKxXUTSJnAhzhU0hLrl7Qzb0fLpwkGMHDem+o6d+ZI8+/BlTXfMU4kVWGvy6g9k/B8L6Q==",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.6.0.tgz",
+      "integrity": "sha512-Ed8uJI3kM11de9S0j67wAV07JUNhbAqIrDYhQBrQW42jGopgheyk/cdcshgGO4fW5Wjq97COCY/BHogdGvKVNQ==",
       "cpu": [
         "arm64"
       ],
@@ -340,9 +340,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.4.1.tgz",
-      "integrity": "sha512-M2sDtw4tf57VPSjbTAN/lz1doWUqO2CbQuX3L9K6GWIR5uw9j+ROKCvvUNBY8WUbMxwaoc8mH9HmmBKsLht7+w==",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.6.0.tgz",
+      "integrity": "sha512-mZoNQ/qK4D7SSY8v6kEsAAyDgznzLLuSFCA3aBHZTmf3HP/dW4tNLTtWh9+LfyO0Z1aUn+ecpT7IQ3WtIg3ViQ==",
       "cpu": [
         "arm64"
       ],
@@ -353,9 +353,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.4.1.tgz",
-      "integrity": "sha512-mHIlRLX+hx+30cD6c4BaBOsSqdnCE4ok7/KDvjHYAHoSuveoMMxIisZFvcLhUnyZcPBXDGZTuBoalcuh43UfQQ==",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.6.0.tgz",
+      "integrity": "sha512-rouezFHpwCqdEXsqAfNsTgSWO0FoZ5hKv5p+TGO5KFhyN/dvYXNMqMolOb8BkyKcPqjYRBeT+Z6V3aM26rPaYg==",
       "cpu": [
         "x64"
       ],
@@ -366,9 +366,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.4.1.tgz",
-      "integrity": "sha512-tB+RZuDi3zxFx7vDrjTNGVLu2KNyzYv+UY8jz7e4TMEoAj7iEt8Qk6xVu6mo3pgjnsHj6jnq3uuRsHp97DLwOA==",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.6.0.tgz",
+      "integrity": "sha512-Bbm+fyn3S6u51urfj3YnqBXg5vI2jQPncRRELaucmhBVyZkbWClQ1fEsRmdnCPpQOQfkpg9gZArvtMVkOMsh1w==",
       "cpu": [
         "x64"
       ],
@@ -379,9 +379,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.4.1.tgz",
-      "integrity": "sha512-Hdn39PzOQowK/HZzYpCuZdJC91PE6EaGbTe2VCA9oq2u18evkisQfws0Smh9QQGNNRa/T7MOuGNQoLeXhhE3PQ==",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.6.0.tgz",
+      "integrity": "sha512-+MRMcyx9L2kTrTUzYmR61+XVsliMG4odFb5UmqtiT8xOfEicfYAGEuF/D1Pww1+uZkYhBqAHpvju7VN+GnC3ng==",
       "cpu": [
         "arm64"
       ],
@@ -392,9 +392,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.4.1.tgz",
-      "integrity": "sha512-tLpKb1Elm9fM8c5w3nl4N1eLTP4bCqTYw9tqUBxX8/hsxqHO3dxc2qPbZ9PNkdK4tg4iLEYn0pOUnVByRd2CbA==",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.6.0.tgz",
+      "integrity": "sha512-rxfeE6K6s/Xl2HGeK6cO8SiQq3k/3BYpw7cfhW5Bk2euXNEpuzi2cc7llxx1si1QgwfjNtdRNTGqdBzGlFZGFw==",
       "cpu": [
         "ia32"
       ],
@@ -405,9 +405,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.4.1.tgz",
-      "integrity": "sha512-eAhItDX9yQtZVM3yvXS/VR3qPqcnXvnLyx1pLXl4JzyNMBNO3KC986t/iAg2zcMzpAp9JSvxB5VZGnBiNoA98w==",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.6.0.tgz",
+      "integrity": "sha512-QqmCsydHS172Y0Kc13bkMXvipbJSvzeglBncJG3LsYJSiPlxYACz7MmJBs4A8l1oU+jfhYEIC/+AUSlvjmiX/g==",
       "cpu": [
         "x64"
       ],
@@ -1752,9 +1752,9 @@
       "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="
     },
     "node_modules/rollup": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.4.1.tgz",
-      "integrity": "sha512-idZzrUpWSblPJX66i+GzrpjKE3vbYrlWirUHteoAbjKReZwa0cohAErOYA5efoMmNCdvG9yrJS+w9Kl6csaH4w==",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.6.0.tgz",
+      "integrity": "sha512-R8i5Her4oO1LiMQ3jKf7MUglYV/mhQ5g5OKeld5CnkmPdIGo79FDDQYqPhq/PCVuTQVuxsWgIbDy9F+zdHn80w==",
       "dev": true,
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -1764,18 +1764,18 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.4.1",
-        "@rollup/rollup-android-arm64": "4.4.1",
-        "@rollup/rollup-darwin-arm64": "4.4.1",
-        "@rollup/rollup-darwin-x64": "4.4.1",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.4.1",
-        "@rollup/rollup-linux-arm64-gnu": "4.4.1",
-        "@rollup/rollup-linux-arm64-musl": "4.4.1",
-        "@rollup/rollup-linux-x64-gnu": "4.4.1",
-        "@rollup/rollup-linux-x64-musl": "4.4.1",
-        "@rollup/rollup-win32-arm64-msvc": "4.4.1",
-        "@rollup/rollup-win32-ia32-msvc": "4.4.1",
-        "@rollup/rollup-win32-x64-msvc": "4.4.1",
+        "@rollup/rollup-android-arm-eabi": "4.6.0",
+        "@rollup/rollup-android-arm64": "4.6.0",
+        "@rollup/rollup-darwin-arm64": "4.6.0",
+        "@rollup/rollup-darwin-x64": "4.6.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.6.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.6.0",
+        "@rollup/rollup-linux-arm64-musl": "4.6.0",
+        "@rollup/rollup-linux-x64-gnu": "4.6.0",
+        "@rollup/rollup-linux-x64-musl": "4.6.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.6.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.6.0",
+        "@rollup/rollup-win32-x64-msvc": "4.6.0",
         "fsevents": "~2.3.2"
       }
     },
diff --git a/package.json b/package.json
index 04ebf73..c1910a9 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^20.9.1",
     "@types/sprintf-js": "^1.1.4",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-    "rollup": "^4.4.1",
+    "rollup": "^4.6.0",
     "rollup-plugin-copy": "^3.5.0",
     "tslib": "^2.6.2",
     "typescript": "^5.2.2"

From 269762f93f0b827bfc50e7fb64c8328cb1863f25 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Nov 2023 13:55:29 +0000
Subject: [PATCH 297/402] Bump @types/node from 20.9.1 to 20.10.0

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.9.1 to 20.10.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5387a69..a93b271 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,7 @@
         "@rollup/plugin-terser": "^0.4.4",
         "@rollup/plugin-typescript": "^11.1.5",
         "@types/d3": "^7.4.3",
-        "@types/node": "^20.9.1",
+        "@types/node": "^20.10.0",
         "@types/sprintf-js": "^1.1.4",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
         "rollup": "^4.4.1",
@@ -717,9 +717,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.9.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.1.tgz",
-      "integrity": "sha512-HhmzZh5LSJNS5O8jQKpJ/3ZcrrlG6L70hpGqMIAoM9YVD0YBRNWYsfwcXq8VnSjlNpCpgLzMXdiPo+dxcvSmiA==",
+      "version": "20.10.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.0.tgz",
+      "integrity": "sha512-D0WfRmU9TQ8I9PFx9Yc+EBHw+vSpIub4IDvQivcp26PtPrdMGAq5SDcpXEo/epqa/DXotVpekHiLNTg3iaKXBQ==",
       "dev": true,
       "dependencies": {
         "undici-types": "~5.26.4"
diff --git a/package.json b/package.json
index 04ebf73..d5fc4f3 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^11.1.5",
     "@types/d3": "^7.4.3",
-    "@types/node": "^20.9.1",
+    "@types/node": "^20.10.0",
     "@types/sprintf-js": "^1.1.4",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
     "rollup": "^4.4.1",

From a7d366876a34e88c545fd0a3614d0c21fba34db1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 13:09:59 +0000
Subject: [PATCH 298/402] Bump @types/node from 20.10.0 to 20.10.4

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.10.0 to 20.10.4.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 316852c..1bacb51 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,7 @@
         "@rollup/plugin-terser": "^0.4.4",
         "@rollup/plugin-typescript": "^11.1.5",
         "@types/d3": "^7.4.3",
-        "@types/node": "^20.10.0",
+        "@types/node": "^20.10.4",
         "@types/sprintf-js": "^1.1.4",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
         "rollup": "^4.6.0",
@@ -717,9 +717,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.0.tgz",
-      "integrity": "sha512-D0WfRmU9TQ8I9PFx9Yc+EBHw+vSpIub4IDvQivcp26PtPrdMGAq5SDcpXEo/epqa/DXotVpekHiLNTg3iaKXBQ==",
+      "version": "20.10.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.4.tgz",
+      "integrity": "sha512-D08YG6rr8X90YB56tSIuBaddy/UXAA9RKJoFvrsnogAum/0pmjkgi4+2nx96A330FmioegBWmEYQ+syqCFaveg==",
       "dev": true,
       "dependencies": {
         "undici-types": "~5.26.4"
diff --git a/package.json b/package.json
index 41c0e51..e0785e8 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^11.1.5",
     "@types/d3": "^7.4.3",
-    "@types/node": "^20.10.0",
+    "@types/node": "^20.10.4",
     "@types/sprintf-js": "^1.1.4",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
     "rollup": "^4.6.0",

From ec4210e6e6ee68e39c407f43b9224dbbc7f18416 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Dec 2023 20:46:58 +0000
Subject: [PATCH 299/402] Bump rollup from 4.6.0 to 4.8.0

Bumps [rollup](https://github.com/rollup/rollup) from 4.6.0 to 4.8.0.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v4.6.0...v4.8.0)

---
updated-dependencies:
- dependency-name: rollup
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 118 ++++++++++++++++++++++++++--------------------
 package.json      |   2 +-
 2 files changed, 67 insertions(+), 53 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1bacb51..e611168 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,7 +23,7 @@
         "@types/node": "^20.10.4",
         "@types/sprintf-js": "^1.1.4",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-        "rollup": "^4.6.0",
+        "rollup": "^4.8.0",
         "rollup-plugin-copy": "^3.5.0",
         "tslib": "^2.6.2",
         "typescript": "^5.3.2"
@@ -262,9 +262,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.6.0.tgz",
-      "integrity": "sha512-keHkkWAe7OtdALGoutLY3utvthkGF+Y17ws9LYT8pxMBYXaCoH/8dXS2uzo6e8+sEhY7y/zi5RFo22Dy2lFpDw==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.8.0.tgz",
+      "integrity": "sha512-zdTObFRoNENrdPpnTNnhOljYIcOX7aI7+7wyrSpPFFIOf/nRdedE6IYsjaBE7tjukphh1tMTojgJ7p3lKY8x6Q==",
       "cpu": [
         "arm"
       ],
@@ -275,9 +275,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.6.0.tgz",
-      "integrity": "sha512-y3Kt+34smKQNWilicPbBz/MXEY7QwDzMFNgwEWeYiOhUt9MTWKjHqe3EVkXwT2fR7izOvHpDWZ0o2IyD9SWX7A==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.8.0.tgz",
+      "integrity": "sha512-aiItwP48BiGpMFS9Znjo/xCNQVwTQVcRKkFKsO81m8exrGjHkCBDvm9PHay2kpa8RPnZzzKcD1iQ9KaLY4fPQQ==",
       "cpu": [
         "arm64"
       ],
@@ -288,9 +288,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.6.0.tgz",
-      "integrity": "sha512-oLzzxcUIHltHxOCmaXl+pkIlU+uhSxef5HfntW7RsLh1eHm+vJzjD9Oo4oUKso4YuP4PpbFJNlZjJuOrxo8dPg==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.8.0.tgz",
+      "integrity": "sha512-zhNIS+L4ZYkYQUjIQUR6Zl0RXhbbA0huvNIWjmPc2SL0cB1h5Djkcy+RZ3/Bwszfb6vgwUvcVJYD6e6Zkpsi8g==",
       "cpu": [
         "arm64"
       ],
@@ -301,9 +301,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.6.0.tgz",
-      "integrity": "sha512-+ANnmjkcOBaV25n0+M0Bere3roeVAnwlKW65qagtuAfIxXF9YxUneRyAn/RDcIdRa7QrjRNJL3jR7T43ObGe8Q==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.8.0.tgz",
+      "integrity": "sha512-A/FAHFRNQYrELrb/JHncRWzTTXB2ticiRFztP4ggIUAfa9Up1qfW8aG2w/mN9jNiZ+HB0t0u0jpJgFXG6BfRTA==",
       "cpu": [
         "x64"
       ],
@@ -314,9 +314,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.6.0.tgz",
-      "integrity": "sha512-tBTSIkjSVUyrekddpkAqKOosnj1Fc0ZY0rJL2bIEWPKqlEQk0paORL9pUIlt7lcGJi3LzMIlUGXvtNi1Z6MOCQ==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.8.0.tgz",
+      "integrity": "sha512-JsidBnh3p2IJJA4/2xOF2puAYqbaczB3elZDT0qHxn362EIoIkq7hrR43Xa8RisgI6/WPfvb2umbGsuvf7E37A==",
       "cpu": [
         "arm"
       ],
@@ -327,9 +327,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.6.0.tgz",
-      "integrity": "sha512-Ed8uJI3kM11de9S0j67wAV07JUNhbAqIrDYhQBrQW42jGopgheyk/cdcshgGO4fW5Wjq97COCY/BHogdGvKVNQ==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.8.0.tgz",
+      "integrity": "sha512-hBNCnqw3EVCkaPB0Oqd24bv8SklETptQWcJz06kb9OtiShn9jK1VuTgi7o4zPSt6rNGWQOTDEAccbk0OqJmS+g==",
       "cpu": [
         "arm64"
       ],
@@ -340,9 +340,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.6.0.tgz",
-      "integrity": "sha512-mZoNQ/qK4D7SSY8v6kEsAAyDgznzLLuSFCA3aBHZTmf3HP/dW4tNLTtWh9+LfyO0Z1aUn+ecpT7IQ3WtIg3ViQ==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.8.0.tgz",
+      "integrity": "sha512-Fw9ChYfJPdltvi9ALJ9wzdCdxGw4wtq4t1qY028b2O7GwB5qLNSGtqMsAel1lfWTZvf4b6/+4HKp0GlSYg0ahA==",
       "cpu": [
         "arm64"
       ],
@@ -352,10 +352,23 @@
         "linux"
       ]
     },
+    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.8.0.tgz",
+      "integrity": "sha512-BH5xIh7tOzS9yBi8dFrCTG8Z6iNIGWGltd3IpTSKp6+pNWWO6qy8eKoRxOtwFbMrid5NZaidLYN6rHh9aB8bEw==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.6.0.tgz",
-      "integrity": "sha512-rouezFHpwCqdEXsqAfNsTgSWO0FoZ5hKv5p+TGO5KFhyN/dvYXNMqMolOb8BkyKcPqjYRBeT+Z6V3aM26rPaYg==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.8.0.tgz",
+      "integrity": "sha512-PmvAj8k6EuWiyLbkNpd6BLv5XeYFpqWuRvRNRl80xVfpGXK/z6KYXmAgbI4ogz7uFiJxCnYcqyvZVD0dgFog7Q==",
       "cpu": [
         "x64"
       ],
@@ -366,9 +379,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.6.0.tgz",
-      "integrity": "sha512-Bbm+fyn3S6u51urfj3YnqBXg5vI2jQPncRRELaucmhBVyZkbWClQ1fEsRmdnCPpQOQfkpg9gZArvtMVkOMsh1w==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.8.0.tgz",
+      "integrity": "sha512-mdxnlW2QUzXwY+95TuxZ+CurrhgrPAMveDWI97EQlA9bfhR8tw3Pt7SUlc/eSlCNxlWktpmT//EAA8UfCHOyXg==",
       "cpu": [
         "x64"
       ],
@@ -379,9 +392,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.6.0.tgz",
-      "integrity": "sha512-+MRMcyx9L2kTrTUzYmR61+XVsliMG4odFb5UmqtiT8xOfEicfYAGEuF/D1Pww1+uZkYhBqAHpvju7VN+GnC3ng==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.8.0.tgz",
+      "integrity": "sha512-ge7saUz38aesM4MA7Cad8CHo0Fyd1+qTaqoIo+Jtk+ipBi4ATSrHWov9/S4u5pbEQmLjgUjB7BJt+MiKG2kzmA==",
       "cpu": [
         "arm64"
       ],
@@ -392,9 +405,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.6.0.tgz",
-      "integrity": "sha512-rxfeE6K6s/Xl2HGeK6cO8SiQq3k/3BYpw7cfhW5Bk2euXNEpuzi2cc7llxx1si1QgwfjNtdRNTGqdBzGlFZGFw==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.8.0.tgz",
+      "integrity": "sha512-p9E3PZlzurhlsN5h9g7zIP1DnqKXJe8ZUkFwAazqSvHuWfihlIISPxG9hCHCoA+dOOspL/c7ty1eeEVFTE0UTw==",
       "cpu": [
         "ia32"
       ],
@@ -405,9 +418,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.6.0.tgz",
-      "integrity": "sha512-QqmCsydHS172Y0Kc13bkMXvipbJSvzeglBncJG3LsYJSiPlxYACz7MmJBs4A8l1oU+jfhYEIC/+AUSlvjmiX/g==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.8.0.tgz",
+      "integrity": "sha512-kb4/auKXkYKqlUYTE8s40FcJIj5soOyRLHKd4ugR0dCq0G2EfcF54eYcfQiGkHzjidZ40daB4ulsFdtqNKZtBg==",
       "cpu": [
         "x64"
       ],
@@ -1752,9 +1765,9 @@
       "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="
     },
     "node_modules/rollup": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.6.0.tgz",
-      "integrity": "sha512-R8i5Her4oO1LiMQ3jKf7MUglYV/mhQ5g5OKeld5CnkmPdIGo79FDDQYqPhq/PCVuTQVuxsWgIbDy9F+zdHn80w==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.8.0.tgz",
+      "integrity": "sha512-NpsklK2fach5CdI+PScmlE5R4Ao/FSWtF7LkoIrHDxPACY/xshNasPsbpG0VVHxUTbf74tJbVT4PrP8JsJ6ZDA==",
       "dev": true,
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -1764,18 +1777,19 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.6.0",
-        "@rollup/rollup-android-arm64": "4.6.0",
-        "@rollup/rollup-darwin-arm64": "4.6.0",
-        "@rollup/rollup-darwin-x64": "4.6.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.6.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.6.0",
-        "@rollup/rollup-linux-arm64-musl": "4.6.0",
-        "@rollup/rollup-linux-x64-gnu": "4.6.0",
-        "@rollup/rollup-linux-x64-musl": "4.6.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.6.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.6.0",
-        "@rollup/rollup-win32-x64-msvc": "4.6.0",
+        "@rollup/rollup-android-arm-eabi": "4.8.0",
+        "@rollup/rollup-android-arm64": "4.8.0",
+        "@rollup/rollup-darwin-arm64": "4.8.0",
+        "@rollup/rollup-darwin-x64": "4.8.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.8.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.8.0",
+        "@rollup/rollup-linux-arm64-musl": "4.8.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.8.0",
+        "@rollup/rollup-linux-x64-gnu": "4.8.0",
+        "@rollup/rollup-linux-x64-musl": "4.8.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.8.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.8.0",
+        "@rollup/rollup-win32-x64-msvc": "4.8.0",
         "fsevents": "~2.3.2"
       }
     },
diff --git a/package.json b/package.json
index e0785e8..586aead 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^20.10.4",
     "@types/sprintf-js": "^1.1.4",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-    "rollup": "^4.6.0",
+    "rollup": "^4.8.0",
     "rollup-plugin-copy": "^3.5.0",
     "tslib": "^2.6.2",
     "typescript": "^5.3.2"

From 5f219c6a2d1164332fc31e657f0618edbb59d1c9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Dec 2023 20:46:58 +0000
Subject: [PATCH 300/402] Bump typescript from 5.3.2 to 5.3.3

Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.3.2 to 5.3.3.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v5.3.2...v5.3.3)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1bacb51..82bdbfb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,7 +26,7 @@
         "rollup": "^4.6.0",
         "rollup-plugin-copy": "^3.5.0",
         "tslib": "^2.6.2",
-        "typescript": "^5.3.2"
+        "typescript": "^5.3.3"
       }
     },
     "node_modules/@codemirror/state": {
@@ -1958,9 +1958,9 @@
       "dev": true
     },
     "node_modules/typescript": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.2.tgz",
-      "integrity": "sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==",
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz",
+      "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
diff --git a/package.json b/package.json
index e0785e8..4dc179f 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "rollup": "^4.6.0",
     "rollup-plugin-copy": "^3.5.0",
     "tslib": "^2.6.2",
-    "typescript": "^5.3.2"
+    "typescript": "^5.3.3"
   },
   "dependencies": {
     "d3": "^7.8.5",

From 29637ea4a242121c72db90217ef92feb8ffa88a2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Jan 2024 13:10:19 +0000
Subject: [PATCH 301/402] Bump @types/node from 20.10.4 to 20.10.6

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.10.4 to 20.10.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d7a13cd..27bffbf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,7 @@
         "@rollup/plugin-terser": "^0.4.4",
         "@rollup/plugin-typescript": "^11.1.5",
         "@types/d3": "^7.4.3",
-        "@types/node": "^20.10.4",
+        "@types/node": "^20.10.6",
         "@types/sprintf-js": "^1.1.4",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
         "rollup": "^4.8.0",
@@ -730,9 +730,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.10.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.4.tgz",
-      "integrity": "sha512-D08YG6rr8X90YB56tSIuBaddy/UXAA9RKJoFvrsnogAum/0pmjkgi4+2nx96A330FmioegBWmEYQ+syqCFaveg==",
+      "version": "20.10.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.6.tgz",
+      "integrity": "sha512-Vac8H+NlRNNlAmDfGUP7b5h/KA+AtWIzuXy0E6OyP8f1tCLYAtPvKRRDJjAPqhpCb0t6U2j7/xqAuLEebW2kiw==",
       "dev": true,
       "dependencies": {
         "undici-types": "~5.26.4"
diff --git a/package.json b/package.json
index 83c5bc2..a5926f3 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^11.1.5",
     "@types/d3": "^7.4.3",
-    "@types/node": "^20.10.4",
+    "@types/node": "^20.10.6",
     "@types/sprintf-js": "^1.1.4",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
     "rollup": "^4.8.0",

From 053f4c9a4398c495b3b63614d5108d8f9a3e0256 Mon Sep 17 00:00:00 2001
From: prolenodev <prolenodev@protonmail.com>
Date: Fri, 5 Jan 2024 05:52:26 +0800
Subject: [PATCH 302/402] Fix typo in README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b2e26aa..5d05cd2 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ Version 1.10.9
 
 Version 1.10.8
 
-- Fixed startDat/endDate misread as a relative date
+- Fixed startDate/endDate misread as a relative date
 
 Version 1.10.7
 

From 6dffcb20d78cc7c0901541457431e4be15060770 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Jan 2024 07:06:51 +0000
Subject: [PATCH 303/402] Bump rollup from 4.8.0 to 4.9.3

Bumps [rollup](https://github.com/rollup/rollup) from 4.8.0 to 4.9.3.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v4.8.0...v4.9.3)

---
updated-dependencies:
- dependency-name: rollup
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 115 ++++++++++++++++++++++++----------------------
 package.json      |   2 +-
 2 files changed, 60 insertions(+), 57 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 27bffbf..2305608 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,7 +23,7 @@
         "@types/node": "^20.10.6",
         "@types/sprintf-js": "^1.1.4",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-        "rollup": "^4.8.0",
+        "rollup": "^4.9.3",
         "rollup-plugin-copy": "^3.5.0",
         "tslib": "^2.6.2",
         "typescript": "^5.3.3"
@@ -262,9 +262,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.8.0.tgz",
-      "integrity": "sha512-zdTObFRoNENrdPpnTNnhOljYIcOX7aI7+7wyrSpPFFIOf/nRdedE6IYsjaBE7tjukphh1tMTojgJ7p3lKY8x6Q==",
+      "version": "4.9.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.9.3.tgz",
+      "integrity": "sha512-nvh9bB41vXEoKKvlWCGptpGt8EhrEwPQFDCY0VAto+R+qpSbaErPS3OjMZuXR8i/2UVw952Dtlnl2JFxH31Qvg==",
       "cpu": [
         "arm"
       ],
@@ -275,9 +275,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.8.0.tgz",
-      "integrity": "sha512-aiItwP48BiGpMFS9Znjo/xCNQVwTQVcRKkFKsO81m8exrGjHkCBDvm9PHay2kpa8RPnZzzKcD1iQ9KaLY4fPQQ==",
+      "version": "4.9.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.9.3.tgz",
+      "integrity": "sha512-kffYCJ2RhDL1DlshLzYPyJtVeusHlA8Q1j6k6s4AEVKLq/3HfGa2ADDycLsmPo3OW83r4XtOPqRMbcFzFsEIzQ==",
       "cpu": [
         "arm64"
       ],
@@ -288,9 +288,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.8.0.tgz",
-      "integrity": "sha512-zhNIS+L4ZYkYQUjIQUR6Zl0RXhbbA0huvNIWjmPc2SL0cB1h5Djkcy+RZ3/Bwszfb6vgwUvcVJYD6e6Zkpsi8g==",
+      "version": "4.9.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.9.3.tgz",
+      "integrity": "sha512-Fo7DR6Q9/+ztTyMBZ79+WJtb8RWZonyCgkBCjV51rW5K/dizBzImTW6HLC0pzmHaAevwM0jW1GtB5LCFE81mSw==",
       "cpu": [
         "arm64"
       ],
@@ -301,9 +301,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.8.0.tgz",
-      "integrity": "sha512-A/FAHFRNQYrELrb/JHncRWzTTXB2ticiRFztP4ggIUAfa9Up1qfW8aG2w/mN9jNiZ+HB0t0u0jpJgFXG6BfRTA==",
+      "version": "4.9.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.9.3.tgz",
+      "integrity": "sha512-5HcxDF9fqHucIlTiw/gmMb3Qv23L8bLCg904I74Q2lpl4j/20z9ogaD3tWkeguRuz+/17cuS321PT3PAuyjQdg==",
       "cpu": [
         "x64"
       ],
@@ -314,9 +314,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.8.0.tgz",
-      "integrity": "sha512-JsidBnh3p2IJJA4/2xOF2puAYqbaczB3elZDT0qHxn362EIoIkq7hrR43Xa8RisgI6/WPfvb2umbGsuvf7E37A==",
+      "version": "4.9.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.9.3.tgz",
+      "integrity": "sha512-cO6hKV+99D1V7uNJQn1chWaF9EGp7qV2N8sGH99q9Y62bsbN6Il55EwJppEWT+JiqDRg396vWCgwdHwje8itBQ==",
       "cpu": [
         "arm"
       ],
@@ -327,9 +327,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.8.0.tgz",
-      "integrity": "sha512-hBNCnqw3EVCkaPB0Oqd24bv8SklETptQWcJz06kb9OtiShn9jK1VuTgi7o4zPSt6rNGWQOTDEAccbk0OqJmS+g==",
+      "version": "4.9.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.9.3.tgz",
+      "integrity": "sha512-xANyq6lVg6KMO8UUs0LjA4q7di3tPpDbzLPgVEU2/F1ngIZ54eli8Zdt3uUUTMXVbgTCafIO+JPeGMhu097i3w==",
       "cpu": [
         "arm64"
       ],
@@ -340,9 +340,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.8.0.tgz",
-      "integrity": "sha512-Fw9ChYfJPdltvi9ALJ9wzdCdxGw4wtq4t1qY028b2O7GwB5qLNSGtqMsAel1lfWTZvf4b6/+4HKp0GlSYg0ahA==",
+      "version": "4.9.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.9.3.tgz",
+      "integrity": "sha512-TZJUfRTugVFATQToCMD8DNV6jv/KpSwhE1lLq5kXiQbBX3Pqw6dRKtzNkh5wcp0n09reBBq/7CGDERRw9KmE+g==",
       "cpu": [
         "arm64"
       ],
@@ -353,9 +353,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.8.0.tgz",
-      "integrity": "sha512-BH5xIh7tOzS9yBi8dFrCTG8Z6iNIGWGltd3IpTSKp6+pNWWO6qy8eKoRxOtwFbMrid5NZaidLYN6rHh9aB8bEw==",
+      "version": "4.9.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.9.3.tgz",
+      "integrity": "sha512-4/QVaRyaB5tkEAGfjVvWrmWdPF6F2NoaoO5uEP7N0AyeBw7l8SeCWWKAGrbx/00PUdHrJVURJiYikazslSKttQ==",
       "cpu": [
         "riscv64"
       ],
@@ -366,9 +366,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.8.0.tgz",
-      "integrity": "sha512-PmvAj8k6EuWiyLbkNpd6BLv5XeYFpqWuRvRNRl80xVfpGXK/z6KYXmAgbI4ogz7uFiJxCnYcqyvZVD0dgFog7Q==",
+      "version": "4.9.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.9.3.tgz",
+      "integrity": "sha512-koLC6D3pj1YLZSkTy/jsk3HOadp7q2h6VQl/lPX854twOmmLNekHB6yuS+MkWcKdGGdW1JPuPBv/ZYhr5Yhtdg==",
       "cpu": [
         "x64"
       ],
@@ -379,9 +379,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.8.0.tgz",
-      "integrity": "sha512-mdxnlW2QUzXwY+95TuxZ+CurrhgrPAMveDWI97EQlA9bfhR8tw3Pt7SUlc/eSlCNxlWktpmT//EAA8UfCHOyXg==",
+      "version": "4.9.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.9.3.tgz",
+      "integrity": "sha512-0OAkQ4HBp+JO2ip2Lgt/ShlrveOMzyhwt2D0KvqH28jFPqfZco28KSq76zymZwmU+F6GRojdxtQMJiNSXKNzeA==",
       "cpu": [
         "x64"
       ],
@@ -392,9 +392,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.8.0.tgz",
-      "integrity": "sha512-ge7saUz38aesM4MA7Cad8CHo0Fyd1+qTaqoIo+Jtk+ipBi4ATSrHWov9/S4u5pbEQmLjgUjB7BJt+MiKG2kzmA==",
+      "version": "4.9.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.9.3.tgz",
+      "integrity": "sha512-z5uvoMvdRWggigOnsb9OOCLERHV0ykRZoRB5O+URPZC9zM3pkoMg5fN4NKu2oHqgkzZtfx9u4njqqlYEzM1v9A==",
       "cpu": [
         "arm64"
       ],
@@ -405,9 +405,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.8.0.tgz",
-      "integrity": "sha512-p9E3PZlzurhlsN5h9g7zIP1DnqKXJe8ZUkFwAazqSvHuWfihlIISPxG9hCHCoA+dOOspL/c7ty1eeEVFTE0UTw==",
+      "version": "4.9.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.9.3.tgz",
+      "integrity": "sha512-wxomCHjBVKws+O4N1WLnniKCXu7vkLtdq9Fl9CN/EbwEldojvUrkoHE/fBLZzC7IT/x12Ut6d6cRs4dFvqJkMg==",
       "cpu": [
         "ia32"
       ],
@@ -418,9 +418,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.8.0.tgz",
-      "integrity": "sha512-kb4/auKXkYKqlUYTE8s40FcJIj5soOyRLHKd4ugR0dCq0G2EfcF54eYcfQiGkHzjidZ40daB4ulsFdtqNKZtBg==",
+      "version": "4.9.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.9.3.tgz",
+      "integrity": "sha512-1Qf/qk/iEtx0aOi+AQQt5PBoW0mFngsm7bPuxHClC/hWh2hHBktR6ktSfUg5b5rC9v8hTwNmHE7lBWXkgqluUQ==",
       "cpu": [
         "x64"
       ],
@@ -1765,10 +1765,13 @@
       "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="
     },
     "node_modules/rollup": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.8.0.tgz",
-      "integrity": "sha512-NpsklK2fach5CdI+PScmlE5R4Ao/FSWtF7LkoIrHDxPACY/xshNasPsbpG0VVHxUTbf74tJbVT4PrP8JsJ6ZDA==",
+      "version": "4.9.3",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.9.3.tgz",
+      "integrity": "sha512-JnchF0ZGFiqGpAPjg3e89j656Ne4tTtCY1VZc1AxtoQcRIxjTu9jyYHBAtkDXE+X681n4un/nX9SU52AroSRzg==",
       "dev": true,
+      "dependencies": {
+        "@types/estree": "1.0.5"
+      },
       "bin": {
         "rollup": "dist/bin/rollup"
       },
@@ -1777,19 +1780,19 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.8.0",
-        "@rollup/rollup-android-arm64": "4.8.0",
-        "@rollup/rollup-darwin-arm64": "4.8.0",
-        "@rollup/rollup-darwin-x64": "4.8.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.8.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.8.0",
-        "@rollup/rollup-linux-arm64-musl": "4.8.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.8.0",
-        "@rollup/rollup-linux-x64-gnu": "4.8.0",
-        "@rollup/rollup-linux-x64-musl": "4.8.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.8.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.8.0",
-        "@rollup/rollup-win32-x64-msvc": "4.8.0",
+        "@rollup/rollup-android-arm-eabi": "4.9.3",
+        "@rollup/rollup-android-arm64": "4.9.3",
+        "@rollup/rollup-darwin-arm64": "4.9.3",
+        "@rollup/rollup-darwin-x64": "4.9.3",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.9.3",
+        "@rollup/rollup-linux-arm64-gnu": "4.9.3",
+        "@rollup/rollup-linux-arm64-musl": "4.9.3",
+        "@rollup/rollup-linux-riscv64-gnu": "4.9.3",
+        "@rollup/rollup-linux-x64-gnu": "4.9.3",
+        "@rollup/rollup-linux-x64-musl": "4.9.3",
+        "@rollup/rollup-win32-arm64-msvc": "4.9.3",
+        "@rollup/rollup-win32-ia32-msvc": "4.9.3",
+        "@rollup/rollup-win32-x64-msvc": "4.9.3",
         "fsevents": "~2.3.2"
       }
     },
diff --git a/package.json b/package.json
index a5926f3..eddc713 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^20.10.6",
     "@types/sprintf-js": "^1.1.4",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-    "rollup": "^4.8.0",
+    "rollup": "^4.9.3",
     "rollup-plugin-copy": "^3.5.0",
     "tslib": "^2.6.2",
     "typescript": "^5.3.3"

From c8f9af9f86ded209cb281110f3b17697e992f447 Mon Sep 17 00:00:00 2001
From: souponaroom <36963544+souponaroom@users.noreply.github.com>
Date: Fri, 19 Jan 2024 13:29:44 -0600
Subject: [PATCH 304/402] Changed null checks to falsey checks so Obsidian
 frontmatter checkboxes work with streaks

---
 package-lock.json | 202 +++++++++++++++++++++++-----------------------
 src/expr.ts       |  28 +++----
 2 files changed, 115 insertions(+), 115 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2305608..1b491a8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -30,20 +30,20 @@
       }
     },
     "node_modules/@codemirror/state": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.3.1.tgz",
-      "integrity": "sha512-88e4HhMtKJyw6fKprGaN/yZfiaoGYOi2nM45YCUC6R/kex9sxFWBDGatS1vk4lMgnWmdIIB9tk8Gj1LmL8YfvA==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.4.0.tgz",
+      "integrity": "sha512-hm8XshYj5Fo30Bb922QX9hXB/bxOAVH+qaqHBzw5TKa72vOeslyGwd4X8M0c1dJ9JqxlaMceOQ8RsL9tC7gU0A==",
       "dev": true,
       "peer": true
     },
     "node_modules/@codemirror/view": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.22.0.tgz",
-      "integrity": "sha512-6zLj4YIoIpfTGKrDMTbeZRpa8ih4EymMCKmddEDcJWrCdp/N1D46B38YEz4creTb4T177AVS9EyXkLeC/HL2jA==",
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.23.0.tgz",
+      "integrity": "sha512-/51px9N4uW8NpuWkyUX+iam5+PM6io2fm+QmRnzwqBy5v/pwGg9T0kILFtYeum8hjuvENtgsGNKluOfqIICmeQ==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@codemirror/state": "^6.1.4",
+        "@codemirror/state": "^6.4.0",
         "style-mod": "^4.1.0",
         "w3c-keyname": "^2.2.4"
       }
@@ -97,9 +97,9 @@
       "dev": true
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.20",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz",
-      "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==",
+      "version": "0.3.21",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.21.tgz",
+      "integrity": "sha512-SRfKmRe1KvYnxjEMtxEr+J4HIeMX5YBg/qhRHpxEIGjhX1rshcHlnFUE9K0GazhVKWM7B+nARSkV8LuvJdJ5/g==",
       "dev": true,
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
@@ -214,12 +214,12 @@
       }
     },
     "node_modules/@rollup/plugin-typescript": {
-      "version": "11.1.5",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-11.1.5.tgz",
-      "integrity": "sha512-rnMHrGBB0IUEv69Q8/JGRD/n4/n6b3nfpufUu26axhUcboUzv/twfZU8fIBbTOphRAe0v8EyxzeDpKXqGHfyDA==",
+      "version": "11.1.6",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-11.1.6.tgz",
+      "integrity": "sha512-R92yOmIACgYdJ7dJ97p4K69I8gg6IEHt8M7dUBxN3W6nrO8uUxX5ixl0yU/N3aZTi8WhPuICvOHXQvF6FaykAA==",
       "dev": true,
       "dependencies": {
-        "@rollup/pluginutils": "^5.0.1",
+        "@rollup/pluginutils": "^5.1.0",
         "resolve": "^1.22.1"
       },
       "engines": {
@@ -240,9 +240,9 @@
       }
     },
     "node_modules/@rollup/pluginutils": {
-      "version": "5.0.5",
-      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.5.tgz",
-      "integrity": "sha512-6aEYR910NyP73oHiJglti74iRyOwgFU4x3meH/H8OJx6Ry0j6cOVZ5X/wTvub7G7Ao6qaHBEaNsV3GLJkSsF+Q==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz",
+      "integrity": "sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==",
       "dev": true,
       "dependencies": {
         "@types/estree": "^1.0.0",
@@ -262,9 +262,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.9.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.9.3.tgz",
-      "integrity": "sha512-nvh9bB41vXEoKKvlWCGptpGt8EhrEwPQFDCY0VAto+R+qpSbaErPS3OjMZuXR8i/2UVw952Dtlnl2JFxH31Qvg==",
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.9.5.tgz",
+      "integrity": "sha512-idWaG8xeSRCfRq9KpRysDHJ/rEHBEXcHuJ82XY0yYFIWnLMjZv9vF/7DOq8djQ2n3Lk6+3qfSH8AqlmHlmi1MA==",
       "cpu": [
         "arm"
       ],
@@ -275,9 +275,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.9.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.9.3.tgz",
-      "integrity": "sha512-kffYCJ2RhDL1DlshLzYPyJtVeusHlA8Q1j6k6s4AEVKLq/3HfGa2ADDycLsmPo3OW83r4XtOPqRMbcFzFsEIzQ==",
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.9.5.tgz",
+      "integrity": "sha512-f14d7uhAMtsCGjAYwZGv6TwuS3IFaM4ZnGMUn3aCBgkcHAYErhV1Ad97WzBvS2o0aaDv4mVz+syiN0ElMyfBPg==",
       "cpu": [
         "arm64"
       ],
@@ -288,9 +288,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.9.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.9.3.tgz",
-      "integrity": "sha512-Fo7DR6Q9/+ztTyMBZ79+WJtb8RWZonyCgkBCjV51rW5K/dizBzImTW6HLC0pzmHaAevwM0jW1GtB5LCFE81mSw==",
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.9.5.tgz",
+      "integrity": "sha512-ndoXeLx455FffL68OIUrVr89Xu1WLzAG4n65R8roDlCoYiQcGGg6MALvs2Ap9zs7AHg8mpHtMpwC8jBBjZrT/w==",
       "cpu": [
         "arm64"
       ],
@@ -301,9 +301,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.9.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.9.3.tgz",
-      "integrity": "sha512-5HcxDF9fqHucIlTiw/gmMb3Qv23L8bLCg904I74Q2lpl4j/20z9ogaD3tWkeguRuz+/17cuS321PT3PAuyjQdg==",
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.9.5.tgz",
+      "integrity": "sha512-UmElV1OY2m/1KEEqTlIjieKfVwRg0Zwg4PLgNf0s3glAHXBN99KLpw5A5lrSYCa1Kp63czTpVll2MAqbZYIHoA==",
       "cpu": [
         "x64"
       ],
@@ -314,9 +314,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.9.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.9.3.tgz",
-      "integrity": "sha512-cO6hKV+99D1V7uNJQn1chWaF9EGp7qV2N8sGH99q9Y62bsbN6Il55EwJppEWT+JiqDRg396vWCgwdHwje8itBQ==",
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.9.5.tgz",
+      "integrity": "sha512-Q0LcU61v92tQB6ae+udZvOyZ0wfpGojtAKrrpAaIqmJ7+psq4cMIhT/9lfV6UQIpeItnq/2QDROhNLo00lOD1g==",
       "cpu": [
         "arm"
       ],
@@ -327,9 +327,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.9.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.9.3.tgz",
-      "integrity": "sha512-xANyq6lVg6KMO8UUs0LjA4q7di3tPpDbzLPgVEU2/F1ngIZ54eli8Zdt3uUUTMXVbgTCafIO+JPeGMhu097i3w==",
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.9.5.tgz",
+      "integrity": "sha512-dkRscpM+RrR2Ee3eOQmRWFjmV/payHEOrjyq1VZegRUa5OrZJ2MAxBNs05bZuY0YCtpqETDy1Ix4i/hRqX98cA==",
       "cpu": [
         "arm64"
       ],
@@ -340,9 +340,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.9.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.9.3.tgz",
-      "integrity": "sha512-TZJUfRTugVFATQToCMD8DNV6jv/KpSwhE1lLq5kXiQbBX3Pqw6dRKtzNkh5wcp0n09reBBq/7CGDERRw9KmE+g==",
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.9.5.tgz",
+      "integrity": "sha512-QaKFVOzzST2xzY4MAmiDmURagWLFh+zZtttuEnuNn19AiZ0T3fhPyjPPGwLNdiDT82ZE91hnfJsUiDwF9DClIQ==",
       "cpu": [
         "arm64"
       ],
@@ -353,9 +353,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.9.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.9.3.tgz",
-      "integrity": "sha512-4/QVaRyaB5tkEAGfjVvWrmWdPF6F2NoaoO5uEP7N0AyeBw7l8SeCWWKAGrbx/00PUdHrJVURJiYikazslSKttQ==",
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.9.5.tgz",
+      "integrity": "sha512-HeGqmRJuyVg6/X6MpE2ur7GbymBPS8Np0S/vQFHDmocfORT+Zt76qu+69NUoxXzGqVP1pzaY6QIi0FJWLC3OPA==",
       "cpu": [
         "riscv64"
       ],
@@ -366,9 +366,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.9.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.9.3.tgz",
-      "integrity": "sha512-koLC6D3pj1YLZSkTy/jsk3HOadp7q2h6VQl/lPX854twOmmLNekHB6yuS+MkWcKdGGdW1JPuPBv/ZYhr5Yhtdg==",
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.9.5.tgz",
+      "integrity": "sha512-Dq1bqBdLaZ1Gb/l2e5/+o3B18+8TI9ANlA1SkejZqDgdU/jK/ThYaMPMJpVMMXy2uRHvGKbkz9vheVGdq3cJfA==",
       "cpu": [
         "x64"
       ],
@@ -379,9 +379,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.9.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.9.3.tgz",
-      "integrity": "sha512-0OAkQ4HBp+JO2ip2Lgt/ShlrveOMzyhwt2D0KvqH28jFPqfZco28KSq76zymZwmU+F6GRojdxtQMJiNSXKNzeA==",
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.9.5.tgz",
+      "integrity": "sha512-ezyFUOwldYpj7AbkwyW9AJ203peub81CaAIVvckdkyH8EvhEIoKzaMFJj0G4qYJ5sw3BpqhFrsCc30t54HV8vg==",
       "cpu": [
         "x64"
       ],
@@ -392,9 +392,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.9.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.9.3.tgz",
-      "integrity": "sha512-z5uvoMvdRWggigOnsb9OOCLERHV0ykRZoRB5O+URPZC9zM3pkoMg5fN4NKu2oHqgkzZtfx9u4njqqlYEzM1v9A==",
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.9.5.tgz",
+      "integrity": "sha512-aHSsMnUw+0UETB0Hlv7B/ZHOGY5bQdwMKJSzGfDfvyhnpmVxLMGnQPGNE9wgqkLUs3+gbG1Qx02S2LLfJ5GaRQ==",
       "cpu": [
         "arm64"
       ],
@@ -405,9 +405,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.9.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.9.3.tgz",
-      "integrity": "sha512-wxomCHjBVKws+O4N1WLnniKCXu7vkLtdq9Fl9CN/EbwEldojvUrkoHE/fBLZzC7IT/x12Ut6d6cRs4dFvqJkMg==",
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.9.5.tgz",
+      "integrity": "sha512-AiqiLkb9KSf7Lj/o1U3SEP9Zn+5NuVKgFdRIZkvd4N0+bYrTOovVd0+LmYCPQGbocT4kvFyK+LXCDiXPBF3fyA==",
       "cpu": [
         "ia32"
       ],
@@ -418,9 +418,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.9.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.9.3.tgz",
-      "integrity": "sha512-1Qf/qk/iEtx0aOi+AQQt5PBoW0mFngsm7bPuxHClC/hWh2hHBktR6ktSfUg5b5rC9v8hTwNmHE7lBWXkgqluUQ==",
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.9.5.tgz",
+      "integrity": "sha512-1q+mykKE3Vot1kaFJIDoUFv5TuW+QQVaf2FmTT9krg86pQrGStOSJJ0Zil7CFagyxDuouTepzt5Y5TVzyajOdQ==",
       "cpu": [
         "x64"
       ],
@@ -614,9 +614,9 @@
       "dev": true
     },
     "node_modules/@types/d3-quadtree": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/d3-quadtree/-/d3-quadtree-3.0.5.tgz",
-      "integrity": "sha512-Cb1f3jyNBnvMMkf4KBZ7IgAQVWd9yzBwYcrxGqg3aPCUgWELAS+nyeB7r76aqu1e3+CGDjhk4BrWaFBekMwigg==",
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-quadtree/-/d3-quadtree-3.0.6.tgz",
+      "integrity": "sha512-oUzyO1/Zm6rsxKRHA1vH0NEDG58HrT5icx/azi9MF1TWdtttWl0UIUsjEQBBh+SIkrpd21ZjEv7ptxWys1ncsg==",
       "dev": true
     },
     "node_modules/@types/d3-random": {
@@ -635,9 +635,9 @@
       }
     },
     "node_modules/@types/d3-scale-chromatic": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.0.2.tgz",
-      "integrity": "sha512-kpKNZMDT3OAX6b5ct5nS/mv6LULagnUy4DmS6yyNjclje1qVe7vbjPwY3q1TGz6+Wr2IUkgFatCzqYUl54fHag==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.0.3.tgz",
+      "integrity": "sha512-laXM4+1o5ImZv3RpFAsTRn3TEkzqkytiOY0Dz0sq5cnd1dtNlk6sHLon4OvqaiJb28T0S/TdsBI3Sjsy+keJrw==",
       "dev": true
     },
     "node_modules/@types/d3-selection": {
@@ -647,9 +647,9 @@
       "dev": true
     },
     "node_modules/@types/d3-shape": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.5.tgz",
-      "integrity": "sha512-dfEWpZJ1Pdg8meLlICX1M3WBIpxnaH2eQV2eY43Y5ysRJOTAV9f3/R++lgJKFstfrEOE2zdJ0sv5qwr2Bkic6Q==",
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.6.tgz",
+      "integrity": "sha512-5KKk5aKGu2I+O6SONMYSNflgiP0WfZIQvVUMan50wHsLG1G94JlxEVnCpQARfTtzytuY0p/9PXXZb3I7giofIA==",
       "dev": true,
       "dependencies": {
         "@types/d3-path": "*"
@@ -730,9 +730,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.10.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.6.tgz",
-      "integrity": "sha512-Vac8H+NlRNNlAmDfGUP7b5h/KA+AtWIzuXy0E6OyP8f1tCLYAtPvKRRDJjAPqhpCb0t6U2j7/xqAuLEebW2kiw==",
+      "version": "20.11.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.5.tgz",
+      "integrity": "sha512-g557vgQjUUfN76MZAN/dt1z3dzcUsimuysco0KeluHgrPdJXkP/XdAURgyO2W9fZWHRtRBiVKzKn8vyOAwlG+w==",
       "dev": true,
       "dependencies": {
         "undici-types": "~5.26.4"
@@ -751,18 +751,18 @@
       "dev": true
     },
     "node_modules/@types/tern": {
-      "version": "0.23.7",
-      "resolved": "https://registry.npmjs.org/@types/tern/-/tern-0.23.7.tgz",
-      "integrity": "sha512-0YS9XCZ0LAhlP11HV9SqncUYyz9Ggsgc7Om/AmchKvoeFyj0qPaJmX6rJ93mJVExizWDzUMb49gAtVpI1uHd8Q==",
+      "version": "0.23.9",
+      "resolved": "https://registry.npmjs.org/@types/tern/-/tern-0.23.9.tgz",
+      "integrity": "sha512-ypzHFE/wBzh+BlH6rrBgS5I/Z7RD21pGhZ2rltb/+ZrVM1awdZwjx7hE5XfuYgHWk9uvV5HLZN3SloevCAp3Bw==",
       "dev": true,
       "dependencies": {
         "@types/estree": "*"
       }
     },
     "node_modules/acorn": {
-      "version": "8.11.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz",
-      "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==",
+      "version": "8.11.3",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
+      "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -1273,9 +1273,9 @@
       }
     },
     "node_modules/fastq": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
-      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.16.0.tgz",
+      "integrity": "sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA==",
       "dev": true,
       "dependencies": {
         "reusify": "^1.0.4"
@@ -1644,9 +1644,9 @@
       }
     },
     "node_modules/obsidian": {
-      "version": "1.4.11",
+      "version": "1.5.1",
       "resolved": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-      "integrity": "sha512-erAaIpFoS77/0/Z2EdNXMI5Kd0jTZvS17Cl/753klHvV7IFgdqD7GPUmiACPN52yOc6iHBwuDuPR1sv6Lz6DCA==",
+      "integrity": "sha512-zXhEivZGOKIBmN2ahr+Shh98RMEM9Ih9RsjD2RLEyVqLwu87mTYYVxLGPfWwsLD06zKUltIGqLpNG9+x5tyILA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1765,9 +1765,9 @@
       "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="
     },
     "node_modules/rollup": {
-      "version": "4.9.3",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.9.3.tgz",
-      "integrity": "sha512-JnchF0ZGFiqGpAPjg3e89j656Ne4tTtCY1VZc1AxtoQcRIxjTu9jyYHBAtkDXE+X681n4un/nX9SU52AroSRzg==",
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.9.5.tgz",
+      "integrity": "sha512-E4vQW0H/mbNMw2yLSqJyjtkHY9dslf/p0zuT1xehNRqUTBOFMqEjguDvqhXr7N7r/4ttb2jr4T41d3dncmIgbQ==",
       "dev": true,
       "dependencies": {
         "@types/estree": "1.0.5"
@@ -1780,19 +1780,19 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.9.3",
-        "@rollup/rollup-android-arm64": "4.9.3",
-        "@rollup/rollup-darwin-arm64": "4.9.3",
-        "@rollup/rollup-darwin-x64": "4.9.3",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.9.3",
-        "@rollup/rollup-linux-arm64-gnu": "4.9.3",
-        "@rollup/rollup-linux-arm64-musl": "4.9.3",
-        "@rollup/rollup-linux-riscv64-gnu": "4.9.3",
-        "@rollup/rollup-linux-x64-gnu": "4.9.3",
-        "@rollup/rollup-linux-x64-musl": "4.9.3",
-        "@rollup/rollup-win32-arm64-msvc": "4.9.3",
-        "@rollup/rollup-win32-ia32-msvc": "4.9.3",
-        "@rollup/rollup-win32-x64-msvc": "4.9.3",
+        "@rollup/rollup-android-arm-eabi": "4.9.5",
+        "@rollup/rollup-android-arm64": "4.9.5",
+        "@rollup/rollup-darwin-arm64": "4.9.5",
+        "@rollup/rollup-darwin-x64": "4.9.5",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.9.5",
+        "@rollup/rollup-linux-arm64-gnu": "4.9.5",
+        "@rollup/rollup-linux-arm64-musl": "4.9.5",
+        "@rollup/rollup-linux-riscv64-gnu": "4.9.5",
+        "@rollup/rollup-linux-x64-gnu": "4.9.5",
+        "@rollup/rollup-linux-x64-musl": "4.9.5",
+        "@rollup/rollup-win32-arm64-msvc": "4.9.5",
+        "@rollup/rollup-win32-ia32-msvc": "4.9.5",
+        "@rollup/rollup-win32-x64-msvc": "4.9.5",
         "fsevents": "~2.3.2"
       }
     },
@@ -1866,9 +1866,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/serialize-javascript": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
-      "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
       "dev": true,
       "dependencies": {
         "randombytes": "^2.1.0"
@@ -1933,9 +1933,9 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.24.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.24.0.tgz",
-      "integrity": "sha512-ZpGR4Hy3+wBEzVEnHvstMvqpD/nABNelQn/z2r0fjVWGQsN3bpOLzQlqDxmb4CDZnXq5lpjnQ+mHQLAOpfM5iw==",
+      "version": "5.27.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.27.0.tgz",
+      "integrity": "sha512-bi1HRwVRskAjheeYl291n3JC4GgO/Ty4z1nVs5AAsmonJulGxpSektecnNedrwK9C7vpvVtcX3cw00VSLt7U2A==",
       "dev": true,
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
diff --git a/src/expr.ts b/src/expr.ts
index 65562c2..6469950 100644
--- a/src/expr.ts
+++ b/src/expr.ts
@@ -167,7 +167,7 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
         let streak = 0;
         let maxStreak = 0;
         for (let dataPoint of dataset) {
-            if (dataPoint.value !== null) {
+            if (dataPoint.value) {
                 streak++;
             } else {
                 streak = 0;
@@ -186,7 +186,7 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
         let maxStreakStart: Moment = null;
         if (dataset) {
             for (let dataPoint of dataset) {
-                if (dataPoint.value !== null) {
+                if (dataPoint.value) {
                     if (streak === 0) {
                         streakStart = dataPoint.date;
                     }
@@ -216,9 +216,9 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
                 if (ind < arrayDataset.length - 1) {
                     nextPoint = arrayDataset[ind + 1];
                 }
-                if (point.value !== null) {
+                if (point.value) {
                     streak++;
-                    if (nextPoint?.value === null) {
+                    if (!nextPoint?.value) {
                         streakEnd = point.date;
                     }
                 } else {
@@ -239,7 +239,7 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
         let breaks = 0;
         let maxBreaks = 0;
         for (let dataPoint of dataset) {
-            if (dataPoint.value === null) {
+            if (!dataPoint.value) {
                 breaks++;
             } else {
                 breaks = 0;
@@ -258,7 +258,7 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
         let maxBreaksStart: Moment = null;
         if (dataset) {
             for (let dataPoint of dataset) {
-                if (dataPoint.value === null) {
+                if (!dataPoint.value) {
                     if (breaks === 0) {
                         breaksStart = dataPoint.date;
                     }
@@ -288,9 +288,9 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
                 if (ind < arrayDataset.length - 1) {
                     nextPoint = arrayDataset[ind + 1];
                 }
-                if (point.value === null) {
+                if (!point.value) {
                     breaks++;
-                    if (nextPoint?.value !== null) {
+                    if (nextPoint?.value) {
                         breaksEnd = point.date;
                     }
                 } else {
@@ -314,7 +314,7 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
             let arrayDataset = Array.from(dataset);
             for (let ind = arrayDataset.length - 1; ind >= 0; ind--) {
                 let point = arrayDataset[ind];
-                if (point.value === null) {
+                if (!point.value) {
                     break;
                 } else {
                     currentStreak++;
@@ -334,7 +334,7 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
                 if (ind < arrayDataset.length - 1) {
                     currentStreakStart = arrayDataset[ind + 1].date;
                 }
-                if (point.value === null) {
+                if (!point.value) {
                     break;
                 } else {
                     currentStreak++;
@@ -355,7 +355,7 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
             let arrayDataset = Array.from(dataset);
             for (let ind = arrayDataset.length - 1; ind >= 0; ind--) {
                 let point = arrayDataset[ind];
-                if (point.value === null) {
+                if (!point.value) {
                     break;
                 } else {
                     if (currentStreak === 0) {
@@ -378,7 +378,7 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
             let arrayDataset = Array.from(dataset);
             for (let ind = arrayDataset.length - 1; ind >= 0; ind--) {
                 let point = arrayDataset[ind];
-                if (point.value === null) {
+                if (!point.value) {
                     currentBreaks++;
                 } else {
                     break;
@@ -398,7 +398,7 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
                 if (ind < arrayDataset.length - 1) {
                     currentBreaksStart = arrayDataset[ind + 1].date;
                 }
-                if (point.value === null) {
+                if (!point.value) {
                     currentBreaks++;
                 } else {
                     break;
@@ -419,7 +419,7 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
             let arrayDataset = Array.from(dataset);
             for (let ind = arrayDataset.length - 1; ind >= 0; ind--) {
                 let point = arrayDataset[ind];
-                if (point.value === null) {
+                if (!point.value) {
                     if (currentBreaks === 0) {
                         currentBreaksEnd = point.date;
                     }

From 0bd5005af783b7490d47169f8249dc8a84ce5dd3 Mon Sep 17 00:00:00 2001
From: souponaroom <36963544+souponaroom@users.noreply.github.com>
Date: Fri, 19 Jan 2024 13:43:32 -0600
Subject: [PATCH 305/402] added rudimentary test

---
 examples/TestSummary.md      | 7 +++++++
 examples/diary/2021-01-21.md | 1 +
 examples/diary/2021-01-22.md | 1 +
 examples/diary/2021-01-23.md | 1 +
 examples/diary/2021-01-24.md | 1 +
 examples/diary/2021-01-25.md | 1 +
 6 files changed, 12 insertions(+)

diff --git a/examples/TestSummary.md b/examples/TestSummary.md
index fb3d158..d615338 100644
--- a/examples/TestSummary.md
+++ b/examples/TestSummary.md
@@ -21,6 +21,13 @@ summary:
     style: "font-size:20px;color:yellow;margin-left: 50px;margin-top:00px;"
 ```
 
+``` tracker
+searchType: frontmatter
+searchTarget: sleptwell
+folder: diary
+summary:
+    template: "I once slept well for {{maxStreak()::i}} days in a row!"
+```
 ## Using Expressions
 
 Please check [expression examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestExpression.md) for more examples.
\ No newline at end of file
diff --git a/examples/diary/2021-01-21.md b/examples/diary/2021-01-21.md
index 94eecce..95f6869 100644
--- a/examples/diary/2021-01-21.md
+++ b/examples/diary/2021-01-21.md
@@ -18,6 +18,7 @@ deepValue:
                     very: 
                         deep: 11.1
 randchar: B
+sleptwell: false
 ---
 
 #weight:67.3kg
diff --git a/examples/diary/2021-01-22.md b/examples/diary/2021-01-22.md
index 1d59f28..c2fe7fb 100644
--- a/examples/diary/2021-01-22.md
+++ b/examples/diary/2021-01-22.md
@@ -18,6 +18,7 @@ deepValue:
                     very: 
                         deep: 83.3
 randchar: E
+sleptwell: true
 ---
 
 #weight:64.7kg
diff --git a/examples/diary/2021-01-23.md b/examples/diary/2021-01-23.md
index c793861..8dfa52d 100644
--- a/examples/diary/2021-01-23.md
+++ b/examples/diary/2021-01-23.md
@@ -18,6 +18,7 @@ deepValue:
                     very: 
                         deep: 28.8
 randchar: A
+sleptwell: true
 ---
 
 #weight:67.3kg
diff --git a/examples/diary/2021-01-24.md b/examples/diary/2021-01-24.md
index 5a726f8..4c8baef 100644
--- a/examples/diary/2021-01-24.md
+++ b/examples/diary/2021-01-24.md
@@ -18,6 +18,7 @@ deepValue:
                     very: 
                         deep: 39.4
 randchar: B
+sleptwell: true
 ---
 
 #weight:64.1kg
diff --git a/examples/diary/2021-01-25.md b/examples/diary/2021-01-25.md
index 569cbf6..ba63688 100644
--- a/examples/diary/2021-01-25.md
+++ b/examples/diary/2021-01-25.md
@@ -18,6 +18,7 @@ deepValue:
                     very: 
                         deep: 81.4
 randchar: E
+sleptwell: false
 ---
 
 #weight:62.4kg

From 4d15256f2464708c0d3c1f6d98acb94dc1ee4e96 Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Fri, 19 Jan 2024 20:51:35 -0700
Subject: [PATCH 306/402] Update dependencies

---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1b491a8..d5689f3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -97,9 +97,9 @@
       "dev": true
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.21",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.21.tgz",
-      "integrity": "sha512-SRfKmRe1KvYnxjEMtxEr+J4HIeMX5YBg/qhRHpxEIGjhX1rshcHlnFUE9K0GazhVKWM7B+nARSkV8LuvJdJ5/g==",
+      "version": "0.3.22",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.22.tgz",
+      "integrity": "sha512-Wf963MzWtA2sjrNt+g18IAln9lKnlRp+K2eH4jjIoF1wYeq3aMREpG09xhlhdzS0EjwU7qmUJYangWa+151vZw==",
       "dev": true,
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",

From 1ee18ec417d0c08bb3c0b4fca4d61c1eeaac4d52 Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Fri, 19 Jan 2024 20:48:57 -0700
Subject: [PATCH 307/402] Update copyright year

---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index e1d3f7d..27adb17 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2023 Hsuan Hao Chang
+Copyright (c) 2021-2024 Hsuan Hao Chang
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From 229f5cd5b91504d8a9807f406c4909e7c7768ac6 Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Fri, 19 Jan 2024 20:49:35 -0700
Subject: [PATCH 308/402] Release 1.13.2

---
 README.md            | 6 ++++++
 docs/ReleaseNotes.md | 6 ++++++
 manifest.json        | 2 +-
 package-lock.json    | 4 ++--
 package.json         | 2 +-
 versions.json        | 3 ++-
 6 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 5d05cd2..c1f7bad 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,12 @@ This is an [Obsidian](https://obsidian.md/) plugin that helps you collect data f
 
 ## What's New
 
+Version 1.13.2
+
+- Update dependencies
+- Fix typo in README.md
+- Change streak counts to terminate on falsey values rather than null
+
 Version 1.13.1
 
 - Fix packaging script
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index b7ea67b..44fa437 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,5 +1,11 @@
 # Release Notes
 
+## 1.13.2
+
+- Update dependencies
+- Fix typo in README.md
+- Change streak counts to terminate on falsey values rather than null
+
 ## 1.13.1
 
 - Fix packaging script
diff --git a/manifest.json b/manifest.json
index cc5ce96..b2fcb28 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "id": "obsidian-tracker",
   "name": "Tracker",
-  "version": "1.13.1",
+  "version": "1.13.2",
   "minAppVersion": "0.9.12",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "author": "pyrochlore",
diff --git a/package-lock.json b/package-lock.json
index d5689f3..3af6d86 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.13.1",
+  "version": "1.13.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "obsidian-tracker",
-      "version": "1.13.1",
+      "version": "1.13.2",
       "license": "MIT",
       "dependencies": {
         "d3": "^7.8.5",
diff --git a/package.json b/package.json
index eddc713..1dad812 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.13.1",
+  "version": "1.13.2",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
diff --git a/versions.json b/versions.json
index 49a583c..3707a72 100644
--- a/versions.json
+++ b/versions.json
@@ -32,5 +32,6 @@
   "1.11.0": "0.9.12",
   "1.12.0": "0.9.12",
   "1.13.0": "0.9.12",
-  "1.13.1": "0.9.12"
+  "1.13.1": "0.9.12",
+  "1.13.2": "0.9.12"
 }

From 56fd4cbe75d37a5e990ad8414d658de354eca305 Mon Sep 17 00:00:00 2001
From: lulunac27a <nacerilucas@gmail.com>
Date: Thu, 1 Feb 2024 19:38:04 -0600
Subject: [PATCH 309/402] Fix spelling mistake

---
 examples/TestExpression.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/TestExpression.md b/examples/TestExpression.md
index d14c3f1..5a86464 100644
--- a/examples/TestExpression.md
+++ b/examples/TestExpression.md
@@ -356,7 +356,7 @@ searchTarget: meditation
 folder: /diary
 endDate: 2021-01-04
 summary:
-    template: 'Set missing values to -1, do normalization then do summation: {{sum( normalize( setMissingValues(dataset(0), -1) ) )::i}} <-- sgiydk be 3'
+    template: 'Set missing values to -1, do normalization then do summation: {{sum( normalize( setMissingValues(dataset(0), -1) ) )::i}} <-- should be 3'
 ```
 
 setMissingValues(Dataset): Dataset

From 23b0013445e0ee96eaa97be231de86da7e6a2d5f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Feb 2024 13:22:25 +0000
Subject: [PATCH 310/402] Bump rollup from 4.9.5 to 4.12.0

Bumps [rollup](https://github.com/rollup/rollup) from 4.9.5 to 4.12.0.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v4.9.5...v4.12.0)

---
updated-dependencies:
- dependency-name: rollup
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 112 +++++++++++++++++++++++-----------------------
 package.json      |   2 +-
 2 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3af6d86..03ae622 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,7 +23,7 @@
         "@types/node": "^20.10.6",
         "@types/sprintf-js": "^1.1.4",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-        "rollup": "^4.9.3",
+        "rollup": "^4.12.0",
         "rollup-plugin-copy": "^3.5.0",
         "tslib": "^2.6.2",
         "typescript": "^5.3.3"
@@ -262,9 +262,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.9.5.tgz",
-      "integrity": "sha512-idWaG8xeSRCfRq9KpRysDHJ/rEHBEXcHuJ82XY0yYFIWnLMjZv9vF/7DOq8djQ2n3Lk6+3qfSH8AqlmHlmi1MA==",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.12.0.tgz",
+      "integrity": "sha512-+ac02NL/2TCKRrJu2wffk1kZ+RyqxVUlbjSagNgPm94frxtr+XDL12E5Ll1enWskLrtrZ2r8L3wED1orIibV/w==",
       "cpu": [
         "arm"
       ],
@@ -275,9 +275,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.9.5.tgz",
-      "integrity": "sha512-f14d7uhAMtsCGjAYwZGv6TwuS3IFaM4ZnGMUn3aCBgkcHAYErhV1Ad97WzBvS2o0aaDv4mVz+syiN0ElMyfBPg==",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.12.0.tgz",
+      "integrity": "sha512-OBqcX2BMe6nvjQ0Nyp7cC90cnumt8PXmO7Dp3gfAju/6YwG0Tj74z1vKrfRz7qAv23nBcYM8BCbhrsWqO7PzQQ==",
       "cpu": [
         "arm64"
       ],
@@ -288,9 +288,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.9.5.tgz",
-      "integrity": "sha512-ndoXeLx455FffL68OIUrVr89Xu1WLzAG4n65R8roDlCoYiQcGGg6MALvs2Ap9zs7AHg8mpHtMpwC8jBBjZrT/w==",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.12.0.tgz",
+      "integrity": "sha512-X64tZd8dRE/QTrBIEs63kaOBG0b5GVEd3ccoLtyf6IdXtHdh8h+I56C2yC3PtC9Ucnv0CpNFJLqKFVgCYe0lOQ==",
       "cpu": [
         "arm64"
       ],
@@ -301,9 +301,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.9.5.tgz",
-      "integrity": "sha512-UmElV1OY2m/1KEEqTlIjieKfVwRg0Zwg4PLgNf0s3glAHXBN99KLpw5A5lrSYCa1Kp63czTpVll2MAqbZYIHoA==",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.12.0.tgz",
+      "integrity": "sha512-cc71KUZoVbUJmGP2cOuiZ9HSOP14AzBAThn3OU+9LcA1+IUqswJyR1cAJj3Mg55HbjZP6OLAIscbQsQLrpgTOg==",
       "cpu": [
         "x64"
       ],
@@ -314,9 +314,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.9.5.tgz",
-      "integrity": "sha512-Q0LcU61v92tQB6ae+udZvOyZ0wfpGojtAKrrpAaIqmJ7+psq4cMIhT/9lfV6UQIpeItnq/2QDROhNLo00lOD1g==",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.12.0.tgz",
+      "integrity": "sha512-a6w/Y3hyyO6GlpKL2xJ4IOh/7d+APaqLYdMf86xnczU3nurFTaVN9s9jOXQg97BE4nYm/7Ga51rjec5nfRdrvA==",
       "cpu": [
         "arm"
       ],
@@ -327,9 +327,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.9.5.tgz",
-      "integrity": "sha512-dkRscpM+RrR2Ee3eOQmRWFjmV/payHEOrjyq1VZegRUa5OrZJ2MAxBNs05bZuY0YCtpqETDy1Ix4i/hRqX98cA==",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.12.0.tgz",
+      "integrity": "sha512-0fZBq27b+D7Ar5CQMofVN8sggOVhEtzFUwOwPppQt0k+VR+7UHMZZY4y+64WJ06XOhBTKXtQB/Sv0NwQMXyNAA==",
       "cpu": [
         "arm64"
       ],
@@ -340,9 +340,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.9.5.tgz",
-      "integrity": "sha512-QaKFVOzzST2xzY4MAmiDmURagWLFh+zZtttuEnuNn19AiZ0T3fhPyjPPGwLNdiDT82ZE91hnfJsUiDwF9DClIQ==",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.12.0.tgz",
+      "integrity": "sha512-eTvzUS3hhhlgeAv6bfigekzWZjaEX9xP9HhxB0Dvrdbkk5w/b+1Sxct2ZuDxNJKzsRStSq1EaEkVSEe7A7ipgQ==",
       "cpu": [
         "arm64"
       ],
@@ -353,9 +353,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.9.5.tgz",
-      "integrity": "sha512-HeGqmRJuyVg6/X6MpE2ur7GbymBPS8Np0S/vQFHDmocfORT+Zt76qu+69NUoxXzGqVP1pzaY6QIi0FJWLC3OPA==",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.12.0.tgz",
+      "integrity": "sha512-ix+qAB9qmrCRiaO71VFfY8rkiAZJL8zQRXveS27HS+pKdjwUfEhqo2+YF2oI+H/22Xsiski+qqwIBxVewLK7sw==",
       "cpu": [
         "riscv64"
       ],
@@ -366,9 +366,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.9.5.tgz",
-      "integrity": "sha512-Dq1bqBdLaZ1Gb/l2e5/+o3B18+8TI9ANlA1SkejZqDgdU/jK/ThYaMPMJpVMMXy2uRHvGKbkz9vheVGdq3cJfA==",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.12.0.tgz",
+      "integrity": "sha512-TenQhZVOtw/3qKOPa7d+QgkeM6xY0LtwzR8OplmyL5LrgTWIXpTQg2Q2ycBf8jm+SFW2Wt/DTn1gf7nFp3ssVA==",
       "cpu": [
         "x64"
       ],
@@ -379,9 +379,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.9.5.tgz",
-      "integrity": "sha512-ezyFUOwldYpj7AbkwyW9AJ203peub81CaAIVvckdkyH8EvhEIoKzaMFJj0G4qYJ5sw3BpqhFrsCc30t54HV8vg==",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.12.0.tgz",
+      "integrity": "sha512-LfFdRhNnW0zdMvdCb5FNuWlls2WbbSridJvxOvYWgSBOYZtgBfW9UGNJG//rwMqTX1xQE9BAodvMH9tAusKDUw==",
       "cpu": [
         "x64"
       ],
@@ -392,9 +392,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.9.5.tgz",
-      "integrity": "sha512-aHSsMnUw+0UETB0Hlv7B/ZHOGY5bQdwMKJSzGfDfvyhnpmVxLMGnQPGNE9wgqkLUs3+gbG1Qx02S2LLfJ5GaRQ==",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.12.0.tgz",
+      "integrity": "sha512-JPDxovheWNp6d7AHCgsUlkuCKvtu3RB55iNEkaQcf0ttsDU/JZF+iQnYcQJSk/7PtT4mjjVG8N1kpwnI9SLYaw==",
       "cpu": [
         "arm64"
       ],
@@ -405,9 +405,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.9.5.tgz",
-      "integrity": "sha512-AiqiLkb9KSf7Lj/o1U3SEP9Zn+5NuVKgFdRIZkvd4N0+bYrTOovVd0+LmYCPQGbocT4kvFyK+LXCDiXPBF3fyA==",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.12.0.tgz",
+      "integrity": "sha512-fjtuvMWRGJn1oZacG8IPnzIV6GF2/XG+h71FKn76OYFqySXInJtseAqdprVTDTyqPxQOG9Exak5/E9Z3+EJ8ZA==",
       "cpu": [
         "ia32"
       ],
@@ -418,9 +418,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.9.5.tgz",
-      "integrity": "sha512-1q+mykKE3Vot1kaFJIDoUFv5TuW+QQVaf2FmTT9krg86pQrGStOSJJ0Zil7CFagyxDuouTepzt5Y5TVzyajOdQ==",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.12.0.tgz",
+      "integrity": "sha512-ZYmr5mS2wd4Dew/JjT0Fqi2NPB/ZhZ2VvPp7SmvPZb4Y1CG/LRcS6tcRo2cYU7zLK5A7cdbhWnnWmUjoI4qapg==",
       "cpu": [
         "x64"
       ],
@@ -1765,9 +1765,9 @@
       "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="
     },
     "node_modules/rollup": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.9.5.tgz",
-      "integrity": "sha512-E4vQW0H/mbNMw2yLSqJyjtkHY9dslf/p0zuT1xehNRqUTBOFMqEjguDvqhXr7N7r/4ttb2jr4T41d3dncmIgbQ==",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.12.0.tgz",
+      "integrity": "sha512-wz66wn4t1OHIJw3+XU7mJJQV/2NAfw5OAk6G6Hoo3zcvz/XOfQ52Vgi+AN4Uxoxi0KBBwk2g8zPrTDA4btSB/Q==",
       "dev": true,
       "dependencies": {
         "@types/estree": "1.0.5"
@@ -1780,19 +1780,19 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.9.5",
-        "@rollup/rollup-android-arm64": "4.9.5",
-        "@rollup/rollup-darwin-arm64": "4.9.5",
-        "@rollup/rollup-darwin-x64": "4.9.5",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.9.5",
-        "@rollup/rollup-linux-arm64-gnu": "4.9.5",
-        "@rollup/rollup-linux-arm64-musl": "4.9.5",
-        "@rollup/rollup-linux-riscv64-gnu": "4.9.5",
-        "@rollup/rollup-linux-x64-gnu": "4.9.5",
-        "@rollup/rollup-linux-x64-musl": "4.9.5",
-        "@rollup/rollup-win32-arm64-msvc": "4.9.5",
-        "@rollup/rollup-win32-ia32-msvc": "4.9.5",
-        "@rollup/rollup-win32-x64-msvc": "4.9.5",
+        "@rollup/rollup-android-arm-eabi": "4.12.0",
+        "@rollup/rollup-android-arm64": "4.12.0",
+        "@rollup/rollup-darwin-arm64": "4.12.0",
+        "@rollup/rollup-darwin-x64": "4.12.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.12.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.12.0",
+        "@rollup/rollup-linux-arm64-musl": "4.12.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.12.0",
+        "@rollup/rollup-linux-x64-gnu": "4.12.0",
+        "@rollup/rollup-linux-x64-musl": "4.12.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.12.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.12.0",
+        "@rollup/rollup-win32-x64-msvc": "4.12.0",
         "fsevents": "~2.3.2"
       }
     },
diff --git a/package.json b/package.json
index 1dad812..09759fc 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^20.10.6",
     "@types/sprintf-js": "^1.1.4",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-    "rollup": "^4.9.3",
+    "rollup": "^4.12.0",
     "rollup-plugin-copy": "^3.5.0",
     "tslib": "^2.6.2",
     "typescript": "^5.3.3"

From cf8ae8fb218014b7d573c88ba83c192d0a582688 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Feb 2024 13:50:08 +0000
Subject: [PATCH 311/402] Bump @types/node from 20.11.5 to 20.11.20

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.5 to 20.11.20.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3af6d86..3c1c08e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,7 @@
         "@rollup/plugin-terser": "^0.4.4",
         "@rollup/plugin-typescript": "^11.1.5",
         "@types/d3": "^7.4.3",
-        "@types/node": "^20.10.6",
+        "@types/node": "^20.11.20",
         "@types/sprintf-js": "^1.1.4",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
         "rollup": "^4.9.3",
@@ -730,9 +730,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.11.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.5.tgz",
-      "integrity": "sha512-g557vgQjUUfN76MZAN/dt1z3dzcUsimuysco0KeluHgrPdJXkP/XdAURgyO2W9fZWHRtRBiVKzKn8vyOAwlG+w==",
+      "version": "20.11.20",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.20.tgz",
+      "integrity": "sha512-7/rR21OS+fq8IyHTgtLkDK949uzsa6n8BkziAKtPVpugIkO6D+/ooXMvzXxDnZrmtXVfjb1bKQafYpb8s89LOg==",
       "dev": true,
       "dependencies": {
         "undici-types": "~5.26.4"
diff --git a/package.json b/package.json
index 1dad812..8b19af7 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^11.1.5",
     "@types/d3": "^7.4.3",
-    "@types/node": "^20.10.6",
+    "@types/node": "^20.11.20",
     "@types/sprintf-js": "^1.1.4",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
     "rollup": "^4.9.3",

From a0de4cff1f33ae0fc10d9f046d15df0222b9a3f4 Mon Sep 17 00:00:00 2001
From: Denis Reznikov <dbreznikov@gmail.com>
Date: Sun, 3 Mar 2024 00:08:01 +0300
Subject: [PATCH 312/402] Fix misspell

Finace -> Finance
---
 examples/FinanceTracker.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/FinanceTracker.md b/examples/FinanceTracker.md
index 212ec16..64d3d66 100644
--- a/examples/FinanceTracker.md
+++ b/examples/FinanceTracker.md
@@ -6,7 +6,7 @@ searchTarget: finance
 folder: diary
 accum: true
 line:
-    title: Finace
+    title: Finance
     yAxisLabel: USD
     lineWidth: 4
 ```
@@ -34,4 +34,4 @@ line:
     fillGap: true
 ```
 
-Please also check those search targets in markdown files under folder 'diary'.
\ No newline at end of file
+Please also check those search targets in markdown files under folder 'diary'.

From 0b94963b23cc54cf5d5b1dd96242d98a9d6cfb64 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Mar 2024 13:44:39 +0000
Subject: [PATCH 313/402] Bump softprops/action-gh-release from 1 to 2

Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release) from 1 to 2.
- [Release notes](https://github.com/softprops/action-gh-release/releases)
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md)
- [Commits](https://github.com/softprops/action-gh-release/compare/v1...v2)

---
updated-dependencies:
- dependency-name: softprops/action-gh-release
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/releases.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index e44ee1a..4bace7d 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -21,7 +21,7 @@ jobs:
         yarn build
         yarn zip
     - name: Release with Notes
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       with:
         files: |
           main.js

From 14e77dd86b2b99860ebbaadfcfa159f1ec3bed67 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 13:47:07 +0000
Subject: [PATCH 314/402] Bump @types/node from 20.11.20 to 20.11.28

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.20 to 20.11.28.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7f546b5..e33f341 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,7 @@
         "@rollup/plugin-terser": "^0.4.4",
         "@rollup/plugin-typescript": "^11.1.5",
         "@types/d3": "^7.4.3",
-        "@types/node": "^20.11.20",
+        "@types/node": "^20.11.28",
         "@types/sprintf-js": "^1.1.4",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
         "rollup": "^4.12.0",
@@ -730,9 +730,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.11.20",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.20.tgz",
-      "integrity": "sha512-7/rR21OS+fq8IyHTgtLkDK949uzsa6n8BkziAKtPVpugIkO6D+/ooXMvzXxDnZrmtXVfjb1bKQafYpb8s89LOg==",
+      "version": "20.11.28",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.28.tgz",
+      "integrity": "sha512-M/GPWVS2wLkSkNHVeLkrF2fD5Lx5UC4PxA0uZcKc6QqbIQUJyW1jVjueJYi1z8n0I5PxYrtpnPnWglE+y9A0KA==",
       "dev": true,
       "dependencies": {
         "undici-types": "~5.26.4"
diff --git a/package.json b/package.json
index 3502a4d..3285ed4 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^11.1.5",
     "@types/d3": "^7.4.3",
-    "@types/node": "^20.11.20",
+    "@types/node": "^20.11.28",
     "@types/sprintf-js": "^1.1.4",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
     "rollup": "^4.12.0",

From 7f0641fc33a9eb33566c2a967b1610eca80d62a3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 13:47:16 +0000
Subject: [PATCH 315/402] Bump rollup from 4.12.0 to 4.13.0

Bumps [rollup](https://github.com/rollup/rollup) from 4.12.0 to 4.13.0.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v4.12.0...v4.13.0)

---
updated-dependencies:
- dependency-name: rollup
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 112 +++++++++++++++++++++++-----------------------
 package.json      |   2 +-
 2 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7f546b5..d365220 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,7 +23,7 @@
         "@types/node": "^20.11.20",
         "@types/sprintf-js": "^1.1.4",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-        "rollup": "^4.12.0",
+        "rollup": "^4.13.0",
         "rollup-plugin-copy": "^3.5.0",
         "tslib": "^2.6.2",
         "typescript": "^5.3.3"
@@ -262,9 +262,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.12.0.tgz",
-      "integrity": "sha512-+ac02NL/2TCKRrJu2wffk1kZ+RyqxVUlbjSagNgPm94frxtr+XDL12E5Ll1enWskLrtrZ2r8L3wED1orIibV/w==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.13.0.tgz",
+      "integrity": "sha512-5ZYPOuaAqEH/W3gYsRkxQATBW3Ii1MfaT4EQstTnLKViLi2gLSQmlmtTpGucNP3sXEpOiI5tdGhjdE111ekyEg==",
       "cpu": [
         "arm"
       ],
@@ -275,9 +275,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.12.0.tgz",
-      "integrity": "sha512-OBqcX2BMe6nvjQ0Nyp7cC90cnumt8PXmO7Dp3gfAju/6YwG0Tj74z1vKrfRz7qAv23nBcYM8BCbhrsWqO7PzQQ==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.13.0.tgz",
+      "integrity": "sha512-BSbaCmn8ZadK3UAQdlauSvtaJjhlDEjS5hEVVIN3A4bbl3X+otyf/kOJV08bYiRxfejP3DXFzO2jz3G20107+Q==",
       "cpu": [
         "arm64"
       ],
@@ -288,9 +288,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.12.0.tgz",
-      "integrity": "sha512-X64tZd8dRE/QTrBIEs63kaOBG0b5GVEd3ccoLtyf6IdXtHdh8h+I56C2yC3PtC9Ucnv0CpNFJLqKFVgCYe0lOQ==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.13.0.tgz",
+      "integrity": "sha512-Ovf2evVaP6sW5Ut0GHyUSOqA6tVKfrTHddtmxGQc1CTQa1Cw3/KMCDEEICZBbyppcwnhMwcDce9ZRxdWRpVd6g==",
       "cpu": [
         "arm64"
       ],
@@ -301,9 +301,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.12.0.tgz",
-      "integrity": "sha512-cc71KUZoVbUJmGP2cOuiZ9HSOP14AzBAThn3OU+9LcA1+IUqswJyR1cAJj3Mg55HbjZP6OLAIscbQsQLrpgTOg==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.13.0.tgz",
+      "integrity": "sha512-U+Jcxm89UTK592vZ2J9st9ajRv/hrwHdnvyuJpa5A2ngGSVHypigidkQJP+YiGL6JODiUeMzkqQzbCG3At81Gg==",
       "cpu": [
         "x64"
       ],
@@ -314,9 +314,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.12.0.tgz",
-      "integrity": "sha512-a6w/Y3hyyO6GlpKL2xJ4IOh/7d+APaqLYdMf86xnczU3nurFTaVN9s9jOXQg97BE4nYm/7Ga51rjec5nfRdrvA==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.13.0.tgz",
+      "integrity": "sha512-8wZidaUJUTIR5T4vRS22VkSMOVooG0F4N+JSwQXWSRiC6yfEsFMLTYRFHvby5mFFuExHa/yAp9juSphQQJAijQ==",
       "cpu": [
         "arm"
       ],
@@ -327,9 +327,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.12.0.tgz",
-      "integrity": "sha512-0fZBq27b+D7Ar5CQMofVN8sggOVhEtzFUwOwPppQt0k+VR+7UHMZZY4y+64WJ06XOhBTKXtQB/Sv0NwQMXyNAA==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.13.0.tgz",
+      "integrity": "sha512-Iu0Kno1vrD7zHQDxOmvweqLkAzjxEVqNhUIXBsZ8hu8Oak7/5VTPrxOEZXYC1nmrBVJp0ZcL2E7lSuuOVaE3+w==",
       "cpu": [
         "arm64"
       ],
@@ -340,9 +340,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.12.0.tgz",
-      "integrity": "sha512-eTvzUS3hhhlgeAv6bfigekzWZjaEX9xP9HhxB0Dvrdbkk5w/b+1Sxct2ZuDxNJKzsRStSq1EaEkVSEe7A7ipgQ==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.13.0.tgz",
+      "integrity": "sha512-C31QrW47llgVyrRjIwiOwsHFcaIwmkKi3PCroQY5aVq4H0A5v/vVVAtFsI1nfBngtoRpeREvZOkIhmRwUKkAdw==",
       "cpu": [
         "arm64"
       ],
@@ -353,9 +353,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.12.0.tgz",
-      "integrity": "sha512-ix+qAB9qmrCRiaO71VFfY8rkiAZJL8zQRXveS27HS+pKdjwUfEhqo2+YF2oI+H/22Xsiski+qqwIBxVewLK7sw==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.13.0.tgz",
+      "integrity": "sha512-Oq90dtMHvthFOPMl7pt7KmxzX7E71AfyIhh+cPhLY9oko97Zf2C9tt/XJD4RgxhaGeAraAXDtqxvKE1y/j35lA==",
       "cpu": [
         "riscv64"
       ],
@@ -366,9 +366,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.12.0.tgz",
-      "integrity": "sha512-TenQhZVOtw/3qKOPa7d+QgkeM6xY0LtwzR8OplmyL5LrgTWIXpTQg2Q2ycBf8jm+SFW2Wt/DTn1gf7nFp3ssVA==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.13.0.tgz",
+      "integrity": "sha512-yUD/8wMffnTKuiIsl6xU+4IA8UNhQ/f1sAnQebmE/lyQ8abjsVyDkyRkWop0kdMhKMprpNIhPmYlCxgHrPoXoA==",
       "cpu": [
         "x64"
       ],
@@ -379,9 +379,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.12.0.tgz",
-      "integrity": "sha512-LfFdRhNnW0zdMvdCb5FNuWlls2WbbSridJvxOvYWgSBOYZtgBfW9UGNJG//rwMqTX1xQE9BAodvMH9tAusKDUw==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.13.0.tgz",
+      "integrity": "sha512-9RyNqoFNdF0vu/qqX63fKotBh43fJQeYC98hCaf89DYQpv+xu0D8QFSOS0biA7cGuqJFOc1bJ+m2rhhsKcw1hw==",
       "cpu": [
         "x64"
       ],
@@ -392,9 +392,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.12.0.tgz",
-      "integrity": "sha512-JPDxovheWNp6d7AHCgsUlkuCKvtu3RB55iNEkaQcf0ttsDU/JZF+iQnYcQJSk/7PtT4mjjVG8N1kpwnI9SLYaw==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.13.0.tgz",
+      "integrity": "sha512-46ue8ymtm/5PUU6pCvjlic0z82qWkxv54GTJZgHrQUuZnVH+tvvSP0LsozIDsCBFO4VjJ13N68wqrKSeScUKdA==",
       "cpu": [
         "arm64"
       ],
@@ -405,9 +405,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.12.0.tgz",
-      "integrity": "sha512-fjtuvMWRGJn1oZacG8IPnzIV6GF2/XG+h71FKn76OYFqySXInJtseAqdprVTDTyqPxQOG9Exak5/E9Z3+EJ8ZA==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.13.0.tgz",
+      "integrity": "sha512-P5/MqLdLSlqxbeuJ3YDeX37srC8mCflSyTrUsgbU1c/U9j6l2g2GiIdYaGD9QjdMQPMSgYm7hgg0551wHyIluw==",
       "cpu": [
         "ia32"
       ],
@@ -418,9 +418,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.12.0.tgz",
-      "integrity": "sha512-ZYmr5mS2wd4Dew/JjT0Fqi2NPB/ZhZ2VvPp7SmvPZb4Y1CG/LRcS6tcRo2cYU7zLK5A7cdbhWnnWmUjoI4qapg==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.13.0.tgz",
+      "integrity": "sha512-UKXUQNbO3DOhzLRwHSpa0HnhhCgNODvfoPWv2FCXme8N/ANFfhIPMGuOT+QuKd16+B5yxZ0HdpNlqPvTMS1qfw==",
       "cpu": [
         "x64"
       ],
@@ -1765,9 +1765,9 @@
       "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="
     },
     "node_modules/rollup": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.12.0.tgz",
-      "integrity": "sha512-wz66wn4t1OHIJw3+XU7mJJQV/2NAfw5OAk6G6Hoo3zcvz/XOfQ52Vgi+AN4Uxoxi0KBBwk2g8zPrTDA4btSB/Q==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.13.0.tgz",
+      "integrity": "sha512-3YegKemjoQnYKmsBlOHfMLVPPA5xLkQ8MHLLSw/fBrFaVkEayL51DilPpNNLq1exr98F2B1TzrV0FUlN3gWRPg==",
       "dev": true,
       "dependencies": {
         "@types/estree": "1.0.5"
@@ -1780,19 +1780,19 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.12.0",
-        "@rollup/rollup-android-arm64": "4.12.0",
-        "@rollup/rollup-darwin-arm64": "4.12.0",
-        "@rollup/rollup-darwin-x64": "4.12.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.12.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.12.0",
-        "@rollup/rollup-linux-arm64-musl": "4.12.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.12.0",
-        "@rollup/rollup-linux-x64-gnu": "4.12.0",
-        "@rollup/rollup-linux-x64-musl": "4.12.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.12.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.12.0",
-        "@rollup/rollup-win32-x64-msvc": "4.12.0",
+        "@rollup/rollup-android-arm-eabi": "4.13.0",
+        "@rollup/rollup-android-arm64": "4.13.0",
+        "@rollup/rollup-darwin-arm64": "4.13.0",
+        "@rollup/rollup-darwin-x64": "4.13.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.13.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.13.0",
+        "@rollup/rollup-linux-arm64-musl": "4.13.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.13.0",
+        "@rollup/rollup-linux-x64-gnu": "4.13.0",
+        "@rollup/rollup-linux-x64-musl": "4.13.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.13.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.13.0",
+        "@rollup/rollup-win32-x64-msvc": "4.13.0",
         "fsevents": "~2.3.2"
       }
     },
diff --git a/package.json b/package.json
index 3502a4d..d653965 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^20.11.20",
     "@types/sprintf-js": "^1.1.4",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-    "rollup": "^4.12.0",
+    "rollup": "^4.13.0",
     "rollup-plugin-copy": "^3.5.0",
     "tslib": "^2.6.2",
     "typescript": "^5.3.3"

From f219e5d1d4fee5ab3357c8c2c0ac052ecb4d3355 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 13:47:27 +0000
Subject: [PATCH 316/402] Bump d3 from 7.8.5 to 7.9.0

Bumps [d3](https://github.com/d3/d3) from 7.8.5 to 7.9.0.
- [Release notes](https://github.com/d3/d3/releases)
- [Changelog](https://github.com/d3/d3/blob/main/CHANGES.md)
- [Commits](https://github.com/d3/d3/compare/v7.8.5...v7.9.0)

---
updated-dependencies:
- dependency-name: d3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7f546b5..97ec0db 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.13.2",
       "license": "MIT",
       "dependencies": {
-        "d3": "^7.8.5",
+        "d3": "^7.9.0",
         "d3-interpolate": "^3.0.1",
         "jsep": "^1.3.8",
         "sprintf-js": "^1.1.3"
@@ -852,9 +852,9 @@
       "dev": true
     },
     "node_modules/d3": {
-      "version": "7.8.5",
-      "resolved": "https://registry.npmjs.org/d3/-/d3-7.8.5.tgz",
-      "integrity": "sha512-JgoahDG51ncUfJu6wX/1vWQEqOflgXyl4MaHqlcSruTez7yhaRKR9i8VjjcQGeS2en/jnFivXuaIMnseMMt0XA==",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/d3/-/d3-7.9.0.tgz",
+      "integrity": "sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA==",
       "dependencies": {
         "d3-array": "3",
         "d3-axis": "3",
diff --git a/package.json b/package.json
index 3502a4d..b80aca4 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "typescript": "^5.3.3"
   },
   "dependencies": {
-    "d3": "^7.8.5",
+    "d3": "^7.9.0",
     "d3-interpolate": "^3.0.1",
     "jsep": "^1.3.8",
     "sprintf-js": "^1.1.3"

From 58eb40ef4db748ec8b3ff6a38bc9f1a9a1e2947d Mon Sep 17 00:00:00 2001
From: Tomas M <2348962+mtomas7@users.noreply.github.com>
Date: Thu, 21 Mar 2024 14:20:22 -0500
Subject: [PATCH 317/402] Update main.ts - use new format for {{average}}

---
 src/main.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.ts b/src/main.ts
index 31d9835..3779e80 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1061,7 +1061,7 @@ folder: /
 startDate:
 endDate:
 summary:
-    template: "Average value of tagName is {{average}}"
+    template: "Average value of tagName is {{average()}}"
     style: "color:white;"
 \`\`\``;
                 break;

From 9aea28fae890c6dc3fc184e9c32fd142f547ac16 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 22 Mar 2024 04:23:24 +0000
Subject: [PATCH 318/402] Bump typescript from 5.3.3 to 5.4.3

Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.3.3 to 5.4.3.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v5.3.3...v5.4.3)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 97ec0db..15a02c1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,7 +26,7 @@
         "rollup": "^4.12.0",
         "rollup-plugin-copy": "^3.5.0",
         "tslib": "^2.6.2",
-        "typescript": "^5.3.3"
+        "typescript": "^5.4.3"
       }
     },
     "node_modules/@codemirror/state": {
@@ -1975,9 +1975,9 @@
       "dev": true
     },
     "node_modules/typescript": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz",
-      "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==",
+      "version": "5.4.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.3.tgz",
+      "integrity": "sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
diff --git a/package.json b/package.json
index b80aca4..7d448c7 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "rollup": "^4.12.0",
     "rollup-plugin-copy": "^3.5.0",
     "tslib": "^2.6.2",
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.3"
   },
   "dependencies": {
     "d3": "^7.9.0",

From 4a56a5e385113a32c60aa1fc78aa98f7c089c977 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 22 Mar 2024 04:24:26 +0000
Subject: [PATCH 319/402] Bump @types/node from 20.11.28 to 20.11.30

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.28 to 20.11.30.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d29d89a..61bd69f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,7 @@
         "@rollup/plugin-terser": "^0.4.4",
         "@rollup/plugin-typescript": "^11.1.5",
         "@types/d3": "^7.4.3",
-        "@types/node": "^20.11.28",
+        "@types/node": "^20.11.30",
         "@types/sprintf-js": "^1.1.4",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
         "rollup": "^4.13.0",
@@ -730,9 +730,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.11.28",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.28.tgz",
-      "integrity": "sha512-M/GPWVS2wLkSkNHVeLkrF2fD5Lx5UC4PxA0uZcKc6QqbIQUJyW1jVjueJYi1z8n0I5PxYrtpnPnWglE+y9A0KA==",
+      "version": "20.11.30",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.30.tgz",
+      "integrity": "sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==",
       "dev": true,
       "dependencies": {
         "undici-types": "~5.26.4"
diff --git a/package.json b/package.json
index a48b1eb..c4f7539 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^11.1.5",
     "@types/d3": "^7.4.3",
-    "@types/node": "^20.11.28",
+    "@types/node": "^20.11.30",
     "@types/sprintf-js": "^1.1.4",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
     "rollup": "^4.13.0",

From f3e4600481a1f5a084d879961ebe38ec051b5a6b Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Thu, 21 Mar 2024 23:54:17 -0600
Subject: [PATCH 320/402] Release 1.13.3

---
 README.md            | 7 +++++++
 docs/ReleaseNotes.md | 7 +++++++
 manifest.json        | 2 +-
 versions.json        | 3 ++-
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c1f7bad..f8be9ac 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,13 @@ This is an [Obsidian](https://obsidian.md/) plugin that helps you collect data f
 
 ## What's New
 
+Version 1.13.3
+
+- Update dependencies
+- Fix typo in FinanceTracker.md
+- Fix typo in TestExpression.md
+- Update main.ts - use new format for {{average}}
+
 Version 1.13.2
 
 - Update dependencies
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index 44fa437..a9bc27e 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,5 +1,12 @@
 # Release Notes
 
+## 1.13.3
+
+- Update dependencies
+- Fix typo in FinanceTracker.md
+- Fix typo in TestExpression.md
+- Update main.ts - use new format for {{average}}
+
 ## 1.13.2
 
 - Update dependencies
diff --git a/manifest.json b/manifest.json
index b2fcb28..5ca257f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "id": "obsidian-tracker",
   "name": "Tracker",
-  "version": "1.13.2",
+  "version": "1.13.3",
   "minAppVersion": "0.9.12",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "author": "pyrochlore",
diff --git a/versions.json b/versions.json
index 3707a72..8f2fcaf 100644
--- a/versions.json
+++ b/versions.json
@@ -33,5 +33,6 @@
   "1.12.0": "0.9.12",
   "1.13.0": "0.9.12",
   "1.13.1": "0.9.12",
-  "1.13.2": "0.9.12"
+  "1.13.2": "0.9.12",
+  "1.13.3": "0.9.12"
 }

From a3f68f1440e282523be1ee623d1cb3e88cb372b5 Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Thu, 21 Mar 2024 23:56:51 -0600
Subject: [PATCH 321/402] Release 1.13.3 (take 2)

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 981665f..a4c876c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.13.2",
+  "version": "1.13.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "obsidian-tracker",
-      "version": "1.13.2",
+      "version": "1.13.3",
       "license": "MIT",
       "dependencies": {
         "d3": "^7.9.0",
diff --git a/package.json b/package.json
index bbe64a8..e9135ba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.13.2",
+  "version": "1.13.3",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {

From b84a79c0e66ed3408a8fc7618ec191679948d7af Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Apr 2024 13:30:39 +0000
Subject: [PATCH 322/402] Bump @types/node from 20.11.30 to 20.12.2

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.30 to 20.12.2.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a4c876c..62bdf99 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,7 @@
         "@rollup/plugin-terser": "^0.4.4",
         "@rollup/plugin-typescript": "^11.1.5",
         "@types/d3": "^7.4.3",
-        "@types/node": "^20.11.30",
+        "@types/node": "^20.12.2",
         "@types/sprintf-js": "^1.1.4",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
         "rollup": "^4.13.0",
@@ -730,9 +730,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.11.30",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.30.tgz",
-      "integrity": "sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==",
+      "version": "20.12.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.2.tgz",
+      "integrity": "sha512-zQ0NYO87hyN6Xrclcqp7f8ZbXNbRfoGWNcMvHTPQp9UUrwI0mI7XBz+cu7/W6/VClYo2g63B0cjull/srU7LgQ==",
       "dev": true,
       "dependencies": {
         "undici-types": "~5.26.4"
diff --git a/package.json b/package.json
index e9135ba..3eae161 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^11.1.5",
     "@types/d3": "^7.4.3",
-    "@types/node": "^20.11.30",
+    "@types/node": "^20.12.2",
     "@types/sprintf-js": "^1.1.4",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
     "rollup": "^4.13.0",

From 954a3eaff300bb77684d6dce5f30214c49aa903d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Apr 2024 00:27:37 +0000
Subject: [PATCH 323/402] Bump rollup from 4.13.0 to 4.13.2

Bumps [rollup](https://github.com/rollup/rollup) from 4.13.0 to 4.13.2.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v4.13.0...v4.13.2)

---
updated-dependencies:
- dependency-name: rollup
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 140 +++++++++++++++++++++++++++-------------------
 package.json      |   2 +-
 2 files changed, 85 insertions(+), 57 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 62bdf99..7298b16 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,7 +23,7 @@
         "@types/node": "^20.12.2",
         "@types/sprintf-js": "^1.1.4",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-        "rollup": "^4.13.0",
+        "rollup": "^4.13.2",
         "rollup-plugin-copy": "^3.5.0",
         "tslib": "^2.6.2",
         "typescript": "^5.4.3"
@@ -262,9 +262,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.13.0.tgz",
-      "integrity": "sha512-5ZYPOuaAqEH/W3gYsRkxQATBW3Ii1MfaT4EQstTnLKViLi2gLSQmlmtTpGucNP3sXEpOiI5tdGhjdE111ekyEg==",
+      "version": "4.13.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.13.2.tgz",
+      "integrity": "sha512-3XFIDKWMFZrMnao1mJhnOT1h2g0169Os848NhhmGweEcfJ4rCi+3yMCOLG4zA61rbJdkcrM/DjVZm9Hg5p5w7g==",
       "cpu": [
         "arm"
       ],
@@ -275,9 +275,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.13.0.tgz",
-      "integrity": "sha512-BSbaCmn8ZadK3UAQdlauSvtaJjhlDEjS5hEVVIN3A4bbl3X+otyf/kOJV08bYiRxfejP3DXFzO2jz3G20107+Q==",
+      "version": "4.13.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.13.2.tgz",
+      "integrity": "sha512-GdxxXbAuM7Y/YQM9/TwwP+L0omeE/lJAR1J+olu36c3LqqZEBdsIWeQ91KBe6nxwOnb06Xh7JS2U5ooWU5/LgQ==",
       "cpu": [
         "arm64"
       ],
@@ -288,9 +288,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.13.0.tgz",
-      "integrity": "sha512-Ovf2evVaP6sW5Ut0GHyUSOqA6tVKfrTHddtmxGQc1CTQa1Cw3/KMCDEEICZBbyppcwnhMwcDce9ZRxdWRpVd6g==",
+      "version": "4.13.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.13.2.tgz",
+      "integrity": "sha512-mCMlpzlBgOTdaFs83I4XRr8wNPveJiJX1RLfv4hggyIVhfB5mJfN4P8Z6yKh+oE4Luz+qq1P3kVdWrCKcMYrrA==",
       "cpu": [
         "arm64"
       ],
@@ -301,9 +301,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.13.0.tgz",
-      "integrity": "sha512-U+Jcxm89UTK592vZ2J9st9ajRv/hrwHdnvyuJpa5A2ngGSVHypigidkQJP+YiGL6JODiUeMzkqQzbCG3At81Gg==",
+      "version": "4.13.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.13.2.tgz",
+      "integrity": "sha512-yUoEvnH0FBef/NbB1u6d3HNGyruAKnN74LrPAfDQL3O32e3k3OSfLrPgSJmgb3PJrBZWfPyt6m4ZhAFa2nZp2A==",
       "cpu": [
         "x64"
       ],
@@ -314,9 +314,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.13.0.tgz",
-      "integrity": "sha512-8wZidaUJUTIR5T4vRS22VkSMOVooG0F4N+JSwQXWSRiC6yfEsFMLTYRFHvby5mFFuExHa/yAp9juSphQQJAijQ==",
+      "version": "4.13.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.13.2.tgz",
+      "integrity": "sha512-GYbLs5ErswU/Xs7aGXqzc3RrdEjKdmoCrgzhJWyFL0r5fL3qd1NPcDKDowDnmcoSiGJeU68/Vy+OMUluRxPiLQ==",
       "cpu": [
         "arm"
       ],
@@ -327,9 +327,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.13.0.tgz",
-      "integrity": "sha512-Iu0Kno1vrD7zHQDxOmvweqLkAzjxEVqNhUIXBsZ8hu8Oak7/5VTPrxOEZXYC1nmrBVJp0ZcL2E7lSuuOVaE3+w==",
+      "version": "4.13.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.13.2.tgz",
+      "integrity": "sha512-L1+D8/wqGnKQIlh4Zre9i4R4b4noxzH5DDciyahX4oOz62CphY7WDWqJoQ66zNR4oScLNOqQJfNSIAe/6TPUmQ==",
       "cpu": [
         "arm64"
       ],
@@ -340,9 +340,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.13.0.tgz",
-      "integrity": "sha512-C31QrW47llgVyrRjIwiOwsHFcaIwmkKi3PCroQY5aVq4H0A5v/vVVAtFsI1nfBngtoRpeREvZOkIhmRwUKkAdw==",
+      "version": "4.13.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.13.2.tgz",
+      "integrity": "sha512-tK5eoKFkXdz6vjfkSTCupUzCo40xueTOiOO6PeEIadlNBkadH1wNOH8ILCPIl8by/Gmb5AGAeQOFeLev7iZDOA==",
       "cpu": [
         "arm64"
       ],
@@ -352,10 +352,23 @@
         "linux"
       ]
     },
+    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
+      "version": "4.13.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.13.2.tgz",
+      "integrity": "sha512-zvXvAUGGEYi6tYhcDmb9wlOckVbuD+7z3mzInCSTACJ4DQrdSLPNUeDIcAQW39M3q6PDquqLWu7pnO39uSMRzQ==",
+      "cpu": [
+        "ppc64le"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.13.0.tgz",
-      "integrity": "sha512-Oq90dtMHvthFOPMl7pt7KmxzX7E71AfyIhh+cPhLY9oko97Zf2C9tt/XJD4RgxhaGeAraAXDtqxvKE1y/j35lA==",
+      "version": "4.13.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.13.2.tgz",
+      "integrity": "sha512-C3GSKvMtdudHCN5HdmAMSRYR2kkhgdOfye4w0xzyii7lebVr4riCgmM6lRiSCnJn2w1Xz7ZZzHKuLrjx5620kw==",
       "cpu": [
         "riscv64"
       ],
@@ -365,10 +378,23 @@
         "linux"
       ]
     },
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.13.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.13.2.tgz",
+      "integrity": "sha512-l4U0KDFwzD36j7HdfJ5/TveEQ1fUTjFFQP5qIt9gBqBgu1G8/kCaq5Ok05kd5TG9F8Lltf3MoYsUMw3rNlJ0Yg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.13.0.tgz",
-      "integrity": "sha512-yUD/8wMffnTKuiIsl6xU+4IA8UNhQ/f1sAnQebmE/lyQ8abjsVyDkyRkWop0kdMhKMprpNIhPmYlCxgHrPoXoA==",
+      "version": "4.13.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.13.2.tgz",
+      "integrity": "sha512-xXMLUAMzrtsvh3cZ448vbXqlUa7ZL8z0MwHp63K2IIID2+DeP5iWIT6g1SN7hg1VxPzqx0xZdiDM9l4n9LRU1A==",
       "cpu": [
         "x64"
       ],
@@ -379,9 +405,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.13.0.tgz",
-      "integrity": "sha512-9RyNqoFNdF0vu/qqX63fKotBh43fJQeYC98hCaf89DYQpv+xu0D8QFSOS0biA7cGuqJFOc1bJ+m2rhhsKcw1hw==",
+      "version": "4.13.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.13.2.tgz",
+      "integrity": "sha512-M/JYAWickafUijWPai4ehrjzVPKRCyDb1SLuO+ZyPfoXgeCEAlgPkNXewFZx0zcnoIe3ay4UjXIMdXQXOZXWqA==",
       "cpu": [
         "x64"
       ],
@@ -392,9 +418,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.13.0.tgz",
-      "integrity": "sha512-46ue8ymtm/5PUU6pCvjlic0z82qWkxv54GTJZgHrQUuZnVH+tvvSP0LsozIDsCBFO4VjJ13N68wqrKSeScUKdA==",
+      "version": "4.13.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.13.2.tgz",
+      "integrity": "sha512-2YWwoVg9KRkIKaXSh0mz3NmfurpmYoBBTAXA9qt7VXk0Xy12PoOP40EFuau+ajgALbbhi4uTj3tSG3tVseCjuA==",
       "cpu": [
         "arm64"
       ],
@@ -405,9 +431,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.13.0.tgz",
-      "integrity": "sha512-P5/MqLdLSlqxbeuJ3YDeX37srC8mCflSyTrUsgbU1c/U9j6l2g2GiIdYaGD9QjdMQPMSgYm7hgg0551wHyIluw==",
+      "version": "4.13.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.13.2.tgz",
+      "integrity": "sha512-2FSsE9aQ6OWD20E498NYKEQLneShWes0NGMPQwxWOdws35qQXH+FplabOSP5zEe1pVjurSDOGEVCE2agFwSEsw==",
       "cpu": [
         "ia32"
       ],
@@ -418,9 +444,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.13.0.tgz",
-      "integrity": "sha512-UKXUQNbO3DOhzLRwHSpa0HnhhCgNODvfoPWv2FCXme8N/ANFfhIPMGuOT+QuKd16+B5yxZ0HdpNlqPvTMS1qfw==",
+      "version": "4.13.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.13.2.tgz",
+      "integrity": "sha512-7h7J2nokcdPePdKykd8wtc8QqqkqxIrUz7MHj6aNr8waBRU//NLDVnNjQnqQO6fqtjrtCdftpbTuOKAyrAQETQ==",
       "cpu": [
         "x64"
       ],
@@ -1765,9 +1791,9 @@
       "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="
     },
     "node_modules/rollup": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.13.0.tgz",
-      "integrity": "sha512-3YegKemjoQnYKmsBlOHfMLVPPA5xLkQ8MHLLSw/fBrFaVkEayL51DilPpNNLq1exr98F2B1TzrV0FUlN3gWRPg==",
+      "version": "4.13.2",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.13.2.tgz",
+      "integrity": "sha512-MIlLgsdMprDBXC+4hsPgzWUasLO9CE4zOkj/u6j+Z6j5A4zRY+CtiXAdJyPtgCsc42g658Aeh1DlrdVEJhsL2g==",
       "dev": true,
       "dependencies": {
         "@types/estree": "1.0.5"
@@ -1780,19 +1806,21 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.13.0",
-        "@rollup/rollup-android-arm64": "4.13.0",
-        "@rollup/rollup-darwin-arm64": "4.13.0",
-        "@rollup/rollup-darwin-x64": "4.13.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.13.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.13.0",
-        "@rollup/rollup-linux-arm64-musl": "4.13.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.13.0",
-        "@rollup/rollup-linux-x64-gnu": "4.13.0",
-        "@rollup/rollup-linux-x64-musl": "4.13.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.13.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.13.0",
-        "@rollup/rollup-win32-x64-msvc": "4.13.0",
+        "@rollup/rollup-android-arm-eabi": "4.13.2",
+        "@rollup/rollup-android-arm64": "4.13.2",
+        "@rollup/rollup-darwin-arm64": "4.13.2",
+        "@rollup/rollup-darwin-x64": "4.13.2",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.13.2",
+        "@rollup/rollup-linux-arm64-gnu": "4.13.2",
+        "@rollup/rollup-linux-arm64-musl": "4.13.2",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.13.2",
+        "@rollup/rollup-linux-riscv64-gnu": "4.13.2",
+        "@rollup/rollup-linux-s390x-gnu": "4.13.2",
+        "@rollup/rollup-linux-x64-gnu": "4.13.2",
+        "@rollup/rollup-linux-x64-musl": "4.13.2",
+        "@rollup/rollup-win32-arm64-msvc": "4.13.2",
+        "@rollup/rollup-win32-ia32-msvc": "4.13.2",
+        "@rollup/rollup-win32-x64-msvc": "4.13.2",
         "fsevents": "~2.3.2"
       }
     },
diff --git a/package.json b/package.json
index 3eae161..b4f21a1 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^20.12.2",
     "@types/sprintf-js": "^1.1.4",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-    "rollup": "^4.13.0",
+    "rollup": "^4.13.2",
     "rollup-plugin-copy": "^3.5.0",
     "tslib": "^2.6.2",
     "typescript": "^5.4.3"

From e7c9995d2da86a6be3e63bb81b9f6efc52679dbc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 13:12:46 +0000
Subject: [PATCH 324/402] Bump @types/node from 20.12.2 to 20.12.7

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.12.2 to 20.12.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7298b16..44fb5e0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,7 @@
         "@rollup/plugin-terser": "^0.4.4",
         "@rollup/plugin-typescript": "^11.1.5",
         "@types/d3": "^7.4.3",
-        "@types/node": "^20.12.2",
+        "@types/node": "^20.12.7",
         "@types/sprintf-js": "^1.1.4",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
         "rollup": "^4.13.2",
@@ -756,9 +756,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.12.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.2.tgz",
-      "integrity": "sha512-zQ0NYO87hyN6Xrclcqp7f8ZbXNbRfoGWNcMvHTPQp9UUrwI0mI7XBz+cu7/W6/VClYo2g63B0cjull/srU7LgQ==",
+      "version": "20.12.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.7.tgz",
+      "integrity": "sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==",
       "dev": true,
       "dependencies": {
         "undici-types": "~5.26.4"
diff --git a/package.json b/package.json
index b4f21a1..e0da6f7 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^11.1.5",
     "@types/d3": "^7.4.3",
-    "@types/node": "^20.12.2",
+    "@types/node": "^20.12.7",
     "@types/sprintf-js": "^1.1.4",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
     "rollup": "^4.13.2",

From 7b043c2aa5131fe7524d09765757c78b07d658c4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 13:12:58 +0000
Subject: [PATCH 325/402] Bump typescript from 5.4.3 to 5.4.5

Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.4.3 to 5.4.5.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v5.4.3...v5.4.5)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7298b16..e416a14 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,7 +26,7 @@
         "rollup": "^4.13.2",
         "rollup-plugin-copy": "^3.5.0",
         "tslib": "^2.6.2",
-        "typescript": "^5.4.3"
+        "typescript": "^5.4.5"
       }
     },
     "node_modules/@codemirror/state": {
@@ -2003,9 +2003,9 @@
       "dev": true
     },
     "node_modules/typescript": {
-      "version": "5.4.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.3.tgz",
-      "integrity": "sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==",
+      "version": "5.4.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
+      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
diff --git a/package.json b/package.json
index b4f21a1..0480c8e 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "rollup": "^4.13.2",
     "rollup-plugin-copy": "^3.5.0",
     "tslib": "^2.6.2",
-    "typescript": "^5.4.3"
+    "typescript": "^5.4.5"
   },
   "dependencies": {
     "d3": "^7.9.0",

From 38334d41a1e578035925a570676a67c71cab9b0f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 13:13:09 +0000
Subject: [PATCH 326/402] Bump rollup from 4.13.2 to 4.14.3

Bumps [rollup](https://github.com/rollup/rollup) from 4.13.2 to 4.14.3.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v4.13.2...v4.14.3)

---
updated-dependencies:
- dependency-name: rollup
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 144 +++++++++++++++++++++++++---------------------
 package.json      |   2 +-
 2 files changed, 80 insertions(+), 66 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7298b16..728610e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,7 +23,7 @@
         "@types/node": "^20.12.2",
         "@types/sprintf-js": "^1.1.4",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-        "rollup": "^4.13.2",
+        "rollup": "^4.14.3",
         "rollup-plugin-copy": "^3.5.0",
         "tslib": "^2.6.2",
         "typescript": "^5.4.3"
@@ -262,9 +262,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.13.2.tgz",
-      "integrity": "sha512-3XFIDKWMFZrMnao1mJhnOT1h2g0169Os848NhhmGweEcfJ4rCi+3yMCOLG4zA61rbJdkcrM/DjVZm9Hg5p5w7g==",
+      "version": "4.14.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.14.3.tgz",
+      "integrity": "sha512-X9alQ3XM6I9IlSlmC8ddAvMSyG1WuHk5oUnXGw+yUBs3BFoTizmG1La/Gr8fVJvDWAq+zlYTZ9DBgrlKRVY06g==",
       "cpu": [
         "arm"
       ],
@@ -275,9 +275,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.13.2.tgz",
-      "integrity": "sha512-GdxxXbAuM7Y/YQM9/TwwP+L0omeE/lJAR1J+olu36c3LqqZEBdsIWeQ91KBe6nxwOnb06Xh7JS2U5ooWU5/LgQ==",
+      "version": "4.14.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.14.3.tgz",
+      "integrity": "sha512-eQK5JIi+POhFpzk+LnjKIy4Ks+pwJ+NXmPxOCSvOKSNRPONzKuUvWE+P9JxGZVxrtzm6BAYMaL50FFuPe0oWMQ==",
       "cpu": [
         "arm64"
       ],
@@ -288,9 +288,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.13.2.tgz",
-      "integrity": "sha512-mCMlpzlBgOTdaFs83I4XRr8wNPveJiJX1RLfv4hggyIVhfB5mJfN4P8Z6yKh+oE4Luz+qq1P3kVdWrCKcMYrrA==",
+      "version": "4.14.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.14.3.tgz",
+      "integrity": "sha512-Od4vE6f6CTT53yM1jgcLqNfItTsLt5zE46fdPaEmeFHvPs5SjZYlLpHrSiHEKR1+HdRfxuzXHjDOIxQyC3ptBA==",
       "cpu": [
         "arm64"
       ],
@@ -301,9 +301,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.13.2.tgz",
-      "integrity": "sha512-yUoEvnH0FBef/NbB1u6d3HNGyruAKnN74LrPAfDQL3O32e3k3OSfLrPgSJmgb3PJrBZWfPyt6m4ZhAFa2nZp2A==",
+      "version": "4.14.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.14.3.tgz",
+      "integrity": "sha512-0IMAO21axJeNIrvS9lSe/PGthc8ZUS+zC53O0VhF5gMxfmcKAP4ESkKOCwEi6u2asUrt4mQv2rjY8QseIEb1aw==",
       "cpu": [
         "x64"
       ],
@@ -314,9 +314,22 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.13.2.tgz",
-      "integrity": "sha512-GYbLs5ErswU/Xs7aGXqzc3RrdEjKdmoCrgzhJWyFL0r5fL3qd1NPcDKDowDnmcoSiGJeU68/Vy+OMUluRxPiLQ==",
+      "version": "4.14.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.14.3.tgz",
+      "integrity": "sha512-ge2DC7tHRHa3caVEoSbPRJpq7azhG+xYsd6u2MEnJ6XzPSzQsTKyXvh6iWjXRf7Rt9ykIUWHtl0Uz3T6yXPpKw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.14.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.14.3.tgz",
+      "integrity": "sha512-ljcuiDI4V3ySuc7eSk4lQ9wU8J8r8KrOUvB2U+TtK0TiW6OFDmJ+DdIjjwZHIw9CNxzbmXY39wwpzYuFDwNXuw==",
       "cpu": [
         "arm"
       ],
@@ -327,9 +340,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.13.2.tgz",
-      "integrity": "sha512-L1+D8/wqGnKQIlh4Zre9i4R4b4noxzH5DDciyahX4oOz62CphY7WDWqJoQ66zNR4oScLNOqQJfNSIAe/6TPUmQ==",
+      "version": "4.14.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.14.3.tgz",
+      "integrity": "sha512-Eci2us9VTHm1eSyn5/eEpaC7eP/mp5n46gTRB3Aar3BgSvDQGJZuicyq6TsH4HngNBgVqC5sDYxOzTExSU+NjA==",
       "cpu": [
         "arm64"
       ],
@@ -340,9 +353,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.13.2.tgz",
-      "integrity": "sha512-tK5eoKFkXdz6vjfkSTCupUzCo40xueTOiOO6PeEIadlNBkadH1wNOH8ILCPIl8by/Gmb5AGAeQOFeLev7iZDOA==",
+      "version": "4.14.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.14.3.tgz",
+      "integrity": "sha512-UrBoMLCq4E92/LCqlh+blpqMz5h1tJttPIniwUgOFJyjWI1qrtrDhhpHPuFxULlUmjFHfloWdixtDhSxJt5iKw==",
       "cpu": [
         "arm64"
       ],
@@ -353,11 +366,11 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.13.2.tgz",
-      "integrity": "sha512-zvXvAUGGEYi6tYhcDmb9wlOckVbuD+7z3mzInCSTACJ4DQrdSLPNUeDIcAQW39M3q6PDquqLWu7pnO39uSMRzQ==",
+      "version": "4.14.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.14.3.tgz",
+      "integrity": "sha512-5aRjvsS8q1nWN8AoRfrq5+9IflC3P1leMoy4r2WjXyFqf3qcqsxRCfxtZIV58tCxd+Yv7WELPcO9mY9aeQyAmw==",
       "cpu": [
-        "ppc64le"
+        "ppc64"
       ],
       "dev": true,
       "optional": true,
@@ -366,9 +379,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.13.2.tgz",
-      "integrity": "sha512-C3GSKvMtdudHCN5HdmAMSRYR2kkhgdOfye4w0xzyii7lebVr4riCgmM6lRiSCnJn2w1Xz7ZZzHKuLrjx5620kw==",
+      "version": "4.14.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.14.3.tgz",
+      "integrity": "sha512-sk/Qh1j2/RJSX7FhEpJn8n0ndxy/uf0kI/9Zc4b1ELhqULVdTfN6HL31CDaTChiBAOgLcsJ1sgVZjWv8XNEsAQ==",
       "cpu": [
         "riscv64"
       ],
@@ -379,9 +392,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.13.2.tgz",
-      "integrity": "sha512-l4U0KDFwzD36j7HdfJ5/TveEQ1fUTjFFQP5qIt9gBqBgu1G8/kCaq5Ok05kd5TG9F8Lltf3MoYsUMw3rNlJ0Yg==",
+      "version": "4.14.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.14.3.tgz",
+      "integrity": "sha512-jOO/PEaDitOmY9TgkxF/TQIjXySQe5KVYB57H/8LRP/ux0ZoO8cSHCX17asMSv3ruwslXW/TLBcxyaUzGRHcqg==",
       "cpu": [
         "s390x"
       ],
@@ -392,9 +405,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.13.2.tgz",
-      "integrity": "sha512-xXMLUAMzrtsvh3cZ448vbXqlUa7ZL8z0MwHp63K2IIID2+DeP5iWIT6g1SN7hg1VxPzqx0xZdiDM9l4n9LRU1A==",
+      "version": "4.14.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.14.3.tgz",
+      "integrity": "sha512-8ybV4Xjy59xLMyWo3GCfEGqtKV5M5gCSrZlxkPGvEPCGDLNla7v48S662HSGwRd6/2cSneMQWiv+QzcttLrrOA==",
       "cpu": [
         "x64"
       ],
@@ -405,9 +418,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.13.2.tgz",
-      "integrity": "sha512-M/JYAWickafUijWPai4ehrjzVPKRCyDb1SLuO+ZyPfoXgeCEAlgPkNXewFZx0zcnoIe3ay4UjXIMdXQXOZXWqA==",
+      "version": "4.14.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.14.3.tgz",
+      "integrity": "sha512-s+xf1I46trOY10OqAtZ5Rm6lzHre/UiLA1J2uOhCFXWkbZrJRkYBPO6FhvGfHmdtQ3Bx793MNa7LvoWFAm93bg==",
       "cpu": [
         "x64"
       ],
@@ -418,9 +431,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.13.2.tgz",
-      "integrity": "sha512-2YWwoVg9KRkIKaXSh0mz3NmfurpmYoBBTAXA9qt7VXk0Xy12PoOP40EFuau+ajgALbbhi4uTj3tSG3tVseCjuA==",
+      "version": "4.14.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.14.3.tgz",
+      "integrity": "sha512-+4h2WrGOYsOumDQ5S2sYNyhVfrue+9tc9XcLWLh+Kw3UOxAvrfOrSMFon60KspcDdytkNDh7K2Vs6eMaYImAZg==",
       "cpu": [
         "arm64"
       ],
@@ -431,9 +444,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.13.2.tgz",
-      "integrity": "sha512-2FSsE9aQ6OWD20E498NYKEQLneShWes0NGMPQwxWOdws35qQXH+FplabOSP5zEe1pVjurSDOGEVCE2agFwSEsw==",
+      "version": "4.14.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.14.3.tgz",
+      "integrity": "sha512-T1l7y/bCeL/kUwh9OD4PQT4aM7Bq43vX05htPJJ46RTI4r5KNt6qJRzAfNfM+OYMNEVBWQzR2Gyk+FXLZfogGw==",
       "cpu": [
         "ia32"
       ],
@@ -444,9 +457,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.13.2.tgz",
-      "integrity": "sha512-7h7J2nokcdPePdKykd8wtc8QqqkqxIrUz7MHj6aNr8waBRU//NLDVnNjQnqQO6fqtjrtCdftpbTuOKAyrAQETQ==",
+      "version": "4.14.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.14.3.tgz",
+      "integrity": "sha512-/BypzV0H1y1HzgYpxqRaXGBRqfodgoBBCcsrujT6QRcakDQdfU+Lq9PENPh5jB4I44YWq+0C2eHsHya+nZY1sA==",
       "cpu": [
         "x64"
       ],
@@ -1791,9 +1804,9 @@
       "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="
     },
     "node_modules/rollup": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.13.2.tgz",
-      "integrity": "sha512-MIlLgsdMprDBXC+4hsPgzWUasLO9CE4zOkj/u6j+Z6j5A4zRY+CtiXAdJyPtgCsc42g658Aeh1DlrdVEJhsL2g==",
+      "version": "4.14.3",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.14.3.tgz",
+      "integrity": "sha512-ag5tTQKYsj1bhrFC9+OEWqb5O6VYgtQDO9hPDBMmIbePwhfSr+ExlcU741t8Dhw5DkPCQf6noz0jb36D6W9/hw==",
       "dev": true,
       "dependencies": {
         "@types/estree": "1.0.5"
@@ -1806,21 +1819,22 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.13.2",
-        "@rollup/rollup-android-arm64": "4.13.2",
-        "@rollup/rollup-darwin-arm64": "4.13.2",
-        "@rollup/rollup-darwin-x64": "4.13.2",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.13.2",
-        "@rollup/rollup-linux-arm64-gnu": "4.13.2",
-        "@rollup/rollup-linux-arm64-musl": "4.13.2",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.13.2",
-        "@rollup/rollup-linux-riscv64-gnu": "4.13.2",
-        "@rollup/rollup-linux-s390x-gnu": "4.13.2",
-        "@rollup/rollup-linux-x64-gnu": "4.13.2",
-        "@rollup/rollup-linux-x64-musl": "4.13.2",
-        "@rollup/rollup-win32-arm64-msvc": "4.13.2",
-        "@rollup/rollup-win32-ia32-msvc": "4.13.2",
-        "@rollup/rollup-win32-x64-msvc": "4.13.2",
+        "@rollup/rollup-android-arm-eabi": "4.14.3",
+        "@rollup/rollup-android-arm64": "4.14.3",
+        "@rollup/rollup-darwin-arm64": "4.14.3",
+        "@rollup/rollup-darwin-x64": "4.14.3",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.14.3",
+        "@rollup/rollup-linux-arm-musleabihf": "4.14.3",
+        "@rollup/rollup-linux-arm64-gnu": "4.14.3",
+        "@rollup/rollup-linux-arm64-musl": "4.14.3",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.14.3",
+        "@rollup/rollup-linux-riscv64-gnu": "4.14.3",
+        "@rollup/rollup-linux-s390x-gnu": "4.14.3",
+        "@rollup/rollup-linux-x64-gnu": "4.14.3",
+        "@rollup/rollup-linux-x64-musl": "4.14.3",
+        "@rollup/rollup-win32-arm64-msvc": "4.14.3",
+        "@rollup/rollup-win32-ia32-msvc": "4.14.3",
+        "@rollup/rollup-win32-x64-msvc": "4.14.3",
         "fsevents": "~2.3.2"
       }
     },
diff --git a/package.json b/package.json
index b4f21a1..bd8c922 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^20.12.2",
     "@types/sprintf-js": "^1.1.4",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-    "rollup": "^4.13.2",
+    "rollup": "^4.14.3",
     "rollup-plugin-copy": "^3.5.0",
     "tslib": "^2.6.2",
     "typescript": "^5.4.3"

From 85b9fcd0307801dc469f0471445308b55d8b3267 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Apr 2024 13:35:41 +0000
Subject: [PATCH 327/402] Bump rollup from 4.14.3 to 4.16.1

Bumps [rollup](https://github.com/rollup/rollup) from 4.14.3 to 4.16.1.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v4.14.3...v4.16.1)

---
updated-dependencies:
- dependency-name: rollup
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 136 +++++++++++++++++++++++-----------------------
 package.json      |   2 +-
 2 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 655c39f..fd07481 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,7 +23,7 @@
         "@types/node": "^20.12.7",
         "@types/sprintf-js": "^1.1.4",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-        "rollup": "^4.14.3",
+        "rollup": "^4.16.1",
         "rollup-plugin-copy": "^3.5.0",
         "tslib": "^2.6.2",
         "typescript": "^5.4.5"
@@ -262,9 +262,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.14.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.14.3.tgz",
-      "integrity": "sha512-X9alQ3XM6I9IlSlmC8ddAvMSyG1WuHk5oUnXGw+yUBs3BFoTizmG1La/Gr8fVJvDWAq+zlYTZ9DBgrlKRVY06g==",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.16.1.tgz",
+      "integrity": "sha512-92/y0TqNLRYOTXpm6Z7mnpvKAG9P7qmK7yJeRJSdzElNCUnsgbpAsGqerUboYRIQKzgfq4pWu9xVkgpWLfmNsw==",
       "cpu": [
         "arm"
       ],
@@ -275,9 +275,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.14.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.14.3.tgz",
-      "integrity": "sha512-eQK5JIi+POhFpzk+LnjKIy4Ks+pwJ+NXmPxOCSvOKSNRPONzKuUvWE+P9JxGZVxrtzm6BAYMaL50FFuPe0oWMQ==",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.16.1.tgz",
+      "integrity": "sha512-ttWB6ZCfRLuDIUiE0yiu5gcqOsYjA5F7kEV1ggHMj20FwLZ8A1FMeahZJFl/pnOmcnD2QL0z4AcDuo27utGU8A==",
       "cpu": [
         "arm64"
       ],
@@ -288,9 +288,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.14.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.14.3.tgz",
-      "integrity": "sha512-Od4vE6f6CTT53yM1jgcLqNfItTsLt5zE46fdPaEmeFHvPs5SjZYlLpHrSiHEKR1+HdRfxuzXHjDOIxQyC3ptBA==",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.16.1.tgz",
+      "integrity": "sha512-QLDvPLetbqjHojTGFw9+nuSP3YY/iz2k1cep6crYlr97sS+ZJ0W43b8Z0zC00+lnFZj6JSNxiA4DjboNQMuh1A==",
       "cpu": [
         "arm64"
       ],
@@ -301,9 +301,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.14.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.14.3.tgz",
-      "integrity": "sha512-0IMAO21axJeNIrvS9lSe/PGthc8ZUS+zC53O0VhF5gMxfmcKAP4ESkKOCwEi6u2asUrt4mQv2rjY8QseIEb1aw==",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.16.1.tgz",
+      "integrity": "sha512-TAUK/D8khRrRIa1KwRzo8JNKk3tcqaeXWdtsiLgA8zmACWwlWLjPCJ4DULGHQrMkeBjp1Cd3Yuwx04lZgFx5Vg==",
       "cpu": [
         "x64"
       ],
@@ -314,9 +314,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.14.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.14.3.tgz",
-      "integrity": "sha512-ge2DC7tHRHa3caVEoSbPRJpq7azhG+xYsd6u2MEnJ6XzPSzQsTKyXvh6iWjXRf7Rt9ykIUWHtl0Uz3T6yXPpKw==",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.16.1.tgz",
+      "integrity": "sha512-KO+WGZjrh6zyFTD1alIFkfdtxf8B4BC+hqd3kBZHscPLvE5FR/6QKsyuCT0JlERxxYBSUKNUQ/UHyX5uwO1x2A==",
       "cpu": [
         "arm"
       ],
@@ -327,9 +327,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.14.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.14.3.tgz",
-      "integrity": "sha512-ljcuiDI4V3ySuc7eSk4lQ9wU8J8r8KrOUvB2U+TtK0TiW6OFDmJ+DdIjjwZHIw9CNxzbmXY39wwpzYuFDwNXuw==",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.16.1.tgz",
+      "integrity": "sha512-NqxbllzIB1WoAo4ThUXVtd21iiM5IHMTTXmXySKBLVcZvkU0HIZmatlP7hLzb5yQubcmdIeWmncd2NdsjocEiw==",
       "cpu": [
         "arm"
       ],
@@ -340,9 +340,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.14.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.14.3.tgz",
-      "integrity": "sha512-Eci2us9VTHm1eSyn5/eEpaC7eP/mp5n46gTRB3Aar3BgSvDQGJZuicyq6TsH4HngNBgVqC5sDYxOzTExSU+NjA==",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.16.1.tgz",
+      "integrity": "sha512-snma5NvV8y7IECQ5rq0sr0f3UUu+92NVmG/913JXJMcXo84h9ak9TA5UI9Cl2XRM9j3m37QwDBtEYnJzRkSmxA==",
       "cpu": [
         "arm64"
       ],
@@ -353,9 +353,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.14.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.14.3.tgz",
-      "integrity": "sha512-UrBoMLCq4E92/LCqlh+blpqMz5h1tJttPIniwUgOFJyjWI1qrtrDhhpHPuFxULlUmjFHfloWdixtDhSxJt5iKw==",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.16.1.tgz",
+      "integrity": "sha512-KOvqGprlD84ueivhCi2flvcUwDRD20mAsE3vxQNVEI2Di9tnPGAfEu6UcrSPZbM+jG2w1oSr43hrPo0RNg6GGg==",
       "cpu": [
         "arm64"
       ],
@@ -366,9 +366,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.14.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.14.3.tgz",
-      "integrity": "sha512-5aRjvsS8q1nWN8AoRfrq5+9IflC3P1leMoy4r2WjXyFqf3qcqsxRCfxtZIV58tCxd+Yv7WELPcO9mY9aeQyAmw==",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.16.1.tgz",
+      "integrity": "sha512-/gsNwtiGLqYwN4vP+EIdUC6Q6LTlpupWqokqIndvZcjn9ig/5P01WyaYCU2wvfL/2Z82jp5kX8c1mDBOvCP3zg==",
       "cpu": [
         "ppc64"
       ],
@@ -379,9 +379,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.14.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.14.3.tgz",
-      "integrity": "sha512-sk/Qh1j2/RJSX7FhEpJn8n0ndxy/uf0kI/9Zc4b1ELhqULVdTfN6HL31CDaTChiBAOgLcsJ1sgVZjWv8XNEsAQ==",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.16.1.tgz",
+      "integrity": "sha512-uU8zuGkQfGqfD9w6VRJZI4IuG4JIfNxxJgEmLMAmPVHREKGsxFVfgHy5c6CexQF2vOfgjB33OsET3Vdn2lln9A==",
       "cpu": [
         "riscv64"
       ],
@@ -392,9 +392,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.14.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.14.3.tgz",
-      "integrity": "sha512-jOO/PEaDitOmY9TgkxF/TQIjXySQe5KVYB57H/8LRP/ux0ZoO8cSHCX17asMSv3ruwslXW/TLBcxyaUzGRHcqg==",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.16.1.tgz",
+      "integrity": "sha512-lsjLtDgtcGFEuBP6yrXwkRN5/wKlvUZtfbKZZu0yaoNpiBL4epgnO21osAALIspVRnl4qZgyLFd8xjCYYWgwfw==",
       "cpu": [
         "s390x"
       ],
@@ -405,9 +405,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.14.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.14.3.tgz",
-      "integrity": "sha512-8ybV4Xjy59xLMyWo3GCfEGqtKV5M5gCSrZlxkPGvEPCGDLNla7v48S662HSGwRd6/2cSneMQWiv+QzcttLrrOA==",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.16.1.tgz",
+      "integrity": "sha512-N2ZizKhUryqqrMfdCnjhJhZRgv61C6gK+hwVtCIKC8ts8J+go+vqENnGexwg21nHIOvLN5mBM8a7DI2vlyIOPg==",
       "cpu": [
         "x64"
       ],
@@ -418,9 +418,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.14.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.14.3.tgz",
-      "integrity": "sha512-s+xf1I46trOY10OqAtZ5Rm6lzHre/UiLA1J2uOhCFXWkbZrJRkYBPO6FhvGfHmdtQ3Bx793MNa7LvoWFAm93bg==",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.16.1.tgz",
+      "integrity": "sha512-5ICeMxqg66FrOA2AbnBQ2TJVxfvZsKLxmof0ibvPLaYtbsJqnTUtJOofgWb46Gjd4uZcA4rdsp4JCxegzQPqCg==",
       "cpu": [
         "x64"
       ],
@@ -431,9 +431,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.14.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.14.3.tgz",
-      "integrity": "sha512-+4h2WrGOYsOumDQ5S2sYNyhVfrue+9tc9XcLWLh+Kw3UOxAvrfOrSMFon60KspcDdytkNDh7K2Vs6eMaYImAZg==",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.16.1.tgz",
+      "integrity": "sha512-1vIP6Ce02L+qWD7uZYRiFiuAJo3m9kARatWmFSnss0gZnVj2Id7OPUU9gm49JPGasgcR3xMqiH3fqBJ8t00yVg==",
       "cpu": [
         "arm64"
       ],
@@ -444,9 +444,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.14.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.14.3.tgz",
-      "integrity": "sha512-T1l7y/bCeL/kUwh9OD4PQT4aM7Bq43vX05htPJJ46RTI4r5KNt6qJRzAfNfM+OYMNEVBWQzR2Gyk+FXLZfogGw==",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.16.1.tgz",
+      "integrity": "sha512-Y3M92DcVsT6LoP+wrKpoUWPaazaP1fzbNkp0a0ZSj5Y//+pQVfVe/tQdsYQQy7dwXR30ZfALUIc9PCh9Izir6w==",
       "cpu": [
         "ia32"
       ],
@@ -457,9 +457,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.14.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.14.3.tgz",
-      "integrity": "sha512-/BypzV0H1y1HzgYpxqRaXGBRqfodgoBBCcsrujT6QRcakDQdfU+Lq9PENPh5jB4I44YWq+0C2eHsHya+nZY1sA==",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.16.1.tgz",
+      "integrity": "sha512-x0fvpHMuF7fK5r8oZxSi8VYXkrVmRgubXpO/wcf15Lk3xZ4Jvvh5oG+u7Su1776A7XzVKZhD2eRc4t7H50gL3w==",
       "cpu": [
         "x64"
       ],
@@ -1804,9 +1804,9 @@
       "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="
     },
     "node_modules/rollup": {
-      "version": "4.14.3",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.14.3.tgz",
-      "integrity": "sha512-ag5tTQKYsj1bhrFC9+OEWqb5O6VYgtQDO9hPDBMmIbePwhfSr+ExlcU741t8Dhw5DkPCQf6noz0jb36D6W9/hw==",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.16.1.tgz",
+      "integrity": "sha512-5CaD3MPDlPKfhqzRvWXK96G6ELJfPZNb3LHiZxTHgDdC6jvwfGz2E8nY+9g1ONk4ttHsK1WaFP19Js4PSr1E3g==",
       "dev": true,
       "dependencies": {
         "@types/estree": "1.0.5"
@@ -1819,22 +1819,22 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.14.3",
-        "@rollup/rollup-android-arm64": "4.14.3",
-        "@rollup/rollup-darwin-arm64": "4.14.3",
-        "@rollup/rollup-darwin-x64": "4.14.3",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.14.3",
-        "@rollup/rollup-linux-arm-musleabihf": "4.14.3",
-        "@rollup/rollup-linux-arm64-gnu": "4.14.3",
-        "@rollup/rollup-linux-arm64-musl": "4.14.3",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.14.3",
-        "@rollup/rollup-linux-riscv64-gnu": "4.14.3",
-        "@rollup/rollup-linux-s390x-gnu": "4.14.3",
-        "@rollup/rollup-linux-x64-gnu": "4.14.3",
-        "@rollup/rollup-linux-x64-musl": "4.14.3",
-        "@rollup/rollup-win32-arm64-msvc": "4.14.3",
-        "@rollup/rollup-win32-ia32-msvc": "4.14.3",
-        "@rollup/rollup-win32-x64-msvc": "4.14.3",
+        "@rollup/rollup-android-arm-eabi": "4.16.1",
+        "@rollup/rollup-android-arm64": "4.16.1",
+        "@rollup/rollup-darwin-arm64": "4.16.1",
+        "@rollup/rollup-darwin-x64": "4.16.1",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.16.1",
+        "@rollup/rollup-linux-arm-musleabihf": "4.16.1",
+        "@rollup/rollup-linux-arm64-gnu": "4.16.1",
+        "@rollup/rollup-linux-arm64-musl": "4.16.1",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.16.1",
+        "@rollup/rollup-linux-riscv64-gnu": "4.16.1",
+        "@rollup/rollup-linux-s390x-gnu": "4.16.1",
+        "@rollup/rollup-linux-x64-gnu": "4.16.1",
+        "@rollup/rollup-linux-x64-musl": "4.16.1",
+        "@rollup/rollup-win32-arm64-msvc": "4.16.1",
+        "@rollup/rollup-win32-ia32-msvc": "4.16.1",
+        "@rollup/rollup-win32-x64-msvc": "4.16.1",
         "fsevents": "~2.3.2"
       }
     },
diff --git a/package.json b/package.json
index b433c0e..dc0647a 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^20.12.7",
     "@types/sprintf-js": "^1.1.4",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-    "rollup": "^4.14.3",
+    "rollup": "^4.16.1",
     "rollup-plugin-copy": "^3.5.0",
     "tslib": "^2.6.2",
     "typescript": "^5.4.5"

From 2bfa60fdc86a7f5d7984a2144d1e648a2842349b Mon Sep 17 00:00:00 2001
From: Xinyi Zhang <xiaoyun.anye@gmail.com>
Date: Sat, 27 Apr 2024 21:39:39 -0700
Subject: [PATCH 328/402] Add stacked bar charts (probablly also works with
 lineCharts).

---
 examples/TestBarChart.md | 14 +++++++++
 src/data.ts              | 21 +++++++++++++
 src/parsing.ts           |  6 ++++
 src/rendering.ts         | 64 ++++++++++++++++++++++++++++++----------
 4 files changed, 90 insertions(+), 15 deletions(-)

diff --git a/examples/TestBarChart.md b/examples/TestBarChart.md
index 3fb2478..73c28db 100644
--- a/examples/TestBarChart.md
+++ b/examples/TestBarChart.md
@@ -53,4 +53,18 @@ bar:
     barColor: yellow, red, green, blue, orange, white
 ```
 
+
+``` tracker
+searchType: tag
+searchTarget: sinsquare[0], sinsquare[1], sinsquare[2], sinsquare[3], sinsquare[4], sinsquare[5]
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-05
+stack: true
+bar:
+    title: Sin Square Wave (Stacked)
+    yAxisLabel: Value
+    yMin: 0
+    barColor: yellow, red, green, blue, orange, black
+```
 Please also check those search targets in markdown files under folder 'diary'.
\ No newline at end of file
diff --git a/src/data.ts b/src/data.ts
index 695c797..3160027 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -391,6 +391,25 @@ export class Dataset implements IterableIterator<DataPoint> {
         }
     }
 
+    public shiftByDataset(shiftDataset: Dataset) {
+        // Assume all datasets are of the same length
+        for (let ind = 0; ind < this.values.length; ind++) {
+            let currentValue = this.values[ind];
+            if (shiftDataset.values[ind] !== null && currentValue !== null) {
+                currentValue += shiftDataset.values[ind];
+            } else if (shiftDataset.values[ind] !== null) {
+                currentValue = shiftDataset.values[ind];
+            }
+            this.values[ind] = currentValue;
+            if (currentValue < this.yMin) {
+                this.yMin = currentValue;
+            }
+            if (currentValue > this.yMax) {
+                this.yMax = currentValue;
+            }
+        }
+    }
+
     public getValues() {
         return this.values;
     }
@@ -571,6 +590,7 @@ export class RenderInfo {
     ignoreAttachedValue: boolean[];
     ignoreZeroValue: boolean[];
     accum: boolean[];
+    stack: boolean;
     penalty: number[];
     valueShift: number[];
     shiftOnlyValueLargerThan: number[];
@@ -614,6 +634,7 @@ export class RenderInfo {
         this.ignoreAttachedValue = []; // false
         this.ignoreZeroValue = []; // false
         this.accum = []; // false, accum values start from zero over days
+        this.stack = false;
         this.penalty = []; // null, use this value instead of null value
         this.valueShift = [];
         this.shiftOnlyValueLargerThan = [];
diff --git a/src/parsing.ts b/src/parsing.ts
index 5478811..9d47feb 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1459,6 +1459,12 @@ export function getRenderInfoFromYaml(
     renderInfo.accum = retAccum;
     // console.log(renderInfo.accum);
 
+    // stack
+    if (typeof yaml.stack === "boolean") {
+        renderInfo.stack = yaml.stack;
+    }
+    // console.log(renderInfo.stack);
+
     // penalty
     let retPenalty = getNumberArrayFromInput(
         "penalty",
diff --git a/src/rendering.ts b/src/rendering.ts
index 2d62188..650ecde 100644
--- a/src/rendering.ts
+++ b/src/rendering.ts
@@ -239,6 +239,18 @@ export function render(canvas: HTMLElement, renderInfo: RenderInfo) {
             dataset.accumulateValues();
         }
     }
+    // stack
+    if (renderInfo.stack) {
+        // Traverse the datasets, and add up the values from each dataset.
+        let lastDataset = null;
+        for (let dataset of renderInfo.datasets) {
+            if (dataset.getQuery().usedAsXDataset) continue;
+            if (lastDataset) {
+                dataset.shiftByDataset(lastDataset);
+            }
+            lastDataset = dataset;
+        }
+    }
 
     for (let lineInfo of renderInfo.line) {
         let ret = renderLineChart(canvas, renderInfo, lineInfo);
@@ -905,16 +917,23 @@ function renderBar(
     // console.log(dataset);
     // console.log(barInfo);
     // console.log("%d/%d", currBarSet, totalNumOfBarSets);
-
+    
     if (!renderInfo || !barInfo) return;
 
     let barGap = 1;
     let barSetWidth = renderInfo.dataAreaSize.width / dataset.getLength();
     let barWidth = barSetWidth;
+    let currentDiaplayInd = currBarSet;
+    let totalDiaplaySet = totalNumOfBarSets;
     if (barSetWidth - barGap > 0) {
         barWidth = barSetWidth - barGap;
     }
-    barWidth = barWidth / totalNumOfBarSets;
+    if (!renderInfo.stack) {
+        barWidth = barWidth / totalNumOfBarSets;
+    } else {
+        currentDiaplayInd = 0;
+        totalDiaplaySet = 1;
+    }
 
     let portionLeft = (currBarSet + 1) / totalNumOfBarSets;
 
@@ -936,12 +955,12 @@ function renderBar(
         .append("rect")
         .attr("x", function (p: DataPoint, i: number) {
             if (i === 0) {
-                let portionVisible = currBarSet + 1 - totalNumOfBarSets / 2.0;
+                let portionVisible = currentDiaplayInd + 1 - totalDiaplaySet / 2.0;
                 if (portionVisible < 1.0) {
                     return (
                         chartElements.xScale(p.date) -
                         barSetWidth / 2.0 +
-                        currBarSet * barWidth +
+                        currentDiaplayInd * barWidth +
                         portionVisible * barWidth
                     );
                 }
@@ -949,7 +968,7 @@ function renderBar(
             return (
                 chartElements.xScale(p.date) -
                 barSetWidth / 2.0 +
-                currBarSet * barWidth
+                currentDiaplayInd * barWidth
             );
         })
         .attr("y", function (p: DataPoint) {
@@ -957,7 +976,7 @@ function renderBar(
         })
         .attr("width", function (p: DataPoint, i: number) {
             if (i === 0) {
-                let portionVisible = currBarSet + 1 - totalNumOfBarSets / 2.0;
+                let portionVisible = currentDiaplayInd + 1 - totalDiaplaySet / 2.0;
                 if (portionVisible < 0.0) {
                     return 0.0;
                 } else if (portionVisible < 1.0) {
@@ -966,7 +985,7 @@ function renderBar(
                 return barWidth;
             } else if (i === dataset.getLength() - 1) {
                 let portionVisible =
-                    1.0 - (currBarSet + 1 - totalNumOfBarSets / 2.0);
+                    1.0 - (currentDiaplayInd + 1 - totalDiaplaySet / 2.0);
                 if (portionVisible < 0.0) {
                     return 0.0;
                 } else if (portionVisible < 1.0) {
@@ -1626,15 +1645,30 @@ function renderBarChart(
     let datasetOnLeftYAxis = [];
     let datasetOnRightYAxis = [];
     let xDatasetIds = renderInfo.datasets.getXDatasetIds();
-    for (let ind = 0; ind < barInfo.yAxisLocation.length; ind++) {
-        if (xDatasetIds.includes(ind)) continue;
-        let yAxisLocation = barInfo.yAxisLocation[ind];
-        if (yAxisLocation.toLowerCase() === "left") {
-            datasetOnLeftYAxis.push(ind);
-        } else if (yAxisLocation.toLocaleLowerCase() === "right") {
-            // right
-            datasetOnRightYAxis.push(ind);
+    if (renderInfo.stack) {
+        for (let ind = barInfo.yAxisLocation.length - 1; ind >= 0; ind--) {
+            if (xDatasetIds.includes(ind)) continue;
+            let yAxisLocation = barInfo.yAxisLocation[ind];
+            if (yAxisLocation.toLowerCase() === "left") {
+                datasetOnLeftYAxis.push(ind);
+            } else if (yAxisLocation.toLocaleLowerCase() === "right") {
+                // right
+                datasetOnRightYAxis.push(ind);
+            }
         }
+
+    } else {
+        for (let ind = 0; ind < barInfo.yAxisLocation.length; ind++) {
+            if (xDatasetIds.includes(ind)) continue;
+            let yAxisLocation = barInfo.yAxisLocation[ind];
+            if (yAxisLocation.toLowerCase() === "left") {
+                datasetOnLeftYAxis.push(ind);
+            } else if (yAxisLocation.toLocaleLowerCase() === "right") {
+                // right
+                datasetOnRightYAxis.push(ind);
+            }
+        }
+
     }
 
     let retRenderLeftYAxis = renderYAxis(

From fdea6262e08270038909677542c7be33533a674b Mon Sep 17 00:00:00 2001
From: xy <xiaoyun.anye@gmail.com>
Date: Sat, 27 Apr 2024 21:56:35 -0700
Subject: [PATCH 329/402] Update doc string for stacked bar chart

---
 docs/InputParameters.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/InputParameters.md b/docs/InputParameters.md
index ecf7982..1683310 100644
--- a/docs/InputParameters.md
+++ b/docs/InputParameters.md
@@ -37,6 +37,7 @@ These key-value pairs are placed under the root of the code block.
 | `ignoreAttachedValue` | Use `constValue` even if the target has a value attached on (true\|false) | 1~NT | false |
 | `ignoreZeroValue` | Treat zero value as missing (true\|false) | 1~NT | false |
 | `accum` | Accumulatively sum the values over time (true\|false) | 1~NT | false |
+| `stack` | Support stacked charts (true\|false) | 1 | false |
 | `penalty` | Value to use if the search target is missing on the day | 1~NT | |
 | `valueShift` | Amount to shift for each collected value | 1~NT | 0 |
 | `shiftOnlyValueLargerThan` | Do `valueShift` only if the value is larger then the specifed one | 1~NT | null |

From c8471b19fd165faa38a28032cc2a6bb9272ebe39 Mon Sep 17 00:00:00 2001
From: xy <xiaoyun.anye@gmail.com>
Date: Sun, 28 Apr 2024 16:58:18 -0700
Subject: [PATCH 330/402] Pervent overlapping external labels in pie chart

---
 examples/TestPieChart.md | 15 ++++++++++
 src/pie.ts               | 63 +++++++++++++++++++++++++++++++---------
 2 files changed, 65 insertions(+), 13 deletions(-)

diff --git a/examples/TestPieChart.md b/examples/TestPieChart.md
index 999f677..a10aef9 100644
--- a/examples/TestPieChart.md
+++ b/examples/TestPieChart.md
@@ -115,3 +115,18 @@ pie:
     hideLabelLessThan: 0.03
     showExtLabelOnlyIfNoLabel: true
 ```
+
+When there are multiple external labels, make sure they won't overlap with each other
+``` tracker
+searchType: task.done, task.notdone
+searchTarget: Say I love you, Say I love you
+datasetName: Done, NotDone
+pie:
+    label: '{{0.5/11*100}}%, B {{0.4/11*100}}%, C {{0.1/11*100}}%, D {{8/11*100}}%, E {{9.7/11*100}}%, F {{0.3/28.5*100}}'
+    extLabel:  'A {{0.5/11*100}}%, B {{0.4/11*100}}%, C {{0.1/11*100}}%, D {{8/11*100}}%, E {{9.7/11*100}}, F {{0.3/11*100}}%'
+    data: '0.5, 0.4, 0.1, 8, 9.7, 0.3'
+    dataColor: '#4daf4a,#377eb8,#ff7f00,#984ea3,#e41a1c,#aaaaaa'
+    ratioInnerRadius: 0.4
+    hideLabelLessThan: 0.03
+    showExtLabelOnlyIfNoLabel: true
+```
diff --git a/src/pie.ts b/src/pie.ts
index 992cef6..c1ddf95 100644
--- a/src/pie.ts
+++ b/src/pie.ts
@@ -467,6 +467,7 @@ function renderPie(
 
     let pie = d3.pie();
     let pieValues = pie(values);
+    pieValues.forEach(function (value: any, i: number) {value.input_index = i})
 
     let sectors = sectorsGroup
         .selectAll("sector")
@@ -526,36 +527,72 @@ function renderPie(
         return arcObj.startAngle + (arcObj.endAngle - arcObj.startAngle) / 2;
     }
 
+    function externalLabelText(arcObj: any, i: number) {
+        if (showExtLabelOnlyIfNoLabel) {
+            if (labels[i] === "" || isLabelHidden(arcObj)) {
+                return extLabels[i];
+            }
+            return "";
+        } else {
+            return extLabels[i];
+        }
+    }
+
     // external label elements
+    let prevBB : DOMRect = null;
+    let extlabelPos : any = {};
     let extLabelElements = sectorsGroup
         .selectAll("extLabel")
         .data(pieValues)
         .enter()
         .append("text")
+        // Sort external labels based on y value such that we can move down overlapping labels
+        .sort(function (arcObj1: any, arcObj2: any) {
+            return Math.cos(getMidAngle(arcObj2)) - Math.cos(getMidAngle(arcObj1));
+        })
         .text(function (arcObj: any, i: number) {
-            if (showExtLabelOnlyIfNoLabel) {
-                if (labels[i] === "" || isLabelHidden(arcObj)) {
-                    return extLabels[i];
-                }
-                return "";
-            } else {
-                return extLabels[i];
-            }
+            i = arcObj.input_index;
+            return externalLabelText(arcObj, i)
         })
         .attr("transform", function (arcObj: any, i: number) {
+            i = arcObj.input_index;
+            // If external label is empty, directly return.
+            if (externalLabelText(arcObj, i).length == 0) {
+                return;
+            }
             let posLabel = hiddenArc.centroid(arcObj);
             let midAngle = getMidAngle(arcObj);
 
             posLabel[0] =
                 (radius * 0.99 - extLabelSizes[i].width) *
                 (midAngle < Math.PI ? 1 : -1);
-            return "translate(" + posLabel[0] + "," + posLabel[1] + ")";
+            
+            var yshift = 0;
+            let thisBB = new DOMRect(posLabel[0], posLabel[1], extLabelSizes[i].width, extLabelSizes[i].height);
+            
+            if (prevBB !== null) {
+                // Check whether there are overlaps
+                if (!(thisBB.right < prevBB.left || prevBB.right < thisBB.left
+                    || prevBB.bottom < thisBB.top)) {
+                    // Since y is sorted from low to high, we expect to shift this item further down
+                    yshift = prevBB.bottom - thisBB.top;
+                    // console.log("has overlap", yshift);
+                }
+            }
+            if (yshift != 0) {
+                thisBB = new DOMRect(posLabel[0], posLabel[1] + yshift, extLabelSizes[i].width, extLabelSizes[i].height);
+            }
+            prevBB = thisBB;
+            // Save external label position for connection line plotting
+            extlabelPos[i] = [posLabel[0], posLabel[1] + yshift]
+            return "translate(" + posLabel[0] + "," + (posLabel[1] + yshift) + ")";
         })
         .style("text-anchor", function (arcObj: any) {
             let midAngle = getMidAngle(arcObj);
             return midAngle < Math.PI ? "start" : "end";
         })
         .attr("class", "tracker-pie-label");
+    
 
     function getPointsForConnectionLines(arcObj: any, i: number) {
         let labelWidth = labelSizes[i].width;
@@ -565,7 +602,8 @@ function renderPie(
 
         let posLabel = arc.centroid(arcObj); // line insertion in the slice
         let posMiddle = hiddenArc.centroid(arcObj); // line break: we use the other arc generator that has been built only for that
-        let posExtLabel = hiddenArc.centroid(arcObj); // Label position = almost the same as posB
+        let posExtLabel = extlabelPos[i] || hiddenArc.centroid(arcObj); // Label position = almost the same as posB
+        posMiddle[1] = posExtLabel[1];
         // console.log(labels[i]);
         // console.log(`label/middle/extLabel: ${posLabel}/${posMiddle}/${posExtLabel}`);
 
@@ -574,7 +612,7 @@ function renderPie(
                 (posMiddle[1] - posLabel[1]) ** 2
         );
 
-        if (labels[i] !== "") {
+        if (labels[i] !== "" && !labelHidden) {
             // shift posLabel, toward the middle point
             posLabel[0] =
                 posLabel[0] +
@@ -584,8 +622,7 @@ function renderPie(
                 ((posMiddle[1] - posLabel[1]) * labelWidth) / distMiddleToLabel;
 
             // shift posExtLabel
-            posExtLabel[0] =
-                (radius * 0.99 - extLabelWidth - 3) *
+            posExtLabel[0] =posExtLabel[0] + (- 3) *
                 (midAngle < Math.PI ? 1 : -1); // multiply by 1 or -1 to put it on the right or on the left
         }
 

From ed7ac24ab568506404a490184b1401f6a38bb2c5 Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Sun, 28 Apr 2024 22:32:03 -0600
Subject: [PATCH 331/402] (nitpick) Remove blank spacing

---
 src/rendering.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rendering.ts b/src/rendering.ts
index 650ecde..a530e19 100644
--- a/src/rendering.ts
+++ b/src/rendering.ts
@@ -917,7 +917,7 @@ function renderBar(
     // console.log(dataset);
     // console.log(barInfo);
     // console.log("%d/%d", currBarSet, totalNumOfBarSets);
-    
+
     if (!renderInfo || !barInfo) return;
 
     let barGap = 1;

From 3550d12f79253ec1d06a94fb70ce469c2f0eccb5 Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Sun, 28 Apr 2024 22:45:24 -0600
Subject: [PATCH 332/402] Release 1.14.0

---
 README.md            | 5 +++++
 docs/ReleaseNotes.md | 6 ++++++
 manifest.json        | 2 +-
 package-lock.json    | 4 ++--
 package.json         | 2 +-
 versions.json        | 3 ++-
 6 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index f8be9ac..9f1267a 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,11 @@ This is an [Obsidian](https://obsidian.md/) plugin that helps you collect data f
 
 ## What's New
 
+Version 1.14.0
+- Update dependencies
+- Prevent overlapping external labels in pie chart
+- Enable Stacked Bar Chart
+
 Version 1.13.3
 
 - Update dependencies
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index a9bc27e..85f9f9a 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,5 +1,11 @@
 # Release Notes
 
+## 1.14.0
+
+- Update dependencies
+- Prevent overlapping external labels in pie chart
+- Enable Stacked Bar Chart
+
 ## 1.13.3
 
 - Update dependencies
diff --git a/manifest.json b/manifest.json
index 5ca257f..9b4559e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "id": "obsidian-tracker",
   "name": "Tracker",
-  "version": "1.13.3",
+  "version": "1.14.0",
   "minAppVersion": "0.9.12",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "author": "pyrochlore",
diff --git a/package-lock.json b/package-lock.json
index fd07481..994be6d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.13.3",
+  "version": "1.14.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "obsidian-tracker",
-      "version": "1.13.3",
+      "version": "1.14.0",
       "license": "MIT",
       "dependencies": {
         "d3": "^7.9.0",
diff --git a/package.json b/package.json
index dc0647a..f5eb2ca 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.13.3",
+  "version": "1.14.0",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
diff --git a/versions.json b/versions.json
index 8f2fcaf..f665075 100644
--- a/versions.json
+++ b/versions.json
@@ -34,5 +34,6 @@
   "1.13.0": "0.9.12",
   "1.13.1": "0.9.12",
   "1.13.2": "0.9.12",
-  "1.13.3": "0.9.12"
+  "1.13.3": "0.9.12",
+  "1.14.0": "0.9.12"
 }

From 7b4fb21f31aa9b4f3730a00dea53190daae04f3e Mon Sep 17 00:00:00 2001
From: Matt Karrmann <mattkarrmann@gmail.com>
Date: Sun, 2 Jun 2024 22:29:28 -0500
Subject: [PATCH 333/402] Respect thresholds in scaled months

---
 src/month.ts | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/src/month.ts b/src/month.ts
index d4eba3f..a1fa232 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -643,26 +643,7 @@ function renderMonthDays(
             console.log(curValue);
         }
 
-        // showCircle
-        let showCircle = false;
-        if (!monthInfo.circleColorByValue) {
-            // shown or not shown
-            if (curValue !== null) {
-                if (curValue > threshold) {
-                    showCircle = true;
-                }
-            }
-        } else {
-            if (!allowScaledValue) {
-                if (curValue !== null) {
-                    if (curValue > threshold) {
-                        showCircle = true;
-                    }
-                }
-            } else {
-                showCircle = true;
-            }
-        }
+        const showCircle = curValue != null && curValue > threshold;
 
         // scaledValue
         let scaledValue = null;

From 265853d9a2e178e18f2a81f8090936a95dff34f6 Mon Sep 17 00:00:00 2001
From: Matt Karrmann <mattkarrmann@gmail.com>
Date: Sun, 2 Jun 2024 22:58:13 -0500
Subject: [PATCH 334/402] Update example

---
 examples/TestCalendar.md                 | 6 ++++--
 examples/diary/Lucas-20210105-Journal.md | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
index 84902b0..99467fd 100644
--- a/examples/TestCalendar.md
+++ b/examples/TestCalendar.md
@@ -46,7 +46,7 @@ month:
 ```
 
 ### Colored by Values
-Use parameter `circleColorByValue`, color the circles based on the values
+Use parameters `circleColorByValue`, `yMin`, and `yMax`, to color the circles based on the values
 ``` tracker
 searchType: tag
 searchTarget: exercise-pushup
@@ -54,13 +54,15 @@ datasetName: PushUp
 folder: diary
 month:
     startWeekOn:
-    threshold: 40
+    threshold: 10
     color: green
     headerMonthColor: orange
     dimNotInMonth: false
     todayRingColor: orange
     selectedRingColor: steelblue
     circleColorByValue: true
+	yMin: 0
+	yMax: 50
     showSelectedValue: true
 ```
 
diff --git a/examples/diary/Lucas-20210105-Journal.md b/examples/diary/Lucas-20210105-Journal.md
index c836d81..1f8cccf 100644
--- a/examples/diary/Lucas-20210105-Journal.md
+++ b/examples/diary/Lucas-20210105-Journal.md
@@ -6,7 +6,7 @@ bloodpressure: 177/119
 
 #weight:70.0kg
 
-#exercise-pushup:35
+#exercise-pushup:5
 #exercise-plank:34sec
 
 #meditation

From ea0add16b14a1dd74b53f4f71ef4d1fc94a3d151 Mon Sep 17 00:00:00 2001
From: Matt Karrmann <mattkarrmann@gmail.com>
Date: Sun, 2 Jun 2024 23:01:00 -0500
Subject: [PATCH 335/402] Fix spacing

---
 examples/TestCalendar.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
index 99467fd..d01fef2 100644
--- a/examples/TestCalendar.md
+++ b/examples/TestCalendar.md
@@ -61,8 +61,8 @@ month:
     todayRingColor: orange
     selectedRingColor: steelblue
     circleColorByValue: true
-	yMin: 0
-	yMax: 50
+    yMin: 0
+    yMax: 50
     showSelectedValue: true
 ```
 

From e539b574f830c53e301d44ef9f3fedf1514c9329 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 13:45:03 +0000
Subject: [PATCH 336/402] Bump @rollup/plugin-commonjs from 25.0.7 to 26.0.1

Bumps [@rollup/plugin-commonjs](https://github.com/rollup/plugins/tree/HEAD/packages/commonjs) from 25.0.7 to 26.0.1.
- [Changelog](https://github.com/rollup/plugins/blob/master/packages/commonjs/CHANGELOG.md)
- [Commits](https://github.com/rollup/plugins/commits/commonjs-v26.0.1/packages/commonjs)

---
updated-dependencies:
- dependency-name: "@rollup/plugin-commonjs"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 466 ++++++++++++++++++++++++++++++++++++++++++++--
 package.json      |   2 +-
 2 files changed, 448 insertions(+), 20 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 994be6d..eacd440 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "sprintf-js": "^1.1.3"
       },
       "devDependencies": {
-        "@rollup/plugin-commonjs": "^25.0.7",
+        "@rollup/plugin-commonjs": "^26.0.1",
         "@rollup/plugin-node-resolve": "^15.2.3",
         "@rollup/plugin-terser": "^0.4.4",
         "@rollup/plugin-typescript": "^11.1.5",
@@ -48,6 +48,23 @@
         "w3c-keyname": "^2.2.4"
       }
     },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
@@ -141,21 +158,31 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
     "node_modules/@rollup/plugin-commonjs": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-25.0.7.tgz",
-      "integrity": "sha512-nEvcR+LRjEjsaSsc4x3XZfCCvZIaSMenZu/OiwOKGN2UhQpAYI7ru7czFvyWbErlpoGjnSX3D5Ch5FcMA3kRWQ==",
+      "version": "26.0.1",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-26.0.1.tgz",
+      "integrity": "sha512-UnsKoZK6/aGIH6AdkptXhNvhaqftcjq3zZdT+LY5Ftms6JR06nADcDsYp5hTU9E2lbJUEOhdlY5J4DNTneM+jQ==",
       "dev": true,
       "dependencies": {
         "@rollup/pluginutils": "^5.0.1",
         "commondir": "^1.0.1",
         "estree-walker": "^2.0.2",
-        "glob": "^8.0.3",
+        "glob": "^10.4.1",
         "is-reference": "1.2.1",
         "magic-string": "^0.30.3"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=16.0.0 || 14 >= 14.17"
       },
       "peerDependencies": {
         "rollup": "^2.68.0||^3.0.0||^4.0.0"
@@ -810,6 +837,30 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
     "node_modules/array-union": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
@@ -864,6 +915,24 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
     "node_modules/colorette": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz",
@@ -890,6 +959,20 @@
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
       "dev": true
     },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/d3": {
       "version": "7.9.0",
       "resolved": "https://registry.npmjs.org/d3/-/d3-7.9.0.tgz",
@@ -1289,6 +1372,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true
+    },
+    "node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true
+    },
     "node_modules/estree-walker": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
@@ -1332,6 +1427,22 @@
         "node": ">=8"
       }
     },
+    "node_modules/foreground-child": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
+      "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/fs-extra": {
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
@@ -1376,19 +1487,22 @@
       }
     },
     "node_modules/glob": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
-      "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+      "version": "10.4.1",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.1.tgz",
+      "integrity": "sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==",
       "dev": true,
       "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^5.0.1",
-        "once": "^1.3.0"
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=16 || 14 >=14.18"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -1565,6 +1679,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/is-glob": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
@@ -1610,6 +1733,30 @@
         "@types/estree": "*"
       }
     },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "node_modules/jackspeak": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.0.tgz",
+      "integrity": "sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==",
+      "dev": true,
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
     "node_modules/jsep": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/jsep/-/jsep-1.3.8.tgz",
@@ -1627,6 +1774,15 @@
         "graceful-fs": "^4.1.6"
       }
     },
+    "node_modules/lru-cache": {
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz",
+      "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==",
+      "dev": true,
+      "engines": {
+        "node": "14 || >=16.14"
+      }
+    },
     "node_modules/magic-string": {
       "version": "0.30.5",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
@@ -1662,15 +1818,27 @@
       }
     },
     "node_modules/minimatch": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
+      "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
       "dev": true,
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "dev": true,
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
       }
     },
     "node_modules/moment": {
@@ -1715,12 +1883,37 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/path-parse": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
+    "node_modules/path-scurry": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/path-type": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
@@ -1916,6 +2109,39 @@
         "randombytes": "^2.1.0"
       }
     },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/slash": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
@@ -1955,6 +2181,102 @@
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
       "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="
     },
+    "node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dev": true,
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/string-width-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/style-mod": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.0.tgz",
@@ -2051,6 +2373,112 @@
       "dev": true,
       "peer": true
     },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
diff --git a/package.json b/package.json
index f5eb2ca..33a1522 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
   "author": "pyrochlore",
   "license": "MIT",
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^25.0.7",
+    "@rollup/plugin-commonjs": "^26.0.1",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^11.1.5",

From 8fd36ea66427faabfa61078c85f5a128105ad25a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 13:45:21 +0000
Subject: [PATCH 337/402] Bump tslib from 2.6.2 to 2.6.3

Bumps [tslib](https://github.com/Microsoft/tslib) from 2.6.2 to 2.6.3.
- [Release notes](https://github.com/Microsoft/tslib/releases)
- [Commits](https://github.com/Microsoft/tslib/compare/v2.6.2...v2.6.3)

---
updated-dependencies:
- dependency-name: tslib
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 994be6d..40975e0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,7 +25,7 @@
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
         "rollup": "^4.16.1",
         "rollup-plugin-copy": "^3.5.0",
-        "tslib": "^2.6.2",
+        "tslib": "^2.6.3",
         "typescript": "^5.4.5"
       }
     },
@@ -2011,9 +2011,9 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
+      "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==",
       "dev": true
     },
     "node_modules/typescript": {
diff --git a/package.json b/package.json
index f5eb2ca..917fcc6 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
     "rollup": "^4.16.1",
     "rollup-plugin-copy": "^3.5.0",
-    "tslib": "^2.6.2",
+    "tslib": "^2.6.3",
     "typescript": "^5.4.5"
   },
   "dependencies": {

From d12935b01173770a80109355c06c9a80ebb2d463 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 13:54:49 +0000
Subject: [PATCH 338/402] Bump @types/node from 20.12.7 to 20.14.11

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.12.7 to 20.14.11.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 994be6d..b66baa2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,7 @@
         "@rollup/plugin-terser": "^0.4.4",
         "@rollup/plugin-typescript": "^11.1.5",
         "@types/d3": "^7.4.3",
-        "@types/node": "^20.12.7",
+        "@types/node": "^20.14.11",
         "@types/sprintf-js": "^1.1.4",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
         "rollup": "^4.16.1",
@@ -769,9 +769,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.12.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.7.tgz",
-      "integrity": "sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==",
+      "version": "20.14.11",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.11.tgz",
+      "integrity": "sha512-kprQpL8MMeszbz6ojB5/tU8PLN4kesnN8Gjzw349rDlNgsSzg90lAVj3llK99Dh7JON+t9AuscPPFW6mPbTnSA==",
       "dev": true,
       "dependencies": {
         "undici-types": "~5.26.4"
diff --git a/package.json b/package.json
index f5eb2ca..b2467d1 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^11.1.5",
     "@types/d3": "^7.4.3",
-    "@types/node": "^20.12.7",
+    "@types/node": "^20.14.11",
     "@types/sprintf-js": "^1.1.4",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
     "rollup": "^4.16.1",

From 37c2b60c8dcaab5418631e02a5d9f4c059e6243f Mon Sep 17 00:00:00 2001
From: Denis Sokolov <denis.sokolov@gmail.com>
Date: Thu, 19 Dec 2024 18:12:46 +0300
Subject: [PATCH 339/402] Updated examples with start and end dates so that
 plots render correctly.

---
 examples/FinanceTracker.md           |  3 +++
 examples/HabitTracker.md             |  3 +++
 examples/StarTracker.md              |  2 ++
 examples/TestCalendar.md             | 11 +++++++++--
 examples/TestRelativeStartEndDate.md |  4 ++--
 examples/TestTask.md                 |  2 ++
 examples/WeightTracker.md            |  1 +
 7 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/examples/FinanceTracker.md b/examples/FinanceTracker.md
index 64d3d66..f63a19f 100644
--- a/examples/FinanceTracker.md
+++ b/examples/FinanceTracker.md
@@ -5,6 +5,7 @@ searchType: tag
 searchTarget: finance
 folder: diary
 accum: true
+endDate: 2021-01-31
 line:
     title: Finance
     yAxisLabel: USD
@@ -17,6 +18,7 @@ searchType: tag
 searchTarget: finance/bank1
 folder: diary
 accum: true
+endDate: 2021-01-31
 line:
     title: Bank1
     yAxisLabel: USD
@@ -28,6 +30,7 @@ searchType: tag
 searchTarget: finance/bank2
 folder: diary
 accum: true
+endDate: 2021-03-15
 line:
     title: Bank2
     yAxisLabel: USD
diff --git a/examples/HabitTracker.md b/examples/HabitTracker.md
index 568d2c2..71b0f30 100644
--- a/examples/HabitTracker.md
+++ b/examples/HabitTracker.md
@@ -15,6 +15,7 @@ line:
 searchType: tag
 searchTarget: exercise-plank
 folder: diary
+endDate: 2021-01-31
 line:
     title: Plank
     yAxisLabel: Hold
@@ -29,6 +30,7 @@ searchTarget: meditation
 folder: diary
 accum: true
 penalty: -1
+endDate: 2021-01-31
 line:
     title: Meditation
     yAxisLabel: Count
@@ -61,6 +63,7 @@ searchTarget: work_log
 folder: diary
 accum: true
 startDate: 2021-01-01
+endDate: 2021-01-31
 line:
     title: Work Log
     yAxisLabel: Count
diff --git a/examples/StarTracker.md b/examples/StarTracker.md
index 41bdb34..9bdd37a 100644
--- a/examples/StarTracker.md
+++ b/examples/StarTracker.md
@@ -5,6 +5,7 @@
 searchType: text
 searchTarget: ⭐
 folder: diary
+endDate: 2021-01-31
 summary:
     template: "I have {{sum()}} stars in total."
     style: "font-size:20px;color:yellow;margin-left: 50px;margin-top:00px;"
@@ -14,6 +15,7 @@ summary:
 searchType: text
 searchTarget: ⭐
 folder: diary
+endDate: 2021-01-31
 accum: true
 line:
     title: Count the Given Stars
diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
index 84902b0..489c384 100644
--- a/examples/TestCalendar.md
+++ b/examples/TestCalendar.md
@@ -9,6 +9,7 @@ searchType: tag
 searchTarget: meditation
 datasetName: Meditation
 folder: diary
+endDate: 2021-01-31
 month:
 ```
 
@@ -21,6 +22,7 @@ searchType: tag
 searchTarget: exercise-pushup
 datasetName: PushUp
 folder: diary
+endDate: 2021-01-31
 month:
     startWeekOn: 'Sun'
     threshold: 40
@@ -38,6 +40,7 @@ searchType: tag
 searchTarget: meditation
 datasetName: Meditation
 folder: diary
+endDate: 2021-01-31
 month:
     startWeekOn: 'Sun'
     color: steelblue
@@ -52,6 +55,7 @@ searchType: tag
 searchTarget: exercise-pushup
 datasetName: PushUp
 folder: diary
+endDate: 2021-01-31
 month:
     startWeekOn:
     threshold: 40
@@ -90,7 +94,7 @@ month:
     selectedRingColor: steelblue
     circleColorByValue: true
     showSelectedValue: true
-    initMonth: 2021-09
+    initMonth: 2021-01
 ```
 
 Specify the initial month by relative date
@@ -109,7 +113,7 @@ month:
     selectedRingColor: steelblue
     circleColorByValue: true
     showSelectedValue: true
-    initMonth: -1M
+    initMonth: -47M
 ```
 
 ## Multiple targets
@@ -122,6 +126,7 @@ searchType: tag
 searchTarget: exercise-pushup, meditation
 datasetName: PushUp, Meditation
 folder: diary
+endDate: 2021-01-31
 month:
     dataset: 0, 1
     startWeekOn: 'Sun'
@@ -142,6 +147,7 @@ searchType: tag
 searchTarget: exercise-pushup, meditation
 datasetName: PushUp, Meditation
 folder: diary
+endDate: 2021-01-31
 month:
     mode: annotation
     startWeekOn: 'Sun'
@@ -159,6 +165,7 @@ searchType: tag
 searchTarget: exercise-pushup, meditation
 datasetName: PushUp, Meditation
 folder: diary
+endDate: 2021-01-31
 month:
     mode: annotation
     startWeekOn: 'Sun'
diff --git a/examples/TestRelativeStartEndDate.md b/examples/TestRelativeStartEndDate.md
index 4c3f0e4..8c93f05 100644
--- a/examples/TestRelativeStartEndDate.md
+++ b/examples/TestRelativeStartEndDate.md
@@ -4,8 +4,8 @@
 searchType: tag
 searchTarget: exercise-pushup
 folder: diary
-startDate: -2M
-endDate: -1M
+startDate: -48M
+endDate: -46M
 line:
     title: PushUp
     yAxisLabel: Count
diff --git a/examples/TestTask.md b/examples/TestTask.md
index a253698..cc0acc2 100644
--- a/examples/TestTask.md
+++ b/examples/TestTask.md
@@ -48,6 +48,7 @@ searchType: task.done
 searchTarget: Say I love you
 folder: diary
 datasetName: Love
+endDate: 2021-01-31
 month:
     color: tomato
     headerMonthColor: orange
@@ -62,6 +63,7 @@ searchType: task.done, task.notdone
 searchTarget: Say I love you, Say I love you
 folder: diary
 datasetName: Good Lover, Bad Lover
+endDate: 2021-01-31
 month:
     color: tomato
     headerMonthColor: orange
diff --git a/examples/WeightTracker.md b/examples/WeightTracker.md
index 2cd0f8d..1385fe5 100644
--- a/examples/WeightTracker.md
+++ b/examples/WeightTracker.md
@@ -28,6 +28,7 @@ summary:
 searchType: tag
 searchTarget: weight
 folder: diary
+endDate: 2021-01-31
 line:
     title: Weight Log
     yAxisLabel: Weight

From bdafd21f2f598febee528135a2ad789cb83925a2 Mon Sep 17 00:00:00 2001
From: Shahar Tal <stalmail10@gmail.com>
Date: Sat, 21 Dec 2024 15:37:08 +0200
Subject: [PATCH 340/402] added first and last expressions

---
 docs/Expressions.md |  2 ++
 src/expr.ts         | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/docs/Expressions.md b/docs/Expressions.md
index fe17aee..f366067 100644
--- a/docs/Expressions.md
+++ b/docs/Expressions.md
@@ -59,6 +59,8 @@ e.g.
 
 | Function(InputType): OutputType | Description |
 |:------------------|:-----------|
+| first(Dataset): number | First value of the dataset |
+| last(Dataset): number | Last value of the dataset |
 | min(Dataset): number | Minimum value of the dataset |
 | minDate(Dataset): Date | Latest date of minimum value |
 | max(Dataset): number | Maximum value of the dataset |
diff --git a/src/expr.ts b/src/expr.ts
index 6469950..e8af3ae 100644
--- a/src/expr.ts
+++ b/src/expr.ts
@@ -76,6 +76,16 @@ function checkBinaryOperantType(left: any, right: any) {
 }
 
 const fnMapDatasetToValue: FnMapDatasetToValue = {
+    // first value of a dataset
+    first: function (dataset, renderInfo) {
+        // return number
+        return dataset.getValue(dataset.getStartDate());
+    },
+    // last value of a dataset
+    last: function (dataset, renderInfo) {
+        // return number
+        return dataset.getValue(dataset.getEndDate());
+    },
     // min value of a dataset
     min: function (dataset, renderInfo) {
         // return number

From d91e4f5b7c37f959dcf2d15463c20dc3bfb0f156 Mon Sep 17 00:00:00 2001
From: Shahar Tal <stalmail10@gmail.com>
Date: Sat, 21 Dec 2024 15:45:05 +0200
Subject: [PATCH 341/402] added example of the new expressions (first, last)

---
 examples/WeightTracker.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/WeightTracker.md b/examples/WeightTracker.md
index 2cd0f8d..8581e47 100644
--- a/examples/WeightTracker.md
+++ b/examples/WeightTracker.md
@@ -21,7 +21,7 @@ searchType: tag
 searchTarget: weight
 folder: diary
 summary:
-    template: "Minimum: {{min()}}kg\nMaximum: {{max()}}kg\nMedian: {{median()}}kg\nAverage: {{average()}}kg"
+    template: "First: {{first()}}kg\nLast: {{last()}}kg\nMinimum: {{min()}}kg\nMaximum: {{max()}}kg\nMedian: {{median()}}kg\nAverage: {{average()}}kg"
 ```
 
 ``` tracker

From 57efbd58e514adc515d2e0d659c78fc18ba77984 Mon Sep 17 00:00:00 2001
From: Shahar Tal <stalmail10@gmail.com>
Date: Sat, 21 Dec 2024 16:29:42 +0200
Subject: [PATCH 342/402] utilizing existing fnMapDatasetToValue methods

---
 src/expr.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/expr.ts b/src/expr.ts
index e8af3ae..51c5fc8 100644
--- a/src/expr.ts
+++ b/src/expr.ts
@@ -79,12 +79,12 @@ const fnMapDatasetToValue: FnMapDatasetToValue = {
     // first value of a dataset
     first: function (dataset, renderInfo) {
         // return number
-        return dataset.getValue(dataset.getStartDate());
+        return dataset.getValue(this.startDate(...arguments));
     },
     // last value of a dataset
     last: function (dataset, renderInfo) {
         // return number
-        return dataset.getValue(dataset.getEndDate());
+        return dataset.getValue(this.endDate(...arguments));
     },
     // min value of a dataset
     min: function (dataset, renderInfo) {

From a51905f27c3977f5f47559494e7c25d1a9a56f29 Mon Sep 17 00:00:00 2001
From: caleb <68855603+calebvisage@users.noreply.github.com>
Date: Sun, 22 Dec 2024 20:27:19 +0200
Subject: [PATCH 343/402] fix: spelling error in Examples.md

---
 docs/Examples.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Examples.md b/docs/Examples.md
index 755afe2..b68f4e7 100644
--- a/docs/Examples.md
+++ b/docs/Examples.md
@@ -25,7 +25,7 @@ Check where (Location) and what (Target to Track) is your target and find the se
 | content | [[journal]] | searchType: wiki<br>searchTarget: journal | O |
 | content | ⭐ | searchType: text<br>searchTarget: ⭐ | O | 
 | content | love | searchType: text<br>searchTarget: love | O |
-| content | test@gmail.com<br>test@hotmail.com | searchType: text<br>serchTarget: '.+\\@.+\\..+' | O |
+| content | test@gmail.com<br>test@hotmail.com | searchType: text<br>searchTarget: '.+\\@.+\\..+' | O |
 | content | #weightlifting: 50 | searchType: text<br>searchTarget: 'weightlifting: (?\<value\>[\\-]?[0-9]+[\\.][0-9]+\|[\\-]?[0-9]+)' | V |
 | content | I walked 10000 steps today. | searchType: text<br>searchTarget: 'walked\\s+(?\<value\>[0-9]+)\\s+steps' | V |
 | content | myvalues 1/2/3 | searchType: text<br>searchTarget: 'myvalues\\s+(?\<value\>[0-9]+)/([0-9]+)/([0-9]+), myvalues\\s+([0-9]+)/(?\<value\>[0-9]+)/([0-9]+), myvalues\\s+([0-9]+)/([0-9]+)/(?\<value\>[0-9]+)' | V |

From e65693e7189525eed2400e5d590abd8df56535fe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 5 Jan 2025 03:09:34 +0000
Subject: [PATCH 344/402] Bump rollup from 4.16.1 to 4.29.1

Bumps [rollup](https://github.com/rollup/rollup) from 4.16.1 to 4.29.1.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v4.16.1...v4.29.1)

---
updated-dependencies:
- dependency-name: rollup
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 186 ++++++++++++++++++++++++++++------------------
 package.json      |   2 +-
 2 files changed, 115 insertions(+), 73 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 994be6d..7b2dbd7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,7 +23,7 @@
         "@types/node": "^20.12.7",
         "@types/sprintf-js": "^1.1.4",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-        "rollup": "^4.16.1",
+        "rollup": "^4.29.1",
         "rollup-plugin-copy": "^3.5.0",
         "tslib": "^2.6.2",
         "typescript": "^5.4.5"
@@ -262,9 +262,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.16.1.tgz",
-      "integrity": "sha512-92/y0TqNLRYOTXpm6Z7mnpvKAG9P7qmK7yJeRJSdzElNCUnsgbpAsGqerUboYRIQKzgfq4pWu9xVkgpWLfmNsw==",
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.29.1.tgz",
+      "integrity": "sha512-ssKhA8RNltTZLpG6/QNkCSge+7mBQGUqJRisZ2MDQcEGaK93QESEgWK2iOpIDZ7k9zPVkG5AS3ksvD5ZWxmItw==",
       "cpu": [
         "arm"
       ],
@@ -275,9 +275,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.16.1.tgz",
-      "integrity": "sha512-ttWB6ZCfRLuDIUiE0yiu5gcqOsYjA5F7kEV1ggHMj20FwLZ8A1FMeahZJFl/pnOmcnD2QL0z4AcDuo27utGU8A==",
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.29.1.tgz",
+      "integrity": "sha512-CaRfrV0cd+NIIcVVN/jx+hVLN+VRqnuzLRmfmlzpOzB87ajixsN/+9L5xNmkaUUvEbI5BmIKS+XTwXsHEb65Ew==",
       "cpu": [
         "arm64"
       ],
@@ -288,9 +288,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.16.1.tgz",
-      "integrity": "sha512-QLDvPLetbqjHojTGFw9+nuSP3YY/iz2k1cep6crYlr97sS+ZJ0W43b8Z0zC00+lnFZj6JSNxiA4DjboNQMuh1A==",
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.29.1.tgz",
+      "integrity": "sha512-2ORr7T31Y0Mnk6qNuwtyNmy14MunTAMx06VAPI6/Ju52W10zk1i7i5U3vlDRWjhOI5quBcrvhkCHyF76bI7kEw==",
       "cpu": [
         "arm64"
       ],
@@ -301,9 +301,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.16.1.tgz",
-      "integrity": "sha512-TAUK/D8khRrRIa1KwRzo8JNKk3tcqaeXWdtsiLgA8zmACWwlWLjPCJ4DULGHQrMkeBjp1Cd3Yuwx04lZgFx5Vg==",
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.29.1.tgz",
+      "integrity": "sha512-j/Ej1oanzPjmN0tirRd5K2/nncAhS9W6ICzgxV+9Y5ZsP0hiGhHJXZ2JQ53iSSjj8m6cRY6oB1GMzNn2EUt6Ng==",
       "cpu": [
         "x64"
       ],
@@ -313,10 +313,36 @@
         "darwin"
       ]
     },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.29.1.tgz",
+      "integrity": "sha512-91C//G6Dm/cv724tpt7nTyP+JdN12iqeXGFM1SqnljCmi5yTXriH7B1r8AD9dAZByHpKAumqP1Qy2vVNIdLZqw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.29.1.tgz",
+      "integrity": "sha512-hEioiEQ9Dec2nIRoeHUP6hr1PSkXzQaCUyqBDQ9I9ik4gCXQZjJMIVzoNLBRGet+hIUb3CISMh9KXuCcWVW/8w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.16.1.tgz",
-      "integrity": "sha512-KO+WGZjrh6zyFTD1alIFkfdtxf8B4BC+hqd3kBZHscPLvE5FR/6QKsyuCT0JlERxxYBSUKNUQ/UHyX5uwO1x2A==",
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.29.1.tgz",
+      "integrity": "sha512-Py5vFd5HWYN9zxBv3WMrLAXY3yYJ6Q/aVERoeUFwiDGiMOWsMs7FokXihSOaT/PMWUty/Pj60XDQndK3eAfE6A==",
       "cpu": [
         "arm"
       ],
@@ -327,9 +353,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.16.1.tgz",
-      "integrity": "sha512-NqxbllzIB1WoAo4ThUXVtd21iiM5IHMTTXmXySKBLVcZvkU0HIZmatlP7hLzb5yQubcmdIeWmncd2NdsjocEiw==",
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.29.1.tgz",
+      "integrity": "sha512-RiWpGgbayf7LUcuSNIbahr0ys2YnEERD4gYdISA06wa0i8RALrnzflh9Wxii7zQJEB2/Eh74dX4y/sHKLWp5uQ==",
       "cpu": [
         "arm"
       ],
@@ -340,9 +366,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.16.1.tgz",
-      "integrity": "sha512-snma5NvV8y7IECQ5rq0sr0f3UUu+92NVmG/913JXJMcXo84h9ak9TA5UI9Cl2XRM9j3m37QwDBtEYnJzRkSmxA==",
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.29.1.tgz",
+      "integrity": "sha512-Z80O+taYxTQITWMjm/YqNoe9d10OX6kDh8X5/rFCMuPqsKsSyDilvfg+vd3iXIqtfmp+cnfL1UrYirkaF8SBZA==",
       "cpu": [
         "arm64"
       ],
@@ -353,9 +379,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.16.1.tgz",
-      "integrity": "sha512-KOvqGprlD84ueivhCi2flvcUwDRD20mAsE3vxQNVEI2Di9tnPGAfEu6UcrSPZbM+jG2w1oSr43hrPo0RNg6GGg==",
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.29.1.tgz",
+      "integrity": "sha512-fOHRtF9gahwJk3QVp01a/GqS4hBEZCV1oKglVVq13kcK3NeVlS4BwIFzOHDbmKzt3i0OuHG4zfRP0YoG5OF/rA==",
       "cpu": [
         "arm64"
       ],
@@ -365,10 +391,23 @@
         "linux"
       ]
     },
+    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.29.1.tgz",
+      "integrity": "sha512-5a7q3tnlbcg0OodyxcAdrrCxFi0DgXJSoOuidFUzHZ2GixZXQs6Tc3CHmlvqKAmOs5eRde+JJxeIf9DonkmYkw==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.16.1.tgz",
-      "integrity": "sha512-/gsNwtiGLqYwN4vP+EIdUC6Q6LTlpupWqokqIndvZcjn9ig/5P01WyaYCU2wvfL/2Z82jp5kX8c1mDBOvCP3zg==",
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.29.1.tgz",
+      "integrity": "sha512-9b4Mg5Yfz6mRnlSPIdROcfw1BU22FQxmfjlp/CShWwO3LilKQuMISMTtAu/bxmmrE6A902W2cZJuzx8+gJ8e9w==",
       "cpu": [
         "ppc64"
       ],
@@ -379,9 +418,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.16.1.tgz",
-      "integrity": "sha512-uU8zuGkQfGqfD9w6VRJZI4IuG4JIfNxxJgEmLMAmPVHREKGsxFVfgHy5c6CexQF2vOfgjB33OsET3Vdn2lln9A==",
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.29.1.tgz",
+      "integrity": "sha512-G5pn0NChlbRM8OJWpJFMX4/i8OEU538uiSv0P6roZcbpe/WfhEO+AT8SHVKfp8qhDQzaz7Q+1/ixMy7hBRidnQ==",
       "cpu": [
         "riscv64"
       ],
@@ -392,9 +431,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.16.1.tgz",
-      "integrity": "sha512-lsjLtDgtcGFEuBP6yrXwkRN5/wKlvUZtfbKZZu0yaoNpiBL4epgnO21osAALIspVRnl4qZgyLFd8xjCYYWgwfw==",
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.29.1.tgz",
+      "integrity": "sha512-WM9lIkNdkhVwiArmLxFXpWndFGuOka4oJOZh8EP3Vb8q5lzdSCBuhjavJsw68Q9AKDGeOOIHYzYm4ZFvmWez5g==",
       "cpu": [
         "s390x"
       ],
@@ -405,9 +444,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.16.1.tgz",
-      "integrity": "sha512-N2ZizKhUryqqrMfdCnjhJhZRgv61C6gK+hwVtCIKC8ts8J+go+vqENnGexwg21nHIOvLN5mBM8a7DI2vlyIOPg==",
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.29.1.tgz",
+      "integrity": "sha512-87xYCwb0cPGZFoGiErT1eDcssByaLX4fc0z2nRM6eMtV9njAfEE6OW3UniAoDhX4Iq5xQVpE6qO9aJbCFumKYQ==",
       "cpu": [
         "x64"
       ],
@@ -418,9 +457,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.16.1.tgz",
-      "integrity": "sha512-5ICeMxqg66FrOA2AbnBQ2TJVxfvZsKLxmof0ibvPLaYtbsJqnTUtJOofgWb46Gjd4uZcA4rdsp4JCxegzQPqCg==",
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.29.1.tgz",
+      "integrity": "sha512-xufkSNppNOdVRCEC4WKvlR1FBDyqCSCpQeMMgv9ZyXqqtKBfkw1yfGMTUTs9Qsl6WQbJnsGboWCp7pJGkeMhKA==",
       "cpu": [
         "x64"
       ],
@@ -431,9 +470,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.16.1.tgz",
-      "integrity": "sha512-1vIP6Ce02L+qWD7uZYRiFiuAJo3m9kARatWmFSnss0gZnVj2Id7OPUU9gm49JPGasgcR3xMqiH3fqBJ8t00yVg==",
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.29.1.tgz",
+      "integrity": "sha512-F2OiJ42m77lSkizZQLuC+jiZ2cgueWQL5YC9tjo3AgaEw+KJmVxHGSyQfDUoYR9cci0lAywv2Clmckzulcq6ig==",
       "cpu": [
         "arm64"
       ],
@@ -444,9 +483,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.16.1.tgz",
-      "integrity": "sha512-Y3M92DcVsT6LoP+wrKpoUWPaazaP1fzbNkp0a0ZSj5Y//+pQVfVe/tQdsYQQy7dwXR30ZfALUIc9PCh9Izir6w==",
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.29.1.tgz",
+      "integrity": "sha512-rYRe5S0FcjlOBZQHgbTKNrqxCBUmgDJem/VQTCcTnA2KCabYSWQDrytOzX7avb79cAAweNmMUb/Zw18RNd4mng==",
       "cpu": [
         "ia32"
       ],
@@ -457,9 +496,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.16.1.tgz",
-      "integrity": "sha512-x0fvpHMuF7fK5r8oZxSi8VYXkrVmRgubXpO/wcf15Lk3xZ4Jvvh5oG+u7Su1776A7XzVKZhD2eRc4t7H50gL3w==",
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.29.1.tgz",
+      "integrity": "sha512-+10CMg9vt1MoHj6x1pxyjPSMjHTIlqs8/tBztXvPAx24SKs9jwVnKqHJumlH/IzhaPUaj3T6T6wfZr8okdXaIg==",
       "cpu": [
         "x64"
       ],
@@ -732,9 +771,9 @@
       }
     },
     "node_modules/@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
       "dev": true
     },
     "node_modules/@types/fs-extra": {
@@ -1804,12 +1843,12 @@
       "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="
     },
     "node_modules/rollup": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.16.1.tgz",
-      "integrity": "sha512-5CaD3MPDlPKfhqzRvWXK96G6ELJfPZNb3LHiZxTHgDdC6jvwfGz2E8nY+9g1ONk4ttHsK1WaFP19Js4PSr1E3g==",
+      "version": "4.29.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.29.1.tgz",
+      "integrity": "sha512-RaJ45M/kmJUzSWDs1Nnd5DdV4eerC98idtUOVr6FfKcgxqvjwHmxc5upLF9qZU9EpsVzzhleFahrT3shLuJzIw==",
       "dev": true,
       "dependencies": {
-        "@types/estree": "1.0.5"
+        "@types/estree": "1.0.6"
       },
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -1819,22 +1858,25 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.16.1",
-        "@rollup/rollup-android-arm64": "4.16.1",
-        "@rollup/rollup-darwin-arm64": "4.16.1",
-        "@rollup/rollup-darwin-x64": "4.16.1",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.16.1",
-        "@rollup/rollup-linux-arm-musleabihf": "4.16.1",
-        "@rollup/rollup-linux-arm64-gnu": "4.16.1",
-        "@rollup/rollup-linux-arm64-musl": "4.16.1",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.16.1",
-        "@rollup/rollup-linux-riscv64-gnu": "4.16.1",
-        "@rollup/rollup-linux-s390x-gnu": "4.16.1",
-        "@rollup/rollup-linux-x64-gnu": "4.16.1",
-        "@rollup/rollup-linux-x64-musl": "4.16.1",
-        "@rollup/rollup-win32-arm64-msvc": "4.16.1",
-        "@rollup/rollup-win32-ia32-msvc": "4.16.1",
-        "@rollup/rollup-win32-x64-msvc": "4.16.1",
+        "@rollup/rollup-android-arm-eabi": "4.29.1",
+        "@rollup/rollup-android-arm64": "4.29.1",
+        "@rollup/rollup-darwin-arm64": "4.29.1",
+        "@rollup/rollup-darwin-x64": "4.29.1",
+        "@rollup/rollup-freebsd-arm64": "4.29.1",
+        "@rollup/rollup-freebsd-x64": "4.29.1",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.29.1",
+        "@rollup/rollup-linux-arm-musleabihf": "4.29.1",
+        "@rollup/rollup-linux-arm64-gnu": "4.29.1",
+        "@rollup/rollup-linux-arm64-musl": "4.29.1",
+        "@rollup/rollup-linux-loongarch64-gnu": "4.29.1",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.29.1",
+        "@rollup/rollup-linux-riscv64-gnu": "4.29.1",
+        "@rollup/rollup-linux-s390x-gnu": "4.29.1",
+        "@rollup/rollup-linux-x64-gnu": "4.29.1",
+        "@rollup/rollup-linux-x64-musl": "4.29.1",
+        "@rollup/rollup-win32-arm64-msvc": "4.29.1",
+        "@rollup/rollup-win32-ia32-msvc": "4.29.1",
+        "@rollup/rollup-win32-x64-msvc": "4.29.1",
         "fsevents": "~2.3.2"
       }
     },
diff --git a/package.json b/package.json
index f5eb2ca..77174b4 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^20.12.7",
     "@types/sprintf-js": "^1.1.4",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-    "rollup": "^4.16.1",
+    "rollup": "^4.29.1",
     "rollup-plugin-copy": "^3.5.0",
     "tslib": "^2.6.2",
     "typescript": "^5.4.5"

From 2edd2d3e5f180edb9e6bec0a83843c588dedaca2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 5 Jan 2025 03:13:35 +0000
Subject: [PATCH 345/402] Bump typescript from 5.4.5 to 5.7.2

Bumps [typescript](https://github.com/microsoft/TypeScript) from 5.4.5 to 5.7.2.
- [Release notes](https://github.com/microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml)
- [Commits](https://github.com/microsoft/TypeScript/compare/v5.4.5...v5.7.2)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 06ab230..01dd53f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,7 +26,7 @@
         "rollup": "^4.29.1",
         "rollup-plugin-copy": "^3.5.0",
         "tslib": "^2.6.3",
-        "typescript": "^5.4.5"
+        "typescript": "^5.7.2"
       }
     },
     "node_modules/@codemirror/state": {
@@ -2381,9 +2381,9 @@
       "dev": true
     },
     "node_modules/typescript": {
-      "version": "5.4.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
-      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz",
+      "integrity": "sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
diff --git a/package.json b/package.json
index fb6e802..ce2aa84 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "rollup": "^4.29.1",
     "rollup-plugin-copy": "^3.5.0",
     "tslib": "^2.6.3",
-    "typescript": "^5.4.5"
+    "typescript": "^5.7.2"
   },
   "dependencies": {
     "d3": "^7.9.0",

From 8d96b1fc5a59fc0d0987bb15db0b93cbc0b27a29 Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Sat, 4 Jan 2025 20:49:05 -0700
Subject: [PATCH 346/402] Update pushup count in other entry files

---
 examples/diary/2021-01-05.md               | 2 +-
 examples/diary/20210105-D.md               | 2 +-
 examples/diary/D-20210105.md               | 2 +-
 examples/diary/Jeffrey-20210105-Diary.md   | 2 +-
 examples/diary/Jeffrey-20210105-Journal.md | 2 +-
 examples/diary/Lucas-20210105-Diary.md     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/diary/2021-01-05.md b/examples/diary/2021-01-05.md
index cea72c4..fab397f 100644
--- a/examples/diary/2021-01-05.md
+++ b/examples/diary/2021-01-05.md
@@ -22,7 +22,7 @@ randchar: A
 
 #weight:72.5kg
 
-#exercise-pushup:49
+#exercise-pushup:5
 #exercise-plank:57sec
 
 #meditation
diff --git a/examples/diary/20210105-D.md b/examples/diary/20210105-D.md
index c836d81..1f8cccf 100644
--- a/examples/diary/20210105-D.md
+++ b/examples/diary/20210105-D.md
@@ -6,7 +6,7 @@ bloodpressure: 177/119
 
 #weight:70.0kg
 
-#exercise-pushup:35
+#exercise-pushup:5
 #exercise-plank:34sec
 
 #meditation
diff --git a/examples/diary/D-20210105.md b/examples/diary/D-20210105.md
index c836d81..1f8cccf 100644
--- a/examples/diary/D-20210105.md
+++ b/examples/diary/D-20210105.md
@@ -6,7 +6,7 @@ bloodpressure: 177/119
 
 #weight:70.0kg
 
-#exercise-pushup:35
+#exercise-pushup:5
 #exercise-plank:34sec
 
 #meditation
diff --git a/examples/diary/Jeffrey-20210105-Diary.md b/examples/diary/Jeffrey-20210105-Diary.md
index c836d81..1f8cccf 100644
--- a/examples/diary/Jeffrey-20210105-Diary.md
+++ b/examples/diary/Jeffrey-20210105-Diary.md
@@ -6,7 +6,7 @@ bloodpressure: 177/119
 
 #weight:70.0kg
 
-#exercise-pushup:35
+#exercise-pushup:5
 #exercise-plank:34sec
 
 #meditation
diff --git a/examples/diary/Jeffrey-20210105-Journal.md b/examples/diary/Jeffrey-20210105-Journal.md
index c836d81..1f8cccf 100644
--- a/examples/diary/Jeffrey-20210105-Journal.md
+++ b/examples/diary/Jeffrey-20210105-Journal.md
@@ -6,7 +6,7 @@ bloodpressure: 177/119
 
 #weight:70.0kg
 
-#exercise-pushup:35
+#exercise-pushup:5
 #exercise-plank:34sec
 
 #meditation
diff --git a/examples/diary/Lucas-20210105-Diary.md b/examples/diary/Lucas-20210105-Diary.md
index c836d81..1f8cccf 100644
--- a/examples/diary/Lucas-20210105-Diary.md
+++ b/examples/diary/Lucas-20210105-Diary.md
@@ -6,7 +6,7 @@ bloodpressure: 177/119
 
 #weight:70.0kg
 
-#exercise-pushup:35
+#exercise-pushup:5
 #exercise-plank:34sec
 
 #meditation

From c6278e4628fd0e9a9882c3d63f332e2f0d46c273 Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Sat, 4 Jan 2025 21:46:54 -0700
Subject: [PATCH 347/402] chore(package): update braces, cross-spawn,
 fill-range, and micromatch packages to latest versions

---
 package-lock.json | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 01dd53f..0c68c15 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -925,12 +925,12 @@
       }
     },
     "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       },
       "engines": {
         "node": ">=8"
@@ -999,9 +999,9 @@
       "dev": true
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
       "dependencies": {
         "path-key": "^3.1.0",
@@ -1455,9 +1455,9 @@
       }
     },
     "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
       "dependencies": {
         "to-regex-range": "^5.0.1"
@@ -1844,12 +1844,12 @@
       }
     },
     "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dev": true,
       "dependencies": {
-        "braces": "^3.0.2",
+        "braces": "^3.0.3",
         "picomatch": "^2.3.1"
       },
       "engines": {

From 4be36926c921549c895a65b64c74a572d3ffb623 Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Sat, 4 Jan 2025 22:56:43 -0700
Subject: [PATCH 348/402] chore(package): update @rollup/plugin-commonjs and
 @rollup/plugin-node-resolve to latest versions

---
 package-lock.json | 44 ++++++++------------------------------------
 package.json      |  4 ++--
 2 files changed, 10 insertions(+), 38 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0c68c15..19d0f76 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,8 +15,8 @@
         "sprintf-js": "^1.1.3"
       },
       "devDependencies": {
-        "@rollup/plugin-commonjs": "^26.0.1",
-        "@rollup/plugin-node-resolve": "^15.2.3",
+        "@rollup/plugin-commonjs": "^26.0.3",
+        "@rollup/plugin-node-resolve": "^15.3.1",
         "@rollup/plugin-terser": "^0.4.4",
         "@rollup/plugin-typescript": "^11.1.5",
         "@types/d3": "^7.4.3",
@@ -169,9 +169,9 @@
       }
     },
     "node_modules/@rollup/plugin-commonjs": {
-      "version": "26.0.1",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-26.0.1.tgz",
-      "integrity": "sha512-UnsKoZK6/aGIH6AdkptXhNvhaqftcjq3zZdT+LY5Ftms6JR06nADcDsYp5hTU9E2lbJUEOhdlY5J4DNTneM+jQ==",
+      "version": "26.0.3",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-26.0.3.tgz",
+      "integrity": "sha512-2BJcolt43MY+y5Tz47djHkodCC3c1VKVrBDKpVqHKpQ9z9S158kCCqB8NF6/gzxLdNlYW9abB3Ibh+kOWLp8KQ==",
       "dev": true,
       "dependencies": {
         "@rollup/pluginutils": "^5.0.1",
@@ -194,15 +194,14 @@
       }
     },
     "node_modules/@rollup/plugin-node-resolve": {
-      "version": "15.2.3",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.3.tgz",
-      "integrity": "sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ==",
+      "version": "15.3.1",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.3.1.tgz",
+      "integrity": "sha512-tgg6b91pAybXHJQMAAwW9VuWBO6Thi+q7BCNARLwSqlmsHz0XYURtGvh/AuwSADXSI4h/2uHbs7s4FzlZDGSGA==",
       "dev": true,
       "dependencies": {
         "@rollup/pluginutils": "^5.0.1",
         "@types/resolve": "1.20.2",
         "deepmerge": "^4.2.2",
-        "is-builtin-module": "^3.2.1",
         "is-module": "^1.0.0",
         "resolve": "^1.22.1"
       },
@@ -942,18 +941,6 @@
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
       "dev": true
     },
-    "node_modules/builtin-modules": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
-      "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -1682,21 +1669,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/is-builtin-module": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
-      "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==",
-      "dev": true,
-      "dependencies": {
-        "builtin-modules": "^3.3.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/is-core-module": {
       "version": "2.13.1",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
diff --git a/package.json b/package.json
index ce2aa84..fb13933 100644
--- a/package.json
+++ b/package.json
@@ -12,8 +12,8 @@
   "author": "pyrochlore",
   "license": "MIT",
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^26.0.1",
-    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-commonjs": "^26.0.3",
+    "@rollup/plugin-node-resolve": "^15.3.1",
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^11.1.5",
     "@types/d3": "^7.4.3",

From ba4642997e3b63d058ed95f6fd90116e4faaf3f2 Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Sat, 4 Jan 2025 22:57:12 -0700
Subject: [PATCH 349/402] chore(tsconfig): update target from ES6 to ES2018

---
 tsconfig.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tsconfig.json b/tsconfig.json
index 8816ba4..287beba 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,7 +4,7 @@
     "inlineSourceMap": true,
     "inlineSources": true,
     "module": "ESNext",
-    "target": "es6",
+    "target": "ES2018",
     "allowJs": true,
     "noImplicitAny": true,
     "moduleResolution": "node",

From 07ab62167aa240828fbe6eb0310feed956d47f35 Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Sat, 4 Jan 2025 22:57:28 -0700
Subject: [PATCH 350/402] fix(rollup): improve circular dependency warning
 handling

---
 rollup.config.build.mjs | 11 ++++++-----
 rollup.config.dev.mjs   | 11 ++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/rollup.config.build.mjs b/rollup.config.build.mjs
index f5313c8..d1c1841 100644
--- a/rollup.config.build.mjs
+++ b/rollup.config.build.mjs
@@ -19,11 +19,12 @@ export default {
     terser()
   ],
   onwarn: function(warning, warner){
-    if (warning.code === 'CIRCULAR_DEPENDENCY'){
-        if(warning.importer && warning.importer.startsWith('node_modules')){
-            return;
-        }
+    if (warning.code === 'CIRCULAR_DEPENDENCY') {
+      if (warning.importer && warning.importer.startsWith('node_modules')) {
+        console.warn(`(!) Circular dependency: ${warning.importer}`);
+      }
+    } else {
+      warner(warning);
     }
-    warner(warning);
   }
 };
\ No newline at end of file
diff --git a/rollup.config.dev.mjs b/rollup.config.dev.mjs
index dd2742f..588dcbd 100644
--- a/rollup.config.dev.mjs
+++ b/rollup.config.dev.mjs
@@ -23,11 +23,12 @@ export default {
     })
   ],
   onwarn: function(warning, warner){
-    if (warning.code === 'CIRCULAR_DEPENDENCY'){
-        if(warning.importer && warning.importer.startsWith('node_modules')){
-            return;
-        }
+    if (warning.code === 'CIRCULAR_DEPENDENCY') {
+      if (warning.importer && warning.importer.startsWith('node_modules')) {
+        console.warn(`(!) Circular dependency: ${warning.importer}`);
+      }
+    } else {
+      warner(warning);
     }
-    warner(warning);
   }
 };
\ No newline at end of file

From 609f6faae79fa9a4430de142a43e275fa0a7a809 Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Sat, 4 Jan 2025 22:59:43 -0700
Subject: [PATCH 351/402] fix(docs): update endDate in TestCommands.md to
 2021-01-31

---
 examples/TestCommands.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/TestCommands.md b/examples/TestCommands.md
index 24b414e..88caaf7 100644
--- a/examples/TestCommands.md
+++ b/examples/TestCommands.md
@@ -5,7 +5,7 @@ searchType: tag
 searchTarget: weight
 folder: /
 startDate:
-endDate:
+endDate: 2021-01-31
 line:
     title: "Line Chart"
     xAxisLabel: Date
@@ -18,7 +18,7 @@ searchType: tag
 searchTarget: weight
 folder: /
 startDate:
-endDate:
+endDate: 2021-01-31
 bar:
     title: "Bar Chart"
     xAxisLabel: Date
@@ -31,7 +31,7 @@ searchType: tag
 searchTarget: weight
 folder: /
 startDate:
-endDate:
+endDate: 2021-01-31
 summary:
     template: "Average value of tagName is {{average()}}"
     style: "color:white;"

From 279e6c296bdf2e4f6108736613c2cfa31ab2d348 Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Sat, 4 Jan 2025 23:14:34 -0700
Subject: [PATCH 352/402] Release 1.15.0

---
 README.md            | 9 +++++++++
 docs/ReleaseNotes.md | 8 ++++++++
 manifest.json        | 2 +-
 package.json         | 2 +-
 versions.json        | 3 ++-
 5 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 9f1267a..4cbad33 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,16 @@ This is an [Obsidian](https://obsidian.md/) plugin that helps you collect data f
 
 ## What's New
 
+Version 1.15.0
+
+- Fix: Minor spelling error in Examples.md
+- Added new expression functions - First and Last
+- Updated dates in examples to fix plots
+- Respect thresholds in scaled months
+- Update dependencies
+
 Version 1.14.0
+
 - Update dependencies
 - Prevent overlapping external labels in pie chart
 - Enable Stacked Bar Chart
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index 85f9f9a..4ddb249 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,5 +1,13 @@
 # Release Notes
 
+## 1.15.0
+
+- Fix: Minor spelling error in Examples.md
+- Added new expression functions - First and Last
+- Updated dates in examples to fix plots
+- Respect thresholds in scaled months
+- Update dependencies
+
 ## 1.14.0
 
 - Update dependencies
diff --git a/manifest.json b/manifest.json
index 9b4559e..c565b1f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "id": "obsidian-tracker",
   "name": "Tracker",
-  "version": "1.14.0",
+  "version": "1.15.0",
   "minAppVersion": "0.9.12",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "author": "pyrochlore",
diff --git a/package.json b/package.json
index fb13933..251356b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.14.0",
+  "version": "1.15.0",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
diff --git a/versions.json b/versions.json
index f665075..4c7a502 100644
--- a/versions.json
+++ b/versions.json
@@ -35,5 +35,6 @@
   "1.13.1": "0.9.12",
   "1.13.2": "0.9.12",
   "1.13.3": "0.9.12",
-  "1.14.0": "0.9.12"
+  "1.14.0": "0.9.12",
+  "1.15.0": "0.9.12"
 }

From 128a794c29e0e7bb42ccdbb7834761fecabd63c1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Jan 2025 13:17:17 +0000
Subject: [PATCH 353/402] Bump @rollup/plugin-typescript from 11.1.6 to 12.1.2

Bumps [@rollup/plugin-typescript](https://github.com/rollup/plugins/tree/HEAD/packages/typescript) from 11.1.6 to 12.1.2.
- [Changelog](https://github.com/rollup/plugins/blob/master/packages/typescript/CHANGELOG.md)
- [Commits](https://github.com/rollup/plugins/commits/typescript-v12.1.2/packages/typescript)

---
updated-dependencies:
- dependency-name: "@rollup/plugin-typescript"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 12 ++++++------
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 19d0f76..b108e07 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.14.0",
+  "version": "1.15.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "obsidian-tracker",
-      "version": "1.14.0",
+      "version": "1.15.0",
       "license": "MIT",
       "dependencies": {
         "d3": "^7.9.0",
@@ -18,7 +18,7 @@
         "@rollup/plugin-commonjs": "^26.0.3",
         "@rollup/plugin-node-resolve": "^15.3.1",
         "@rollup/plugin-terser": "^0.4.4",
-        "@rollup/plugin-typescript": "^11.1.5",
+        "@rollup/plugin-typescript": "^12.1.2",
         "@types/d3": "^7.4.3",
         "@types/node": "^20.14.11",
         "@types/sprintf-js": "^1.1.4",
@@ -240,9 +240,9 @@
       }
     },
     "node_modules/@rollup/plugin-typescript": {
-      "version": "11.1.6",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-11.1.6.tgz",
-      "integrity": "sha512-R92yOmIACgYdJ7dJ97p4K69I8gg6IEHt8M7dUBxN3W6nrO8uUxX5ixl0yU/N3aZTi8WhPuICvOHXQvF6FaykAA==",
+      "version": "12.1.2",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-12.1.2.tgz",
+      "integrity": "sha512-cdtSp154H5sv637uMr1a8OTWB0L1SWDSm1rDGiyfcGcvQ6cuTs4MDk2BVEBGysUWago4OJN4EQZqOTl/QY3Jgg==",
       "dev": true,
       "dependencies": {
         "@rollup/pluginutils": "^5.1.0",
diff --git a/package.json b/package.json
index 251356b..8462b37 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "@rollup/plugin-commonjs": "^26.0.3",
     "@rollup/plugin-node-resolve": "^15.3.1",
     "@rollup/plugin-terser": "^0.4.4",
-    "@rollup/plugin-typescript": "^11.1.5",
+    "@rollup/plugin-typescript": "^12.1.2",
     "@types/d3": "^7.4.3",
     "@types/node": "^20.14.11",
     "@types/sprintf-js": "^1.1.4",

From a6e89ea2dcfc53f255c6149baa3c3feeb0b10bce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Jan 2025 13:17:22 +0000
Subject: [PATCH 354/402] Bump @rollup/plugin-node-resolve from 15.3.1 to
 16.0.0

Bumps [@rollup/plugin-node-resolve](https://github.com/rollup/plugins/tree/HEAD/packages/node-resolve) from 15.3.1 to 16.0.0.
- [Changelog](https://github.com/rollup/plugins/blob/master/packages/node-resolve/CHANGELOG.md)
- [Commits](https://github.com/rollup/plugins/commits/commonjs-v16.0.0/packages/node-resolve)

---
updated-dependencies:
- dependency-name: "@rollup/plugin-node-resolve"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 12 ++++++------
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 19d0f76..0dba7ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.14.0",
+  "version": "1.15.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "obsidian-tracker",
-      "version": "1.14.0",
+      "version": "1.15.0",
       "license": "MIT",
       "dependencies": {
         "d3": "^7.9.0",
@@ -16,7 +16,7 @@
       },
       "devDependencies": {
         "@rollup/plugin-commonjs": "^26.0.3",
-        "@rollup/plugin-node-resolve": "^15.3.1",
+        "@rollup/plugin-node-resolve": "^16.0.0",
         "@rollup/plugin-terser": "^0.4.4",
         "@rollup/plugin-typescript": "^11.1.5",
         "@types/d3": "^7.4.3",
@@ -194,9 +194,9 @@
       }
     },
     "node_modules/@rollup/plugin-node-resolve": {
-      "version": "15.3.1",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.3.1.tgz",
-      "integrity": "sha512-tgg6b91pAybXHJQMAAwW9VuWBO6Thi+q7BCNARLwSqlmsHz0XYURtGvh/AuwSADXSI4h/2uHbs7s4FzlZDGSGA==",
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-16.0.0.tgz",
+      "integrity": "sha512-0FPvAeVUT/zdWoO0jnb/V5BlBsUSNfkIOtFHzMO4H9MOklrmQFY6FduVHKucNb/aTFxvnGhj4MNj/T1oNdDfNg==",
       "dev": true,
       "dependencies": {
         "@rollup/pluginutils": "^5.0.1",
diff --git a/package.json b/package.json
index 251356b..947ec0c 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
   "license": "MIT",
   "devDependencies": {
     "@rollup/plugin-commonjs": "^26.0.3",
-    "@rollup/plugin-node-resolve": "^15.3.1",
+    "@rollup/plugin-node-resolve": "^16.0.0",
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^11.1.5",
     "@types/d3": "^7.4.3",

From 60cdb78da99642e101d093ce32a9fd261cb1feb5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Jan 2025 13:17:27 +0000
Subject: [PATCH 355/402] Bump jsep from 1.3.8 to 1.4.0

Bumps [jsep](https://github.com/EricSmekens/jsep) from 1.3.8 to 1.4.0.
- [Release notes](https://github.com/EricSmekens/jsep/releases)
- [Changelog](https://github.com/EricSmekens/jsep/blob/master/CHANGELOG.md)
- [Commits](https://github.com/EricSmekens/jsep/compare/v1.3.8...v1.4.0)

---
updated-dependencies:
- dependency-name: jsep
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 12 ++++++------
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 19d0f76..b8c591a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,17 +1,17 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.14.0",
+  "version": "1.15.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "obsidian-tracker",
-      "version": "1.14.0",
+      "version": "1.15.0",
       "license": "MIT",
       "dependencies": {
         "d3": "^7.9.0",
         "d3-interpolate": "^3.0.1",
-        "jsep": "^1.3.8",
+        "jsep": "^1.4.0",
         "sprintf-js": "^1.1.3"
       },
       "devDependencies": {
@@ -1769,9 +1769,9 @@
       }
     },
     "node_modules/jsep": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/jsep/-/jsep-1.3.8.tgz",
-      "integrity": "sha512-qofGylTGgYj9gZFsHuyWAN4jr35eJ66qJCK4eKDnldohuUoQFbU3iZn2zjvEbd9wOAhP9Wx5DsAAduTyE1PSWQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/jsep/-/jsep-1.4.0.tgz",
+      "integrity": "sha512-B7qPcEVE3NVkmSJbaYxvv4cHkVW7DQsZz13pUMrfS8z8Q/BuShN+gcTXrUlPiGqM2/t/EEaI030bpxMqY8gMlw==",
       "engines": {
         "node": ">= 10.16.0"
       }
diff --git a/package.json b/package.json
index 251356b..875bcc1 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
   "dependencies": {
     "d3": "^7.9.0",
     "d3-interpolate": "^3.0.1",
-    "jsep": "^1.3.8",
+    "jsep": "^1.4.0",
     "sprintf-js": "^1.1.3"
   }
 }

From 44f43d04368e283ae4af4016fb8ad14800cd76e1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 14:02:50 +0000
Subject: [PATCH 356/402] Bump rollup from 4.29.1 to 4.31.0

Bumps [rollup](https://github.com/rollup/rollup) from 4.29.1 to 4.31.0.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v4.29.1...v4.31.0)

---
updated-dependencies:
- dependency-name: rollup
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 164 +++++++++++++++++++++++-----------------------
 package.json      |   2 +-
 2 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 19d0f76..7232066 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.14.0",
+  "version": "1.15.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "obsidian-tracker",
-      "version": "1.14.0",
+      "version": "1.15.0",
       "license": "MIT",
       "dependencies": {
         "d3": "^7.9.0",
@@ -23,7 +23,7 @@
         "@types/node": "^20.14.11",
         "@types/sprintf-js": "^1.1.4",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-        "rollup": "^4.29.1",
+        "rollup": "^4.31.0",
         "rollup-plugin-copy": "^3.5.0",
         "tslib": "^2.6.3",
         "typescript": "^5.7.2"
@@ -288,9 +288,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.29.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.29.1.tgz",
-      "integrity": "sha512-ssKhA8RNltTZLpG6/QNkCSge+7mBQGUqJRisZ2MDQcEGaK93QESEgWK2iOpIDZ7k9zPVkG5AS3ksvD5ZWxmItw==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.31.0.tgz",
+      "integrity": "sha512-9NrR4033uCbUBRgvLcBrJofa2KY9DzxL2UKZ1/4xA/mnTNyhZCWBuD8X3tPm1n4KxcgaraOYgrFKSgwjASfmlA==",
       "cpu": [
         "arm"
       ],
@@ -301,9 +301,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.29.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.29.1.tgz",
-      "integrity": "sha512-CaRfrV0cd+NIIcVVN/jx+hVLN+VRqnuzLRmfmlzpOzB87ajixsN/+9L5xNmkaUUvEbI5BmIKS+XTwXsHEb65Ew==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.31.0.tgz",
+      "integrity": "sha512-iBbODqT86YBFHajxxF8ebj2hwKm1k8PTBQSojSt3d1FFt1gN+xf4CowE47iN0vOSdnd+5ierMHBbu/rHc7nq5g==",
       "cpu": [
         "arm64"
       ],
@@ -314,9 +314,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.29.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.29.1.tgz",
-      "integrity": "sha512-2ORr7T31Y0Mnk6qNuwtyNmy14MunTAMx06VAPI6/Ju52W10zk1i7i5U3vlDRWjhOI5quBcrvhkCHyF76bI7kEw==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.31.0.tgz",
+      "integrity": "sha512-WHIZfXgVBX30SWuTMhlHPXTyN20AXrLH4TEeH/D0Bolvx9PjgZnn4H677PlSGvU6MKNsjCQJYczkpvBbrBnG6g==",
       "cpu": [
         "arm64"
       ],
@@ -327,9 +327,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.29.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.29.1.tgz",
-      "integrity": "sha512-j/Ej1oanzPjmN0tirRd5K2/nncAhS9W6ICzgxV+9Y5ZsP0hiGhHJXZ2JQ53iSSjj8m6cRY6oB1GMzNn2EUt6Ng==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.31.0.tgz",
+      "integrity": "sha512-hrWL7uQacTEF8gdrQAqcDy9xllQ0w0zuL1wk1HV8wKGSGbKPVjVUv/DEwT2+Asabf8Dh/As+IvfdU+H8hhzrQQ==",
       "cpu": [
         "x64"
       ],
@@ -340,9 +340,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.29.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.29.1.tgz",
-      "integrity": "sha512-91C//G6Dm/cv724tpt7nTyP+JdN12iqeXGFM1SqnljCmi5yTXriH7B1r8AD9dAZByHpKAumqP1Qy2vVNIdLZqw==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.31.0.tgz",
+      "integrity": "sha512-S2oCsZ4hJviG1QjPY1h6sVJLBI6ekBeAEssYKad1soRFv3SocsQCzX6cwnk6fID6UQQACTjeIMB+hyYrFacRew==",
       "cpu": [
         "arm64"
       ],
@@ -353,9 +353,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.29.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.29.1.tgz",
-      "integrity": "sha512-hEioiEQ9Dec2nIRoeHUP6hr1PSkXzQaCUyqBDQ9I9ik4gCXQZjJMIVzoNLBRGet+hIUb3CISMh9KXuCcWVW/8w==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.31.0.tgz",
+      "integrity": "sha512-pCANqpynRS4Jirn4IKZH4tnm2+2CqCNLKD7gAdEjzdLGbH1iO0zouHz4mxqg0uEMpO030ejJ0aA6e1PJo2xrPA==",
       "cpu": [
         "x64"
       ],
@@ -366,9 +366,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.29.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.29.1.tgz",
-      "integrity": "sha512-Py5vFd5HWYN9zxBv3WMrLAXY3yYJ6Q/aVERoeUFwiDGiMOWsMs7FokXihSOaT/PMWUty/Pj60XDQndK3eAfE6A==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.31.0.tgz",
+      "integrity": "sha512-0O8ViX+QcBd3ZmGlcFTnYXZKGbFu09EhgD27tgTdGnkcYXLat4KIsBBQeKLR2xZDCXdIBAlWLkiXE1+rJpCxFw==",
       "cpu": [
         "arm"
       ],
@@ -379,9 +379,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.29.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.29.1.tgz",
-      "integrity": "sha512-RiWpGgbayf7LUcuSNIbahr0ys2YnEERD4gYdISA06wa0i8RALrnzflh9Wxii7zQJEB2/Eh74dX4y/sHKLWp5uQ==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.31.0.tgz",
+      "integrity": "sha512-w5IzG0wTVv7B0/SwDnMYmbr2uERQp999q8FMkKG1I+j8hpPX2BYFjWe69xbhbP6J9h2gId/7ogesl9hwblFwwg==",
       "cpu": [
         "arm"
       ],
@@ -392,9 +392,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.29.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.29.1.tgz",
-      "integrity": "sha512-Z80O+taYxTQITWMjm/YqNoe9d10OX6kDh8X5/rFCMuPqsKsSyDilvfg+vd3iXIqtfmp+cnfL1UrYirkaF8SBZA==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.31.0.tgz",
+      "integrity": "sha512-JyFFshbN5xwy6fulZ8B/8qOqENRmDdEkcIMF0Zz+RsfamEW+Zabl5jAb0IozP/8UKnJ7g2FtZZPEUIAlUSX8cA==",
       "cpu": [
         "arm64"
       ],
@@ -405,9 +405,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.29.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.29.1.tgz",
-      "integrity": "sha512-fOHRtF9gahwJk3QVp01a/GqS4hBEZCV1oKglVVq13kcK3NeVlS4BwIFzOHDbmKzt3i0OuHG4zfRP0YoG5OF/rA==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.31.0.tgz",
+      "integrity": "sha512-kpQXQ0UPFeMPmPYksiBL9WS/BDiQEjRGMfklVIsA0Sng347H8W2iexch+IEwaR7OVSKtr2ZFxggt11zVIlZ25g==",
       "cpu": [
         "arm64"
       ],
@@ -418,9 +418,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-      "version": "4.29.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.29.1.tgz",
-      "integrity": "sha512-5a7q3tnlbcg0OodyxcAdrrCxFi0DgXJSoOuidFUzHZ2GixZXQs6Tc3CHmlvqKAmOs5eRde+JJxeIf9DonkmYkw==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.31.0.tgz",
+      "integrity": "sha512-pMlxLjt60iQTzt9iBb3jZphFIl55a70wexvo8p+vVFK+7ifTRookdoXX3bOsRdmfD+OKnMozKO6XM4zR0sHRrQ==",
       "cpu": [
         "loong64"
       ],
@@ -431,9 +431,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.29.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.29.1.tgz",
-      "integrity": "sha512-9b4Mg5Yfz6mRnlSPIdROcfw1BU22FQxmfjlp/CShWwO3LilKQuMISMTtAu/bxmmrE6A902W2cZJuzx8+gJ8e9w==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.31.0.tgz",
+      "integrity": "sha512-D7TXT7I/uKEuWiRkEFbed1UUYZwcJDU4vZQdPTcepK7ecPhzKOYk4Er2YR4uHKme4qDeIh6N3XrLfpuM7vzRWQ==",
       "cpu": [
         "ppc64"
       ],
@@ -444,9 +444,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.29.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.29.1.tgz",
-      "integrity": "sha512-G5pn0NChlbRM8OJWpJFMX4/i8OEU538uiSv0P6roZcbpe/WfhEO+AT8SHVKfp8qhDQzaz7Q+1/ixMy7hBRidnQ==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.31.0.tgz",
+      "integrity": "sha512-wal2Tc8O5lMBtoePLBYRKj2CImUCJ4UNGJlLwspx7QApYny7K1cUYlzQ/4IGQBLmm+y0RS7dwc3TDO/pmcneTw==",
       "cpu": [
         "riscv64"
       ],
@@ -457,9 +457,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.29.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.29.1.tgz",
-      "integrity": "sha512-WM9lIkNdkhVwiArmLxFXpWndFGuOka4oJOZh8EP3Vb8q5lzdSCBuhjavJsw68Q9AKDGeOOIHYzYm4ZFvmWez5g==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.31.0.tgz",
+      "integrity": "sha512-O1o5EUI0+RRMkK9wiTVpk2tyzXdXefHtRTIjBbmFREmNMy7pFeYXCFGbhKFwISA3UOExlo5GGUuuj3oMKdK6JQ==",
       "cpu": [
         "s390x"
       ],
@@ -470,9 +470,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.29.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.29.1.tgz",
-      "integrity": "sha512-87xYCwb0cPGZFoGiErT1eDcssByaLX4fc0z2nRM6eMtV9njAfEE6OW3UniAoDhX4Iq5xQVpE6qO9aJbCFumKYQ==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.31.0.tgz",
+      "integrity": "sha512-zSoHl356vKnNxwOWnLd60ixHNPRBglxpv2g7q0Cd3Pmr561gf0HiAcUBRL3S1vPqRC17Zo2CX/9cPkqTIiai1g==",
       "cpu": [
         "x64"
       ],
@@ -483,9 +483,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.29.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.29.1.tgz",
-      "integrity": "sha512-xufkSNppNOdVRCEC4WKvlR1FBDyqCSCpQeMMgv9ZyXqqtKBfkw1yfGMTUTs9Qsl6WQbJnsGboWCp7pJGkeMhKA==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.31.0.tgz",
+      "integrity": "sha512-ypB/HMtcSGhKUQNiFwqgdclWNRrAYDH8iMYH4etw/ZlGwiTVxBz2tDrGRrPlfZu6QjXwtd+C3Zib5pFqID97ZA==",
       "cpu": [
         "x64"
       ],
@@ -496,9 +496,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.29.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.29.1.tgz",
-      "integrity": "sha512-F2OiJ42m77lSkizZQLuC+jiZ2cgueWQL5YC9tjo3AgaEw+KJmVxHGSyQfDUoYR9cci0lAywv2Clmckzulcq6ig==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.31.0.tgz",
+      "integrity": "sha512-JuhN2xdI/m8Hr+aVO3vspO7OQfUFO6bKLIRTAy0U15vmWjnZDLrEgCZ2s6+scAYaQVpYSh9tZtRijApw9IXyMw==",
       "cpu": [
         "arm64"
       ],
@@ -509,9 +509,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.29.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.29.1.tgz",
-      "integrity": "sha512-rYRe5S0FcjlOBZQHgbTKNrqxCBUmgDJem/VQTCcTnA2KCabYSWQDrytOzX7avb79cAAweNmMUb/Zw18RNd4mng==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.31.0.tgz",
+      "integrity": "sha512-U1xZZXYkvdf5MIWmftU8wrM5PPXzyaY1nGCI4KI4BFfoZxHamsIe+BtnPLIvvPykvQWlVbqUXdLa4aJUuilwLQ==",
       "cpu": [
         "ia32"
       ],
@@ -522,9 +522,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.29.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.29.1.tgz",
-      "integrity": "sha512-+10CMg9vt1MoHj6x1pxyjPSMjHTIlqs8/tBztXvPAx24SKs9jwVnKqHJumlH/IzhaPUaj3T6T6wfZr8okdXaIg==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.31.0.tgz",
+      "integrity": "sha512-ul8rnCsUumNln5YWwz0ted2ZHFhzhRRnkpBZ+YRuHoRAlUji9KChpOUOndY7uykrPEPXVbHLlsdo6v5yXo/TXw==",
       "cpu": [
         "x64"
       ],
@@ -2008,9 +2008,9 @@
       "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="
     },
     "node_modules/rollup": {
-      "version": "4.29.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.29.1.tgz",
-      "integrity": "sha512-RaJ45M/kmJUzSWDs1Nnd5DdV4eerC98idtUOVr6FfKcgxqvjwHmxc5upLF9qZU9EpsVzzhleFahrT3shLuJzIw==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.31.0.tgz",
+      "integrity": "sha512-9cCE8P4rZLx9+PjoyqHLs31V9a9Vpvfo4qNcs6JCiGWYhw2gijSetFbH6SSy1whnkgcefnUwr8sad7tgqsGvnw==",
       "dev": true,
       "dependencies": {
         "@types/estree": "1.0.6"
@@ -2023,25 +2023,25 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.29.1",
-        "@rollup/rollup-android-arm64": "4.29.1",
-        "@rollup/rollup-darwin-arm64": "4.29.1",
-        "@rollup/rollup-darwin-x64": "4.29.1",
-        "@rollup/rollup-freebsd-arm64": "4.29.1",
-        "@rollup/rollup-freebsd-x64": "4.29.1",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.29.1",
-        "@rollup/rollup-linux-arm-musleabihf": "4.29.1",
-        "@rollup/rollup-linux-arm64-gnu": "4.29.1",
-        "@rollup/rollup-linux-arm64-musl": "4.29.1",
-        "@rollup/rollup-linux-loongarch64-gnu": "4.29.1",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.29.1",
-        "@rollup/rollup-linux-riscv64-gnu": "4.29.1",
-        "@rollup/rollup-linux-s390x-gnu": "4.29.1",
-        "@rollup/rollup-linux-x64-gnu": "4.29.1",
-        "@rollup/rollup-linux-x64-musl": "4.29.1",
-        "@rollup/rollup-win32-arm64-msvc": "4.29.1",
-        "@rollup/rollup-win32-ia32-msvc": "4.29.1",
-        "@rollup/rollup-win32-x64-msvc": "4.29.1",
+        "@rollup/rollup-android-arm-eabi": "4.31.0",
+        "@rollup/rollup-android-arm64": "4.31.0",
+        "@rollup/rollup-darwin-arm64": "4.31.0",
+        "@rollup/rollup-darwin-x64": "4.31.0",
+        "@rollup/rollup-freebsd-arm64": "4.31.0",
+        "@rollup/rollup-freebsd-x64": "4.31.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.31.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.31.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.31.0",
+        "@rollup/rollup-linux-arm64-musl": "4.31.0",
+        "@rollup/rollup-linux-loongarch64-gnu": "4.31.0",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.31.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.31.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.31.0",
+        "@rollup/rollup-linux-x64-gnu": "4.31.0",
+        "@rollup/rollup-linux-x64-musl": "4.31.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.31.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.31.0",
+        "@rollup/rollup-win32-x64-msvc": "4.31.0",
         "fsevents": "~2.3.2"
       }
     },
diff --git a/package.json b/package.json
index 251356b..a0aed21 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^20.14.11",
     "@types/sprintf-js": "^1.1.4",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-    "rollup": "^4.29.1",
+    "rollup": "^4.31.0",
     "rollup-plugin-copy": "^3.5.0",
     "tslib": "^2.6.3",
     "typescript": "^5.7.2"

From e0df3b10bdbbd377398275eac7d37489b7af7172 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 21:23:40 +0000
Subject: [PATCH 357/402] Bump tslib from 2.6.3 to 2.8.1

Bumps [tslib](https://github.com/Microsoft/tslib) from 2.6.3 to 2.8.1.
- [Release notes](https://github.com/Microsoft/tslib/releases)
- [Commits](https://github.com/Microsoft/tslib/compare/v2.6.3...v2.8.1)

---
updated-dependencies:
- dependency-name: tslib
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 11 ++++++-----
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2961eda..1f3c997 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,7 +25,7 @@
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
         "rollup": "^4.31.0",
         "rollup-plugin-copy": "^3.5.0",
-        "tslib": "^2.6.3",
+        "tslib": "^2.8.1",
         "typescript": "^5.7.2"
       }
     },
@@ -2347,10 +2347,11 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
-      "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==",
-      "dev": true
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "dev": true,
+      "license": "0BSD"
     },
     "node_modules/typescript": {
       "version": "5.7.2",
diff --git a/package.json b/package.json
index 4f34e49..692ee55 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
     "rollup": "^4.31.0",
     "rollup-plugin-copy": "^3.5.0",
-    "tslib": "^2.6.3",
+    "tslib": "^2.8.1",
     "typescript": "^5.7.2"
   },
   "dependencies": {

From 0c788e0b5118e649e8a225647dbdb07e2505bf01 Mon Sep 17 00:00:00 2001
From: Lokesh-Bharath <bharathchandra.putnam@gmail.com>
Date: Wed, 12 Feb 2025 09:27:06 -0500
Subject: [PATCH 358/402] Fix issue #298: Added DatasetName as title for
 calendar in annotation mode

---
 src/month.ts | 65 ++++++++++++++++++++++++----------------------------
 1 file changed, 30 insertions(+), 35 deletions(-)

diff --git a/src/month.ts b/src/month.ts
index a1fa232..b9ed553 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -300,41 +300,36 @@ function renderMonthHeader(
         datasetName,
         "tracker-month-title-rotator"
     );
-    if (
-        monthInfo.mode === "circle" ||
-        (monthInfo.mode === "annotation" &&
-            !monthInfo.showAnnotationOfAllTargets)
-    ) {
-        let datasetRotator = headerGroup
-            .append("text")
-            .text(datasetName)
-            .attr(
-                "transform",
-                "translate(" +
-                    3.5 * cellSize +
-                    "," +
-                    datasetNameSize.height +
-                    ")"
-            )
-            .attr("class", "tracker-month-title-rotator")
-            .style("cursor", "pointer")
-            .on("click", function (event: any) {
-                // show next target
-                if (toNextDataset(renderInfo, monthInfo)) {
-                    // clear circles
-                    clearSelection(chartElements, monthInfo);
-
-                    refresh(
-                        canvas,
-                        chartElements,
-                        renderInfo,
-                        monthInfo,
-                        curMonthDate
-                    );
-                }
-            });
-        chartElements["rotator"] = datasetRotator;
-    }
+    
+    let datasetRotator = headerGroup
+        .append("text")
+        .text(datasetName)
+        .attr(
+            "transform",
+            "translate(" +
+                3.5 * cellSize +
+                "," +
+                datasetNameSize.height +
+                ")"
+        )
+        .attr("class", "tracker-month-title-rotator")
+        .style("cursor", "pointer")
+        .on("click", function (event: any) {
+            // show next target
+            if (toNextDataset(renderInfo, monthInfo)) {
+                // clear circles
+                clearSelection(chartElements, monthInfo);
+
+                refresh(
+                    canvas,
+                    chartElements,
+                    renderInfo,
+                    monthInfo,
+                    curMonthDate
+                );
+            }
+        });
+    chartElements["rotator"] = datasetRotator;
 
     // value monitor
     let monitorTextSize = helper.measureTextSize(

From ba1a7a229c42a9e36765547efffe657187cb5dd6 Mon Sep 17 00:00:00 2001
From: Lokesh-Bharath <bharathchandra.putnam@gmail.com>
Date: Sun, 16 Feb 2025 17:17:12 -0500
Subject: [PATCH 359/402] Resolve scaling issue when navigating between monthly
 views (#169)

---
 src/month.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/month.ts b/src/month.ts
index a1fa232..baaf7a0 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -1088,6 +1088,8 @@ function refresh(
     );
 
     renderMonthDays(canvas, chartElements, renderInfo, monthInfo, curMonthDate);
+
+    setChartScale(canvas, chartElements, renderInfo);
 }
 
 export function renderMonth(

From d8680cefe8040c15dc055590230ab75123343163 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Feb 2025 14:16:54 +0000
Subject: [PATCH 360/402] Bump @types/node from 20.14.11 to 22.13.4

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.14.11 to 22.13.4.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 20 +++++++++++---------
 package.json      |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1f3c997..a5ea75f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,7 @@
         "@rollup/plugin-terser": "^0.4.4",
         "@rollup/plugin-typescript": "^11.1.5",
         "@types/d3": "^7.4.3",
-        "@types/node": "^20.14.11",
+        "@types/node": "^22.13.4",
         "@types/sprintf-js": "^1.1.4",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
         "rollup": "^4.31.0",
@@ -834,12 +834,13 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.14.11",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.11.tgz",
-      "integrity": "sha512-kprQpL8MMeszbz6ojB5/tU8PLN4kesnN8Gjzw349rDlNgsSzg90lAVj3llK99Dh7JON+t9AuscPPFW6mPbTnSA==",
+      "version": "22.13.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.4.tgz",
+      "integrity": "sha512-ywP2X0DYtX3y08eFVx5fNIw7/uIv8hYUKgXoK8oayJlLnKcRfEYCxWMVE1XagUdVtCJlZT1AU4LXEABW+L1Peg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~6.20.0"
       }
     },
     "node_modules/@types/resolve": {
@@ -2367,10 +2368,11 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "6.20.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
+      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/universalify": {
       "version": "0.1.2",
diff --git a/package.json b/package.json
index 692ee55..ead670f 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^11.1.5",
     "@types/d3": "^7.4.3",
-    "@types/node": "^20.14.11",
+    "@types/node": "^22.13.4",
     "@types/sprintf-js": "^1.1.4",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
     "rollup": "^4.31.0",

From 7908592d929a32dd0c3cba8759ce9ca585924458 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Feb 2025 03:08:47 +0000
Subject: [PATCH 361/402] Bump rollup from 4.31.0 to 4.34.8

Bumps [rollup](https://github.com/rollup/rollup) from 4.31.0 to 4.34.8.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v4.31.0...v4.34.8)

---
updated-dependencies:
- dependency-name: rollup
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 180 +++++++++++++++++++++++++---------------------
 package.json      |   2 +-
 2 files changed, 101 insertions(+), 81 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a5ea75f..5de7275 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,7 +23,7 @@
         "@types/node": "^22.13.4",
         "@types/sprintf-js": "^1.1.4",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-        "rollup": "^4.31.0",
+        "rollup": "^4.34.8",
         "rollup-plugin-copy": "^3.5.0",
         "tslib": "^2.8.1",
         "typescript": "^5.7.2"
@@ -288,247 +288,266 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.31.0.tgz",
-      "integrity": "sha512-9NrR4033uCbUBRgvLcBrJofa2KY9DzxL2UKZ1/4xA/mnTNyhZCWBuD8X3tPm1n4KxcgaraOYgrFKSgwjASfmlA==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.34.8.tgz",
+      "integrity": "sha512-q217OSE8DTp8AFHuNHXo0Y86e1wtlfVrXiAlwkIvGRQv9zbc6mE3sjIVfwI8sYUyNxwOg0j/Vm1RKM04JcWLJw==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.31.0.tgz",
-      "integrity": "sha512-iBbODqT86YBFHajxxF8ebj2hwKm1k8PTBQSojSt3d1FFt1gN+xf4CowE47iN0vOSdnd+5ierMHBbu/rHc7nq5g==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.34.8.tgz",
+      "integrity": "sha512-Gigjz7mNWaOL9wCggvoK3jEIUUbGul656opstjaUSGC3eT0BM7PofdAJaBfPFWWkXNVAXbaQtC99OCg4sJv70Q==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.31.0.tgz",
-      "integrity": "sha512-WHIZfXgVBX30SWuTMhlHPXTyN20AXrLH4TEeH/D0Bolvx9PjgZnn4H677PlSGvU6MKNsjCQJYczkpvBbrBnG6g==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.34.8.tgz",
+      "integrity": "sha512-02rVdZ5tgdUNRxIUrFdcMBZQoaPMrxtwSb+/hOfBdqkatYHR3lZ2A2EGyHq2sGOd0Owk80oV3snlDASC24He3Q==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.31.0.tgz",
-      "integrity": "sha512-hrWL7uQacTEF8gdrQAqcDy9xllQ0w0zuL1wk1HV8wKGSGbKPVjVUv/DEwT2+Asabf8Dh/As+IvfdU+H8hhzrQQ==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.34.8.tgz",
+      "integrity": "sha512-qIP/elwR/tq/dYRx3lgwK31jkZvMiD6qUtOycLhTzCvrjbZ3LjQnEM9rNhSGpbLXVJYQ3rq39A6Re0h9tU2ynw==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ]
     },
     "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.31.0.tgz",
-      "integrity": "sha512-S2oCsZ4hJviG1QjPY1h6sVJLBI6ekBeAEssYKad1soRFv3SocsQCzX6cwnk6fID6UQQACTjeIMB+hyYrFacRew==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.34.8.tgz",
+      "integrity": "sha512-IQNVXL9iY6NniYbTaOKdrlVP3XIqazBgJOVkddzJlqnCpRi/yAeSOa8PLcECFSQochzqApIOE1GHNu3pCz+BDA==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
       ]
     },
     "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.31.0.tgz",
-      "integrity": "sha512-pCANqpynRS4Jirn4IKZH4tnm2+2CqCNLKD7gAdEjzdLGbH1iO0zouHz4mxqg0uEMpO030ejJ0aA6e1PJo2xrPA==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.34.8.tgz",
+      "integrity": "sha512-TYXcHghgnCqYFiE3FT5QwXtOZqDj5GmaFNTNt3jNC+vh22dc/ukG2cG+pi75QO4kACohZzidsq7yKTKwq/Jq7Q==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.31.0.tgz",
-      "integrity": "sha512-0O8ViX+QcBd3ZmGlcFTnYXZKGbFu09EhgD27tgTdGnkcYXLat4KIsBBQeKLR2xZDCXdIBAlWLkiXE1+rJpCxFw==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.34.8.tgz",
+      "integrity": "sha512-A4iphFGNkWRd+5m3VIGuqHnG3MVnqKe7Al57u9mwgbyZ2/xF9Jio72MaY7xxh+Y87VAHmGQr73qoKL9HPbXj1g==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.31.0.tgz",
-      "integrity": "sha512-w5IzG0wTVv7B0/SwDnMYmbr2uERQp999q8FMkKG1I+j8hpPX2BYFjWe69xbhbP6J9h2gId/7ogesl9hwblFwwg==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.34.8.tgz",
+      "integrity": "sha512-S0lqKLfTm5u+QTxlFiAnb2J/2dgQqRy/XvziPtDd1rKZFXHTyYLoVL58M/XFwDI01AQCDIevGLbQrMAtdyanpA==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.31.0.tgz",
-      "integrity": "sha512-JyFFshbN5xwy6fulZ8B/8qOqENRmDdEkcIMF0Zz+RsfamEW+Zabl5jAb0IozP/8UKnJ7g2FtZZPEUIAlUSX8cA==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.34.8.tgz",
+      "integrity": "sha512-jpz9YOuPiSkL4G4pqKrus0pn9aYwpImGkosRKwNi+sJSkz+WU3anZe6hi73StLOQdfXYXC7hUfsQlTnjMd3s1A==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.31.0.tgz",
-      "integrity": "sha512-kpQXQ0UPFeMPmPYksiBL9WS/BDiQEjRGMfklVIsA0Sng347H8W2iexch+IEwaR7OVSKtr2ZFxggt11zVIlZ25g==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.34.8.tgz",
+      "integrity": "sha512-KdSfaROOUJXgTVxJNAZ3KwkRc5nggDk+06P6lgi1HLv1hskgvxHUKZ4xtwHkVYJ1Rep4GNo+uEfycCRRxht7+Q==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.31.0.tgz",
-      "integrity": "sha512-pMlxLjt60iQTzt9iBb3jZphFIl55a70wexvo8p+vVFK+7ifTRookdoXX3bOsRdmfD+OKnMozKO6XM4zR0sHRrQ==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.34.8.tgz",
+      "integrity": "sha512-NyF4gcxwkMFRjgXBM6g2lkT58OWztZvw5KkV2K0qqSnUEqCVcqdh2jN4gQrTn/YUpAcNKyFHfoOZEer9nwo6uQ==",
       "cpu": [
         "loong64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.31.0.tgz",
-      "integrity": "sha512-D7TXT7I/uKEuWiRkEFbed1UUYZwcJDU4vZQdPTcepK7ecPhzKOYk4Er2YR4uHKme4qDeIh6N3XrLfpuM7vzRWQ==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.34.8.tgz",
+      "integrity": "sha512-LMJc999GkhGvktHU85zNTDImZVUCJ1z/MbAJTnviiWmmjyckP5aQsHtcujMjpNdMZPT2rQEDBlJfubhs3jsMfw==",
       "cpu": [
         "ppc64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.31.0.tgz",
-      "integrity": "sha512-wal2Tc8O5lMBtoePLBYRKj2CImUCJ4UNGJlLwspx7QApYny7K1cUYlzQ/4IGQBLmm+y0RS7dwc3TDO/pmcneTw==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.34.8.tgz",
+      "integrity": "sha512-xAQCAHPj8nJq1PI3z8CIZzXuXCstquz7cIOL73HHdXiRcKk8Ywwqtx2wrIy23EcTn4aZ2fLJNBB8d0tQENPCmw==",
       "cpu": [
         "riscv64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.31.0.tgz",
-      "integrity": "sha512-O1o5EUI0+RRMkK9wiTVpk2tyzXdXefHtRTIjBbmFREmNMy7pFeYXCFGbhKFwISA3UOExlo5GGUuuj3oMKdK6JQ==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.8.tgz",
+      "integrity": "sha512-DdePVk1NDEuc3fOe3dPPTb+rjMtuFw89gw6gVWxQFAuEqqSdDKnrwzZHrUYdac7A7dXl9Q2Vflxpme15gUWQFA==",
       "cpu": [
         "s390x"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.31.0.tgz",
-      "integrity": "sha512-zSoHl356vKnNxwOWnLd60ixHNPRBglxpv2g7q0Cd3Pmr561gf0HiAcUBRL3S1vPqRC17Zo2CX/9cPkqTIiai1g==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.8.tgz",
+      "integrity": "sha512-8y7ED8gjxITUltTUEJLQdgpbPh1sUQ0kMTmufRF/Ns5tI9TNMNlhWtmPKKHCU0SilX+3MJkZ0zERYYGIVBYHIA==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.31.0.tgz",
-      "integrity": "sha512-ypB/HMtcSGhKUQNiFwqgdclWNRrAYDH8iMYH4etw/ZlGwiTVxBz2tDrGRrPlfZu6QjXwtd+C3Zib5pFqID97ZA==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.8.tgz",
+      "integrity": "sha512-SCXcP0ZpGFIe7Ge+McxY5zKxiEI5ra+GT3QRxL0pMMtxPfpyLAKleZODi1zdRHkz5/BhueUrYtYVgubqe9JBNQ==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.31.0.tgz",
-      "integrity": "sha512-JuhN2xdI/m8Hr+aVO3vspO7OQfUFO6bKLIRTAy0U15vmWjnZDLrEgCZ2s6+scAYaQVpYSh9tZtRijApw9IXyMw==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.34.8.tgz",
+      "integrity": "sha512-YHYsgzZgFJzTRbth4h7Or0m5O74Yda+hLin0irAIobkLQFRQd1qWmnoVfwmKm9TXIZVAD0nZ+GEb2ICicLyCnQ==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.31.0.tgz",
-      "integrity": "sha512-U1xZZXYkvdf5MIWmftU8wrM5PPXzyaY1nGCI4KI4BFfoZxHamsIe+BtnPLIvvPykvQWlVbqUXdLa4aJUuilwLQ==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.34.8.tgz",
+      "integrity": "sha512-r3NRQrXkHr4uWy5TOjTpTYojR9XmF0j/RYgKCef+Ag46FWUTltm5ziticv8LdNsDMehjJ543x/+TJAek/xBA2w==",
       "cpu": [
         "ia32"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.31.0.tgz",
-      "integrity": "sha512-ul8rnCsUumNln5YWwz0ted2ZHFhzhRRnkpBZ+YRuHoRAlUji9KChpOUOndY7uykrPEPXVbHLlsdo6v5yXo/TXw==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.34.8.tgz",
+      "integrity": "sha512-U0FaE5O1BCpZSeE6gBl3c5ObhePQSfk9vDRToMmTkbhCOgW4jqvtS5LGyQ76L1fH8sM0keRp4uDTsbjiUyjk0g==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -2009,10 +2028,11 @@
       "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="
     },
     "node_modules/rollup": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.31.0.tgz",
-      "integrity": "sha512-9cCE8P4rZLx9+PjoyqHLs31V9a9Vpvfo4qNcs6JCiGWYhw2gijSetFbH6SSy1whnkgcefnUwr8sad7tgqsGvnw==",
+      "version": "4.34.8",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.34.8.tgz",
+      "integrity": "sha512-489gTVMzAYdiZHFVA/ig/iYFllCcWFHMvUHI1rpFmkoUtRlQxqh6/yiNqnYibjMZ2b/+FUQwldG+aLsEt6bglQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/estree": "1.0.6"
       },
@@ -2024,25 +2044,25 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.31.0",
-        "@rollup/rollup-android-arm64": "4.31.0",
-        "@rollup/rollup-darwin-arm64": "4.31.0",
-        "@rollup/rollup-darwin-x64": "4.31.0",
-        "@rollup/rollup-freebsd-arm64": "4.31.0",
-        "@rollup/rollup-freebsd-x64": "4.31.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.31.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.31.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.31.0",
-        "@rollup/rollup-linux-arm64-musl": "4.31.0",
-        "@rollup/rollup-linux-loongarch64-gnu": "4.31.0",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.31.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.31.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.31.0",
-        "@rollup/rollup-linux-x64-gnu": "4.31.0",
-        "@rollup/rollup-linux-x64-musl": "4.31.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.31.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.31.0",
-        "@rollup/rollup-win32-x64-msvc": "4.31.0",
+        "@rollup/rollup-android-arm-eabi": "4.34.8",
+        "@rollup/rollup-android-arm64": "4.34.8",
+        "@rollup/rollup-darwin-arm64": "4.34.8",
+        "@rollup/rollup-darwin-x64": "4.34.8",
+        "@rollup/rollup-freebsd-arm64": "4.34.8",
+        "@rollup/rollup-freebsd-x64": "4.34.8",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.34.8",
+        "@rollup/rollup-linux-arm-musleabihf": "4.34.8",
+        "@rollup/rollup-linux-arm64-gnu": "4.34.8",
+        "@rollup/rollup-linux-arm64-musl": "4.34.8",
+        "@rollup/rollup-linux-loongarch64-gnu": "4.34.8",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.34.8",
+        "@rollup/rollup-linux-riscv64-gnu": "4.34.8",
+        "@rollup/rollup-linux-s390x-gnu": "4.34.8",
+        "@rollup/rollup-linux-x64-gnu": "4.34.8",
+        "@rollup/rollup-linux-x64-musl": "4.34.8",
+        "@rollup/rollup-win32-arm64-msvc": "4.34.8",
+        "@rollup/rollup-win32-ia32-msvc": "4.34.8",
+        "@rollup/rollup-win32-x64-msvc": "4.34.8",
         "fsevents": "~2.3.2"
       }
     },
diff --git a/package.json b/package.json
index ead670f..c35c8fd 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^22.13.4",
     "@types/sprintf-js": "^1.1.4",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-    "rollup": "^4.31.0",
+    "rollup": "^4.34.8",
     "rollup-plugin-copy": "^3.5.0",
     "tslib": "^2.8.1",
     "typescript": "^5.7.2"

From cab3605f2df277c2f6fd551bd1ad708a68bced5e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Feb 2025 03:08:47 +0000
Subject: [PATCH 362/402] Bump typescript from 5.7.2 to 5.7.3

Bumps [typescript](https://github.com/microsoft/TypeScript) from 5.7.2 to 5.7.3.
- [Release notes](https://github.com/microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml)
- [Commits](https://github.com/microsoft/TypeScript/compare/v5.7.2...v5.7.3)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 9 +++++----
 package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a5ea75f..bd73464 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,7 +26,7 @@
         "rollup": "^4.31.0",
         "rollup-plugin-copy": "^3.5.0",
         "tslib": "^2.8.1",
-        "typescript": "^5.7.2"
+        "typescript": "^5.7.3"
       }
     },
     "node_modules/@codemirror/state": {
@@ -2355,10 +2355,11 @@
       "license": "0BSD"
     },
     "node_modules/typescript": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz",
-      "integrity": "sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==",
+      "version": "5.7.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz",
+      "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
       "dev": true,
+      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
diff --git a/package.json b/package.json
index ead670f..6b97b24 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "rollup": "^4.31.0",
     "rollup-plugin-copy": "^3.5.0",
     "tslib": "^2.8.1",
-    "typescript": "^5.7.2"
+    "typescript": "^5.7.3"
   },
   "dependencies": {
     "d3": "^7.9.0",

From 2e9421e033e71d5a78765722fe032c0c202328a2 Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Thu, 20 Feb 2025 20:35:01 -0700
Subject: [PATCH 363/402] Fix lock file

---
 package-lock.json | 624 +++++++++++++++++++++++++++++++---------------
 1 file changed, 426 insertions(+), 198 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ffeb8e0..0b00ec5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -30,20 +30,25 @@
       }
     },
     "node_modules/@codemirror/state": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.4.0.tgz",
-      "integrity": "sha512-hm8XshYj5Fo30Bb922QX9hXB/bxOAVH+qaqHBzw5TKa72vOeslyGwd4X8M0c1dJ9JqxlaMceOQ8RsL9tC7gU0A==",
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.2.tgz",
+      "integrity": "sha512-FVqsPqtPWKVVL3dPSxy8wEF/ymIEuVzF1PK3VbUgrxXpJUSHQWWZz4JMToquRxnkw+36LTamCZG2iua2Ptq0fA==",
       "dev": true,
-      "peer": true
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@marijn/find-cluster-break": "^1.0.0"
+      }
     },
     "node_modules/@codemirror/view": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.23.0.tgz",
-      "integrity": "sha512-/51px9N4uW8NpuWkyUX+iam5+PM6io2fm+QmRnzwqBy5v/pwGg9T0kILFtYeum8hjuvENtgsGNKluOfqIICmeQ==",
+      "version": "6.36.3",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.36.3.tgz",
+      "integrity": "sha512-N2bilM47QWC8Hnx0rMdDxO2x2ImJ1FvZWXubwKgjeoOrWwEiFrtpA7SFHcuZ+o2Ze2VzbkgbzWVj4+V18LVkeg==",
       "dev": true,
+      "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@codemirror/state": "^6.4.0",
+        "@codemirror/state": "^6.5.0",
         "style-mod": "^4.1.0",
         "w3c-keyname": "^2.2.4"
       }
@@ -53,6 +58,7 @@
       "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
       "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "string-width": "^5.1.2",
         "string-width-cjs": "npm:string-width@^4.2.0",
@@ -66,68 +72,83 @@
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
-      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
+      "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/set-array": "^1.2.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/trace-mapping": "^0.3.24"
       },
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
-      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/set-array": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/source-map": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz",
-      "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
+      "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25"
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
-      "dev": true
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.22",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.22.tgz",
-      "integrity": "sha512-Wf963MzWtA2sjrNt+g18IAln9lKnlRp+K2eH4jjIoF1wYeq3aMREpG09xhlhdzS0EjwU7qmUJYangWa+151vZw==",
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
+    "node_modules/@marijn/find-cluster-break": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz",
+      "integrity": "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
       "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "2.0.5",
         "run-parallel": "^1.1.9"
@@ -141,6 +162,7 @@
       "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
       "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
@@ -150,6 +172,7 @@
       "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
       "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
@@ -163,6 +186,7 @@
       "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
       "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "engines": {
         "node": ">=14"
@@ -173,6 +197,7 @@
       "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-26.0.3.tgz",
       "integrity": "sha512-2BJcolt43MY+y5Tz47djHkodCC3c1VKVrBDKpVqHKpQ9z9S158kCCqB8NF6/gzxLdNlYW9abB3Ibh+kOWLp8KQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@rollup/pluginutils": "^5.0.1",
         "commondir": "^1.0.1",
@@ -198,6 +223,7 @@
       "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-16.0.0.tgz",
       "integrity": "sha512-0FPvAeVUT/zdWoO0jnb/V5BlBsUSNfkIOtFHzMO4H9MOklrmQFY6FduVHKucNb/aTFxvnGhj4MNj/T1oNdDfNg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@rollup/pluginutils": "^5.0.1",
         "@types/resolve": "1.20.2",
@@ -222,6 +248,7 @@
       "resolved": "https://registry.npmjs.org/@rollup/plugin-terser/-/plugin-terser-0.4.4.tgz",
       "integrity": "sha512-XHeJC5Bgvs8LfukDwWZp7yeqin6ns8RTl2B9avbejt6tZqsqvVoWI7ZTQrcNsfKEDWBTnTxM8nMDkO2IFFbd0A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "serialize-javascript": "^6.0.1",
         "smob": "^1.0.0",
@@ -244,6 +271,7 @@
       "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-12.1.2.tgz",
       "integrity": "sha512-cdtSp154H5sv637uMr1a8OTWB0L1SWDSm1rDGiyfcGcvQ6cuTs4MDk2BVEBGysUWago4OJN4EQZqOTl/QY3Jgg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@rollup/pluginutils": "^5.1.0",
         "resolve": "^1.22.1"
@@ -266,14 +294,15 @@
       }
     },
     "node_modules/@rollup/pluginutils": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz",
-      "integrity": "sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==",
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.4.tgz",
+      "integrity": "sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/estree": "^1.0.0",
         "estree-walker": "^2.0.2",
-        "picomatch": "^2.3.1"
+        "picomatch": "^4.0.2"
       },
       "engines": {
         "node": ">=14.0.0"
@@ -558,6 +587,7 @@
       "resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-5.60.8.tgz",
       "integrity": "sha512-VjFgDF/eB+Aklcy15TtOTLQeMjTo07k7KAjql8OK5Dirr7a6sJY4T1uVBDuTVG9VEmn1uUsohOpYnVfgC6/jyw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/tern": "*"
       }
@@ -567,6 +597,7 @@
       "resolved": "https://registry.npmjs.org/@types/d3/-/d3-7.4.3.tgz",
       "integrity": "sha512-lZXZ9ckh5R8uiFVt8ogUNf+pIrK4EsWrx2Np75WvF/eTpJ0FMHNhjXk8CKEx/+gpHbNQyJWehbFaTvqmHWB3ww==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-array": "*",
         "@types/d3-axis": "*",
@@ -604,13 +635,15 @@
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.1.tgz",
       "integrity": "sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-axis": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/@types/d3-axis/-/d3-axis-3.0.6.tgz",
       "integrity": "sha512-pYeijfZuBd87T0hGn0FO1vQ/cgLk6E1ALJjfkC0oJ8cbwkZl3TpgS8bVBLZN+2jjGgg38epgxb2zmoGtSfvgMw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-selection": "*"
       }
@@ -620,6 +653,7 @@
       "resolved": "https://registry.npmjs.org/@types/d3-brush/-/d3-brush-3.0.6.tgz",
       "integrity": "sha512-nH60IZNNxEcrh6L1ZSMNA28rj27ut/2ZmI3r96Zd+1jrZD++zD3LsMIjWlvg4AYrHn/Pqz4CF3veCxGjtbqt7A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-selection": "*"
       }
@@ -628,19 +662,22 @@
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/@types/d3-chord/-/d3-chord-3.0.6.tgz",
       "integrity": "sha512-LFYWWd8nwfwEmTZG9PfQxd17HbNPksHBiJHaKuY1XeqscXacsS2tyoo6OdRsjf+NQYeB6XrNL3a25E3gH69lcg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-color": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz",
       "integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-contour": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/@types/d3-contour/-/d3-contour-3.0.6.tgz",
       "integrity": "sha512-BjzLgXGnCWjUSYGfH1cpdo41/hgdWETu4YxpezoztawmqsvCeep+8QGfiY6YbDvfgHz/DkjeIkkZVJavB4a3rg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-array": "*",
         "@types/geojson": "*"
@@ -650,19 +687,22 @@
       "version": "6.0.4",
       "resolved": "https://registry.npmjs.org/@types/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
       "integrity": "sha512-ZMaSKu4THYCU6sV64Lhg6qjf1orxBthaC161plr5KuPHo3CNm8DTHiLw/5Eq2b6TsNP0W0iJrUOFscY6Q450Hw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-dispatch": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/@types/d3-dispatch/-/d3-dispatch-3.0.6.tgz",
       "integrity": "sha512-4fvZhzMeeuBJYZXRXrRIQnvUYfyXwYmLsdiN7XXmVNQKKw1cM8a5WdID0g1hVFZDqT9ZqZEY5pD44p24VS7iZQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-drag": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/@types/d3-drag/-/d3-drag-3.0.7.tgz",
       "integrity": "sha512-HE3jVKlzU9AaMazNufooRJ5ZpWmLIoc90A37WU2JMmeq28w1FQqCZswHZ3xR+SuxYftzHq6WU6KJHvqxKzTxxQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-selection": "*"
       }
@@ -671,136 +711,156 @@
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/@types/d3-dsv/-/d3-dsv-3.0.7.tgz",
       "integrity": "sha512-n6QBF9/+XASqcKK6waudgL0pf/S5XHPPI8APyMLLUHd8NqouBGLsU8MgtO7NINGtPBtk9Kko/W4ea0oAspwh9g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-ease": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.2.tgz",
       "integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-fetch": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/@types/d3-fetch/-/d3-fetch-3.0.7.tgz",
       "integrity": "sha512-fTAfNmxSb9SOWNB9IoG5c8Hg6R+AzUHDRlsXsDZsNp6sxAEOP0tkP3gKkNSO/qmHPoBFTxNrjDprVHDQDvo5aA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-dsv": "*"
       }
     },
     "node_modules/@types/d3-force": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@types/d3-force/-/d3-force-3.0.9.tgz",
-      "integrity": "sha512-IKtvyFdb4Q0LWna6ymywQsEYjK/94SGhPrMfEr1TIc5OBeziTi+1jcCvttts8e0UWZIxpasjnQk9MNk/3iS+kA==",
-      "dev": true
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@types/d3-force/-/d3-force-3.0.10.tgz",
+      "integrity": "sha512-ZYeSaCF3p73RdOKcjj+swRlZfnYpK1EbaDiYICEEp5Q6sUiqFaFQ9qgoshp5CzIyyb/yD09kD9o2zEltCexlgw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-format": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/@types/d3-format/-/d3-format-3.0.4.tgz",
       "integrity": "sha512-fALi2aI6shfg7vM5KiR1wNJnZ7r6UuggVqtDA+xiEdPZQwy/trcQaHnwShLuLdta2rTymCNpxYTiMZX/e09F4g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-geo": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-3.1.0.tgz",
       "integrity": "sha512-856sckF0oP/diXtS4jNsiQw/UuK5fQG8l/a9VVLeSouf1/PPbBE1i1W852zVwKwYCBkFJJB7nCFTbk6UMEXBOQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/geojson": "*"
       }
     },
     "node_modules/@types/d3-hierarchy": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/@types/d3-hierarchy/-/d3-hierarchy-3.1.6.tgz",
-      "integrity": "sha512-qlmD/8aMk5xGorUvTUWHCiumvgaUXYldYjNVOWtYoTYY/L+WwIEAmJxUmTgr9LoGNG0PPAOmqMDJVDPc7DOpPw==",
-      "dev": true
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-hierarchy/-/d3-hierarchy-3.1.7.tgz",
+      "integrity": "sha512-tJFtNoYBtRtkNysX1Xq4sxtjK8YgoWUNpIiUee0/jHGRwqvzYxkq0hGVbbOGSz+JgFxxRu4K8nb3YpG3CMARtg==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-interpolate": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz",
       "integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-color": "*"
       }
     },
     "node_modules/@types/d3-path": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.0.2.tgz",
-      "integrity": "sha512-WAIEVlOCdd/NKRYTsqCpOMHQHemKBEINf8YXMYOtXH0GA7SY0dqMB78P3Uhgfy+4X+/Mlw2wDtlETkN6kQUCMA==",
-      "dev": true
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.1.tgz",
+      "integrity": "sha512-VMZBYyQvbGmWyWVea0EHs/BwLgxc+MKi1zLDCONksozI4YJMcTt8ZEuIR4Sb1MMTE8MMW49v0IwI5+b7RmfWlg==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-polygon": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/@types/d3-polygon/-/d3-polygon-3.0.2.tgz",
       "integrity": "sha512-ZuWOtMaHCkN9xoeEMr1ubW2nGWsp4nIql+OPQRstu4ypeZ+zk3YKqQT0CXVe/PYqrKpZAi+J9mTs05TKwjXSRA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-quadtree": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/@types/d3-quadtree/-/d3-quadtree-3.0.6.tgz",
       "integrity": "sha512-oUzyO1/Zm6rsxKRHA1vH0NEDG58HrT5icx/azi9MF1TWdtttWl0UIUsjEQBBh+SIkrpd21ZjEv7ptxWys1ncsg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-random": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/@types/d3-random/-/d3-random-3.0.3.tgz",
       "integrity": "sha512-Imagg1vJ3y76Y2ea0871wpabqp613+8/r0mCLEBfdtqC7xMSfj9idOnmBYyMoULfHePJyxMAw3nWhJxzc+LFwQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-scale": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.8.tgz",
-      "integrity": "sha512-gkK1VVTr5iNiYJ7vWDI+yUFFlszhNMtVeneJ6lUTKPjprsvLLI9/tgEGiXJOnlINJA8FyA88gfnQsHbybVZrYQ==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.9.tgz",
+      "integrity": "sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-time": "*"
       }
     },
     "node_modules/@types/d3-scale-chromatic": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.0.3.tgz",
-      "integrity": "sha512-laXM4+1o5ImZv3RpFAsTRn3TEkzqkytiOY0Dz0sq5cnd1dtNlk6sHLon4OvqaiJb28T0S/TdsBI3Sjsy+keJrw==",
-      "dev": true
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
+      "integrity": "sha512-iWMJgwkK7yTRmWqRB5plb1kadXyQ5Sj8V/zYlFGMUBbIPKQScw+Dku9cAAMgJG+z5GYDoMjWGLVOvjghDEFnKQ==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-selection": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.10.tgz",
-      "integrity": "sha512-cuHoUgS/V3hLdjJOLTT691+G2QoqAjCVLmr4kJXR4ha56w1Zdu8UUQ5TxLRqudgNjwXeQxKMq4j+lyf9sWuslg==",
-      "dev": true
+      "version": "3.0.11",
+      "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.11.tgz",
+      "integrity": "sha512-bhAXu23DJWsrI45xafYpkQ4NtcKMwWnAC/vKrd2l+nxMFuvOT3XMYTIj2opv8vq8AO5Yh7Qac/nSeP/3zjTK0w==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-shape": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.6.tgz",
-      "integrity": "sha512-5KKk5aKGu2I+O6SONMYSNflgiP0WfZIQvVUMan50wHsLG1G94JlxEVnCpQARfTtzytuY0p/9PXXZb3I7giofIA==",
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.7.tgz",
+      "integrity": "sha512-VLvUQ33C+3J+8p+Daf+nYSOsjB4GXp19/S/aGo60m9h1v6XaxjiT82lKVWJCfzhtuZ3yD7i/TPeC/fuKLLOSmg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-path": "*"
       }
     },
     "node_modules/@types/d3-time": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.3.tgz",
-      "integrity": "sha512-2p6olUZ4w3s+07q3Tm2dbiMZy5pCDfYwtLXXHUnVzXgQlZ/OyPtUz6OL382BkOuGlLXqfT+wqv8Fw2v8/0geBw==",
-      "dev": true
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.4.tgz",
+      "integrity": "sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-time-format": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-4.0.3.tgz",
       "integrity": "sha512-5xg9rC+wWL8kdDj153qZcsJ0FWiFt0J5RB6LYUNZjwSnesfblqrI/bJ1wBdJ8OQfncgbJG5+2F+qfqnqyzYxyg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-timer": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.2.tgz",
       "integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-transition": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-3.0.8.tgz",
-      "integrity": "sha512-ew63aJfQ/ms7QQ4X7pk5NxQ9fZH/z+i24ZfJ6tJSfqxJMrYLiK01EAs2/Rtw/JreGUsS3pLPNV644qXFGnoZNQ==",
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-3.0.9.tgz",
+      "integrity": "sha512-uZS5shfxzO3rGlu0cC3bjmMFKsXv+SmZZcgp0KD22ts4uGXp5EVYGzu/0YdwZeKmddhcAccYtREJKkPfXkZuCg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-selection": "*"
       }
@@ -810,6 +870,7 @@
       "resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-3.0.8.tgz",
       "integrity": "sha512-iqMC4/YlFCSlO8+2Ii1GGGliCAY4XdeG748w5vQUbevlbDu0zSjH/+jojorQVBK/se0j6DUFNPBGSqD3YWYnDw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-interpolate": "*",
         "@types/d3-selection": "*"
@@ -819,28 +880,32 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
       "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/fs-extra": {
       "version": "8.1.5",
       "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.1.5.tgz",
       "integrity": "sha512-0dzKcwO+S8s2kuF5Z9oUWatQJj5Uq/iqphEtE3GQJVRRYm/tD1LglU2UnXi2A8jLq5umkGouOXOR9y0n613ZwQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/geojson": {
-      "version": "7946.0.13",
-      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.13.tgz",
-      "integrity": "sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ==",
-      "dev": true
+      "version": "7946.0.16",
+      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz",
+      "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/glob": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
       "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/minimatch": "*",
         "@types/node": "*"
@@ -850,7 +915,8 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
       "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/node": {
       "version": "22.13.4",
@@ -866,28 +932,32 @@
       "version": "1.20.2",
       "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz",
       "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/sprintf-js": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/@types/sprintf-js/-/sprintf-js-1.1.4.tgz",
       "integrity": "sha512-aWK1reDYWxcjgcIIPmQi3u+OQDuYa9b+lr6eIsGWrekJ9vr1NSjr4Eab8oQ1iKuH1ltFHpXGyerAv1a3FMKxzQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/tern": {
       "version": "0.23.9",
       "resolved": "https://registry.npmjs.org/@types/tern/-/tern-0.23.9.tgz",
       "integrity": "sha512-ypzHFE/wBzh+BlH6rrBgS5I/Z7RD21pGhZ2rltb/+ZrVM1awdZwjx7hE5XfuYgHWk9uvV5HLZN3SloevCAp3Bw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/estree": "*"
       }
     },
     "node_modules/acorn": {
-      "version": "8.11.3",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
-      "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
+      "version": "8.14.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -896,10 +966,11 @@
       }
     },
     "node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -912,6 +983,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
       "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -924,6 +996,7 @@
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
       "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -932,13 +1005,15 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/brace-expansion": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
       "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
@@ -948,6 +1023,7 @@
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
       "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fill-range": "^7.1.1"
       },
@@ -959,13 +1035,15 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -977,18 +1055,21 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/colorette": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz",
       "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/commander": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
       "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "license": "MIT",
       "engines": {
         "node": ">= 10"
       }
@@ -997,19 +1078,22 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
       "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/cross-spawn": {
       "version": "7.0.6",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
       "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -1023,6 +1107,7 @@
       "version": "7.9.0",
       "resolved": "https://registry.npmjs.org/d3/-/d3-7.9.0.tgz",
       "integrity": "sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA==",
+      "license": "ISC",
       "dependencies": {
         "d3-array": "3",
         "d3-axis": "3",
@@ -1063,6 +1148,7 @@
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
       "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
+      "license": "ISC",
       "dependencies": {
         "internmap": "1 - 2"
       },
@@ -1074,6 +1160,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz",
       "integrity": "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1082,6 +1169,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz",
       "integrity": "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==",
+      "license": "ISC",
       "dependencies": {
         "d3-dispatch": "1 - 3",
         "d3-drag": "2 - 3",
@@ -1097,6 +1185,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz",
       "integrity": "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==",
+      "license": "ISC",
       "dependencies": {
         "d3-path": "1 - 3"
       },
@@ -1108,6 +1197,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
       "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1116,6 +1206,7 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-4.0.2.tgz",
       "integrity": "sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==",
+      "license": "ISC",
       "dependencies": {
         "d3-array": "^3.2.0"
       },
@@ -1127,6 +1218,7 @@
       "version": "6.0.4",
       "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
       "integrity": "sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==",
+      "license": "ISC",
       "dependencies": {
         "delaunator": "5"
       },
@@ -1138,6 +1230,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
       "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1146,6 +1239,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz",
       "integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==",
+      "license": "ISC",
       "dependencies": {
         "d3-dispatch": "1 - 3",
         "d3-selection": "3"
@@ -1158,6 +1252,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz",
       "integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==",
+      "license": "ISC",
       "dependencies": {
         "commander": "7",
         "iconv-lite": "0.6",
@@ -1182,6 +1277,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
       "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=12"
       }
@@ -1190,6 +1286,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz",
       "integrity": "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==",
+      "license": "ISC",
       "dependencies": {
         "d3-dsv": "1 - 3"
       },
@@ -1201,6 +1298,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz",
       "integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==",
+      "license": "ISC",
       "dependencies": {
         "d3-dispatch": "1 - 3",
         "d3-quadtree": "1 - 3",
@@ -1214,14 +1312,16 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz",
       "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/d3-geo": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.0.tgz",
-      "integrity": "sha512-JEo5HxXDdDYXCaWdwLRt79y7giK8SbhZJbFWXqbRTolCHFI5jRqteLzCsq51NKbUoX0PjBVSohxrx+NoOUujYA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz",
+      "integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==",
+      "license": "ISC",
       "dependencies": {
         "d3-array": "2.5.0 - 3"
       },
@@ -1233,6 +1333,7 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz",
       "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1241,6 +1342,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
       "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
+      "license": "ISC",
       "dependencies": {
         "d3-color": "1 - 3"
       },
@@ -1252,6 +1354,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
       "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1260,6 +1363,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz",
       "integrity": "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1268,6 +1372,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz",
       "integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1276,6 +1381,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz",
       "integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1284,6 +1390,7 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
       "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
+      "license": "ISC",
       "dependencies": {
         "d3-array": "2.10.0 - 3",
         "d3-format": "1 - 3",
@@ -1296,9 +1403,10 @@
       }
     },
     "node_modules/d3-scale-chromatic": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz",
-      "integrity": "sha512-Lx9thtxAKrO2Pq6OO2Ua474opeziKr279P/TKZsMAhYyNDD3EnCffdbgeSYN5O7m2ByQsxtuP2CSDczNUIZ22g==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
+      "integrity": "sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==",
+      "license": "ISC",
       "dependencies": {
         "d3-color": "1 - 3",
         "d3-interpolate": "1 - 3"
@@ -1311,6 +1419,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz",
       "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1319,6 +1428,7 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
       "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
+      "license": "ISC",
       "dependencies": {
         "d3-path": "^3.1.0"
       },
@@ -1330,6 +1440,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
       "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
+      "license": "ISC",
       "dependencies": {
         "d3-array": "2 - 3"
       },
@@ -1341,6 +1452,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
       "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
+      "license": "ISC",
       "dependencies": {
         "d3-time": "1 - 3"
       },
@@ -1352,6 +1464,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
       "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1360,6 +1473,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz",
       "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==",
+      "license": "ISC",
       "dependencies": {
         "d3-color": "1 - 3",
         "d3-dispatch": "1 - 3",
@@ -1378,6 +1492,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz",
       "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==",
+      "license": "ISC",
       "dependencies": {
         "d3-dispatch": "1 - 3",
         "d3-drag": "2 - 3",
@@ -1394,16 +1509,18 @@
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
       "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/delaunator": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.0.tgz",
-      "integrity": "sha512-AyLvtyJdbv/U1GkiS6gUUzclRoAY4Gs75qkMygJJhU75LW4DNuSF2RMzpxs9jw9Oz1BobHjTdkG3zdP55VxAqw==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.1.tgz",
+      "integrity": "sha512-8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw==",
+      "license": "ISC",
       "dependencies": {
-        "robust-predicates": "^3.0.0"
+        "robust-predicates": "^3.0.2"
       }
     },
     "node_modules/dir-glob": {
@@ -1411,6 +1528,7 @@
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
       "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-type": "^4.0.0"
       },
@@ -1422,41 +1540,46 @@
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
       "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/emoji-regex": {
       "version": "9.2.2",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
       "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/estree-walker": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
       "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/fast-glob": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
-      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
         "glob-parent": "^5.1.2",
         "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
+        "micromatch": "^4.0.8"
       },
       "engines": {
         "node": ">=8.6.0"
       }
     },
     "node_modules/fastq": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.16.0.tgz",
-      "integrity": "sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA==",
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.0.tgz",
+      "integrity": "sha512-7SFSRCNjBQIZH/xZR3iy5iQYR8aGBE0h3VG6/cwlbrpdciNYBMotQav8c1XI3HjHH+NikUpP53nPdlZSdWmFzA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "reusify": "^1.0.4"
       }
@@ -1466,6 +1589,7 @@
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
       "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -1474,10 +1598,11 @@
       }
     },
     "node_modules/foreground-child": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
-      "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
+      "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "cross-spawn": "^7.0.0",
         "signal-exit": "^4.0.1"
@@ -1494,6 +1619,7 @@
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
       "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.0",
         "jsonfile": "^4.0.0",
@@ -1507,7 +1633,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/fsevents": {
       "version": "2.3.3",
@@ -1515,6 +1642,7 @@
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -1528,28 +1656,28 @@
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
       "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/glob": {
-      "version": "10.4.1",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.1.tgz",
-      "integrity": "sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==",
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "foreground-child": "^3.1.0",
         "jackspeak": "^3.1.2",
         "minimatch": "^9.0.4",
         "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
         "path-scurry": "^1.11.1"
       },
       "bin": {
         "glob": "dist/esm/bin.mjs"
       },
-      "engines": {
-        "node": ">=16 || 14 >=14.18"
-      },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
@@ -1559,6 +1687,7 @@
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -1571,6 +1700,7 @@
       "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.1.tgz",
       "integrity": "sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/glob": "^7.1.1",
         "array-union": "^2.1.0",
@@ -1590,6 +1720,7 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -1599,7 +1730,9 @@
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -1620,6 +1753,7 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -1631,13 +1765,15 @@
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/hasown": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
-      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.2"
       },
@@ -1649,6 +1785,7 @@
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
       "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
@@ -1657,10 +1794,11 @@
       }
     },
     "node_modules/ignore": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
-      "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
@@ -1669,7 +1807,9 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -1679,23 +1819,29 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/internmap": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
       "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.13.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
-      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "hasown": "^2.0.0"
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -1706,6 +1852,7 @@
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1715,6 +1862,7 @@
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -1724,6 +1872,7 @@
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -1735,13 +1884,15 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
       "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
@@ -1751,6 +1902,7 @@
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.1.tgz",
       "integrity": "sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1760,6 +1912,7 @@
       "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
       "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/estree": "*"
       }
@@ -1768,19 +1921,18 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/jackspeak": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.0.tgz",
-      "integrity": "sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
       "dev": true,
+      "license": "BlueOak-1.0.0",
       "dependencies": {
         "@isaacs/cliui": "^8.0.2"
       },
-      "engines": {
-        "node": ">=14"
-      },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       },
@@ -1792,6 +1944,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/jsep/-/jsep-1.4.0.tgz",
       "integrity": "sha512-B7qPcEVE3NVkmSJbaYxvv4cHkVW7DQsZz13pUMrfS8z8Q/BuShN+gcTXrUlPiGqM2/t/EEaI030bpxMqY8gMlw==",
+      "license": "MIT",
       "engines": {
         "node": ">= 10.16.0"
       }
@@ -1801,29 +1954,26 @@
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
       "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
       "dev": true,
+      "license": "MIT",
       "optionalDependencies": {
         "graceful-fs": "^4.1.6"
       }
     },
     "node_modules/lru-cache": {
-      "version": "10.2.2",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz",
-      "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==",
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
       "dev": true,
-      "engines": {
-        "node": "14 || >=16.14"
-      }
+      "license": "ISC"
     },
     "node_modules/magic-string": {
-      "version": "0.30.5",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
-      "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
+      "version": "0.30.17",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
+      "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.4.15"
-      },
-      "engines": {
-        "node": ">=12"
+        "@jridgewell/sourcemap-codec": "^1.5.0"
       }
     },
     "node_modules/merge2": {
@@ -1831,6 +1981,7 @@
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
       "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
@@ -1840,6 +1991,7 @@
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
       "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "braces": "^3.0.3",
         "picomatch": "^2.3.1"
@@ -1848,11 +2000,25 @@
         "node": ">=8.6"
       }
     },
+    "node_modules/micromatch/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/minimatch": {
-      "version": "9.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
-      "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -1868,6 +2034,7 @@
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
       "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">=16 || 14 >=14.17"
       }
@@ -1877,14 +2044,15 @@
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
       "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "*"
       }
     },
     "node_modules/obsidian": {
-      "version": "1.5.1",
+      "version": "1.8.7",
       "resolved": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-      "integrity": "sha512-zXhEivZGOKIBmN2ahr+Shh98RMEM9Ih9RsjD2RLEyVqLwu87mTYYVxLGPfWwsLD06zKUltIGqLpNG9+x5tyILA==",
+      "integrity": "sha512-AWXhKFmmMiw/qLfcautRoNDqsREC3kLBKmVuiICyZmqcTlS/jGxhOFxJ1z095NfddwD6ZPm2JqmVRRRsB+Vkzg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1901,15 +2069,24 @@
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "wrappy": "1"
       }
     },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+      "dev": true,
+      "license": "BlueOak-1.0.0"
+    },
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1919,6 +2096,7 @@
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -1927,13 +2105,15 @@
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/path-scurry": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
       "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
       "dev": true,
+      "license": "BlueOak-1.0.0",
       "dependencies": {
         "lru-cache": "^10.2.0",
         "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
@@ -1950,17 +2130,19 @@
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=8.6"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/jonschlinkert"
@@ -1984,30 +2166,36 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "^5.1.0"
       }
     },
     "node_modules/resolve": {
-      "version": "1.22.8",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
-      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+      "version": "1.22.10",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
+      "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-core-module": "^2.13.0",
+        "is-core-module": "^2.16.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
       "bin": {
         "resolve": "bin/resolve"
       },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -2017,6 +2205,7 @@
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
       "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "iojs": ">=1.0.0",
         "node": ">=0.10.0"
@@ -2025,7 +2214,8 @@
     "node_modules/robust-predicates": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.2.tgz",
-      "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="
+      "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==",
+      "license": "Unlicense"
     },
     "node_modules/rollup": {
       "version": "4.34.8",
@@ -2071,6 +2261,7 @@
       "resolved": "https://registry.npmjs.org/rollup-plugin-copy/-/rollup-plugin-copy-3.5.0.tgz",
       "integrity": "sha512-wI8D5dvYovRMx/YYKtUNt3Yxaw4ORC9xo6Gt9t22kveWz1enG9QrhVlagzwrxSC455xD1dHMKhIJkbsQ7d48BA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/fs-extra": "^8.0.1",
         "colorette": "^1.1.0",
@@ -2101,6 +2292,7 @@
           "url": "https://feross.org/support"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "queue-microtask": "^1.2.2"
       }
@@ -2108,7 +2300,8 @@
     "node_modules/rw": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
-      "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ=="
+      "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==",
+      "license": "BSD-3-Clause"
     },
     "node_modules/safe-buffer": {
       "version": "5.2.1",
@@ -2128,18 +2321,21 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "license": "MIT"
     },
     "node_modules/serialize-javascript": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
       "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "randombytes": "^2.1.0"
       }
@@ -2149,6 +2345,7 @@
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "shebang-regex": "^3.0.0"
       },
@@ -2161,6 +2358,7 @@
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -2170,6 +2368,7 @@
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
       "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">=14"
       },
@@ -2182,21 +2381,24 @@
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/smob": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/smob/-/smob-1.4.1.tgz",
-      "integrity": "sha512-9LK+E7Hv5R9u4g4C3p+jjLstaLe11MDsL21UpYaCNmapvMkYhqCV4A/f/3gyH8QjMyh6l68q9xC85vihY9ahMQ==",
-      "dev": true
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/smob/-/smob-1.5.0.tgz",
+      "integrity": "sha512-g6T+p7QO8npa+/hNx9ohv1E5pVCmWrVCUzUXJyLdMmftX6ER0oiWY/w9knEonLpnOp6b6FenKnMfR8gqwWdwig==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -2206,6 +2408,7 @@
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
       "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -2214,13 +2417,15 @@
     "node_modules/sprintf-js": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
-      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="
+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+      "license": "BSD-3-Clause"
     },
     "node_modules/string-width": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
       "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "eastasianwidth": "^0.2.0",
         "emoji-regex": "^9.2.2",
@@ -2239,6 +2444,7 @@
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -2253,6 +2459,7 @@
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
       "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -2261,13 +2468,15 @@
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/string-width-cjs/node_modules/strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -2280,6 +2489,7 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
       "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^6.0.1"
       },
@@ -2296,6 +2506,7 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -2308,15 +2519,17 @@
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
       "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/style-mod": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.0.tgz",
-      "integrity": "sha512-Ca5ib8HrFn+f+0n4N4ScTIA9iTOQ7MaGS1ylHcoVqW9J7w2w8PzN6g9gKmTYgGEBH8e120+RCmhpje6jC5uGWA==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.2.tgz",
+      "integrity": "sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==",
       "dev": true,
+      "license": "MIT",
       "peer": true
     },
     "node_modules/supports-preserve-symlinks-flag": {
@@ -2324,6 +2537,7 @@
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -2332,10 +2546,11 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.27.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.27.0.tgz",
-      "integrity": "sha512-bi1HRwVRskAjheeYl291n3JC4GgO/Ty4z1nVs5AAsmonJulGxpSektecnNedrwK9C7vpvVtcX3cw00VSLt7U2A==",
+      "version": "5.39.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.39.0.tgz",
+      "integrity": "sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
         "acorn": "^8.8.2",
@@ -2353,13 +2568,15 @@
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -2400,6 +2617,7 @@
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
       "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4.0.0"
       }
@@ -2409,6 +2627,7 @@
       "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
       "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==",
       "dev": true,
+      "license": "MIT",
       "peer": true
     },
     "node_modules/which": {
@@ -2416,6 +2635,7 @@
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
       "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -2431,6 +2651,7 @@
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
       "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^6.1.0",
         "string-width": "^5.0.1",
@@ -2449,6 +2670,7 @@
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -2466,6 +2688,7 @@
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
       "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -2475,6 +2698,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -2489,13 +2713,15 @@
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/wrap-ansi-cjs/node_modules/string-width": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -2510,6 +2736,7 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -2521,7 +2748,8 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     }
   }
 }

From bfb869aec304be2c035cf29f65d453ae152cd66d Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Thu, 20 Feb 2025 22:11:54 -0700
Subject: [PATCH 364/402] Add test case for calendar scaling

---
 examples/TestCalendar.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
index 3fedc19..f9505d4 100644
--- a/examples/TestCalendar.md
+++ b/examples/TestCalendar.md
@@ -181,3 +181,15 @@ month:
 
 Please also check those search targets in markdown files under folder 'diary'.
 
+## Scaling
+fitPanelWidth: true
+Click forward backward months and verify it stays scaled
+``` tracker
+searchType: tag
+searchTarget: meditation
+datasetName: Meditation
+fitPanelWidth: true
+folder: diary
+endDate: 2021-01-31
+month:
+```

From 83433974447f273fbce2cc16deb89b43a6167cf5 Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Thu, 20 Feb 2025 22:13:44 -0700
Subject: [PATCH 365/402] Fix calendar title when using annotation mode and
 showAnnotationOfAllTargets

When using:

```
mode: annotation
showAnnotationOfAllTargets: true
```

The title will be set to "All Targets" and will not be clickable
---
 src/month.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/month.ts b/src/month.ts
index 7ab3826..a394700 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -295,6 +295,10 @@ function renderMonthHeader(
 
     headerHeight += headerYearSize.height;
 
+    if (monthInfo.mode === "annotation" && monthInfo.showAnnotationOfAllTargets && monthInfo.dataset.length > 1) {
+        datasetName = "All Targets"
+    }
+
     // dataset rotator
     let datasetNameSize = helper.measureTextSize(
         datasetName,
@@ -313,8 +317,9 @@ function renderMonthHeader(
                 ")"
         )
         .attr("class", "tracker-month-title-rotator")
-        .style("cursor", "pointer")
-        .on("click", function (event: any) {
+        .style("cursor", "pointer");
+    if (!monthInfo.showAnnotationOfAllTargets || monthInfo.mode !== "annotation") {
+        datasetRotator.on("click", function (event: any) {
             // show next target
             if (toNextDataset(renderInfo, monthInfo)) {
                 // clear circles
@@ -329,6 +334,7 @@ function renderMonthHeader(
                 );
             }
         });
+    }
     chartElements["rotator"] = datasetRotator;
 
     // value monitor

From 0f18cf1bf2306eeed3ac8b330fb1cd06271bb53f Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Thu, 20 Feb 2025 22:28:27 -0700
Subject: [PATCH 366/402] Release 1.15.1

---
 README.md            | 288 ++++++++++++++++++++++---------------------
 docs/ReleaseNotes.md |   6 +
 manifest.json        |  20 +--
 package-lock.json    |   4 +-
 package.json         |   2 +-
 versions.json        |  81 ++++++------
 6 files changed, 207 insertions(+), 194 deletions(-)

diff --git a/README.md b/README.md
index 4cbad33..ed74e40 100644
--- a/README.md
+++ b/README.md
@@ -1,141 +1,147 @@
-# Obsidian Tracker Plugin
-
-![GitHub release](https://img.shields.io/github/v/release/pyrochlore/obsidian-tracker)
-
-<img src="https://raw.githubusercontent.com/pyrochlore/obsidian-tracker/master/docs/images/screenshot_v1.9.png" width="800">
-
-This is an [Obsidian](https://obsidian.md/) plugin that helps you collect data from notes and represent it comprehensively.
-
-[Here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Examples.md) is a table containing simplified examples showing what you can track.
-
-## What's New
-
-Version 1.15.0
-
-- Fix: Minor spelling error in Examples.md
-- Added new expression functions - First and Last
-- Updated dates in examples to fix plots
-- Respect thresholds in scaled months
-- Update dependencies
-
-Version 1.14.0
-
-- Update dependencies
-- Prevent overlapping external labels in pie chart
-- Enable Stacked Bar Chart
-
-Version 1.13.3
-
-- Update dependencies
-- Fix typo in FinanceTracker.md
-- Fix typo in TestExpression.md
-- Update main.ts - use new format for {{average}}
-
-Version 1.13.2
-
-- Update dependencies
-- Fix typo in README.md
-- Change streak counts to terminate on falsey values rather than null
-
-Version 1.13.1
-
-- Fix packaging script
-
-Version 1.13.0
-
-- Add support for inline dataview fields (including emoji support for values)
-- Update dependencies
-
-Version 1.12.0
-
-- Add aspect ratio parameter for graphs
-- Reorganize release notes in readme to be in descending order (latest release first)
-
-Version 1.11.0
-
-- Add support for checkboxes in new properties added in Obsidian 1.4
-- Fix typos in documentation and examples
-
-Version 1.10.9
-
-- Replace tab characters by spaces
-- Accept more unicode characters in dvField
-- Allow emojis in the folder path
-- Fixed bugs
-
-Version 1.10.8
-
-- Fixed startDate/endDate misread as a relative date
-
-Version 1.10.7
-
-- Allow using html image tags as emoji inputs
-
-Version 1.10.6
-
-- Fixed the coloring for missing data in the month view
-
-Version 1.10.5
-
-- Allow using a relative date value in `initMonth` in the month view
-
-Version 1.10.4
-
-- Allow using a regular expression as a key of the parameter `textValueMap`
-- Add a parameter `shiftOnlyValueLargerThan` to determine when to do `valueShift`
-- Fixed bugs reported by users
-- Fixed typo in plugin settings
-
-Version 1.10.3
-
-- Allow using the parameter `fitPanelWidth` with the output type `month` and `pie`
-- Fixed the resizing and positioning of the chart tooltip
-
-Version 1.10.2
-
-- Fixed plugin not rendering on some macOS machines
-
-Version 1.10.1
-
-- Fixed 'failed to load plugin' on iOS
-
-Version 1.10.0
-
-- Add annotation mode for month view ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestCalendar.md))
-- Add parameters `xAxisTickInterval`, `yAxisTickInterval`, `xAxisTickLabelFormat` and `yAxisTickLabelFormat` for the line and bar chart ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestAxisIntervalAndFormat.md))
-- Allow using regular expression in parameter `dateFormatPrefix` and `dateFormatSuffix` ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md))
-- Add parameters `file`, `specifiedFilesOnly`, `fileContainsLinkedFiles`, and `fileMultiplierAfterLink` to retrieve data from specified files ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestSpecifiedFiles.md))
-- Add a parameter `textValueMap` to convert texts or emojis to specified values ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTextValueMap.md))
-- Fixed bugs
-- Enhanced error messages
-
-## !!! Breaking Changes !!!
-
-From version 1.9.0, template variables, e.g. '{{sum}}', are deprecated. Instead, Tracker provide operators (+, -, *, /, %) and functions (dataset(), sum(), maxStreak(), ......etc) to help us do data processing. For users having code blocks from previous version, please replace '{{sum}}' by '{{sum()}}' or '{{sum(1)}}' by '{{sum(dataset(1))}}'. More information about the new expressions could be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Expressions.md).
-
-## Usage
-
-1. Have some targets you want to track in daily notes.
-2. Add a new note for displaying the tracker.
-3. Add tracker code blocks manually ([examples](https://github.com/pyrochlore/obsidian-tracker/tree/master/examples)) or using [commands](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Commands.md).
-4. Switch the document view mode to 'Preview', then the code block will get rendered.
-
-For more use cases, please download and open the [examples](https://github.com/pyrochlore/obsidian-tracker/tree/master/examples) folder in obsidian with this plugin installed and enabled.
-
-## More Details You May Want to Know
-
-- [Installation](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Installation.md): Install the plugin from Obsidian or install it manually
-- [Concepts](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Concepts.md): Explain how this plugin works and what to setup
-  - [Target Evaluation](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TargetEvaluation.md)
-  - [Input Parameters](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md)
-  - [Expressions](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Expressions.md)
-- [Examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Examples.md)
-- [Plugin Settings](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Settings.md)
-- [Release Notes](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/ReleaseNotes.md)
-- [Road Map](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/RoadMap.md)
-- [Frequently Asked Questions](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Questions.md)
-
-## Support
-
-- If you like this plugin or want to support further development, you can [Buy Me a Coffee](https://www.buymeacoffee.com/pyrochlore).
-- Please report bugs and request features in [GitHub Issues](https://github.com/pyrochlore/obsidian-tracker/issues)
+# Obsidian Tracker Plugin
+
+![GitHub release](https://img.shields.io/github/v/release/pyrochlore/obsidian-tracker)
+
+<img src="https://raw.githubusercontent.com/pyrochlore/obsidian-tracker/master/docs/images/screenshot_v1.9.png" width="800">
+
+This is an [Obsidian](https://obsidian.md/) plugin that helps you collect data from notes and represent it comprehensively.
+
+[Here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Examples.md) is a table containing simplified examples showing what you can track.
+
+## What's New
+
+Version 1.15.1
+
+- Fix: Added DatasetName as title for calendar in annotation mode
+- Fix: Resolve scaling issue when navigating between monthly views
+- Update dependencies
+
+Version 1.15.0
+
+- Fix: Minor spelling error in Examples.md
+- Added new expression functions - First and Last
+- Updated dates in examples to fix plots
+- Respect thresholds in scaled months
+- Update dependencies
+
+Version 1.14.0
+
+- Update dependencies
+- Prevent overlapping external labels in pie chart
+- Enable Stacked Bar Chart
+
+Version 1.13.3
+
+- Update dependencies
+- Fix typo in FinanceTracker.md
+- Fix typo in TestExpression.md
+- Update main.ts - use new format for {{average}}
+
+Version 1.13.2
+
+- Update dependencies
+- Fix typo in README.md
+- Change streak counts to terminate on falsey values rather than null
+
+Version 1.13.1
+
+- Fix packaging script
+
+Version 1.13.0
+
+- Add support for inline dataview fields (including emoji support for values)
+- Update dependencies
+
+Version 1.12.0
+
+- Add aspect ratio parameter for graphs
+- Reorganize release notes in readme to be in descending order (latest release first)
+
+Version 1.11.0
+
+- Add support for checkboxes in new properties added in Obsidian 1.4
+- Fix typos in documentation and examples
+
+Version 1.10.9
+
+- Replace tab characters by spaces
+- Accept more unicode characters in dvField
+- Allow emojis in the folder path
+- Fixed bugs
+
+Version 1.10.8
+
+- Fixed startDate/endDate misread as a relative date
+
+Version 1.10.7
+
+- Allow using html image tags as emoji inputs
+
+Version 1.10.6
+
+- Fixed the coloring for missing data in the month view
+
+Version 1.10.5
+
+- Allow using a relative date value in `initMonth` in the month view
+
+Version 1.10.4
+
+- Allow using a regular expression as a key of the parameter `textValueMap`
+- Add a parameter `shiftOnlyValueLargerThan` to determine when to do `valueShift`
+- Fixed bugs reported by users
+- Fixed typo in plugin settings
+
+Version 1.10.3
+
+- Allow using the parameter `fitPanelWidth` with the output type `month` and `pie`
+- Fixed the resizing and positioning of the chart tooltip
+
+Version 1.10.2
+
+- Fixed plugin not rendering on some macOS machines
+
+Version 1.10.1
+
+- Fixed 'failed to load plugin' on iOS
+
+Version 1.10.0
+
+- Add annotation mode for month view ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestCalendar.md))
+- Add parameters `xAxisTickInterval`, `yAxisTickInterval`, `xAxisTickLabelFormat` and `yAxisTickLabelFormat` for the line and bar chart ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestAxisIntervalAndFormat.md))
+- Allow using regular expression in parameter `dateFormatPrefix` and `dateFormatSuffix` ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md))
+- Add parameters `file`, `specifiedFilesOnly`, `fileContainsLinkedFiles`, and `fileMultiplierAfterLink` to retrieve data from specified files ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestSpecifiedFiles.md))
+- Add a parameter `textValueMap` to convert texts or emojis to specified values ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestTextValueMap.md))
+- Fixed bugs
+- Enhanced error messages
+
+## !!! Breaking Changes !!!
+
+From version 1.9.0, template variables, e.g. '{{sum}}', are deprecated. Instead, Tracker provide operators (+, -, *, /, %) and functions (dataset(), sum(), maxStreak(), ......etc) to help us do data processing. For users having code blocks from previous version, please replace '{{sum}}' by '{{sum()}}' or '{{sum(1)}}' by '{{sum(dataset(1))}}'. More information about the new expressions could be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Expressions.md).
+
+## Usage
+
+1. Have some targets you want to track in daily notes.
+2. Add a new note for displaying the tracker.
+3. Add tracker code blocks manually ([examples](https://github.com/pyrochlore/obsidian-tracker/tree/master/examples)) or using [commands](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Commands.md).
+4. Switch the document view mode to 'Preview', then the code block will get rendered.
+
+For more use cases, please download and open the [examples](https://github.com/pyrochlore/obsidian-tracker/tree/master/examples) folder in obsidian with this plugin installed and enabled.
+
+## More Details You May Want to Know
+
+- [Installation](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Installation.md): Install the plugin from Obsidian or install it manually
+- [Concepts](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Concepts.md): Explain how this plugin works and what to setup
+  - [Target Evaluation](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TargetEvaluation.md)
+  - [Input Parameters](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md)
+  - [Expressions](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Expressions.md)
+- [Examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Examples.md)
+- [Plugin Settings](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Settings.md)
+- [Release Notes](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/ReleaseNotes.md)
+- [Road Map](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/RoadMap.md)
+- [Frequently Asked Questions](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Questions.md)
+
+## Support
+
+- If you like this plugin or want to support further development, you can [Buy Me a Coffee](https://www.buymeacoffee.com/pyrochlore).
+- Please report bugs and request features in [GitHub Issues](https://github.com/pyrochlore/obsidian-tracker/issues)
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index 4ddb249..ad9a9b5 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,5 +1,11 @@
 # Release Notes
 
+## 1.15.1
+
+- Fix: Added DatasetName as title for calendar in annotation mode
+- Fix: Resolve scaling issue when navigating between monthly views
+- Update dependencies
+
 ## 1.15.0
 
 - Fix: Minor spelling error in Examples.md
diff --git a/manifest.json b/manifest.json
index c565b1f..8046462 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,10 +1,10 @@
-{
-  "id": "obsidian-tracker",
-  "name": "Tracker",
-  "version": "1.15.0",
-  "minAppVersion": "0.9.12",
-  "description": "A plugin tracks occurrences and numbers in your notes",
-  "author": "pyrochlore",
-  "authorUrl": "",
-  "isDesktopOnly": false
-}
+{
+  "id": "obsidian-tracker",
+  "name": "Tracker",
+  "version": "1.15.1",
+  "minAppVersion": "0.9.12",
+  "description": "A plugin tracks occurrences and numbers in your notes",
+  "author": "pyrochlore",
+  "authorUrl": "",
+  "isDesktopOnly": false
+}
diff --git a/package-lock.json b/package-lock.json
index 0b00ec5..2544d0f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.15.0",
+  "version": "1.15.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "obsidian-tracker",
-      "version": "1.15.0",
+      "version": "1.15.1",
       "license": "MIT",
       "dependencies": {
         "d3": "^7.9.0",
diff --git a/package.json b/package.json
index 954ddf2..d0e9153 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.15.0",
+  "version": "1.15.1",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
diff --git a/versions.json b/versions.json
index 4c7a502..2223ef4 100644
--- a/versions.json
+++ b/versions.json
@@ -1,40 +1,41 @@
-{
-  "1.0.0": "0.9.12",
-  "1.0.1": "0.9.12",
-  "1.0.2": "0.9.12",
-  "1.1.0": "0.9.12",
-  "1.2.0": "0.9.12",
-  "1.2.1": "0.9.12",
-  "1.3.0": "0.9.12",
-  "1.4.0": "0.9.12",
-  "1.4.1": "0.9.12",
-  "1.5.0": "0.9.12",
-  "1.5.1": "0.9.12",
-  "1.6.0": "0.9.12",
-  "1.6.1": "0.9.12",
-  "1.7.0": "0.9.12",
-  "1.8.0": "0.9.12",
-  "1.8.1": "0.9.12",
-  "1.8.2": "0.9.12",
-  "1.9.0": "0.9.12",
-  "1.9.1": "0.9.12",
-  "1.9.2": "0.9.12",
-  "1.10.0": "0.9.12",
-  "1.10.1": "0.9.12",
-  "1.10.2": "0.9.12",
-  "1.10.3": "0.9.12",
-  "1.10.4": "0.9.12",
-  "1.10.5": "0.9.12",
-  "1.10.6": "0.9.12",
-  "1.10.7": "0.9.12",
-  "1.10.8": "0.9.12",
-  "1.10.9": "0.9.12",
-  "1.11.0": "0.9.12",
-  "1.12.0": "0.9.12",
-  "1.13.0": "0.9.12",
-  "1.13.1": "0.9.12",
-  "1.13.2": "0.9.12",
-  "1.13.3": "0.9.12",
-  "1.14.0": "0.9.12",
-  "1.15.0": "0.9.12"
-}
+{
+  "1.0.0": "0.9.12",
+  "1.0.1": "0.9.12",
+  "1.0.2": "0.9.12",
+  "1.1.0": "0.9.12",
+  "1.2.0": "0.9.12",
+  "1.2.1": "0.9.12",
+  "1.3.0": "0.9.12",
+  "1.4.0": "0.9.12",
+  "1.4.1": "0.9.12",
+  "1.5.0": "0.9.12",
+  "1.5.1": "0.9.12",
+  "1.6.0": "0.9.12",
+  "1.6.1": "0.9.12",
+  "1.7.0": "0.9.12",
+  "1.8.0": "0.9.12",
+  "1.8.1": "0.9.12",
+  "1.8.2": "0.9.12",
+  "1.9.0": "0.9.12",
+  "1.9.1": "0.9.12",
+  "1.9.2": "0.9.12",
+  "1.10.0": "0.9.12",
+  "1.10.1": "0.9.12",
+  "1.10.2": "0.9.12",
+  "1.10.3": "0.9.12",
+  "1.10.4": "0.9.12",
+  "1.10.5": "0.9.12",
+  "1.10.6": "0.9.12",
+  "1.10.7": "0.9.12",
+  "1.10.8": "0.9.12",
+  "1.10.9": "0.9.12",
+  "1.11.0": "0.9.12",
+  "1.12.0": "0.9.12",
+  "1.13.0": "0.9.12",
+  "1.13.1": "0.9.12",
+  "1.13.2": "0.9.12",
+  "1.13.3": "0.9.12",
+  "1.14.0": "0.9.12",
+  "1.15.0": "0.9.12",
+  "1.15.1": "0.9.12"
+}

From 9f4e60726d72323aeee30659e47ec02bc935cdc8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Mar 2025 13:15:55 +0000
Subject: [PATCH 367/402] Bump @rollup/plugin-node-resolve from 16.0.0 to
 16.0.1

Bumps [@rollup/plugin-node-resolve](https://github.com/rollup/plugins/tree/HEAD/packages/node-resolve) from 16.0.0 to 16.0.1.
- [Changelog](https://github.com/rollup/plugins/blob/master/packages/node-resolve/CHANGELOG.md)
- [Commits](https://github.com/rollup/plugins/commits/node-resolve-v16.0.1/packages/node-resolve)

---
updated-dependencies:
- dependency-name: "@rollup/plugin-node-resolve"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2544d0f..9a6873d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,7 +16,7 @@
       },
       "devDependencies": {
         "@rollup/plugin-commonjs": "^26.0.3",
-        "@rollup/plugin-node-resolve": "^16.0.0",
+        "@rollup/plugin-node-resolve": "^16.0.1",
         "@rollup/plugin-terser": "^0.4.4",
         "@rollup/plugin-typescript": "^12.1.2",
         "@types/d3": "^7.4.3",
@@ -219,9 +219,9 @@
       }
     },
     "node_modules/@rollup/plugin-node-resolve": {
-      "version": "16.0.0",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-16.0.0.tgz",
-      "integrity": "sha512-0FPvAeVUT/zdWoO0jnb/V5BlBsUSNfkIOtFHzMO4H9MOklrmQFY6FduVHKucNb/aTFxvnGhj4MNj/T1oNdDfNg==",
+      "version": "16.0.1",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-16.0.1.tgz",
+      "integrity": "sha512-tk5YCxJWIG81umIvNkSod2qK5KyQW19qcBF/B78n1bjtOON6gzKoVeSzAE8yHCZEDmqkHKkxplExA8KzdJLJpA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index d0e9153..4ccad55 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
   "license": "MIT",
   "devDependencies": {
     "@rollup/plugin-commonjs": "^26.0.3",
-    "@rollup/plugin-node-resolve": "^16.0.0",
+    "@rollup/plugin-node-resolve": "^16.0.1",
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^12.1.2",
     "@types/d3": "^7.4.3",

From c9ceae9d7d7bf122477cd0113ca9682b70d564d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Apr 2025 14:13:11 +0000
Subject: [PATCH 368/402] Bump typescript from 5.7.3 to 5.8.3

Bumps [typescript](https://github.com/microsoft/TypeScript) from 5.7.3 to 5.8.3.
- [Release notes](https://github.com/microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release-publish.yml)
- [Commits](https://github.com/microsoft/TypeScript/commits)

---
updated-dependencies:
- dependency-name: typescript
  dependency-version: 5.8.3
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2544d0f..7e40d4f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,7 +26,7 @@
         "rollup": "^4.34.8",
         "rollup-plugin-copy": "^3.5.0",
         "tslib": "^2.8.1",
-        "typescript": "^5.7.3"
+        "typescript": "^5.8.3"
       }
     },
     "node_modules/@codemirror/state": {
@@ -2592,9 +2592,9 @@
       "license": "0BSD"
     },
     "node_modules/typescript": {
-      "version": "5.7.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz",
-      "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
+      "version": "5.8.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
+      "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
diff --git a/package.json b/package.json
index d0e9153..42811c5 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "rollup": "^4.34.8",
     "rollup-plugin-copy": "^3.5.0",
     "tslib": "^2.8.1",
-    "typescript": "^5.7.3"
+    "typescript": "^5.8.3"
   },
   "dependencies": {
     "d3": "^7.9.0",

From 0e0659c163bb2c4d0ed4b18a147a943fe5bb8db2 Mon Sep 17 00:00:00 2001
From: Lokesh-Bharath <bharathchandra.putnam@gmail.com>
Date: Sat, 12 Apr 2025 18:13:39 -0400
Subject: [PATCH 369/402] Adding thresholdType parameter to calendars to allow
 thresholds of LessThan and GreaterThan type

---
 docs/InputParameters.md  |  1 +
 examples/TestCalendar.md | 20 ++++++++++++++++++++
 src/data.ts              |  7 +++++++
 src/month.ts             | 35 +++++++++++++++++++++++++++--------
 src/parsing.ts           | 30 +++++++++++++++++++++++++++++-
 5 files changed, 84 insertions(+), 9 deletions(-)

diff --git a/docs/InputParameters.md b/docs/InputParameters.md
index 1683310..52fea28 100644
--- a/docs/InputParameters.md
+++ b/docs/InputParameters.md
@@ -139,6 +139,7 @@ These key-value pairs should be placed under the key `month`.
 | `dataset` | Index of the dataset of your interest | 1~NT | all indices of non-x searchTarget |
 | `startWeekOn` | First day of a week ('Sun'\|'Mon') | 1 | 'Sun' |
 | `threshold` | Threshold to determine showing a circle on a day or not | 1~NT | 0 |
+| `thresholdType` | Pick one of the two (GreaterThan\|LessThan) | 2 | GreaterThan
 | `yMin` | Minimum value | 1~NT | Minimum value of the dataset |
 | `yMax` | Maximum value | 1~NT | Maximum value of the dataset |
 | `showCircle` | Circle the day label if the collected value reach the threshold (value > `threshold`) | 1 | true |
diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
index f9505d4..d896134 100644
--- a/examples/TestCalendar.md
+++ b/examples/TestCalendar.md
@@ -70,6 +70,26 @@ month:
     showSelectedValue: true
 ```
 
+### Colored by Threshold and thresholdType
+Use parameters threshold and thresholdType - "LessThan" to color the circles
+``` tracker
+searchType: tag
+searchTarget: exercise-pushup
+datasetName: PushUp
+folder: diary
+endDate: 2021-01-31
+month:
+    startWeekOn:
+    threshold: 40
+    thresholdType: lessthan
+    color: green
+    headerMonthColor: orange
+    dimNotInMonth: false
+    todayRingColor: orange
+    selectedRingColor: steelblue
+    showSelectedValue: true
+```
+
 ### Check minDate, minValue, maxDate, maxValue
 ``` tracker
 searchType: tag
diff --git a/src/data.ts b/src/data.ts
index 3160027..a3d2809 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -37,6 +37,11 @@ export enum ValueType {
     String,
 }
 
+export enum ThresholdType {
+    GreaterThan = "greaterthan",
+    LessThan = "lessthan"
+}
+
 export type TextValueMap = {
     [key: string]: number;
 };
@@ -860,6 +865,7 @@ export class MonthInfo implements IGraph {
     dataset: number[];
     startWeekOn: string;
     threshold: number[];
+    thresholdType: string[];
     yMin: number[];
     yMax: number[];
     color: string;
@@ -896,6 +902,7 @@ export class MonthInfo implements IGraph {
         this.dataset = [];
         this.startWeekOn = "Sun";
         this.threshold = []; // if value > threshold, will show dot
+        this.thresholdType = []; 
         this.yMin = [];
         this.yMax = [];
         this.color = null;
diff --git a/src/month.ts b/src/month.ts
index a394700..d538a04 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -6,6 +6,7 @@ import {
     MonthInfo,
     Dataset,
     Size,
+    ThresholdType,
     Transform,
     ChartElements,
     GraphType,
@@ -535,7 +536,12 @@ function renderMonthDays(
     });
     if (curDatasetId < 0) curDatasetIndex = 0;
     let threshold = monthInfo.threshold[curDatasetIndex];
+    let thresholdType = monthInfo.thresholdType[curDatasetIndex];
 
+    if(logToConsole){
+        console.log(`threshold: ${threshold}, thresholdType: ${thresholdType}`);
+    }
+    
     let curMonth = curMonthDate.month(); // 0~11
     let curDaysInMonth = curMonthDate.daysInMonth(); // 28~31
 
@@ -644,8 +650,15 @@ function renderMonthDays(
             console.log(curValue);
         }
 
-        const showCircle = curValue != null && curValue > threshold;
 
+        let showCircle = curValue != null;
+
+        if(thresholdType === ThresholdType.LessThan){
+            showCircle = showCircle && (curValue < threshold);
+        } else {
+            showCircle = showCircle && (curValue > threshold);
+        }
+       
         // scaledValue
         let scaledValue = null;
         if (monthInfo.circleColorByValue) {
@@ -663,14 +676,17 @@ function renderMonthDays(
         let nextValue = dataset.getValue(curDate, 1);
         let prevValue = dataset.getValue(curDate, -1);
         let streakIn = false;
-        if (curValue !== null && curValue > threshold) {
-            if (prevValue !== null && prevValue > threshold) {
+        if (showCircle) {
+            if (prevValue !== null && ((thresholdType === ThresholdType.LessThan && prevValue
+                < threshold) || (thresholdType === ThresholdType.GreaterThan && prevValue > threshold))) {
                 streakIn = true;
-            }
+            } 
         }
+
         let streakOut = false;
-        if (curValue !== null && curValue > threshold) {
-            if (nextValue !== null && nextValue > threshold) {
+        if (showCircle) {
+            if (nextValue !== null && ((thresholdType === ThresholdType.LessThan && nextValue 
+                < threshold) ||  (thresholdType === ThresholdType.GreaterThan && nextValue > threshold))) {
                 streakOut = true;
             }
         }
@@ -685,7 +701,7 @@ function renderMonthDays(
         let textAnnotation = "";
         if (showAnnotation) {
             if (!showAnnotationOfAllTargets) {
-                if (curValue > threshold) {
+                if (showCircle) {
                     textAnnotation = curAnnotation;
                 }
             } else {
@@ -697,8 +713,11 @@ function renderMonthDays(
                         let v = renderInfo.datasets
                             .getDatasetById(datasetId)
                             .getValue(curDate);
+                        
+                        let ttype = monthInfo.thresholdType[datasetIndex];
                         let t = monthInfo.threshold[datasetIndex];
-                        if (v !== null && v > t) {
+                        if (v !== null && ((ttype === ThresholdType.LessThan && v < t) || 
+                            (ttype == ThresholdType.GreaterThan && v > t))) {
                             textAnnotation += annotations[datasetIndex];
                         }
                     }
diff --git a/src/parsing.ts b/src/parsing.ts
index 9d47feb..d56e514 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -16,6 +16,7 @@ import {
     Dataset,
     CustomDatasetInfo,
     AspectRatio,
+    ThresholdType
 } from "./data";
 import { TFolder, normalizePath } from "obsidian";
 import { parseYaml } from "obsidian";
@@ -1042,7 +1043,7 @@ export function getRenderInfoFromYaml(
         searchType.filter((t) => t !== SearchType.Table).length > 0
     ) {
         let errorMessage =
-            "searchType 'table' doestn't work with other types for now";
+            "searchType 'table' doesn't work with other types for now";
         return errorMessage;
     }
     // console.log(searchType);
@@ -2088,6 +2089,33 @@ export function getRenderInfoFromYaml(
         }
         // console.log(month.threshold);
 
+        // thresholdType
+        let retThresholdType = getStringArray("thresholdType", yamlMonth?.thresholdType);
+        if (typeof retThresholdType === "string") {
+            return retThresholdType;
+        }
+        month.thresholdType = retThresholdType;
+        if (month.thresholdType.length === 0) {
+            for (let indDataset = 0; indDataset < numDataset; indDataset++) {
+                month.thresholdType.push(ThresholdType.GreaterThan);
+            }
+        }
+        if (month.thresholdType.length !== month.dataset.length) {
+            const errorMessage =
+                "The number of inputs of thresholdType and dataset not matched";
+            return errorMessage;
+        }
+        for(let ind in month.thresholdType) {
+            if(!Object.values(ThresholdType).includes(month.thresholdType[ind].toLowerCase() as ThresholdType)) {
+                const errorMessage =
+                    "thresholdType should be either 'GreaterThan' or 'LessThan'";
+                return errorMessage;
+            } else {
+                month.thresholdType[ind] = month.thresholdType[ind].toLowerCase();
+            }
+        }
+        // console.log(month.thresholdType);
+
         // yMin
         let retYMin = getNumberArray("yMin", yamlMonth?.yMin);
         if (typeof retYMin === "string") {

From 2ad96600fbdb4a2a569325244a33c2f7ca0aa4aa Mon Sep 17 00:00:00 2001
From: Lokesh-Bharath <47545252+Lokesh-Bharath@users.noreply.github.com>
Date: Tue, 15 Apr 2025 12:30:03 -0400
Subject: [PATCH 370/402] Update the case to "LessThan" in TestCalendar.md

---
 examples/TestCalendar.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
index d896134..77e24ca 100644
--- a/examples/TestCalendar.md
+++ b/examples/TestCalendar.md
@@ -81,7 +81,7 @@ endDate: 2021-01-31
 month:
     startWeekOn:
     threshold: 40
-    thresholdType: lessthan
+    thresholdType: LessThan
     color: green
     headerMonthColor: orange
     dimNotInMonth: false

From d4b1980638292977512188ee8fdf2ee914914ab8 Mon Sep 17 00:00:00 2001
From: Lokesh-Bharath <47545252+Lokesh-Bharath@users.noreply.github.com>
Date: Tue, 15 Apr 2025 12:30:03 -0400
Subject: [PATCH 371/402] Update the case to "LessThan" in TestCalendar.md

---
 examples/TestCalendar.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
index d896134..77e24ca 100644
--- a/examples/TestCalendar.md
+++ b/examples/TestCalendar.md
@@ -81,7 +81,7 @@ endDate: 2021-01-31
 month:
     startWeekOn:
     threshold: 40
-    thresholdType: lessthan
+    thresholdType: LessThan
     color: green
     headerMonthColor: orange
     dimNotInMonth: false

From 2ee63575b5c99959cab93475534d5698b993ab66 Mon Sep 17 00:00:00 2001
From: Lokesh-Bharath <bharathchandra.putnam@gmail.com>
Date: Wed, 30 Apr 2025 13:30:43 -0400
Subject: [PATCH 372/402] Added a new field to allow increasing intensity of
 circle color with streak length

---
 docs/InputParameters.md  |  3 ++-
 examples/TestCalendar.md | 15 +++++++++++
 src/data.ts              |  2 ++
 src/month.ts             | 56 +++++++++++++++++++++++++++++++---------
 src/parsing.ts           |  6 +++++
 5 files changed, 69 insertions(+), 13 deletions(-)

diff --git a/docs/InputParameters.md b/docs/InputParameters.md
index 52fea28..a219a52 100644
--- a/docs/InputParameters.md
+++ b/docs/InputParameters.md
@@ -139,7 +139,7 @@ These key-value pairs should be placed under the key `month`.
 | `dataset` | Index of the dataset of your interest | 1~NT | all indices of non-x searchTarget |
 | `startWeekOn` | First day of a week ('Sun'\|'Mon') | 1 | 'Sun' |
 | `threshold` | Threshold to determine showing a circle on a day or not | 1~NT | 0 |
-| `thresholdType` | Pick one of the two (GreaterThan\|LessThan) | 2 | GreaterThan
+| `thresholdType` | Pick one of the two (GreaterThan\|LessThan) | 1 | GreaterThan
 | `yMin` | Minimum value | 1~NT | Minimum value of the dataset |
 | `yMax` | Maximum value | 1~NT | Maximum value of the dataset |
 | `showCircle` | Circle the day label if the collected value reach the threshold (value > `threshold`) | 1 | true |
@@ -151,6 +151,7 @@ These key-value pairs should be placed under the key `month`.
 | `showSelectedRing` | Show/hide a ring on the label of the selected day | 1 | true |
 | `circleColor` | Color of circles | 1 | '#69b3a2' |
 | `circleColorByValue` | Display circle colors based on the value | 1 | false |
+| `circleColorByStreak` | Display circle colors based on the streak length | 1 | false |
 | `headerYearColor` | Color of the year text in header | 1 | 'white' |
 | `headerMonthColor` | Color of the month text in header | 1 | 'white' |
 | `dividingLineColor` | Color of the dividing line | 1 | '#69b3a2' |
diff --git a/examples/TestCalendar.md b/examples/TestCalendar.md
index 77e24ca..68705a7 100644
--- a/examples/TestCalendar.md
+++ b/examples/TestCalendar.md
@@ -69,6 +69,21 @@ month:
     yMax: 50
     showSelectedValue: true
 ```
+### Colored by Streak
+Use parameter circleColorByStreak to increase color intesity with streaklength. This can also be used along with thresholdtype parameter.
+``` tracker
+searchType: tag
+searchTarget: exercise-pushup
+datasetName: PushUp
+folder: diary
+endDate: 2021-01-31
+month:
+    startWeekOn:
+    threshold: 30
+    color: red
+    dimNotInMonth: false
+    circleColorByStreak: true
+```
 
 ### Colored by Threshold and thresholdType
 Use parameters threshold and thresholdType - "LessThan" to color the circles
diff --git a/src/data.ts b/src/data.ts
index a3d2809..0e45a67 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -885,6 +885,7 @@ export class MonthInfo implements IGraph {
     showSelectedRing: boolean;
     circleColor: string;
     circleColorByValue: boolean;
+    circleColorByStreak: boolean;
     todayRingColor: string;
     selectedRingColor: string;
 
@@ -922,6 +923,7 @@ export class MonthInfo implements IGraph {
         this.showSelectedRing = true;
         this.circleColor = null;
         this.circleColorByValue = false;
+        this.circleColorByStreak = false;
         this.todayRingColor = ""; // white
         this.selectedRingColor = "firebrick";
 
diff --git a/src/month.ts b/src/month.ts
index d538a04..6c04c47 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -31,6 +31,7 @@ interface DayInfo {
     showCircle: boolean;
     streakIn: boolean;
     streakOut: boolean;
+    curStreakCount: number;
     annotation: string;
 }
 
@@ -394,7 +395,7 @@ function renderMonthHeader(
     let arrowRight = headerGroup
         .append("text")
         .text(">") // pivot at center
-        .attr("id", "arrowLeft")
+        .attr("id", "arrowRight")
         .attr(
             "transform",
             "translate(" +
@@ -598,6 +599,20 @@ function renderMonthDays(
     let indCol = 0;
     let indRow = 0;
     let ind = 0;
+    let curStreakCount = 0;
+    
+    let streakStartDate = startDate.clone().subtract(1, "days");
+    while(curStreakCount < 28) {
+        let curValue = dataset.getValue(streakStartDate);
+        if(curValue != null && ((thresholdType === ThresholdType.LessThan && curValue < threshold) 
+            || (thresholdType === ThresholdType.GreaterThan && curValue > threshold))) {
+            curStreakCount++;
+            streakStartDate = streakStartDate.subtract(1, "days");
+        } else {
+            break;
+        }
+    }
+    
     for (
         let curDate = startDate.clone();
         curDate <= endDate;
@@ -683,6 +698,13 @@ function renderMonthDays(
             } 
         }
 
+        if(showCircle) {
+            curStreakCount != 28? curStreakCount++: curStreakCount;
+        }
+        else {
+            curStreakCount = 0;
+        }
+       
         let streakOut = false;
         if (showCircle) {
             if (nextValue !== null && ((thresholdType === ThresholdType.LessThan && nextValue 
@@ -737,6 +759,7 @@ function renderMonthDays(
             showCircle: showCircle,
             streakIn: streakIn,
             streakOut: streakOut,
+            curStreakCount: curStreakCount,
             annotation: textAnnotation,
         });
 
@@ -796,14 +819,18 @@ function renderMonthDays(
             .attr("height", streakHeight)
             .style("fill", function (d: DayInfo) {
                 if (d.showCircle) {
-                    if (!monthInfo.circleColorByValue) {
+                    if (!(monthInfo.circleColorByValue || monthInfo.circleColorByStreak)) {
                         return streakColor;
                     }
-                    if (d.scaledValue !== null) {
+                    if (monthInfo.circleColorByValue && d.scaledValue !== null) {
                         return d3.interpolateLab(
                             "white",
                             streakColor
                         )(d.scaledValue * 0.8 + 0.2);
+                    } else if(monthInfo.circleColorByStreak && d.curStreakCount > 0){
+                        return d3.interpolateLab( "white", streakColor)(
+                            Math.log10(d.curStreakCount)/Math.log10(28) * 0.6 + 0.4
+                          );
                     } else {
                         return "none";
                     }
@@ -843,14 +870,18 @@ function renderMonthDays(
             .attr("height", streakHeight)
             .style("fill", function (d: DayInfo) {
                 if (d.showCircle) {
-                    if (!monthInfo.circleColorByValue) {
+                    if (!(monthInfo.circleColorByValue || monthInfo.circleColorByStreak)) {
                         return streakColor;
                     }
-                    if (d.scaledValue !== null) {
+                    if (monthInfo.circleColorByValue && d.scaledValue !== null) {
                         return d3.interpolateLab(
                             "white",
                             streakColor
                         )(d.scaledValue * 0.8 + 0.2);
+                    } else if(monthInfo.circleColorByStreak && d.curStreakCount > 0){
+                        return d3.interpolateLab("white", streakColor)(
+                            Math.log10(d.curStreakCount)/Math.log10(28) * 0.6 + 0.4
+                        );    
                     } else {
                         return "none";
                     }
@@ -890,17 +921,18 @@ function renderMonthDays(
             })
             .style("fill", function (d: DayInfo) {
                 if (d.showCircle) {
-                    if (!monthInfo.circleColorByValue) {
+                    if (!(monthInfo.circleColorByValue || monthInfo.circleColorByStreak)) {
                         return circleColor;
                     }
-                    if (d.scaledValue !== null) {
-                        let scaledColor = d3.interpolateLab(
+                    if (monthInfo.circleColorByValue && d.scaledValue !== null) {
+                        return d3.interpolateLab(
                             "white",
                             circleColor
-                        )(d.scaledValue * 0.8 + 0.2);
-                        // console.log(d.scaledValue);
-                        // console.log(scaledColor);
-                        return scaledColor;
+                        )(d.scaledValue * 0.8 + 0.2);  
+                    } else if(monthInfo.circleColorByStreak && d.curStreakCount > 0){
+                        return d3.interpolateLab( "white", circleColor)(
+                            Math.log10(d.curStreakCount)/Math.log10(28) * 0.6 + 0.4
+                        );
                     } else {
                         return "none";
                     }
diff --git a/src/parsing.ts b/src/parsing.ts
index d56e514..d47ae35 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -2199,6 +2199,12 @@ export function getRenderInfoFromYaml(
         }
         // console.log(month.circleColorByValue);
 
+        // circleColorByStreak
+        if (typeof yamlMonth?.circleColorByStreak === "boolean") {
+            month.circleColorByStreak = yamlMonth.circleColorByStreak;
+        }
+        //console.log(month.circleColorByStreak);
+
         // headerYearColor
         month.headerYearColor = getStringFromInput(
             yamlMonth?.headerYearColor,

From 4106aa9bbf789ab7c3419e8f19a6cdb0fba75246 Mon Sep 17 00:00:00 2001
From: xy <xiaoyun.anye@gmail.com>
Date: Sat, 10 May 2025 18:08:09 -0700
Subject: [PATCH 373/402] Create new branch to prep for better bar chart
 display

---
 docs/InputParameters.md  |  1 +
 examples/TestBarChart.md |  4 ++++
 src/data.ts              |  2 ++
 src/parsing.ts           |  8 ++++++++
 src/rendering.ts         | 22 +++++++++++++++++++++-
 5 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/docs/InputParameters.md b/docs/InputParameters.md
index 1683310..1f3cfe4 100644
--- a/docs/InputParameters.md
+++ b/docs/InputParameters.md
@@ -103,6 +103,7 @@ These key-value pairs should be placed under the key `bar`.
 | Key | Description | Number of Values | Default |
 |:--------|:-------|:-----------:|:------|
 | `barColor` | Color of bars in the chart | 1~NT | #69b3a2 |
+| `xAxisPadding` | Padding to ensure bars are fully displayed | 1~2 | null |
 | `yAxisLocation` |  Corresponding y-axis for the dataset (left\|right) | 1~NT | left |
 
 ### Parameters for a Summary
diff --git a/examples/TestBarChart.md b/examples/TestBarChart.md
index 73c28db..2ae1bdb 100644
--- a/examples/TestBarChart.md
+++ b/examples/TestBarChart.md
@@ -9,6 +9,7 @@ endDate: 2021-01-05
 bar:
     title: Weight Log
     yAxisLabel: Weight
+    xAxisPadding: 12h
     yAxisUnit: kg
     yMin: 0
     barColor: darkolivegreen
@@ -23,6 +24,7 @@ endDate: 2021-01-31
 bar:
     title: Weight Log
     yAxisLabel: Weight
+    xAxisPadding: 0.5d
     yAxisUnit: kg
     yMin: 0
     barColor: brown
@@ -37,6 +39,7 @@ endDate: 2021-01-21
 bar:
     title: Sin Wave
     yAxisLabel: Value
+    xAxisPadding: 12h
     barColor: yellow, red, green
 ```
 
@@ -49,6 +52,7 @@ endDate: 2021-01-05
 bar:
     title: Sin Square Wave
     yAxisLabel: Value
+    xAxisPadding: 12h
     yMin: 0
     barColor: yellow, red, green, blue, orange, white
 ```
diff --git a/src/data.ts b/src/data.ts
index 3160027..b44d9b0 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -786,11 +786,13 @@ export class LineInfo extends CommonChartInfo {
 export class BarInfo extends CommonChartInfo {
     barColor: string[];
     yAxisLocation: string[];
+    xAxisPadding: string;
 
     constructor() {
         super();
         this.barColor = []; // #69b3a2
         this.yAxisLocation = []; // left, for each target
+        this.xAxisPadding = null; // the string will be converted to Duration (a month is not nesscesary to 30 days)
     }
 
     public GetGraphType() {
diff --git a/src/parsing.ts b/src/parsing.ts
index 9d47feb..d5ecc95 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1835,6 +1835,14 @@ export function getRenderInfoFromYaml(
         bar.yAxisLocation = retYAxisLocation;
         // console.log(bar.yAxisLocation);
 
+        // xAxisPadding
+        let retXAxisPadding = getStringFromInput(
+            yamlBar?.xAxisPadding,
+            null
+        );
+        bar.xAxisPadding = retXAxisPadding;
+        // console.log(bar.xAxisPadding);
+
         renderInfo.bar.push(bar);
     } // bar related parameters
     // console.log(renderInfo.bar);
diff --git a/src/rendering.ts b/src/rendering.ts
index a530e19..871d99c 100644
--- a/src/rendering.ts
+++ b/src/rendering.ts
@@ -307,6 +307,16 @@ function renderXAxis(
 
     let datasets = renderInfo.datasets;
     let xDomain = d3.extent(datasets.getDates());
+    if (chartInfo instanceof BarInfo && chartInfo.xAxisPadding) {
+        let xAxisPaddingDuration = helper.parseDurationString(
+            chartInfo.xAxisPadding
+        );
+        xDomain = [
+            xDomain[0].clone().subtract(xAxisPaddingDuration.asHours(), 'hours'),
+            xDomain[1].clone().add(xAxisPaddingDuration.asHours(), 'hours'),
+        ];
+    }
+    console.log(xDomain);
     let xScale = d3
         .scaleTime()
         .domain(xDomain)
@@ -954,8 +964,13 @@ function renderBar(
         .enter()
         .append("rect")
         .attr("x", function (p: DataPoint, i: number) {
+<<<<<<< Updated upstream
             if (i === 0) {
                 let portionVisible = currentDiaplayInd + 1 - totalDiaplaySet / 2.0;
+=======
+            if (i === 0 && barInfo.xAxisPadding === null) {
+                let portionVisible = currBarSet + 1 - totalNumOfBarSets / 2.0;
+>>>>>>> Stashed changes
                 if (portionVisible < 1.0) {
                     return (
                         chartElements.xScale(p.date) -
@@ -975,15 +990,20 @@ function renderBar(
             return yScale(Math.max(p.value, 0));
         })
         .attr("width", function (p: DataPoint, i: number) {
+<<<<<<< Updated upstream
             if (i === 0) {
                 let portionVisible = currentDiaplayInd + 1 - totalDiaplaySet / 2.0;
+=======
+            if (i === 0 && barInfo.xAxisPadding === null) {
+                let portionVisible = currBarSet + 1 - totalNumOfBarSets / 2.0;
+>>>>>>> Stashed changes
                 if (portionVisible < 0.0) {
                     return 0.0;
                 } else if (portionVisible < 1.0) {
                     return barWidth * portionVisible;
                 }
                 return barWidth;
-            } else if (i === dataset.getLength() - 1) {
+            } else if (i === dataset.getLength() - 1 && barInfo.xAxisPadding === null) {
                 let portionVisible =
                     1.0 - (currentDiaplayInd + 1 - totalDiaplaySet / 2.0);
                 if (portionVisible < 0.0) {

From a5a2e2557510ce9fe695b753710eecff76f57a39 Mon Sep 17 00:00:00 2001
From: xy <xiaoyun.anye@gmail.com>
Date: Sat, 10 May 2025 18:32:47 -0700
Subject: [PATCH 374/402] Update logging

---
 examples/TestBarChart.md |  3 ++-
 src/rendering.ts         | 28 ++++++++++------------------
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/examples/TestBarChart.md b/examples/TestBarChart.md
index 2ae1bdb..118a754 100644
--- a/examples/TestBarChart.md
+++ b/examples/TestBarChart.md
@@ -24,7 +24,7 @@ endDate: 2021-01-31
 bar:
     title: Weight Log
     yAxisLabel: Weight
-    xAxisPadding: 0.5d
+    xAxisPadding: 12h
     yAxisUnit: kg
     yMin: 0
     barColor: brown
@@ -68,6 +68,7 @@ stack: true
 bar:
     title: Sin Square Wave (Stacked)
     yAxisLabel: Value
+    xAxisPadding: 12h
     yMin: 0
     barColor: yellow, red, green, blue, orange, black
 ```
diff --git a/src/rendering.ts b/src/rendering.ts
index 871d99c..8f4a711 100644
--- a/src/rendering.ts
+++ b/src/rendering.ts
@@ -307,16 +307,18 @@ function renderXAxis(
 
     let datasets = renderInfo.datasets;
     let xDomain = d3.extent(datasets.getDates());
-    if (chartInfo instanceof BarInfo && chartInfo.xAxisPadding) {
+    if (chartInfo instanceof BarInfo && chartInfo.xAxisPadding !== null) {
         let xAxisPaddingDuration = helper.parseDurationString(
             chartInfo.xAxisPadding
         );
-        xDomain = [
-            xDomain[0].clone().subtract(xAxisPaddingDuration.asHours(), 'hours'),
-            xDomain[1].clone().add(xAxisPaddingDuration.asHours(), 'hours'),
-        ];
+        if (xAxisPaddingDuration !== null) {
+            xDomain = [
+                xDomain[0].clone().subtract(xAxisPaddingDuration.asHours(), 'hours'),
+                xDomain[1].clone().add(xAxisPaddingDuration.asHours(), 'hours'),
+            ];
+        }
     }
-    console.log(xDomain);
+    // console.log(xDomain);
     let xScale = d3
         .scaleTime()
         .domain(xDomain)
@@ -964,13 +966,8 @@ function renderBar(
         .enter()
         .append("rect")
         .attr("x", function (p: DataPoint, i: number) {
-<<<<<<< Updated upstream
-            if (i === 0) {
-                let portionVisible = currentDiaplayInd + 1 - totalDiaplaySet / 2.0;
-=======
             if (i === 0 && barInfo.xAxisPadding === null) {
-                let portionVisible = currBarSet + 1 - totalNumOfBarSets / 2.0;
->>>>>>> Stashed changes
+                let portionVisible = currentDiaplayInd + 1 - totalDiaplaySet / 2.0;
                 if (portionVisible < 1.0) {
                     return (
                         chartElements.xScale(p.date) -
@@ -990,13 +987,8 @@ function renderBar(
             return yScale(Math.max(p.value, 0));
         })
         .attr("width", function (p: DataPoint, i: number) {
-<<<<<<< Updated upstream
-            if (i === 0) {
-                let portionVisible = currentDiaplayInd + 1 - totalDiaplaySet / 2.0;
-=======
             if (i === 0 && barInfo.xAxisPadding === null) {
-                let portionVisible = currBarSet + 1 - totalNumOfBarSets / 2.0;
->>>>>>> Stashed changes
+                let portionVisible = currentDiaplayInd + 1 - totalDiaplaySet / 2.0;
                 if (portionVisible < 0.0) {
                     return 0.0;
                 } else if (portionVisible < 1.0) {

From ad5a8a5971c444b2241ce422db4c722da68e59cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 May 2025 13:58:26 +0000
Subject: [PATCH 375/402] Bump @types/node from 22.13.4 to 22.15.17

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 22.13.4 to 22.15.17.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 22.15.17
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 16 ++++++++--------
 package.json      |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2544d0f..dd7d304 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,7 @@
         "@rollup/plugin-terser": "^0.4.4",
         "@rollup/plugin-typescript": "^12.1.2",
         "@types/d3": "^7.4.3",
-        "@types/node": "^22.13.4",
+        "@types/node": "^22.15.17",
         "@types/sprintf-js": "^1.1.4",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
         "rollup": "^4.34.8",
@@ -919,13 +919,13 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "22.13.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.4.tgz",
-      "integrity": "sha512-ywP2X0DYtX3y08eFVx5fNIw7/uIv8hYUKgXoK8oayJlLnKcRfEYCxWMVE1XagUdVtCJlZT1AU4LXEABW+L1Peg==",
+      "version": "22.15.17",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.17.tgz",
+      "integrity": "sha512-wIX2aSZL5FE+MR0JlvF87BNVrtFWf6AE6rxSE9X7OwnVvoyCQjpzSRJ+M87se/4QCkCiebQAqrJ0y6fwIyi7nw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~6.20.0"
+        "undici-types": "~6.21.0"
       }
     },
     "node_modules/@types/resolve": {
@@ -2606,9 +2606,9 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "6.20.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
+      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
       "dev": true,
       "license": "MIT"
     },
diff --git a/package.json b/package.json
index d0e9153..e224ff1 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^12.1.2",
     "@types/d3": "^7.4.3",
-    "@types/node": "^22.13.4",
+    "@types/node": "^22.15.17",
     "@types/sprintf-js": "^1.1.4",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
     "rollup": "^4.34.8",

From 9caa6637491fc11df13b2c3a0ac880e20d0a9797 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 May 2025 13:59:26 +0000
Subject: [PATCH 376/402] Bump rollup from 4.34.8 to 4.40.2

Bumps [rollup](https://github.com/rollup/rollup) from 4.34.8 to 4.40.2.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v4.34.8...v4.40.2)

---
updated-dependencies:
- dependency-name: rollup
  dependency-version: 4.40.2
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 183 +++++++++++++++++++++++++---------------------
 package.json      |   2 +-
 2 files changed, 100 insertions(+), 85 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2544d0f..cac257d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,7 +23,7 @@
         "@types/node": "^22.13.4",
         "@types/sprintf-js": "^1.1.4",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-        "rollup": "^4.34.8",
+        "rollup": "^4.40.2",
         "rollup-plugin-copy": "^3.5.0",
         "tslib": "^2.8.1",
         "typescript": "^5.7.3"
@@ -317,9 +317,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.34.8.tgz",
-      "integrity": "sha512-q217OSE8DTp8AFHuNHXo0Y86e1wtlfVrXiAlwkIvGRQv9zbc6mE3sjIVfwI8sYUyNxwOg0j/Vm1RKM04JcWLJw==",
+      "version": "4.40.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.40.2.tgz",
+      "integrity": "sha512-JkdNEq+DFxZfUwxvB58tHMHBHVgX23ew41g1OQinthJ+ryhdRk67O31S7sYw8u2lTjHUPFxwar07BBt1KHp/hg==",
       "cpu": [
         "arm"
       ],
@@ -331,9 +331,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.34.8.tgz",
-      "integrity": "sha512-Gigjz7mNWaOL9wCggvoK3jEIUUbGul656opstjaUSGC3eT0BM7PofdAJaBfPFWWkXNVAXbaQtC99OCg4sJv70Q==",
+      "version": "4.40.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.40.2.tgz",
+      "integrity": "sha512-13unNoZ8NzUmnndhPTkWPWbX3vtHodYmy+I9kuLxN+F+l+x3LdVF7UCu8TWVMt1POHLh6oDHhnOA04n8oJZhBw==",
       "cpu": [
         "arm64"
       ],
@@ -345,9 +345,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.34.8.tgz",
-      "integrity": "sha512-02rVdZ5tgdUNRxIUrFdcMBZQoaPMrxtwSb+/hOfBdqkatYHR3lZ2A2EGyHq2sGOd0Owk80oV3snlDASC24He3Q==",
+      "version": "4.40.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.40.2.tgz",
+      "integrity": "sha512-Gzf1Hn2Aoe8VZzevHostPX23U7N5+4D36WJNHK88NZHCJr7aVMG4fadqkIf72eqVPGjGc0HJHNuUaUcxiR+N/w==",
       "cpu": [
         "arm64"
       ],
@@ -359,9 +359,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.34.8.tgz",
-      "integrity": "sha512-qIP/elwR/tq/dYRx3lgwK31jkZvMiD6qUtOycLhTzCvrjbZ3LjQnEM9rNhSGpbLXVJYQ3rq39A6Re0h9tU2ynw==",
+      "version": "4.40.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.40.2.tgz",
+      "integrity": "sha512-47N4hxa01a4x6XnJoskMKTS8XZ0CZMd8YTbINbi+w03A2w4j1RTlnGHOz/P0+Bg1LaVL6ufZyNprSg+fW5nYQQ==",
       "cpu": [
         "x64"
       ],
@@ -373,9 +373,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.34.8.tgz",
-      "integrity": "sha512-IQNVXL9iY6NniYbTaOKdrlVP3XIqazBgJOVkddzJlqnCpRi/yAeSOa8PLcECFSQochzqApIOE1GHNu3pCz+BDA==",
+      "version": "4.40.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.40.2.tgz",
+      "integrity": "sha512-8t6aL4MD+rXSHHZUR1z19+9OFJ2rl1wGKvckN47XFRVO+QL/dUSpKA2SLRo4vMg7ELA8pzGpC+W9OEd1Z/ZqoQ==",
       "cpu": [
         "arm64"
       ],
@@ -387,9 +387,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.34.8.tgz",
-      "integrity": "sha512-TYXcHghgnCqYFiE3FT5QwXtOZqDj5GmaFNTNt3jNC+vh22dc/ukG2cG+pi75QO4kACohZzidsq7yKTKwq/Jq7Q==",
+      "version": "4.40.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.40.2.tgz",
+      "integrity": "sha512-C+AyHBzfpsOEYRFjztcYUFsH4S7UsE9cDtHCtma5BK8+ydOZYgMmWg1d/4KBytQspJCld8ZIujFMAdKG1xyr4Q==",
       "cpu": [
         "x64"
       ],
@@ -401,9 +401,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.34.8.tgz",
-      "integrity": "sha512-A4iphFGNkWRd+5m3VIGuqHnG3MVnqKe7Al57u9mwgbyZ2/xF9Jio72MaY7xxh+Y87VAHmGQr73qoKL9HPbXj1g==",
+      "version": "4.40.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.40.2.tgz",
+      "integrity": "sha512-de6TFZYIvJwRNjmW3+gaXiZ2DaWL5D5yGmSYzkdzjBDS3W+B9JQ48oZEsmMvemqjtAFzE16DIBLqd6IQQRuG9Q==",
       "cpu": [
         "arm"
       ],
@@ -415,9 +415,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.34.8.tgz",
-      "integrity": "sha512-S0lqKLfTm5u+QTxlFiAnb2J/2dgQqRy/XvziPtDd1rKZFXHTyYLoVL58M/XFwDI01AQCDIevGLbQrMAtdyanpA==",
+      "version": "4.40.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.40.2.tgz",
+      "integrity": "sha512-urjaEZubdIkacKc930hUDOfQPysezKla/O9qV+O89enqsqUmQm8Xj8O/vh0gHg4LYfv7Y7UsE3QjzLQzDYN1qg==",
       "cpu": [
         "arm"
       ],
@@ -429,9 +429,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.34.8.tgz",
-      "integrity": "sha512-jpz9YOuPiSkL4G4pqKrus0pn9aYwpImGkosRKwNi+sJSkz+WU3anZe6hi73StLOQdfXYXC7hUfsQlTnjMd3s1A==",
+      "version": "4.40.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.40.2.tgz",
+      "integrity": "sha512-KlE8IC0HFOC33taNt1zR8qNlBYHj31qGT1UqWqtvR/+NuCVhfufAq9fxO8BMFC22Wu0rxOwGVWxtCMvZVLmhQg==",
       "cpu": [
         "arm64"
       ],
@@ -443,9 +443,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.34.8.tgz",
-      "integrity": "sha512-KdSfaROOUJXgTVxJNAZ3KwkRc5nggDk+06P6lgi1HLv1hskgvxHUKZ4xtwHkVYJ1Rep4GNo+uEfycCRRxht7+Q==",
+      "version": "4.40.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.40.2.tgz",
+      "integrity": "sha512-j8CgxvfM0kbnhu4XgjnCWJQyyBOeBI1Zq91Z850aUddUmPeQvuAy6OiMdPS46gNFgy8gN1xkYyLgwLYZG3rBOg==",
       "cpu": [
         "arm64"
       ],
@@ -457,9 +457,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-      "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.34.8.tgz",
-      "integrity": "sha512-NyF4gcxwkMFRjgXBM6g2lkT58OWztZvw5KkV2K0qqSnUEqCVcqdh2jN4gQrTn/YUpAcNKyFHfoOZEer9nwo6uQ==",
+      "version": "4.40.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.40.2.tgz",
+      "integrity": "sha512-Ybc/1qUampKuRF4tQXc7G7QY9YRyeVSykfK36Y5Qc5dmrIxwFhrOzqaVTNoZygqZ1ZieSWTibfFhQ5qK8jpWxw==",
       "cpu": [
         "loong64"
       ],
@@ -471,9 +471,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.34.8.tgz",
-      "integrity": "sha512-LMJc999GkhGvktHU85zNTDImZVUCJ1z/MbAJTnviiWmmjyckP5aQsHtcujMjpNdMZPT2rQEDBlJfubhs3jsMfw==",
+      "version": "4.40.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.40.2.tgz",
+      "integrity": "sha512-3FCIrnrt03CCsZqSYAOW/k9n625pjpuMzVfeI+ZBUSDT3MVIFDSPfSUgIl9FqUftxcUXInvFah79hE1c9abD+Q==",
       "cpu": [
         "ppc64"
       ],
@@ -485,9 +485,23 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.34.8.tgz",
-      "integrity": "sha512-xAQCAHPj8nJq1PI3z8CIZzXuXCstquz7cIOL73HHdXiRcKk8Ywwqtx2wrIy23EcTn4aZ2fLJNBB8d0tQENPCmw==",
+      "version": "4.40.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.40.2.tgz",
+      "integrity": "sha512-QNU7BFHEvHMp2ESSY3SozIkBPaPBDTsfVNGx3Xhv+TdvWXFGOSH2NJvhD1zKAT6AyuuErJgbdvaJhYVhVqrWTg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-musl": {
+      "version": "4.40.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.40.2.tgz",
+      "integrity": "sha512-5W6vNYkhgfh7URiXTO1E9a0cy4fSgfE4+Hl5agb/U1sa0kjOLMLC1wObxwKxecE17j0URxuTrYZZME4/VH57Hg==",
       "cpu": [
         "riscv64"
       ],
@@ -499,9 +513,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.8.tgz",
-      "integrity": "sha512-DdePVk1NDEuc3fOe3dPPTb+rjMtuFw89gw6gVWxQFAuEqqSdDKnrwzZHrUYdac7A7dXl9Q2Vflxpme15gUWQFA==",
+      "version": "4.40.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.40.2.tgz",
+      "integrity": "sha512-B7LKIz+0+p348JoAL4X/YxGx9zOx3sR+o6Hj15Y3aaApNfAshK8+mWZEf759DXfRLeL2vg5LYJBB7DdcleYCoQ==",
       "cpu": [
         "s390x"
       ],
@@ -513,9 +527,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.8.tgz",
-      "integrity": "sha512-8y7ED8gjxITUltTUEJLQdgpbPh1sUQ0kMTmufRF/Ns5tI9TNMNlhWtmPKKHCU0SilX+3MJkZ0zERYYGIVBYHIA==",
+      "version": "4.40.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.40.2.tgz",
+      "integrity": "sha512-lG7Xa+BmBNwpjmVUbmyKxdQJ3Q6whHjMjzQplOs5Z+Gj7mxPtWakGHqzMqNER68G67kmCX9qX57aRsW5V0VOng==",
       "cpu": [
         "x64"
       ],
@@ -527,9 +541,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.8.tgz",
-      "integrity": "sha512-SCXcP0ZpGFIe7Ge+McxY5zKxiEI5ra+GT3QRxL0pMMtxPfpyLAKleZODi1zdRHkz5/BhueUrYtYVgubqe9JBNQ==",
+      "version": "4.40.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.40.2.tgz",
+      "integrity": "sha512-tD46wKHd+KJvsmije4bUskNuvWKFcTOIM9tZ/RrmIvcXnbi0YK/cKS9FzFtAm7Oxi2EhV5N2OpfFB348vSQRXA==",
       "cpu": [
         "x64"
       ],
@@ -541,9 +555,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.34.8.tgz",
-      "integrity": "sha512-YHYsgzZgFJzTRbth4h7Or0m5O74Yda+hLin0irAIobkLQFRQd1qWmnoVfwmKm9TXIZVAD0nZ+GEb2ICicLyCnQ==",
+      "version": "4.40.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.40.2.tgz",
+      "integrity": "sha512-Bjv/HG8RRWLNkXwQQemdsWw4Mg+IJ29LK+bJPW2SCzPKOUaMmPEppQlu/Fqk1d7+DX3V7JbFdbkh/NMmurT6Pg==",
       "cpu": [
         "arm64"
       ],
@@ -555,9 +569,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.34.8.tgz",
-      "integrity": "sha512-r3NRQrXkHr4uWy5TOjTpTYojR9XmF0j/RYgKCef+Ag46FWUTltm5ziticv8LdNsDMehjJ543x/+TJAek/xBA2w==",
+      "version": "4.40.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.40.2.tgz",
+      "integrity": "sha512-dt1llVSGEsGKvzeIO76HToiYPNPYPkmjhMHhP00T9S4rDern8P2ZWvWAQUEJ+R1UdMWJ/42i/QqJ2WV765GZcA==",
       "cpu": [
         "ia32"
       ],
@@ -569,9 +583,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.34.8.tgz",
-      "integrity": "sha512-U0FaE5O1BCpZSeE6gBl3c5ObhePQSfk9vDRToMmTkbhCOgW4jqvtS5LGyQ76L1fH8sM0keRp4uDTsbjiUyjk0g==",
+      "version": "4.40.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.40.2.tgz",
+      "integrity": "sha512-bwspbWB04XJpeElvsp+DCylKfF4trJDa2Y9Go8O6A7YLX2LIKGcNK/CYImJN6ZP4DcuOHB4Utl3iCbnR62DudA==",
       "cpu": [
         "x64"
       ],
@@ -877,9 +891,9 @@
       }
     },
     "node_modules/@types/estree": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
-      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
+      "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -2218,13 +2232,13 @@
       "license": "Unlicense"
     },
     "node_modules/rollup": {
-      "version": "4.34.8",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.34.8.tgz",
-      "integrity": "sha512-489gTVMzAYdiZHFVA/ig/iYFllCcWFHMvUHI1rpFmkoUtRlQxqh6/yiNqnYibjMZ2b/+FUQwldG+aLsEt6bglQ==",
+      "version": "4.40.2",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.40.2.tgz",
+      "integrity": "sha512-tfUOg6DTP4rhQ3VjOO6B4wyrJnGOX85requAXvqYTHsOgb2TFJdZ3aWpT8W2kPoypSGP7dZUyzxJ9ee4buM5Fg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/estree": "1.0.6"
+        "@types/estree": "1.0.7"
       },
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -2234,25 +2248,26 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.34.8",
-        "@rollup/rollup-android-arm64": "4.34.8",
-        "@rollup/rollup-darwin-arm64": "4.34.8",
-        "@rollup/rollup-darwin-x64": "4.34.8",
-        "@rollup/rollup-freebsd-arm64": "4.34.8",
-        "@rollup/rollup-freebsd-x64": "4.34.8",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.34.8",
-        "@rollup/rollup-linux-arm-musleabihf": "4.34.8",
-        "@rollup/rollup-linux-arm64-gnu": "4.34.8",
-        "@rollup/rollup-linux-arm64-musl": "4.34.8",
-        "@rollup/rollup-linux-loongarch64-gnu": "4.34.8",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.34.8",
-        "@rollup/rollup-linux-riscv64-gnu": "4.34.8",
-        "@rollup/rollup-linux-s390x-gnu": "4.34.8",
-        "@rollup/rollup-linux-x64-gnu": "4.34.8",
-        "@rollup/rollup-linux-x64-musl": "4.34.8",
-        "@rollup/rollup-win32-arm64-msvc": "4.34.8",
-        "@rollup/rollup-win32-ia32-msvc": "4.34.8",
-        "@rollup/rollup-win32-x64-msvc": "4.34.8",
+        "@rollup/rollup-android-arm-eabi": "4.40.2",
+        "@rollup/rollup-android-arm64": "4.40.2",
+        "@rollup/rollup-darwin-arm64": "4.40.2",
+        "@rollup/rollup-darwin-x64": "4.40.2",
+        "@rollup/rollup-freebsd-arm64": "4.40.2",
+        "@rollup/rollup-freebsd-x64": "4.40.2",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.40.2",
+        "@rollup/rollup-linux-arm-musleabihf": "4.40.2",
+        "@rollup/rollup-linux-arm64-gnu": "4.40.2",
+        "@rollup/rollup-linux-arm64-musl": "4.40.2",
+        "@rollup/rollup-linux-loongarch64-gnu": "4.40.2",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.40.2",
+        "@rollup/rollup-linux-riscv64-gnu": "4.40.2",
+        "@rollup/rollup-linux-riscv64-musl": "4.40.2",
+        "@rollup/rollup-linux-s390x-gnu": "4.40.2",
+        "@rollup/rollup-linux-x64-gnu": "4.40.2",
+        "@rollup/rollup-linux-x64-musl": "4.40.2",
+        "@rollup/rollup-win32-arm64-msvc": "4.40.2",
+        "@rollup/rollup-win32-ia32-msvc": "4.40.2",
+        "@rollup/rollup-win32-x64-msvc": "4.40.2",
         "fsevents": "~2.3.2"
       }
     },
diff --git a/package.json b/package.json
index d0e9153..00a4e86 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^22.13.4",
     "@types/sprintf-js": "^1.1.4",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-    "rollup": "^4.34.8",
+    "rollup": "^4.40.2",
     "rollup-plugin-copy": "^3.5.0",
     "tslib": "^2.8.1",
     "typescript": "^5.7.3"

From 6eae711ec9da1b409373cd398ddf1c94826351a9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 May 2025 22:39:00 +0000
Subject: [PATCH 377/402] Bump @rollup/plugin-commonjs from 26.0.3 to 28.0.3

Bumps [@rollup/plugin-commonjs](https://github.com/rollup/plugins/tree/HEAD/packages/commonjs) from 26.0.3 to 28.0.3.
- [Changelog](https://github.com/rollup/plugins/blob/master/packages/commonjs/CHANGELOG.md)
- [Commits](https://github.com/rollup/plugins/commits/commonjs-v28.0.3/packages/commonjs)

---
updated-dependencies:
- dependency-name: "@rollup/plugin-commonjs"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 534 ++--------------------------------------------
 package.json      |   2 +-
 2 files changed, 23 insertions(+), 513 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9feef4d..3ff6859 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "sprintf-js": "^1.1.3"
       },
       "devDependencies": {
-        "@rollup/plugin-commonjs": "^26.0.3",
+        "@rollup/plugin-commonjs": "^28.0.3",
         "@rollup/plugin-node-resolve": "^16.0.1",
         "@rollup/plugin-terser": "^0.4.4",
         "@rollup/plugin-typescript": "^12.1.2",
@@ -53,24 +53,6 @@
         "w3c-keyname": "^2.2.4"
       }
     },
-    "node_modules/@isaacs/cliui": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
-      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "string-width": "^5.1.2",
-        "string-width-cjs": "npm:string-width@^4.2.0",
-        "strip-ansi": "^7.0.1",
-        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
-        "wrap-ansi": "^8.1.0",
-        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.8",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
@@ -181,30 +163,20 @@
         "node": ">= 8"
       }
     },
-    "node_modules/@pkgjs/parseargs": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
-      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "engines": {
-        "node": ">=14"
-      }
-    },
     "node_modules/@rollup/plugin-commonjs": {
-      "version": "26.0.3",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-26.0.3.tgz",
-      "integrity": "sha512-2BJcolt43MY+y5Tz47djHkodCC3c1VKVrBDKpVqHKpQ9z9S158kCCqB8NF6/gzxLdNlYW9abB3Ibh+kOWLp8KQ==",
+      "version": "28.0.3",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-28.0.3.tgz",
+      "integrity": "sha512-pyltgilam1QPdn+Zd9gaCfOLcnjMEJ9gV+bTw6/r73INdvzf1ah9zLIJBm+kW7R6IUFIQ1YO+VqZtYxZNWFPEQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@rollup/pluginutils": "^5.0.1",
         "commondir": "^1.0.1",
         "estree-walker": "^2.0.2",
-        "glob": "^10.4.1",
+        "fdir": "^6.2.0",
         "is-reference": "1.2.1",
-        "magic-string": "^0.30.3"
+        "magic-string": "^0.30.3",
+        "picomatch": "^4.0.2"
       },
       "engines": {
         "node": ">=16.0.0 || 14 >= 14.17"
@@ -979,32 +951,6 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/ansi-regex": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/array-union": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
@@ -1022,16 +968,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
     "node_modules/braces": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
@@ -1052,26 +988,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/colorette": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz",
@@ -1102,21 +1018,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/cross-spawn": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
-      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/d3": {
       "version": "7.9.0",
       "resolved": "https://registry.npmjs.org/d3/-/d3-7.9.0.tgz",
@@ -1550,20 +1451,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/eastasianwidth": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/estree-walker": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
@@ -1598,6 +1485,21 @@
         "reusify": "^1.0.4"
       }
     },
+    "node_modules/fdir": {
+      "version": "6.4.4",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz",
+      "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "picomatch": "^3 || ^4"
+      },
+      "peerDependenciesMeta": {
+        "picomatch": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/fill-range": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
@@ -1611,23 +1513,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/foreground-child": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
-      "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "cross-spawn": "^7.0.0",
-        "signal-exit": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/fs-extra": {
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
@@ -1675,27 +1560,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/glob": {
-      "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^3.1.2",
-        "minimatch": "^9.0.4",
-        "minipass": "^7.1.2",
-        "package-json-from-dist": "^1.0.0",
-        "path-scurry": "^1.11.1"
-      },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/glob-parent": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
@@ -1871,16 +1735,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/is-glob": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
@@ -1931,29 +1785,6 @@
         "@types/estree": "*"
       }
     },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/jackspeak": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
-      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "@isaacs/cliui": "^8.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      },
-      "optionalDependencies": {
-        "@pkgjs/parseargs": "^0.11.0"
-      }
-    },
     "node_modules/jsep": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/jsep/-/jsep-1.4.0.tgz",
@@ -1973,13 +1804,6 @@
         "graceful-fs": "^4.1.6"
       }
     },
-    "node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/magic-string": {
       "version": "0.30.17",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
@@ -2027,32 +1851,6 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/minipass": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
-      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      }
-    },
     "node_modules/moment": {
       "version": "2.29.4",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
@@ -2088,13 +1886,6 @@
         "wrappy": "1"
       }
     },
-    "node_modules/package-json-from-dist": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
-      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
-      "dev": true,
-      "license": "BlueOak-1.0.0"
-    },
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -2105,16 +1896,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/path-parse": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
@@ -2122,23 +1903,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/path-scurry": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
-      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "lru-cache": "^10.2.0",
-        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/path-type": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
@@ -2355,42 +2119,6 @@
         "randombytes": "^2.1.0"
       }
     },
-    "node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/signal-exit": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/slash": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
@@ -2435,110 +2163,6 @@
       "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
       "license": "BSD-3-Clause"
     },
-    "node_modules/string-width": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "eastasianwidth": "^0.2.0",
-        "emoji-regex": "^9.2.2",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/string-width-cjs": {
-      "name": "string-width",
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/string-width-cjs/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/string-width-cjs/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/string-width-cjs/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
-    "node_modules/strip-ansi-cjs": {
-      "name": "strip-ansi",
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/style-mod": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.2.tgz",
@@ -2645,120 +2269,6 @@
       "license": "MIT",
       "peer": true
     },
-    "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/wrap-ansi": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
-      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^6.1.0",
-        "string-width": "^5.0.1",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi-cjs": {
-      "name": "wrap-ansi",
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
diff --git a/package.json b/package.json
index f3198e0..0096868 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
   "author": "pyrochlore",
   "license": "MIT",
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^26.0.3",
+    "@rollup/plugin-commonjs": "^28.0.3",
     "@rollup/plugin-node-resolve": "^16.0.1",
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^12.1.2",

From 4910c12bd8b868b829a037d8510f09a8d07caf4d Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Mon, 12 May 2025 19:03:31 -0600
Subject: [PATCH 378/402] Release 1.16.0

---
 README.md            |   6 +
 docs/ReleaseNotes.md |   6 +
 manifest.json        |   2 +-
 package-lock.json    | 397 ++++++++++++-------------------------------
 package.json         |   2 +-
 versions.json        |   3 +-
 6 files changed, 120 insertions(+), 296 deletions(-)

diff --git a/README.md b/README.md
index ed74e40..e514299 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,12 @@ This is an [Obsidian](https://obsidian.md/) plugin that helps you collect data f
 
 ## What's New
 
+Version 1.16.0
+
+- Adding thresholdType parameter to Calendars
+- Enable bar chart full-bar display at beginning and end
+- Update dependencies
+
 Version 1.15.1
 
 - Fix: Added DatasetName as title for calendar in annotation mode
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index ad9a9b5..56ff980 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,5 +1,11 @@
 # Release Notes
 
+## 1.16.0
+
+- Adding thresholdType parameter to Calendars
+- Enable bar chart full-bar display at beginning and end
+- Update dependencies
+
 ## 1.15.1
 
 - Fix: Added DatasetName as title for calendar in annotation mode
diff --git a/manifest.json b/manifest.json
index 8046462..ccb0aaa 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "id": "obsidian-tracker",
   "name": "Tracker",
-  "version": "1.15.1",
+  "version": "1.16.0",
   "minAppVersion": "0.9.12",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "author": "pyrochlore",
diff --git a/package-lock.json b/package-lock.json
index 3ff6859..d7baae7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.15.1",
+  "version": "1.16.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "obsidian-tracker",
-      "version": "1.15.1",
+      "version": "1.16.0",
       "license": "MIT",
       "dependencies": {
         "d3": "^7.9.0",
@@ -34,18 +34,16 @@
       "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.2.tgz",
       "integrity": "sha512-FVqsPqtPWKVVL3dPSxy8wEF/ymIEuVzF1PK3VbUgrxXpJUSHQWWZz4JMToquRxnkw+36LTamCZG2iua2Ptq0fA==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@marijn/find-cluster-break": "^1.0.0"
       }
     },
     "node_modules/@codemirror/view": {
-      "version": "6.36.3",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.36.3.tgz",
-      "integrity": "sha512-N2bilM47QWC8Hnx0rMdDxO2x2ImJ1FvZWXubwKgjeoOrWwEiFrtpA7SFHcuZ+o2Ze2VzbkgbzWVj4+V18LVkeg==",
+      "version": "6.36.8",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.36.8.tgz",
+      "integrity": "sha512-yoRo4f+FdnD01fFt4XpfpMCcCAo9QvZOtbrXExn4SqzH32YC6LgzqxfLZw/r6Ge65xyY03mK/UfUqrVw1gFiFg==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@codemirror/state": "^6.5.0",
@@ -58,7 +56,6 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
       "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@jridgewell/set-array": "^1.2.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
@@ -73,7 +70,6 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
       "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
@@ -83,7 +79,6 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
       "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
@@ -93,7 +88,6 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
       "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25"
@@ -103,15 +97,13 @@
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
       "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.25",
       "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
       "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
@@ -122,7 +114,6 @@
       "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz",
       "integrity": "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==",
       "dev": true,
-      "license": "MIT",
       "peer": true
     },
     "node_modules/@nodelib/fs.scandir": {
@@ -130,7 +121,6 @@
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
       "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "2.0.5",
         "run-parallel": "^1.1.9"
@@ -144,7 +134,6 @@
       "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
       "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
@@ -154,7 +143,6 @@
       "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
       "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
@@ -168,7 +156,6 @@
       "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-28.0.3.tgz",
       "integrity": "sha512-pyltgilam1QPdn+Zd9gaCfOLcnjMEJ9gV+bTw6/r73INdvzf1ah9zLIJBm+kW7R6IUFIQ1YO+VqZtYxZNWFPEQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@rollup/pluginutils": "^5.0.1",
         "commondir": "^1.0.1",
@@ -195,7 +182,6 @@
       "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-16.0.1.tgz",
       "integrity": "sha512-tk5YCxJWIG81umIvNkSod2qK5KyQW19qcBF/B78n1bjtOON6gzKoVeSzAE8yHCZEDmqkHKkxplExA8KzdJLJpA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@rollup/pluginutils": "^5.0.1",
         "@types/resolve": "1.20.2",
@@ -220,7 +206,6 @@
       "resolved": "https://registry.npmjs.org/@rollup/plugin-terser/-/plugin-terser-0.4.4.tgz",
       "integrity": "sha512-XHeJC5Bgvs8LfukDwWZp7yeqin6ns8RTl2B9avbejt6tZqsqvVoWI7ZTQrcNsfKEDWBTnTxM8nMDkO2IFFbd0A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "serialize-javascript": "^6.0.1",
         "smob": "^1.0.0",
@@ -243,7 +228,6 @@
       "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-12.1.2.tgz",
       "integrity": "sha512-cdtSp154H5sv637uMr1a8OTWB0L1SWDSm1rDGiyfcGcvQ6cuTs4MDk2BVEBGysUWago4OJN4EQZqOTl/QY3Jgg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@rollup/pluginutils": "^5.1.0",
         "resolve": "^1.22.1"
@@ -270,7 +254,6 @@
       "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.4.tgz",
       "integrity": "sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/estree": "^1.0.0",
         "estree-walker": "^2.0.2",
@@ -296,7 +279,6 @@
         "arm"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -310,7 +292,6 @@
         "arm64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -324,7 +305,6 @@
         "arm64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -338,7 +318,6 @@
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -352,7 +331,6 @@
         "arm64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
@@ -366,7 +344,6 @@
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
@@ -380,7 +357,6 @@
         "arm"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -394,7 +370,6 @@
         "arm"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -408,7 +383,6 @@
         "arm64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -422,7 +396,6 @@
         "arm64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -436,7 +409,6 @@
         "loong64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -450,7 +422,6 @@
         "ppc64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -464,7 +435,6 @@
         "riscv64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -478,7 +448,6 @@
         "riscv64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -492,7 +461,6 @@
         "s390x"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -506,7 +474,6 @@
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -520,7 +487,6 @@
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -534,7 +500,6 @@
         "arm64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -548,7 +513,6 @@
         "ia32"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -562,7 +526,6 @@
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -573,7 +536,6 @@
       "resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-5.60.8.tgz",
       "integrity": "sha512-VjFgDF/eB+Aklcy15TtOTLQeMjTo07k7KAjql8OK5Dirr7a6sJY4T1uVBDuTVG9VEmn1uUsohOpYnVfgC6/jyw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/tern": "*"
       }
@@ -583,7 +545,6 @@
       "resolved": "https://registry.npmjs.org/@types/d3/-/d3-7.4.3.tgz",
       "integrity": "sha512-lZXZ9ckh5R8uiFVt8ogUNf+pIrK4EsWrx2Np75WvF/eTpJ0FMHNhjXk8CKEx/+gpHbNQyJWehbFaTvqmHWB3ww==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/d3-array": "*",
         "@types/d3-axis": "*",
@@ -621,15 +582,13 @@
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.1.tgz",
       "integrity": "sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/d3-axis": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/@types/d3-axis/-/d3-axis-3.0.6.tgz",
       "integrity": "sha512-pYeijfZuBd87T0hGn0FO1vQ/cgLk6E1ALJjfkC0oJ8cbwkZl3TpgS8bVBLZN+2jjGgg38epgxb2zmoGtSfvgMw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/d3-selection": "*"
       }
@@ -639,7 +598,6 @@
       "resolved": "https://registry.npmjs.org/@types/d3-brush/-/d3-brush-3.0.6.tgz",
       "integrity": "sha512-nH60IZNNxEcrh6L1ZSMNA28rj27ut/2ZmI3r96Zd+1jrZD++zD3LsMIjWlvg4AYrHn/Pqz4CF3veCxGjtbqt7A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/d3-selection": "*"
       }
@@ -648,22 +606,19 @@
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/@types/d3-chord/-/d3-chord-3.0.6.tgz",
       "integrity": "sha512-LFYWWd8nwfwEmTZG9PfQxd17HbNPksHBiJHaKuY1XeqscXacsS2tyoo6OdRsjf+NQYeB6XrNL3a25E3gH69lcg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/d3-color": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz",
       "integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/d3-contour": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/@types/d3-contour/-/d3-contour-3.0.6.tgz",
       "integrity": "sha512-BjzLgXGnCWjUSYGfH1cpdo41/hgdWETu4YxpezoztawmqsvCeep+8QGfiY6YbDvfgHz/DkjeIkkZVJavB4a3rg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/d3-array": "*",
         "@types/geojson": "*"
@@ -673,22 +628,19 @@
       "version": "6.0.4",
       "resolved": "https://registry.npmjs.org/@types/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
       "integrity": "sha512-ZMaSKu4THYCU6sV64Lhg6qjf1orxBthaC161plr5KuPHo3CNm8DTHiLw/5Eq2b6TsNP0W0iJrUOFscY6Q450Hw==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/d3-dispatch": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/@types/d3-dispatch/-/d3-dispatch-3.0.6.tgz",
       "integrity": "sha512-4fvZhzMeeuBJYZXRXrRIQnvUYfyXwYmLsdiN7XXmVNQKKw1cM8a5WdID0g1hVFZDqT9ZqZEY5pD44p24VS7iZQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/d3-drag": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/@types/d3-drag/-/d3-drag-3.0.7.tgz",
       "integrity": "sha512-HE3jVKlzU9AaMazNufooRJ5ZpWmLIoc90A37WU2JMmeq28w1FQqCZswHZ3xR+SuxYftzHq6WU6KJHvqxKzTxxQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/d3-selection": "*"
       }
@@ -697,22 +649,19 @@
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/@types/d3-dsv/-/d3-dsv-3.0.7.tgz",
       "integrity": "sha512-n6QBF9/+XASqcKK6waudgL0pf/S5XHPPI8APyMLLUHd8NqouBGLsU8MgtO7NINGtPBtk9Kko/W4ea0oAspwh9g==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/d3-ease": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.2.tgz",
       "integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/d3-fetch": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/@types/d3-fetch/-/d3-fetch-3.0.7.tgz",
       "integrity": "sha512-fTAfNmxSb9SOWNB9IoG5c8Hg6R+AzUHDRlsXsDZsNp6sxAEOP0tkP3gKkNSO/qmHPoBFTxNrjDprVHDQDvo5aA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/d3-dsv": "*"
       }
@@ -721,22 +670,19 @@
       "version": "3.0.10",
       "resolved": "https://registry.npmjs.org/@types/d3-force/-/d3-force-3.0.10.tgz",
       "integrity": "sha512-ZYeSaCF3p73RdOKcjj+swRlZfnYpK1EbaDiYICEEp5Q6sUiqFaFQ9qgoshp5CzIyyb/yD09kD9o2zEltCexlgw==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/d3-format": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/@types/d3-format/-/d3-format-3.0.4.tgz",
       "integrity": "sha512-fALi2aI6shfg7vM5KiR1wNJnZ7r6UuggVqtDA+xiEdPZQwy/trcQaHnwShLuLdta2rTymCNpxYTiMZX/e09F4g==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/d3-geo": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-3.1.0.tgz",
       "integrity": "sha512-856sckF0oP/diXtS4jNsiQw/UuK5fQG8l/a9VVLeSouf1/PPbBE1i1W852zVwKwYCBkFJJB7nCFTbk6UMEXBOQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/geojson": "*"
       }
@@ -745,15 +691,13 @@
       "version": "3.1.7",
       "resolved": "https://registry.npmjs.org/@types/d3-hierarchy/-/d3-hierarchy-3.1.7.tgz",
       "integrity": "sha512-tJFtNoYBtRtkNysX1Xq4sxtjK8YgoWUNpIiUee0/jHGRwqvzYxkq0hGVbbOGSz+JgFxxRu4K8nb3YpG3CMARtg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/d3-interpolate": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz",
       "integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/d3-color": "*"
       }
@@ -762,36 +706,31 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.1.tgz",
       "integrity": "sha512-VMZBYyQvbGmWyWVea0EHs/BwLgxc+MKi1zLDCONksozI4YJMcTt8ZEuIR4Sb1MMTE8MMW49v0IwI5+b7RmfWlg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/d3-polygon": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/@types/d3-polygon/-/d3-polygon-3.0.2.tgz",
       "integrity": "sha512-ZuWOtMaHCkN9xoeEMr1ubW2nGWsp4nIql+OPQRstu4ypeZ+zk3YKqQT0CXVe/PYqrKpZAi+J9mTs05TKwjXSRA==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/d3-quadtree": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/@types/d3-quadtree/-/d3-quadtree-3.0.6.tgz",
       "integrity": "sha512-oUzyO1/Zm6rsxKRHA1vH0NEDG58HrT5icx/azi9MF1TWdtttWl0UIUsjEQBBh+SIkrpd21ZjEv7ptxWys1ncsg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/d3-random": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/@types/d3-random/-/d3-random-3.0.3.tgz",
       "integrity": "sha512-Imagg1vJ3y76Y2ea0871wpabqp613+8/r0mCLEBfdtqC7xMSfj9idOnmBYyMoULfHePJyxMAw3nWhJxzc+LFwQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/d3-scale": {
       "version": "4.0.9",
       "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.9.tgz",
       "integrity": "sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/d3-time": "*"
       }
@@ -800,22 +739,19 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
       "integrity": "sha512-iWMJgwkK7yTRmWqRB5plb1kadXyQ5Sj8V/zYlFGMUBbIPKQScw+Dku9cAAMgJG+z5GYDoMjWGLVOvjghDEFnKQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/d3-selection": {
       "version": "3.0.11",
       "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.11.tgz",
       "integrity": "sha512-bhAXu23DJWsrI45xafYpkQ4NtcKMwWnAC/vKrd2l+nxMFuvOT3XMYTIj2opv8vq8AO5Yh7Qac/nSeP/3zjTK0w==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/d3-shape": {
       "version": "3.1.7",
       "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.7.tgz",
       "integrity": "sha512-VLvUQ33C+3J+8p+Daf+nYSOsjB4GXp19/S/aGo60m9h1v6XaxjiT82lKVWJCfzhtuZ3yD7i/TPeC/fuKLLOSmg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/d3-path": "*"
       }
@@ -824,29 +760,25 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.4.tgz",
       "integrity": "sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/d3-time-format": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-4.0.3.tgz",
       "integrity": "sha512-5xg9rC+wWL8kdDj153qZcsJ0FWiFt0J5RB6LYUNZjwSnesfblqrI/bJ1wBdJ8OQfncgbJG5+2F+qfqnqyzYxyg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/d3-timer": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.2.tgz",
       "integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/d3-transition": {
       "version": "3.0.9",
       "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-3.0.9.tgz",
       "integrity": "sha512-uZS5shfxzO3rGlu0cC3bjmMFKsXv+SmZZcgp0KD22ts4uGXp5EVYGzu/0YdwZeKmddhcAccYtREJKkPfXkZuCg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/d3-selection": "*"
       }
@@ -856,7 +788,6 @@
       "resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-3.0.8.tgz",
       "integrity": "sha512-iqMC4/YlFCSlO8+2Ii1GGGliCAY4XdeG748w5vQUbevlbDu0zSjH/+jojorQVBK/se0j6DUFNPBGSqD3YWYnDw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/d3-interpolate": "*",
         "@types/d3-selection": "*"
@@ -866,15 +797,13 @@
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
       "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/fs-extra": {
       "version": "8.1.5",
       "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.1.5.tgz",
       "integrity": "sha512-0dzKcwO+S8s2kuF5Z9oUWatQJj5Uq/iqphEtE3GQJVRRYm/tD1LglU2UnXi2A8jLq5umkGouOXOR9y0n613ZwQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -883,15 +812,13 @@
       "version": "7946.0.16",
       "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz",
       "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/glob": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
       "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/minimatch": "*",
         "@types/node": "*"
@@ -901,15 +828,13 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
       "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/node": {
       "version": "22.15.17",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.17.tgz",
       "integrity": "sha512-wIX2aSZL5FE+MR0JlvF87BNVrtFWf6AE6rxSE9X7OwnVvoyCQjpzSRJ+M87se/4QCkCiebQAqrJ0y6fwIyi7nw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "undici-types": "~6.21.0"
       }
@@ -918,32 +843,28 @@
       "version": "1.20.2",
       "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz",
       "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/sprintf-js": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/@types/sprintf-js/-/sprintf-js-1.1.4.tgz",
       "integrity": "sha512-aWK1reDYWxcjgcIIPmQi3u+OQDuYa9b+lr6eIsGWrekJ9vr1NSjr4Eab8oQ1iKuH1ltFHpXGyerAv1a3FMKxzQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/tern": {
       "version": "0.23.9",
       "resolved": "https://registry.npmjs.org/@types/tern/-/tern-0.23.9.tgz",
       "integrity": "sha512-ypzHFE/wBzh+BlH6rrBgS5I/Z7RD21pGhZ2rltb/+ZrVM1awdZwjx7hE5XfuYgHWk9uvV5HLZN3SloevCAp3Bw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/estree": "*"
       }
     },
     "node_modules/acorn": {
-      "version": "8.14.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
-      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+      "version": "8.14.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
+      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -956,7 +877,6 @@
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
       "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -965,15 +885,23 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
-      "license": "MIT"
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
     },
     "node_modules/braces": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
       "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "fill-range": "^7.1.1"
       },
@@ -985,21 +913,18 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/colorette": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz",
       "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/commander": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
       "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-      "license": "MIT",
       "engines": {
         "node": ">= 10"
       }
@@ -1008,21 +933,18 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
       "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/d3": {
       "version": "7.9.0",
       "resolved": "https://registry.npmjs.org/d3/-/d3-7.9.0.tgz",
       "integrity": "sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA==",
-      "license": "ISC",
       "dependencies": {
         "d3-array": "3",
         "d3-axis": "3",
@@ -1063,7 +985,6 @@
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
       "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
-      "license": "ISC",
       "dependencies": {
         "internmap": "1 - 2"
       },
@@ -1075,7 +996,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz",
       "integrity": "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==",
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1084,7 +1004,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz",
       "integrity": "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==",
-      "license": "ISC",
       "dependencies": {
         "d3-dispatch": "1 - 3",
         "d3-drag": "2 - 3",
@@ -1100,7 +1019,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz",
       "integrity": "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==",
-      "license": "ISC",
       "dependencies": {
         "d3-path": "1 - 3"
       },
@@ -1112,7 +1030,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
       "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1121,7 +1038,6 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-4.0.2.tgz",
       "integrity": "sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==",
-      "license": "ISC",
       "dependencies": {
         "d3-array": "^3.2.0"
       },
@@ -1133,7 +1049,6 @@
       "version": "6.0.4",
       "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
       "integrity": "sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==",
-      "license": "ISC",
       "dependencies": {
         "delaunator": "5"
       },
@@ -1145,7 +1060,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
       "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==",
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1154,7 +1068,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz",
       "integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==",
-      "license": "ISC",
       "dependencies": {
         "d3-dispatch": "1 - 3",
         "d3-selection": "3"
@@ -1167,7 +1080,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz",
       "integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==",
-      "license": "ISC",
       "dependencies": {
         "commander": "7",
         "iconv-lite": "0.6",
@@ -1192,7 +1104,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
       "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==",
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=12"
       }
@@ -1201,7 +1112,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz",
       "integrity": "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==",
-      "license": "ISC",
       "dependencies": {
         "d3-dsv": "1 - 3"
       },
@@ -1213,7 +1123,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz",
       "integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==",
-      "license": "ISC",
       "dependencies": {
         "d3-dispatch": "1 - 3",
         "d3-quadtree": "1 - 3",
@@ -1227,7 +1136,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz",
       "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==",
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1236,7 +1144,6 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz",
       "integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==",
-      "license": "ISC",
       "dependencies": {
         "d3-array": "2.5.0 - 3"
       },
@@ -1248,7 +1155,6 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz",
       "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==",
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1257,7 +1163,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
       "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
-      "license": "ISC",
       "dependencies": {
         "d3-color": "1 - 3"
       },
@@ -1269,7 +1174,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
       "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==",
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1278,7 +1182,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz",
       "integrity": "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==",
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1287,7 +1190,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz",
       "integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==",
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1296,7 +1198,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz",
       "integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==",
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1305,7 +1206,6 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
       "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
-      "license": "ISC",
       "dependencies": {
         "d3-array": "2.10.0 - 3",
         "d3-format": "1 - 3",
@@ -1321,7 +1221,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
       "integrity": "sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==",
-      "license": "ISC",
       "dependencies": {
         "d3-color": "1 - 3",
         "d3-interpolate": "1 - 3"
@@ -1334,7 +1233,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz",
       "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1343,7 +1241,6 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
       "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
-      "license": "ISC",
       "dependencies": {
         "d3-path": "^3.1.0"
       },
@@ -1355,7 +1252,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
       "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
-      "license": "ISC",
       "dependencies": {
         "d3-array": "2 - 3"
       },
@@ -1367,7 +1263,6 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
       "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
-      "license": "ISC",
       "dependencies": {
         "d3-time": "1 - 3"
       },
@@ -1379,7 +1274,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
       "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1388,7 +1282,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz",
       "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==",
-      "license": "ISC",
       "dependencies": {
         "d3-color": "1 - 3",
         "d3-dispatch": "1 - 3",
@@ -1407,7 +1300,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz",
       "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==",
-      "license": "ISC",
       "dependencies": {
         "d3-dispatch": "1 - 3",
         "d3-drag": "2 - 3",
@@ -1424,7 +1316,6 @@
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
       "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1433,7 +1324,6 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.1.tgz",
       "integrity": "sha512-8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw==",
-      "license": "ISC",
       "dependencies": {
         "robust-predicates": "^3.0.2"
       }
@@ -1443,7 +1333,6 @@
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
       "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "path-type": "^4.0.0"
       },
@@ -1455,15 +1344,13 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
       "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/fast-glob": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
       "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
@@ -1476,11 +1363,10 @@
       }
     },
     "node_modules/fastq": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.0.tgz",
-      "integrity": "sha512-7SFSRCNjBQIZH/xZR3iy5iQYR8aGBE0h3VG6/cwlbrpdciNYBMotQav8c1XI3HjHH+NikUpP53nPdlZSdWmFzA==",
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
+      "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "reusify": "^1.0.4"
       }
@@ -1490,7 +1376,6 @@
       "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz",
       "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==",
       "dev": true,
-      "license": "MIT",
       "peerDependencies": {
         "picomatch": "^3 || ^4"
       },
@@ -1505,7 +1390,6 @@
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
       "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -1518,7 +1402,6 @@
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
       "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.0",
         "jsonfile": "^4.0.0",
@@ -1532,8 +1415,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/fsevents": {
       "version": "2.3.3",
@@ -1541,7 +1423,6 @@
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
       "hasInstallScript": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -1555,17 +1436,36 @@
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
       "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
       "dev": true,
-      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/glob-parent": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -1578,7 +1478,6 @@
       "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.1.tgz",
       "integrity": "sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/glob": "^7.1.1",
         "array-union": "^2.1.0",
@@ -1593,65 +1492,17 @@
         "node": ">=8"
       }
     },
-    "node_modules/globby/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/globby/node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/globby/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/hasown": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
       "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.2"
       },
@@ -1663,7 +1514,6 @@
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
       "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
@@ -1676,7 +1526,6 @@
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
       "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
@@ -1687,7 +1536,6 @@
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
       "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -1697,14 +1545,12 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     },
     "node_modules/internmap": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
       "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1714,7 +1560,6 @@
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
       "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "hasown": "^2.0.2"
       },
@@ -1730,7 +1575,6 @@
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1740,7 +1584,6 @@
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -1752,15 +1595,13 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
       "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
@@ -1770,7 +1611,6 @@
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.1.tgz",
       "integrity": "sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1780,7 +1620,6 @@
       "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
       "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/estree": "*"
       }
@@ -1789,7 +1628,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/jsep/-/jsep-1.4.0.tgz",
       "integrity": "sha512-B7qPcEVE3NVkmSJbaYxvv4cHkVW7DQsZz13pUMrfS8z8Q/BuShN+gcTXrUlPiGqM2/t/EEaI030bpxMqY8gMlw==",
-      "license": "MIT",
       "engines": {
         "node": ">= 10.16.0"
       }
@@ -1799,7 +1637,6 @@
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
       "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
       "dev": true,
-      "license": "MIT",
       "optionalDependencies": {
         "graceful-fs": "^4.1.6"
       }
@@ -1809,7 +1646,6 @@
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
       "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.5.0"
       }
@@ -1819,7 +1655,6 @@
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
       "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
@@ -1829,7 +1664,6 @@
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
       "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "braces": "^3.0.3",
         "picomatch": "^2.3.1"
@@ -1843,7 +1677,6 @@
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8.6"
       },
@@ -1851,12 +1684,23 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/moment": {
       "version": "2.29.4",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
       "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "*"
       }
@@ -1864,7 +1708,7 @@
     "node_modules/obsidian": {
       "version": "1.8.7",
       "resolved": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-      "integrity": "sha512-AWXhKFmmMiw/qLfcautRoNDqsREC3kLBKmVuiICyZmqcTlS/jGxhOFxJ1z095NfddwD6ZPm2JqmVRRRsB+Vkzg==",
+      "integrity": "sha512-0yByIRBSLYSpg0PrVhysWyRU55BrsaJl484RmRX2lM4AJ7VVMy/8jC9aj7VfW7D+1Iy4h1iUACGbIqdFjlUo+Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1881,7 +1725,6 @@
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "wrappy": "1"
       }
@@ -1891,7 +1734,6 @@
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1900,15 +1742,13 @@
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/path-type": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -1918,7 +1758,6 @@
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
       "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -1944,15 +1783,13 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ],
-      "license": "MIT"
+      ]
     },
     "node_modules/randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "safe-buffer": "^5.1.0"
       }
@@ -1962,7 +1799,6 @@
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
       "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "is-core-module": "^2.16.0",
         "path-parse": "^1.0.7",
@@ -1979,11 +1815,10 @@
       }
     },
     "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
+      "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "iojs": ">=1.0.0",
         "node": ">=0.10.0"
@@ -1992,15 +1827,13 @@
     "node_modules/robust-predicates": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.2.tgz",
-      "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==",
-      "license": "Unlicense"
+      "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="
     },
     "node_modules/rollup": {
       "version": "4.40.2",
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.40.2.tgz",
       "integrity": "sha512-tfUOg6DTP4rhQ3VjOO6B4wyrJnGOX85requAXvqYTHsOgb2TFJdZ3aWpT8W2kPoypSGP7dZUyzxJ9ee4buM5Fg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/estree": "1.0.7"
       },
@@ -2040,7 +1873,6 @@
       "resolved": "https://registry.npmjs.org/rollup-plugin-copy/-/rollup-plugin-copy-3.5.0.tgz",
       "integrity": "sha512-wI8D5dvYovRMx/YYKtUNt3Yxaw4ORC9xo6Gt9t22kveWz1enG9QrhVlagzwrxSC455xD1dHMKhIJkbsQ7d48BA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/fs-extra": "^8.0.1",
         "colorette": "^1.1.0",
@@ -2071,7 +1903,6 @@
           "url": "https://feross.org/support"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "queue-microtask": "^1.2.2"
       }
@@ -2079,8 +1910,7 @@
     "node_modules/rw": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
-      "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==",
-      "license": "BSD-3-Clause"
+      "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ=="
     },
     "node_modules/safe-buffer": {
       "version": "5.2.1",
@@ -2100,21 +1930,18 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ],
-      "license": "MIT"
+      ]
     },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "license": "MIT"
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/serialize-javascript": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
       "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "randombytes": "^2.1.0"
       }
@@ -2124,7 +1951,6 @@
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -2133,15 +1959,13 @@
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/smob/-/smob-1.5.0.tgz",
       "integrity": "sha512-g6T+p7QO8npa+/hNx9ohv1E5pVCmWrVCUzUXJyLdMmftX6ER0oiWY/w9knEonLpnOp6b6FenKnMfR8gqwWdwig==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -2151,7 +1975,6 @@
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
       "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -2160,15 +1983,13 @@
     "node_modules/sprintf-js": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
-      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
-      "license": "BSD-3-Clause"
+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="
     },
     "node_modules/style-mod": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.2.tgz",
       "integrity": "sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==",
       "dev": true,
-      "license": "MIT",
       "peer": true
     },
     "node_modules/supports-preserve-symlinks-flag": {
@@ -2176,7 +1997,6 @@
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -2189,7 +2009,6 @@
       "resolved": "https://registry.npmjs.org/terser/-/terser-5.39.0.tgz",
       "integrity": "sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
         "acorn": "^8.8.2",
@@ -2207,15 +2026,13 @@
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -2227,15 +2044,13 @@
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-      "dev": true,
-      "license": "0BSD"
+      "dev": true
     },
     "node_modules/typescript": {
       "version": "5.8.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
       "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
       "dev": true,
-      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -2248,15 +2063,13 @@
       "version": "6.21.0",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
       "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/universalify": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
       "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 4.0.0"
       }
@@ -2266,15 +2079,13 @@
       "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
       "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true
     },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     }
   }
 }
diff --git a/package.json b/package.json
index 0096868..2796e4a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.15.1",
+  "version": "1.16.0",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
diff --git a/versions.json b/versions.json
index 2223ef4..2fded29 100644
--- a/versions.json
+++ b/versions.json
@@ -37,5 +37,6 @@
   "1.13.3": "0.9.12",
   "1.14.0": "0.9.12",
   "1.15.0": "0.9.12",
-  "1.15.1": "0.9.12"
+  "1.15.1": "0.9.12",
+  "1.16.0": "0.9.12"
 }

From 4312ef77e6560ee2daf8f123d94835d959d20053 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Jun 2025 14:50:22 +0000
Subject: [PATCH 379/402] Bump @rollup/plugin-commonjs from 28.0.3 to 28.0.5

Bumps [@rollup/plugin-commonjs](https://github.com/rollup/plugins/tree/HEAD/packages/commonjs) from 28.0.3 to 28.0.5.
- [Changelog](https://github.com/rollup/plugins/blob/master/packages/commonjs/CHANGELOG.md)
- [Commits](https://github.com/rollup/plugins/commits/commonjs-v28.0.5/packages/commonjs)

---
updated-dependencies:
- dependency-name: "@rollup/plugin-commonjs"
  dependency-version: 28.0.5
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 9 +++++----
 package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d7baae7..c52262a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "sprintf-js": "^1.1.3"
       },
       "devDependencies": {
-        "@rollup/plugin-commonjs": "^28.0.3",
+        "@rollup/plugin-commonjs": "^28.0.5",
         "@rollup/plugin-node-resolve": "^16.0.1",
         "@rollup/plugin-terser": "^0.4.4",
         "@rollup/plugin-typescript": "^12.1.2",
@@ -152,10 +152,11 @@
       }
     },
     "node_modules/@rollup/plugin-commonjs": {
-      "version": "28.0.3",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-28.0.3.tgz",
-      "integrity": "sha512-pyltgilam1QPdn+Zd9gaCfOLcnjMEJ9gV+bTw6/r73INdvzf1ah9zLIJBm+kW7R6IUFIQ1YO+VqZtYxZNWFPEQ==",
+      "version": "28.0.5",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-28.0.5.tgz",
+      "integrity": "sha512-lytLp2JgAMwqJY6ve3OSROXr2XuEYHjnsQN3hmnxC+w11dI91LuUw4Yc1kk2FqKXeMG8psoFejFgK+znoij0cg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@rollup/pluginutils": "^5.0.1",
         "commondir": "^1.0.1",
diff --git a/package.json b/package.json
index 2796e4a..da97e45 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
   "author": "pyrochlore",
   "license": "MIT",
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^28.0.3",
+    "@rollup/plugin-commonjs": "^28.0.5",
     "@rollup/plugin-node-resolve": "^16.0.1",
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^12.1.2",

From e5c07e958dc4459b3544ebdca4f92f654f699ce0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Jun 2025 23:53:16 +0000
Subject: [PATCH 380/402] Bump rollup from 4.40.2 to 4.43.0

Bumps [rollup](https://github.com/rollup/rollup) from 4.40.2 to 4.43.0.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v4.40.2...v4.43.0)

---
updated-dependencies:
- dependency-name: rollup
  dependency-version: 4.43.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 200 +++++++++++++++++++++++++---------------------
 package.json      |   2 +-
 2 files changed, 112 insertions(+), 90 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c52262a..251ae09 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,7 +23,7 @@
         "@types/node": "^22.15.17",
         "@types/sprintf-js": "^1.1.4",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-        "rollup": "^4.40.2",
+        "rollup": "^4.44.0",
         "rollup-plugin-copy": "^3.5.0",
         "tslib": "^2.8.1",
         "typescript": "^5.8.3"
@@ -273,260 +273,280 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.40.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.40.2.tgz",
-      "integrity": "sha512-JkdNEq+DFxZfUwxvB58tHMHBHVgX23ew41g1OQinthJ+ryhdRk67O31S7sYw8u2lTjHUPFxwar07BBt1KHp/hg==",
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.44.0.tgz",
+      "integrity": "sha512-xEiEE5oDW6tK4jXCAyliuntGR+amEMO7HLtdSshVuhFnKTYoeYMyXQK7pLouAJJj5KHdwdn87bfHAR2nSdNAUA==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.40.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.40.2.tgz",
-      "integrity": "sha512-13unNoZ8NzUmnndhPTkWPWbX3vtHodYmy+I9kuLxN+F+l+x3LdVF7UCu8TWVMt1POHLh6oDHhnOA04n8oJZhBw==",
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.44.0.tgz",
+      "integrity": "sha512-uNSk/TgvMbskcHxXYHzqwiyBlJ/lGcv8DaUfcnNwict8ba9GTTNxfn3/FAoFZYgkaXXAdrAA+SLyKplyi349Jw==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.40.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.40.2.tgz",
-      "integrity": "sha512-Gzf1Hn2Aoe8VZzevHostPX23U7N5+4D36WJNHK88NZHCJr7aVMG4fadqkIf72eqVPGjGc0HJHNuUaUcxiR+N/w==",
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.44.0.tgz",
+      "integrity": "sha512-VGF3wy0Eq1gcEIkSCr8Ke03CWT+Pm2yveKLaDvq51pPpZza3JX/ClxXOCmTYYq3us5MvEuNRTaeyFThCKRQhOA==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.40.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.40.2.tgz",
-      "integrity": "sha512-47N4hxa01a4x6XnJoskMKTS8XZ0CZMd8YTbINbi+w03A2w4j1RTlnGHOz/P0+Bg1LaVL6ufZyNprSg+fW5nYQQ==",
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.44.0.tgz",
+      "integrity": "sha512-fBkyrDhwquRvrTxSGH/qqt3/T0w5Rg0L7ZIDypvBPc1/gzjJle6acCpZ36blwuwcKD/u6oCE/sRWlUAcxLWQbQ==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ]
     },
     "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.40.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.40.2.tgz",
-      "integrity": "sha512-8t6aL4MD+rXSHHZUR1z19+9OFJ2rl1wGKvckN47XFRVO+QL/dUSpKA2SLRo4vMg7ELA8pzGpC+W9OEd1Z/ZqoQ==",
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.44.0.tgz",
+      "integrity": "sha512-u5AZzdQJYJXByB8giQ+r4VyfZP+walV+xHWdaFx/1VxsOn6eWJhK2Vl2eElvDJFKQBo/hcYIBg/jaKS8ZmKeNQ==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
       ]
     },
     "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.40.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.40.2.tgz",
-      "integrity": "sha512-C+AyHBzfpsOEYRFjztcYUFsH4S7UsE9cDtHCtma5BK8+ydOZYgMmWg1d/4KBytQspJCld8ZIujFMAdKG1xyr4Q==",
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.44.0.tgz",
+      "integrity": "sha512-qC0kS48c/s3EtdArkimctY7h3nHicQeEUdjJzYVJYR3ct3kWSafmn6jkNCA8InbUdge6PVx6keqjk5lVGJf99g==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.40.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.40.2.tgz",
-      "integrity": "sha512-de6TFZYIvJwRNjmW3+gaXiZ2DaWL5D5yGmSYzkdzjBDS3W+B9JQ48oZEsmMvemqjtAFzE16DIBLqd6IQQRuG9Q==",
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.44.0.tgz",
+      "integrity": "sha512-x+e/Z9H0RAWckn4V2OZZl6EmV0L2diuX3QB0uM1r6BvhUIv6xBPL5mrAX2E3e8N8rEHVPwFfz/ETUbV4oW9+lQ==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.40.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.40.2.tgz",
-      "integrity": "sha512-urjaEZubdIkacKc930hUDOfQPysezKla/O9qV+O89enqsqUmQm8Xj8O/vh0gHg4LYfv7Y7UsE3QjzLQzDYN1qg==",
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.44.0.tgz",
+      "integrity": "sha512-1exwiBFf4PU/8HvI8s80icyCcnAIB86MCBdst51fwFmH5dyeoWVPVgmQPcKrMtBQ0W5pAs7jBCWuRXgEpRzSCg==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.40.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.40.2.tgz",
-      "integrity": "sha512-KlE8IC0HFOC33taNt1zR8qNlBYHj31qGT1UqWqtvR/+NuCVhfufAq9fxO8BMFC22Wu0rxOwGVWxtCMvZVLmhQg==",
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.44.0.tgz",
+      "integrity": "sha512-ZTR2mxBHb4tK4wGf9b8SYg0Y6KQPjGpR4UWwTFdnmjB4qRtoATZ5dWn3KsDwGa5Z2ZBOE7K52L36J9LueKBdOQ==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.40.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.40.2.tgz",
-      "integrity": "sha512-j8CgxvfM0kbnhu4XgjnCWJQyyBOeBI1Zq91Z850aUddUmPeQvuAy6OiMdPS46gNFgy8gN1xkYyLgwLYZG3rBOg==",
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.44.0.tgz",
+      "integrity": "sha512-GFWfAhVhWGd4r6UxmnKRTBwP1qmModHtd5gkraeW2G490BpFOZkFtem8yuX2NyafIP/mGpRJgTJ2PwohQkUY/Q==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-      "version": "4.40.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.40.2.tgz",
-      "integrity": "sha512-Ybc/1qUampKuRF4tQXc7G7QY9YRyeVSykfK36Y5Qc5dmrIxwFhrOzqaVTNoZygqZ1ZieSWTibfFhQ5qK8jpWxw==",
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.44.0.tgz",
+      "integrity": "sha512-xw+FTGcov/ejdusVOqKgMGW3c4+AgqrfvzWEVXcNP6zq2ue+lsYUgJ+5Rtn/OTJf7e2CbgTFvzLW2j0YAtj0Gg==",
       "cpu": [
         "loong64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.40.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.40.2.tgz",
-      "integrity": "sha512-3FCIrnrt03CCsZqSYAOW/k9n625pjpuMzVfeI+ZBUSDT3MVIFDSPfSUgIl9FqUftxcUXInvFah79hE1c9abD+Q==",
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.44.0.tgz",
+      "integrity": "sha512-bKGibTr9IdF0zr21kMvkZT4K6NV+jjRnBoVMt2uNMG0BYWm3qOVmYnXKzx7UhwrviKnmK46IKMByMgvpdQlyJQ==",
       "cpu": [
         "ppc64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.40.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.40.2.tgz",
-      "integrity": "sha512-QNU7BFHEvHMp2ESSY3SozIkBPaPBDTsfVNGx3Xhv+TdvWXFGOSH2NJvhD1zKAT6AyuuErJgbdvaJhYVhVqrWTg==",
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.44.0.tgz",
+      "integrity": "sha512-vV3cL48U5kDaKZtXrti12YRa7TyxgKAIDoYdqSIOMOFBXqFj2XbChHAtXquEn2+n78ciFgr4KIqEbydEGPxXgA==",
       "cpu": [
         "riscv64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-musl": {
-      "version": "4.40.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.40.2.tgz",
-      "integrity": "sha512-5W6vNYkhgfh7URiXTO1E9a0cy4fSgfE4+Hl5agb/U1sa0kjOLMLC1wObxwKxecE17j0URxuTrYZZME4/VH57Hg==",
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.44.0.tgz",
+      "integrity": "sha512-TDKO8KlHJuvTEdfw5YYFBjhFts2TR0VpZsnLLSYmB7AaohJhM8ctDSdDnUGq77hUh4m/djRafw+9zQpkOanE2Q==",
       "cpu": [
         "riscv64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.40.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.40.2.tgz",
-      "integrity": "sha512-B7LKIz+0+p348JoAL4X/YxGx9zOx3sR+o6Hj15Y3aaApNfAshK8+mWZEf759DXfRLeL2vg5LYJBB7DdcleYCoQ==",
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.44.0.tgz",
+      "integrity": "sha512-8541GEyktXaw4lvnGp9m84KENcxInhAt6vPWJ9RodsB/iGjHoMB2Pp5MVBCiKIRxrxzJhGCxmNzdu+oDQ7kwRA==",
       "cpu": [
         "s390x"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.40.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.40.2.tgz",
-      "integrity": "sha512-lG7Xa+BmBNwpjmVUbmyKxdQJ3Q6whHjMjzQplOs5Z+Gj7mxPtWakGHqzMqNER68G67kmCX9qX57aRsW5V0VOng==",
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.44.0.tgz",
+      "integrity": "sha512-iUVJc3c0o8l9Sa/qlDL2Z9UP92UZZW1+EmQ4xfjTc1akr0iUFZNfxrXJ/R1T90h/ILm9iXEY6+iPrmYB3pXKjw==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.40.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.40.2.tgz",
-      "integrity": "sha512-tD46wKHd+KJvsmije4bUskNuvWKFcTOIM9tZ/RrmIvcXnbi0YK/cKS9FzFtAm7Oxi2EhV5N2OpfFB348vSQRXA==",
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.44.0.tgz",
+      "integrity": "sha512-PQUobbhLTQT5yz/SPg116VJBgz+XOtXt8D1ck+sfJJhuEsMj2jSej5yTdp8CvWBSceu+WW+ibVL6dm0ptG5fcA==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.40.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.40.2.tgz",
-      "integrity": "sha512-Bjv/HG8RRWLNkXwQQemdsWw4Mg+IJ29LK+bJPW2SCzPKOUaMmPEppQlu/Fqk1d7+DX3V7JbFdbkh/NMmurT6Pg==",
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.44.0.tgz",
+      "integrity": "sha512-M0CpcHf8TWn+4oTxJfh7LQuTuaYeXGbk0eageVjQCKzYLsajWS/lFC94qlRqOlyC2KvRT90ZrfXULYmukeIy7w==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.40.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.40.2.tgz",
-      "integrity": "sha512-dt1llVSGEsGKvzeIO76HToiYPNPYPkmjhMHhP00T9S4rDern8P2ZWvWAQUEJ+R1UdMWJ/42i/QqJ2WV765GZcA==",
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.44.0.tgz",
+      "integrity": "sha512-3XJ0NQtMAXTWFW8FqZKcw3gOQwBtVWP/u8TpHP3CRPXD7Pd6s8lLdH3sHWh8vqKCyyiI8xW5ltJScQmBU9j7WA==",
       "cpu": [
         "ia32"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.40.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.40.2.tgz",
-      "integrity": "sha512-bwspbWB04XJpeElvsp+DCylKfF4trJDa2Y9Go8O6A7YLX2LIKGcNK/CYImJN6ZP4DcuOHB4Utl3iCbnR62DudA==",
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.44.0.tgz",
+      "integrity": "sha512-Q2Mgwt+D8hd5FIPUuPDsvPR7Bguza6yTkJxspDGkZj7tBRn2y4KSWYuIXpftFSjBra76TbKerCV7rgFPQrn+wQ==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -795,10 +815,11 @@
       }
     },
     "node_modules/@types/estree": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
-      "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==",
-      "dev": true
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/fs-extra": {
       "version": "8.1.5",
@@ -1831,12 +1852,13 @@
       "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="
     },
     "node_modules/rollup": {
-      "version": "4.40.2",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.40.2.tgz",
-      "integrity": "sha512-tfUOg6DTP4rhQ3VjOO6B4wyrJnGOX85requAXvqYTHsOgb2TFJdZ3aWpT8W2kPoypSGP7dZUyzxJ9ee4buM5Fg==",
+      "version": "4.44.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.44.0.tgz",
+      "integrity": "sha512-qHcdEzLCiktQIfwBq420pn2dP+30uzqYxv9ETm91wdt2R9AFcWfjNAmje4NWlnCIQ5RMTzVf0ZyisOKqHR6RwA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/estree": "1.0.7"
+        "@types/estree": "1.0.8"
       },
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -1846,26 +1868,26 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.40.2",
-        "@rollup/rollup-android-arm64": "4.40.2",
-        "@rollup/rollup-darwin-arm64": "4.40.2",
-        "@rollup/rollup-darwin-x64": "4.40.2",
-        "@rollup/rollup-freebsd-arm64": "4.40.2",
-        "@rollup/rollup-freebsd-x64": "4.40.2",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.40.2",
-        "@rollup/rollup-linux-arm-musleabihf": "4.40.2",
-        "@rollup/rollup-linux-arm64-gnu": "4.40.2",
-        "@rollup/rollup-linux-arm64-musl": "4.40.2",
-        "@rollup/rollup-linux-loongarch64-gnu": "4.40.2",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.40.2",
-        "@rollup/rollup-linux-riscv64-gnu": "4.40.2",
-        "@rollup/rollup-linux-riscv64-musl": "4.40.2",
-        "@rollup/rollup-linux-s390x-gnu": "4.40.2",
-        "@rollup/rollup-linux-x64-gnu": "4.40.2",
-        "@rollup/rollup-linux-x64-musl": "4.40.2",
-        "@rollup/rollup-win32-arm64-msvc": "4.40.2",
-        "@rollup/rollup-win32-ia32-msvc": "4.40.2",
-        "@rollup/rollup-win32-x64-msvc": "4.40.2",
+        "@rollup/rollup-android-arm-eabi": "4.44.0",
+        "@rollup/rollup-android-arm64": "4.44.0",
+        "@rollup/rollup-darwin-arm64": "4.44.0",
+        "@rollup/rollup-darwin-x64": "4.44.0",
+        "@rollup/rollup-freebsd-arm64": "4.44.0",
+        "@rollup/rollup-freebsd-x64": "4.44.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.44.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.44.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.44.0",
+        "@rollup/rollup-linux-arm64-musl": "4.44.0",
+        "@rollup/rollup-linux-loongarch64-gnu": "4.44.0",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.44.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.44.0",
+        "@rollup/rollup-linux-riscv64-musl": "4.44.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.44.0",
+        "@rollup/rollup-linux-x64-gnu": "4.44.0",
+        "@rollup/rollup-linux-x64-musl": "4.44.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.44.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.44.0",
+        "@rollup/rollup-win32-x64-msvc": "4.44.0",
         "fsevents": "~2.3.2"
       }
     },
diff --git a/package.json b/package.json
index da97e45..3661fa8 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^22.15.17",
     "@types/sprintf-js": "^1.1.4",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-    "rollup": "^4.40.2",
+    "rollup": "^4.44.0",
     "rollup-plugin-copy": "^3.5.0",
     "tslib": "^2.8.1",
     "typescript": "^5.8.3"

From bc34897360836439229d79f84a3cc9ff3cd4c45f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 20 Jun 2025 00:04:58 +0000
Subject: [PATCH 381/402] Bump @types/node from 22.15.17 to 24.0.3

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 22.15.17 to 24.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 24.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 20 +++++++++++---------
 package.json      |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 251ae09..2e47913 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,7 @@
         "@rollup/plugin-terser": "^0.4.4",
         "@rollup/plugin-typescript": "^12.1.2",
         "@types/d3": "^7.4.3",
-        "@types/node": "^22.15.17",
+        "@types/node": "^24.0.3",
         "@types/sprintf-js": "^1.1.4",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
         "rollup": "^4.44.0",
@@ -853,12 +853,13 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "22.15.17",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.17.tgz",
-      "integrity": "sha512-wIX2aSZL5FE+MR0JlvF87BNVrtFWf6AE6rxSE9X7OwnVvoyCQjpzSRJ+M87se/4QCkCiebQAqrJ0y6fwIyi7nw==",
+      "version": "24.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.0.3.tgz",
+      "integrity": "sha512-R4I/kzCYAdRLzfiCabn9hxWfbuHS573x+r0dJMkkzThEa7pbrcDWK+9zu3e7aBOouf+rQAciqPFMnxwr0aWgKg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~6.21.0"
+        "undici-types": "~7.8.0"
       }
     },
     "node_modules/@types/resolve": {
@@ -2083,10 +2084,11 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
-      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
-      "dev": true
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz",
+      "integrity": "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/universalify": {
       "version": "0.1.2",
diff --git a/package.json b/package.json
index 3661fa8..ba36ac3 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^12.1.2",
     "@types/d3": "^7.4.3",
-    "@types/node": "^22.15.17",
+    "@types/node": "^24.0.3",
     "@types/sprintf-js": "^1.1.4",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
     "rollup": "^4.44.0",

From a9b05b495dccfc01ca4a862ce83169c25e6c13b2 Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Thu, 19 Jun 2025 18:15:53 -0600
Subject: [PATCH 382/402] Release 1.17.0

---
 README.md            | 5 +++++
 docs/ReleaseNotes.md | 5 +++++
 manifest.json        | 2 +-
 package-lock.json    | 4 ++--
 package.json         | 2 +-
 versions.json        | 3 ++-
 6 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index e514299..af6f918 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,11 @@ This is an [Obsidian](https://obsidian.md/) plugin that helps you collect data f
 
 ## What's New
 
+Version 1.17.0
+
+- Adding colorByStreak parameter to Calendars allowing for increase color intensity based on streak
+- Update dependencies
+
 Version 1.16.0
 
 - Adding thresholdType parameter to Calendars
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index 56ff980..da14099 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,5 +1,10 @@
 # Release Notes
 
+## 1.17.0
+
+- Adding colorByStreak parameter to Calendars allowing for increase color intensity based on streak
+- Update dependencies
+
 ## 1.16.0
 
 - Adding thresholdType parameter to Calendars
diff --git a/manifest.json b/manifest.json
index ccb0aaa..557f716 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "id": "obsidian-tracker",
   "name": "Tracker",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "minAppVersion": "0.9.12",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "author": "pyrochlore",
diff --git a/package-lock.json b/package-lock.json
index 2e47913..899be75 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "obsidian-tracker",
-      "version": "1.16.0",
+      "version": "1.17.0",
       "license": "MIT",
       "dependencies": {
         "d3": "^7.9.0",
diff --git a/package.json b/package.json
index ba36ac3..58f2a50 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
diff --git a/versions.json b/versions.json
index 2fded29..3e7e34e 100644
--- a/versions.json
+++ b/versions.json
@@ -38,5 +38,6 @@
   "1.14.0": "0.9.12",
   "1.15.0": "0.9.12",
   "1.15.1": "0.9.12",
-  "1.16.0": "0.9.12"
+  "1.16.0": "0.9.12",
+  "1.17.0": "0.9.12"
 }

From 81b0dd0ed5e1266818040d8ab25439a1d58c8d96 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Oct 2025 13:49:32 +0000
Subject: [PATCH 383/402] Bump actions/setup-node from 4 to 6

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4 to 6.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v4...v6)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/releases.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index 4bace7d..0a30170 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Use Node.js
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v6
       with:
         node-version: '18.x'
     - name: Build

From 105cbdb1793b12d2919319babc4dcea96bca95f0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Nov 2025 14:25:23 +0000
Subject: [PATCH 384/402] Bump actions/checkout from 4 to 6

Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/releases.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index 4bace7d..e1f2af1 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -10,7 +10,7 @@ jobs:
       contents: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Use Node.js
       uses: actions/setup-node@v4
       with:

From d285fb1efbe9be2b17a387e09b20e8a09d161242 Mon Sep 17 00:00:00 2001
From: Mike Greiner <mike.greiner@protonmail.com>
Date: Sat, 20 Dec 2025 16:01:18 -0700
Subject: [PATCH 385/402] Fix #497: Support all days for startWeekOn parameter

- Add getDayIndex() helper function supporting abbreviations and full names
- Update month and heatmap views to support all 7 days (Sun-Sat)
- Add validation with clear error messages
- Support case-insensitive input (FRIDAY, friday, Fri all work)
- Support full day names (Sunday, Monday, etc.)
- Update documentation and add example file
---
 docs/InputParameters.md     |   2 +-
 examples/TestStartWeekOn.md | 170 ++++++++++++++++++++++++++++++++++++
 rollup.config.dev.mjs       |   6 +-
 src/heatmap.ts              |  33 +++----
 src/helper.ts               |  26 ++++++
 src/month.ts                |  37 ++++----
 src/parsing.ts              |  28 +++++-
 7 files changed, 258 insertions(+), 44 deletions(-)
 create mode 100644 examples/TestStartWeekOn.md

diff --git a/docs/InputParameters.md b/docs/InputParameters.md
index 9bcbf54..0ab700d 100644
--- a/docs/InputParameters.md
+++ b/docs/InputParameters.md
@@ -138,7 +138,7 @@ These key-value pairs should be placed under the key `month`.
 |:--------|:-------|:-----------:|:------|
 | `mode` | Pick one mode of the two(circle\|annotation) | 1 | 
 | `dataset` | Index of the dataset of your interest | 1~NT | all indices of non-x searchTarget |
-| `startWeekOn` | First day of a week ('Sun'\|'Mon') | 1 | 'Sun' |
+| `startWeekOn` | First day of a week ('Sun'\|'Mon'\|'Tue'\|'Wed'\|'Thu'\|'Fri'\|'Sat' or full names like 'Sunday', 'Monday', etc.) | 1 | 'Sun' |
 | `threshold` | Threshold to determine showing a circle on a day or not | 1~NT | 0 |
 | `thresholdType` | Pick one of the two (GreaterThan\|LessThan) | 1 | GreaterThan
 | `yMin` | Minimum value | 1~NT | Minimum value of the dataset |
diff --git a/examples/TestStartWeekOn.md b/examples/TestStartWeekOn.md
new file mode 100644
index 0000000..428ac6b
--- /dev/null
+++ b/examples/TestStartWeekOn.md
@@ -0,0 +1,170 @@
+# Test: startWeekOn Parameter
+
+This example demonstrates the `startWeekOn` parameter which allows you to start the week on any day.
+
+## All Days Supported
+
+The `startWeekOn` parameter now accepts any day of the week:
+- Abbreviations: `Sun`, `Mon`, `Tue`, `Wed`, `Thu`, `Fri`, `Sat`
+- Full names: `Sunday`, `Monday`, `Tuesday`, `Wednesday`, `Thursday`, `Friday`, `Saturday`
+- Case-insensitive: `FRIDAY`, `friday`, `Fri` all work
+
+## Sunday (Default)
+
+```tracker
+searchType: tag
+searchTarget: test
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-31
+month:
+    startWeekOn: Sun
+    mode: circle
+```
+
+## Monday
+
+```tracker
+searchType: tag
+searchTarget: test
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-31
+month:
+    startWeekOn: Mon
+    mode: circle
+```
+
+## Tuesday
+
+```tracker
+searchType: tag
+searchTarget: test
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-31
+month:
+    startWeekOn: Tue
+    mode: circle
+```
+
+## Wednesday
+
+```tracker
+searchType: tag
+searchTarget: test
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-31
+month:
+    startWeekOn: Wed
+    mode: circle
+```
+
+## Thursday
+
+```tracker
+searchType: tag
+searchTarget: test
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-31
+month:
+    startWeekOn: Thu
+    mode: circle
+```
+
+## Friday
+
+```tracker
+searchType: tag
+searchTarget: test
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-31
+month:
+    startWeekOn: Fri
+    mode: circle
+```
+
+## Saturday
+
+```tracker
+searchType: tag
+searchTarget: test
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-31
+month:
+    startWeekOn: Sat
+    mode: circle
+```
+
+## Case Insensitivity
+
+All of these are equivalent:
+
+```tracker
+searchType: tag
+searchTarget: test
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-31
+month:
+    startWeekOn: FRIDAY
+    mode: circle
+```
+
+```tracker
+searchType: tag
+searchTarget: test
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-31
+month:
+    startWeekOn: friday
+    mode: circle
+```
+
+```tracker
+searchType: tag
+searchTarget: test
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-31
+month:
+    startWeekOn: Friday
+    mode: circle
+```
+
+## Full Day Names
+
+You can also use full day names:
+
+```tracker
+searchType: tag
+searchTarget: test
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-31
+month:
+    startWeekOn: Sunday
+    mode: circle
+```
+
+## Error Handling
+
+Invalid values will show a clear error message:
+
+```tracker
+searchType: tag
+searchTarget: test
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-31
+month:
+    startWeekOn: InvalidDay
+    mode: circle
+```
+
+**Expected Error:** "Invalid startWeekOn value: 'InvalidDay'. Must be one of: Sun, Mon, Tue, Wed, Thu, Fri, Sat (or full day names like Sunday, Monday, etc.)"
diff --git a/rollup.config.dev.mjs b/rollup.config.dev.mjs
index 588dcbd..22c50a2 100644
--- a/rollup.config.dev.mjs
+++ b/rollup.config.dev.mjs
@@ -13,7 +13,11 @@ export default {
   },
   external: ['obsidian'],
   plugins: [
-    typescript(),
+    typescript({
+      tsconfig: 'tsconfig.json',
+      rootDir: 'src',
+      outDir: 'examples/.obsidian/plugins/obsidian-tracker'
+    }),
     nodeResolve({browser: true}),
     commonjs(),
     copy({
diff --git a/src/heatmap.ts b/src/heatmap.ts
index 601e618..359db0b 100644
--- a/src/heatmap.ts
+++ b/src/heatmap.ts
@@ -128,17 +128,16 @@ function renderHeatmapDays(
     // Prepare data for graph
     let daysInHeatmapView: Array<DayInfo> = [];
     const dataStartDate = dataset.getStartDate().clone();
-    let startDate = dataStartDate
-        .clone()
-        .subtract(dataStartDate.day(), "days");
-    if (heatmapInfo.startWeekOn.toLowerCase() === "mon") {
-        startDate = startDate.add(1, "days");
-    }
+    const startDayIndex = helper.getDayIndex(heatmapInfo.startWeekOn);
+    const currentDayOfWeek = dataStartDate.day(); // 0=Sunday, 1=Monday, etc.
+    // Calculate days to subtract to get to the start of the week
+    const daysToSubtract = (currentDayOfWeek - startDayIndex + 7) % 7;
+    let startDate = dataStartDate.clone().subtract(daysToSubtract, "days");
     const dataEndDate = dataset.getEndDate().clone();
-    let endDate = dataEndDate.clone().add(7 - dataEndDate.day() - 1, "days");
-    if (heatmapInfo.startWeekOn.toLowerCase() === "mon") {
-        endDate = endDate.add(1, "days");
-    }
+    const endDayOfWeek = dataEndDate.day();
+    // Calculate days to add to complete the week (get to Saturday of that week)
+    const daysToAdd = (6 - endDayOfWeek + startDayIndex) % 7;
+    let endDate = dataEndDate.clone().add(daysToAdd, "days");
     // console.log(startDate.format("YYYY-MM-DD"));
     // console.log(endDate.format("YYYY-MM-DD"));
 
@@ -150,16 +149,10 @@ function renderHeatmapDays(
         curDate <= endDate;
         curDate.add(1, "days")
     ) {
-        if (heatmapInfo.startWeekOn.toLowerCase() === "mon") {
-            indCol = curDate.day() - 1;
-            if (indCol < 0) {
-                indCol = 6;
-            }
-            indRow = Math.floor(ind / 7);
-        } else {
-            indCol = curDate.day(); // 0~6
-            indRow = Math.floor(ind / 7);
-        }
+        const dayOfWeek = curDate.day(); // 0=Sunday, 1=Monday, etc.
+        // Calculate column: shift by startDayIndex
+        indCol = (dayOfWeek - startDayIndex + 7) % 7;
+        indRow = Math.floor(ind / 7);
 
         // curValue and scaledValue
         let curValue = dataset.getValue(curDate);
diff --git a/src/helper.ts b/src/helper.ts
index 3c7fd36..3e252b1 100644
--- a/src/helper.ts
+++ b/src/helper.ts
@@ -332,6 +332,32 @@ export function trimByChar(str: string, char: string) {
         : str.substring(first, str.length - last);
 }
 
+/**
+ * Convert day abbreviation or full name to day index (0-6)
+ * @param dayAbbr - Day abbreviation or full name: "Sun"/"Sunday", "Mon"/"Monday", etc.
+ * @returns Day index (0=Sunday, 1=Monday, ..., 6=Saturday)
+ */
+export function getDayIndex(dayAbbr: string): number {
+    const dayMap: { [key: string]: number } = {
+        "sun": 0,
+        "sunday": 0,
+        "mon": 1,
+        "monday": 1,
+        "tue": 2,
+        "tuesday": 2,
+        "wed": 3,
+        "wednesday": 3,
+        "thu": 4,
+        "thursday": 4,
+        "fri": 5,
+        "friday": 5,
+        "sat": 6,
+        "saturday": 6
+    };
+    const normalized = dayAbbr.toLowerCase().trim();
+    return dayMap[normalized] !== undefined ? dayMap[normalized] : 0; // Default to Sunday
+}
+
 export function replaceImgTagByAlt(input: string) {
     if (input === null) return null;
 
diff --git a/src/month.ts b/src/month.ts
index 6c04c47..4d42cfc 100644
--- a/src/month.ts
+++ b/src/month.ts
@@ -447,7 +447,9 @@ function renderMonthHeader(
 
     // week day names
     let weekdayNames = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
-    if (monthInfo.startWeekOn.toLowerCase() === "mon") {
+    const startDayIndex = helper.getDayIndex(monthInfo.startWeekOn);
+    // Rotate array so startWeekOn is first
+    for (let i = 0; i < startDayIndex; i++) {
         weekdayNames.push(weekdayNames.shift());
     }
     let weekdayNameSize = helper.measureTextSize(
@@ -572,17 +574,16 @@ function renderMonthDays(
 
     // Start and end
     const monthStartDate = curMonthDate.clone().startOf("month");
-    let startDate = monthStartDate
-        .clone()
-        .subtract(monthStartDate.day(), "days");
-    if (monthInfo.startWeekOn.toLowerCase() === "mon") {
-        startDate = startDate.add(1, "days");
-    }
+    const startDayIndex = helper.getDayIndex(monthInfo.startWeekOn);
+    const currentDayOfWeek = monthStartDate.day(); // 0=Sunday, 1=Monday, etc.
+    // Calculate days to subtract to get to the start of the week
+    const daysToSubtract = (currentDayOfWeek - startDayIndex + 7) % 7;
+    let startDate = monthStartDate.clone().subtract(daysToSubtract, "days");
     const monthEndDate = curMonthDate.clone().endOf("month");
-    let endDate = monthEndDate.clone().add(7 - monthEndDate.day() - 1, "days");
-    if (monthInfo.startWeekOn.toLowerCase() === "mon") {
-        endDate = endDate.add(1, "days");
-    }
+    const endDayOfWeek = monthEndDate.day();
+    // Calculate days to add to complete the week (get to Saturday of that week)
+    const daysToAdd = (6 - endDayOfWeek + startDayIndex) % 7;
+    let endDate = monthEndDate.clone().add(daysToAdd, "days");
     const dataStartDate = dataset.getStartDate();
     const dataEndDate = dataset.getEndDate();
     // console.log(monthStartDate.format("YYYY-MM-DD"));
@@ -628,16 +629,10 @@ function renderMonthDays(
             logToConsole = false; // Change this to do dubugging
         }
 
-        if (monthInfo.startWeekOn.toLowerCase() === "mon") {
-            indCol = curDate.day() - 1;
-            if (indCol < 0) {
-                indCol = 6;
-            }
-            indRow = Math.floor(ind / 7);
-        } else {
-            indCol = curDate.day(); // 0~6
-            indRow = Math.floor(ind / 7);
-        }
+        const dayOfWeek = curDate.day(); // 0=Sunday, 1=Monday, etc.
+        // Calculate column: shift by startDayIndex
+        indCol = (dayOfWeek - startDayIndex + 7) % 7;
+        indRow = Math.floor(ind / 7);
 
         // is this day in this month
         let isInThisMonth = true;
diff --git a/src/parsing.ts b/src/parsing.ts
index 516eea8..7754409 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -2065,10 +2065,20 @@ export function getRenderInfoFromYaml(
         let numDataset = month.dataset.length;
 
         // startWeekOn
-        month.startWeekOn = getStringFromInput(
+        let startWeekOnValue = getStringFromInput(
             yamlMonth?.startWeekOn,
             month.startWeekOn
         );
+        // Validate day abbreviation - supports both abbreviations and full names
+        if (startWeekOnValue) {
+            const normalized = startWeekOnValue.toLowerCase().trim();
+            const validDays = ["sun", "sunday", "mon", "monday", "tue", "tuesday", "wed", "wednesday", "thu", "thursday", "fri", "friday", "sat", "saturday"];
+            if (!validDays.includes(normalized)) {
+                errorMessage = `Invalid startWeekOn value: "${startWeekOnValue}". Must be one of: Sun, Mon, Tue, Wed, Thu, Fri, Sat (or full day names like Sunday, Monday, etc.)`;
+                return errorMessage;
+            }
+        }
+        month.startWeekOn = startWeekOnValue;
         // console.log(month.startWeekOn);
 
         // showCircle
@@ -2306,6 +2316,22 @@ export function getRenderInfoFromYaml(
             }
         }
 
+        // startWeekOn
+        let heatmapStartWeekOnValue = getStringFromInput(
+            yamlHeatmap?.startWeekOn,
+            heatmap.startWeekOn
+        );
+        // Validate day abbreviation - supports both abbreviations and full names
+        if (heatmapStartWeekOnValue) {
+            const normalized = heatmapStartWeekOnValue.toLowerCase().trim();
+            const validDays = ["sun", "sunday", "mon", "monday", "tue", "tuesday", "wed", "wednesday", "thu", "thursday", "fri", "friday", "sat", "saturday"];
+            if (!validDays.includes(normalized)) {
+                errorMessage = `Invalid startWeekOn value: "${heatmapStartWeekOnValue}". Must be one of: Sun, Mon, Tue, Wed, Thu, Fri, Sat (or full day names like Sunday, Monday, etc.)`;
+                return errorMessage;
+            }
+        }
+        heatmap.startWeekOn = heatmapStartWeekOnValue;
+
         renderInfo.heatmap.push(heatmap);
     }
     // console.log(renderInfo.heatmap);

From bb3a7daec44841634074b94f7de05c02d0637780 Mon Sep 17 00:00:00 2001
From: Mike Greiner <mike.greiner@protonmail.com>
Date: Sat, 20 Dec 2025 18:25:41 -0700
Subject: [PATCH 386/402] Add searchType: frontmatter.exists for tracking field
 existence
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Implements Issue #280: Adds new searchType that tracks days when a
frontmatter field exists and is non-empty, regardless of value.

Changes:
- Add FrontmatterExists to SearchType enum
- Implement collectDataFromFrontmatterExists() function
- Add validation and parsing support
- Update user documentation (Concepts, InputParameters, TargetEvaluation)
- Add example usage (TestFrontmatter.md)
- Add comprehensive unit tests (12 test cases)
- Fix pre-existing bug: .contains() → .includes() in helper.ts
- Add testing infrastructure (Jest, mocks, config)
- Update README with Development section

Testing:
- 12 unit tests covering all edge cases (all passing)
- Manual testing in Obsidian
- Backward compatibility verified

Fixes #280
---
 README.md                       |   22 +
 TESTING.md                      |  187 +
 TEST_SETUP.md                   |   67 +
 docs/Concepts.md                |    2 +-
 docs/InputParameters.md         |    2 +-
 docs/TargetEvaluation.md        |   13 +-
 examples/TestFrontmatter.md     |   17 +
 jest.config.js                  |   29 +
 package-lock.json               | 6114 ++++++++++++++++++++++++-------
 package.json                    |    8 +-
 rollup.config.dev.mjs           |    6 +-
 src/collecting.ts               |   38 +
 src/data.ts                     |    1 +
 src/helper.ts                   |    2 +-
 src/main.ts                     |   30 +-
 src/parsing.ts                  |    4 +
 test/frontmatter-exists.test.ts |  275 ++
 test/mocks/d3.ts                |   42 +
 test/mocks/obsidian.ts          |   41 +
 test/setup.ts                   |   16 +
 20 files changed, 5675 insertions(+), 1241 deletions(-)
 create mode 100644 TESTING.md
 create mode 100644 TEST_SETUP.md
 create mode 100644 jest.config.js
 create mode 100644 test/frontmatter-exists.test.ts
 create mode 100644 test/mocks/d3.ts
 create mode 100644 test/mocks/obsidian.ts
 create mode 100644 test/setup.ts

diff --git a/README.md b/README.md
index af6f918..343b1f2 100644
--- a/README.md
+++ b/README.md
@@ -139,6 +139,27 @@ From version 1.9.0, template variables, e.g. '{{sum}}', are deprecated. Instead,
 
 For more use cases, please download and open the [examples](https://github.com/pyrochlore/obsidian-tracker/tree/master/examples) folder in obsidian with this plugin installed and enabled.
 
+## Development
+
+### Running Tests
+
+The plugin includes automated unit tests. To run them:
+
+```bash
+npm test              # Run all tests
+npm run test:watch    # Watch mode (re-runs on changes)
+npm run test:coverage # Generate coverage report
+```
+
+See [TESTING.md](TESTING.md) for detailed testing documentation.
+
+### Building
+
+```bash
+npm run build  # Build for production
+npm run dev    # Build in watch mode for development
+```
+
 ## More Details You May Want to Know
 
 - [Installation](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Installation.md): Install the plugin from Obsidian or install it manually
@@ -151,6 +172,7 @@ For more use cases, please download and open the [examples](https://github.com/p
 - [Release Notes](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/ReleaseNotes.md)
 - [Road Map](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/RoadMap.md)
 - [Frequently Asked Questions](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Questions.md)
+- [Testing](TESTING.md): How to run and write tests
 
 ## Support
 
diff --git a/TESTING.md b/TESTING.md
new file mode 100644
index 0000000..3aacda1
--- /dev/null
+++ b/TESTING.md
@@ -0,0 +1,187 @@
+# Testing Guide
+
+This document explains how to run tests for the obsidian-tracker plugin.
+
+## Quick Start
+
+```bash
+npm test
+```
+
+That's it! The tests will run automatically.
+
+## Test Commands
+
+```bash
+npm test              # Run all tests once
+npm run test:watch    # Run tests in watch mode (re-runs on file changes)
+npm run test:coverage # Run tests with coverage report
+```
+
+## What Gets Tested
+
+### Unit Tests
+
+Unit tests validate core logic without requiring Obsidian to be running. They test:
+
+- **Data collection functions** - How data is extracted from frontmatter, tags, etc.
+- **Parsing functions** - YAML configuration parsing and validation
+- **Edge cases** - Empty values, null, undefined, arrays, booleans, etc.
+
+### Current Test Coverage
+
+- `test/frontmatter-exists.test.ts` - Tests for the `frontmatter.exists` searchType
+  - 12 test cases covering all edge cases
+  - Validates non-empty strings, arrays, booleans, numbers
+  - Validates empty strings, arrays, null, undefined are rejected
+
+## Test Structure
+
+```
+test/
+├── frontmatter-exists.test.ts  # Unit tests for frontmatter.exists
+├── mocks/
+│   ├── obsidian.ts             # Mock Obsidian API
+│   └── d3.ts                   # Mock d3 library
+└── setup.ts                    # Jest setup file
+```
+
+## Prerequisites
+
+1. **Node.js** - Version 18+ recommended
+2. **npm** - Comes with Node.js
+3. **Dependencies** - Run `npm install` first
+
+## First Time Setup
+
+```bash
+# Install dependencies (including Jest)
+npm install
+
+# Verify tests work
+npm test
+```
+
+If you encounter issues with npm install (e.g., obsidian package integrity errors), see [Troubleshooting](#troubleshooting) below.
+
+## Writing New Tests
+
+### Example Test Structure
+
+```typescript
+import { describe, it, expect, beforeEach } from '@jest/globals';
+import { SearchType, Query } from '../src/data';
+import { yourFunction } from '../src/your-module';
+
+describe('Your Feature', () => {
+    let query: Query;
+    
+    beforeEach(() => {
+        // Set up test data
+        query = new Query(0, SearchType.YourType, 'target');
+    });
+    
+    it('should do something', () => {
+        const result = yourFunction(query);
+        expect(result).toBe(true);
+    });
+});
+```
+
+### Test File Naming
+
+- Test files should be named `*.test.ts` or `*.spec.ts`
+- Place them in the `test/` directory
+- Jest will automatically find and run them
+
+## Mocking Obsidian API
+
+Since tests run outside Obsidian, we mock the Obsidian API. See `test/mocks/obsidian.ts` for examples.
+
+To use mocks:
+
+```typescript
+import type { CachedMetadata } from 'obsidian';
+
+const fileCache: CachedMetadata = {
+    frontmatter: {
+        field: 'value'
+    }
+};
+```
+
+## Troubleshooting
+
+### npm install fails with obsidian package error
+
+If you see integrity check errors for the obsidian package:
+
+```bash
+# Clear npm cache
+npm cache clean --force
+
+# Remove node_modules and reinstall
+rm -rf node_modules package-lock.json
+npm install
+```
+
+### Tests fail with "Module not found"
+
+Make sure all dependencies are installed:
+
+```bash
+npm install
+```
+
+### TypeScript errors in tests
+
+Check that `ts-jest` is installed:
+
+```bash
+npm install --save-dev ts-jest@29 @types/jest@29
+```
+
+## Continuous Integration
+
+These tests can be run in CI/CD pipelines:
+
+```yaml
+# Example GitHub Actions
+- name: Run tests
+  run: npm test
+```
+
+## Manual Testing (Obsidian)
+
+For visual/end-to-end testing, you still need to test in Obsidian:
+
+1. Build the plugin: `npm run build`
+2. Copy to test vault: See `test-deploy.sh` or `TEST_SETUP.md`
+3. Enable plugin in Obsidian
+4. Test with real notes
+
+See `docs/dev/issue-497/TESTING_GUIDE.md` for detailed manual testing instructions.
+
+## Coverage Reports
+
+Generate coverage reports:
+
+```bash
+npm run test:coverage
+```
+
+This creates a `coverage/` directory with HTML reports. Open `coverage/lcov-report/index.html` in a browser to view.
+
+## Best Practices
+
+1. **Write tests for new features** - Add tests when implementing new searchTypes or features
+2. **Test edge cases** - Empty values, null, undefined, arrays, etc.
+3. **Keep tests fast** - Unit tests should run in seconds
+4. **Mock external dependencies** - Don't require Obsidian or real files
+5. **Use descriptive test names** - "should count non-empty strings" not "test1"
+
+## Questions?
+
+- See `TEST_SETUP.md` for setup troubleshooting
+- Check existing test files for examples
+- Review Jest documentation: https://jestjs.io/docs/getting-started
diff --git a/TEST_SETUP.md b/TEST_SETUP.md
new file mode 100644
index 0000000..f11d630
--- /dev/null
+++ b/TEST_SETUP.md
@@ -0,0 +1,67 @@
+# Test Setup Guide
+
+## Quick Start
+
+Tests are now set up and working! Just run:
+
+```bash
+npm test
+```
+
+## First Time Setup
+
+If you're setting up the project for the first time:
+
+```bash
+# Install all dependencies (including Jest)
+npm install
+
+# Run tests to verify everything works
+npm test
+```
+
+## If npm install fails
+
+If you encounter integrity check errors with the `obsidian` package:
+
+```bash
+# Clear npm cache and reinstall
+npm cache clean --force
+rm -rf node_modules package-lock.json
+npm install
+```
+
+This should resolve the issue. The npm cache fix worked for us!
+
+## Test Files Created
+
+- `test/frontmatter-exists.test.ts` - Comprehensive unit tests for the new feature
+- `test/mocks/obsidian.ts` - Mock Obsidian API
+- `test/setup.ts` - Jest setup file
+- `jest.config.js` - Jest configuration
+
+## Running Tests
+
+Once Jest is installed:
+
+```bash
+npm test                    # Run all tests
+npm run test:watch         # Watch mode
+npm run test:coverage      # With coverage
+```
+
+## What the Tests Cover
+
+The `frontmatter-exists.test.ts` file tests:
+- ✅ Non-empty strings
+- ❌ Empty strings  
+- ❌ Whitespace-only strings
+- ✅ Non-empty arrays
+- ❌ Empty arrays
+- ✅ Boolean true
+- ✅ Boolean false
+- ✅ Number zero
+- ❌ Null values
+- ❌ Missing/undefined fields
+- ❌ Missing frontmatter
+- ✅ Nested fields
diff --git a/docs/Concepts.md b/docs/Concepts.md
index 159a718..54f9ac6 100644
--- a/docs/Concepts.md
+++ b/docs/Concepts.md
@@ -6,7 +6,7 @@ This plugin was designed to read code blocks in [YAML format](https://en.wikiped
 
 ### Collecting Data
 
-Providing parameters `searchType` and `searchTarget` is the minimum requirement for a successful data collection. `searchType` can be `tag`, `frontmatter`, `wiki`, `dvField`, `table`, `fileMeta`, `task`, or `text`. Then the cooresponding `searchTarget` should be provided according to the specified type.
+Providing parameters `searchType` and `searchTarget` is the minimum requirement for a successful data collection. `searchType` can be `tag`, `frontmatter`, `frontmatter.exists`, `wiki`, `dvField`, `table`, `fileMeta`, `task`, or `text`. Then the cooresponding `searchTarget` should be provided according to the specified type.
 
 ### Target Evaluation
 
diff --git a/docs/InputParameters.md b/docs/InputParameters.md
index 9bcbf54..1538f65 100644
--- a/docs/InputParameters.md
+++ b/docs/InputParameters.md
@@ -18,7 +18,7 @@ These key-value pairs are placed under the root of the code block.
 
 | Key | Description | Number of Values | Default |
 |:--------|:-------|:-----------:|:------|
-| `searchType` | Type of `searchTarget` (tag\|frontmatter\|wiki\|text\|dvField\|table\|fileMeta\|task) | 1~NT | Must be provided |
+| `searchType` | Type of `searchTarget` (tag\|frontmatter\|frontmatter.exists\|wiki\|text\|dvField\|table\|fileMeta\|task) | 1~NT | Must be provided |
 | `searchTarget` | Target to search<br>[[detail](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TargetEvaluation.md)] | NT (Number of Targets) | Must be provided |
 | `folder` | Root path containing notes to search | 1 | Root of this vault |
 | `file` | Files to include for searching | N | null |
diff --git a/docs/TargetEvaluation.md b/docs/TargetEvaluation.md
index 40beb65..d9c5bd4 100644
--- a/docs/TargetEvaluation.md
+++ b/docs/TargetEvaluation.md
@@ -1,6 +1,6 @@
 # Target Evaluation
 
-From the [input parameters](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md) you provided, the search targets dispersed in the notes will be counted or evaluated as a value. Tracker plugin supports eight kinds of `searchType`: `tag`, `frontmatter`, `wiki`, `text`, `table`, `dvField`, `task`, and `fileMeta`, dealing with different types of searching condition.
+From the [input parameters](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md) you provided, the search targets dispersed in the notes will be counted or evaluated as a value. Tracker plugin supports multiple kinds of `searchType`: `tag`, `frontmatter`, `frontmatter.exists`, `wiki`, `text`, `table`, `dvField`, `task`, and `fileMeta`, dealing with different types of searching condition.
 
 ## Multiple Targets
 You can provide multiple search targets in code block by entering an array of targets separated by a comma under parameter `searchType` and `searchTarget`. Each of the targets will be identified in order and then the  values in notes will be evaluated and form a dataset indexed by that order in the array (zero-based indexing).
@@ -51,6 +51,17 @@ mood: 10<br>
 ......<br>
 \-\-\-<br>
 
+### searchType: frontmatter.exists
+
+This search type tracks days when a frontmatter field exists and is non-empty. Unlike `frontmatter`, which tries to parse the value as a number, `frontmatter.exists` simply checks if the field has any value (text, number, boolean, etc.) and counts it as 1 (or the value specified by `constValue`). This is useful for tracking habits or events where you just need to know if something happened, regardless of the value.
+
+For example, if you have a frontmatter field `meditation: "yes"` or `meditation: "completed"`, using `searchType: frontmatter.exists` with `searchTarget: meditation` will count each day where the field exists and is not empty.
+
+\-\-\-<br>
+meditation: yes<br>
+......<br>
+\-\-\-<br>
+
 ### searchType: wiki
 This search type helps you count wiki links in articles. For example,
 [[A]]
diff --git a/examples/TestFrontmatter.md b/examples/TestFrontmatter.md
index f3eca7c..a08cd8f 100644
--- a/examples/TestFrontmatter.md
+++ b/examples/TestFrontmatter.md
@@ -65,4 +65,21 @@ month:
     initMonth: 2021-01
 ```
 
+## Track Field Existence (frontmatter.exists)
+
+Track days when a frontmatter field exists and is non-empty, regardless of the value. This is useful for habit tracking where you just need to know if something happened.
+
+``` tracker
+searchType: frontmatter.exists
+searchTarget: meditation
+datasetName: Meditation Days
+folder: diary
+startDate: 2021-01-01
+endDate: 2021-01-31
+month:
+    mode: circle
+```
+
+This will count each day where the `meditation` field exists in the frontmatter, whether it's `meditation: yes`, `meditation: completed`, `meditation: true`, or any other non-empty value.
+
 Please also check those search targets in markdown files under folder 'diary'.
\ No newline at end of file
diff --git a/jest.config.js b/jest.config.js
new file mode 100644
index 0000000..f4a88d8
--- /dev/null
+++ b/jest.config.js
@@ -0,0 +1,29 @@
+module.exports = {
+  testEnvironment: 'node',
+  roots: ['<rootDir>/test'],
+  testMatch: ['**/__tests__/**/*.ts', '**/?(*.)+(spec|test).ts'],
+  transform: {
+    '^.+\\.ts$': ['ts-jest', {
+      tsconfig: {
+        esModuleInterop: true,
+        allowSyntheticDefaultImports: true,
+        module: 'commonjs',
+      },
+    }],
+  },
+  moduleNameMapper: {
+    '^obsidian$': '<rootDir>/test/mocks/obsidian.ts',
+    // Mock d3 and other ES module dependencies
+    '^d3$': '<rootDir>/test/mocks/d3.ts',
+  },
+  collectCoverageFrom: [
+    'src/**/*.ts',
+    '!src/**/*.d.ts',
+  ],
+  setupFilesAfterEnv: ['<rootDir>/test/setup.ts'],
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json'],
+  // Transform ES modules in node_modules
+  transformIgnorePatterns: [
+    'node_modules/(?!(d3|d3-.*|moment)/)',
+  ],
+};
diff --git a/package-lock.json b/package-lock.json
index 899be75..d284734 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,1664 +20,4481 @@
         "@rollup/plugin-terser": "^0.4.4",
         "@rollup/plugin-typescript": "^12.1.2",
         "@types/d3": "^7.4.3",
+        "@types/jest": "^29.5.14",
         "@types/node": "^24.0.3",
         "@types/sprintf-js": "^1.1.4",
+        "jest": "^29.7.0",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
         "rollup": "^4.44.0",
         "rollup-plugin-copy": "^3.5.0",
+        "ts-jest": "^29.4.6",
         "tslib": "^2.8.1",
         "typescript": "^5.8.3"
       }
     },
-    "node_modules/@codemirror/state": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.2.tgz",
-      "integrity": "sha512-FVqsPqtPWKVVL3dPSxy8wEF/ymIEuVzF1PK3VbUgrxXpJUSHQWWZz4JMToquRxnkw+36LTamCZG2iua2Ptq0fA==",
+    "node_modules/@babel/code-frame": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
+      "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
       "dev": true,
-      "peer": true,
+      "license": "MIT",
       "dependencies": {
-        "@marijn/find-cluster-break": "^1.0.0"
+        "@babel/helper-validator-identifier": "^7.27.1",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@codemirror/view": {
-      "version": "6.36.8",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.36.8.tgz",
-      "integrity": "sha512-yoRo4f+FdnD01fFt4XpfpMCcCAo9QvZOtbrXExn4SqzH32YC6LgzqxfLZw/r6Ge65xyY03mK/UfUqrVw1gFiFg==",
+    "node_modules/@babel/compat-data": {
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.5.tgz",
+      "integrity": "sha512-6uFXyCayocRbqhZOB+6XcuZbkMNimwfVGFji8CTZnCzOHVGvDqzvitu1re2AU5LROliz7eQPhB8CpAMvnx9EjA==",
       "dev": true,
-      "peer": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/core": {
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.5.tgz",
+      "integrity": "sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@codemirror/state": "^6.5.0",
-        "style-mod": "^4.1.0",
-        "w3c-keyname": "^2.2.4"
+        "@babel/code-frame": "^7.27.1",
+        "@babel/generator": "^7.28.5",
+        "@babel/helper-compilation-targets": "^7.27.2",
+        "@babel/helper-module-transforms": "^7.28.3",
+        "@babel/helpers": "^7.28.4",
+        "@babel/parser": "^7.28.5",
+        "@babel/template": "^7.27.2",
+        "@babel/traverse": "^7.28.5",
+        "@babel/types": "^7.28.5",
+        "@jridgewell/remapping": "^2.3.5",
+        "convert-source-map": "^2.0.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
       }
     },
-    "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
-      "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
+    "node_modules/@babel/generator": {
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.5.tgz",
+      "integrity": "sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jridgewell/set-array": "^1.2.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.24"
+        "@babel/parser": "^7.28.5",
+        "@babel/types": "^7.28.5",
+        "@jridgewell/gen-mapping": "^0.3.12",
+        "@jridgewell/trace-mapping": "^0.3.28",
+        "jsesc": "^3.0.2"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
-      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+    "node_modules/@babel/helper-compilation-targets": {
+      "version": "7.27.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz",
+      "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/compat-data": "^7.27.2",
+        "@babel/helper-validator-option": "^7.27.1",
+        "browserslist": "^4.24.0",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.1"
+      },
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+    "node_modules/@babel/helper-globals": {
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz",
+      "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@jridgewell/source-map": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
-      "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz",
+      "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.25"
+        "@babel/traverse": "^7.27.1",
+        "@babel/types": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
-      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
-      "dev": true
-    },
-    "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.25",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.28.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz",
+      "integrity": "sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jridgewell/resolve-uri": "^3.1.0",
-        "@jridgewell/sourcemap-codec": "^1.4.14"
+        "@babel/helper-module-imports": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.27.1",
+        "@babel/traverse": "^7.28.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@marijn/find-cluster-break": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz",
-      "integrity": "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==",
+    "node_modules/@babel/helper-plugin-utils": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz",
+      "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==",
       "dev": true,
-      "peer": true
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
     },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
       "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">= 8"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
+      "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">= 8"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",
+      "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helpers": {
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.4.tgz",
+      "integrity": "sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
+        "@babel/template": "^7.27.2",
+        "@babel/types": "^7.28.4"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@rollup/plugin-commonjs": {
-      "version": "28.0.5",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-28.0.5.tgz",
-      "integrity": "sha512-lytLp2JgAMwqJY6ve3OSROXr2XuEYHjnsQN3hmnxC+w11dI91LuUw4Yc1kk2FqKXeMG8psoFejFgK+znoij0cg==",
+    "node_modules/@babel/parser": {
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz",
+      "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@rollup/pluginutils": "^5.0.1",
-        "commondir": "^1.0.1",
-        "estree-walker": "^2.0.2",
-        "fdir": "^6.2.0",
-        "is-reference": "1.2.1",
-        "magic-string": "^0.30.3",
-        "picomatch": "^4.0.2"
+        "@babel/types": "^7.28.5"
+      },
+      "bin": {
+        "parser": "bin/babel-parser.js"
       },
       "engines": {
-        "node": ">=16.0.0 || 14 >= 14.17"
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
       },
       "peerDependencies": {
-        "rollup": "^2.68.0||^3.0.0||^4.0.0"
-      },
-      "peerDependenciesMeta": {
-        "rollup": {
-          "optional": true
-        }
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@rollup/plugin-node-resolve": {
-      "version": "16.0.1",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-16.0.1.tgz",
-      "integrity": "sha512-tk5YCxJWIG81umIvNkSod2qK5KyQW19qcBF/B78n1bjtOON6gzKoVeSzAE8yHCZEDmqkHKkxplExA8KzdJLJpA==",
+    "node_modules/@babel/plugin-syntax-bigint": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@rollup/pluginutils": "^5.0.1",
-        "@types/resolve": "1.20.2",
-        "deepmerge": "^4.2.2",
-        "is-module": "^1.0.0",
-        "resolve": "^1.22.1"
-      },
-      "engines": {
-        "node": ">=14.0.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
       },
       "peerDependencies": {
-        "rollup": "^2.78.0||^3.0.0||^4.0.0"
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.12.13"
       },
-      "peerDependenciesMeta": {
-        "rollup": {
-          "optional": true
-        }
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@rollup/plugin-terser": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-terser/-/plugin-terser-0.4.4.tgz",
-      "integrity": "sha512-XHeJC5Bgvs8LfukDwWZp7yeqin6ns8RTl2B9avbejt6tZqsqvVoWI7ZTQrcNsfKEDWBTnTxM8nMDkO2IFFbd0A==",
+    "node_modules/@babel/plugin-syntax-class-static-block": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "serialize-javascript": "^6.0.1",
-        "smob": "^1.0.0",
-        "terser": "^5.17.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "rollup": "^2.0.0||^3.0.0||^4.0.0"
-      },
-      "peerDependenciesMeta": {
-        "rollup": {
-          "optional": true
-        }
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@rollup/plugin-typescript": {
-      "version": "12.1.2",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-12.1.2.tgz",
-      "integrity": "sha512-cdtSp154H5sv637uMr1a8OTWB0L1SWDSm1rDGiyfcGcvQ6cuTs4MDk2BVEBGysUWago4OJN4EQZqOTl/QY3Jgg==",
+    "node_modules/@babel/plugin-syntax-import-attributes": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz",
+      "integrity": "sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@rollup/pluginutils": "^5.1.0",
-        "resolve": "^1.22.1"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "rollup": "^2.14.0||^3.0.0||^4.0.0",
-        "tslib": "*",
-        "typescript": ">=3.7.0"
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
-      "peerDependenciesMeta": {
-        "rollup": {
-          "optional": true
-        },
-        "tslib": {
-          "optional": true
-        }
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@rollup/pluginutils": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.4.tgz",
-      "integrity": "sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==",
+    "node_modules/@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/estree": "^1.0.0",
-        "estree-walker": "^2.0.2",
-        "picomatch": "^4.0.2"
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-jsx": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz",
+      "integrity": "sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
-      },
-      "peerDependenciesMeta": {
-        "rollup": {
-          "optional": true
-        }
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.44.0.tgz",
-      "integrity": "sha512-xEiEE5oDW6tK4jXCAyliuntGR+amEMO7HLtdSshVuhFnKTYoeYMyXQK7pLouAJJj5KHdwdn87bfHAR2nSdNAUA==",
-      "cpu": [
-        "arm"
-      ],
+    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ]
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
     },
-    "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.44.0.tgz",
-      "integrity": "sha512-uNSk/TgvMbskcHxXYHzqwiyBlJ/lGcv8DaUfcnNwict8ba9GTTNxfn3/FAoFZYgkaXXAdrAA+SLyKplyi349Jw==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ]
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
     },
-    "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.44.0.tgz",
-      "integrity": "sha512-VGF3wy0Eq1gcEIkSCr8Ke03CWT+Pm2yveKLaDvq51pPpZza3JX/ClxXOCmTYYq3us5MvEuNRTaeyFThCKRQhOA==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
     },
-    "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.44.0.tgz",
-      "integrity": "sha512-fBkyrDhwquRvrTxSGH/qqt3/T0w5Rg0L7ZIDypvBPc1/gzjJle6acCpZ36blwuwcKD/u6oCE/sRWlUAcxLWQbQ==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
     },
-    "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.44.0.tgz",
-      "integrity": "sha512-u5AZzdQJYJXByB8giQ+r4VyfZP+walV+xHWdaFx/1VxsOn6eWJhK2Vl2eElvDJFKQBo/hcYIBg/jaKS8ZmKeNQ==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
     },
-    "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.44.0.tgz",
-      "integrity": "sha512-qC0kS48c/s3EtdArkimctY7h3nHicQeEUdjJzYVJYR3ct3kWSafmn6jkNCA8InbUdge6PVx6keqjk5lVGJf99g==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
     },
-    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.44.0.tgz",
-      "integrity": "sha512-x+e/Z9H0RAWckn4V2OZZl6EmV0L2diuX3QB0uM1r6BvhUIv6xBPL5mrAX2E3e8N8rEHVPwFfz/ETUbV4oW9+lQ==",
-      "cpu": [
-        "arm"
-      ],
+    "node_modules/@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
     },
-    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.44.0.tgz",
-      "integrity": "sha512-1exwiBFf4PU/8HvI8s80icyCcnAIB86MCBdst51fwFmH5dyeoWVPVgmQPcKrMtBQ0W5pAs7jBCWuRXgEpRzSCg==",
-      "cpu": [
-        "arm"
-      ],
+    "node_modules/@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
     },
-    "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.44.0.tgz",
-      "integrity": "sha512-ZTR2mxBHb4tK4wGf9b8SYg0Y6KQPjGpR4UWwTFdnmjB4qRtoATZ5dWn3KsDwGa5Z2ZBOE7K52L36J9LueKBdOQ==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@babel/plugin-syntax-typescript": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.27.1.tgz",
+      "integrity": "sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
     },
-    "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.44.0.tgz",
-      "integrity": "sha512-GFWfAhVhWGd4r6UxmnKRTBwP1qmModHtd5gkraeW2G490BpFOZkFtem8yuX2NyafIP/mGpRJgTJ2PwohQkUY/Q==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@babel/template": {
+      "version": "7.27.2",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
+      "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "dependencies": {
+        "@babel/code-frame": "^7.27.1",
+        "@babel/parser": "^7.27.2",
+        "@babel/types": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
     },
-    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.44.0.tgz",
-      "integrity": "sha512-xw+FTGcov/ejdusVOqKgMGW3c4+AgqrfvzWEVXcNP6zq2ue+lsYUgJ+5Rtn/OTJf7e2CbgTFvzLW2j0YAtj0Gg==",
-      "cpu": [
-        "loong64"
-      ],
+    "node_modules/@babel/traverse": {
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.5.tgz",
+      "integrity": "sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "dependencies": {
+        "@babel/code-frame": "^7.27.1",
+        "@babel/generator": "^7.28.5",
+        "@babel/helper-globals": "^7.28.0",
+        "@babel/parser": "^7.28.5",
+        "@babel/template": "^7.27.2",
+        "@babel/types": "^7.28.5",
+        "debug": "^4.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
     },
-    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.44.0.tgz",
-      "integrity": "sha512-bKGibTr9IdF0zr21kMvkZT4K6NV+jjRnBoVMt2uNMG0BYWm3qOVmYnXKzx7UhwrviKnmK46IKMByMgvpdQlyJQ==",
-      "cpu": [
-        "ppc64"
-      ],
+    "node_modules/@babel/types": {
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz",
+      "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.28.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
     },
-    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.44.0.tgz",
-      "integrity": "sha512-vV3cL48U5kDaKZtXrti12YRa7TyxgKAIDoYdqSIOMOFBXqFj2XbChHAtXquEn2+n78ciFgr4KIqEbydEGPxXgA==",
-      "cpu": [
-        "riscv64"
-      ],
+    "node_modules/@bcoe/v8-coverage": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
       "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "license": "MIT"
     },
-    "node_modules/@rollup/rollup-linux-riscv64-musl": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.44.0.tgz",
-      "integrity": "sha512-TDKO8KlHJuvTEdfw5YYFBjhFts2TR0VpZsnLLSYmB7AaohJhM8ctDSdDnUGq77hUh4m/djRafw+9zQpkOanE2Q==",
-      "cpu": [
-        "riscv64"
-      ],
+    "node_modules/@codemirror/state": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.0.tgz",
+      "integrity": "sha512-MwBHVK60IiIHDcoMet78lxt6iw5gJOGSbNbOIVBHWVXIH4/Nq1+GQgLLGgI1KlnN86WDXsPudVaqYHKBIx7Eyw==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "peer": true,
+      "dependencies": {
+        "@marijn/find-cluster-break": "^1.0.0"
+      }
     },
-    "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.44.0.tgz",
-      "integrity": "sha512-8541GEyktXaw4lvnGp9m84KENcxInhAt6vPWJ9RodsB/iGjHoMB2Pp5MVBCiKIRxrxzJhGCxmNzdu+oDQ7kwRA==",
-      "cpu": [
-        "s390x"
-      ],
+    "node_modules/@codemirror/view": {
+      "version": "6.38.6",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.38.6.tgz",
+      "integrity": "sha512-qiS0z1bKs5WOvHIAC0Cybmv4AJSkAXgX5aD6Mqd2epSLlVJsQl8NG23jCVouIgkh4All/mrbdsf2UOLFnJw0tw==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "peer": true,
+      "dependencies": {
+        "@codemirror/state": "^6.5.0",
+        "crelt": "^1.0.6",
+        "style-mod": "^4.1.0",
+        "w3c-keyname": "^2.2.4"
+      }
     },
-    "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.44.0.tgz",
-      "integrity": "sha512-iUVJc3c0o8l9Sa/qlDL2Z9UP92UZZW1+EmQ4xfjTc1akr0iUFZNfxrXJ/R1T90h/ILm9iXEY6+iPrmYB3pXKjw==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
       "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "license": "ISC",
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.44.0.tgz",
-      "integrity": "sha512-PQUobbhLTQT5yz/SPg116VJBgz+XOtXt8D1ck+sfJJhuEsMj2jSej5yTdp8CvWBSceu+WW+ibVL6dm0ptG5fcA==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.44.0.tgz",
-      "integrity": "sha512-M0CpcHf8TWn+4oTxJfh7LQuTuaYeXGbk0eageVjQCKzYLsajWS/lFC94qlRqOlyC2KvRT90ZrfXULYmukeIy7w==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@jest/console": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
+      "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
     },
-    "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.44.0.tgz",
-      "integrity": "sha512-3XJ0NQtMAXTWFW8FqZKcw3gOQwBtVWP/u8TpHP3CRPXD7Pd6s8lLdH3sHWh8vqKCyyiI8xW5ltJScQmBU9j7WA==",
-      "cpu": [
-        "ia32"
-      ],
+    "node_modules/@jest/core": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
+      "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
+      "dependencies": {
+        "@jest/console": "^29.7.0",
+        "@jest/reporters": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "jest-changed-files": "^29.7.0",
+        "jest-config": "^29.7.0",
+        "jest-haste-map": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-resolve-dependencies": "^29.7.0",
+        "jest-runner": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "jest-watcher": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^29.7.0",
+        "slash": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
     },
-    "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.44.0.tgz",
-      "integrity": "sha512-Q2Mgwt+D8hd5FIPUuPDsvPR7Bguza6yTkJxspDGkZj7tBRn2y4KSWYuIXpftFSjBra76TbKerCV7rgFPQrn+wQ==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@jest/environment": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
+      "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
+      "dependencies": {
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-mock": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
     },
-    "node_modules/@types/codemirror": {
-      "version": "5.60.8",
-      "resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-5.60.8.tgz",
-      "integrity": "sha512-VjFgDF/eB+Aklcy15TtOTLQeMjTo07k7KAjql8OK5Dirr7a6sJY4T1uVBDuTVG9VEmn1uUsohOpYnVfgC6/jyw==",
+    "node_modules/@jest/expect": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
+      "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/tern": "*"
+        "expect": "^29.7.0",
+        "jest-snapshot": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@types/d3": {
-      "version": "7.4.3",
-      "resolved": "https://registry.npmjs.org/@types/d3/-/d3-7.4.3.tgz",
-      "integrity": "sha512-lZXZ9ckh5R8uiFVt8ogUNf+pIrK4EsWrx2Np75WvF/eTpJ0FMHNhjXk8CKEx/+gpHbNQyJWehbFaTvqmHWB3ww==",
+    "node_modules/@jest/expect-utils": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
+      "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/d3-array": "*",
-        "@types/d3-axis": "*",
-        "@types/d3-brush": "*",
-        "@types/d3-chord": "*",
-        "@types/d3-color": "*",
-        "@types/d3-contour": "*",
-        "@types/d3-delaunay": "*",
-        "@types/d3-dispatch": "*",
-        "@types/d3-drag": "*",
-        "@types/d3-dsv": "*",
-        "@types/d3-ease": "*",
-        "@types/d3-fetch": "*",
-        "@types/d3-force": "*",
-        "@types/d3-format": "*",
-        "@types/d3-geo": "*",
-        "@types/d3-hierarchy": "*",
-        "@types/d3-interpolate": "*",
-        "@types/d3-path": "*",
-        "@types/d3-polygon": "*",
-        "@types/d3-quadtree": "*",
-        "@types/d3-random": "*",
-        "@types/d3-scale": "*",
-        "@types/d3-scale-chromatic": "*",
-        "@types/d3-selection": "*",
-        "@types/d3-shape": "*",
-        "@types/d3-time": "*",
-        "@types/d3-time-format": "*",
-        "@types/d3-timer": "*",
-        "@types/d3-transition": "*",
-        "@types/d3-zoom": "*"
+        "jest-get-type": "^29.6.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@types/d3-array": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.1.tgz",
-      "integrity": "sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg==",
-      "dev": true
-    },
-    "node_modules/@types/d3-axis": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@types/d3-axis/-/d3-axis-3.0.6.tgz",
-      "integrity": "sha512-pYeijfZuBd87T0hGn0FO1vQ/cgLk6E1ALJjfkC0oJ8cbwkZl3TpgS8bVBLZN+2jjGgg38epgxb2zmoGtSfvgMw==",
+    "node_modules/@jest/fake-timers": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
+      "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/d3-selection": "*"
+        "@jest/types": "^29.6.3",
+        "@sinonjs/fake-timers": "^10.0.2",
+        "@types/node": "*",
+        "jest-message-util": "^29.7.0",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@types/d3-brush": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@types/d3-brush/-/d3-brush-3.0.6.tgz",
-      "integrity": "sha512-nH60IZNNxEcrh6L1ZSMNA28rj27ut/2ZmI3r96Zd+1jrZD++zD3LsMIjWlvg4AYrHn/Pqz4CF3veCxGjtbqt7A==",
+    "node_modules/@jest/globals": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
+      "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/d3-selection": "*"
+        "@jest/environment": "^29.7.0",
+        "@jest/expect": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "jest-mock": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@types/d3-chord": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@types/d3-chord/-/d3-chord-3.0.6.tgz",
-      "integrity": "sha512-LFYWWd8nwfwEmTZG9PfQxd17HbNPksHBiJHaKuY1XeqscXacsS2tyoo6OdRsjf+NQYeB6XrNL3a25E3gH69lcg==",
-      "dev": true
-    },
-    "node_modules/@types/d3-color": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz",
-      "integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==",
-      "dev": true
-    },
-    "node_modules/@types/d3-contour": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@types/d3-contour/-/d3-contour-3.0.6.tgz",
-      "integrity": "sha512-BjzLgXGnCWjUSYGfH1cpdo41/hgdWETu4YxpezoztawmqsvCeep+8QGfiY6YbDvfgHz/DkjeIkkZVJavB4a3rg==",
+    "node_modules/@jest/reporters": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
+      "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/d3-array": "*",
-        "@types/geojson": "*"
+        "@bcoe/v8-coverage": "^0.2.3",
+        "@jest/console": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-instrument": "^6.0.0",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-reports": "^3.1.3",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "slash": "^3.0.0",
+        "string-length": "^4.0.1",
+        "strip-ansi": "^6.0.0",
+        "v8-to-istanbul": "^9.0.1"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@types/d3-delaunay": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/@types/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
-      "integrity": "sha512-ZMaSKu4THYCU6sV64Lhg6qjf1orxBthaC161plr5KuPHo3CNm8DTHiLw/5Eq2b6TsNP0W0iJrUOFscY6Q450Hw==",
-      "dev": true
-    },
-    "node_modules/@types/d3-dispatch": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@types/d3-dispatch/-/d3-dispatch-3.0.6.tgz",
-      "integrity": "sha512-4fvZhzMeeuBJYZXRXrRIQnvUYfyXwYmLsdiN7XXmVNQKKw1cM8a5WdID0g1hVFZDqT9ZqZEY5pD44p24VS7iZQ==",
-      "dev": true
-    },
-    "node_modules/@types/d3-drag": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@types/d3-drag/-/d3-drag-3.0.7.tgz",
-      "integrity": "sha512-HE3jVKlzU9AaMazNufooRJ5ZpWmLIoc90A37WU2JMmeq28w1FQqCZswHZ3xR+SuxYftzHq6WU6KJHvqxKzTxxQ==",
+    "node_modules/@jest/schemas": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/d3-selection": "*"
+        "@sinclair/typebox": "^0.27.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@types/d3-dsv": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@types/d3-dsv/-/d3-dsv-3.0.7.tgz",
-      "integrity": "sha512-n6QBF9/+XASqcKK6waudgL0pf/S5XHPPI8APyMLLUHd8NqouBGLsU8MgtO7NINGtPBtk9Kko/W4ea0oAspwh9g==",
-      "dev": true
-    },
-    "node_modules/@types/d3-ease": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.2.tgz",
-      "integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==",
-      "dev": true
-    },
-    "node_modules/@types/d3-fetch": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@types/d3-fetch/-/d3-fetch-3.0.7.tgz",
-      "integrity": "sha512-fTAfNmxSb9SOWNB9IoG5c8Hg6R+AzUHDRlsXsDZsNp6sxAEOP0tkP3gKkNSO/qmHPoBFTxNrjDprVHDQDvo5aA==",
+    "node_modules/@jest/source-map": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
+      "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/d3-dsv": "*"
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.2.9"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@types/d3-force": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/@types/d3-force/-/d3-force-3.0.10.tgz",
-      "integrity": "sha512-ZYeSaCF3p73RdOKcjj+swRlZfnYpK1EbaDiYICEEp5Q6sUiqFaFQ9qgoshp5CzIyyb/yD09kD9o2zEltCexlgw==",
-      "dev": true
-    },
-    "node_modules/@types/d3-format": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/d3-format/-/d3-format-3.0.4.tgz",
-      "integrity": "sha512-fALi2aI6shfg7vM5KiR1wNJnZ7r6UuggVqtDA+xiEdPZQwy/trcQaHnwShLuLdta2rTymCNpxYTiMZX/e09F4g==",
-      "dev": true
-    },
-    "node_modules/@types/d3-geo": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-3.1.0.tgz",
-      "integrity": "sha512-856sckF0oP/diXtS4jNsiQw/UuK5fQG8l/a9VVLeSouf1/PPbBE1i1W852zVwKwYCBkFJJB7nCFTbk6UMEXBOQ==",
+    "node_modules/@jest/test-result": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
+      "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/geojson": "*"
+        "@jest/console": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@types/d3-hierarchy": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/@types/d3-hierarchy/-/d3-hierarchy-3.1.7.tgz",
-      "integrity": "sha512-tJFtNoYBtRtkNysX1Xq4sxtjK8YgoWUNpIiUee0/jHGRwqvzYxkq0hGVbbOGSz+JgFxxRu4K8nb3YpG3CMARtg==",
-      "dev": true
-    },
-    "node_modules/@types/d3-interpolate": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz",
-      "integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==",
+    "node_modules/@jest/test-sequencer": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
+      "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/d3-color": "*"
+        "@jest/test-result": "^29.7.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@types/d3-path": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.1.tgz",
-      "integrity": "sha512-VMZBYyQvbGmWyWVea0EHs/BwLgxc+MKi1zLDCONksozI4YJMcTt8ZEuIR4Sb1MMTE8MMW49v0IwI5+b7RmfWlg==",
-      "dev": true
-    },
-    "node_modules/@types/d3-polygon": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@types/d3-polygon/-/d3-polygon-3.0.2.tgz",
-      "integrity": "sha512-ZuWOtMaHCkN9xoeEMr1ubW2nGWsp4nIql+OPQRstu4ypeZ+zk3YKqQT0CXVe/PYqrKpZAi+J9mTs05TKwjXSRA==",
-      "dev": true
-    },
-    "node_modules/@types/d3-quadtree": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@types/d3-quadtree/-/d3-quadtree-3.0.6.tgz",
-      "integrity": "sha512-oUzyO1/Zm6rsxKRHA1vH0NEDG58HrT5icx/azi9MF1TWdtttWl0UIUsjEQBBh+SIkrpd21ZjEv7ptxWys1ncsg==",
-      "dev": true
-    },
-    "node_modules/@types/d3-random": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/d3-random/-/d3-random-3.0.3.tgz",
-      "integrity": "sha512-Imagg1vJ3y76Y2ea0871wpabqp613+8/r0mCLEBfdtqC7xMSfj9idOnmBYyMoULfHePJyxMAw3nWhJxzc+LFwQ==",
-      "dev": true
-    },
-    "node_modules/@types/d3-scale": {
-      "version": "4.0.9",
-      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.9.tgz",
-      "integrity": "sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw==",
+    "node_modules/@jest/transform": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
+      "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/d3-time": "*"
+        "@babel/core": "^7.11.6",
+        "@jest/types": "^29.6.3",
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "babel-plugin-istanbul": "^6.1.1",
+        "chalk": "^4.0.0",
+        "convert-source-map": "^2.0.0",
+        "fast-json-stable-stringify": "^2.1.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "pirates": "^4.0.4",
+        "slash": "^3.0.0",
+        "write-file-atomic": "^4.0.2"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@types/d3-scale-chromatic": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
-      "integrity": "sha512-iWMJgwkK7yTRmWqRB5plb1kadXyQ5Sj8V/zYlFGMUBbIPKQScw+Dku9cAAMgJG+z5GYDoMjWGLVOvjghDEFnKQ==",
-      "dev": true
-    },
-    "node_modules/@types/d3-selection": {
-      "version": "3.0.11",
-      "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.11.tgz",
-      "integrity": "sha512-bhAXu23DJWsrI45xafYpkQ4NtcKMwWnAC/vKrd2l+nxMFuvOT3XMYTIj2opv8vq8AO5Yh7Qac/nSeP/3zjTK0w==",
-      "dev": true
-    },
-    "node_modules/@types/d3-shape": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.7.tgz",
-      "integrity": "sha512-VLvUQ33C+3J+8p+Daf+nYSOsjB4GXp19/S/aGo60m9h1v6XaxjiT82lKVWJCfzhtuZ3yD7i/TPeC/fuKLLOSmg==",
+    "node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/d3-path": "*"
+        "@jest/schemas": "^29.6.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@types/d3-time": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.4.tgz",
-      "integrity": "sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==",
-      "dev": true
-    },
-    "node_modules/@types/d3-time-format": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-4.0.3.tgz",
-      "integrity": "sha512-5xg9rC+wWL8kdDj153qZcsJ0FWiFt0J5RB6LYUNZjwSnesfblqrI/bJ1wBdJ8OQfncgbJG5+2F+qfqnqyzYxyg==",
-      "dev": true
-    },
-    "node_modules/@types/d3-timer": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.2.tgz",
-      "integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==",
-      "dev": true
-    },
-    "node_modules/@types/d3-transition": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-3.0.9.tgz",
-      "integrity": "sha512-uZS5shfxzO3rGlu0cC3bjmMFKsXv+SmZZcgp0KD22ts4uGXp5EVYGzu/0YdwZeKmddhcAccYtREJKkPfXkZuCg==",
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.13",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
+      "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/d3-selection": "*"
+        "@jridgewell/sourcemap-codec": "^1.5.0",
+        "@jridgewell/trace-mapping": "^0.3.24"
       }
     },
-    "node_modules/@types/d3-zoom": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-3.0.8.tgz",
-      "integrity": "sha512-iqMC4/YlFCSlO8+2Ii1GGGliCAY4XdeG748w5vQUbevlbDu0zSjH/+jojorQVBK/se0j6DUFNPBGSqD3YWYnDw==",
+    "node_modules/@jridgewell/remapping": {
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz",
+      "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/d3-interpolate": "*",
-        "@types/d3-selection": "*"
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
       }
     },
-    "node_modules/@types/estree": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
-      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/fs-extra": {
-      "version": "8.1.5",
-      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.1.5.tgz",
-      "integrity": "sha512-0dzKcwO+S8s2kuF5Z9oUWatQJj5Uq/iqphEtE3GQJVRRYm/tD1LglU2UnXi2A8jLq5umkGouOXOR9y0n613ZwQ==",
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
       "dev": true,
-      "dependencies": {
-        "@types/node": "*"
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@types/geojson": {
-      "version": "7946.0.16",
-      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz",
-      "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==",
-      "dev": true
-    },
-    "node_modules/@types/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
+    "node_modules/@jridgewell/source-map": {
+      "version": "0.3.11",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.11.tgz",
+      "integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/minimatch": "*",
-        "@types/node": "*"
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25"
       }
     },
-    "node_modules/@types/minimatch": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
-      "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
-      "dev": true
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/@types/node": {
-      "version": "24.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.0.3.tgz",
-      "integrity": "sha512-R4I/kzCYAdRLzfiCabn9hxWfbuHS573x+r0dJMkkzThEa7pbrcDWK+9zu3e7aBOouf+rQAciqPFMnxwr0aWgKg==",
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.31",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
+      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~7.8.0"
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
-    "node_modules/@types/resolve": {
-      "version": "1.20.2",
-      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz",
-      "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==",
-      "dev": true
-    },
-    "node_modules/@types/sprintf-js": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/@types/sprintf-js/-/sprintf-js-1.1.4.tgz",
-      "integrity": "sha512-aWK1reDYWxcjgcIIPmQi3u+OQDuYa9b+lr6eIsGWrekJ9vr1NSjr4Eab8oQ1iKuH1ltFHpXGyerAv1a3FMKxzQ==",
-      "dev": true
-    },
-    "node_modules/@types/tern": {
-      "version": "0.23.9",
-      "resolved": "https://registry.npmjs.org/@types/tern/-/tern-0.23.9.tgz",
-      "integrity": "sha512-ypzHFE/wBzh+BlH6rrBgS5I/Z7RD21pGhZ2rltb/+ZrVM1awdZwjx7hE5XfuYgHWk9uvV5HLZN3SloevCAp3Bw==",
+    "node_modules/@marijn/find-cluster-break": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz",
+      "integrity": "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==",
       "dev": true,
-      "dependencies": {
-        "@types/estree": "*"
-      }
+      "license": "MIT"
     },
-    "node_modules/acorn": {
-      "version": "8.14.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
-      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
+      "license": "MIT",
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
       },
       "engines": {
-        "node": ">=0.4.0"
+        "node": ">= 8"
       }
     },
-    "node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@rollup/plugin-commonjs": {
+      "version": "28.0.9",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-28.0.9.tgz",
+      "integrity": "sha512-PIR4/OHZ79romx0BVVll/PkwWpJ7e5lsqFa3gFfcrFPWwLXLV39JVUzQV9RKjWerE7B845Hqjj9VYlQeieZ2dA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@rollup/pluginutils": "^5.0.1",
+        "commondir": "^1.0.1",
+        "estree-walker": "^2.0.2",
+        "fdir": "^6.2.0",
+        "is-reference": "1.2.1",
+        "magic-string": "^0.30.3",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=16.0.0 || 14 >= 14.17"
+      },
+      "peerDependencies": {
+        "rollup": "^2.68.0||^3.0.0||^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/plugin-node-resolve": {
+      "version": "16.0.3",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-16.0.3.tgz",
+      "integrity": "sha512-lUYM3UBGuM93CnMPG1YocWu7X802BrNF3jW2zny5gQyLQgRFJhV1Sq0Zi74+dh/6NBx1DxFC4b4GXg9wUCG5Qg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@rollup/pluginutils": "^5.0.1",
+        "@types/resolve": "1.20.2",
+        "deepmerge": "^4.2.2",
+        "is-module": "^1.0.0",
+        "resolve": "^1.22.1"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^2.78.0||^3.0.0||^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/plugin-terser": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-terser/-/plugin-terser-0.4.4.tgz",
+      "integrity": "sha512-XHeJC5Bgvs8LfukDwWZp7yeqin6ns8RTl2B9avbejt6tZqsqvVoWI7ZTQrcNsfKEDWBTnTxM8nMDkO2IFFbd0A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "serialize-javascript": "^6.0.1",
+        "smob": "^1.0.0",
+        "terser": "^5.17.4"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^2.0.0||^3.0.0||^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/plugin-typescript": {
+      "version": "12.3.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-12.3.0.tgz",
+      "integrity": "sha512-7DP0/p7y3t67+NabT9f8oTBFE6gGkto4SA6Np2oudYmZE/m1dt8RB0SjL1msMxFpLo631qjRCcBlAbq1ml/Big==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@rollup/pluginutils": "^5.1.0",
+        "resolve": "^1.22.1"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^2.14.0||^3.0.0||^4.0.0",
+        "tslib": "*",
+        "typescript": ">=3.7.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        },
+        "tslib": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/pluginutils": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.3.0.tgz",
+      "integrity": "sha512-5EdhGZtnu3V88ces7s53hhfK5KSASnJZv8Lulpc04cWO3REESroJXg73DFsOmgbU2BhwV0E20bu2IDZb3VKW4Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.0",
+        "estree-walker": "^2.0.2",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.54.0.tgz",
+      "integrity": "sha512-OywsdRHrFvCdvsewAInDKCNyR3laPA2mc9bRYJ6LBp5IyvF3fvXbbNR0bSzHlZVFtn6E0xw2oZlyjg4rKCVcng==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.54.0.tgz",
+      "integrity": "sha512-Skx39Uv+u7H224Af+bDgNinitlmHyQX1K/atIA32JP3JQw6hVODX5tkbi2zof/E69M1qH2UoN3Xdxgs90mmNYw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.54.0.tgz",
+      "integrity": "sha512-k43D4qta/+6Fq+nCDhhv9yP2HdeKeP56QrUUTW7E6PhZP1US6NDqpJj4MY0jBHlJivVJD5P8NxrjuobZBJTCRw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.54.0.tgz",
+      "integrity": "sha512-cOo7biqwkpawslEfox5Vs8/qj83M/aZCSSNIWpVzfU2CYHa2G3P1UN5WF01RdTHSgCkri7XOlTdtk17BezlV3A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.54.0.tgz",
+      "integrity": "sha512-miSvuFkmvFbgJ1BevMa4CPCFt5MPGw094knM64W9I0giUIMMmRYcGW/JWZDriaw/k1kOBtsWh1z6nIFV1vPNtA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.54.0.tgz",
+      "integrity": "sha512-KGXIs55+b/ZfZsq9aR026tmr/+7tq6VG6MsnrvF4H8VhwflTIuYh+LFUlIsRdQSgrgmtM3fVATzEAj4hBQlaqQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.54.0.tgz",
+      "integrity": "sha512-EHMUcDwhtdRGlXZsGSIuXSYwD5kOT9NVnx9sqzYiwAc91wfYOE1g1djOEDseZJKKqtHAHGwnGPQu3kytmfaXLQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.54.0.tgz",
+      "integrity": "sha512-+pBrqEjaakN2ySv5RVrj/qLytYhPKEUwk+e3SFU5jTLHIcAtqh2rLrd/OkbNuHJpsBgxsD8ccJt5ga/SeG0JmA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.54.0.tgz",
+      "integrity": "sha512-NSqc7rE9wuUaRBsBp5ckQ5CVz5aIRKCwsoa6WMF7G01sX3/qHUw/z4pv+D+ahL1EIKy6Enpcnz1RY8pf7bjwng==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.54.0.tgz",
+      "integrity": "sha512-gr5vDbg3Bakga5kbdpqx81m2n9IX8M6gIMlQQIXiLTNeQW6CucvuInJ91EuCJ/JYvc+rcLLsDFcfAD1K7fMofg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loong64-gnu": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.54.0.tgz",
+      "integrity": "sha512-gsrtB1NA3ZYj2vq0Rzkylo9ylCtW/PhpLEivlgWe0bpgtX5+9j9EZa0wtZiCjgu6zmSeZWyI/e2YRX1URozpIw==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.54.0.tgz",
+      "integrity": "sha512-y3qNOfTBStmFNq+t4s7Tmc9hW2ENtPg8FeUD/VShI7rKxNW7O4fFeaYbMsd3tpFlIg1Q8IapFgy7Q9i2BqeBvA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.54.0.tgz",
+      "integrity": "sha512-89sepv7h2lIVPsFma8iwmccN7Yjjtgz0Rj/Ou6fEqg3HDhpCa+Et+YSufy27i6b0Wav69Qv4WBNl3Rs6pwhebQ==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-musl": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.54.0.tgz",
+      "integrity": "sha512-ZcU77ieh0M2Q8Ur7D5X7KvK+UxbXeDHwiOt/CPSBTI1fBmeDMivW0dPkdqkT4rOgDjrDDBUed9x4EgraIKoR2A==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.54.0.tgz",
+      "integrity": "sha512-2AdWy5RdDF5+4YfG/YesGDDtbyJlC9LHmL6rZw6FurBJ5n4vFGupsOBGfwMRjBYH7qRQowT8D/U4LoSvVwOhSQ==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.54.0.tgz",
+      "integrity": "sha512-WGt5J8Ij/rvyqpFexxk3ffKqqbLf9AqrTBbWDk7ApGUzaIs6V+s2s84kAxklFwmMF/vBNGrVdYgbblCOFFezMQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.54.0.tgz",
+      "integrity": "sha512-JzQmb38ATzHjxlPHuTH6tE7ojnMKM2kYNzt44LO/jJi8BpceEC8QuXYA908n8r3CNuG/B3BV8VR3Hi1rYtmPiw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-openharmony-arm64": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.54.0.tgz",
+      "integrity": "sha512-huT3fd0iC7jigGh7n3q/+lfPcXxBi+om/Rs3yiFxjvSxbSB6aohDFXbWvlspaqjeOh+hx7DDHS+5Es5qRkWkZg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.54.0.tgz",
+      "integrity": "sha512-c2V0W1bsKIKfbLMBu/WGBz6Yci8nJ/ZJdheE0EwB73N3MvHYKiKGs3mVilX4Gs70eGeDaMqEob25Tw2Gb9Nqyw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.54.0.tgz",
+      "integrity": "sha512-woEHgqQqDCkAzrDhvDipnSirm5vxUXtSKDYTVpZG3nUdW/VVB5VdCYA2iReSj/u3yCZzXID4kuKG7OynPnB3WQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-gnu": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.54.0.tgz",
+      "integrity": "sha512-dzAc53LOuFvHwbCEOS0rPbXp6SIhAf2txMP5p6mGyOXXw5mWY8NGGbPMPrs4P1WItkfApDathBj/NzMLUZ9rtQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.54.0.tgz",
+      "integrity": "sha512-hYT5d3YNdSh3mbCU1gwQyPgQd3T2ne0A3KG8KSBdav5TiBg6eInVmV+TeR5uHufiIgSFg0XsOWGW5/RhNcSvPg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@sinclair/typebox": {
+      "version": "0.27.8",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@sinonjs/commons": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
+      "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "type-detect": "4.0.8"
+      }
+    },
+    "node_modules/@sinonjs/fake-timers": {
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
+      "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@sinonjs/commons": "^3.0.0"
+      }
+    },
+    "node_modules/@types/babel__core": {
+      "version": "7.20.5",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
+      "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
+      }
+    },
+    "node_modules/@types/babel__generator": {
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.27.0.tgz",
+      "integrity": "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__template": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
+      "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__traverse": {
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.28.0.tgz",
+      "integrity": "sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.28.2"
+      }
+    },
+    "node_modules/@types/codemirror": {
+      "version": "5.60.8",
+      "resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-5.60.8.tgz",
+      "integrity": "sha512-VjFgDF/eB+Aklcy15TtOTLQeMjTo07k7KAjql8OK5Dirr7a6sJY4T1uVBDuTVG9VEmn1uUsohOpYnVfgC6/jyw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/tern": "*"
+      }
+    },
+    "node_modules/@types/d3": {
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/@types/d3/-/d3-7.4.3.tgz",
+      "integrity": "sha512-lZXZ9ckh5R8uiFVt8ogUNf+pIrK4EsWrx2Np75WvF/eTpJ0FMHNhjXk8CKEx/+gpHbNQyJWehbFaTvqmHWB3ww==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/d3-array": "*",
+        "@types/d3-axis": "*",
+        "@types/d3-brush": "*",
+        "@types/d3-chord": "*",
+        "@types/d3-color": "*",
+        "@types/d3-contour": "*",
+        "@types/d3-delaunay": "*",
+        "@types/d3-dispatch": "*",
+        "@types/d3-drag": "*",
+        "@types/d3-dsv": "*",
+        "@types/d3-ease": "*",
+        "@types/d3-fetch": "*",
+        "@types/d3-force": "*",
+        "@types/d3-format": "*",
+        "@types/d3-geo": "*",
+        "@types/d3-hierarchy": "*",
+        "@types/d3-interpolate": "*",
+        "@types/d3-path": "*",
+        "@types/d3-polygon": "*",
+        "@types/d3-quadtree": "*",
+        "@types/d3-random": "*",
+        "@types/d3-scale": "*",
+        "@types/d3-scale-chromatic": "*",
+        "@types/d3-selection": "*",
+        "@types/d3-shape": "*",
+        "@types/d3-time": "*",
+        "@types/d3-time-format": "*",
+        "@types/d3-timer": "*",
+        "@types/d3-transition": "*",
+        "@types/d3-zoom": "*"
+      }
+    },
+    "node_modules/@types/d3-array": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.2.tgz",
+      "integrity": "sha512-hOLWVbm7uRza0BYXpIIW5pxfrKe0W+D5lrFiAEYR+pb6w3N2SwSMaJbXdUfSEv+dT4MfHBLtn5js0LAWaO6otw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-axis": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-axis/-/d3-axis-3.0.6.tgz",
+      "integrity": "sha512-pYeijfZuBd87T0hGn0FO1vQ/cgLk6E1ALJjfkC0oJ8cbwkZl3TpgS8bVBLZN+2jjGgg38epgxb2zmoGtSfvgMw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/d3-selection": "*"
+      }
+    },
+    "node_modules/@types/d3-brush": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-brush/-/d3-brush-3.0.6.tgz",
+      "integrity": "sha512-nH60IZNNxEcrh6L1ZSMNA28rj27ut/2ZmI3r96Zd+1jrZD++zD3LsMIjWlvg4AYrHn/Pqz4CF3veCxGjtbqt7A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/d3-selection": "*"
+      }
+    },
+    "node_modules/@types/d3-chord": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-chord/-/d3-chord-3.0.6.tgz",
+      "integrity": "sha512-LFYWWd8nwfwEmTZG9PfQxd17HbNPksHBiJHaKuY1XeqscXacsS2tyoo6OdRsjf+NQYeB6XrNL3a25E3gH69lcg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-color": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz",
+      "integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-contour": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-contour/-/d3-contour-3.0.6.tgz",
+      "integrity": "sha512-BjzLgXGnCWjUSYGfH1cpdo41/hgdWETu4YxpezoztawmqsvCeep+8QGfiY6YbDvfgHz/DkjeIkkZVJavB4a3rg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/d3-array": "*",
+        "@types/geojson": "*"
+      }
+    },
+    "node_modules/@types/d3-delaunay": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
+      "integrity": "sha512-ZMaSKu4THYCU6sV64Lhg6qjf1orxBthaC161plr5KuPHo3CNm8DTHiLw/5Eq2b6TsNP0W0iJrUOFscY6Q450Hw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-dispatch": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-dispatch/-/d3-dispatch-3.0.7.tgz",
+      "integrity": "sha512-5o9OIAdKkhN1QItV2oqaE5KMIiXAvDWBDPrD85e58Qlz1c1kI/J0NcqbEG88CoTwJrYe7ntUCVfeUl2UJKbWgA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-drag": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-drag/-/d3-drag-3.0.7.tgz",
+      "integrity": "sha512-HE3jVKlzU9AaMazNufooRJ5ZpWmLIoc90A37WU2JMmeq28w1FQqCZswHZ3xR+SuxYftzHq6WU6KJHvqxKzTxxQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/d3-selection": "*"
+      }
+    },
+    "node_modules/@types/d3-dsv": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-dsv/-/d3-dsv-3.0.7.tgz",
+      "integrity": "sha512-n6QBF9/+XASqcKK6waudgL0pf/S5XHPPI8APyMLLUHd8NqouBGLsU8MgtO7NINGtPBtk9Kko/W4ea0oAspwh9g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-ease": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.2.tgz",
+      "integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-fetch": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-fetch/-/d3-fetch-3.0.7.tgz",
+      "integrity": "sha512-fTAfNmxSb9SOWNB9IoG5c8Hg6R+AzUHDRlsXsDZsNp6sxAEOP0tkP3gKkNSO/qmHPoBFTxNrjDprVHDQDvo5aA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/d3-dsv": "*"
+      }
+    },
+    "node_modules/@types/d3-force": {
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@types/d3-force/-/d3-force-3.0.10.tgz",
+      "integrity": "sha512-ZYeSaCF3p73RdOKcjj+swRlZfnYpK1EbaDiYICEEp5Q6sUiqFaFQ9qgoshp5CzIyyb/yD09kD9o2zEltCexlgw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-format": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-format/-/d3-format-3.0.4.tgz",
+      "integrity": "sha512-fALi2aI6shfg7vM5KiR1wNJnZ7r6UuggVqtDA+xiEdPZQwy/trcQaHnwShLuLdta2rTymCNpxYTiMZX/e09F4g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-geo": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-3.1.0.tgz",
+      "integrity": "sha512-856sckF0oP/diXtS4jNsiQw/UuK5fQG8l/a9VVLeSouf1/PPbBE1i1W852zVwKwYCBkFJJB7nCFTbk6UMEXBOQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/geojson": "*"
+      }
+    },
+    "node_modules/@types/d3-hierarchy": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-hierarchy/-/d3-hierarchy-3.1.7.tgz",
+      "integrity": "sha512-tJFtNoYBtRtkNysX1Xq4sxtjK8YgoWUNpIiUee0/jHGRwqvzYxkq0hGVbbOGSz+JgFxxRu4K8nb3YpG3CMARtg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-interpolate": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz",
+      "integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/d3-color": "*"
+      }
+    },
+    "node_modules/@types/d3-path": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.1.tgz",
+      "integrity": "sha512-VMZBYyQvbGmWyWVea0EHs/BwLgxc+MKi1zLDCONksozI4YJMcTt8ZEuIR4Sb1MMTE8MMW49v0IwI5+b7RmfWlg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-polygon": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-polygon/-/d3-polygon-3.0.2.tgz",
+      "integrity": "sha512-ZuWOtMaHCkN9xoeEMr1ubW2nGWsp4nIql+OPQRstu4ypeZ+zk3YKqQT0CXVe/PYqrKpZAi+J9mTs05TKwjXSRA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-quadtree": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-quadtree/-/d3-quadtree-3.0.6.tgz",
+      "integrity": "sha512-oUzyO1/Zm6rsxKRHA1vH0NEDG58HrT5icx/azi9MF1TWdtttWl0UIUsjEQBBh+SIkrpd21ZjEv7ptxWys1ncsg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-random": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-random/-/d3-random-3.0.3.tgz",
+      "integrity": "sha512-Imagg1vJ3y76Y2ea0871wpabqp613+8/r0mCLEBfdtqC7xMSfj9idOnmBYyMoULfHePJyxMAw3nWhJxzc+LFwQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-scale": {
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.9.tgz",
+      "integrity": "sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/d3-time": "*"
+      }
+    },
+    "node_modules/@types/d3-scale-chromatic": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
+      "integrity": "sha512-iWMJgwkK7yTRmWqRB5plb1kadXyQ5Sj8V/zYlFGMUBbIPKQScw+Dku9cAAMgJG+z5GYDoMjWGLVOvjghDEFnKQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-selection": {
+      "version": "3.0.11",
+      "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.11.tgz",
+      "integrity": "sha512-bhAXu23DJWsrI45xafYpkQ4NtcKMwWnAC/vKrd2l+nxMFuvOT3XMYTIj2opv8vq8AO5Yh7Qac/nSeP/3zjTK0w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-shape": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.7.tgz",
+      "integrity": "sha512-VLvUQ33C+3J+8p+Daf+nYSOsjB4GXp19/S/aGo60m9h1v6XaxjiT82lKVWJCfzhtuZ3yD7i/TPeC/fuKLLOSmg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/d3-path": "*"
+      }
+    },
+    "node_modules/@types/d3-time": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.4.tgz",
+      "integrity": "sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-time-format": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-4.0.3.tgz",
+      "integrity": "sha512-5xg9rC+wWL8kdDj153qZcsJ0FWiFt0J5RB6LYUNZjwSnesfblqrI/bJ1wBdJ8OQfncgbJG5+2F+qfqnqyzYxyg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-timer": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.2.tgz",
+      "integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-transition": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-3.0.9.tgz",
+      "integrity": "sha512-uZS5shfxzO3rGlu0cC3bjmMFKsXv+SmZZcgp0KD22ts4uGXp5EVYGzu/0YdwZeKmddhcAccYtREJKkPfXkZuCg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/d3-selection": "*"
+      }
+    },
+    "node_modules/@types/d3-zoom": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-3.0.8.tgz",
+      "integrity": "sha512-iqMC4/YlFCSlO8+2Ii1GGGliCAY4XdeG748w5vQUbevlbDu0zSjH/+jojorQVBK/se0j6DUFNPBGSqD3YWYnDw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/d3-interpolate": "*",
+        "@types/d3-selection": "*"
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/fs-extra": {
+      "version": "8.1.5",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.1.5.tgz",
+      "integrity": "sha512-0dzKcwO+S8s2kuF5Z9oUWatQJj5Uq/iqphEtE3GQJVRRYm/tD1LglU2UnXi2A8jLq5umkGouOXOR9y0n613ZwQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/geojson": {
+      "version": "7946.0.16",
+      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz",
+      "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/minimatch": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/graceful-fs": {
+      "version": "4.1.9",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
+      "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/istanbul-lib-coverage": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
+      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/istanbul-lib-report": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
+      "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "*"
+      }
+    },
+    "node_modules/@types/istanbul-reports": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
+      "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/istanbul-lib-report": "*"
+      }
+    },
+    "node_modules/@types/jest": {
+      "version": "29.5.14",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.14.tgz",
+      "integrity": "sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "expect": "^29.0.0",
+        "pretty-format": "^29.0.0"
+      }
+    },
+    "node_modules/@types/minimatch": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
+      "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/node": {
+      "version": "24.10.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.4.tgz",
+      "integrity": "sha512-vnDVpYPMzs4wunl27jHrfmwojOGKya0xyM3sH+UE5iv5uPS6vX7UIoh6m+vQc5LGBq52HBKPIn/zcSZVzeDEZg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~7.16.0"
+      }
+    },
+    "node_modules/@types/resolve": {
+      "version": "1.20.2",
+      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz",
+      "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/sprintf-js": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@types/sprintf-js/-/sprintf-js-1.1.4.tgz",
+      "integrity": "sha512-aWK1reDYWxcjgcIIPmQi3u+OQDuYa9b+lr6eIsGWrekJ9vr1NSjr4Eab8oQ1iKuH1ltFHpXGyerAv1a3FMKxzQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/stack-utils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
+      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/tern": {
+      "version": "0.23.9",
+      "resolved": "https://registry.npmjs.org/@types/tern/-/tern-0.23.9.tgz",
+      "integrity": "sha512-ypzHFE/wBzh+BlH6rrBgS5I/Z7RD21pGhZ2rltb/+ZrVM1awdZwjx7hE5XfuYgHWk9uvV5HLZN3SloevCAp3Bw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "*"
+      }
+    },
+    "node_modules/@types/yargs": {
+      "version": "17.0.35",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.35.tgz",
+      "integrity": "sha512-qUHkeCyQFxMXg79wQfTtfndEC+N9ZZg76HJftDJp+qH2tV7Gj4OJi7l+PiWwJ+pWtW8GwSmqsDj/oymhrTWXjg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@types/yargs-parser": {
+      "version": "21.0.3",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
+      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/acorn": {
+      "version": "8.15.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "type-fest": "^0.21.3"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/anymatch/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/argparse/node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-jest": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
+      "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/transform": "^29.7.0",
+        "@types/babel__core": "^7.1.14",
+        "babel-plugin-istanbul": "^6.1.1",
+        "babel-preset-jest": "^29.6.3",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.8.0"
+      }
+    },
+    "node_modules/babel-plugin-istanbul": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^5.0.4",
+        "test-exclude": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-plugin-jest-hoist": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
+      "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/template": "^7.3.3",
+        "@babel/types": "^7.3.3",
+        "@types/babel__core": "^7.1.14",
+        "@types/babel__traverse": "^7.0.6"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/babel-preset-current-node-syntax": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.2.0.tgz",
+      "integrity": "sha512-E/VlAEzRrsLEb2+dv8yp3bo4scof3l9nR4lrld+Iy5NyVqgVYUJnDAmunkhPMisRI32Qc4iRiz425d8vM++2fg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-bigint": "^7.8.3",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
+        "@babel/plugin-syntax-import-attributes": "^7.24.7",
+        "@babel/plugin-syntax-import-meta": "^7.10.4",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0 || ^8.0.0-0"
+      }
+    },
+    "node_modules/babel-preset-jest": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
+      "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "babel-plugin-jest-hoist": "^29.6.3",
+        "babel-preset-current-node-syntax": "^1.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/baseline-browser-mapping": {
+      "version": "2.9.11",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.11.tgz",
+      "integrity": "sha512-Sg0xJUNDU1sJNGdfGWhVHX0kkZ+HWcvmVymJbj6NSgZZmW/8S9Y2HQ5euytnIgakgxN6papOAWiwDo1ctFDcoQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "baseline-browser-mapping": "dist/cli.js"
+      }
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/browserslist": {
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.1.tgz",
+      "integrity": "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "baseline-browser-mapping": "^2.9.0",
+        "caniuse-lite": "^1.0.30001759",
+        "electron-to-chromium": "^1.5.263",
+        "node-releases": "^2.0.27",
+        "update-browserslist-db": "^1.2.0"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
+    "node_modules/bs-logger": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
+      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-json-stable-stringify": "2.x"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/bser": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "node-int64": "^0.4.0"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001761",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001761.tgz",
+      "integrity": "sha512-JF9ptu1vP2coz98+5051jZ4PwQgd2ni8A+gYSN7EA7dPKIMf0pDlSUxhdmVOaV3/fYK5uWBkgSXJaRLr4+3A6g==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "CC-BY-4.0"
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/char-regex": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cjs-module-lexer": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz",
+      "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "iojs": ">= 1.0.0",
+        "node": ">= 0.12.0"
+      }
+    },
+    "node_modules/collect-v8-coverage": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.3.tgz",
+      "integrity": "sha512-1L5aqIkwPfiodaMgQunkF1zRhNqifHBmtbbbxcr6yVxxBnliw4TDOW6NxpO8DJLgJ16OT+Y4ztZqP6p/FtXnAw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/colorette": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz",
+      "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/create-jest": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
+      "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "jest-config": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "prompts": "^2.0.1"
+      },
+      "bin": {
+        "create-jest": "bin/create-jest.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/crelt": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
+      "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/d3": {
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/d3/-/d3-7.9.0.tgz",
+      "integrity": "sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-array": "3",
+        "d3-axis": "3",
+        "d3-brush": "3",
+        "d3-chord": "3",
+        "d3-color": "3",
+        "d3-contour": "4",
+        "d3-delaunay": "6",
+        "d3-dispatch": "3",
+        "d3-drag": "3",
+        "d3-dsv": "3",
+        "d3-ease": "3",
+        "d3-fetch": "3",
+        "d3-force": "3",
+        "d3-format": "3",
+        "d3-geo": "3",
+        "d3-hierarchy": "3",
+        "d3-interpolate": "3",
+        "d3-path": "3",
+        "d3-polygon": "3",
+        "d3-quadtree": "3",
+        "d3-random": "3",
+        "d3-scale": "4",
+        "d3-scale-chromatic": "3",
+        "d3-selection": "3",
+        "d3-shape": "3",
+        "d3-time": "3",
+        "d3-time-format": "4",
+        "d3-timer": "3",
+        "d3-transition": "3",
+        "d3-zoom": "3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-array": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
+      "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
+      "license": "ISC",
+      "dependencies": {
+        "internmap": "1 - 2"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-axis": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz",
+      "integrity": "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-brush": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz",
+      "integrity": "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-dispatch": "1 - 3",
+        "d3-drag": "2 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-selection": "3",
+        "d3-transition": "3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-chord": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz",
+      "integrity": "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-path": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-color": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
+      "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-contour": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-4.0.2.tgz",
+      "integrity": "sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-array": "^3.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-delaunay": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
+      "integrity": "sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==",
+      "license": "ISC",
+      "dependencies": {
+        "delaunator": "5"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-dispatch": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
+      "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-drag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz",
+      "integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-dispatch": "1 - 3",
+        "d3-selection": "3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-dsv": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz",
+      "integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==",
+      "license": "ISC",
+      "dependencies": {
+        "commander": "7",
+        "iconv-lite": "0.6",
+        "rw": "1"
+      },
+      "bin": {
+        "csv2json": "bin/dsv2json.js",
+        "csv2tsv": "bin/dsv2dsv.js",
+        "dsv2dsv": "bin/dsv2dsv.js",
+        "dsv2json": "bin/dsv2json.js",
+        "json2csv": "bin/json2dsv.js",
+        "json2dsv": "bin/json2dsv.js",
+        "json2tsv": "bin/json2dsv.js",
+        "tsv2csv": "bin/dsv2dsv.js",
+        "tsv2json": "bin/dsv2json.js"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-ease": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
+      "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-fetch": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz",
+      "integrity": "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-dsv": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-force": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz",
+      "integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-dispatch": "1 - 3",
+        "d3-quadtree": "1 - 3",
+        "d3-timer": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-format": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz",
+      "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-geo": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz",
+      "integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-array": "2.5.0 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-hierarchy": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz",
+      "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-interpolate": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
+      "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-color": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-path": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
+      "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-polygon": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz",
+      "integrity": "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-quadtree": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz",
+      "integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-random": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz",
+      "integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-scale": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
+      "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-array": "2.10.0 - 3",
+        "d3-format": "1 - 3",
+        "d3-interpolate": "1.2.0 - 3",
+        "d3-time": "2.1.1 - 3",
+        "d3-time-format": "2 - 4"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-scale-chromatic": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
+      "integrity": "sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-color": "1 - 3",
+        "d3-interpolate": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-selection": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz",
+      "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
+      "license": "ISC",
+      "peer": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-shape": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
+      "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-path": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-time": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
+      "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-array": "2 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-time-format": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
+      "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-time": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-timer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
+      "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-transition": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz",
+      "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-color": "1 - 3",
+        "d3-dispatch": "1 - 3",
+        "d3-ease": "1 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-timer": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "d3-selection": "2 - 3"
+      }
+    },
+    "node_modules/d3-zoom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz",
+      "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-dispatch": "1 - 3",
+        "d3-drag": "2 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-selection": "2 - 3",
+        "d3-transition": "2 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/dedent": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.7.1.tgz",
+      "integrity": "sha512-9JmrhGZpOlEgOLdQgSm0zxFaYoQon408V1v49aqTWuXENVlnCuY9JBZcXZiCsZQWDjTm5Qf/nIvAy77mXDAjEg==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "babel-plugin-macros": "^3.1.0"
+      },
+      "peerDependenciesMeta": {
+        "babel-plugin-macros": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/deepmerge": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/delaunator": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.1.tgz",
+      "integrity": "sha512-8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw==",
+      "license": "ISC",
+      "dependencies": {
+        "robust-predicates": "^3.0.2"
+      }
+    },
+    "node_modules/detect-newline": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/diff-sequences": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.5.267",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.267.tgz",
+      "integrity": "sha512-0Drusm6MVRXSOJpGbaSVgcQsuB4hEkMpHXaVstcPmhu5LIedxs1xNK/nIxmQIU/RPC0+1/o0AVZfBTkTNJOdUw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/emittery": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
+      "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.4.tgz",
+      "integrity": "sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/estree-walker": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/execa": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/expect": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
+      "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/expect-utils": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/fast-glob": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.8"
+      },
+      "engines": {
+        "node": ">=8.6.0"
       }
     },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+    "node_modules/fastq": {
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
+      "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "reusify": "^1.0.4"
       }
     },
-    "node_modules/braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+    "node_modules/fb-watchman": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
+      "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bser": "2.1.1"
+      }
+    },
+    "node_modules/fdir": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "picomatch": "^3 || ^4"
+      },
+      "peerDependenciesMeta": {
+        "picomatch": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fs-extra": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=6 <7 || >=8"
+      }
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/globby": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.1.tgz",
+      "integrity": "sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/glob": "^7.1.1",
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.0.3",
+        "glob": "^7.1.3",
+        "ignore": "^5.1.1",
+        "merge2": "^1.2.3",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/handlebars": {
+      "version": "4.7.8",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
+      "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "minimist": "^1.2.5",
+        "neo-async": "^2.6.2",
+        "source-map": "^0.6.1",
+        "wordwrap": "^1.0.0"
+      },
+      "bin": {
+        "handlebars": "bin/handlebars"
+      },
+      "engines": {
+        "node": ">=0.4.7"
+      },
+      "optionalDependencies": {
+        "uglify-js": "^3.1.4"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=10.17.0"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "license": "MIT",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ignore": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/import-local": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
+      "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "fill-range": "^7.1.1"
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
       },
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true
-    },
-    "node_modules/colorette": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz",
-      "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==",
-      "dev": true
-    },
-    "node_modules/commander": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">= 10"
+        "node": ">=0.8.19"
       }
     },
-    "node_modules/commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
-      "dev": true
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
     },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true,
+      "license": "ISC"
     },
-    "node_modules/d3": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/d3/-/d3-7.9.0.tgz",
-      "integrity": "sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA==",
-      "dependencies": {
-        "d3-array": "3",
-        "d3-axis": "3",
-        "d3-brush": "3",
-        "d3-chord": "3",
-        "d3-color": "3",
-        "d3-contour": "4",
-        "d3-delaunay": "6",
-        "d3-dispatch": "3",
-        "d3-drag": "3",
-        "d3-dsv": "3",
-        "d3-ease": "3",
-        "d3-fetch": "3",
-        "d3-force": "3",
-        "d3-format": "3",
-        "d3-geo": "3",
-        "d3-hierarchy": "3",
-        "d3-interpolate": "3",
-        "d3-path": "3",
-        "d3-polygon": "3",
-        "d3-quadtree": "3",
-        "d3-random": "3",
-        "d3-scale": "4",
-        "d3-scale-chromatic": "3",
-        "d3-selection": "3",
-        "d3-shape": "3",
-        "d3-time": "3",
-        "d3-time-format": "4",
-        "d3-timer": "3",
-        "d3-transition": "3",
-        "d3-zoom": "3"
-      },
+    "node_modules/internmap": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
+      "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
     },
-    "node_modules/d3-array": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
-      "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/is-core-module": {
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "internmap": "1 - 2"
+        "hasown": "^2.0.2"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/d3-axis": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz",
-      "integrity": "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==",
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/d3-brush": {
+    "node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz",
-      "integrity": "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==",
-      "dependencies": {
-        "d3-dispatch": "1 - 3",
-        "d3-drag": "2 - 3",
-        "d3-interpolate": "1 - 3",
-        "d3-selection": "3",
-        "d3-transition": "3"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/d3-chord": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz",
-      "integrity": "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==",
-      "dependencies": {
-        "d3-path": "1 - 3"
-      },
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": ">=8"
       }
     },
-    "node_modules/d3-color": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
-      "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
+    "node_modules/is-generator-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": ">=6"
       }
     },
-    "node_modules/d3-contour": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-4.0.2.tgz",
-      "integrity": "sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==",
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "d3-array": "^3.2.0"
+        "is-extglob": "^2.1.1"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/d3-delaunay": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
-      "integrity": "sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==",
-      "dependencies": {
-        "delaunator": "5"
-      },
+    "node_modules/is-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
+      "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": ">=0.12.0"
       }
     },
-    "node_modules/d3-dispatch": {
+    "node_modules/is-plain-object": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
-      "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.1.tgz",
+      "integrity": "sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/d3-drag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz",
-      "integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==",
+    "node_modules/is-reference": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
+      "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "d3-dispatch": "1 - 3",
-        "d3-selection": "3"
+        "@types/estree": "*"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
       },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
+      "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
-        "node": ">=12"
+        "node": ">=8"
       }
     },
-    "node_modules/d3-dsv": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz",
-      "integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==",
+    "node_modules/istanbul-lib-instrument": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
+      "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
+      "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "commander": "7",
-        "iconv-lite": "0.6",
-        "rw": "1"
-      },
-      "bin": {
-        "csv2json": "bin/dsv2json.js",
-        "csv2tsv": "bin/dsv2dsv.js",
-        "dsv2dsv": "bin/dsv2dsv.js",
-        "dsv2json": "bin/dsv2json.js",
-        "json2csv": "bin/json2dsv.js",
-        "json2dsv": "bin/json2dsv.js",
-        "json2tsv": "bin/json2dsv.js",
-        "tsv2csv": "bin/dsv2dsv.js",
-        "tsv2json": "bin/dsv2json.js"
+        "@babel/core": "^7.23.9",
+        "@babel/parser": "^7.23.9",
+        "@istanbuljs/schema": "^0.1.3",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^7.5.4"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=10"
       }
     },
-    "node_modules/d3-ease": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
-      "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==",
+    "node_modules/istanbul-lib-instrument/node_modules/semver": {
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=10"
       }
     },
-    "node_modules/d3-fetch": {
+    "node_modules/istanbul-lib-report": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz",
-      "integrity": "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+      "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "d3-dsv": "1 - 3"
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^4.0.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=10"
       }
     },
-    "node_modules/d3-force": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz",
-      "integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==",
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+      "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "d3-dispatch": "1 - 3",
-        "d3-quadtree": "1 - 3",
-        "d3-timer": "1 - 3"
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=10"
       }
     },
-    "node_modules/d3-format": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz",
-      "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==",
+    "node_modules/istanbul-reports": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.2.0.tgz",
+      "integrity": "sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=8"
       }
     },
-    "node_modules/d3-geo": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz",
-      "integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==",
+    "node_modules/jest": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
+      "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "d3-array": "2.5.0 - 3"
+        "@jest/core": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "import-local": "^3.0.2",
+        "jest-cli": "^29.7.0"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
       },
       "engines": {
-        "node": ">=12"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
       }
     },
-    "node_modules/d3-hierarchy": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz",
-      "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==",
+    "node_modules/jest-changed-files": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
+      "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "execa": "^5.0.0",
+        "jest-util": "^29.7.0",
+        "p-limit": "^3.1.0"
+      },
       "engines": {
-        "node": ">=12"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/d3-interpolate": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
-      "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
+    "node_modules/jest-circus": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
+      "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "d3-color": "1 - 3"
+        "@jest/environment": "^29.7.0",
+        "@jest/expect": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "dedent": "^1.0.0",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^29.7.0",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "p-limit": "^3.1.0",
+        "pretty-format": "^29.7.0",
+        "pure-rand": "^6.0.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
       },
       "engines": {
-        "node": ">=12"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/d3-path": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
-      "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==",
+    "node_modules/jest-cli": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
+      "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/core": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "create-jest": "^29.7.0",
+        "exit": "^0.1.2",
+        "import-local": "^3.0.2",
+        "jest-config": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "yargs": "^17.3.1"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
       "engines": {
-        "node": ">=12"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
       }
     },
-    "node_modules/d3-polygon": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz",
-      "integrity": "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==",
+    "node_modules/jest-config": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
+      "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.11.6",
+        "@jest/test-sequencer": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "babel-jest": "^29.7.0",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-circus": "^29.7.0",
+        "jest-environment-node": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-runner": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "parse-json": "^5.2.0",
+        "pretty-format": "^29.7.0",
+        "slash": "^3.0.0",
+        "strip-json-comments": "^3.1.1"
+      },
       "engines": {
-        "node": ">=12"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@types/node": "*",
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "ts-node": {
+          "optional": true
+        }
       }
     },
-    "node_modules/d3-quadtree": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz",
-      "integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==",
+    "node_modules/jest-diff": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
+      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "diff-sequences": "^29.6.3",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
+      },
       "engines": {
-        "node": ">=12"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/d3-random": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz",
-      "integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==",
+    "node_modules/jest-docblock": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
+      "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "detect-newline": "^3.0.0"
+      },
       "engines": {
-        "node": ">=12"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/d3-scale": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
-      "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
+    "node_modules/jest-each": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
+      "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "d3-array": "2.10.0 - 3",
-        "d3-format": "1 - 3",
-        "d3-interpolate": "1.2.0 - 3",
-        "d3-time": "2.1.1 - 3",
-        "d3-time-format": "2 - 4"
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "pretty-format": "^29.7.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/d3-scale-chromatic": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
-      "integrity": "sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==",
+    "node_modules/jest-environment-node": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
+      "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "d3-color": "1 - 3",
-        "d3-interpolate": "1 - 3"
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/d3-selection": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz",
-      "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
+    "node_modules/jest-get-type": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/d3-shape": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
-      "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
+    "node_modules/jest-haste-map": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
+      "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "d3-path": "^3.1.0"
+        "@jest/types": "^29.6.3",
+        "@types/graceful-fs": "^4.1.3",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "walker": "^1.0.8"
       },
       "engines": {
-        "node": ">=12"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "^2.3.2"
       }
     },
-    "node_modules/d3-time": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
-      "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
+    "node_modules/jest-leak-detector": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
+      "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "d3-array": "2 - 3"
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/d3-time-format": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
-      "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
+    "node_modules/jest-matcher-utils": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
+      "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "d3-time": "1 - 3"
+        "chalk": "^4.0.0",
+        "jest-diff": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
       },
       "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/d3-timer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
-      "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
-      "engines": {
-        "node": ">=12"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/d3-transition": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz",
-      "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==",
+    "node_modules/jest-message-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
+      "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "d3-color": "1 - 3",
-        "d3-dispatch": "1 - 3",
-        "d3-ease": "1 - 3",
-        "d3-interpolate": "1 - 3",
-        "d3-timer": "1 - 3"
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^29.6.3",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^29.7.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
       },
       "engines": {
-        "node": ">=12"
-      },
-      "peerDependencies": {
-        "d3-selection": "2 - 3"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/d3-zoom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz",
-      "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==",
+    "node_modules/jest-mock": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
+      "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "d3-dispatch": "1 - 3",
-        "d3-drag": "2 - 3",
-        "d3-interpolate": "1 - 3",
-        "d3-selection": "2 - 3",
-        "d3-transition": "2 - 3"
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-util": "^29.7.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/deepmerge": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
-      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+    "node_modules/jest-pnp-resolver": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
+      "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
+      },
+      "peerDependencies": {
+        "jest-resolve": "*"
+      },
+      "peerDependenciesMeta": {
+        "jest-resolve": {
+          "optional": true
+        }
       }
     },
-    "node_modules/delaunator": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.1.tgz",
-      "integrity": "sha512-8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw==",
-      "dependencies": {
-        "robust-predicates": "^3.0.2"
+    "node_modules/jest-regex-util": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
+      "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+    "node_modules/jest-resolve": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
+      "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "path-type": "^4.0.0"
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "resolve": "^1.20.0",
+        "resolve.exports": "^2.0.0",
+        "slash": "^3.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/estree-walker": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
-      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
-      "dev": true
-    },
-    "node_modules/fast-glob": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
-      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+    "node_modules/jest-resolve-dependencies": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
+      "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.8"
+        "jest-regex-util": "^29.6.3",
+        "jest-snapshot": "^29.7.0"
       },
       "engines": {
-        "node": ">=8.6.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/fastq": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
-      "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
+    "node_modules/jest-runner": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
+      "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "reusify": "^1.0.4"
+        "@jest/console": "^29.7.0",
+        "@jest/environment": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "emittery": "^0.13.1",
+        "graceful-fs": "^4.2.9",
+        "jest-docblock": "^29.7.0",
+        "jest-environment-node": "^29.7.0",
+        "jest-haste-map": "^29.7.0",
+        "jest-leak-detector": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-resolve": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-watcher": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "p-limit": "^3.1.0",
+        "source-map-support": "0.5.13"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/fdir": {
-      "version": "6.4.4",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz",
-      "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==",
+    "node_modules/jest-runtime": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
+      "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
       "dev": true,
-      "peerDependencies": {
-        "picomatch": "^3 || ^4"
+      "license": "MIT",
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/globals": "^29.7.0",
+        "@jest/source-map": "^29.6.3",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^1.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-mock": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0"
       },
-      "peerDependenciesMeta": {
-        "picomatch": {
-          "optional": true
-        }
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+    "node_modules/jest-snapshot": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
+      "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "to-regex-range": "^5.0.1"
+        "@babel/core": "^7.11.6",
+        "@babel/generator": "^7.7.2",
+        "@babel/plugin-syntax-jsx": "^7.7.2",
+        "@babel/plugin-syntax-typescript": "^7.7.2",
+        "@babel/types": "^7.3.3",
+        "@jest/expect-utils": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "babel-preset-current-node-syntax": "^1.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^29.7.0",
+        "graceful-fs": "^4.2.9",
+        "jest-diff": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^29.7.0",
+        "semver": "^7.5.3"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/fs-extra": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+    "node_modules/jest-snapshot/node_modules/semver": {
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
       "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
       },
       "engines": {
-        "node": ">=6 <7 || >=8"
+        "node": ">=10"
       }
     },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+    "node_modules/jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
       "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
       "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+    "node_modules/jest-util/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
+    "node_modules/jest-validate": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
+      "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "@jest/types": "^29.6.3",
+        "camelcase": "^6.2.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.6.3",
+        "leven": "^3.1.0",
+        "pretty-format": "^29.7.0"
       },
       "engines": {
-        "node": "*"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-validate/node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+    "node_modules/jest-watcher": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
+      "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-glob": "^4.0.1"
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "emittery": "^0.13.1",
+        "jest-util": "^29.7.0",
+        "string-length": "^4.0.1"
       },
       "engines": {
-        "node": ">= 6"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/globby": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.1.tgz",
-      "integrity": "sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==",
+    "node_modules/jest-worker": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
+      "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/glob": "^7.1.1",
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.0.3",
-        "glob": "^7.1.3",
-        "ignore": "^5.1.1",
-        "merge2": "^1.2.3",
-        "slash": "^3.0.0"
+        "@types/node": "*",
+        "jest-util": "^29.7.0",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/graceful-fs": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "dev": true
-    },
-    "node_modules/hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "function-bind": "^1.1.2"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/js-yaml": {
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
+      "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/ignore": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
-      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
-      "dev": true,
+    "node_modules/jsep": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/jsep/-/jsep-1.4.0.tgz",
+      "integrity": "sha512-B7qPcEVE3NVkmSJbaYxvv4cHkVW7DQsZz13pUMrfS8z8Q/BuShN+gcTXrUlPiGqM2/t/EEaI030bpxMqY8gMlw==",
+      "license": "MIT",
       "engines": {
-        "node": ">= 4"
+        "node": ">= 10.16.0"
       }
     },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+    "node_modules/jsesc": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
       "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
+      "license": "MIT",
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/internmap": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
-      "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
+    "node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "json5": "lib/cli.js"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=6"
       }
     },
-    "node_modules/is-core-module": {
-      "version": "2.16.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
-      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+    "node_modules/jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
       "dev": true,
-      "dependencies": {
-        "hasown": "^2.0.2"
-      },
+      "license": "MIT",
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=6"
       }
     },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+    "node_modules/leven": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
       }
     },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-extglob": "^2.1.1"
+        "p-locate": "^4.1.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/is-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
-      "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==",
-      "dev": true
+    "node_modules/lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+    "node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
       "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^3.0.2"
       }
     },
-    "node_modules/is-plain-object": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.1.tgz",
-      "integrity": "sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==",
+    "node_modules/magic-string": {
+      "version": "0.30.21",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
+      "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
       "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.5.5"
       }
     },
-    "node_modules/is-reference": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
-      "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==",
+    "node_modules/make-dir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/estree": "*"
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/jsep": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/jsep/-/jsep-1.4.0.tgz",
-      "integrity": "sha512-B7qPcEVE3NVkmSJbaYxvv4cHkVW7DQsZz13pUMrfS8z8Q/BuShN+gcTXrUlPiGqM2/t/EEaI030bpxMqY8gMlw==",
+    "node_modules/make-dir/node_modules/semver": {
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
       "engines": {
-        "node": ">= 10.16.0"
+        "node": ">=10"
       }
     },
-    "node_modules/jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
+    "node_modules/make-error": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
       "dev": true,
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
+      "license": "ISC"
     },
-    "node_modules/magic-string": {
-      "version": "0.30.17",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
-      "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
+    "node_modules/makeerror": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.5.0"
+        "tmpl": "1.0.5"
       }
     },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/merge2": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
       "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
@@ -1687,6 +4504,7 @@
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
       "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "braces": "^3.0.3",
         "picomatch": "^2.3.1"
@@ -1700,6 +4518,7 @@
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8.6"
       },
@@ -1707,11 +4526,22 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -1719,19 +4549,88 @@
         "node": "*"
       }
     },
+    "node_modules/minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/moment": {
       "version": "2.29.4",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
       "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "*"
       }
     },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.27",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.27.tgz",
+      "integrity": "sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/obsidian": {
-      "version": "1.8.7",
+      "version": "1.11.0",
       "resolved": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-      "integrity": "sha512-0yByIRBSLYSpg0PrVhysWyRU55BrsaJl484RmRX2lM4AJ7VVMy/8jC9aj7VfW7D+1Iy4h1iUACGbIqdFjlUo+Q==",
+      "integrity": "sha512-EWqiRJ4x3dnELRM3NicOWTIdO4ebAdklzLfrMG3XTQk8Sm6AIJp+ZHiEz6pdeO5KPYEX/QC/I+3aPI8U4y8sfA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1739,8 +4638,8 @@
         "moment": "2.29.4"
       },
       "peerDependencies": {
-        "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.0.0"
+        "@codemirror/state": "6.5.0",
+        "@codemirror/view": "6.38.6"
       }
     },
     "node_modules/once": {
@@ -1748,39 +4647,162 @@
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "wrappy": "1"
       }
     },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-locate/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/path-parse": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/path-type": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/picocolors": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/picomatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
-      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -1788,6 +4810,88 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/pirates": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz",
+      "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pretty-format": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/schemas": "^29.6.3",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/prompts": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kleur": "^3.0.3",
+        "sisteransi": "^1.0.5"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/pure-rand": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",
+      "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/dubzzz"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fast-check"
+        }
+      ],
+      "license": "MIT"
+    },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -1806,24 +4910,44 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "^5.1.0"
       }
     },
+    "node_modules/react-is": {
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/resolve": {
-      "version": "1.22.10",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
-      "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
+      "version": "1.22.11",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz",
+      "integrity": "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-core-module": "^2.16.0",
+        "is-core-module": "^2.16.1",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
@@ -1837,11 +4961,45 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/resolve-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve.exports": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz",
+      "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/reusify": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
       "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "iojs": ">=1.0.0",
         "node": ">=0.10.0"
@@ -1850,14 +5008,16 @@
     "node_modules/robust-predicates": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.2.tgz",
-      "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="
+      "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==",
+      "license": "Unlicense"
     },
     "node_modules/rollup": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.44.0.tgz",
-      "integrity": "sha512-qHcdEzLCiktQIfwBq420pn2dP+30uzqYxv9ETm91wdt2R9AFcWfjNAmje4NWlnCIQ5RMTzVf0ZyisOKqHR6RwA==",
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.54.0.tgz",
+      "integrity": "sha512-3nk8Y3a9Ea8szgKhinMlGMhGMw89mqule3KWczxhIzqudyHdCIOHw8WJlj/r329fACjKLEh13ZSk7oE22kyeIw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/estree": "1.0.8"
       },
@@ -1869,26 +5029,28 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.44.0",
-        "@rollup/rollup-android-arm64": "4.44.0",
-        "@rollup/rollup-darwin-arm64": "4.44.0",
-        "@rollup/rollup-darwin-x64": "4.44.0",
-        "@rollup/rollup-freebsd-arm64": "4.44.0",
-        "@rollup/rollup-freebsd-x64": "4.44.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.44.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.44.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.44.0",
-        "@rollup/rollup-linux-arm64-musl": "4.44.0",
-        "@rollup/rollup-linux-loongarch64-gnu": "4.44.0",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.44.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.44.0",
-        "@rollup/rollup-linux-riscv64-musl": "4.44.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.44.0",
-        "@rollup/rollup-linux-x64-gnu": "4.44.0",
-        "@rollup/rollup-linux-x64-musl": "4.44.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.44.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.44.0",
-        "@rollup/rollup-win32-x64-msvc": "4.44.0",
+        "@rollup/rollup-android-arm-eabi": "4.54.0",
+        "@rollup/rollup-android-arm64": "4.54.0",
+        "@rollup/rollup-darwin-arm64": "4.54.0",
+        "@rollup/rollup-darwin-x64": "4.54.0",
+        "@rollup/rollup-freebsd-arm64": "4.54.0",
+        "@rollup/rollup-freebsd-x64": "4.54.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.54.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.54.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.54.0",
+        "@rollup/rollup-linux-arm64-musl": "4.54.0",
+        "@rollup/rollup-linux-loong64-gnu": "4.54.0",
+        "@rollup/rollup-linux-ppc64-gnu": "4.54.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.54.0",
+        "@rollup/rollup-linux-riscv64-musl": "4.54.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.54.0",
+        "@rollup/rollup-linux-x64-gnu": "4.54.0",
+        "@rollup/rollup-linux-x64-musl": "4.54.0",
+        "@rollup/rollup-openharmony-arm64": "4.54.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.54.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.54.0",
+        "@rollup/rollup-win32-x64-gnu": "4.54.0",
+        "@rollup/rollup-win32-x64-msvc": "4.54.0",
         "fsevents": "~2.3.2"
       }
     },
@@ -1897,6 +5059,7 @@
       "resolved": "https://registry.npmjs.org/rollup-plugin-copy/-/rollup-plugin-copy-3.5.0.tgz",
       "integrity": "sha512-wI8D5dvYovRMx/YYKtUNt3Yxaw4ORC9xo6Gt9t22kveWz1enG9QrhVlagzwrxSC455xD1dHMKhIJkbsQ7d48BA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/fs-extra": "^8.0.1",
         "colorette": "^1.1.0",
@@ -1927,6 +5090,7 @@
           "url": "https://feross.org/support"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "queue-microtask": "^1.2.2"
       }
@@ -1934,7 +5098,8 @@
     "node_modules/rw": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
-      "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ=="
+      "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==",
+      "license": "BSD-3-Clause"
     },
     "node_modules/safe-buffer": {
       "version": "5.2.1",
@@ -1954,27 +5119,78 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "license": "MIT"
+    },
+    "node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
     },
     "node_modules/serialize-javascript": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
       "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
       "dev": true,
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/sisteransi": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/slash": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -1983,22 +5199,25 @@
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/smob/-/smob-1.5.0.tgz",
       "integrity": "sha512-g6T+p7QO8npa+/hNx9ohv1E5pVCmWrVCUzUXJyLdMmftX6ER0oiWY/w9knEonLpnOp6b6FenKnMfR8gqwWdwig==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/source-map-support": {
-      "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "version": "0.5.13",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -2007,20 +5226,123 @@
     "node_modules/sprintf-js": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
-      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="
+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/stack-utils": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
+      "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "escape-string-regexp": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/string-length": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "char-regex": "^1.0.2",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
     "node_modules/style-mod": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.2.tgz",
-      "integrity": "sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.3.tgz",
+      "integrity": "sha512-i/n8VsZydrugj3Iuzll8+x/00GH2vnYsk1eomD8QiRrSAeW6ItbCQDtfXCeJHd0iwiNagqjQkvpvREEPtW3IoQ==",
       "dev": true,
-      "peer": true
+      "license": "MIT"
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
     },
     "node_modules/supports-preserve-symlinks-flag": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -2029,13 +5351,14 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.39.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.39.0.tgz",
-      "integrity": "sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==",
+      "version": "5.44.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.44.1.tgz",
+      "integrity": "sha512-t/R3R/n0MSwnnazuPpPNVO60LX0SKL45pyl9YlvxIdkH0Of7D5qM2EVe+yASRIlY5pZ73nclYJfNANGWPwFDZw==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
-        "acorn": "^8.8.2",
+        "acorn": "^8.15.0",
         "commander": "^2.20.0",
         "source-map-support": "~0.5.20"
       },
@@ -2050,13 +5373,48 @@
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/terser/node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/tmpl": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
+      "dev": true,
+      "license": "BSD-3-Clause"
     },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -2064,17 +5422,123 @@
         "node": ">=8.0"
       }
     },
+    "node_modules/ts-jest": {
+      "version": "29.4.6",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.6.tgz",
+      "integrity": "sha512-fSpWtOO/1AjSNQguk43hb/JCo16oJDnMJf3CdEGNkqsEX3t0KX96xvyX1D7PfLCpVoKu4MfVrqUkFyblYoY4lA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bs-logger": "^0.2.6",
+        "fast-json-stable-stringify": "^2.1.0",
+        "handlebars": "^4.7.8",
+        "json5": "^2.2.3",
+        "lodash.memoize": "^4.1.2",
+        "make-error": "^1.3.6",
+        "semver": "^7.7.3",
+        "type-fest": "^4.41.0",
+        "yargs-parser": "^21.1.1"
+      },
+      "bin": {
+        "ts-jest": "cli.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": ">=7.0.0-beta.0 <8",
+        "@jest/transform": "^29.0.0 || ^30.0.0",
+        "@jest/types": "^29.0.0 || ^30.0.0",
+        "babel-jest": "^29.0.0 || ^30.0.0",
+        "jest": "^29.0.0 || ^30.0.0",
+        "jest-util": "^29.0.0 || ^30.0.0",
+        "typescript": ">=4.3 <6"
+      },
+      "peerDependenciesMeta": {
+        "@babel/core": {
+          "optional": true
+        },
+        "@jest/transform": {
+          "optional": true
+        },
+        "@jest/types": {
+          "optional": true
+        },
+        "babel-jest": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        },
+        "jest-util": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ts-jest/node_modules/semver": {
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ts-jest/node_modules/type-fest": {
+      "version": "4.41.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
+      "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/tslib": {
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-      "dev": true
+      "dev": true,
+      "license": "0BSD",
+      "peer": true
+    },
+    "node_modules/type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
     "node_modules/typescript": {
-      "version": "5.8.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
-      "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
+      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "dev": true,
+      "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -2083,10 +5547,24 @@
         "node": ">=14.17"
       }
     },
+    "node_modules/uglify-js": {
+      "version": "3.19.3",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",
+      "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "optional": true,
+      "bin": {
+        "uglifyjs": "bin/uglifyjs"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/undici-types": {
-      "version": "7.8.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz",
-      "integrity": "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
       "dev": true,
       "license": "MIT"
     },
@@ -2095,22 +5573,194 @@
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
       "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4.0.0"
       }
     },
+    "node_modules/update-browserslist-db": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",
+      "integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.1"
+      },
+      "bin": {
+        "update-browserslist-db": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
+      }
+    },
+    "node_modules/v8-to-istanbul": {
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
+      "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.12",
+        "@types/istanbul-lib-coverage": "^2.0.1",
+        "convert-source-map": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.12.0"
+      }
+    },
     "node_modules/w3c-keyname": {
       "version": "2.2.8",
       "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
       "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==",
       "dev": true,
-      "peer": true
+      "license": "MIT"
+    },
+    "node_modules/walker": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
+      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "makeerror": "1.0.12"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/wordwrap": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+      "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
     },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/write-file-atomic": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.7"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     }
   }
 }
diff --git a/package.json b/package.json
index 58f2a50..e901776 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,10 @@
   "scripts": {
     "dev": "rollup --config rollup.config.dev.mjs -w",
     "build": "rollup --config rollup.config.build.mjs",
-    "zip": "zip -9 obsidian-tracker-v$npm_package_version.zip main.js manifest.json styles.css"
+    "zip": "zip -9 obsidian-tracker-v$npm_package_version.zip main.js manifest.json styles.css",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:coverage": "jest --coverage"
   },
   "keywords": [],
   "author": "pyrochlore",
@@ -17,11 +20,14 @@
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^12.1.2",
     "@types/d3": "^7.4.3",
+    "@types/jest": "^29.5.14",
     "@types/node": "^24.0.3",
     "@types/sprintf-js": "^1.1.4",
+    "jest": "^29.7.0",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
     "rollup": "^4.44.0",
     "rollup-plugin-copy": "^3.5.0",
+    "ts-jest": "^29.4.6",
     "tslib": "^2.8.1",
     "typescript": "^5.8.3"
   },
diff --git a/rollup.config.dev.mjs b/rollup.config.dev.mjs
index 588dcbd..22c50a2 100644
--- a/rollup.config.dev.mjs
+++ b/rollup.config.dev.mjs
@@ -13,7 +13,11 @@ export default {
   },
   external: ['obsidian'],
   plugins: [
-    typescript(),
+    typescript({
+      tsconfig: 'tsconfig.json',
+      rootDir: 'src',
+      outDir: 'examples/.obsidian/plugins/obsidian-tracker'
+    }),
     nodeResolve({browser: true}),
     commonjs(),
     copy({
diff --git a/src/collecting.ts b/src/collecting.ts
index 2e7e47a..8842d2d 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -494,6 +494,44 @@ export function collectDataFromFrontmatterTag(
     return false;
 }
 
+// Track existence of frontmatter field (any non-empty value counts as 1.0)
+export function collectDataFromFrontmatterExists(
+    fileCache: CachedMetadata,
+    query: Query,
+    renderInfo: RenderInfo,
+    dataMap: DataMap,
+    xValueMap: XValueMap
+): boolean {
+    let frontMatter = fileCache.frontmatter;
+    if (frontMatter) {
+        let deepValue = helper.deepValue(frontMatter, query.getTarget());
+        // Check if field exists and is non-empty
+        if (deepValue !== null && deepValue !== undefined) {
+            // Handle different value types
+            let hasValue = false;
+            if (typeof deepValue === "string") {
+                hasValue = deepValue.trim() !== "";
+            } else if (Array.isArray(deepValue)) {
+                hasValue = deepValue.length > 0;
+            } else {
+                // Number, boolean, or other - deepValue converts these to strings
+                hasValue = true;
+            }
+            
+            if (hasValue) {
+                // Field exists and has a value, use constValue (default 1.0)
+                query.addNumTargets();
+                let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
+                // Note: xValue can be undefined if xDataset wasn't set up, but addToDataMap should handle it
+                // Other functions don't check for undefined, so we'll follow the same pattern
+                addToDataMap(dataMap, xValue, query, renderInfo.constValue[query.getId()]);
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
 // In form 'key: value', target used to identify 'frontmatter key'
 export function collectDataFromFrontmatterKey(
     fileCache: CachedMetadata,
diff --git a/src/data.ts b/src/data.ts
index 3951fbc..928aa50 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -3,6 +3,7 @@ import { Moment } from "moment";
 export enum SearchType {
     Tag,
     Frontmatter,
+    FrontmatterExists,
     Wiki,
     WikiLink,
     WikiDisplay,
diff --git a/src/helper.ts b/src/helper.ts
index 3c7fd36..472b1a6 100644
--- a/src/helper.ts
+++ b/src/helper.ts
@@ -24,7 +24,7 @@ function makeTimeFormat() {
                 if (fmtSec !== "") {
                     fmt += `:${fmtSec}`;
                 }
-                if (fmtHour.contains("h")) {
+                if (fmtHour.includes("h")) {
                     fmt += " a";
                 }
                 timeFormat.push(fmt);
diff --git a/src/main.ts b/src/main.ts
index 3779e80..96f454a 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -261,10 +261,11 @@ export default class Tracker extends Plugin {
         el: HTMLElement,
         ctx: MarkdownPostProcessorContext
     ) {
-        // console.log("postprocess");
-        const canvas = document.createElement("div");
+        try {
+            // console.log("postprocess");
+            const canvas = document.createElement("div");
 
-        let yamlText = source.trim();
+            let yamlText = source.trim();
 
         // Replace all tabs by spaces
         let tabSize = this.app.vault.getConfig("tabSize");
@@ -315,6 +316,7 @@ export default class Tracker extends Plugin {
                 let target = q.getTarget();
                 if (
                     type === SearchType.Frontmatter ||
+                    type === SearchType.FrontmatterExists ||
                     type === SearchType.Tag ||
                     type === SearchType.Wiki ||
                     type === SearchType.WikiLink ||
@@ -511,6 +513,22 @@ export default class Tracker extends Plugin {
                     processInfo.gotAnyValidYValue ||= gotAnyValue;
                 } // console.log("Search frontmatter keys");
 
+                // console.log("Search frontmatter exists");
+        if (
+            fileCache &&
+            query.getType() === SearchType.FrontmatterExists &&
+            query.getTarget() !== "tags"
+        ) {
+            let gotAnyValue = collecting.collectDataFromFrontmatterExists(
+                fileCache,
+                query,
+                renderInfo,
+                dataMap,
+                xValueMap
+            );
+            processInfo.gotAnyValidYValue ||= gotAnyValue;
+        } // console.log("Search frontmatter exists");
+
                 // console.log("Search wiki links");
                 if (
                     fileCache &&
@@ -745,6 +763,12 @@ export default class Tracker extends Plugin {
         }
 
         el.appendChild(canvas);
+        } catch (error) {
+            console.error("TRACKER: ERROR in postprocessor:", error);
+            console.error("TRACKER: Error stack:", error.stack);
+            const canvas = document.createElement("div");
+            return this.renderErrorMessage("Error: " + error.message, canvas, el);
+        }
     }
 
     // TODO: remove this.app and move to collecting.ts
diff --git a/src/parsing.ts b/src/parsing.ts
index 516eea8..43ad3ff 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -44,6 +44,7 @@ function validateSearchType(searchType: string): boolean {
         searchType.toLowerCase() === "tag" ||
         searchType.toLowerCase() === "text" ||
         searchType.toLowerCase() === "frontmatter" ||
+        searchType.toLowerCase() === "frontmatter.exists" ||
         searchType.toLowerCase() === "wiki" ||
         searchType.toLowerCase() === "wiki.link" ||
         searchType.toLowerCase() === "wiki.display" ||
@@ -1002,6 +1003,9 @@ export function getRenderInfoFromYaml(
             case "frontmatter":
                 searchType.push(SearchType.Frontmatter);
                 break;
+            case "frontmatter.exists":
+                searchType.push(SearchType.FrontmatterExists);
+                break;
             case "wiki":
                 searchType.push(SearchType.Wiki);
                 break;
diff --git a/test/frontmatter-exists.test.ts b/test/frontmatter-exists.test.ts
new file mode 100644
index 0000000..afbdc30
--- /dev/null
+++ b/test/frontmatter-exists.test.ts
@@ -0,0 +1,275 @@
+/**
+ * Automated tests for frontmatter.exists searchType
+ * 
+ * Run with: npm test
+ */
+
+import { describe, it, expect, beforeEach } from '@jest/globals';
+import { SearchType, Query, RenderInfo, DataMap, XValueMap } from '../src/data';
+import { collectDataFromFrontmatterExists } from '../src/collecting';
+import type { CachedMetadata } from 'obsidian';
+
+// Mock Obsidian types
+type MockCachedMetadata = {
+    frontmatter?: Record<string, any>;
+};
+
+describe('frontmatter.exists searchType', () => {
+    let query: Query;
+    let renderInfo: RenderInfo;
+    let dataMap: DataMap;
+    let xValueMap: XValueMap;
+
+    beforeEach(() => {
+        // Create a query for frontmatter.exists
+        query = new Query(0, SearchType.FrontmatterExists, 'meditation');
+        
+        // Create minimal renderInfo
+        renderInfo = new RenderInfo([query]);
+        renderInfo.xDataset = [-1]; // Use filename as date
+        renderInfo.constValue = [1.0];
+        renderInfo.dateFormat = 'YYYY-MM-DD';
+        
+        // Initialize data structures
+        dataMap = new Map();
+        xValueMap = new Map();
+        xValueMap.set(-1, '2024-12-01'); // Set xValue for the test date
+    });
+
+    it('should count non-empty string values', () => {
+        const fileCache: MockCachedMetadata = {
+            frontmatter: {
+                meditation: 'yes'
+            }
+        };
+
+        const result = collectDataFromFrontmatterExists(
+            fileCache as CachedMetadata,
+            query,
+            renderInfo,
+            dataMap,
+            xValueMap
+        );
+
+        expect(result).toBe(true);
+        expect(query.getNumTargets()).toBe(1);
+        expect(dataMap.has('2024-12-01')).toBe(true);
+    });
+
+    it('should NOT count empty strings', () => {
+        const fileCache: MockCachedMetadata = {
+            frontmatter: {
+                meditation: ''
+            }
+        };
+
+        const result = collectDataFromFrontmatterExists(
+            fileCache as CachedMetadata,
+            query,
+            renderInfo,
+            dataMap,
+            xValueMap
+        );
+
+        expect(result).toBe(false);
+        expect(query.getNumTargets()).toBe(0);
+    });
+
+    it('should NOT count whitespace-only strings', () => {
+        const fileCache: MockCachedMetadata = {
+            frontmatter: {
+                meditation: '   '
+            }
+        };
+
+        const result = collectDataFromFrontmatterExists(
+            fileCache as CachedMetadata,
+            query,
+            renderInfo,
+            dataMap,
+            xValueMap
+        );
+
+        expect(result).toBe(false);
+        expect(query.getNumTargets()).toBe(0);
+    });
+
+    it('should count non-empty arrays', () => {
+        const fileCache: MockCachedMetadata = {
+            frontmatter: {
+                tags: ['meditation', 'exercise']
+            }
+        };
+
+        const tagsQuery = new Query(0, SearchType.FrontmatterExists, 'tags');
+        const result = collectDataFromFrontmatterExists(
+            fileCache as CachedMetadata,
+            tagsQuery,
+            renderInfo,
+            dataMap,
+            xValueMap
+        );
+
+        expect(result).toBe(true);
+        expect(tagsQuery.getNumTargets()).toBe(1);
+    });
+
+    it('should NOT count empty arrays', () => {
+        const fileCache: MockCachedMetadata = {
+            frontmatter: {
+                tags: []
+            }
+        };
+
+        const tagsQuery = new Query(0, SearchType.FrontmatterExists, 'tags');
+        const result = collectDataFromFrontmatterExists(
+            fileCache as CachedMetadata,
+            tagsQuery,
+            renderInfo,
+            dataMap,
+            xValueMap
+        );
+
+        expect(result).toBe(false);
+        expect(tagsQuery.getNumTargets()).toBe(0);
+    });
+
+    it('should count boolean true', () => {
+        const fileCache: MockCachedMetadata = {
+            frontmatter: {
+                completed: true
+            }
+        };
+
+        const boolQuery = new Query(0, SearchType.FrontmatterExists, 'completed');
+        const result = collectDataFromFrontmatterExists(
+            fileCache as CachedMetadata,
+            boolQuery,
+            renderInfo,
+            dataMap,
+            xValueMap
+        );
+
+        expect(result).toBe(true);
+        expect(boolQuery.getNumTargets()).toBe(1);
+    });
+
+    it('should count boolean false (it exists!)', () => {
+        const fileCache: MockCachedMetadata = {
+            frontmatter: {
+                notDone: false
+            }
+        };
+
+        const boolQuery = new Query(0, SearchType.FrontmatterExists, 'notDone');
+        const result = collectDataFromFrontmatterExists(
+            fileCache as CachedMetadata,
+            boolQuery,
+            renderInfo,
+            dataMap,
+            xValueMap
+        );
+
+        expect(result).toBe(true);
+        expect(boolQuery.getNumTargets()).toBe(1);
+    });
+
+    it('should count number zero (it exists!)', () => {
+        const fileCache: MockCachedMetadata = {
+            frontmatter: {
+                score: 0
+            }
+        };
+
+        const numQuery = new Query(0, SearchType.FrontmatterExists, 'score');
+        const result = collectDataFromFrontmatterExists(
+            fileCache as CachedMetadata,
+            numQuery,
+            renderInfo,
+            dataMap,
+            xValueMap
+        );
+
+        expect(result).toBe(true);
+        expect(numQuery.getNumTargets()).toBe(1);
+    });
+
+    it('should NOT count null values', () => {
+        const fileCache: MockCachedMetadata = {
+            frontmatter: {
+                noScore: null
+            }
+        };
+
+        const nullQuery = new Query(0, SearchType.FrontmatterExists, 'noScore');
+        const result = collectDataFromFrontmatterExists(
+            fileCache as CachedMetadata,
+            nullQuery,
+            renderInfo,
+            dataMap,
+            xValueMap
+        );
+
+        expect(result).toBe(false);
+        expect(nullQuery.getNumTargets()).toBe(0);
+    });
+
+    it('should NOT count undefined/missing fields', () => {
+        const fileCache: MockCachedMetadata = {
+            frontmatter: {
+                otherField: 'value'
+            }
+        };
+
+        const missingQuery = new Query(0, SearchType.FrontmatterExists, 'meditation');
+        const result = collectDataFromFrontmatterExists(
+            fileCache as CachedMetadata,
+            missingQuery,
+            renderInfo,
+            dataMap,
+            xValueMap
+        );
+
+        expect(result).toBe(false);
+        expect(missingQuery.getNumTargets()).toBe(0);
+    });
+
+    it('should handle missing frontmatter', () => {
+        const fileCache: MockCachedMetadata = {
+            frontmatter: undefined
+        };
+
+        const result = collectDataFromFrontmatterExists(
+            fileCache as CachedMetadata,
+            query,
+            renderInfo,
+            dataMap,
+            xValueMap
+        );
+
+        expect(result).toBe(false);
+        expect(query.getNumTargets()).toBe(0);
+    });
+
+    it('should handle nested frontmatter fields', () => {
+        const fileCache: MockCachedMetadata = {
+            frontmatter: {
+                nested: {
+                    field: 'value'
+                }
+            }
+        };
+
+        const nestedQuery = new Query(0, SearchType.FrontmatterExists, 'nested.field');
+        const result = collectDataFromFrontmatterExists(
+            fileCache as CachedMetadata,
+            nestedQuery,
+            renderInfo,
+            dataMap,
+            xValueMap
+        );
+
+        expect(result).toBe(true);
+        expect(nestedQuery.getNumTargets()).toBe(1);
+    });
+});
diff --git a/test/mocks/d3.ts b/test/mocks/d3.ts
new file mode 100644
index 0000000..1bc5091
--- /dev/null
+++ b/test/mocks/d3.ts
@@ -0,0 +1,42 @@
+/**
+ * Mock d3 for testing
+ * We don't need actual d3 functionality for unit tests
+ */
+
+export const select = () => ({
+  append: () => ({}),
+  attr: () => ({}),
+  style: () => ({}),
+  text: () => ({}),
+  selectAll: () => ({
+    data: () => ({
+      enter: () => ({
+        append: () => ({}),
+      }),
+    }),
+  }),
+});
+
+export const scaleLinear = () => ({
+  domain: () => ({
+    range: () => ({}),
+  }),
+});
+
+export const scaleTime = () => ({
+  domain: () => ({
+    range: () => ({}),
+  }),
+});
+
+export const axisBottom = () => ({});
+export const axisLeft = () => ({});
+
+// Add other d3 functions as needed for tests
+export default {
+  select,
+  scaleLinear,
+  scaleTime,
+  axisBottom,
+  axisLeft,
+};
diff --git a/test/mocks/obsidian.ts b/test/mocks/obsidian.ts
new file mode 100644
index 0000000..ce41f94
--- /dev/null
+++ b/test/mocks/obsidian.ts
@@ -0,0 +1,41 @@
+/**
+ * Mock Obsidian API for testing
+ */
+
+// Mock CachedMetadata type
+export interface CachedMetadata {
+    frontmatter?: Record<string, any>;
+    tags?: Array<{ tag: string; position?: any }>;
+    headings?: Array<any>;
+    sections?: Array<any>;
+    links?: Array<any>;
+    embeds?: Array<any>;
+    blocks?: Record<string, any>;
+    listItems?: Array<any>;
+}
+
+// Mock other Obsidian types as needed
+export type TFile = any;
+export type TFolder = any;
+export type App = any;
+export type Plugin = any;
+export type MarkdownPostProcessorContext = any;
+export type MarkdownView = any;
+export type Editor = any;
+
+// Mock normalizePath
+export function normalizePath(path: string): string {
+    return path.replace(/\\/g, '/');
+}
+
+// Mock parseYaml (we'll use a real YAML parser in tests)
+export function parseYaml(yaml: string): any {
+    // For testing, we'll use a simple mock or real parser
+    // In actual tests, we might want to use js-yaml
+    try {
+        // Simple mock - in real tests you'd use a YAML parser
+        return {};
+    } catch (e) {
+        return null;
+    }
+}
diff --git a/test/setup.ts b/test/setup.ts
new file mode 100644
index 0000000..5082912
--- /dev/null
+++ b/test/setup.ts
@@ -0,0 +1,16 @@
+/**
+ * Jest setup file
+ * Runs before each test file
+ */
+
+// Mock global objects that Obsidian uses
+global.window = {
+    moment: require('moment'),
+} as any;
+
+// Mock console methods if needed (optional)
+// global.console = {
+//     ...console,
+//     error: jest.fn(),
+//     log: jest.fn(),
+// };

From ad85dd0cf12818a24e5a6401d1b1a777acd95b53 Mon Sep 17 00:00:00 2001
From: Mike Greiner <mike.greiner@protonmail.com>
Date: Wed, 7 Jan 2026 20:29:22 -0700
Subject: [PATCH 387/402] fix: handle numeric YAML parsing for
 startDate/endDate with YYYYMMDD format

Fixes issue #324 where dateFormat: YYYYMMDD made startDate and endDate
ineffective, causing all files to be included regardless of date range.

Root cause: YAML parsers may parse numeric-looking dates (e.g., 20240201)
as numbers instead of strings. The code only checked typeof === 'string',
so numeric values were skipped, leaving startDate/endDate as null.

Changes:
- Updated parsing.ts to handle both string and number types for
  startDate/endDate, converting numbers to strings before processing
- Updated main.ts to use isBefore/isAfter with 'day' granularity for
  clearer, more readable date comparisons
- Fixed closure issue by capturing startDate/endDate in local variables
  before async file processing loop
- Fixed helper.ts bug: changed .contains() to .includes() for string
  method compatibility

Tests:
- Added unit tests for YYYYMMDD date format parsing and filtering
- Added edge case tests for boundary conditions and missing dates
- Added date comparison method tests
- All 28 tests passing
---
 src/helper.ts                          |   2 +-
 src/main.ts                            |  23 +-
 src/parsing.ts                         |  30 +-
 test/date-comparison-methods.test.ts   |  86 ++++++
 test/date-format-yyyymmdd.test.ts      | 206 ++++++++++++++
 test/edge-cases-date-filtering.test.ts | 365 +++++++++++++++++++++++++
 test/mocks/d3.ts                       |   2 +
 test/mocks/obsidian.ts                 |  93 +++++++
 test/parsing-yyyymmdd.test.ts          | 154 +++++++++++
 test/setup.ts                          |  11 +
 10 files changed, 957 insertions(+), 15 deletions(-)
 create mode 100644 test/date-comparison-methods.test.ts
 create mode 100644 test/date-format-yyyymmdd.test.ts
 create mode 100644 test/edge-cases-date-filtering.test.ts
 create mode 100644 test/mocks/d3.ts
 create mode 100644 test/mocks/obsidian.ts
 create mode 100644 test/parsing-yyyymmdd.test.ts
 create mode 100644 test/setup.ts

diff --git a/src/helper.ts b/src/helper.ts
index 3e252b1..ad1e7b3 100644
--- a/src/helper.ts
+++ b/src/helper.ts
@@ -24,7 +24,7 @@ function makeTimeFormat() {
                 if (fmtSec !== "") {
                     fmt += `:${fmtSec}`;
                 }
-                if (fmtHour.contains("h")) {
+                if (fmtHour.includes("h")) {
                     fmt += " a";
                 }
                 timeFormat.push(fmt);
diff --git a/src/main.ts b/src/main.ts
index 3779e80..93c58f7 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -304,6 +304,11 @@ export default class Tracker extends Plugin {
         let dataMap: DataMap = new Map(); // {strDate: [query: value, ...]}
         let processInfo = new CollectingProcessInfo();
         processInfo.fileTotal = files.length;
+        
+        // Store dates in local variables to ensure they're captured correctly in async closures
+        // This fixes the issue where dates become null inside async functions
+        const startDate = renderInfo.startDate ? renderInfo.startDate.clone() : null;
+        const endDate = renderInfo.endDate ? renderInfo.endDate.clone() : null;
 
         // Collect data from files, each file has one data point for each query
         const loopFilePromises = files.map(async (file) => {
@@ -427,15 +432,19 @@ export default class Tracker extends Plugin {
                         skipThisFile = true;
                         processInfo.fileNotInFormat++;
                     } else {
-                        // console.log("file " + file.basename + " accepted");
-                        if (renderInfo.startDate !== null) {
-                            if (xDate < renderInfo.startDate) {
+                        // Date filtering: only include files within the specified date range
+                        // Use isBefore/isAfter with 'day' granularity for clear, readable date comparisons
+                        // Use local variables (startDate/endDate) captured before async loop to avoid closure issues
+                        if (startDate !== null && startDate.isValid()) {
+                            // Skip files with dates before the start date
+                            if (xDate.isBefore(startDate, 'day')) {
                                 skipThisFile = true;
                                 processInfo.fileOutOfDateRange++;
                             }
                         }
-                        if (renderInfo.endDate !== null) {
-                            if (xDate > renderInfo.endDate) {
+                        if (endDate !== null && endDate.isValid()) {
+                            // Skip files with dates after the end date
+                            if (xDate.isAfter(endDate, 'day')) {
                                 skipThisFile = true;
                                 processInfo.fileOutOfDateRange++;
                             }
@@ -465,7 +474,9 @@ export default class Tracker extends Plugin {
                     }
                 }
             }
-            if (skipThisFile) return;
+            if (skipThisFile) {
+                return;
+            }
             // console.log(xValueMap);
             // console.log(`minDate: ${minDate}`);
             // console.log(`maxDate: ${maxDate}`);
diff --git a/src/parsing.ts b/src/parsing.ts
index 7754409..b6f8bd7 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1276,14 +1276,21 @@ export function getRenderInfoFromYaml(
 
     // startDate, endDate
     // console.log("Parsing startDate");
-    if (typeof yaml.startDate === "string") {
-        if (/^([\-]?[0-9]+[\.][0-9]+|[\-]?[0-9]+)m$/.test(yaml.startDate)) {
+    // Handle both string and number types (YAML may parse numeric dates as numbers)
+    if (typeof yaml.startDate === "string" || typeof yaml.startDate === "number") {
+        let strStartDate: string;
+        if (typeof yaml.startDate === "number") {
+            strStartDate = yaml.startDate.toString();
+        } else {
+            strStartDate = yaml.startDate;
+        }
+        if (/^([\-]?[0-9]+[\.][0-9]+|[\-]?[0-9]+)m$/.test(strStartDate)) {
             let errorMessage =
                 "'m' for 'minute' is too small for parameter startDate, please use 'd' for 'day' or 'M' for month";
             return errorMessage;
         }
-        let strStartDate = helper.getDateStringFromInputString(
-            yaml.startDate,
+        strStartDate = helper.getDateStringFromInputString(
+            strStartDate,
             renderInfo.dateFormatPrefix,
             renderInfo.dateFormatSuffix
         );
@@ -1318,14 +1325,21 @@ export function getRenderInfoFromYaml(
     }
 
     // console.log("Parsing endDate");
-    if (typeof yaml.endDate === "string") {
-        if (/^([\-]?[0-9]+[\.][0-9]+|[\-]?[0-9]+)m$/.test(yaml.endDate)) {
+    // Handle both string and number types (YAML may parse numeric dates as numbers)
+    if (typeof yaml.endDate === "string" || typeof yaml.endDate === "number") {
+        let strEndDate: string;
+        if (typeof yaml.endDate === "number") {
+            strEndDate = yaml.endDate.toString();
+        } else {
+            strEndDate = yaml.endDate;
+        }
+        if (/^([\-]?[0-9]+[\.][0-9]+|[\-]?[0-9]+)m$/.test(strEndDate)) {
             let errorMessage =
                 "'m' for 'minute' is too small for parameter endDate, please use 'd' for 'day' or 'M' for month";
             return errorMessage;
         }
-        let strEndDate = helper.getDateStringFromInputString(
-            yaml.endDate,
+        strEndDate = helper.getDateStringFromInputString(
+            strEndDate,
             renderInfo.dateFormatPrefix,
             renderInfo.dateFormatSuffix
         );
diff --git a/test/date-comparison-methods.test.ts b/test/date-comparison-methods.test.ts
new file mode 100644
index 0000000..d078a6b
--- /dev/null
+++ b/test/date-comparison-methods.test.ts
@@ -0,0 +1,86 @@
+/**
+ * Test to compare different date comparison methods
+ * 
+ * Question: Is valueOf() the best method, or should we use isBefore/isAfter?
+ */
+
+import * as helper from '../src/helper';
+import moment from 'moment';
+
+describe('Date Comparison Methods', () => {
+    beforeAll(() => {
+        if (typeof (global as any).window === 'undefined') {
+            (global as any).window = {};
+        }
+        (global as any).window.moment = moment;
+    });
+
+    describe('valueOf() vs isBefore/isAfter', () => {
+        it('should produce same results with valueOf() and isBefore/isAfter', () => {
+            const startDate = helper.strToDate('20240201', 'YYYYMMDD');
+            const endDate = helper.strToDate('20240203', 'YYYYMMDD');
+            const testDate = helper.strToDate('20240202', 'YYYYMMDD');
+
+            // Method 1: valueOf() (current implementation)
+            const inRangeValueOf = 
+                testDate.valueOf() >= startDate.valueOf() && 
+                testDate.valueOf() <= endDate.valueOf();
+
+            // Method 2: isBefore/isAfter with 'day' granularity
+            const inRangeMoment = 
+                !testDate.isBefore(startDate, 'day') && 
+                !testDate.isAfter(endDate, 'day');
+
+            // Method 3: isSameOrAfter/isSameOrBefore
+            const inRangeSame = 
+                testDate.isSameOrAfter(startDate, 'day') && 
+                testDate.isSameOrBefore(endDate, 'day');
+
+            expect(inRangeValueOf).toBe(true);
+            expect(inRangeMoment).toBe(true);
+            expect(inRangeSame).toBe(true);
+        });
+
+        it('should handle boundary dates correctly with both methods', () => {
+            const startDate = helper.strToDate('20240201', 'YYYYMMDD');
+            const endDate = helper.strToDate('20240203', 'YYYYMMDD');
+
+            // Test start date boundary
+            const onStartDate = helper.strToDate('20240201', 'YYYYMMDD');
+            expect(onStartDate.valueOf() >= startDate.valueOf()).toBe(true);
+            expect(!onStartDate.isBefore(startDate, 'day')).toBe(true);
+            expect(onStartDate.isSameOrAfter(startDate, 'day')).toBe(true);
+
+            // Test end date boundary
+            const onEndDate = helper.strToDate('20240203', 'YYYYMMDD');
+            expect(onEndDate.valueOf() <= endDate.valueOf()).toBe(true);
+            expect(!onEndDate.isAfter(endDate, 'day')).toBe(true);
+            expect(onEndDate.isSameOrBefore(endDate, 'day')).toBe(true);
+        });
+
+        it('should handle dates normalized to start of day', () => {
+            // strToDate normalizes to startOf('day'), so all dates should be at midnight
+            const date1 = helper.strToDate('20240201', 'YYYYMMDD');
+            const date2 = helper.strToDate('20240201', 'YYYYMMDD');
+
+            // Both should be at midnight (00:00:00)
+            expect(date1.hours()).toBe(0);
+            expect(date1.minutes()).toBe(0);
+            expect(date1.seconds()).toBe(0);
+            expect(date1.valueOf()).toBe(date2.valueOf());
+        });
+    });
+
+    describe('Performance and clarity', () => {
+        it('should note that isBefore/isAfter is more explicit about day granularity', () => {
+            // isBefore/isAfter with 'day' is more explicit about what we're comparing
+            // valueOf() works but is less clear about granularity
+            const date1 = helper.strToDate('20240201', 'YYYYMMDD');
+            const date2 = helper.strToDate('20240201', 'YYYYMMDD');
+
+            // Both methods work, but isBefore with 'day' is more explicit
+            expect(date1.isBefore(date2, 'day')).toBe(false);
+            expect(date1.valueOf() < date2.valueOf()).toBe(false);
+        });
+    });
+});
diff --git a/test/date-format-yyyymmdd.test.ts b/test/date-format-yyyymmdd.test.ts
new file mode 100644
index 0000000..94dae53
--- /dev/null
+++ b/test/date-format-yyyymmdd.test.ts
@@ -0,0 +1,206 @@
+/**
+ * Tests for Issue #324: YYYYMMDD date format not working properly for startDate/endDate
+ * 
+ * Bug: When dateFormat is set to YYYYMMDD, the startDate and endDate settings
+ * become ineffective and all files are included regardless of the date range.
+ */
+
+import * as helper from '../src/helper';
+import { RenderInfo } from '../src/data';
+import moment from 'moment';
+
+describe('Issue #324: YYYYMMDD date format with startDate/endDate', () => {
+    // Set up window.moment for tests
+    beforeAll(() => {
+        if (typeof (global as any).window === 'undefined') {
+            (global as any).window = {};
+        }
+        (global as any).window.moment = moment;
+    });
+
+    describe('strToDate function with YYYYMMDD format', () => {
+        it('should parse YYYYMMDD format correctly', () => {
+            const date = helper.strToDate('20240201', 'YYYYMMDD');
+            expect(date.isValid()).toBe(true);
+            expect(date.format('YYYY-MM-DD')).toBe('2024-02-01');
+        });
+
+        it('should parse YYYY-MM-DD format correctly (baseline)', () => {
+            const date = helper.strToDate('2024-02-01', 'YYYY-MM-DD');
+            expect(date.isValid()).toBe(true);
+            expect(date.format('YYYY-MM-DD')).toBe('2024-02-01');
+        });
+
+        it('should parse dates with YYYYMMDD format consistently', () => {
+            const date1 = helper.strToDate('20240201', 'YYYYMMDD');
+            const date2 = helper.strToDate('20240203', 'YYYYMMDD');
+            
+            expect(date1.isValid()).toBe(true);
+            expect(date2.isValid()).toBe(true);
+            
+            // Verify date comparison works
+            expect(date1.isBefore(date2)).toBe(true);
+            expect(date2.isAfter(date1)).toBe(true);
+        });
+    });
+
+    describe('Date range filtering with YYYYMMDD format', () => {
+        it('should correctly compare dates parsed with YYYYMMDD format', () => {
+            const startDate = helper.strToDate('20240201', 'YYYYMMDD');
+            const endDate = helper.strToDate('20240203', 'YYYYMMDD');
+            const testDate1 = helper.strToDate('20240131', 'YYYYMMDD'); // Before range
+            const testDate2 = helper.strToDate('20240202', 'YYYYMMDD'); // In range
+            const testDate3 = helper.strToDate('20240204', 'YYYYMMDD'); // After range
+
+            // These comparisons should work correctly
+            expect(testDate1.isBefore(startDate)).toBe(true);
+            expect(testDate2.isSameOrAfter(startDate) && testDate2.isSameOrBefore(endDate)).toBe(true);
+            expect(testDate3.isAfter(endDate)).toBe(true);
+        });
+
+        it('should correctly identify dates within range using isBefore/isAfter (fixed comparison)', () => {
+            const startDate = helper.strToDate('20240201', 'YYYYMMDD');
+            const endDate = helper.strToDate('20240203', 'YYYYMMDD');
+            const testDate1 = helper.strToDate('20240131', 'YYYYMMDD'); // Before
+            const testDate2 = helper.strToDate('20240202', 'YYYYMMDD'); // In range
+            const testDate3 = helper.strToDate('20240204', 'YYYYMMDD'); // After
+
+            // Test the fixed comparison logic using isBefore/isAfter (more reliable)
+            const beforeRange = testDate1.isBefore(startDate, 'day');
+            const inRange = !testDate2.isBefore(startDate, 'day') && !testDate2.isAfter(endDate, 'day');
+            const afterRange = testDate3.isAfter(endDate, 'day');
+
+            expect(beforeRange).toBe(true);
+            expect(inRange).toBe(true);
+            expect(afterRange).toBe(true);
+        });
+
+        it('should correctly compare dates with YYYY-MM-DD format (baseline)', () => {
+            const startDate = helper.strToDate('2024-02-01', 'YYYY-MM-DD');
+            const endDate = helper.strToDate('2024-02-03', 'YYYY-MM-DD');
+            const testDate1 = helper.strToDate('2024-01-31', 'YYYY-MM-DD');
+            const testDate2 = helper.strToDate('2024-02-02', 'YYYY-MM-DD');
+            const testDate3 = helper.strToDate('2024-02-04', 'YYYY-MM-DD');
+
+            const beforeRange = testDate1 < startDate;
+            const inRange = !(testDate2 < startDate) && !(testDate2 > endDate);
+            const afterRange = testDate3 > endDate;
+
+            expect(beforeRange).toBe(true);
+            expect(inRange).toBe(true);
+            expect(afterRange).toBe(true);
+        });
+    });
+
+    describe('Reproducing the bug: date comparison with YYYYMMDD', () => {
+        it('should correctly filter dates when using YYYYMMDD format', () => {
+            // Simulate the scenario from the issue
+            const startDateStr = '20240201';
+            const endDateStr = '20240203';
+            const dateFormat = 'YYYYMMDD';
+
+            const startDate = helper.strToDate(startDateStr, dateFormat);
+            const endDate = helper.strToDate(endDateStr, dateFormat);
+
+            // Test dates from different years (as mentioned in issue comments)
+            const datesToTest = [
+                { str: '20180101', expected: 'before' }, // 2018 - before range
+                { str: '20190101', expected: 'before' }, // 2019 - before range
+                { str: '20240201', expected: 'in' },     // Start date
+                { str: '20240202', expected: 'in' },     // In range
+                { str: '20240203', expected: 'in' },     // End date
+                { str: '20240204', expected: 'after' },  // After range
+            ];
+
+            datesToTest.forEach(({ str, expected }) => {
+                const testDate = helper.strToDate(str, dateFormat);
+                expect(testDate.isValid()).toBe(true);
+
+                // Apply the fixed filtering logic as in main.ts (using isBefore/isAfter)
+                let shouldSkip = false;
+                if (startDate !== null && startDate.isValid()) {
+                    if (testDate.isBefore(startDate, 'day')) {
+                        shouldSkip = true;
+                    }
+                }
+                if (endDate !== null && endDate.isValid()) {
+                    if (testDate.isAfter(endDate, 'day')) {
+                        shouldSkip = true;
+                    }
+                }
+
+                if (expected === 'before' || expected === 'after') {
+                    expect(shouldSkip).toBe(true);
+                } else {
+                    expect(shouldSkip).toBe(false);
+                }
+            });
+        });
+
+        it('BUG REPRODUCTION: should fail when dates have different format contexts', () => {
+            // This test reproduces the actual bug scenario
+            // When startDate/endDate are parsed with YYYYMMDD format,
+            // and file dates are also parsed with YYYYMMDD format,
+            // the comparison might fail due to format context issues
+            
+            const dateFormat = 'YYYYMMDD';
+            
+            // Parse startDate and endDate (as done in parsing.ts)
+            const startDate = helper.strToDate('20240201', dateFormat);
+            const endDate = helper.strToDate('20240203', dateFormat);
+            
+            // Parse file dates (as done when reading files)
+            const fileDate1 = helper.strToDate('20180101', dateFormat); // Before range
+            const fileDate2 = helper.strToDate('20240202', dateFormat); // In range
+            const fileDate3 = helper.strToDate('20240204', dateFormat); // After range
+            
+            // Check if dates are valid
+            expect(startDate.isValid()).toBe(true);
+            expect(endDate.isValid()).toBe(true);
+            expect(fileDate1.isValid()).toBe(true);
+            expect(fileDate2.isValid()).toBe(true);
+            expect(fileDate3.isValid()).toBe(true);
+            
+            // The bug: comparison might fail if dates have different internal format storage
+            // Check the creation data format
+            const startFormat = startDate.creationData().format;
+            const fileFormat1 = fileDate1.creationData().format;
+            
+            // If formats differ, comparison might fail
+            // This is the suspected bug
+            const formatsMatch = startFormat.toString() === fileFormat1.toString();
+            
+            // Test the actual comparison operators used in main.ts
+            const beforeRange = fileDate1 < startDate;
+            const inRange = !(fileDate2 < startDate) && !(fileDate2 > endDate);
+            const afterRange = fileDate3 > endDate;
+            
+            // These should all work correctly
+            expect(beforeRange).toBe(true);
+            expect(inRange).toBe(true);
+            expect(afterRange).toBe(true);
+        });
+    });
+
+    describe('dateToStr and strToDate roundtrip with YYYYMMDD', () => {
+        it('should correctly roundtrip dates with YYYYMMDD format', () => {
+            const originalDate = moment('2024-02-01');
+            const dateStr = helper.dateToStr(originalDate, 'YYYYMMDD');
+            expect(dateStr).toBe('20240201');
+
+            const parsedDate = helper.strToDate(dateStr, 'YYYYMMDD');
+            expect(parsedDate.isValid()).toBe(true);
+            expect(parsedDate.format('YYYY-MM-DD')).toBe('2024-02-01');
+        });
+
+        it('should correctly roundtrip dates with YYYY-MM-DD format (baseline)', () => {
+            const originalDate = moment('2024-02-01');
+            const dateStr = helper.dateToStr(originalDate, 'YYYY-MM-DD');
+            expect(dateStr).toBe('2024-02-01');
+
+            const parsedDate = helper.strToDate(dateStr, 'YYYY-MM-DD');
+            expect(parsedDate.isValid()).toBe(true);
+            expect(parsedDate.format('YYYY-MM-DD')).toBe('2024-02-01');
+        });
+    });
+});
diff --git a/test/edge-cases-date-filtering.test.ts b/test/edge-cases-date-filtering.test.ts
new file mode 100644
index 0000000..f7a8877
--- /dev/null
+++ b/test/edge-cases-date-filtering.test.ts
@@ -0,0 +1,365 @@
+/**
+ * Edge case tests for date filtering
+ * 
+ * Tests various edge cases that might not be covered by the main test cases
+ */
+
+import { getRenderInfoFromYaml } from '../src/parsing';
+import { getDateFromFilename } from '../src/collecting';
+import { RenderInfo } from '../src/data';
+import moment from 'moment';
+
+// Mock Tracker plugin
+class MockTracker {
+    app: any;
+    settings: any;
+
+    constructor() {
+        this.app = {
+            vault: {
+                getAbstractFileByPath: (path: string) => {
+                    const { TFolder } = require('./mocks/obsidian');
+                    return new TFolder(path, path);
+                },
+                getConfig: (key: string) => {
+                    if (key === 'tabSize') return 4;
+                    return null;
+                }
+            }
+        };
+        this.settings = {
+            folder: '/',
+            dateFormat: 'YYYY-MM-DD'
+        };
+    }
+}
+
+describe('Edge Cases: Date Filtering', () => {
+    let mockPlugin: MockTracker;
+
+    beforeAll(() => {
+        if (typeof (global as any).window === 'undefined') {
+            (global as any).window = {};
+        }
+        (global as any).window.moment = moment;
+        mockPlugin = new MockTracker();
+    });
+
+    describe('Boundary conditions', () => {
+        it('should include files with dates exactly equal to startDate', () => {
+            const yamlText = `
+searchType: tag
+searchTarget: weight
+folder: test
+dateFormat: YYYYMMDD
+startDate: 20240201
+endDate: 20240203
+line:
+  title: Test
+`.trim();
+
+            const renderInfo = getRenderInfoFromYaml(yamlText, mockPlugin as any);
+            if (typeof renderInfo === 'string') {
+                fail(`Parsing failed: ${renderInfo}`);
+                return;
+            }
+
+            const file = { basename: '20240201', name: '20240201.md', path: 'test/20240201.md' };
+            const fileDate = getDateFromFilename(file as any, renderInfo);
+
+            const startDate = renderInfo.startDate!;
+            const endDate = renderInfo.endDate!;
+
+            // File date equals startDate - should be included
+            expect(fileDate.valueOf() >= startDate.valueOf()).toBe(true);
+            expect(fileDate.valueOf() <= endDate.valueOf()).toBe(true);
+        });
+
+        it('should include files with dates exactly equal to endDate', () => {
+            const yamlText = `
+searchType: tag
+searchTarget: weight
+folder: test
+dateFormat: YYYYMMDD
+startDate: 20240201
+endDate: 20240203
+line:
+  title: Test
+`.trim();
+
+            const renderInfo = getRenderInfoFromYaml(yamlText, mockPlugin as any);
+            if (typeof renderInfo === 'string') {
+                fail(`Parsing failed: ${renderInfo}`);
+                return;
+            }
+
+            const file = { basename: '20240203', name: '20240203.md', path: 'test/20240203.md' };
+            const fileDate = getDateFromFilename(file as any, renderInfo);
+
+            const startDate = renderInfo.startDate!;
+            const endDate = renderInfo.endDate!;
+
+            // File date equals endDate - should be included
+            expect(fileDate.valueOf() >= startDate.valueOf()).toBe(true);
+            expect(fileDate.valueOf() <= endDate.valueOf()).toBe(true);
+        });
+
+        it('should exclude files with dates exactly one day before startDate', () => {
+            const yamlText = `
+searchType: tag
+searchTarget: weight
+folder: test
+dateFormat: YYYYMMDD
+startDate: 20240201
+endDate: 20240203
+line:
+  title: Test
+`.trim();
+
+            const renderInfo = getRenderInfoFromYaml(yamlText, mockPlugin as any);
+            if (typeof renderInfo === 'string') {
+                fail(`Parsing failed: ${renderInfo}`);
+                return;
+            }
+
+            const file = { basename: '20240131', name: '20240131.md', path: 'test/20240131.md' };
+            const fileDate = getDateFromFilename(file as any, renderInfo);
+
+            const startDate = renderInfo.startDate!;
+
+            // File date is before startDate - should be excluded
+            expect(fileDate.valueOf() < startDate.valueOf()).toBe(true);
+        });
+
+        it('should exclude files with dates exactly one day after endDate', () => {
+            const yamlText = `
+searchType: tag
+searchTarget: weight
+folder: test
+dateFormat: YYYYMMDD
+startDate: 20240201
+endDate: 20240203
+line:
+  title: Test
+`.trim();
+
+            const renderInfo = getRenderInfoFromYaml(yamlText, mockPlugin as any);
+            if (typeof renderInfo === 'string') {
+                fail(`Parsing failed: ${renderInfo}`);
+                return;
+            }
+
+            const file = { basename: '20240204', name: '20240204.md', path: 'test/20240204.md' };
+            const fileDate = getDateFromFilename(file as any, renderInfo);
+
+            const endDate = renderInfo.endDate!;
+
+            // File date is after endDate - should be excluded
+            expect(fileDate.valueOf() > endDate.valueOf()).toBe(true);
+        });
+    });
+
+    describe('Missing date boundaries', () => {
+        it('should include all files when startDate is missing', () => {
+            const yamlText = `
+searchType: tag
+searchTarget: weight
+folder: test
+dateFormat: YYYYMMDD
+endDate: 20240203
+line:
+  title: Test
+`.trim();
+
+            const renderInfo = getRenderInfoFromYaml(yamlText, mockPlugin as any);
+            if (typeof renderInfo === 'string') {
+                fail(`Parsing failed: ${renderInfo}`);
+                return;
+            }
+
+            expect(renderInfo.startDate).toBeNull();
+            expect(renderInfo.endDate).not.toBeNull();
+
+            // Files before endDate should be included
+            const file = { basename: '20240101', name: '20240101.md', path: 'test/20240101.md' };
+            const fileDate = getDateFromFilename(file as any, renderInfo);
+            const endDate = renderInfo.endDate!;
+
+            expect(fileDate.valueOf() <= endDate.valueOf()).toBe(true);
+        });
+
+        it('should include all files when endDate is missing', () => {
+            const yamlText = `
+searchType: tag
+searchTarget: weight
+folder: test
+dateFormat: YYYYMMDD
+startDate: 20240201
+line:
+  title: Test
+`.trim();
+
+            const renderInfo = getRenderInfoFromYaml(yamlText, mockPlugin as any);
+            if (typeof renderInfo === 'string') {
+                fail(`Parsing failed: ${renderInfo}`);
+                return;
+            }
+
+            expect(renderInfo.startDate).not.toBeNull();
+            expect(renderInfo.endDate).toBeNull();
+
+            // Files after startDate should be included
+            const file = { basename: '20241231', name: '20241231.md', path: 'test/20241231.md' };
+            const fileDate = getDateFromFilename(file as any, renderInfo);
+            const startDate = renderInfo.startDate!;
+
+            expect(fileDate.valueOf() >= startDate.valueOf()).toBe(true);
+        });
+
+        it('should include all files when both startDate and endDate are missing', () => {
+            const yamlText = `
+searchType: tag
+searchTarget: weight
+folder: test
+dateFormat: YYYYMMDD
+line:
+  title: Test
+`.trim();
+
+            const renderInfo = getRenderInfoFromYaml(yamlText, mockPlugin as any);
+            if (typeof renderInfo === 'string') {
+                fail(`Parsing failed: ${renderInfo}`);
+                return;
+            }
+
+            expect(renderInfo.startDate).toBeNull();
+            expect(renderInfo.endDate).toBeNull();
+
+            // Any file should be processable
+            const file = { basename: '20240101', name: '20240101.md', path: 'test/20240101.md' };
+            const fileDate = getDateFromFilename(file as any, renderInfo);
+
+            expect(fileDate.isValid()).toBe(true);
+        });
+    });
+
+    describe('Year/month boundaries', () => {
+        it('should handle dates at year boundary correctly', () => {
+            const yamlText = `
+searchType: tag
+searchTarget: weight
+folder: test
+dateFormat: YYYYMMDD
+startDate: 20231231
+endDate: 20240102
+line:
+  title: Test
+`.trim();
+
+            const renderInfo = getRenderInfoFromYaml(yamlText, mockPlugin as any);
+            if (typeof renderInfo === 'string') {
+                fail(`Parsing failed: ${renderInfo}`);
+                return;
+            }
+
+            const files = [
+                { basename: '20231230', expected: 'excluded' }, // Before
+                { basename: '20231231', expected: 'included' }, // Start
+                { basename: '20240101', expected: 'included' }, // Year boundary
+                { basename: '20240102', expected: 'included' }, // End
+                { basename: '20240103', expected: 'excluded' }, // After
+            ];
+
+            const startDate = renderInfo.startDate!;
+            const endDate = renderInfo.endDate!;
+
+            for (const { basename, expected } of files) {
+                const file = { basename, name: `${basename}.md`, path: `test/${basename}.md` };
+                const fileDate = getDateFromFilename(file as any, renderInfo);
+
+                const inRange = 
+                    fileDate.valueOf() >= startDate.valueOf() && 
+                    fileDate.valueOf() <= endDate.valueOf();
+
+                if (expected === 'included') {
+                    expect(inRange).toBe(true);
+                } else {
+                    expect(inRange).toBe(false);
+                }
+            }
+        });
+
+        it('should handle dates at month boundary correctly', () => {
+            const yamlText = `
+searchType: tag
+searchTarget: weight
+folder: test
+dateFormat: YYYYMMDD
+startDate: 20240131
+endDate: 20240202
+line:
+  title: Test
+`.trim();
+
+            const renderInfo = getRenderInfoFromYaml(yamlText, mockPlugin as any);
+            if (typeof renderInfo === 'string') {
+                fail(`Parsing failed: ${renderInfo}`);
+                return;
+            }
+
+            const files = [
+                { basename: '20240130', expected: 'excluded' }, // Before
+                { basename: '20240131', expected: 'included' }, // Start (last day of Jan)
+                { basename: '20240201', expected: 'included' }, // Month boundary
+                { basename: '20240202', expected: 'included' }, // End
+                { basename: '20240203', expected: 'excluded' }, // After
+            ];
+
+            const startDate = renderInfo.startDate!;
+            const endDate = renderInfo.endDate!;
+
+            for (const { basename, expected } of files) {
+                const file = { basename, name: `${basename}.md`, path: `test/${basename}.md` };
+                const fileDate = getDateFromFilename(file as any, renderInfo);
+
+                const inRange = 
+                    fileDate.valueOf() >= startDate.valueOf() && 
+                    fileDate.valueOf() <= endDate.valueOf();
+
+                if (expected === 'included') {
+                    expect(inRange).toBe(true);
+                } else {
+                    expect(inRange).toBe(false);
+                }
+            }
+        });
+    });
+
+    describe('Invalid date handling', () => {
+        it('should handle files with invalid date formats gracefully', () => {
+            const yamlText = `
+searchType: tag
+searchTarget: weight
+folder: test
+dateFormat: YYYYMMDD
+startDate: 20240201
+endDate: 20240203
+line:
+  title: Test
+`.trim();
+
+            const renderInfo = getRenderInfoFromYaml(yamlText, mockPlugin as any);
+            if (typeof renderInfo === 'string') {
+                fail(`Parsing failed: ${renderInfo}`);
+                return;
+            }
+
+            // File with invalid date format
+            const file = { basename: 'invalid-date', name: 'invalid-date.md', path: 'test/invalid-date.md' };
+            const fileDate = getDateFromFilename(file as any, renderInfo);
+
+            // Invalid dates should be marked as invalid
+            expect(fileDate.isValid()).toBe(false);
+        });
+    });
+});
diff --git a/test/mocks/d3.ts b/test/mocks/d3.ts
new file mode 100644
index 0000000..b5cfd5f
--- /dev/null
+++ b/test/mocks/d3.ts
@@ -0,0 +1,2 @@
+// Mock for d3 library
+export default {};
diff --git a/test/mocks/obsidian.ts b/test/mocks/obsidian.ts
new file mode 100644
index 0000000..c2a2c87
--- /dev/null
+++ b/test/mocks/obsidian.ts
@@ -0,0 +1,93 @@
+// Mock for Obsidian API
+// This provides window.moment which is used throughout the codebase
+
+import moment from 'moment';
+
+// Create a global window object if it doesn't exist
+if (typeof (global as any).window === 'undefined') {
+    (global as any).window = {};
+}
+
+// Mock window.moment with the actual moment library
+(global as any).window.moment = moment;
+
+// Export minimal Obsidian types for TypeScript
+export class TFile {
+    basename: string;
+    name: string;
+    path: string;
+    extension: string;
+    stat: any;
+
+    constructor(basename: string, path: string = '') {
+        this.basename = basename;
+        this.name = basename;
+        this.path = path || basename;
+        this.extension = '';
+        this.stat = {};
+    }
+}
+
+export class TFolder {
+    name: string;
+    path: string;
+
+    constructor(name: string, path: string = '') {
+        this.name = name;
+        this.path = path || name;
+    }
+}
+
+export function normalizePath(path: string): string {
+    return path.replace(/\\/g, '/');
+}
+
+export interface CachedMetadata {
+    frontmatter?: Record<string, any>;
+    tags?: Array<{ tag: string }>;
+}
+
+// Simple YAML parser for testing (handles basic key-value pairs and nested objects)
+export function parseYaml(yamlText: string): any {
+    const result: any = {};
+    const lines = yamlText.split('\n');
+    const stack: Array<{ obj: any; indent: number }> = [{ obj: result, indent: -1 }];
+    
+    for (const line of lines) {
+        const trimmed = line.trim();
+        if (!trimmed || trimmed.startsWith('#')) continue;
+        
+        // Calculate indentation (spaces before first non-space char)
+        const indent = line.length - line.trimStart().length;
+        
+        // Pop stack until we find the parent at this indentation level
+        while (stack.length > 1 && stack[stack.length - 1].indent >= indent) {
+            stack.pop();
+        }
+        
+        const colonIndex = trimmed.indexOf(':');
+        if (colonIndex === -1) continue;
+        
+        const key = trimmed.substring(0, colonIndex).trim();
+        let value: any = trimmed.substring(colonIndex + 1).trim();
+        
+        // Remove quotes if present
+        if ((value.startsWith('"') && value.endsWith('"')) ||
+            (value.startsWith("'") && value.endsWith("'"))) {
+            value = value.slice(1, -1);
+        }
+        
+        // If value is empty, it's likely a nested object
+        const currentObj = stack[stack.length - 1].obj;
+        if (value === '') {
+            // Create nested object
+            currentObj[key] = {};
+            stack.push({ obj: currentObj[key], indent: indent });
+        } else {
+            // Simple key-value pair
+            currentObj[key] = value;
+        }
+    }
+    
+    return result;
+}
diff --git a/test/parsing-yyyymmdd.test.ts b/test/parsing-yyyymmdd.test.ts
new file mode 100644
index 0000000..34d6f87
--- /dev/null
+++ b/test/parsing-yyyymmdd.test.ts
@@ -0,0 +1,154 @@
+/**
+ * Tests for Issue #324: YYYYMMDD date format parsing in getRenderInfoFromYaml
+ * 
+ * This test verifies that startDate and endDate are correctly parsed from YAML
+ * when dateFormat is YYYYMMDD.
+ */
+
+import { getRenderInfoFromYaml } from '../src/parsing';
+import { RenderInfo } from '../src/data';
+import moment from 'moment';
+
+// Mock Tracker plugin
+class MockTracker {
+    app: any;
+    settings: any;
+
+    constructor() {
+        this.app = {
+            vault: {
+                getAbstractFileByPath: (path: string) => {
+                    // Return a mock folder for any path
+                    const { TFolder } = require('./mocks/obsidian');
+                    return new TFolder(path, path);
+                },
+                getConfig: (key: string) => {
+                    if (key === 'tabSize') return 4;
+                    return null;
+                }
+            }
+        };
+        this.settings = {
+            folder: '/',
+            dateFormat: 'YYYY-MM-DD'
+        };
+    }
+}
+
+describe('Issue #324: YYYYMMDD date format parsing', () => {
+    let mockPlugin: MockTracker;
+
+    beforeAll(() => {
+        if (typeof (global as any).window === 'undefined') {
+            (global as any).window = {};
+        }
+        (global as any).window.moment = moment;
+        mockPlugin = new MockTracker();
+    });
+
+    it('should parse startDate and endDate with YYYYMMDD format', () => {
+        const yamlText = `
+searchType: tag
+searchTarget: weight
+folder: test-issue-324
+dateFormat: YYYYMMDD
+startDate: 20240201
+endDate: 20240203
+line:
+  title: Test
+`.trim();
+
+        const result = getRenderInfoFromYaml(yamlText, mockPlugin as any);
+        
+        // Log the actual result to see what we're getting
+        if (typeof result === 'string') {
+            console.log('Error message:', result);
+        }
+        
+        expect(typeof result).toBe('object');
+        expect(result).not.toBeInstanceOf(String); // Should not be an error message
+        
+        const renderInfo = result as RenderInfo;
+        
+        // Check that dateFormat is set correctly
+        expect(renderInfo.dateFormat).toBe('YYYYMMDD');
+        
+        // Check that startDate and endDate are parsed correctly
+        expect(renderInfo.startDate).not.toBeNull();
+        expect(renderInfo.startDate?.isValid()).toBe(true);
+        expect(renderInfo.startDate?.format('YYYY-MM-DD')).toBe('2024-02-01');
+        
+        expect(renderInfo.endDate).not.toBeNull();
+        expect(renderInfo.endDate?.isValid()).toBe(true);
+        expect(renderInfo.endDate?.format('YYYY-MM-DD')).toBe('2024-02-03');
+    });
+
+    it('should parse startDate and endDate with YYYY-MM-DD format (baseline)', () => {
+        const yamlText = `
+searchType: tag
+searchTarget: weight
+folder: test-issue-324
+dateFormat: YYYY-MM-DD
+startDate: 2024-02-01
+endDate: 2024-02-03
+line:
+    title: Test
+`.trim();
+
+        const result = getRenderInfoFromYaml(yamlText, mockPlugin as any);
+        
+        expect(typeof result).toBe('object');
+        expect(result).not.toBeInstanceOf(String);
+        
+        const renderInfo = result as RenderInfo;
+        
+        expect(renderInfo.dateFormat).toBe('YYYY-MM-DD');
+        expect(renderInfo.startDate).not.toBeNull();
+        expect(renderInfo.startDate?.isValid()).toBe(true);
+        expect(renderInfo.startDate?.format('YYYY-MM-DD')).toBe('2024-02-01');
+        
+        expect(renderInfo.endDate).not.toBeNull();
+        expect(renderInfo.endDate?.isValid()).toBe(true);
+        expect(renderInfo.endDate?.format('YYYY-MM-DD')).toBe('2024-02-03');
+    });
+
+    it('should handle missing startDate and endDate', () => {
+        const yamlText = `
+searchType: tag
+searchTarget: weight
+folder: test-issue-324
+dateFormat: YYYYMMDD
+line:
+    title: Test
+`.trim();
+
+        const result = getRenderInfoFromYaml(yamlText, mockPlugin as any);
+        
+        expect(typeof result).toBe('object');
+        expect(result).not.toBeInstanceOf(String);
+        
+        const renderInfo = result as RenderInfo;
+        
+        expect(renderInfo.dateFormat).toBe('YYYYMMDD');
+        expect(renderInfo.startDate).toBeNull();
+        expect(renderInfo.endDate).toBeNull();
+    });
+
+    it('should return error for invalid startDate format', () => {
+        const yamlText = `
+searchType: tag
+searchTarget: weight
+folder: test-issue-324
+dateFormat: YYYYMMDD
+startDate: invalid-date
+endDate: 20240203
+line:
+    title: Test
+`.trim();
+
+        const result = getRenderInfoFromYaml(yamlText, mockPlugin as any);
+        
+        expect(typeof result).toBe('string'); // Should be an error message
+        expect(result).toContain('Invalid startDate');
+    });
+});
diff --git a/test/setup.ts b/test/setup.ts
new file mode 100644
index 0000000..1912fc4
--- /dev/null
+++ b/test/setup.ts
@@ -0,0 +1,11 @@
+// Jest setup file
+// This runs before each test file
+
+// Ensure window.moment is available globally
+import moment from 'moment';
+
+if (typeof (global as any).window === 'undefined') {
+    (global as any).window = {};
+}
+
+(global as any).window.moment = moment;

From b1f2c7d455c2935d9abea059fb56d9ae077e8f53 Mon Sep 17 00:00:00 2001
From: curious-archaea <stellate.flowers@proton.me>
Date: Tue, 10 Feb 2026 17:08:20 -0500
Subject: [PATCH 388/402] fix npm install integrity issue and refresh lockfile

---
 package-lock.json | 699 +++++++++++++++++++++++++++++++---------------
 1 file changed, 468 insertions(+), 231 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 899be75..5309b32 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -30,39 +30,39 @@
       }
     },
     "node_modules/@codemirror/state": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.2.tgz",
-      "integrity": "sha512-FVqsPqtPWKVVL3dPSxy8wEF/ymIEuVzF1PK3VbUgrxXpJUSHQWWZz4JMToquRxnkw+36LTamCZG2iua2Ptq0fA==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.0.tgz",
+      "integrity": "sha512-MwBHVK60IiIHDcoMet78lxt6iw5gJOGSbNbOIVBHWVXIH4/Nq1+GQgLLGgI1KlnN86WDXsPudVaqYHKBIx7Eyw==",
       "dev": true,
+      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@marijn/find-cluster-break": "^1.0.0"
       }
     },
     "node_modules/@codemirror/view": {
-      "version": "6.36.8",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.36.8.tgz",
-      "integrity": "sha512-yoRo4f+FdnD01fFt4XpfpMCcCAo9QvZOtbrXExn4SqzH32YC6LgzqxfLZw/r6Ge65xyY03mK/UfUqrVw1gFiFg==",
+      "version": "6.38.6",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.38.6.tgz",
+      "integrity": "sha512-qiS0z1bKs5WOvHIAC0Cybmv4AJSkAXgX5aD6Mqd2epSLlVJsQl8NG23jCVouIgkh4All/mrbdsf2UOLFnJw0tw==",
       "dev": true,
+      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@codemirror/state": "^6.5.0",
+        "crelt": "^1.0.6",
         "style-mod": "^4.1.0",
         "w3c-keyname": "^2.2.4"
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
-      "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
+      "version": "0.3.13",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
+      "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jridgewell/set-array": "^1.2.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/sourcemap-codec": "^1.5.0",
         "@jridgewell/trace-mapping": "^0.3.24"
-      },
-      "engines": {
-        "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/resolve-uri": {
@@ -70,40 +70,35 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
       "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
       "dev": true,
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
-      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/source-map": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
-      "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
+      "version": "0.3.11",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.11.tgz",
+      "integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25"
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
-      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
-      "dev": true
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.25",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "version": "0.3.31",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
+      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
@@ -114,6 +109,7 @@
       "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz",
       "integrity": "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==",
       "dev": true,
+      "license": "MIT",
       "peer": true
     },
     "node_modules/@nodelib/fs.scandir": {
@@ -121,6 +117,7 @@
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
       "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "2.0.5",
         "run-parallel": "^1.1.9"
@@ -134,6 +131,7 @@
       "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
       "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
@@ -143,6 +141,7 @@
       "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
       "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
@@ -152,9 +151,9 @@
       }
     },
     "node_modules/@rollup/plugin-commonjs": {
-      "version": "28.0.5",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-28.0.5.tgz",
-      "integrity": "sha512-lytLp2JgAMwqJY6ve3OSROXr2XuEYHjnsQN3hmnxC+w11dI91LuUw4Yc1kk2FqKXeMG8psoFejFgK+znoij0cg==",
+      "version": "28.0.9",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-28.0.9.tgz",
+      "integrity": "sha512-PIR4/OHZ79romx0BVVll/PkwWpJ7e5lsqFa3gFfcrFPWwLXLV39JVUzQV9RKjWerE7B845Hqjj9VYlQeieZ2dA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -179,10 +178,11 @@
       }
     },
     "node_modules/@rollup/plugin-node-resolve": {
-      "version": "16.0.1",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-16.0.1.tgz",
-      "integrity": "sha512-tk5YCxJWIG81umIvNkSod2qK5KyQW19qcBF/B78n1bjtOON6gzKoVeSzAE8yHCZEDmqkHKkxplExA8KzdJLJpA==",
+      "version": "16.0.3",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-16.0.3.tgz",
+      "integrity": "sha512-lUYM3UBGuM93CnMPG1YocWu7X802BrNF3jW2zny5gQyLQgRFJhV1Sq0Zi74+dh/6NBx1DxFC4b4GXg9wUCG5Qg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@rollup/pluginutils": "^5.0.1",
         "@types/resolve": "1.20.2",
@@ -207,6 +207,7 @@
       "resolved": "https://registry.npmjs.org/@rollup/plugin-terser/-/plugin-terser-0.4.4.tgz",
       "integrity": "sha512-XHeJC5Bgvs8LfukDwWZp7yeqin6ns8RTl2B9avbejt6tZqsqvVoWI7ZTQrcNsfKEDWBTnTxM8nMDkO2IFFbd0A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "serialize-javascript": "^6.0.1",
         "smob": "^1.0.0",
@@ -225,10 +226,11 @@
       }
     },
     "node_modules/@rollup/plugin-typescript": {
-      "version": "12.1.2",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-12.1.2.tgz",
-      "integrity": "sha512-cdtSp154H5sv637uMr1a8OTWB0L1SWDSm1rDGiyfcGcvQ6cuTs4MDk2BVEBGysUWago4OJN4EQZqOTl/QY3Jgg==",
+      "version": "12.3.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-12.3.0.tgz",
+      "integrity": "sha512-7DP0/p7y3t67+NabT9f8oTBFE6gGkto4SA6Np2oudYmZE/m1dt8RB0SjL1msMxFpLo631qjRCcBlAbq1ml/Big==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@rollup/pluginutils": "^5.1.0",
         "resolve": "^1.22.1"
@@ -251,10 +253,11 @@
       }
     },
     "node_modules/@rollup/pluginutils": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.4.tgz",
-      "integrity": "sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.3.0.tgz",
+      "integrity": "sha512-5EdhGZtnu3V88ces7s53hhfK5KSASnJZv8Lulpc04cWO3REESroJXg73DFsOmgbU2BhwV0E20bu2IDZb3VKW4Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/estree": "^1.0.0",
         "estree-walker": "^2.0.2",
@@ -273,9 +276,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.44.0.tgz",
-      "integrity": "sha512-xEiEE5oDW6tK4jXCAyliuntGR+amEMO7HLtdSshVuhFnKTYoeYMyXQK7pLouAJJj5KHdwdn87bfHAR2nSdNAUA==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.57.1.tgz",
+      "integrity": "sha512-A6ehUVSiSaaliTxai040ZpZ2zTevHYbvu/lDoeAteHI8QnaosIzm4qwtezfRg1jOYaUmnzLX1AOD6Z+UJjtifg==",
       "cpu": [
         "arm"
       ],
@@ -287,9 +290,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.44.0.tgz",
-      "integrity": "sha512-uNSk/TgvMbskcHxXYHzqwiyBlJ/lGcv8DaUfcnNwict8ba9GTTNxfn3/FAoFZYgkaXXAdrAA+SLyKplyi349Jw==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.57.1.tgz",
+      "integrity": "sha512-dQaAddCY9YgkFHZcFNS/606Exo8vcLHwArFZ7vxXq4rigo2bb494/xKMMwRRQW6ug7Js6yXmBZhSBRuBvCCQ3w==",
       "cpu": [
         "arm64"
       ],
@@ -301,9 +304,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.44.0.tgz",
-      "integrity": "sha512-VGF3wy0Eq1gcEIkSCr8Ke03CWT+Pm2yveKLaDvq51pPpZza3JX/ClxXOCmTYYq3us5MvEuNRTaeyFThCKRQhOA==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.57.1.tgz",
+      "integrity": "sha512-crNPrwJOrRxagUYeMn/DZwqN88SDmwaJ8Cvi/TN1HnWBU7GwknckyosC2gd0IqYRsHDEnXf328o9/HC6OkPgOg==",
       "cpu": [
         "arm64"
       ],
@@ -315,9 +318,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.44.0.tgz",
-      "integrity": "sha512-fBkyrDhwquRvrTxSGH/qqt3/T0w5Rg0L7ZIDypvBPc1/gzjJle6acCpZ36blwuwcKD/u6oCE/sRWlUAcxLWQbQ==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.57.1.tgz",
+      "integrity": "sha512-Ji8g8ChVbKrhFtig5QBV7iMaJrGtpHelkB3lsaKzadFBe58gmjfGXAOfI5FV0lYMH8wiqsxKQ1C9B0YTRXVy4w==",
       "cpu": [
         "x64"
       ],
@@ -329,9 +332,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.44.0.tgz",
-      "integrity": "sha512-u5AZzdQJYJXByB8giQ+r4VyfZP+walV+xHWdaFx/1VxsOn6eWJhK2Vl2eElvDJFKQBo/hcYIBg/jaKS8ZmKeNQ==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.57.1.tgz",
+      "integrity": "sha512-R+/WwhsjmwodAcz65guCGFRkMb4gKWTcIeLy60JJQbXrJ97BOXHxnkPFrP+YwFlaS0m+uWJTstrUA9o+UchFug==",
       "cpu": [
         "arm64"
       ],
@@ -343,9 +346,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.44.0.tgz",
-      "integrity": "sha512-qC0kS48c/s3EtdArkimctY7h3nHicQeEUdjJzYVJYR3ct3kWSafmn6jkNCA8InbUdge6PVx6keqjk5lVGJf99g==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.57.1.tgz",
+      "integrity": "sha512-IEQTCHeiTOnAUC3IDQdzRAGj3jOAYNr9kBguI7MQAAZK3caezRrg0GxAb6Hchg4lxdZEI5Oq3iov/w/hnFWY9Q==",
       "cpu": [
         "x64"
       ],
@@ -357,9 +360,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.44.0.tgz",
-      "integrity": "sha512-x+e/Z9H0RAWckn4V2OZZl6EmV0L2diuX3QB0uM1r6BvhUIv6xBPL5mrAX2E3e8N8rEHVPwFfz/ETUbV4oW9+lQ==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.57.1.tgz",
+      "integrity": "sha512-F8sWbhZ7tyuEfsmOxwc2giKDQzN3+kuBLPwwZGyVkLlKGdV1nvnNwYD0fKQ8+XS6hp9nY7B+ZeK01EBUE7aHaw==",
       "cpu": [
         "arm"
       ],
@@ -371,9 +374,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.44.0.tgz",
-      "integrity": "sha512-1exwiBFf4PU/8HvI8s80icyCcnAIB86MCBdst51fwFmH5dyeoWVPVgmQPcKrMtBQ0W5pAs7jBCWuRXgEpRzSCg==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.57.1.tgz",
+      "integrity": "sha512-rGfNUfn0GIeXtBP1wL5MnzSj98+PZe/AXaGBCRmT0ts80lU5CATYGxXukeTX39XBKsxzFpEeK+Mrp9faXOlmrw==",
       "cpu": [
         "arm"
       ],
@@ -385,9 +388,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.44.0.tgz",
-      "integrity": "sha512-ZTR2mxBHb4tK4wGf9b8SYg0Y6KQPjGpR4UWwTFdnmjB4qRtoATZ5dWn3KsDwGa5Z2ZBOE7K52L36J9LueKBdOQ==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.57.1.tgz",
+      "integrity": "sha512-MMtej3YHWeg/0klK2Qodf3yrNzz6CGjo2UntLvk2RSPlhzgLvYEB3frRvbEF2wRKh1Z2fDIg9KRPe1fawv7C+g==",
       "cpu": [
         "arm64"
       ],
@@ -399,9 +402,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.44.0.tgz",
-      "integrity": "sha512-GFWfAhVhWGd4r6UxmnKRTBwP1qmModHtd5gkraeW2G490BpFOZkFtem8yuX2NyafIP/mGpRJgTJ2PwohQkUY/Q==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.57.1.tgz",
+      "integrity": "sha512-1a/qhaaOXhqXGpMFMET9VqwZakkljWHLmZOX48R0I/YLbhdxr1m4gtG1Hq7++VhVUmf+L3sTAf9op4JlhQ5u1Q==",
       "cpu": [
         "arm64"
       ],
@@ -412,10 +415,10 @@
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.44.0.tgz",
-      "integrity": "sha512-xw+FTGcov/ejdusVOqKgMGW3c4+AgqrfvzWEVXcNP6zq2ue+lsYUgJ+5Rtn/OTJf7e2CbgTFvzLW2j0YAtj0Gg==",
+    "node_modules/@rollup/rollup-linux-loong64-gnu": {
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.57.1.tgz",
+      "integrity": "sha512-QWO6RQTZ/cqYtJMtxhkRkidoNGXc7ERPbZN7dVW5SdURuLeVU7lwKMpo18XdcmpWYd0qsP1bwKPf7DNSUinhvA==",
       "cpu": [
         "loong64"
       ],
@@ -426,10 +429,38 @@
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.44.0.tgz",
-      "integrity": "sha512-bKGibTr9IdF0zr21kMvkZT4K6NV+jjRnBoVMt2uNMG0BYWm3qOVmYnXKzx7UhwrviKnmK46IKMByMgvpdQlyJQ==",
+    "node_modules/@rollup/rollup-linux-loong64-musl": {
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.57.1.tgz",
+      "integrity": "sha512-xpObYIf+8gprgWaPP32xiN5RVTi/s5FCR+XMXSKmhfoJjrpRAjCuuqQXyxUa/eJTdAE6eJ+KDKaoEqjZQxh3Gw==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.57.1.tgz",
+      "integrity": "sha512-4BrCgrpZo4hvzMDKRqEaW1zeecScDCR+2nZ86ATLhAoJ5FQ+lbHVD3ttKe74/c7tNT9c6F2viwB3ufwp01Oh2w==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-musl": {
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.57.1.tgz",
+      "integrity": "sha512-NOlUuzesGauESAyEYFSe3QTUguL+lvrN1HtwEEsU2rOwdUDeTMJdO5dUYl/2hKf9jWydJrO9OL/XSSf65R5+Xw==",
       "cpu": [
         "ppc64"
       ],
@@ -441,9 +472,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.44.0.tgz",
-      "integrity": "sha512-vV3cL48U5kDaKZtXrti12YRa7TyxgKAIDoYdqSIOMOFBXqFj2XbChHAtXquEn2+n78ciFgr4KIqEbydEGPxXgA==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.57.1.tgz",
+      "integrity": "sha512-ptA88htVp0AwUUqhVghwDIKlvJMD/fmL/wrQj99PRHFRAG6Z5nbWoWG4o81Nt9FT+IuqUQi+L31ZKAFeJ5Is+A==",
       "cpu": [
         "riscv64"
       ],
@@ -455,9 +486,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-musl": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.44.0.tgz",
-      "integrity": "sha512-TDKO8KlHJuvTEdfw5YYFBjhFts2TR0VpZsnLLSYmB7AaohJhM8ctDSdDnUGq77hUh4m/djRafw+9zQpkOanE2Q==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.57.1.tgz",
+      "integrity": "sha512-S51t7aMMTNdmAMPpBg7OOsTdn4tySRQvklmL3RpDRyknk87+Sp3xaumlatU+ppQ+5raY7sSTcC2beGgvhENfuw==",
       "cpu": [
         "riscv64"
       ],
@@ -469,9 +500,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.44.0.tgz",
-      "integrity": "sha512-8541GEyktXaw4lvnGp9m84KENcxInhAt6vPWJ9RodsB/iGjHoMB2Pp5MVBCiKIRxrxzJhGCxmNzdu+oDQ7kwRA==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.57.1.tgz",
+      "integrity": "sha512-Bl00OFnVFkL82FHbEqy3k5CUCKH6OEJL54KCyx2oqsmZnFTR8IoNqBF+mjQVcRCT5sB6yOvK8A37LNm/kPJiZg==",
       "cpu": [
         "s390x"
       ],
@@ -483,9 +514,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.44.0.tgz",
-      "integrity": "sha512-iUVJc3c0o8l9Sa/qlDL2Z9UP92UZZW1+EmQ4xfjTc1akr0iUFZNfxrXJ/R1T90h/ILm9iXEY6+iPrmYB3pXKjw==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.57.1.tgz",
+      "integrity": "sha512-ABca4ceT4N+Tv/GtotnWAeXZUZuM/9AQyCyKYyKnpk4yoA7QIAuBt6Hkgpw8kActYlew2mvckXkvx0FfoInnLg==",
       "cpu": [
         "x64"
       ],
@@ -497,9 +528,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.44.0.tgz",
-      "integrity": "sha512-PQUobbhLTQT5yz/SPg116VJBgz+XOtXt8D1ck+sfJJhuEsMj2jSej5yTdp8CvWBSceu+WW+ibVL6dm0ptG5fcA==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.57.1.tgz",
+      "integrity": "sha512-HFps0JeGtuOR2convgRRkHCekD7j+gdAuXM+/i6kGzQtFhlCtQkpwtNzkNj6QhCDp7DRJ7+qC/1Vg2jt5iSOFw==",
       "cpu": [
         "x64"
       ],
@@ -510,10 +541,38 @@
         "linux"
       ]
     },
+    "node_modules/@rollup/rollup-openbsd-x64": {
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.57.1.tgz",
+      "integrity": "sha512-H+hXEv9gdVQuDTgnqD+SQffoWoc0Of59AStSzTEj/feWTBAnSfSD3+Dql1ZruJQxmykT/JVY0dE8Ka7z0DH1hw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-openharmony-arm64": {
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.57.1.tgz",
+      "integrity": "sha512-4wYoDpNg6o/oPximyc/NG+mYUejZrCU2q+2w6YZqrAs2UcNUChIZXjtafAiiZSUc7On8v5NyNj34Kzj/Ltk6dQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ]
+    },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.44.0.tgz",
-      "integrity": "sha512-M0CpcHf8TWn+4oTxJfh7LQuTuaYeXGbk0eageVjQCKzYLsajWS/lFC94qlRqOlyC2KvRT90ZrfXULYmukeIy7w==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.57.1.tgz",
+      "integrity": "sha512-O54mtsV/6LW3P8qdTcamQmuC990HDfR71lo44oZMZlXU4tzLrbvTii87Ni9opq60ds0YzuAlEr/GNwuNluZyMQ==",
       "cpu": [
         "arm64"
       ],
@@ -525,9 +584,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.44.0.tgz",
-      "integrity": "sha512-3XJ0NQtMAXTWFW8FqZKcw3gOQwBtVWP/u8TpHP3CRPXD7Pd6s8lLdH3sHWh8vqKCyyiI8xW5ltJScQmBU9j7WA==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.57.1.tgz",
+      "integrity": "sha512-P3dLS+IerxCT/7D2q2FYcRdWRl22dNbrbBEtxdWhXrfIMPP9lQhb5h4Du04mdl5Woq05jVCDPCMF7Ub0NAjIew==",
       "cpu": [
         "ia32"
       ],
@@ -538,10 +597,24 @@
         "win32"
       ]
     },
+    "node_modules/@rollup/rollup-win32-x64-gnu": {
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.57.1.tgz",
+      "integrity": "sha512-VMBH2eOOaKGtIJYleXsi2B8CPVADrh+TyNxJ4mWPnKfLB/DBUmzW+5m1xUrcwWoMfSLagIRpjUFeW5CO5hyciQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.44.0.tgz",
-      "integrity": "sha512-Q2Mgwt+D8hd5FIPUuPDsvPR7Bguza6yTkJxspDGkZj7tBRn2y4KSWYuIXpftFSjBra76TbKerCV7rgFPQrn+wQ==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.57.1.tgz",
+      "integrity": "sha512-mxRFDdHIWRxg3UfIIAwCm6NzvxG0jDX/wBN6KsQFTvKFqqg9vTrWUE68qEjHt19A5wwx5X5aUi2zuZT7YR0jrA==",
       "cpu": [
         "x64"
       ],
@@ -557,6 +630,7 @@
       "resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-5.60.8.tgz",
       "integrity": "sha512-VjFgDF/eB+Aklcy15TtOTLQeMjTo07k7KAjql8OK5Dirr7a6sJY4T1uVBDuTVG9VEmn1uUsohOpYnVfgC6/jyw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/tern": "*"
       }
@@ -566,6 +640,7 @@
       "resolved": "https://registry.npmjs.org/@types/d3/-/d3-7.4.3.tgz",
       "integrity": "sha512-lZXZ9ckh5R8uiFVt8ogUNf+pIrK4EsWrx2Np75WvF/eTpJ0FMHNhjXk8CKEx/+gpHbNQyJWehbFaTvqmHWB3ww==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-array": "*",
         "@types/d3-axis": "*",
@@ -600,16 +675,18 @@
       }
     },
     "node_modules/@types/d3-array": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.1.tgz",
-      "integrity": "sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg==",
-      "dev": true
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.2.tgz",
+      "integrity": "sha512-hOLWVbm7uRza0BYXpIIW5pxfrKe0W+D5lrFiAEYR+pb6w3N2SwSMaJbXdUfSEv+dT4MfHBLtn5js0LAWaO6otw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-axis": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/@types/d3-axis/-/d3-axis-3.0.6.tgz",
       "integrity": "sha512-pYeijfZuBd87T0hGn0FO1vQ/cgLk6E1ALJjfkC0oJ8cbwkZl3TpgS8bVBLZN+2jjGgg38epgxb2zmoGtSfvgMw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-selection": "*"
       }
@@ -619,6 +696,7 @@
       "resolved": "https://registry.npmjs.org/@types/d3-brush/-/d3-brush-3.0.6.tgz",
       "integrity": "sha512-nH60IZNNxEcrh6L1ZSMNA28rj27ut/2ZmI3r96Zd+1jrZD++zD3LsMIjWlvg4AYrHn/Pqz4CF3veCxGjtbqt7A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-selection": "*"
       }
@@ -627,19 +705,22 @@
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/@types/d3-chord/-/d3-chord-3.0.6.tgz",
       "integrity": "sha512-LFYWWd8nwfwEmTZG9PfQxd17HbNPksHBiJHaKuY1XeqscXacsS2tyoo6OdRsjf+NQYeB6XrNL3a25E3gH69lcg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-color": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz",
       "integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-contour": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/@types/d3-contour/-/d3-contour-3.0.6.tgz",
       "integrity": "sha512-BjzLgXGnCWjUSYGfH1cpdo41/hgdWETu4YxpezoztawmqsvCeep+8QGfiY6YbDvfgHz/DkjeIkkZVJavB4a3rg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-array": "*",
         "@types/geojson": "*"
@@ -649,19 +730,22 @@
       "version": "6.0.4",
       "resolved": "https://registry.npmjs.org/@types/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
       "integrity": "sha512-ZMaSKu4THYCU6sV64Lhg6qjf1orxBthaC161plr5KuPHo3CNm8DTHiLw/5Eq2b6TsNP0W0iJrUOFscY6Q450Hw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-dispatch": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@types/d3-dispatch/-/d3-dispatch-3.0.6.tgz",
-      "integrity": "sha512-4fvZhzMeeuBJYZXRXrRIQnvUYfyXwYmLsdiN7XXmVNQKKw1cM8a5WdID0g1hVFZDqT9ZqZEY5pD44p24VS7iZQ==",
-      "dev": true
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-dispatch/-/d3-dispatch-3.0.7.tgz",
+      "integrity": "sha512-5o9OIAdKkhN1QItV2oqaE5KMIiXAvDWBDPrD85e58Qlz1c1kI/J0NcqbEG88CoTwJrYe7ntUCVfeUl2UJKbWgA==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-drag": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/@types/d3-drag/-/d3-drag-3.0.7.tgz",
       "integrity": "sha512-HE3jVKlzU9AaMazNufooRJ5ZpWmLIoc90A37WU2JMmeq28w1FQqCZswHZ3xR+SuxYftzHq6WU6KJHvqxKzTxxQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-selection": "*"
       }
@@ -670,19 +754,22 @@
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/@types/d3-dsv/-/d3-dsv-3.0.7.tgz",
       "integrity": "sha512-n6QBF9/+XASqcKK6waudgL0pf/S5XHPPI8APyMLLUHd8NqouBGLsU8MgtO7NINGtPBtk9Kko/W4ea0oAspwh9g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-ease": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.2.tgz",
       "integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-fetch": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/@types/d3-fetch/-/d3-fetch-3.0.7.tgz",
       "integrity": "sha512-fTAfNmxSb9SOWNB9IoG5c8Hg6R+AzUHDRlsXsDZsNp6sxAEOP0tkP3gKkNSO/qmHPoBFTxNrjDprVHDQDvo5aA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-dsv": "*"
       }
@@ -691,19 +778,22 @@
       "version": "3.0.10",
       "resolved": "https://registry.npmjs.org/@types/d3-force/-/d3-force-3.0.10.tgz",
       "integrity": "sha512-ZYeSaCF3p73RdOKcjj+swRlZfnYpK1EbaDiYICEEp5Q6sUiqFaFQ9qgoshp5CzIyyb/yD09kD9o2zEltCexlgw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-format": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/@types/d3-format/-/d3-format-3.0.4.tgz",
       "integrity": "sha512-fALi2aI6shfg7vM5KiR1wNJnZ7r6UuggVqtDA+xiEdPZQwy/trcQaHnwShLuLdta2rTymCNpxYTiMZX/e09F4g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-geo": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-3.1.0.tgz",
       "integrity": "sha512-856sckF0oP/diXtS4jNsiQw/UuK5fQG8l/a9VVLeSouf1/PPbBE1i1W852zVwKwYCBkFJJB7nCFTbk6UMEXBOQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/geojson": "*"
       }
@@ -712,13 +802,15 @@
       "version": "3.1.7",
       "resolved": "https://registry.npmjs.org/@types/d3-hierarchy/-/d3-hierarchy-3.1.7.tgz",
       "integrity": "sha512-tJFtNoYBtRtkNysX1Xq4sxtjK8YgoWUNpIiUee0/jHGRwqvzYxkq0hGVbbOGSz+JgFxxRu4K8nb3YpG3CMARtg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-interpolate": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz",
       "integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-color": "*"
       }
@@ -727,31 +819,36 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.1.tgz",
       "integrity": "sha512-VMZBYyQvbGmWyWVea0EHs/BwLgxc+MKi1zLDCONksozI4YJMcTt8ZEuIR4Sb1MMTE8MMW49v0IwI5+b7RmfWlg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-polygon": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/@types/d3-polygon/-/d3-polygon-3.0.2.tgz",
       "integrity": "sha512-ZuWOtMaHCkN9xoeEMr1ubW2nGWsp4nIql+OPQRstu4ypeZ+zk3YKqQT0CXVe/PYqrKpZAi+J9mTs05TKwjXSRA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-quadtree": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/@types/d3-quadtree/-/d3-quadtree-3.0.6.tgz",
       "integrity": "sha512-oUzyO1/Zm6rsxKRHA1vH0NEDG58HrT5icx/azi9MF1TWdtttWl0UIUsjEQBBh+SIkrpd21ZjEv7ptxWys1ncsg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-random": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/@types/d3-random/-/d3-random-3.0.3.tgz",
       "integrity": "sha512-Imagg1vJ3y76Y2ea0871wpabqp613+8/r0mCLEBfdtqC7xMSfj9idOnmBYyMoULfHePJyxMAw3nWhJxzc+LFwQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-scale": {
       "version": "4.0.9",
       "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.9.tgz",
       "integrity": "sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-time": "*"
       }
@@ -760,19 +857,22 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
       "integrity": "sha512-iWMJgwkK7yTRmWqRB5plb1kadXyQ5Sj8V/zYlFGMUBbIPKQScw+Dku9cAAMgJG+z5GYDoMjWGLVOvjghDEFnKQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-selection": {
       "version": "3.0.11",
       "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.11.tgz",
       "integrity": "sha512-bhAXu23DJWsrI45xafYpkQ4NtcKMwWnAC/vKrd2l+nxMFuvOT3XMYTIj2opv8vq8AO5Yh7Qac/nSeP/3zjTK0w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-shape": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.7.tgz",
-      "integrity": "sha512-VLvUQ33C+3J+8p+Daf+nYSOsjB4GXp19/S/aGo60m9h1v6XaxjiT82lKVWJCfzhtuZ3yD7i/TPeC/fuKLLOSmg==",
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.8.tgz",
+      "integrity": "sha512-lae0iWfcDeR7qt7rA88BNiqdvPS5pFVPpo5OfjElwNaT2yyekbM0C9vK+yqBqEmHr6lDkRnYNoTBYlAgJa7a4w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-path": "*"
       }
@@ -781,25 +881,29 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.4.tgz",
       "integrity": "sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-time-format": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-4.0.3.tgz",
       "integrity": "sha512-5xg9rC+wWL8kdDj153qZcsJ0FWiFt0J5RB6LYUNZjwSnesfblqrI/bJ1wBdJ8OQfncgbJG5+2F+qfqnqyzYxyg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-timer": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.2.tgz",
       "integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-transition": {
       "version": "3.0.9",
       "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-3.0.9.tgz",
       "integrity": "sha512-uZS5shfxzO3rGlu0cC3bjmMFKsXv+SmZZcgp0KD22ts4uGXp5EVYGzu/0YdwZeKmddhcAccYtREJKkPfXkZuCg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-selection": "*"
       }
@@ -809,6 +913,7 @@
       "resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-3.0.8.tgz",
       "integrity": "sha512-iqMC4/YlFCSlO8+2Ii1GGGliCAY4XdeG748w5vQUbevlbDu0zSjH/+jojorQVBK/se0j6DUFNPBGSqD3YWYnDw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-interpolate": "*",
         "@types/d3-selection": "*"
@@ -826,6 +931,7 @@
       "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.1.5.tgz",
       "integrity": "sha512-0dzKcwO+S8s2kuF5Z9oUWatQJj5Uq/iqphEtE3GQJVRRYm/tD1LglU2UnXi2A8jLq5umkGouOXOR9y0n613ZwQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -834,13 +940,15 @@
       "version": "7946.0.16",
       "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz",
       "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/glob": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
       "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/minimatch": "*",
         "@types/node": "*"
@@ -850,44 +958,49 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
       "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "24.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.0.3.tgz",
-      "integrity": "sha512-R4I/kzCYAdRLzfiCabn9hxWfbuHS573x+r0dJMkkzThEa7pbrcDWK+9zu3e7aBOouf+rQAciqPFMnxwr0aWgKg==",
+      "version": "24.10.13",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.13.tgz",
+      "integrity": "sha512-oH72nZRfDv9lADUBSo104Aq7gPHpQZc4BTx38r9xf9pg5LfP6EzSyH2n7qFmmxRQXh7YlUXODcYsg6PuTDSxGg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~7.8.0"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/@types/resolve": {
       "version": "1.20.2",
       "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz",
       "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/sprintf-js": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/@types/sprintf-js/-/sprintf-js-1.1.4.tgz",
       "integrity": "sha512-aWK1reDYWxcjgcIIPmQi3u+OQDuYa9b+lr6eIsGWrekJ9vr1NSjr4Eab8oQ1iKuH1ltFHpXGyerAv1a3FMKxzQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/tern": {
       "version": "0.23.9",
       "resolved": "https://registry.npmjs.org/@types/tern/-/tern-0.23.9.tgz",
       "integrity": "sha512-ypzHFE/wBzh+BlH6rrBgS5I/Z7RD21pGhZ2rltb/+ZrVM1awdZwjx7hE5XfuYgHWk9uvV5HLZN3SloevCAp3Bw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/estree": "*"
       }
     },
     "node_modules/acorn": {
-      "version": "8.14.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
-      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+      "version": "8.15.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -900,6 +1013,7 @@
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
       "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -908,13 +1022,15 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -925,6 +1041,7 @@
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
       "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fill-range": "^7.1.1"
       },
@@ -936,18 +1053,21 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/colorette": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz",
       "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/commander": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
       "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "license": "MIT",
       "engines": {
         "node": ">= 10"
       }
@@ -956,18 +1076,29 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
       "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/crelt": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
+      "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/d3": {
       "version": "7.9.0",
       "resolved": "https://registry.npmjs.org/d3/-/d3-7.9.0.tgz",
       "integrity": "sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA==",
+      "license": "ISC",
       "dependencies": {
         "d3-array": "3",
         "d3-axis": "3",
@@ -1008,6 +1139,7 @@
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
       "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
+      "license": "ISC",
       "dependencies": {
         "internmap": "1 - 2"
       },
@@ -1019,6 +1151,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz",
       "integrity": "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1027,6 +1160,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz",
       "integrity": "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==",
+      "license": "ISC",
       "dependencies": {
         "d3-dispatch": "1 - 3",
         "d3-drag": "2 - 3",
@@ -1042,6 +1176,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz",
       "integrity": "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==",
+      "license": "ISC",
       "dependencies": {
         "d3-path": "1 - 3"
       },
@@ -1053,6 +1188,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
       "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1061,6 +1197,7 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-4.0.2.tgz",
       "integrity": "sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==",
+      "license": "ISC",
       "dependencies": {
         "d3-array": "^3.2.0"
       },
@@ -1072,6 +1209,7 @@
       "version": "6.0.4",
       "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
       "integrity": "sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==",
+      "license": "ISC",
       "dependencies": {
         "delaunator": "5"
       },
@@ -1083,6 +1221,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
       "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1091,6 +1230,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz",
       "integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==",
+      "license": "ISC",
       "dependencies": {
         "d3-dispatch": "1 - 3",
         "d3-selection": "3"
@@ -1103,6 +1243,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz",
       "integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==",
+      "license": "ISC",
       "dependencies": {
         "commander": "7",
         "iconv-lite": "0.6",
@@ -1127,6 +1268,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
       "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=12"
       }
@@ -1135,6 +1277,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz",
       "integrity": "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==",
+      "license": "ISC",
       "dependencies": {
         "d3-dsv": "1 - 3"
       },
@@ -1146,6 +1289,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz",
       "integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==",
+      "license": "ISC",
       "dependencies": {
         "d3-dispatch": "1 - 3",
         "d3-quadtree": "1 - 3",
@@ -1156,9 +1300,10 @@
       }
     },
     "node_modules/d3-format": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz",
-      "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.2.tgz",
+      "integrity": "sha512-AJDdYOdnyRDV5b6ArilzCPPwc1ejkHcoyFarqlPqT7zRYjhavcT3uSrqcMvsgh2CgoPbK3RCwyHaVyxYcP2Arg==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1167,6 +1312,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz",
       "integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==",
+      "license": "ISC",
       "dependencies": {
         "d3-array": "2.5.0 - 3"
       },
@@ -1178,6 +1324,7 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz",
       "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1186,6 +1333,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
       "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
+      "license": "ISC",
       "dependencies": {
         "d3-color": "1 - 3"
       },
@@ -1197,6 +1345,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
       "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1205,6 +1354,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz",
       "integrity": "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1213,6 +1363,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz",
       "integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1221,6 +1372,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz",
       "integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1229,6 +1381,7 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
       "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
+      "license": "ISC",
       "dependencies": {
         "d3-array": "2.10.0 - 3",
         "d3-format": "1 - 3",
@@ -1244,6 +1397,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
       "integrity": "sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==",
+      "license": "ISC",
       "dependencies": {
         "d3-color": "1 - 3",
         "d3-interpolate": "1 - 3"
@@ -1256,6 +1410,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz",
       "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1264,6 +1419,7 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
       "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
+      "license": "ISC",
       "dependencies": {
         "d3-path": "^3.1.0"
       },
@@ -1275,6 +1431,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
       "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
+      "license": "ISC",
       "dependencies": {
         "d3-array": "2 - 3"
       },
@@ -1286,6 +1443,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
       "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
+      "license": "ISC",
       "dependencies": {
         "d3-time": "1 - 3"
       },
@@ -1297,6 +1455,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
       "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1305,6 +1464,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz",
       "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==",
+      "license": "ISC",
       "dependencies": {
         "d3-color": "1 - 3",
         "d3-dispatch": "1 - 3",
@@ -1323,6 +1483,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz",
       "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==",
+      "license": "ISC",
       "dependencies": {
         "d3-dispatch": "1 - 3",
         "d3-drag": "2 - 3",
@@ -1339,6 +1500,7 @@
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
       "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1347,6 +1509,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.1.tgz",
       "integrity": "sha512-8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw==",
+      "license": "ISC",
       "dependencies": {
         "robust-predicates": "^3.0.2"
       }
@@ -1356,6 +1519,7 @@
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
       "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-type": "^4.0.0"
       },
@@ -1367,13 +1531,15 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
       "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/fast-glob": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
       "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
@@ -1386,19 +1552,24 @@
       }
     },
     "node_modules/fastq": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
-      "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz",
+      "integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "reusify": "^1.0.4"
       }
     },
     "node_modules/fdir": {
-      "version": "6.4.4",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz",
-      "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
       "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.0.0"
+      },
       "peerDependencies": {
         "picomatch": "^3 || ^4"
       },
@@ -1413,6 +1584,7 @@
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
       "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -1425,6 +1597,7 @@
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
       "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.0",
         "jsonfile": "^4.0.0",
@@ -1438,7 +1611,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/fsevents": {
       "version": "2.3.3",
@@ -1446,6 +1620,7 @@
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -1459,6 +1634,7 @@
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
       "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -1467,8 +1643,9 @@
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -1489,6 +1666,7 @@
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -1501,6 +1679,7 @@
       "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.1.tgz",
       "integrity": "sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/glob": "^7.1.1",
         "array-union": "^2.1.0",
@@ -1519,13 +1698,15 @@
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/hasown": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
       "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.2"
       },
@@ -1537,6 +1718,7 @@
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
       "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
@@ -1549,6 +1731,7 @@
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
       "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
@@ -1559,6 +1742,7 @@
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
       "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -1568,12 +1752,14 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/internmap": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
       "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1583,6 +1769,7 @@
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
       "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "hasown": "^2.0.2"
       },
@@ -1598,6 +1785,7 @@
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1607,6 +1795,7 @@
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -1618,13 +1807,15 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
       "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
@@ -1634,6 +1825,7 @@
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.1.tgz",
       "integrity": "sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1643,6 +1835,7 @@
       "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
       "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/estree": "*"
       }
@@ -1651,6 +1844,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/jsep/-/jsep-1.4.0.tgz",
       "integrity": "sha512-B7qPcEVE3NVkmSJbaYxvv4cHkVW7DQsZz13pUMrfS8z8Q/BuShN+gcTXrUlPiGqM2/t/EEaI030bpxMqY8gMlw==",
+      "license": "MIT",
       "engines": {
         "node": ">= 10.16.0"
       }
@@ -1660,17 +1854,19 @@
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
       "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
       "dev": true,
+      "license": "MIT",
       "optionalDependencies": {
         "graceful-fs": "^4.1.6"
       }
     },
     "node_modules/magic-string": {
-      "version": "0.30.17",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
-      "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
+      "version": "0.30.21",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
+      "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.5.0"
+        "@jridgewell/sourcemap-codec": "^1.5.5"
       }
     },
     "node_modules/merge2": {
@@ -1678,6 +1874,7 @@
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
       "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
@@ -1687,6 +1884,7 @@
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
       "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "braces": "^3.0.3",
         "picomatch": "^2.3.1"
@@ -1700,6 +1898,7 @@
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8.6"
       },
@@ -1712,6 +1911,7 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -1724,14 +1924,15 @@
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
       "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "*"
       }
     },
     "node_modules/obsidian": {
-      "version": "1.8.7",
+      "version": "1.12.0",
       "resolved": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-      "integrity": "sha512-0yByIRBSLYSpg0PrVhysWyRU55BrsaJl484RmRX2lM4AJ7VVMy/8jC9aj7VfW7D+1Iy4h1iUACGbIqdFjlUo+Q==",
+      "integrity": "sha512-y1XtnfQKldoFKmVEbqf20jYnQ9Nhhn6hEWxodkNMG9jO9xjyLAY2ELgPuxLAxNJ/AP+FIhVjGIHuNkHqzTokJg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1739,8 +1940,8 @@
         "moment": "2.29.4"
       },
       "peerDependencies": {
-        "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.0.0"
+        "@codemirror/state": "6.5.0",
+        "@codemirror/view": "6.38.6"
       }
     },
     "node_modules/once": {
@@ -1748,6 +1949,7 @@
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "wrappy": "1"
       }
@@ -1757,6 +1959,7 @@
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1765,22 +1968,25 @@
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/path-type": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/picomatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
-      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -1806,24 +2012,27 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "^5.1.0"
       }
     },
     "node_modules/resolve": {
-      "version": "1.22.10",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
-      "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
+      "version": "1.22.11",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz",
+      "integrity": "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-core-module": "^2.16.0",
+        "is-core-module": "^2.16.1",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
@@ -1842,6 +2051,7 @@
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
       "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "iojs": ">=1.0.0",
         "node": ">=0.10.0"
@@ -1850,12 +2060,13 @@
     "node_modules/robust-predicates": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.2.tgz",
-      "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="
+      "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==",
+      "license": "Unlicense"
     },
     "node_modules/rollup": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.44.0.tgz",
-      "integrity": "sha512-qHcdEzLCiktQIfwBq420pn2dP+30uzqYxv9ETm91wdt2R9AFcWfjNAmje4NWlnCIQ5RMTzVf0ZyisOKqHR6RwA==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.57.1.tgz",
+      "integrity": "sha512-oQL6lgK3e2QZeQ7gcgIkS2YZPg5slw37hYufJ3edKlfQSGGm8ICoxswK15ntSzF/a8+h7ekRy7k7oWc3BQ7y8A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1869,26 +2080,31 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.44.0",
-        "@rollup/rollup-android-arm64": "4.44.0",
-        "@rollup/rollup-darwin-arm64": "4.44.0",
-        "@rollup/rollup-darwin-x64": "4.44.0",
-        "@rollup/rollup-freebsd-arm64": "4.44.0",
-        "@rollup/rollup-freebsd-x64": "4.44.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.44.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.44.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.44.0",
-        "@rollup/rollup-linux-arm64-musl": "4.44.0",
-        "@rollup/rollup-linux-loongarch64-gnu": "4.44.0",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.44.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.44.0",
-        "@rollup/rollup-linux-riscv64-musl": "4.44.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.44.0",
-        "@rollup/rollup-linux-x64-gnu": "4.44.0",
-        "@rollup/rollup-linux-x64-musl": "4.44.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.44.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.44.0",
-        "@rollup/rollup-win32-x64-msvc": "4.44.0",
+        "@rollup/rollup-android-arm-eabi": "4.57.1",
+        "@rollup/rollup-android-arm64": "4.57.1",
+        "@rollup/rollup-darwin-arm64": "4.57.1",
+        "@rollup/rollup-darwin-x64": "4.57.1",
+        "@rollup/rollup-freebsd-arm64": "4.57.1",
+        "@rollup/rollup-freebsd-x64": "4.57.1",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.57.1",
+        "@rollup/rollup-linux-arm-musleabihf": "4.57.1",
+        "@rollup/rollup-linux-arm64-gnu": "4.57.1",
+        "@rollup/rollup-linux-arm64-musl": "4.57.1",
+        "@rollup/rollup-linux-loong64-gnu": "4.57.1",
+        "@rollup/rollup-linux-loong64-musl": "4.57.1",
+        "@rollup/rollup-linux-ppc64-gnu": "4.57.1",
+        "@rollup/rollup-linux-ppc64-musl": "4.57.1",
+        "@rollup/rollup-linux-riscv64-gnu": "4.57.1",
+        "@rollup/rollup-linux-riscv64-musl": "4.57.1",
+        "@rollup/rollup-linux-s390x-gnu": "4.57.1",
+        "@rollup/rollup-linux-x64-gnu": "4.57.1",
+        "@rollup/rollup-linux-x64-musl": "4.57.1",
+        "@rollup/rollup-openbsd-x64": "4.57.1",
+        "@rollup/rollup-openharmony-arm64": "4.57.1",
+        "@rollup/rollup-win32-arm64-msvc": "4.57.1",
+        "@rollup/rollup-win32-ia32-msvc": "4.57.1",
+        "@rollup/rollup-win32-x64-gnu": "4.57.1",
+        "@rollup/rollup-win32-x64-msvc": "4.57.1",
         "fsevents": "~2.3.2"
       }
     },
@@ -1897,6 +2113,7 @@
       "resolved": "https://registry.npmjs.org/rollup-plugin-copy/-/rollup-plugin-copy-3.5.0.tgz",
       "integrity": "sha512-wI8D5dvYovRMx/YYKtUNt3Yxaw4ORC9xo6Gt9t22kveWz1enG9QrhVlagzwrxSC455xD1dHMKhIJkbsQ7d48BA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/fs-extra": "^8.0.1",
         "colorette": "^1.1.0",
@@ -1927,6 +2144,7 @@
           "url": "https://feross.org/support"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "queue-microtask": "^1.2.2"
       }
@@ -1934,7 +2152,8 @@
     "node_modules/rw": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
-      "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ=="
+      "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==",
+      "license": "BSD-3-Clause"
     },
     "node_modules/safe-buffer": {
       "version": "5.2.1",
@@ -1954,18 +2173,21 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "license": "MIT"
     },
     "node_modules/serialize-javascript": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
       "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "randombytes": "^2.1.0"
       }
@@ -1975,6 +2197,7 @@
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -1983,13 +2206,15 @@
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/smob/-/smob-1.5.0.tgz",
       "integrity": "sha512-g6T+p7QO8npa+/hNx9ohv1E5pVCmWrVCUzUXJyLdMmftX6ER0oiWY/w9knEonLpnOp6b6FenKnMfR8gqwWdwig==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1999,6 +2224,7 @@
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
       "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -2007,13 +2233,15 @@
     "node_modules/sprintf-js": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
-      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="
+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+      "license": "BSD-3-Clause"
     },
     "node_modules/style-mod": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.2.tgz",
-      "integrity": "sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.3.tgz",
+      "integrity": "sha512-i/n8VsZydrugj3Iuzll8+x/00GH2vnYsk1eomD8QiRrSAeW6ItbCQDtfXCeJHd0iwiNagqjQkvpvREEPtW3IoQ==",
       "dev": true,
+      "license": "MIT",
       "peer": true
     },
     "node_modules/supports-preserve-symlinks-flag": {
@@ -2021,6 +2249,7 @@
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -2029,13 +2258,14 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.39.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.39.0.tgz",
-      "integrity": "sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==",
+      "version": "5.46.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.46.0.tgz",
+      "integrity": "sha512-jTwoImyr/QbOWFFso3YoU3ik0jBBDJ6JTOQiy/J2YxVJdZCc+5u7skhNwiOR3FQIygFqVUPHl7qbbxtjW2K3Qg==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
-        "acorn": "^8.8.2",
+        "acorn": "^8.15.0",
         "commander": "^2.20.0",
         "source-map-support": "~0.5.20"
       },
@@ -2050,13 +2280,15 @@
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -2068,13 +2300,15 @@
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-      "dev": true
+      "dev": true,
+      "license": "0BSD"
     },
     "node_modules/typescript": {
-      "version": "5.8.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
-      "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
+      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "dev": true,
+      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -2084,9 +2318,9 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "7.8.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz",
-      "integrity": "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
       "dev": true,
       "license": "MIT"
     },
@@ -2095,6 +2329,7 @@
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
       "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4.0.0"
       }
@@ -2104,13 +2339,15 @@
       "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
       "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==",
       "dev": true,
+      "license": "MIT",
       "peer": true
     },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     }
   }
 }

From eed489e3a3087e6c18163215dc3ac0e4f19ebb5b Mon Sep 17 00:00:00 2001
From: curious-archaea <stellate.flowers@proton.me>
Date: Tue, 10 Feb 2026 20:29:39 -0500
Subject: [PATCH 389/402] fix rollup error during build caused by inferred
 conflict between outDir and dir

---
 rollup.config.build.mjs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/rollup.config.build.mjs b/rollup.config.build.mjs
index d1c1841..85eae08 100644
--- a/rollup.config.build.mjs
+++ b/rollup.config.build.mjs
@@ -13,7 +13,15 @@ export default {
   },
   external: ['obsidian'],
   plugins: [
-    typescript(),
+    typescript({
+        // Added these lines to fix a rollup error: "Path of Typescript compiler option 'outDir' must be located inside Rollup 'dir' option."
+      tsconfig: 'tsconfig.json',
+      rootDir: 'src',
+        // outDir must be a subdirectory of Rollup's output.dir ('.') to satisfy @rollup/plugin-typescript's validation. 
+        // 'dist' is a placeholder, since TypeScript doesn't emit files here. Rollup handles all output.
+        // (there might be more elegant ways to deal with this - just not quite sure how.)
+      outDir: 'dist'
+    }),
     nodeResolve({browser: true}),
     commonjs(),
     terser()

From c9c99d440bdc8f2c7034467e61980a5b7460fec6 Mon Sep 17 00:00:00 2001
From: curious-archaea <stellate.flowers@proton.me>
Date: Wed, 18 Feb 2026 15:08:17 -0500
Subject: [PATCH 390/402] feat: support trackable list values in frontmatter

This allows users to search a custom YAML property containing a list for
a single search target. It extends the list search functionality available
via searchType: tag to other frontmatter properties.
Closes feature request #420

Changes include:
- Add searchType: frontmatterlist to check whether a specific value
  is present in a frontmatter key that holds a list.
- Add collectDataFromFrontmatterList to collecting.ts, based on
  collectDataFromFrontmatterTag
- Update documentation with usage examples for frontmatterlist
- Update examples vault with diary entries for test data and tests
  in TestFrontmatterList.md
- Version bump to 1.18.0

This should not change existing behavior unless the new feature is used.
---
 docs/Concepts.md                |  4 +-
 docs/Examples.md                |  2 +
 docs/TargetEvaluation.md        | 40 ++++++++++++++++-
 examples/TestFrontmatter.md     |  9 ++--
 examples/TestFrontmatterList.md | 76 +++++++++++++++++++++++++++++++++
 examples/diary/2026-02-08.md    |  3 ++
 examples/diary/2026-02-09.md    |  4 ++
 examples/diary/2026-02-10.md    |  4 ++
 examples/diary/2026-02-11.md    |  4 ++
 examples/diary/2026-02-12.md    |  3 ++
 examples/diary/2026-02-13.md    |  4 ++
 examples/diary/2026-02-14.md    |  7 +++
 examples/diary/2026-02-15.md    |  5 +++
 examples/diary/2026-02-16.md    |  6 +++
 examples/diary/2026-02-17.md    |  5 +++
 examples/diary/2026-02-18.md    |  4 ++
 manifest.json                   |  2 +-
 src/collecting.ts               | 47 ++++++++++++++++++++
 src/data.ts                     |  1 +
 src/main.ts                     | 13 ++++++
 src/parsing.ts                  |  4 ++
 versions.json                   |  3 +-
 22 files changed, 242 insertions(+), 8 deletions(-)
 create mode 100644 examples/TestFrontmatterList.md
 create mode 100644 examples/diary/2026-02-08.md
 create mode 100644 examples/diary/2026-02-09.md
 create mode 100644 examples/diary/2026-02-10.md
 create mode 100644 examples/diary/2026-02-11.md
 create mode 100644 examples/diary/2026-02-12.md
 create mode 100644 examples/diary/2026-02-13.md
 create mode 100644 examples/diary/2026-02-14.md
 create mode 100644 examples/diary/2026-02-15.md
 create mode 100644 examples/diary/2026-02-16.md
 create mode 100644 examples/diary/2026-02-17.md
 create mode 100644 examples/diary/2026-02-18.md

diff --git a/docs/Concepts.md b/docs/Concepts.md
index 159a718..a969891 100644
--- a/docs/Concepts.md
+++ b/docs/Concepts.md
@@ -6,11 +6,11 @@ This plugin was designed to read code blocks in [YAML format](https://en.wikiped
 
 ### Collecting Data
 
-Providing parameters `searchType` and `searchTarget` is the minimum requirement for a successful data collection. `searchType` can be `tag`, `frontmatter`, `wiki`, `dvField`, `table`, `fileMeta`, `task`, or `text`. Then the cooresponding `searchTarget` should be provided according to the specified type.
+Providing parameters `searchType` and `searchTarget` is the minimum requirement for a successful data collection. `searchType` can be `tag`, `frontmatter`, `frontmatterlist`, `wiki`, `dvField`, `table`, `fileMeta`, `task`, or `text`. Then the cooresponding `searchTarget` should be provided according to the specified type.
 
 ### Target Evaluation
 
-Depends on the `searchType` and the `searchTarget` you provided, the evaluation of a target would be different. Simply speaking, you can track the occurrences of a target or the value attached/embedded in it.
+Depending on the `searchType` and the `searchTarget` you provided, the evaluation of a target would be different. Simply speaking, you can track the occurrences of a target or the value attached/embedded in it.
 
 To see the detail about the target evaluation, please check the document [Target Evaluation](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TargetEvaluation.md).
 
diff --git a/docs/Examples.md b/docs/Examples.md
index b68f4e7..2d09417 100644
--- a/docs/Examples.md
+++ b/docs/Examples.md
@@ -35,6 +35,7 @@ Check where (Location) and what (Target to Track) is your target and find the se
 | content | - [x] Say love<br>- [ ] Say love | searchType:task<br>searchTarget: Say love | O |
 | content | - [x] Say love | searchType:task.done<br>searchTarget: Say love | O |
 | content | - [ ] Say love | searchType: task.notdone<br>searchTarget: Say love | O |
+| frontmatter | habits: spanish, piano, yoga<br>([more examples](https://github.com/curious-archaea/obsidian-tracker/blob/master/docs/TargetEvaluation.md#Formatting-property-values-in-frontmatter))| searchType: frontmatterlist<br>searchTarget: habits[spanish] | O |
 
 ## Full examples
 
@@ -54,6 +55,7 @@ List of all examples
 - [Dataview Inline Field](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDvField.md)
 - [Expression](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestExpression.md)
 - [File Meta](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestFileMeta.md)
+- [Frontmatter Lists](https://github.com/curious-archaea/obsidian-tracker/blob/master/examples/TestFrontmatterList.md) (New!)
 - [Legends](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestLegends.md)
 - [Multiple Targets / Multiple Values](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestMultipleTargetsMultipleValues.md)
 - [Pie Chart](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestPieChart.md)
diff --git a/docs/TargetEvaluation.md b/docs/TargetEvaluation.md
index 40beb65..3843988 100644
--- a/docs/TargetEvaluation.md
+++ b/docs/TargetEvaluation.md
@@ -1,6 +1,6 @@
 # Target Evaluation
 
-From the [input parameters](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md) you provided, the search targets dispersed in the notes will be counted or evaluated as a value. Tracker plugin supports eight kinds of `searchType`: `tag`, `frontmatter`, `wiki`, `text`, `table`, `dvField`, `task`, and `fileMeta`, dealing with different types of searching condition.
+From the [input parameters](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/InputParameters.md) you provided, the search targets dispersed in the notes will be counted or evaluated as a value. Tracker plugin supports nine kinds of `searchType`: `tag`, `frontmatter`, `frontmatterlist`, `wiki`, `text`, `table`, `dvField`, `task`, and `fileMeta`, dealing with different types of searching condition.
 
 ## Multiple Targets
 You can provide multiple search targets in code block by entering an array of targets separated by a comma under parameter `searchType` and `searchTarget`. Each of the targets will be identified in order and then the  values in notes will be evaluated and form a dataset indexed by that order in the array (zero-based indexing).
@@ -21,6 +21,8 @@ Many other parameters that accept multiple values (e.g. lineColor) can also be p
 
 Multiple values under a target (value tuple) separated by a slash, e.g. #bloodpressure:180/120mmHg, are supported after version 1.3.0. To identify a specific value as a target, use an accessor with bracket notation where the value in the bracket is the index by the order of values. In this case, they are bloodpressure[0] and bloodpressure[1]. You can find the example of this [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/BloodPressureTracker.md). You can also use a custom separator by using the parameter `separator`.
 
+**Note**: the bracket notation used with searchType: frontmatterlist (e.g. habits[yoga]) uses the same bracket syntax but serves a different purpose. It specifies a string value to match against a list, rather than a numeric index into a tuple. The two are not interchangeable.
+
 ## Search Target in Detail
 
 ### searchType: tag
@@ -51,6 +53,42 @@ mood: 10<br>
 ......<br>
 \-\-\-<br>
 
+### searchType: frontmatterlist
+This option is for vaultkeepers who want to use the same custom YAML property to track multiple targets. It is useful for tracking habits or categories recorded as a list in front matter fields *other* than tags.
+
+This search type checks whether a specific value is present in a frontmatter key that holds a list.  Ex:
+```
+habits: [habitA, habitB, habitC]
+```
+
+When specifying a searchTarget, use the key name followed by the member value in bracket notation:
+```
+searchType: frontmatterlist
+searchTarget: habits[spanish]
+```
+When the member value is present in the list, it will be evaluated as a constant value (default 1.0). When it is absent, the day will have no value. This is ideal for counting occurances. 
+
+#### Formatting property values in frontmatter
+
+Like tags, values stored in frontmatter lists are **case insensitive**. (ex: `piano` and `Piano` should be treated the same.)
+
+**Single-line lists** can optionally be surrounded by square brackets, but it's not required. Any of the following will work in frontmatter and evaluate without issue:
+- `habits: `
+- `habits: []`
+- `habits: spanish`
+- `habits: [spanish]`
+- `habits: yoga, spanish, piano`
+- `habits: [yoga, spanish, piano]`
+
+**Multi-line lists** are also allowed, ex:
+```
+habits:
+ - yoga
+ - spanish
+ - piano
+```
+
+
 ### searchType: wiki
 This search type helps you count wiki links in articles. For example,
 [[A]]
diff --git a/examples/TestFrontmatter.md b/examples/TestFrontmatter.md
index f3eca7c..259c141 100644
--- a/examples/TestFrontmatter.md
+++ b/examples/TestFrontmatter.md
@@ -36,7 +36,7 @@ line:
 ```
 
 ## Multiple Tags in Front Matter
-Extract data of one tag from multiple tags
+Extract data of one tag from multiple tags.
 The default separator in front matter tags is comma (,)
 ``` tracker
 searchType: tag
@@ -54,7 +54,7 @@ line:
     pointBorderColor: "#d65d0e"
 ```
 
-Use the data of two tags
+Use the data of two tags.
 The default separator in front matter tags is comma (,)
 ``` tracker
 searchType: tag
@@ -65,4 +65,7 @@ month:
     initMonth: 2021-01
 ```
 
-Please also check those search targets in markdown files under folder 'diary'.
\ No newline at end of file
+Please also check those search targets in markdown files under folder 'diary'.
+
+
+Note about multiple values: When extracting one value from a list of multiple values in frontmatter fields besides tags, please refer to TestFrontmatterList.md.
diff --git a/examples/TestFrontmatterList.md b/examples/TestFrontmatterList.md
new file mode 100644
index 0000000..f3ecaf9
--- /dev/null
+++ b/examples/TestFrontmatterList.md
@@ -0,0 +1,76 @@
+# Frontmatter Lists
+This option is helpful for vaultkeepers who want to track multiple habits (targets) using the same custom YAML property. 
+
+## Example outputs
+Each of the outputs below is generated by searching frontmatter for `habits: ` , then checking the list of values for the presence of a single habit, ex: `yoga`, `piano`, or `spanish`.  
+
+```tracker
+searchType: frontmatterlist
+searchTarget: habits[yoga]
+folder: diary
+startDate: 2026-02-01
+endDate: 2026-02-28
+datasetName: Yoga
+month:
+```
+
+
+
+```tracker
+searchType: frontmatterlist
+searchTarget: habits[spanish]
+folder: diary
+startDate: 2026-02-01
+endDate: 2026-02-28
+datasetName: Spanish
+month:
+	color: orange
+```
+```tracker
+searchType: frontmatterlist
+searchTarget: habits[piano]
+folder: diary
+startDate: 2026-02-01
+endDate: 2026-02-28
+datasetName: Piano
+month:
+	color: lightblue
+```
+
+```tracker
+searchType: frontmatterlist
+searchTarget: habits[piano]
+folder: diary
+startDate: 2026-02-01
+endDate: 2026-02-28
+summary:
+	template: "Total count: {{sum()}}"
+```
+
+
+
+### Testing
+
+**Bracket test**: Single-line lists can be surrounded by square brackets, but it's not required. (Trailing commas won't break anything either.)
+- 2/9: `habits: []`
+- 2/10: `habits: [piano]`
+- 2/12: `habits: [yoga, spanish]`
+- 2/16: `habits: `
+- 2/8: `habits: spanish`
+- 2/15: `habits: yoga, spanish, piano`
+
+.
+
+**Case test**:  Values stored in frontmatter lists are **case insensitive** for this plugin, mirroring the behavior of tags. In the examples above, `yoga` and `Yoga` should be treated the same. 
+
+If search targets are case insensitive, then both 2/14 and 2/17 will be highlighted on the `month:` output for `habit[yoga]` when the examples vault is viewed in Obsidian. 
+
+.
+
+**Multi-line list test**: If multi-line lists are working, then 2/14 will be highlighted on each of the calendars above when the examples vault is viewed in Obsidian. 
+```
+habits:
+ - yoga
+ - spanish
+ - piano
+```
diff --git a/examples/diary/2026-02-08.md b/examples/diary/2026-02-08.md
new file mode 100644
index 0000000..2fb751f
--- /dev/null
+++ b/examples/diary/2026-02-08.md
@@ -0,0 +1,3 @@
+---
+habits: spanish
+---
diff --git a/examples/diary/2026-02-09.md b/examples/diary/2026-02-09.md
new file mode 100644
index 0000000..b71f133
--- /dev/null
+++ b/examples/diary/2026-02-09.md
@@ -0,0 +1,4 @@
+---
+habits: []
+---
+ Punxsutawney Phil was right :( 
\ No newline at end of file
diff --git a/examples/diary/2026-02-10.md b/examples/diary/2026-02-10.md
new file mode 100644
index 0000000..34ea72f
--- /dev/null
+++ b/examples/diary/2026-02-10.md
@@ -0,0 +1,4 @@
+---
+habits: [piano]
+---
+boop beep
\ No newline at end of file
diff --git a/examples/diary/2026-02-11.md b/examples/diary/2026-02-11.md
new file mode 100644
index 0000000..7e28c16
--- /dev/null
+++ b/examples/diary/2026-02-11.md
@@ -0,0 +1,4 @@
+---
+habits: [yoga, spanish, piano]
+---
+build all the habits
\ No newline at end of file
diff --git a/examples/diary/2026-02-12.md b/examples/diary/2026-02-12.md
new file mode 100644
index 0000000..94e3ddd
--- /dev/null
+++ b/examples/diary/2026-02-12.md
@@ -0,0 +1,3 @@
+---
+habits: [yoga, spanish]
+---
diff --git a/examples/diary/2026-02-13.md b/examples/diary/2026-02-13.md
new file mode 100644
index 0000000..229d107
--- /dev/null
+++ b/examples/diary/2026-02-13.md
@@ -0,0 +1,4 @@
+---
+habits: [spanish, piano,]
+---
+a trailing comma snuck inside the brackets, but will it cause problems? tune into [[TestFrontmatterList]] tonight at 8 to find out.
\ No newline at end of file
diff --git a/examples/diary/2026-02-14.md b/examples/diary/2026-02-14.md
new file mode 100644
index 0000000..bf54920
--- /dev/null
+++ b/examples/diary/2026-02-14.md
@@ -0,0 +1,7 @@
+---
+habits:
+ - yoga
+ - spanish
+ - piano
+---
+habits, but as a fancy little bullet list
\ No newline at end of file
diff --git a/examples/diary/2026-02-15.md b/examples/diary/2026-02-15.md
new file mode 100644
index 0000000..a229124
--- /dev/null
+++ b/examples/diary/2026-02-15.md
@@ -0,0 +1,5 @@
+---
+habits: yoga, spanish, piano
+---
+
+such productivity, wow
diff --git a/examples/diary/2026-02-16.md b/examples/diary/2026-02-16.md
new file mode 100644
index 0000000..e97d247
--- /dev/null
+++ b/examples/diary/2026-02-16.md
@@ -0,0 +1,6 @@
+---
+habits: 
+---
+
+everybody deserve a little lazy day every now and then :) 
+
diff --git a/examples/diary/2026-02-17.md b/examples/diary/2026-02-17.md
new file mode 100644
index 0000000..17cf3d2
--- /dev/null
+++ b/examples/diary/2026-02-17.md
@@ -0,0 +1,5 @@
+---
+habits: Yoga, spanish, Piano
+---
+
+let's get wAcKy with these cAsEs
\ No newline at end of file
diff --git a/examples/diary/2026-02-18.md b/examples/diary/2026-02-18.md
new file mode 100644
index 0000000..631a1e3
--- /dev/null
+++ b/examples/diary/2026-02-18.md
@@ -0,0 +1,4 @@
+---
+habits: Yoga, spanish, Piano,
+---
+a wild trailing comma appeared
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 557f716..ab508a9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "id": "obsidian-tracker",
   "name": "Tracker",
-  "version": "1.17.0",
+  "version": "1.18.0",
   "minAppVersion": "0.9.12",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "author": "pyrochlore",
diff --git a/src/collecting.ts b/src/collecting.ts
index 2e7e47a..96a906e 100644
--- a/src/collecting.ts
+++ b/src/collecting.ts
@@ -494,6 +494,53 @@ export function collectDataFromFrontmatterTag(
     return false;
 }
 
+// In form 'key[memberValue]', checks membership in a frontmatter list
+export function collectDataFromFrontmatterList(
+    fileCache: CachedMetadata,
+    query: Query,
+    renderInfo: RenderInfo,
+    dataMap: DataMap,
+    xValueMap: XValueMap
+): boolean {
+    let frontMatter = fileCache.frontmatter;
+    if (!frontMatter) return false;
+
+    // Parse searchTarget in the form "key[memberValue]"
+    let match = query.getTarget().match(/^(.+)\[(.+)\]$/);
+    if (!match) return false;
+
+    let listKey = match[1].trim();
+    let memberValue = match[2].trim().toLowerCase();
+
+    let rawValue = helper.deepValue(frontMatter, listKey);
+    if (rawValue == null) return false;
+
+    // Normalize to array of strings
+    let listValues: string[] = [];
+    if (Array.isArray(rawValue)) {
+        listValues = rawValue
+            .filter((v) => v != null)
+            .map((v) => String(v).trim())
+            .filter((v) => v !== "");
+    } else if (typeof rawValue === "string") {
+        listValues = rawValue
+            .split(query.getSeparator(true))
+            .map((s) => s.trim())
+            .filter((s) => s !== "");
+    } else {
+        return false;
+    }
+
+    if (listValues.some((v) => v.toLowerCase() === memberValue)) {
+        query.addNumTargets();
+        let xValue = xValueMap.get(renderInfo.xDataset[query.getId()]);
+        addToDataMap(dataMap, xValue, query, renderInfo.constValue[query.getId()]);
+        return true;
+    }
+
+    return false;
+}
+
 // In form 'key: value', target used to identify 'frontmatter key'
 export function collectDataFromFrontmatterKey(
     fileCache: CachedMetadata,
diff --git a/src/data.ts b/src/data.ts
index 3951fbc..1ee922b 100644
--- a/src/data.ts
+++ b/src/data.ts
@@ -3,6 +3,7 @@ import { Moment } from "moment";
 export enum SearchType {
     Tag,
     Frontmatter,
+    FrontmatterList, // new :) 
     Wiki,
     WikiLink,
     WikiDisplay,
diff --git a/src/main.ts b/src/main.ts
index 3779e80..19b4d11 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -315,6 +315,7 @@ export default class Tracker extends Plugin {
                 let target = q.getTarget();
                 if (
                     type === SearchType.Frontmatter ||
+                    type === SearchType.FrontmatterList ||  // new
                     type === SearchType.Tag ||
                     type === SearchType.Wiki ||
                     type === SearchType.WikiLink ||
@@ -495,6 +496,18 @@ export default class Tracker extends Plugin {
                     processInfo.gotAnyValidYValue ||= gotAnyValue;
                 } // Search frontmatter tags
 
+                // Search frontmatter list membership
+                if (fileCache && query.getType() === SearchType.FrontmatterList) {
+                    let gotAnyValue = collecting.collectDataFromFrontmatterList(
+                        fileCache,
+                        query,
+                        renderInfo,
+                        dataMap,
+                        xValueMap
+                    );
+                    processInfo.gotAnyValidYValue ||= gotAnyValue;
+                }
+
                 // console.log("Search frontmatter keys");
                 if (
                     fileCache &&
diff --git a/src/parsing.ts b/src/parsing.ts
index 7754409..176f54e 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -44,6 +44,7 @@ function validateSearchType(searchType: string): boolean {
         searchType.toLowerCase() === "tag" ||
         searchType.toLowerCase() === "text" ||
         searchType.toLowerCase() === "frontmatter" ||
+        searchType.toLowerCase() === "frontmatterlist" ||  // new
         searchType.toLowerCase() === "wiki" ||
         searchType.toLowerCase() === "wiki.link" ||
         searchType.toLowerCase() === "wiki.display" ||
@@ -1002,6 +1003,9 @@ export function getRenderInfoFromYaml(
             case "frontmatter":
                 searchType.push(SearchType.Frontmatter);
                 break;
+            case "frontmatterlist":  // new
+                searchType.push(SearchType.FrontmatterList);
+                break;
             case "wiki":
                 searchType.push(SearchType.Wiki);
                 break;
diff --git a/versions.json b/versions.json
index 3e7e34e..9157c01 100644
--- a/versions.json
+++ b/versions.json
@@ -39,5 +39,6 @@
   "1.15.0": "0.9.12",
   "1.15.1": "0.9.12",
   "1.16.0": "0.9.12",
-  "1.17.0": "0.9.12"
+  "1.17.0": "0.9.12",
+  "1.18.0": "0.9.12"
 }

From 8db8e76e30f937eb1ff16e2c15873f5c1bd3cebd Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Wed, 18 Feb 2026 19:52:53 -0700
Subject: [PATCH 391/402] Fix TestStartWeekOn.md and rebuild package-lock.json

---
 examples/TestStartWeekOn.md |  14 +-
 package-lock.json           | 715 ++++++++++++++++++++++++------------
 2 files changed, 485 insertions(+), 244 deletions(-)

diff --git a/examples/TestStartWeekOn.md b/examples/TestStartWeekOn.md
index 428ac6b..8b99cfe 100644
--- a/examples/TestStartWeekOn.md
+++ b/examples/TestStartWeekOn.md
@@ -13,7 +13,7 @@ The `startWeekOn` parameter now accepts any day of the week:
 
 ```tracker
 searchType: tag
-searchTarget: test
+searchTarget: meditation
 folder: diary
 startDate: 2021-01-01
 endDate: 2021-01-31
@@ -26,7 +26,7 @@ month:
 
 ```tracker
 searchType: tag
-searchTarget: test
+searchTarget: meditation
 folder: diary
 startDate: 2021-01-01
 endDate: 2021-01-31
@@ -39,7 +39,7 @@ month:
 
 ```tracker
 searchType: tag
-searchTarget: test
+searchTarget: meditation
 folder: diary
 startDate: 2021-01-01
 endDate: 2021-01-31
@@ -52,7 +52,7 @@ month:
 
 ```tracker
 searchType: tag
-searchTarget: test
+searchTarget: meditation
 folder: diary
 startDate: 2021-01-01
 endDate: 2021-01-31
@@ -65,7 +65,7 @@ month:
 
 ```tracker
 searchType: tag
-searchTarget: test
+searchTarget: meditation
 folder: diary
 startDate: 2021-01-01
 endDate: 2021-01-31
@@ -78,7 +78,7 @@ month:
 
 ```tracker
 searchType: tag
-searchTarget: test
+searchTarget: meditation
 folder: diary
 startDate: 2021-01-01
 endDate: 2021-01-31
@@ -91,7 +91,7 @@ month:
 
 ```tracker
 searchType: tag
-searchTarget: test
+searchTarget: meditation
 folder: diary
 startDate: 2021-01-01
 endDate: 2021-01-31
diff --git a/package-lock.json b/package-lock.json
index 899be75..967cba3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -30,39 +30,39 @@
       }
     },
     "node_modules/@codemirror/state": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.2.tgz",
-      "integrity": "sha512-FVqsPqtPWKVVL3dPSxy8wEF/ymIEuVzF1PK3VbUgrxXpJUSHQWWZz4JMToquRxnkw+36LTamCZG2iua2Ptq0fA==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.0.tgz",
+      "integrity": "sha512-MwBHVK60IiIHDcoMet78lxt6iw5gJOGSbNbOIVBHWVXIH4/Nq1+GQgLLGgI1KlnN86WDXsPudVaqYHKBIx7Eyw==",
       "dev": true,
+      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@marijn/find-cluster-break": "^1.0.0"
       }
     },
     "node_modules/@codemirror/view": {
-      "version": "6.36.8",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.36.8.tgz",
-      "integrity": "sha512-yoRo4f+FdnD01fFt4XpfpMCcCAo9QvZOtbrXExn4SqzH32YC6LgzqxfLZw/r6Ge65xyY03mK/UfUqrVw1gFiFg==",
+      "version": "6.38.6",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.38.6.tgz",
+      "integrity": "sha512-qiS0z1bKs5WOvHIAC0Cybmv4AJSkAXgX5aD6Mqd2epSLlVJsQl8NG23jCVouIgkh4All/mrbdsf2UOLFnJw0tw==",
       "dev": true,
+      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@codemirror/state": "^6.5.0",
+        "crelt": "^1.0.6",
         "style-mod": "^4.1.0",
         "w3c-keyname": "^2.2.4"
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
-      "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
+      "version": "0.3.13",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
+      "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jridgewell/set-array": "^1.2.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/sourcemap-codec": "^1.5.0",
         "@jridgewell/trace-mapping": "^0.3.24"
-      },
-      "engines": {
-        "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/resolve-uri": {
@@ -70,40 +70,35 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
       "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
       "dev": true,
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
-      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/source-map": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
-      "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
+      "version": "0.3.11",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.11.tgz",
+      "integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25"
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
-      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
-      "dev": true
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.25",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "version": "0.3.31",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
+      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
@@ -114,13 +109,14 @@
       "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz",
       "integrity": "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==",
       "dev": true,
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
       "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "2.0.5",
         "run-parallel": "^1.1.9"
@@ -134,6 +130,7 @@
       "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
       "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
@@ -143,6 +140,7 @@
       "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
       "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
@@ -152,9 +150,9 @@
       }
     },
     "node_modules/@rollup/plugin-commonjs": {
-      "version": "28.0.5",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-28.0.5.tgz",
-      "integrity": "sha512-lytLp2JgAMwqJY6ve3OSROXr2XuEYHjnsQN3hmnxC+w11dI91LuUw4Yc1kk2FqKXeMG8psoFejFgK+znoij0cg==",
+      "version": "28.0.9",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-28.0.9.tgz",
+      "integrity": "sha512-PIR4/OHZ79romx0BVVll/PkwWpJ7e5lsqFa3gFfcrFPWwLXLV39JVUzQV9RKjWerE7B845Hqjj9VYlQeieZ2dA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -179,10 +177,11 @@
       }
     },
     "node_modules/@rollup/plugin-node-resolve": {
-      "version": "16.0.1",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-16.0.1.tgz",
-      "integrity": "sha512-tk5YCxJWIG81umIvNkSod2qK5KyQW19qcBF/B78n1bjtOON6gzKoVeSzAE8yHCZEDmqkHKkxplExA8KzdJLJpA==",
+      "version": "16.0.3",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-16.0.3.tgz",
+      "integrity": "sha512-lUYM3UBGuM93CnMPG1YocWu7X802BrNF3jW2zny5gQyLQgRFJhV1Sq0Zi74+dh/6NBx1DxFC4b4GXg9wUCG5Qg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@rollup/pluginutils": "^5.0.1",
         "@types/resolve": "1.20.2",
@@ -207,6 +206,7 @@
       "resolved": "https://registry.npmjs.org/@rollup/plugin-terser/-/plugin-terser-0.4.4.tgz",
       "integrity": "sha512-XHeJC5Bgvs8LfukDwWZp7yeqin6ns8RTl2B9avbejt6tZqsqvVoWI7ZTQrcNsfKEDWBTnTxM8nMDkO2IFFbd0A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "serialize-javascript": "^6.0.1",
         "smob": "^1.0.0",
@@ -225,10 +225,11 @@
       }
     },
     "node_modules/@rollup/plugin-typescript": {
-      "version": "12.1.2",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-12.1.2.tgz",
-      "integrity": "sha512-cdtSp154H5sv637uMr1a8OTWB0L1SWDSm1rDGiyfcGcvQ6cuTs4MDk2BVEBGysUWago4OJN4EQZqOTl/QY3Jgg==",
+      "version": "12.3.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-12.3.0.tgz",
+      "integrity": "sha512-7DP0/p7y3t67+NabT9f8oTBFE6gGkto4SA6Np2oudYmZE/m1dt8RB0SjL1msMxFpLo631qjRCcBlAbq1ml/Big==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@rollup/pluginutils": "^5.1.0",
         "resolve": "^1.22.1"
@@ -251,10 +252,11 @@
       }
     },
     "node_modules/@rollup/pluginutils": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.4.tgz",
-      "integrity": "sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.3.0.tgz",
+      "integrity": "sha512-5EdhGZtnu3V88ces7s53hhfK5KSASnJZv8Lulpc04cWO3REESroJXg73DFsOmgbU2BhwV0E20bu2IDZb3VKW4Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/estree": "^1.0.0",
         "estree-walker": "^2.0.2",
@@ -273,9 +275,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.44.0.tgz",
-      "integrity": "sha512-xEiEE5oDW6tK4jXCAyliuntGR+amEMO7HLtdSshVuhFnKTYoeYMyXQK7pLouAJJj5KHdwdn87bfHAR2nSdNAUA==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.57.1.tgz",
+      "integrity": "sha512-A6ehUVSiSaaliTxai040ZpZ2zTevHYbvu/lDoeAteHI8QnaosIzm4qwtezfRg1jOYaUmnzLX1AOD6Z+UJjtifg==",
       "cpu": [
         "arm"
       ],
@@ -287,9 +289,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.44.0.tgz",
-      "integrity": "sha512-uNSk/TgvMbskcHxXYHzqwiyBlJ/lGcv8DaUfcnNwict8ba9GTTNxfn3/FAoFZYgkaXXAdrAA+SLyKplyi349Jw==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.57.1.tgz",
+      "integrity": "sha512-dQaAddCY9YgkFHZcFNS/606Exo8vcLHwArFZ7vxXq4rigo2bb494/xKMMwRRQW6ug7Js6yXmBZhSBRuBvCCQ3w==",
       "cpu": [
         "arm64"
       ],
@@ -301,9 +303,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.44.0.tgz",
-      "integrity": "sha512-VGF3wy0Eq1gcEIkSCr8Ke03CWT+Pm2yveKLaDvq51pPpZza3JX/ClxXOCmTYYq3us5MvEuNRTaeyFThCKRQhOA==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.57.1.tgz",
+      "integrity": "sha512-crNPrwJOrRxagUYeMn/DZwqN88SDmwaJ8Cvi/TN1HnWBU7GwknckyosC2gd0IqYRsHDEnXf328o9/HC6OkPgOg==",
       "cpu": [
         "arm64"
       ],
@@ -315,9 +317,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.44.0.tgz",
-      "integrity": "sha512-fBkyrDhwquRvrTxSGH/qqt3/T0w5Rg0L7ZIDypvBPc1/gzjJle6acCpZ36blwuwcKD/u6oCE/sRWlUAcxLWQbQ==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.57.1.tgz",
+      "integrity": "sha512-Ji8g8ChVbKrhFtig5QBV7iMaJrGtpHelkB3lsaKzadFBe58gmjfGXAOfI5FV0lYMH8wiqsxKQ1C9B0YTRXVy4w==",
       "cpu": [
         "x64"
       ],
@@ -329,9 +331,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.44.0.tgz",
-      "integrity": "sha512-u5AZzdQJYJXByB8giQ+r4VyfZP+walV+xHWdaFx/1VxsOn6eWJhK2Vl2eElvDJFKQBo/hcYIBg/jaKS8ZmKeNQ==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.57.1.tgz",
+      "integrity": "sha512-R+/WwhsjmwodAcz65guCGFRkMb4gKWTcIeLy60JJQbXrJ97BOXHxnkPFrP+YwFlaS0m+uWJTstrUA9o+UchFug==",
       "cpu": [
         "arm64"
       ],
@@ -343,9 +345,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.44.0.tgz",
-      "integrity": "sha512-qC0kS48c/s3EtdArkimctY7h3nHicQeEUdjJzYVJYR3ct3kWSafmn6jkNCA8InbUdge6PVx6keqjk5lVGJf99g==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.57.1.tgz",
+      "integrity": "sha512-IEQTCHeiTOnAUC3IDQdzRAGj3jOAYNr9kBguI7MQAAZK3caezRrg0GxAb6Hchg4lxdZEI5Oq3iov/w/hnFWY9Q==",
       "cpu": [
         "x64"
       ],
@@ -357,9 +359,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.44.0.tgz",
-      "integrity": "sha512-x+e/Z9H0RAWckn4V2OZZl6EmV0L2diuX3QB0uM1r6BvhUIv6xBPL5mrAX2E3e8N8rEHVPwFfz/ETUbV4oW9+lQ==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.57.1.tgz",
+      "integrity": "sha512-F8sWbhZ7tyuEfsmOxwc2giKDQzN3+kuBLPwwZGyVkLlKGdV1nvnNwYD0fKQ8+XS6hp9nY7B+ZeK01EBUE7aHaw==",
       "cpu": [
         "arm"
       ],
@@ -371,9 +373,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.44.0.tgz",
-      "integrity": "sha512-1exwiBFf4PU/8HvI8s80icyCcnAIB86MCBdst51fwFmH5dyeoWVPVgmQPcKrMtBQ0W5pAs7jBCWuRXgEpRzSCg==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.57.1.tgz",
+      "integrity": "sha512-rGfNUfn0GIeXtBP1wL5MnzSj98+PZe/AXaGBCRmT0ts80lU5CATYGxXukeTX39XBKsxzFpEeK+Mrp9faXOlmrw==",
       "cpu": [
         "arm"
       ],
@@ -385,9 +387,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.44.0.tgz",
-      "integrity": "sha512-ZTR2mxBHb4tK4wGf9b8SYg0Y6KQPjGpR4UWwTFdnmjB4qRtoATZ5dWn3KsDwGa5Z2ZBOE7K52L36J9LueKBdOQ==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.57.1.tgz",
+      "integrity": "sha512-MMtej3YHWeg/0klK2Qodf3yrNzz6CGjo2UntLvk2RSPlhzgLvYEB3frRvbEF2wRKh1Z2fDIg9KRPe1fawv7C+g==",
       "cpu": [
         "arm64"
       ],
@@ -399,9 +401,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.44.0.tgz",
-      "integrity": "sha512-GFWfAhVhWGd4r6UxmnKRTBwP1qmModHtd5gkraeW2G490BpFOZkFtem8yuX2NyafIP/mGpRJgTJ2PwohQkUY/Q==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.57.1.tgz",
+      "integrity": "sha512-1a/qhaaOXhqXGpMFMET9VqwZakkljWHLmZOX48R0I/YLbhdxr1m4gtG1Hq7++VhVUmf+L3sTAf9op4JlhQ5u1Q==",
       "cpu": [
         "arm64"
       ],
@@ -412,10 +414,10 @@
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.44.0.tgz",
-      "integrity": "sha512-xw+FTGcov/ejdusVOqKgMGW3c4+AgqrfvzWEVXcNP6zq2ue+lsYUgJ+5Rtn/OTJf7e2CbgTFvzLW2j0YAtj0Gg==",
+    "node_modules/@rollup/rollup-linux-loong64-gnu": {
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.57.1.tgz",
+      "integrity": "sha512-QWO6RQTZ/cqYtJMtxhkRkidoNGXc7ERPbZN7dVW5SdURuLeVU7lwKMpo18XdcmpWYd0qsP1bwKPf7DNSUinhvA==",
       "cpu": [
         "loong64"
       ],
@@ -426,10 +428,38 @@
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.44.0.tgz",
-      "integrity": "sha512-bKGibTr9IdF0zr21kMvkZT4K6NV+jjRnBoVMt2uNMG0BYWm3qOVmYnXKzx7UhwrviKnmK46IKMByMgvpdQlyJQ==",
+    "node_modules/@rollup/rollup-linux-loong64-musl": {
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.57.1.tgz",
+      "integrity": "sha512-xpObYIf+8gprgWaPP32xiN5RVTi/s5FCR+XMXSKmhfoJjrpRAjCuuqQXyxUa/eJTdAE6eJ+KDKaoEqjZQxh3Gw==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.57.1.tgz",
+      "integrity": "sha512-4BrCgrpZo4hvzMDKRqEaW1zeecScDCR+2nZ86ATLhAoJ5FQ+lbHVD3ttKe74/c7tNT9c6F2viwB3ufwp01Oh2w==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-musl": {
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.57.1.tgz",
+      "integrity": "sha512-NOlUuzesGauESAyEYFSe3QTUguL+lvrN1HtwEEsU2rOwdUDeTMJdO5dUYl/2hKf9jWydJrO9OL/XSSf65R5+Xw==",
       "cpu": [
         "ppc64"
       ],
@@ -441,9 +471,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.44.0.tgz",
-      "integrity": "sha512-vV3cL48U5kDaKZtXrti12YRa7TyxgKAIDoYdqSIOMOFBXqFj2XbChHAtXquEn2+n78ciFgr4KIqEbydEGPxXgA==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.57.1.tgz",
+      "integrity": "sha512-ptA88htVp0AwUUqhVghwDIKlvJMD/fmL/wrQj99PRHFRAG6Z5nbWoWG4o81Nt9FT+IuqUQi+L31ZKAFeJ5Is+A==",
       "cpu": [
         "riscv64"
       ],
@@ -455,9 +485,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-musl": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.44.0.tgz",
-      "integrity": "sha512-TDKO8KlHJuvTEdfw5YYFBjhFts2TR0VpZsnLLSYmB7AaohJhM8ctDSdDnUGq77hUh4m/djRafw+9zQpkOanE2Q==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.57.1.tgz",
+      "integrity": "sha512-S51t7aMMTNdmAMPpBg7OOsTdn4tySRQvklmL3RpDRyknk87+Sp3xaumlatU+ppQ+5raY7sSTcC2beGgvhENfuw==",
       "cpu": [
         "riscv64"
       ],
@@ -469,9 +499,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.44.0.tgz",
-      "integrity": "sha512-8541GEyktXaw4lvnGp9m84KENcxInhAt6vPWJ9RodsB/iGjHoMB2Pp5MVBCiKIRxrxzJhGCxmNzdu+oDQ7kwRA==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.57.1.tgz",
+      "integrity": "sha512-Bl00OFnVFkL82FHbEqy3k5CUCKH6OEJL54KCyx2oqsmZnFTR8IoNqBF+mjQVcRCT5sB6yOvK8A37LNm/kPJiZg==",
       "cpu": [
         "s390x"
       ],
@@ -483,9 +513,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.44.0.tgz",
-      "integrity": "sha512-iUVJc3c0o8l9Sa/qlDL2Z9UP92UZZW1+EmQ4xfjTc1akr0iUFZNfxrXJ/R1T90h/ILm9iXEY6+iPrmYB3pXKjw==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.57.1.tgz",
+      "integrity": "sha512-ABca4ceT4N+Tv/GtotnWAeXZUZuM/9AQyCyKYyKnpk4yoA7QIAuBt6Hkgpw8kActYlew2mvckXkvx0FfoInnLg==",
       "cpu": [
         "x64"
       ],
@@ -497,9 +527,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.44.0.tgz",
-      "integrity": "sha512-PQUobbhLTQT5yz/SPg116VJBgz+XOtXt8D1ck+sfJJhuEsMj2jSej5yTdp8CvWBSceu+WW+ibVL6dm0ptG5fcA==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.57.1.tgz",
+      "integrity": "sha512-HFps0JeGtuOR2convgRRkHCekD7j+gdAuXM+/i6kGzQtFhlCtQkpwtNzkNj6QhCDp7DRJ7+qC/1Vg2jt5iSOFw==",
       "cpu": [
         "x64"
       ],
@@ -510,10 +540,38 @@
         "linux"
       ]
     },
+    "node_modules/@rollup/rollup-openbsd-x64": {
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.57.1.tgz",
+      "integrity": "sha512-H+hXEv9gdVQuDTgnqD+SQffoWoc0Of59AStSzTEj/feWTBAnSfSD3+Dql1ZruJQxmykT/JVY0dE8Ka7z0DH1hw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-openharmony-arm64": {
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.57.1.tgz",
+      "integrity": "sha512-4wYoDpNg6o/oPximyc/NG+mYUejZrCU2q+2w6YZqrAs2UcNUChIZXjtafAiiZSUc7On8v5NyNj34Kzj/Ltk6dQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ]
+    },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.44.0.tgz",
-      "integrity": "sha512-M0CpcHf8TWn+4oTxJfh7LQuTuaYeXGbk0eageVjQCKzYLsajWS/lFC94qlRqOlyC2KvRT90ZrfXULYmukeIy7w==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.57.1.tgz",
+      "integrity": "sha512-O54mtsV/6LW3P8qdTcamQmuC990HDfR71lo44oZMZlXU4tzLrbvTii87Ni9opq60ds0YzuAlEr/GNwuNluZyMQ==",
       "cpu": [
         "arm64"
       ],
@@ -525,9 +583,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.44.0.tgz",
-      "integrity": "sha512-3XJ0NQtMAXTWFW8FqZKcw3gOQwBtVWP/u8TpHP3CRPXD7Pd6s8lLdH3sHWh8vqKCyyiI8xW5ltJScQmBU9j7WA==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.57.1.tgz",
+      "integrity": "sha512-P3dLS+IerxCT/7D2q2FYcRdWRl22dNbrbBEtxdWhXrfIMPP9lQhb5h4Du04mdl5Woq05jVCDPCMF7Ub0NAjIew==",
       "cpu": [
         "ia32"
       ],
@@ -538,10 +596,24 @@
         "win32"
       ]
     },
+    "node_modules/@rollup/rollup-win32-x64-gnu": {
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.57.1.tgz",
+      "integrity": "sha512-VMBH2eOOaKGtIJYleXsi2B8CPVADrh+TyNxJ4mWPnKfLB/DBUmzW+5m1xUrcwWoMfSLagIRpjUFeW5CO5hyciQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.44.0.tgz",
-      "integrity": "sha512-Q2Mgwt+D8hd5FIPUuPDsvPR7Bguza6yTkJxspDGkZj7tBRn2y4KSWYuIXpftFSjBra76TbKerCV7rgFPQrn+wQ==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.57.1.tgz",
+      "integrity": "sha512-mxRFDdHIWRxg3UfIIAwCm6NzvxG0jDX/wBN6KsQFTvKFqqg9vTrWUE68qEjHt19A5wwx5X5aUi2zuZT7YR0jrA==",
       "cpu": [
         "x64"
       ],
@@ -557,6 +629,7 @@
       "resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-5.60.8.tgz",
       "integrity": "sha512-VjFgDF/eB+Aklcy15TtOTLQeMjTo07k7KAjql8OK5Dirr7a6sJY4T1uVBDuTVG9VEmn1uUsohOpYnVfgC6/jyw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/tern": "*"
       }
@@ -566,6 +639,7 @@
       "resolved": "https://registry.npmjs.org/@types/d3/-/d3-7.4.3.tgz",
       "integrity": "sha512-lZXZ9ckh5R8uiFVt8ogUNf+pIrK4EsWrx2Np75WvF/eTpJ0FMHNhjXk8CKEx/+gpHbNQyJWehbFaTvqmHWB3ww==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-array": "*",
         "@types/d3-axis": "*",
@@ -600,16 +674,18 @@
       }
     },
     "node_modules/@types/d3-array": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.1.tgz",
-      "integrity": "sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg==",
-      "dev": true
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.2.tgz",
+      "integrity": "sha512-hOLWVbm7uRza0BYXpIIW5pxfrKe0W+D5lrFiAEYR+pb6w3N2SwSMaJbXdUfSEv+dT4MfHBLtn5js0LAWaO6otw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-axis": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/@types/d3-axis/-/d3-axis-3.0.6.tgz",
       "integrity": "sha512-pYeijfZuBd87T0hGn0FO1vQ/cgLk6E1ALJjfkC0oJ8cbwkZl3TpgS8bVBLZN+2jjGgg38epgxb2zmoGtSfvgMw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-selection": "*"
       }
@@ -619,6 +695,7 @@
       "resolved": "https://registry.npmjs.org/@types/d3-brush/-/d3-brush-3.0.6.tgz",
       "integrity": "sha512-nH60IZNNxEcrh6L1ZSMNA28rj27ut/2ZmI3r96Zd+1jrZD++zD3LsMIjWlvg4AYrHn/Pqz4CF3veCxGjtbqt7A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-selection": "*"
       }
@@ -627,19 +704,22 @@
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/@types/d3-chord/-/d3-chord-3.0.6.tgz",
       "integrity": "sha512-LFYWWd8nwfwEmTZG9PfQxd17HbNPksHBiJHaKuY1XeqscXacsS2tyoo6OdRsjf+NQYeB6XrNL3a25E3gH69lcg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-color": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz",
       "integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-contour": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/@types/d3-contour/-/d3-contour-3.0.6.tgz",
       "integrity": "sha512-BjzLgXGnCWjUSYGfH1cpdo41/hgdWETu4YxpezoztawmqsvCeep+8QGfiY6YbDvfgHz/DkjeIkkZVJavB4a3rg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-array": "*",
         "@types/geojson": "*"
@@ -649,19 +729,22 @@
       "version": "6.0.4",
       "resolved": "https://registry.npmjs.org/@types/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
       "integrity": "sha512-ZMaSKu4THYCU6sV64Lhg6qjf1orxBthaC161plr5KuPHo3CNm8DTHiLw/5Eq2b6TsNP0W0iJrUOFscY6Q450Hw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-dispatch": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@types/d3-dispatch/-/d3-dispatch-3.0.6.tgz",
-      "integrity": "sha512-4fvZhzMeeuBJYZXRXrRIQnvUYfyXwYmLsdiN7XXmVNQKKw1cM8a5WdID0g1hVFZDqT9ZqZEY5pD44p24VS7iZQ==",
-      "dev": true
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-dispatch/-/d3-dispatch-3.0.7.tgz",
+      "integrity": "sha512-5o9OIAdKkhN1QItV2oqaE5KMIiXAvDWBDPrD85e58Qlz1c1kI/J0NcqbEG88CoTwJrYe7ntUCVfeUl2UJKbWgA==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-drag": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/@types/d3-drag/-/d3-drag-3.0.7.tgz",
       "integrity": "sha512-HE3jVKlzU9AaMazNufooRJ5ZpWmLIoc90A37WU2JMmeq28w1FQqCZswHZ3xR+SuxYftzHq6WU6KJHvqxKzTxxQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-selection": "*"
       }
@@ -670,19 +753,22 @@
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/@types/d3-dsv/-/d3-dsv-3.0.7.tgz",
       "integrity": "sha512-n6QBF9/+XASqcKK6waudgL0pf/S5XHPPI8APyMLLUHd8NqouBGLsU8MgtO7NINGtPBtk9Kko/W4ea0oAspwh9g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-ease": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.2.tgz",
       "integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-fetch": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/@types/d3-fetch/-/d3-fetch-3.0.7.tgz",
       "integrity": "sha512-fTAfNmxSb9SOWNB9IoG5c8Hg6R+AzUHDRlsXsDZsNp6sxAEOP0tkP3gKkNSO/qmHPoBFTxNrjDprVHDQDvo5aA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-dsv": "*"
       }
@@ -691,19 +777,22 @@
       "version": "3.0.10",
       "resolved": "https://registry.npmjs.org/@types/d3-force/-/d3-force-3.0.10.tgz",
       "integrity": "sha512-ZYeSaCF3p73RdOKcjj+swRlZfnYpK1EbaDiYICEEp5Q6sUiqFaFQ9qgoshp5CzIyyb/yD09kD9o2zEltCexlgw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-format": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/@types/d3-format/-/d3-format-3.0.4.tgz",
       "integrity": "sha512-fALi2aI6shfg7vM5KiR1wNJnZ7r6UuggVqtDA+xiEdPZQwy/trcQaHnwShLuLdta2rTymCNpxYTiMZX/e09F4g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-geo": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-3.1.0.tgz",
       "integrity": "sha512-856sckF0oP/diXtS4jNsiQw/UuK5fQG8l/a9VVLeSouf1/PPbBE1i1W852zVwKwYCBkFJJB7nCFTbk6UMEXBOQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/geojson": "*"
       }
@@ -712,13 +801,15 @@
       "version": "3.1.7",
       "resolved": "https://registry.npmjs.org/@types/d3-hierarchy/-/d3-hierarchy-3.1.7.tgz",
       "integrity": "sha512-tJFtNoYBtRtkNysX1Xq4sxtjK8YgoWUNpIiUee0/jHGRwqvzYxkq0hGVbbOGSz+JgFxxRu4K8nb3YpG3CMARtg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-interpolate": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz",
       "integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-color": "*"
       }
@@ -727,31 +818,36 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.1.tgz",
       "integrity": "sha512-VMZBYyQvbGmWyWVea0EHs/BwLgxc+MKi1zLDCONksozI4YJMcTt8ZEuIR4Sb1MMTE8MMW49v0IwI5+b7RmfWlg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-polygon": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/@types/d3-polygon/-/d3-polygon-3.0.2.tgz",
       "integrity": "sha512-ZuWOtMaHCkN9xoeEMr1ubW2nGWsp4nIql+OPQRstu4ypeZ+zk3YKqQT0CXVe/PYqrKpZAi+J9mTs05TKwjXSRA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-quadtree": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/@types/d3-quadtree/-/d3-quadtree-3.0.6.tgz",
       "integrity": "sha512-oUzyO1/Zm6rsxKRHA1vH0NEDG58HrT5icx/azi9MF1TWdtttWl0UIUsjEQBBh+SIkrpd21ZjEv7ptxWys1ncsg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-random": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/@types/d3-random/-/d3-random-3.0.3.tgz",
       "integrity": "sha512-Imagg1vJ3y76Y2ea0871wpabqp613+8/r0mCLEBfdtqC7xMSfj9idOnmBYyMoULfHePJyxMAw3nWhJxzc+LFwQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-scale": {
       "version": "4.0.9",
       "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.9.tgz",
       "integrity": "sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-time": "*"
       }
@@ -760,19 +856,22 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
       "integrity": "sha512-iWMJgwkK7yTRmWqRB5plb1kadXyQ5Sj8V/zYlFGMUBbIPKQScw+Dku9cAAMgJG+z5GYDoMjWGLVOvjghDEFnKQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-selection": {
       "version": "3.0.11",
       "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.11.tgz",
       "integrity": "sha512-bhAXu23DJWsrI45xafYpkQ4NtcKMwWnAC/vKrd2l+nxMFuvOT3XMYTIj2opv8vq8AO5Yh7Qac/nSeP/3zjTK0w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-shape": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.7.tgz",
-      "integrity": "sha512-VLvUQ33C+3J+8p+Daf+nYSOsjB4GXp19/S/aGo60m9h1v6XaxjiT82lKVWJCfzhtuZ3yD7i/TPeC/fuKLLOSmg==",
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.8.tgz",
+      "integrity": "sha512-lae0iWfcDeR7qt7rA88BNiqdvPS5pFVPpo5OfjElwNaT2yyekbM0C9vK+yqBqEmHr6lDkRnYNoTBYlAgJa7a4w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-path": "*"
       }
@@ -781,25 +880,29 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.4.tgz",
       "integrity": "sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-time-format": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-4.0.3.tgz",
       "integrity": "sha512-5xg9rC+wWL8kdDj153qZcsJ0FWiFt0J5RB6LYUNZjwSnesfblqrI/bJ1wBdJ8OQfncgbJG5+2F+qfqnqyzYxyg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-timer": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.2.tgz",
       "integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-transition": {
       "version": "3.0.9",
       "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-3.0.9.tgz",
       "integrity": "sha512-uZS5shfxzO3rGlu0cC3bjmMFKsXv+SmZZcgp0KD22ts4uGXp5EVYGzu/0YdwZeKmddhcAccYtREJKkPfXkZuCg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-selection": "*"
       }
@@ -809,6 +912,7 @@
       "resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-3.0.8.tgz",
       "integrity": "sha512-iqMC4/YlFCSlO8+2Ii1GGGliCAY4XdeG748w5vQUbevlbDu0zSjH/+jojorQVBK/se0j6DUFNPBGSqD3YWYnDw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-interpolate": "*",
         "@types/d3-selection": "*"
@@ -826,6 +930,7 @@
       "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.1.5.tgz",
       "integrity": "sha512-0dzKcwO+S8s2kuF5Z9oUWatQJj5Uq/iqphEtE3GQJVRRYm/tD1LglU2UnXi2A8jLq5umkGouOXOR9y0n613ZwQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -834,13 +939,15 @@
       "version": "7946.0.16",
       "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz",
       "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/glob": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
       "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/minimatch": "*",
         "@types/node": "*"
@@ -850,44 +957,49 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
       "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "24.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.0.3.tgz",
-      "integrity": "sha512-R4I/kzCYAdRLzfiCabn9hxWfbuHS573x+r0dJMkkzThEa7pbrcDWK+9zu3e7aBOouf+rQAciqPFMnxwr0aWgKg==",
+      "version": "24.10.13",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.13.tgz",
+      "integrity": "sha512-oH72nZRfDv9lADUBSo104Aq7gPHpQZc4BTx38r9xf9pg5LfP6EzSyH2n7qFmmxRQXh7YlUXODcYsg6PuTDSxGg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~7.8.0"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/@types/resolve": {
       "version": "1.20.2",
       "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz",
       "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/sprintf-js": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/@types/sprintf-js/-/sprintf-js-1.1.4.tgz",
       "integrity": "sha512-aWK1reDYWxcjgcIIPmQi3u+OQDuYa9b+lr6eIsGWrekJ9vr1NSjr4Eab8oQ1iKuH1ltFHpXGyerAv1a3FMKxzQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/tern": {
       "version": "0.23.9",
       "resolved": "https://registry.npmjs.org/@types/tern/-/tern-0.23.9.tgz",
       "integrity": "sha512-ypzHFE/wBzh+BlH6rrBgS5I/Z7RD21pGhZ2rltb/+ZrVM1awdZwjx7hE5XfuYgHWk9uvV5HLZN3SloevCAp3Bw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/estree": "*"
       }
     },
     "node_modules/acorn": {
-      "version": "8.14.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
-      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+      "version": "8.15.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -900,6 +1012,7 @@
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
       "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -908,13 +1021,15 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -925,6 +1040,7 @@
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
       "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fill-range": "^7.1.1"
       },
@@ -936,18 +1052,21 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/colorette": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz",
       "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/commander": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
       "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "license": "MIT",
       "engines": {
         "node": ">= 10"
       }
@@ -956,18 +1075,28 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
       "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/crelt": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
+      "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/d3": {
       "version": "7.9.0",
       "resolved": "https://registry.npmjs.org/d3/-/d3-7.9.0.tgz",
       "integrity": "sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA==",
+      "license": "ISC",
       "dependencies": {
         "d3-array": "3",
         "d3-axis": "3",
@@ -1008,6 +1137,7 @@
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
       "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
+      "license": "ISC",
       "dependencies": {
         "internmap": "1 - 2"
       },
@@ -1019,6 +1149,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz",
       "integrity": "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1027,6 +1158,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz",
       "integrity": "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==",
+      "license": "ISC",
       "dependencies": {
         "d3-dispatch": "1 - 3",
         "d3-drag": "2 - 3",
@@ -1042,6 +1174,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz",
       "integrity": "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==",
+      "license": "ISC",
       "dependencies": {
         "d3-path": "1 - 3"
       },
@@ -1053,6 +1186,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
       "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1061,6 +1195,7 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-4.0.2.tgz",
       "integrity": "sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==",
+      "license": "ISC",
       "dependencies": {
         "d3-array": "^3.2.0"
       },
@@ -1072,6 +1207,7 @@
       "version": "6.0.4",
       "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
       "integrity": "sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==",
+      "license": "ISC",
       "dependencies": {
         "delaunator": "5"
       },
@@ -1083,6 +1219,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
       "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1091,6 +1228,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz",
       "integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==",
+      "license": "ISC",
       "dependencies": {
         "d3-dispatch": "1 - 3",
         "d3-selection": "3"
@@ -1103,6 +1241,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz",
       "integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==",
+      "license": "ISC",
       "dependencies": {
         "commander": "7",
         "iconv-lite": "0.6",
@@ -1127,6 +1266,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
       "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=12"
       }
@@ -1135,6 +1275,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz",
       "integrity": "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==",
+      "license": "ISC",
       "dependencies": {
         "d3-dsv": "1 - 3"
       },
@@ -1146,6 +1287,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz",
       "integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==",
+      "license": "ISC",
       "dependencies": {
         "d3-dispatch": "1 - 3",
         "d3-quadtree": "1 - 3",
@@ -1156,9 +1298,10 @@
       }
     },
     "node_modules/d3-format": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz",
-      "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.2.tgz",
+      "integrity": "sha512-AJDdYOdnyRDV5b6ArilzCPPwc1ejkHcoyFarqlPqT7zRYjhavcT3uSrqcMvsgh2CgoPbK3RCwyHaVyxYcP2Arg==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1167,6 +1310,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz",
       "integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==",
+      "license": "ISC",
       "dependencies": {
         "d3-array": "2.5.0 - 3"
       },
@@ -1178,6 +1322,7 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz",
       "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1186,6 +1331,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
       "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
+      "license": "ISC",
       "dependencies": {
         "d3-color": "1 - 3"
       },
@@ -1197,6 +1343,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
       "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1205,6 +1352,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz",
       "integrity": "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1213,6 +1361,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz",
       "integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1221,6 +1370,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz",
       "integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1229,6 +1379,7 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
       "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
+      "license": "ISC",
       "dependencies": {
         "d3-array": "2.10.0 - 3",
         "d3-format": "1 - 3",
@@ -1244,6 +1395,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
       "integrity": "sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==",
+      "license": "ISC",
       "dependencies": {
         "d3-color": "1 - 3",
         "d3-interpolate": "1 - 3"
@@ -1256,6 +1408,8 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz",
       "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
+      "license": "ISC",
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -1264,6 +1418,7 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
       "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
+      "license": "ISC",
       "dependencies": {
         "d3-path": "^3.1.0"
       },
@@ -1275,6 +1430,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
       "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
+      "license": "ISC",
       "dependencies": {
         "d3-array": "2 - 3"
       },
@@ -1286,6 +1442,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
       "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
+      "license": "ISC",
       "dependencies": {
         "d3-time": "1 - 3"
       },
@@ -1297,6 +1454,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
       "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1305,6 +1463,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz",
       "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==",
+      "license": "ISC",
       "dependencies": {
         "d3-color": "1 - 3",
         "d3-dispatch": "1 - 3",
@@ -1323,6 +1482,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz",
       "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==",
+      "license": "ISC",
       "dependencies": {
         "d3-dispatch": "1 - 3",
         "d3-drag": "2 - 3",
@@ -1339,6 +1499,7 @@
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
       "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1347,6 +1508,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.1.tgz",
       "integrity": "sha512-8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw==",
+      "license": "ISC",
       "dependencies": {
         "robust-predicates": "^3.0.2"
       }
@@ -1356,6 +1518,7 @@
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
       "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-type": "^4.0.0"
       },
@@ -1367,13 +1530,15 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
       "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/fast-glob": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
       "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
@@ -1386,19 +1551,24 @@
       }
     },
     "node_modules/fastq": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
-      "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz",
+      "integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "reusify": "^1.0.4"
       }
     },
     "node_modules/fdir": {
-      "version": "6.4.4",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz",
-      "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
       "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.0.0"
+      },
       "peerDependencies": {
         "picomatch": "^3 || ^4"
       },
@@ -1413,6 +1583,7 @@
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
       "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -1425,6 +1596,7 @@
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
       "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.0",
         "jsonfile": "^4.0.0",
@@ -1438,7 +1610,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/fsevents": {
       "version": "2.3.3",
@@ -1446,6 +1619,7 @@
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -1459,6 +1633,7 @@
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
       "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -1467,8 +1642,9 @@
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -1489,6 +1665,7 @@
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -1501,6 +1678,7 @@
       "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.1.tgz",
       "integrity": "sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/glob": "^7.1.1",
         "array-union": "^2.1.0",
@@ -1519,13 +1697,15 @@
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/hasown": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
       "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.2"
       },
@@ -1537,6 +1717,7 @@
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
       "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
@@ -1549,6 +1730,7 @@
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
       "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
@@ -1559,6 +1741,7 @@
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
       "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -1568,12 +1751,14 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/internmap": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
       "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -1583,6 +1768,7 @@
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
       "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "hasown": "^2.0.2"
       },
@@ -1598,6 +1784,7 @@
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1607,6 +1794,7 @@
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -1618,13 +1806,15 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
       "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
@@ -1634,6 +1824,7 @@
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.1.tgz",
       "integrity": "sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1643,6 +1834,7 @@
       "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
       "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/estree": "*"
       }
@@ -1651,6 +1843,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/jsep/-/jsep-1.4.0.tgz",
       "integrity": "sha512-B7qPcEVE3NVkmSJbaYxvv4cHkVW7DQsZz13pUMrfS8z8Q/BuShN+gcTXrUlPiGqM2/t/EEaI030bpxMqY8gMlw==",
+      "license": "MIT",
       "engines": {
         "node": ">= 10.16.0"
       }
@@ -1660,17 +1853,19 @@
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
       "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
       "dev": true,
+      "license": "MIT",
       "optionalDependencies": {
         "graceful-fs": "^4.1.6"
       }
     },
     "node_modules/magic-string": {
-      "version": "0.30.17",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
-      "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
+      "version": "0.30.21",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
+      "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.5.0"
+        "@jridgewell/sourcemap-codec": "^1.5.5"
       }
     },
     "node_modules/merge2": {
@@ -1678,6 +1873,7 @@
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
       "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
@@ -1687,6 +1883,7 @@
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
       "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "braces": "^3.0.3",
         "picomatch": "^2.3.1"
@@ -1700,6 +1897,7 @@
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8.6"
       },
@@ -1712,6 +1910,7 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -1724,14 +1923,15 @@
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
       "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "*"
       }
     },
     "node_modules/obsidian": {
-      "version": "1.8.7",
+      "version": "1.12.2",
       "resolved": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-      "integrity": "sha512-0yByIRBSLYSpg0PrVhysWyRU55BrsaJl484RmRX2lM4AJ7VVMy/8jC9aj7VfW7D+1Iy4h1iUACGbIqdFjlUo+Q==",
+      "integrity": "sha512-okcp2sqVzbOKGtTn+EBjuiq5fX3vfbxWujwC5CSKvUVYajZ7WAC2z9uKBv5Nle100nWyI6wRlA4jSbWjHLmlHA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1739,8 +1939,8 @@
         "moment": "2.29.4"
       },
       "peerDependencies": {
-        "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.0.0"
+        "@codemirror/state": "6.5.0",
+        "@codemirror/view": "6.38.6"
       }
     },
     "node_modules/once": {
@@ -1748,6 +1948,7 @@
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "wrappy": "1"
       }
@@ -1757,6 +1958,7 @@
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1765,22 +1967,26 @@
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/path-type": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/picomatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
-      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -1806,24 +2012,27 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "^5.1.0"
       }
     },
     "node_modules/resolve": {
-      "version": "1.22.10",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
-      "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
+      "version": "1.22.11",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz",
+      "integrity": "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-core-module": "^2.16.0",
+        "is-core-module": "^2.16.1",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
@@ -1842,6 +2051,7 @@
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
       "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "iojs": ">=1.0.0",
         "node": ">=0.10.0"
@@ -1850,14 +2060,16 @@
     "node_modules/robust-predicates": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.2.tgz",
-      "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="
+      "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==",
+      "license": "Unlicense"
     },
     "node_modules/rollup": {
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.44.0.tgz",
-      "integrity": "sha512-qHcdEzLCiktQIfwBq420pn2dP+30uzqYxv9ETm91wdt2R9AFcWfjNAmje4NWlnCIQ5RMTzVf0ZyisOKqHR6RwA==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.57.1.tgz",
+      "integrity": "sha512-oQL6lgK3e2QZeQ7gcgIkS2YZPg5slw37hYufJ3edKlfQSGGm8ICoxswK15ntSzF/a8+h7ekRy7k7oWc3BQ7y8A==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/estree": "1.0.8"
       },
@@ -1869,26 +2081,31 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.44.0",
-        "@rollup/rollup-android-arm64": "4.44.0",
-        "@rollup/rollup-darwin-arm64": "4.44.0",
-        "@rollup/rollup-darwin-x64": "4.44.0",
-        "@rollup/rollup-freebsd-arm64": "4.44.0",
-        "@rollup/rollup-freebsd-x64": "4.44.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.44.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.44.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.44.0",
-        "@rollup/rollup-linux-arm64-musl": "4.44.0",
-        "@rollup/rollup-linux-loongarch64-gnu": "4.44.0",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.44.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.44.0",
-        "@rollup/rollup-linux-riscv64-musl": "4.44.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.44.0",
-        "@rollup/rollup-linux-x64-gnu": "4.44.0",
-        "@rollup/rollup-linux-x64-musl": "4.44.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.44.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.44.0",
-        "@rollup/rollup-win32-x64-msvc": "4.44.0",
+        "@rollup/rollup-android-arm-eabi": "4.57.1",
+        "@rollup/rollup-android-arm64": "4.57.1",
+        "@rollup/rollup-darwin-arm64": "4.57.1",
+        "@rollup/rollup-darwin-x64": "4.57.1",
+        "@rollup/rollup-freebsd-arm64": "4.57.1",
+        "@rollup/rollup-freebsd-x64": "4.57.1",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.57.1",
+        "@rollup/rollup-linux-arm-musleabihf": "4.57.1",
+        "@rollup/rollup-linux-arm64-gnu": "4.57.1",
+        "@rollup/rollup-linux-arm64-musl": "4.57.1",
+        "@rollup/rollup-linux-loong64-gnu": "4.57.1",
+        "@rollup/rollup-linux-loong64-musl": "4.57.1",
+        "@rollup/rollup-linux-ppc64-gnu": "4.57.1",
+        "@rollup/rollup-linux-ppc64-musl": "4.57.1",
+        "@rollup/rollup-linux-riscv64-gnu": "4.57.1",
+        "@rollup/rollup-linux-riscv64-musl": "4.57.1",
+        "@rollup/rollup-linux-s390x-gnu": "4.57.1",
+        "@rollup/rollup-linux-x64-gnu": "4.57.1",
+        "@rollup/rollup-linux-x64-musl": "4.57.1",
+        "@rollup/rollup-openbsd-x64": "4.57.1",
+        "@rollup/rollup-openharmony-arm64": "4.57.1",
+        "@rollup/rollup-win32-arm64-msvc": "4.57.1",
+        "@rollup/rollup-win32-ia32-msvc": "4.57.1",
+        "@rollup/rollup-win32-x64-gnu": "4.57.1",
+        "@rollup/rollup-win32-x64-msvc": "4.57.1",
         "fsevents": "~2.3.2"
       }
     },
@@ -1897,6 +2114,7 @@
       "resolved": "https://registry.npmjs.org/rollup-plugin-copy/-/rollup-plugin-copy-3.5.0.tgz",
       "integrity": "sha512-wI8D5dvYovRMx/YYKtUNt3Yxaw4ORC9xo6Gt9t22kveWz1enG9QrhVlagzwrxSC455xD1dHMKhIJkbsQ7d48BA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/fs-extra": "^8.0.1",
         "colorette": "^1.1.0",
@@ -1927,6 +2145,7 @@
           "url": "https://feross.org/support"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "queue-microtask": "^1.2.2"
       }
@@ -1934,7 +2153,8 @@
     "node_modules/rw": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
-      "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ=="
+      "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==",
+      "license": "BSD-3-Clause"
     },
     "node_modules/safe-buffer": {
       "version": "5.2.1",
@@ -1954,18 +2174,21 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "license": "MIT"
     },
     "node_modules/serialize-javascript": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
       "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "randombytes": "^2.1.0"
       }
@@ -1975,21 +2198,27 @@
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/smob": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/smob/-/smob-1.5.0.tgz",
-      "integrity": "sha512-g6T+p7QO8npa+/hNx9ohv1E5pVCmWrVCUzUXJyLdMmftX6ER0oiWY/w9knEonLpnOp6b6FenKnMfR8gqwWdwig==",
-      "dev": true
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/smob/-/smob-1.6.1.tgz",
+      "integrity": "sha512-KAkBqZl3c2GvNgNhcoyJae1aKldDW0LO279wF9bk1PnluRTETKBq0WyzRXxEhoQLk56yHaOY4JCBEKDuJIET5g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=20.0.0"
+      }
     },
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1999,6 +2228,7 @@
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
       "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -2007,20 +2237,22 @@
     "node_modules/sprintf-js": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
-      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="
+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+      "license": "BSD-3-Clause"
     },
     "node_modules/style-mod": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.2.tgz",
-      "integrity": "sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.3.tgz",
+      "integrity": "sha512-i/n8VsZydrugj3Iuzll8+x/00GH2vnYsk1eomD8QiRrSAeW6ItbCQDtfXCeJHd0iwiNagqjQkvpvREEPtW3IoQ==",
       "dev": true,
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/supports-preserve-symlinks-flag": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -2029,13 +2261,14 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.39.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.39.0.tgz",
-      "integrity": "sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==",
+      "version": "5.46.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.46.0.tgz",
+      "integrity": "sha512-jTwoImyr/QbOWFFso3YoU3ik0jBBDJ6JTOQiy/J2YxVJdZCc+5u7skhNwiOR3FQIygFqVUPHl7qbbxtjW2K3Qg==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
-        "acorn": "^8.8.2",
+        "acorn": "^8.15.0",
         "commander": "^2.20.0",
         "source-map-support": "~0.5.20"
       },
@@ -2050,13 +2283,15 @@
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -2068,13 +2303,17 @@
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-      "dev": true
+      "dev": true,
+      "license": "0BSD",
+      "peer": true
     },
     "node_modules/typescript": {
-      "version": "5.8.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
-      "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
+      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "dev": true,
+      "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -2084,9 +2323,9 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "7.8.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz",
-      "integrity": "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
       "dev": true,
       "license": "MIT"
     },
@@ -2095,6 +2334,7 @@
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
       "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4.0.0"
       }
@@ -2104,13 +2344,14 @@
       "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
       "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==",
       "dev": true,
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     }
   }
 }

From 56db253a45d25f24a280a738e53e55545e1dc27c Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Wed, 18 Feb 2026 19:52:53 -0700
Subject: [PATCH 392/402] Fix TestStartWeekOn.md and rebuild package-lock.json

---
 examples/TestStartWeekOn.md | 14 +++++++-------
 package-lock.json           | 34 +++++++++++++++++++---------------
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/examples/TestStartWeekOn.md b/examples/TestStartWeekOn.md
index 428ac6b..8b99cfe 100644
--- a/examples/TestStartWeekOn.md
+++ b/examples/TestStartWeekOn.md
@@ -13,7 +13,7 @@ The `startWeekOn` parameter now accepts any day of the week:
 
 ```tracker
 searchType: tag
-searchTarget: test
+searchTarget: meditation
 folder: diary
 startDate: 2021-01-01
 endDate: 2021-01-31
@@ -26,7 +26,7 @@ month:
 
 ```tracker
 searchType: tag
-searchTarget: test
+searchTarget: meditation
 folder: diary
 startDate: 2021-01-01
 endDate: 2021-01-31
@@ -39,7 +39,7 @@ month:
 
 ```tracker
 searchType: tag
-searchTarget: test
+searchTarget: meditation
 folder: diary
 startDate: 2021-01-01
 endDate: 2021-01-31
@@ -52,7 +52,7 @@ month:
 
 ```tracker
 searchType: tag
-searchTarget: test
+searchTarget: meditation
 folder: diary
 startDate: 2021-01-01
 endDate: 2021-01-31
@@ -65,7 +65,7 @@ month:
 
 ```tracker
 searchType: tag
-searchTarget: test
+searchTarget: meditation
 folder: diary
 startDate: 2021-01-01
 endDate: 2021-01-31
@@ -78,7 +78,7 @@ month:
 
 ```tracker
 searchType: tag
-searchTarget: test
+searchTarget: meditation
 folder: diary
 startDate: 2021-01-01
 endDate: 2021-01-31
@@ -91,7 +91,7 @@ month:
 
 ```tracker
 searchType: tag
-searchTarget: test
+searchTarget: meditation
 folder: diary
 startDate: 2021-01-01
 endDate: 2021-01-31
diff --git a/package-lock.json b/package-lock.json
index 5309b32..967cba3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -109,8 +109,7 @@
       "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz",
       "integrity": "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
@@ -1091,8 +1090,7 @@
       "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
       "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/d3": {
       "version": "7.9.0",
@@ -1411,6 +1409,7 @@
       "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz",
       "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
       "license": "ISC",
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -1930,9 +1929,9 @@
       }
     },
     "node_modules/obsidian": {
-      "version": "1.12.0",
+      "version": "1.12.2",
       "resolved": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-      "integrity": "sha512-y1XtnfQKldoFKmVEbqf20jYnQ9Nhhn6hEWxodkNMG9jO9xjyLAY2ELgPuxLAxNJ/AP+FIhVjGIHuNkHqzTokJg==",
+      "integrity": "sha512-okcp2sqVzbOKGtTn+EBjuiq5fX3vfbxWujwC5CSKvUVYajZ7WAC2z9uKBv5Nle100nWyI6wRlA4jSbWjHLmlHA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1987,6 +1986,7 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -2069,6 +2069,7 @@
       "integrity": "sha512-oQL6lgK3e2QZeQ7gcgIkS2YZPg5slw37hYufJ3edKlfQSGGm8ICoxswK15ntSzF/a8+h7ekRy7k7oWc3BQ7y8A==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/estree": "1.0.8"
       },
@@ -2203,11 +2204,14 @@
       }
     },
     "node_modules/smob": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/smob/-/smob-1.5.0.tgz",
-      "integrity": "sha512-g6T+p7QO8npa+/hNx9ohv1E5pVCmWrVCUzUXJyLdMmftX6ER0oiWY/w9knEonLpnOp6b6FenKnMfR8gqwWdwig==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/smob/-/smob-1.6.1.tgz",
+      "integrity": "sha512-KAkBqZl3c2GvNgNhcoyJae1aKldDW0LO279wF9bk1PnluRTETKBq0WyzRXxEhoQLk56yHaOY4JCBEKDuJIET5g==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": ">=20.0.0"
+      }
     },
     "node_modules/source-map": {
       "version": "0.6.1",
@@ -2241,8 +2245,7 @@
       "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.3.tgz",
       "integrity": "sha512-i/n8VsZydrugj3Iuzll8+x/00GH2vnYsk1eomD8QiRrSAeW6ItbCQDtfXCeJHd0iwiNagqjQkvpvREEPtW3IoQ==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/supports-preserve-symlinks-flag": {
       "version": "1.0.0",
@@ -2301,7 +2304,8 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
       "dev": true,
-      "license": "0BSD"
+      "license": "0BSD",
+      "peer": true
     },
     "node_modules/typescript": {
       "version": "5.9.3",
@@ -2309,6 +2313,7 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -2339,8 +2344,7 @@
       "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
       "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/wrappy": {
       "version": "1.0.2",

From 04262dc6b317d6e8443b473da997a79c34216ca9 Mon Sep 17 00:00:00 2001
From: Mike Greiner <mike.greiner@protonmail.com>
Date: Wed, 7 Jan 2026 20:29:22 -0700
Subject: [PATCH 393/402] fix: handle numeric YAML parsing for
 startDate/endDate with YYYYMMDD format

Fixes issue #324 where dateFormat: YYYYMMDD made startDate and endDate
ineffective, causing all files to be included regardless of date range.

Root cause: YAML parsers may parse numeric-looking dates (e.g., 20240201)
as numbers instead of strings. The code only checked typeof === 'string',
so numeric values were skipped, leaving startDate/endDate as null.

Changes:
- Updated parsing.ts to handle both string and number types for
  startDate/endDate, converting numbers to strings before processing
- Updated main.ts to use isBefore/isAfter with 'day' granularity for
  clearer, more readable date comparisons
- Fixed closure issue by capturing startDate/endDate in local variables
  before async file processing loop
- Fixed helper.ts bug: changed .contains() to .includes() for string
  method compatibility

Tests:
- Added unit tests for YYYYMMDD date format parsing and filtering
- Added edge case tests for boundary conditions and missing dates
- Added date comparison method tests
- All 28 tests passing
---
 src/helper.ts                          |   2 +-
 src/main.ts                            |  23 +-
 src/parsing.ts                         |  30 +-
 test/date-comparison-methods.test.ts   |  86 ++++++
 test/date-format-yyyymmdd.test.ts      | 206 ++++++++++++++
 test/edge-cases-date-filtering.test.ts | 365 +++++++++++++++++++++++++
 test/mocks/d3.ts                       |   2 +
 test/mocks/obsidian.ts                 |  93 +++++++
 test/parsing-yyyymmdd.test.ts          | 154 +++++++++++
 test/setup.ts                          |  11 +
 10 files changed, 957 insertions(+), 15 deletions(-)
 create mode 100644 test/date-comparison-methods.test.ts
 create mode 100644 test/date-format-yyyymmdd.test.ts
 create mode 100644 test/edge-cases-date-filtering.test.ts
 create mode 100644 test/mocks/d3.ts
 create mode 100644 test/mocks/obsidian.ts
 create mode 100644 test/parsing-yyyymmdd.test.ts
 create mode 100644 test/setup.ts

diff --git a/src/helper.ts b/src/helper.ts
index 3e252b1..ad1e7b3 100644
--- a/src/helper.ts
+++ b/src/helper.ts
@@ -24,7 +24,7 @@ function makeTimeFormat() {
                 if (fmtSec !== "") {
                     fmt += `:${fmtSec}`;
                 }
-                if (fmtHour.contains("h")) {
+                if (fmtHour.includes("h")) {
                     fmt += " a";
                 }
                 timeFormat.push(fmt);
diff --git a/src/main.ts b/src/main.ts
index 19b4d11..666dba4 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -304,6 +304,11 @@ export default class Tracker extends Plugin {
         let dataMap: DataMap = new Map(); // {strDate: [query: value, ...]}
         let processInfo = new CollectingProcessInfo();
         processInfo.fileTotal = files.length;
+        
+        // Store dates in local variables to ensure they're captured correctly in async closures
+        // This fixes the issue where dates become null inside async functions
+        const startDate = renderInfo.startDate ? renderInfo.startDate.clone() : null;
+        const endDate = renderInfo.endDate ? renderInfo.endDate.clone() : null;
 
         // Collect data from files, each file has one data point for each query
         const loopFilePromises = files.map(async (file) => {
@@ -428,15 +433,19 @@ export default class Tracker extends Plugin {
                         skipThisFile = true;
                         processInfo.fileNotInFormat++;
                     } else {
-                        // console.log("file " + file.basename + " accepted");
-                        if (renderInfo.startDate !== null) {
-                            if (xDate < renderInfo.startDate) {
+                        // Date filtering: only include files within the specified date range
+                        // Use isBefore/isAfter with 'day' granularity for clear, readable date comparisons
+                        // Use local variables (startDate/endDate) captured before async loop to avoid closure issues
+                        if (startDate !== null && startDate.isValid()) {
+                            // Skip files with dates before the start date
+                            if (xDate.isBefore(startDate, 'day')) {
                                 skipThisFile = true;
                                 processInfo.fileOutOfDateRange++;
                             }
                         }
-                        if (renderInfo.endDate !== null) {
-                            if (xDate > renderInfo.endDate) {
+                        if (endDate !== null && endDate.isValid()) {
+                            // Skip files with dates after the end date
+                            if (xDate.isAfter(endDate, 'day')) {
                                 skipThisFile = true;
                                 processInfo.fileOutOfDateRange++;
                             }
@@ -466,7 +475,9 @@ export default class Tracker extends Plugin {
                     }
                 }
             }
-            if (skipThisFile) return;
+            if (skipThisFile) {
+                return;
+            }
             // console.log(xValueMap);
             // console.log(`minDate: ${minDate}`);
             // console.log(`maxDate: ${maxDate}`);
diff --git a/src/parsing.ts b/src/parsing.ts
index 176f54e..5d0fbc8 100644
--- a/src/parsing.ts
+++ b/src/parsing.ts
@@ -1280,14 +1280,21 @@ export function getRenderInfoFromYaml(
 
     // startDate, endDate
     // console.log("Parsing startDate");
-    if (typeof yaml.startDate === "string") {
-        if (/^([\-]?[0-9]+[\.][0-9]+|[\-]?[0-9]+)m$/.test(yaml.startDate)) {
+    // Handle both string and number types (YAML may parse numeric dates as numbers)
+    if (typeof yaml.startDate === "string" || typeof yaml.startDate === "number") {
+        let strStartDate: string;
+        if (typeof yaml.startDate === "number") {
+            strStartDate = yaml.startDate.toString();
+        } else {
+            strStartDate = yaml.startDate;
+        }
+        if (/^([\-]?[0-9]+[\.][0-9]+|[\-]?[0-9]+)m$/.test(strStartDate)) {
             let errorMessage =
                 "'m' for 'minute' is too small for parameter startDate, please use 'd' for 'day' or 'M' for month";
             return errorMessage;
         }
-        let strStartDate = helper.getDateStringFromInputString(
-            yaml.startDate,
+        strStartDate = helper.getDateStringFromInputString(
+            strStartDate,
             renderInfo.dateFormatPrefix,
             renderInfo.dateFormatSuffix
         );
@@ -1322,14 +1329,21 @@ export function getRenderInfoFromYaml(
     }
 
     // console.log("Parsing endDate");
-    if (typeof yaml.endDate === "string") {
-        if (/^([\-]?[0-9]+[\.][0-9]+|[\-]?[0-9]+)m$/.test(yaml.endDate)) {
+    // Handle both string and number types (YAML may parse numeric dates as numbers)
+    if (typeof yaml.endDate === "string" || typeof yaml.endDate === "number") {
+        let strEndDate: string;
+        if (typeof yaml.endDate === "number") {
+            strEndDate = yaml.endDate.toString();
+        } else {
+            strEndDate = yaml.endDate;
+        }
+        if (/^([\-]?[0-9]+[\.][0-9]+|[\-]?[0-9]+)m$/.test(strEndDate)) {
             let errorMessage =
                 "'m' for 'minute' is too small for parameter endDate, please use 'd' for 'day' or 'M' for month";
             return errorMessage;
         }
-        let strEndDate = helper.getDateStringFromInputString(
-            yaml.endDate,
+        strEndDate = helper.getDateStringFromInputString(
+            strEndDate,
             renderInfo.dateFormatPrefix,
             renderInfo.dateFormatSuffix
         );
diff --git a/test/date-comparison-methods.test.ts b/test/date-comparison-methods.test.ts
new file mode 100644
index 0000000..d078a6b
--- /dev/null
+++ b/test/date-comparison-methods.test.ts
@@ -0,0 +1,86 @@
+/**
+ * Test to compare different date comparison methods
+ * 
+ * Question: Is valueOf() the best method, or should we use isBefore/isAfter?
+ */
+
+import * as helper from '../src/helper';
+import moment from 'moment';
+
+describe('Date Comparison Methods', () => {
+    beforeAll(() => {
+        if (typeof (global as any).window === 'undefined') {
+            (global as any).window = {};
+        }
+        (global as any).window.moment = moment;
+    });
+
+    describe('valueOf() vs isBefore/isAfter', () => {
+        it('should produce same results with valueOf() and isBefore/isAfter', () => {
+            const startDate = helper.strToDate('20240201', 'YYYYMMDD');
+            const endDate = helper.strToDate('20240203', 'YYYYMMDD');
+            const testDate = helper.strToDate('20240202', 'YYYYMMDD');
+
+            // Method 1: valueOf() (current implementation)
+            const inRangeValueOf = 
+                testDate.valueOf() >= startDate.valueOf() && 
+                testDate.valueOf() <= endDate.valueOf();
+
+            // Method 2: isBefore/isAfter with 'day' granularity
+            const inRangeMoment = 
+                !testDate.isBefore(startDate, 'day') && 
+                !testDate.isAfter(endDate, 'day');
+
+            // Method 3: isSameOrAfter/isSameOrBefore
+            const inRangeSame = 
+                testDate.isSameOrAfter(startDate, 'day') && 
+                testDate.isSameOrBefore(endDate, 'day');
+
+            expect(inRangeValueOf).toBe(true);
+            expect(inRangeMoment).toBe(true);
+            expect(inRangeSame).toBe(true);
+        });
+
+        it('should handle boundary dates correctly with both methods', () => {
+            const startDate = helper.strToDate('20240201', 'YYYYMMDD');
+            const endDate = helper.strToDate('20240203', 'YYYYMMDD');
+
+            // Test start date boundary
+            const onStartDate = helper.strToDate('20240201', 'YYYYMMDD');
+            expect(onStartDate.valueOf() >= startDate.valueOf()).toBe(true);
+            expect(!onStartDate.isBefore(startDate, 'day')).toBe(true);
+            expect(onStartDate.isSameOrAfter(startDate, 'day')).toBe(true);
+
+            // Test end date boundary
+            const onEndDate = helper.strToDate('20240203', 'YYYYMMDD');
+            expect(onEndDate.valueOf() <= endDate.valueOf()).toBe(true);
+            expect(!onEndDate.isAfter(endDate, 'day')).toBe(true);
+            expect(onEndDate.isSameOrBefore(endDate, 'day')).toBe(true);
+        });
+
+        it('should handle dates normalized to start of day', () => {
+            // strToDate normalizes to startOf('day'), so all dates should be at midnight
+            const date1 = helper.strToDate('20240201', 'YYYYMMDD');
+            const date2 = helper.strToDate('20240201', 'YYYYMMDD');
+
+            // Both should be at midnight (00:00:00)
+            expect(date1.hours()).toBe(0);
+            expect(date1.minutes()).toBe(0);
+            expect(date1.seconds()).toBe(0);
+            expect(date1.valueOf()).toBe(date2.valueOf());
+        });
+    });
+
+    describe('Performance and clarity', () => {
+        it('should note that isBefore/isAfter is more explicit about day granularity', () => {
+            // isBefore/isAfter with 'day' is more explicit about what we're comparing
+            // valueOf() works but is less clear about granularity
+            const date1 = helper.strToDate('20240201', 'YYYYMMDD');
+            const date2 = helper.strToDate('20240201', 'YYYYMMDD');
+
+            // Both methods work, but isBefore with 'day' is more explicit
+            expect(date1.isBefore(date2, 'day')).toBe(false);
+            expect(date1.valueOf() < date2.valueOf()).toBe(false);
+        });
+    });
+});
diff --git a/test/date-format-yyyymmdd.test.ts b/test/date-format-yyyymmdd.test.ts
new file mode 100644
index 0000000..94dae53
--- /dev/null
+++ b/test/date-format-yyyymmdd.test.ts
@@ -0,0 +1,206 @@
+/**
+ * Tests for Issue #324: YYYYMMDD date format not working properly for startDate/endDate
+ * 
+ * Bug: When dateFormat is set to YYYYMMDD, the startDate and endDate settings
+ * become ineffective and all files are included regardless of the date range.
+ */
+
+import * as helper from '../src/helper';
+import { RenderInfo } from '../src/data';
+import moment from 'moment';
+
+describe('Issue #324: YYYYMMDD date format with startDate/endDate', () => {
+    // Set up window.moment for tests
+    beforeAll(() => {
+        if (typeof (global as any).window === 'undefined') {
+            (global as any).window = {};
+        }
+        (global as any).window.moment = moment;
+    });
+
+    describe('strToDate function with YYYYMMDD format', () => {
+        it('should parse YYYYMMDD format correctly', () => {
+            const date = helper.strToDate('20240201', 'YYYYMMDD');
+            expect(date.isValid()).toBe(true);
+            expect(date.format('YYYY-MM-DD')).toBe('2024-02-01');
+        });
+
+        it('should parse YYYY-MM-DD format correctly (baseline)', () => {
+            const date = helper.strToDate('2024-02-01', 'YYYY-MM-DD');
+            expect(date.isValid()).toBe(true);
+            expect(date.format('YYYY-MM-DD')).toBe('2024-02-01');
+        });
+
+        it('should parse dates with YYYYMMDD format consistently', () => {
+            const date1 = helper.strToDate('20240201', 'YYYYMMDD');
+            const date2 = helper.strToDate('20240203', 'YYYYMMDD');
+            
+            expect(date1.isValid()).toBe(true);
+            expect(date2.isValid()).toBe(true);
+            
+            // Verify date comparison works
+            expect(date1.isBefore(date2)).toBe(true);
+            expect(date2.isAfter(date1)).toBe(true);
+        });
+    });
+
+    describe('Date range filtering with YYYYMMDD format', () => {
+        it('should correctly compare dates parsed with YYYYMMDD format', () => {
+            const startDate = helper.strToDate('20240201', 'YYYYMMDD');
+            const endDate = helper.strToDate('20240203', 'YYYYMMDD');
+            const testDate1 = helper.strToDate('20240131', 'YYYYMMDD'); // Before range
+            const testDate2 = helper.strToDate('20240202', 'YYYYMMDD'); // In range
+            const testDate3 = helper.strToDate('20240204', 'YYYYMMDD'); // After range
+
+            // These comparisons should work correctly
+            expect(testDate1.isBefore(startDate)).toBe(true);
+            expect(testDate2.isSameOrAfter(startDate) && testDate2.isSameOrBefore(endDate)).toBe(true);
+            expect(testDate3.isAfter(endDate)).toBe(true);
+        });
+
+        it('should correctly identify dates within range using isBefore/isAfter (fixed comparison)', () => {
+            const startDate = helper.strToDate('20240201', 'YYYYMMDD');
+            const endDate = helper.strToDate('20240203', 'YYYYMMDD');
+            const testDate1 = helper.strToDate('20240131', 'YYYYMMDD'); // Before
+            const testDate2 = helper.strToDate('20240202', 'YYYYMMDD'); // In range
+            const testDate3 = helper.strToDate('20240204', 'YYYYMMDD'); // After
+
+            // Test the fixed comparison logic using isBefore/isAfter (more reliable)
+            const beforeRange = testDate1.isBefore(startDate, 'day');
+            const inRange = !testDate2.isBefore(startDate, 'day') && !testDate2.isAfter(endDate, 'day');
+            const afterRange = testDate3.isAfter(endDate, 'day');
+
+            expect(beforeRange).toBe(true);
+            expect(inRange).toBe(true);
+            expect(afterRange).toBe(true);
+        });
+
+        it('should correctly compare dates with YYYY-MM-DD format (baseline)', () => {
+            const startDate = helper.strToDate('2024-02-01', 'YYYY-MM-DD');
+            const endDate = helper.strToDate('2024-02-03', 'YYYY-MM-DD');
+            const testDate1 = helper.strToDate('2024-01-31', 'YYYY-MM-DD');
+            const testDate2 = helper.strToDate('2024-02-02', 'YYYY-MM-DD');
+            const testDate3 = helper.strToDate('2024-02-04', 'YYYY-MM-DD');
+
+            const beforeRange = testDate1 < startDate;
+            const inRange = !(testDate2 < startDate) && !(testDate2 > endDate);
+            const afterRange = testDate3 > endDate;
+
+            expect(beforeRange).toBe(true);
+            expect(inRange).toBe(true);
+            expect(afterRange).toBe(true);
+        });
+    });
+
+    describe('Reproducing the bug: date comparison with YYYYMMDD', () => {
+        it('should correctly filter dates when using YYYYMMDD format', () => {
+            // Simulate the scenario from the issue
+            const startDateStr = '20240201';
+            const endDateStr = '20240203';
+            const dateFormat = 'YYYYMMDD';
+
+            const startDate = helper.strToDate(startDateStr, dateFormat);
+            const endDate = helper.strToDate(endDateStr, dateFormat);
+
+            // Test dates from different years (as mentioned in issue comments)
+            const datesToTest = [
+                { str: '20180101', expected: 'before' }, // 2018 - before range
+                { str: '20190101', expected: 'before' }, // 2019 - before range
+                { str: '20240201', expected: 'in' },     // Start date
+                { str: '20240202', expected: 'in' },     // In range
+                { str: '20240203', expected: 'in' },     // End date
+                { str: '20240204', expected: 'after' },  // After range
+            ];
+
+            datesToTest.forEach(({ str, expected }) => {
+                const testDate = helper.strToDate(str, dateFormat);
+                expect(testDate.isValid()).toBe(true);
+
+                // Apply the fixed filtering logic as in main.ts (using isBefore/isAfter)
+                let shouldSkip = false;
+                if (startDate !== null && startDate.isValid()) {
+                    if (testDate.isBefore(startDate, 'day')) {
+                        shouldSkip = true;
+                    }
+                }
+                if (endDate !== null && endDate.isValid()) {
+                    if (testDate.isAfter(endDate, 'day')) {
+                        shouldSkip = true;
+                    }
+                }
+
+                if (expected === 'before' || expected === 'after') {
+                    expect(shouldSkip).toBe(true);
+                } else {
+                    expect(shouldSkip).toBe(false);
+                }
+            });
+        });
+
+        it('BUG REPRODUCTION: should fail when dates have different format contexts', () => {
+            // This test reproduces the actual bug scenario
+            // When startDate/endDate are parsed with YYYYMMDD format,
+            // and file dates are also parsed with YYYYMMDD format,
+            // the comparison might fail due to format context issues
+            
+            const dateFormat = 'YYYYMMDD';
+            
+            // Parse startDate and endDate (as done in parsing.ts)
+            const startDate = helper.strToDate('20240201', dateFormat);
+            const endDate = helper.strToDate('20240203', dateFormat);
+            
+            // Parse file dates (as done when reading files)
+            const fileDate1 = helper.strToDate('20180101', dateFormat); // Before range
+            const fileDate2 = helper.strToDate('20240202', dateFormat); // In range
+            const fileDate3 = helper.strToDate('20240204', dateFormat); // After range
+            
+            // Check if dates are valid
+            expect(startDate.isValid()).toBe(true);
+            expect(endDate.isValid()).toBe(true);
+            expect(fileDate1.isValid()).toBe(true);
+            expect(fileDate2.isValid()).toBe(true);
+            expect(fileDate3.isValid()).toBe(true);
+            
+            // The bug: comparison might fail if dates have different internal format storage
+            // Check the creation data format
+            const startFormat = startDate.creationData().format;
+            const fileFormat1 = fileDate1.creationData().format;
+            
+            // If formats differ, comparison might fail
+            // This is the suspected bug
+            const formatsMatch = startFormat.toString() === fileFormat1.toString();
+            
+            // Test the actual comparison operators used in main.ts
+            const beforeRange = fileDate1 < startDate;
+            const inRange = !(fileDate2 < startDate) && !(fileDate2 > endDate);
+            const afterRange = fileDate3 > endDate;
+            
+            // These should all work correctly
+            expect(beforeRange).toBe(true);
+            expect(inRange).toBe(true);
+            expect(afterRange).toBe(true);
+        });
+    });
+
+    describe('dateToStr and strToDate roundtrip with YYYYMMDD', () => {
+        it('should correctly roundtrip dates with YYYYMMDD format', () => {
+            const originalDate = moment('2024-02-01');
+            const dateStr = helper.dateToStr(originalDate, 'YYYYMMDD');
+            expect(dateStr).toBe('20240201');
+
+            const parsedDate = helper.strToDate(dateStr, 'YYYYMMDD');
+            expect(parsedDate.isValid()).toBe(true);
+            expect(parsedDate.format('YYYY-MM-DD')).toBe('2024-02-01');
+        });
+
+        it('should correctly roundtrip dates with YYYY-MM-DD format (baseline)', () => {
+            const originalDate = moment('2024-02-01');
+            const dateStr = helper.dateToStr(originalDate, 'YYYY-MM-DD');
+            expect(dateStr).toBe('2024-02-01');
+
+            const parsedDate = helper.strToDate(dateStr, 'YYYY-MM-DD');
+            expect(parsedDate.isValid()).toBe(true);
+            expect(parsedDate.format('YYYY-MM-DD')).toBe('2024-02-01');
+        });
+    });
+});
diff --git a/test/edge-cases-date-filtering.test.ts b/test/edge-cases-date-filtering.test.ts
new file mode 100644
index 0000000..f7a8877
--- /dev/null
+++ b/test/edge-cases-date-filtering.test.ts
@@ -0,0 +1,365 @@
+/**
+ * Edge case tests for date filtering
+ * 
+ * Tests various edge cases that might not be covered by the main test cases
+ */
+
+import { getRenderInfoFromYaml } from '../src/parsing';
+import { getDateFromFilename } from '../src/collecting';
+import { RenderInfo } from '../src/data';
+import moment from 'moment';
+
+// Mock Tracker plugin
+class MockTracker {
+    app: any;
+    settings: any;
+
+    constructor() {
+        this.app = {
+            vault: {
+                getAbstractFileByPath: (path: string) => {
+                    const { TFolder } = require('./mocks/obsidian');
+                    return new TFolder(path, path);
+                },
+                getConfig: (key: string) => {
+                    if (key === 'tabSize') return 4;
+                    return null;
+                }
+            }
+        };
+        this.settings = {
+            folder: '/',
+            dateFormat: 'YYYY-MM-DD'
+        };
+    }
+}
+
+describe('Edge Cases: Date Filtering', () => {
+    let mockPlugin: MockTracker;
+
+    beforeAll(() => {
+        if (typeof (global as any).window === 'undefined') {
+            (global as any).window = {};
+        }
+        (global as any).window.moment = moment;
+        mockPlugin = new MockTracker();
+    });
+
+    describe('Boundary conditions', () => {
+        it('should include files with dates exactly equal to startDate', () => {
+            const yamlText = `
+searchType: tag
+searchTarget: weight
+folder: test
+dateFormat: YYYYMMDD
+startDate: 20240201
+endDate: 20240203
+line:
+  title: Test
+`.trim();
+
+            const renderInfo = getRenderInfoFromYaml(yamlText, mockPlugin as any);
+            if (typeof renderInfo === 'string') {
+                fail(`Parsing failed: ${renderInfo}`);
+                return;
+            }
+
+            const file = { basename: '20240201', name: '20240201.md', path: 'test/20240201.md' };
+            const fileDate = getDateFromFilename(file as any, renderInfo);
+
+            const startDate = renderInfo.startDate!;
+            const endDate = renderInfo.endDate!;
+
+            // File date equals startDate - should be included
+            expect(fileDate.valueOf() >= startDate.valueOf()).toBe(true);
+            expect(fileDate.valueOf() <= endDate.valueOf()).toBe(true);
+        });
+
+        it('should include files with dates exactly equal to endDate', () => {
+            const yamlText = `
+searchType: tag
+searchTarget: weight
+folder: test
+dateFormat: YYYYMMDD
+startDate: 20240201
+endDate: 20240203
+line:
+  title: Test
+`.trim();
+
+            const renderInfo = getRenderInfoFromYaml(yamlText, mockPlugin as any);
+            if (typeof renderInfo === 'string') {
+                fail(`Parsing failed: ${renderInfo}`);
+                return;
+            }
+
+            const file = { basename: '20240203', name: '20240203.md', path: 'test/20240203.md' };
+            const fileDate = getDateFromFilename(file as any, renderInfo);
+
+            const startDate = renderInfo.startDate!;
+            const endDate = renderInfo.endDate!;
+
+            // File date equals endDate - should be included
+            expect(fileDate.valueOf() >= startDate.valueOf()).toBe(true);
+            expect(fileDate.valueOf() <= endDate.valueOf()).toBe(true);
+        });
+
+        it('should exclude files with dates exactly one day before startDate', () => {
+            const yamlText = `
+searchType: tag
+searchTarget: weight
+folder: test
+dateFormat: YYYYMMDD
+startDate: 20240201
+endDate: 20240203
+line:
+  title: Test
+`.trim();
+
+            const renderInfo = getRenderInfoFromYaml(yamlText, mockPlugin as any);
+            if (typeof renderInfo === 'string') {
+                fail(`Parsing failed: ${renderInfo}`);
+                return;
+            }
+
+            const file = { basename: '20240131', name: '20240131.md', path: 'test/20240131.md' };
+            const fileDate = getDateFromFilename(file as any, renderInfo);
+
+            const startDate = renderInfo.startDate!;
+
+            // File date is before startDate - should be excluded
+            expect(fileDate.valueOf() < startDate.valueOf()).toBe(true);
+        });
+
+        it('should exclude files with dates exactly one day after endDate', () => {
+            const yamlText = `
+searchType: tag
+searchTarget: weight
+folder: test
+dateFormat: YYYYMMDD
+startDate: 20240201
+endDate: 20240203
+line:
+  title: Test
+`.trim();
+
+            const renderInfo = getRenderInfoFromYaml(yamlText, mockPlugin as any);
+            if (typeof renderInfo === 'string') {
+                fail(`Parsing failed: ${renderInfo}`);
+                return;
+            }
+
+            const file = { basename: '20240204', name: '20240204.md', path: 'test/20240204.md' };
+            const fileDate = getDateFromFilename(file as any, renderInfo);
+
+            const endDate = renderInfo.endDate!;
+
+            // File date is after endDate - should be excluded
+            expect(fileDate.valueOf() > endDate.valueOf()).toBe(true);
+        });
+    });
+
+    describe('Missing date boundaries', () => {
+        it('should include all files when startDate is missing', () => {
+            const yamlText = `
+searchType: tag
+searchTarget: weight
+folder: test
+dateFormat: YYYYMMDD
+endDate: 20240203
+line:
+  title: Test
+`.trim();
+
+            const renderInfo = getRenderInfoFromYaml(yamlText, mockPlugin as any);
+            if (typeof renderInfo === 'string') {
+                fail(`Parsing failed: ${renderInfo}`);
+                return;
+            }
+
+            expect(renderInfo.startDate).toBeNull();
+            expect(renderInfo.endDate).not.toBeNull();
+
+            // Files before endDate should be included
+            const file = { basename: '20240101', name: '20240101.md', path: 'test/20240101.md' };
+            const fileDate = getDateFromFilename(file as any, renderInfo);
+            const endDate = renderInfo.endDate!;
+
+            expect(fileDate.valueOf() <= endDate.valueOf()).toBe(true);
+        });
+
+        it('should include all files when endDate is missing', () => {
+            const yamlText = `
+searchType: tag
+searchTarget: weight
+folder: test
+dateFormat: YYYYMMDD
+startDate: 20240201
+line:
+  title: Test
+`.trim();
+
+            const renderInfo = getRenderInfoFromYaml(yamlText, mockPlugin as any);
+            if (typeof renderInfo === 'string') {
+                fail(`Parsing failed: ${renderInfo}`);
+                return;
+            }
+
+            expect(renderInfo.startDate).not.toBeNull();
+            expect(renderInfo.endDate).toBeNull();
+
+            // Files after startDate should be included
+            const file = { basename: '20241231', name: '20241231.md', path: 'test/20241231.md' };
+            const fileDate = getDateFromFilename(file as any, renderInfo);
+            const startDate = renderInfo.startDate!;
+
+            expect(fileDate.valueOf() >= startDate.valueOf()).toBe(true);
+        });
+
+        it('should include all files when both startDate and endDate are missing', () => {
+            const yamlText = `
+searchType: tag
+searchTarget: weight
+folder: test
+dateFormat: YYYYMMDD
+line:
+  title: Test
+`.trim();
+
+            const renderInfo = getRenderInfoFromYaml(yamlText, mockPlugin as any);
+            if (typeof renderInfo === 'string') {
+                fail(`Parsing failed: ${renderInfo}`);
+                return;
+            }
+
+            expect(renderInfo.startDate).toBeNull();
+            expect(renderInfo.endDate).toBeNull();
+
+            // Any file should be processable
+            const file = { basename: '20240101', name: '20240101.md', path: 'test/20240101.md' };
+            const fileDate = getDateFromFilename(file as any, renderInfo);
+
+            expect(fileDate.isValid()).toBe(true);
+        });
+    });
+
+    describe('Year/month boundaries', () => {
+        it('should handle dates at year boundary correctly', () => {
+            const yamlText = `
+searchType: tag
+searchTarget: weight
+folder: test
+dateFormat: YYYYMMDD
+startDate: 20231231
+endDate: 20240102
+line:
+  title: Test
+`.trim();
+
+            const renderInfo = getRenderInfoFromYaml(yamlText, mockPlugin as any);
+            if (typeof renderInfo === 'string') {
+                fail(`Parsing failed: ${renderInfo}`);
+                return;
+            }
+
+            const files = [
+                { basename: '20231230', expected: 'excluded' }, // Before
+                { basename: '20231231', expected: 'included' }, // Start
+                { basename: '20240101', expected: 'included' }, // Year boundary
+                { basename: '20240102', expected: 'included' }, // End
+                { basename: '20240103', expected: 'excluded' }, // After
+            ];
+
+            const startDate = renderInfo.startDate!;
+            const endDate = renderInfo.endDate!;
+
+            for (const { basename, expected } of files) {
+                const file = { basename, name: `${basename}.md`, path: `test/${basename}.md` };
+                const fileDate = getDateFromFilename(file as any, renderInfo);
+
+                const inRange = 
+                    fileDate.valueOf() >= startDate.valueOf() && 
+                    fileDate.valueOf() <= endDate.valueOf();
+
+                if (expected === 'included') {
+                    expect(inRange).toBe(true);
+                } else {
+                    expect(inRange).toBe(false);
+                }
+            }
+        });
+
+        it('should handle dates at month boundary correctly', () => {
+            const yamlText = `
+searchType: tag
+searchTarget: weight
+folder: test
+dateFormat: YYYYMMDD
+startDate: 20240131
+endDate: 20240202
+line:
+  title: Test
+`.trim();
+
+            const renderInfo = getRenderInfoFromYaml(yamlText, mockPlugin as any);
+            if (typeof renderInfo === 'string') {
+                fail(`Parsing failed: ${renderInfo}`);
+                return;
+            }
+
+            const files = [
+                { basename: '20240130', expected: 'excluded' }, // Before
+                { basename: '20240131', expected: 'included' }, // Start (last day of Jan)
+                { basename: '20240201', expected: 'included' }, // Month boundary
+                { basename: '20240202', expected: 'included' }, // End
+                { basename: '20240203', expected: 'excluded' }, // After
+            ];
+
+            const startDate = renderInfo.startDate!;
+            const endDate = renderInfo.endDate!;
+
+            for (const { basename, expected } of files) {
+                const file = { basename, name: `${basename}.md`, path: `test/${basename}.md` };
+                const fileDate = getDateFromFilename(file as any, renderInfo);
+
+                const inRange = 
+                    fileDate.valueOf() >= startDate.valueOf() && 
+                    fileDate.valueOf() <= endDate.valueOf();
+
+                if (expected === 'included') {
+                    expect(inRange).toBe(true);
+                } else {
+                    expect(inRange).toBe(false);
+                }
+            }
+        });
+    });
+
+    describe('Invalid date handling', () => {
+        it('should handle files with invalid date formats gracefully', () => {
+            const yamlText = `
+searchType: tag
+searchTarget: weight
+folder: test
+dateFormat: YYYYMMDD
+startDate: 20240201
+endDate: 20240203
+line:
+  title: Test
+`.trim();
+
+            const renderInfo = getRenderInfoFromYaml(yamlText, mockPlugin as any);
+            if (typeof renderInfo === 'string') {
+                fail(`Parsing failed: ${renderInfo}`);
+                return;
+            }
+
+            // File with invalid date format
+            const file = { basename: 'invalid-date', name: 'invalid-date.md', path: 'test/invalid-date.md' };
+            const fileDate = getDateFromFilename(file as any, renderInfo);
+
+            // Invalid dates should be marked as invalid
+            expect(fileDate.isValid()).toBe(false);
+        });
+    });
+});
diff --git a/test/mocks/d3.ts b/test/mocks/d3.ts
new file mode 100644
index 0000000..b5cfd5f
--- /dev/null
+++ b/test/mocks/d3.ts
@@ -0,0 +1,2 @@
+// Mock for d3 library
+export default {};
diff --git a/test/mocks/obsidian.ts b/test/mocks/obsidian.ts
new file mode 100644
index 0000000..c2a2c87
--- /dev/null
+++ b/test/mocks/obsidian.ts
@@ -0,0 +1,93 @@
+// Mock for Obsidian API
+// This provides window.moment which is used throughout the codebase
+
+import moment from 'moment';
+
+// Create a global window object if it doesn't exist
+if (typeof (global as any).window === 'undefined') {
+    (global as any).window = {};
+}
+
+// Mock window.moment with the actual moment library
+(global as any).window.moment = moment;
+
+// Export minimal Obsidian types for TypeScript
+export class TFile {
+    basename: string;
+    name: string;
+    path: string;
+    extension: string;
+    stat: any;
+
+    constructor(basename: string, path: string = '') {
+        this.basename = basename;
+        this.name = basename;
+        this.path = path || basename;
+        this.extension = '';
+        this.stat = {};
+    }
+}
+
+export class TFolder {
+    name: string;
+    path: string;
+
+    constructor(name: string, path: string = '') {
+        this.name = name;
+        this.path = path || name;
+    }
+}
+
+export function normalizePath(path: string): string {
+    return path.replace(/\\/g, '/');
+}
+
+export interface CachedMetadata {
+    frontmatter?: Record<string, any>;
+    tags?: Array<{ tag: string }>;
+}
+
+// Simple YAML parser for testing (handles basic key-value pairs and nested objects)
+export function parseYaml(yamlText: string): any {
+    const result: any = {};
+    const lines = yamlText.split('\n');
+    const stack: Array<{ obj: any; indent: number }> = [{ obj: result, indent: -1 }];
+    
+    for (const line of lines) {
+        const trimmed = line.trim();
+        if (!trimmed || trimmed.startsWith('#')) continue;
+        
+        // Calculate indentation (spaces before first non-space char)
+        const indent = line.length - line.trimStart().length;
+        
+        // Pop stack until we find the parent at this indentation level
+        while (stack.length > 1 && stack[stack.length - 1].indent >= indent) {
+            stack.pop();
+        }
+        
+        const colonIndex = trimmed.indexOf(':');
+        if (colonIndex === -1) continue;
+        
+        const key = trimmed.substring(0, colonIndex).trim();
+        let value: any = trimmed.substring(colonIndex + 1).trim();
+        
+        // Remove quotes if present
+        if ((value.startsWith('"') && value.endsWith('"')) ||
+            (value.startsWith("'") && value.endsWith("'"))) {
+            value = value.slice(1, -1);
+        }
+        
+        // If value is empty, it's likely a nested object
+        const currentObj = stack[stack.length - 1].obj;
+        if (value === '') {
+            // Create nested object
+            currentObj[key] = {};
+            stack.push({ obj: currentObj[key], indent: indent });
+        } else {
+            // Simple key-value pair
+            currentObj[key] = value;
+        }
+    }
+    
+    return result;
+}
diff --git a/test/parsing-yyyymmdd.test.ts b/test/parsing-yyyymmdd.test.ts
new file mode 100644
index 0000000..34d6f87
--- /dev/null
+++ b/test/parsing-yyyymmdd.test.ts
@@ -0,0 +1,154 @@
+/**
+ * Tests for Issue #324: YYYYMMDD date format parsing in getRenderInfoFromYaml
+ * 
+ * This test verifies that startDate and endDate are correctly parsed from YAML
+ * when dateFormat is YYYYMMDD.
+ */
+
+import { getRenderInfoFromYaml } from '../src/parsing';
+import { RenderInfo } from '../src/data';
+import moment from 'moment';
+
+// Mock Tracker plugin
+class MockTracker {
+    app: any;
+    settings: any;
+
+    constructor() {
+        this.app = {
+            vault: {
+                getAbstractFileByPath: (path: string) => {
+                    // Return a mock folder for any path
+                    const { TFolder } = require('./mocks/obsidian');
+                    return new TFolder(path, path);
+                },
+                getConfig: (key: string) => {
+                    if (key === 'tabSize') return 4;
+                    return null;
+                }
+            }
+        };
+        this.settings = {
+            folder: '/',
+            dateFormat: 'YYYY-MM-DD'
+        };
+    }
+}
+
+describe('Issue #324: YYYYMMDD date format parsing', () => {
+    let mockPlugin: MockTracker;
+
+    beforeAll(() => {
+        if (typeof (global as any).window === 'undefined') {
+            (global as any).window = {};
+        }
+        (global as any).window.moment = moment;
+        mockPlugin = new MockTracker();
+    });
+
+    it('should parse startDate and endDate with YYYYMMDD format', () => {
+        const yamlText = `
+searchType: tag
+searchTarget: weight
+folder: test-issue-324
+dateFormat: YYYYMMDD
+startDate: 20240201
+endDate: 20240203
+line:
+  title: Test
+`.trim();
+
+        const result = getRenderInfoFromYaml(yamlText, mockPlugin as any);
+        
+        // Log the actual result to see what we're getting
+        if (typeof result === 'string') {
+            console.log('Error message:', result);
+        }
+        
+        expect(typeof result).toBe('object');
+        expect(result).not.toBeInstanceOf(String); // Should not be an error message
+        
+        const renderInfo = result as RenderInfo;
+        
+        // Check that dateFormat is set correctly
+        expect(renderInfo.dateFormat).toBe('YYYYMMDD');
+        
+        // Check that startDate and endDate are parsed correctly
+        expect(renderInfo.startDate).not.toBeNull();
+        expect(renderInfo.startDate?.isValid()).toBe(true);
+        expect(renderInfo.startDate?.format('YYYY-MM-DD')).toBe('2024-02-01');
+        
+        expect(renderInfo.endDate).not.toBeNull();
+        expect(renderInfo.endDate?.isValid()).toBe(true);
+        expect(renderInfo.endDate?.format('YYYY-MM-DD')).toBe('2024-02-03');
+    });
+
+    it('should parse startDate and endDate with YYYY-MM-DD format (baseline)', () => {
+        const yamlText = `
+searchType: tag
+searchTarget: weight
+folder: test-issue-324
+dateFormat: YYYY-MM-DD
+startDate: 2024-02-01
+endDate: 2024-02-03
+line:
+    title: Test
+`.trim();
+
+        const result = getRenderInfoFromYaml(yamlText, mockPlugin as any);
+        
+        expect(typeof result).toBe('object');
+        expect(result).not.toBeInstanceOf(String);
+        
+        const renderInfo = result as RenderInfo;
+        
+        expect(renderInfo.dateFormat).toBe('YYYY-MM-DD');
+        expect(renderInfo.startDate).not.toBeNull();
+        expect(renderInfo.startDate?.isValid()).toBe(true);
+        expect(renderInfo.startDate?.format('YYYY-MM-DD')).toBe('2024-02-01');
+        
+        expect(renderInfo.endDate).not.toBeNull();
+        expect(renderInfo.endDate?.isValid()).toBe(true);
+        expect(renderInfo.endDate?.format('YYYY-MM-DD')).toBe('2024-02-03');
+    });
+
+    it('should handle missing startDate and endDate', () => {
+        const yamlText = `
+searchType: tag
+searchTarget: weight
+folder: test-issue-324
+dateFormat: YYYYMMDD
+line:
+    title: Test
+`.trim();
+
+        const result = getRenderInfoFromYaml(yamlText, mockPlugin as any);
+        
+        expect(typeof result).toBe('object');
+        expect(result).not.toBeInstanceOf(String);
+        
+        const renderInfo = result as RenderInfo;
+        
+        expect(renderInfo.dateFormat).toBe('YYYYMMDD');
+        expect(renderInfo.startDate).toBeNull();
+        expect(renderInfo.endDate).toBeNull();
+    });
+
+    it('should return error for invalid startDate format', () => {
+        const yamlText = `
+searchType: tag
+searchTarget: weight
+folder: test-issue-324
+dateFormat: YYYYMMDD
+startDate: invalid-date
+endDate: 20240203
+line:
+    title: Test
+`.trim();
+
+        const result = getRenderInfoFromYaml(yamlText, mockPlugin as any);
+        
+        expect(typeof result).toBe('string'); // Should be an error message
+        expect(result).toContain('Invalid startDate');
+    });
+});
diff --git a/test/setup.ts b/test/setup.ts
new file mode 100644
index 0000000..1912fc4
--- /dev/null
+++ b/test/setup.ts
@@ -0,0 +1,11 @@
+// Jest setup file
+// This runs before each test file
+
+// Ensure window.moment is available globally
+import moment from 'moment';
+
+if (typeof (global as any).window === 'undefined') {
+    (global as any).window = {};
+}
+
+(global as any).window.moment = moment;

From 08c6f7bfaf0c9527d47e08c33688c36c1edf8b44 Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Wed, 18 Feb 2026 21:57:50 -0700
Subject: [PATCH 394/402] Small corrections from PR

---
 docs/Examples.md | 4 ++--
 manifest.json    | 2 +-
 versions.json    | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/docs/Examples.md b/docs/Examples.md
index 2d09417..efd0593 100644
--- a/docs/Examples.md
+++ b/docs/Examples.md
@@ -35,7 +35,7 @@ Check where (Location) and what (Target to Track) is your target and find the se
 | content | - [x] Say love<br>- [ ] Say love | searchType:task<br>searchTarget: Say love | O |
 | content | - [x] Say love | searchType:task.done<br>searchTarget: Say love | O |
 | content | - [ ] Say love | searchType: task.notdone<br>searchTarget: Say love | O |
-| frontmatter | habits: spanish, piano, yoga<br>([more examples](https://github.com/curious-archaea/obsidian-tracker/blob/master/docs/TargetEvaluation.md#Formatting-property-values-in-frontmatter))| searchType: frontmatterlist<br>searchTarget: habits[spanish] | O |
+| frontmatter | habits: spanish, piano, yoga<br>([more examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/TargetEvaluation.md#Formatting-property-values-in-frontmatter))| searchType: frontmatterlist<br>searchTarget: habits[spanish] | O |
 
 ## Full examples
 
@@ -55,7 +55,7 @@ List of all examples
 - [Dataview Inline Field](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDvField.md)
 - [Expression](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestExpression.md)
 - [File Meta](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestFileMeta.md)
-- [Frontmatter Lists](https://github.com/curious-archaea/obsidian-tracker/blob/master/examples/TestFrontmatterList.md) (New!)
+- [Frontmatter Lists](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestFrontmatterList.md) (New!)
 - [Legends](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestLegends.md)
 - [Multiple Targets / Multiple Values](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestMultipleTargetsMultipleValues.md)
 - [Pie Chart](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestPieChart.md)
diff --git a/manifest.json b/manifest.json
index ab508a9..557f716 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "id": "obsidian-tracker",
   "name": "Tracker",
-  "version": "1.18.0",
+  "version": "1.17.0",
   "minAppVersion": "0.9.12",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "author": "pyrochlore",
diff --git a/versions.json b/versions.json
index 9157c01..3e7e34e 100644
--- a/versions.json
+++ b/versions.json
@@ -39,6 +39,5 @@
   "1.15.0": "0.9.12",
   "1.15.1": "0.9.12",
   "1.16.0": "0.9.12",
-  "1.17.0": "0.9.12",
-  "1.18.0": "0.9.12"
+  "1.17.0": "0.9.12"
 }

From fbf9c56cd17fcacfe2723bce1d50ea50ae413624 Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Wed, 18 Feb 2026 22:13:40 -0700
Subject: [PATCH 395/402] Update dependencies

---
 package-lock.json     | 32 ++++++++++++++++----------------
 package.json          | 12 ++++++------
 rollup.config.dev.mjs |  2 +-
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 967cba3..2862bf5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,18 +15,18 @@
         "sprintf-js": "^1.1.3"
       },
       "devDependencies": {
-        "@rollup/plugin-commonjs": "^28.0.5",
-        "@rollup/plugin-node-resolve": "^16.0.1",
+        "@rollup/plugin-commonjs": "^29.0.0",
+        "@rollup/plugin-node-resolve": "^16.0.3",
         "@rollup/plugin-terser": "^0.4.4",
-        "@rollup/plugin-typescript": "^12.1.2",
+        "@rollup/plugin-typescript": "^12.3.0",
         "@types/d3": "^7.4.3",
-        "@types/node": "^24.0.3",
+        "@types/node": "^25.3.0",
         "@types/sprintf-js": "^1.1.4",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-        "rollup": "^4.44.0",
+        "rollup": "^4.57.1",
         "rollup-plugin-copy": "^3.5.0",
         "tslib": "^2.8.1",
-        "typescript": "^5.8.3"
+        "typescript": "^5.9.3"
       }
     },
     "node_modules/@codemirror/state": {
@@ -150,9 +150,9 @@
       }
     },
     "node_modules/@rollup/plugin-commonjs": {
-      "version": "28.0.9",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-28.0.9.tgz",
-      "integrity": "sha512-PIR4/OHZ79romx0BVVll/PkwWpJ7e5lsqFa3gFfcrFPWwLXLV39JVUzQV9RKjWerE7B845Hqjj9VYlQeieZ2dA==",
+      "version": "29.0.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-29.0.0.tgz",
+      "integrity": "sha512-U2YHaxR2cU/yAiwKJtJRhnyLk7cifnQw0zUpISsocBDoHDJn+HTV74ABqnwr5bEgWUwFZC9oFL6wLe21lHu5eQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -961,13 +961,13 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "24.10.13",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.13.tgz",
-      "integrity": "sha512-oH72nZRfDv9lADUBSo104Aq7gPHpQZc4BTx38r9xf9pg5LfP6EzSyH2n7qFmmxRQXh7YlUXODcYsg6PuTDSxGg==",
+      "version": "25.3.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.3.0.tgz",
+      "integrity": "sha512-4K3bqJpXpqfg2XKGK9bpDTc6xO/xoUP/RBWS7AtRMug6zZFaRekiLzjVtAoZMquxoAbzBvy5nxQ7veS5eYzf8A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~7.16.0"
+        "undici-types": "~7.18.0"
       }
     },
     "node_modules/@types/resolve": {
@@ -2323,9 +2323,9 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
-      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz",
+      "integrity": "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==",
       "dev": true,
       "license": "MIT"
     },
diff --git a/package.json b/package.json
index 58f2a50..bd5ffb3 100644
--- a/package.json
+++ b/package.json
@@ -12,18 +12,18 @@
   "author": "pyrochlore",
   "license": "MIT",
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^28.0.5",
-    "@rollup/plugin-node-resolve": "^16.0.1",
+    "@rollup/plugin-commonjs": "^29.0.0",
+    "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-terser": "^0.4.4",
-    "@rollup/plugin-typescript": "^12.1.2",
+    "@rollup/plugin-typescript": "^12.3.0",
     "@types/d3": "^7.4.3",
-    "@types/node": "^24.0.3",
+    "@types/node": "^25.3.0",
     "@types/sprintf-js": "^1.1.4",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-    "rollup": "^4.44.0",
+    "rollup": "^4.57.1",
     "rollup-plugin-copy": "^3.5.0",
     "tslib": "^2.8.1",
-    "typescript": "^5.8.3"
+    "typescript": "^5.9.3"
   },
   "dependencies": {
     "d3": "^7.9.0",
diff --git a/rollup.config.dev.mjs b/rollup.config.dev.mjs
index 22c50a2..50363b1 100644
--- a/rollup.config.dev.mjs
+++ b/rollup.config.dev.mjs
@@ -35,4 +35,4 @@ export default {
       warner(warning);
     }
   }
-};
\ No newline at end of file
+};

From 77c62ebcd2fb4b75767337e6fc6ba76728513a07 Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Wed, 18 Feb 2026 22:19:23 -0700
Subject: [PATCH 396/402] Release 1.18.0

---
 README.md            | 7 +++++++
 docs/ReleaseNotes.md | 7 +++++++
 manifest.json        | 2 +-
 package-lock.json    | 4 ++--
 package.json         | 2 +-
 versions.json        | 3 ++-
 6 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index af6f918..5c82199 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,13 @@ This is an [Obsidian](https://obsidian.md/) plugin that helps you collect data f
 
 ## What's New
 
+Version 1.18.0
+
+- Support all days for startWeekOn parameter
+- Handle numeric YAML parsing for startDate/endDate with YYYYMMDD format
+- Add searchType for frontmatter keys containing lists
+- Update dependencies
+
 Version 1.17.0
 
 - Adding colorByStreak parameter to Calendars allowing for increase color intensity based on streak
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index da14099..274b6fd 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,5 +1,12 @@
 # Release Notes
 
+## 1.18.0
+
+- Support all days for startWeekOn parameter
+- Handle numeric YAML parsing for startDate/endDate with YYYYMMDD format
+- Add searchType for frontmatter keys containing lists
+- Update dependencies
+
 ## 1.17.0
 
 - Adding colorByStreak parameter to Calendars allowing for increase color intensity based on streak
diff --git a/manifest.json b/manifest.json
index 557f716..ab508a9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "id": "obsidian-tracker",
   "name": "Tracker",
-  "version": "1.17.0",
+  "version": "1.18.0",
   "minAppVersion": "0.9.12",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "author": "pyrochlore",
diff --git a/package-lock.json b/package-lock.json
index 2862bf5..f04e151 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.17.0",
+  "version": "1.18.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "obsidian-tracker",
-      "version": "1.17.0",
+      "version": "1.18.0",
       "license": "MIT",
       "dependencies": {
         "d3": "^7.9.0",
diff --git a/package.json b/package.json
index bd5ffb3..49a0870 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.17.0",
+  "version": "1.18.0",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
diff --git a/versions.json b/versions.json
index 3e7e34e..9157c01 100644
--- a/versions.json
+++ b/versions.json
@@ -39,5 +39,6 @@
   "1.15.0": "0.9.12",
   "1.15.1": "0.9.12",
   "1.16.0": "0.9.12",
-  "1.17.0": "0.9.12"
+  "1.17.0": "0.9.12",
+  "1.18.0": "0.9.12"
 }

From 6c4cd8e5523c21941da6d79f20c8180993d64d2a Mon Sep 17 00:00:00 2001
From: Mike Greiner <mike.greiner@protonmail.com>
Date: Thu, 19 Feb 2026 07:33:47 -0700
Subject: [PATCH 397/402] fix: add meditation frontmatter key to example diary
 files

The TestFrontmatter.md example for frontmatter.exists searched for
a 'meditation' key in frontmatter, but the diary files only had
#meditation as an inline tag in the body. Added meditation: true
to the frontmatter of all 38 diary files that have the inline tag,
so the frontmatter.exists example works correctly.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 examples/diary/05-01-2021.md               | 1 +
 examples/diary/05.01.2021.md               | 1 +
 examples/diary/2021-01-02.md               | 1 +
 examples/diary/2021-01-03.md               | 1 +
 examples/diary/2021-01-04.md               | 1 +
 examples/diary/2021-01-05-Tuesday.md       | 1 +
 examples/diary/2021-01-05.md               | 1 +
 examples/diary/2021-01-06.md               | 1 +
 examples/diary/2021-01-09.md               | 1 +
 examples/diary/2021-01-12.md               | 1 +
 examples/diary/2021-01-13.md               | 1 +
 examples/diary/2021-01-14.md               | 1 +
 examples/diary/2021-01-15.md               | 1 +
 examples/diary/2021-01-18.md               | 1 +
 examples/diary/2021-01-19.md               | 1 +
 examples/diary/2021-01-21.md               | 1 +
 examples/diary/2021-01-24.md               | 1 +
 examples/diary/2021-01-26.md               | 1 +
 examples/diary/2021-01-27.md               | 1 +
 examples/diary/20210103-D.md               | 1 +
 examples/diary/20210104-D.md               | 1 +
 examples/diary/20210105-D.md               | 1 +
 examples/diary/5-20210105.md               | 1 +
 examples/diary/D-20210103.md               | 1 +
 examples/diary/D-20210104.md               | 1 +
 examples/diary/D-20210105.md               | 1 +
 examples/diary/Jeffrey-20210103-Diary.md   | 1 +
 examples/diary/Jeffrey-20210103-Journal.md | 1 +
 examples/diary/Jeffrey-20210104-Diary.md   | 1 +
 examples/diary/Jeffrey-20210104-Journal.md | 1 +
 examples/diary/Jeffrey-20210105-Diary.md   | 1 +
 examples/diary/Jeffrey-20210105-Journal.md | 1 +
 examples/diary/Lucas-20210103-Diary.md     | 1 +
 examples/diary/Lucas-20210103-Journal.md   | 1 +
 examples/diary/Lucas-20210104-Diary.md     | 1 +
 examples/diary/Lucas-20210104-Journal.md   | 1 +
 examples/diary/Lucas-20210105-Diary.md     | 1 +
 examples/diary/Lucas-20210105-Journal.md   | 1 +
 38 files changed, 38 insertions(+)

diff --git a/examples/diary/05-01-2021.md b/examples/diary/05-01-2021.md
index 892a3e0..f9285eb 100644
--- a/examples/diary/05-01-2021.md
+++ b/examples/diary/05-01-2021.md
@@ -1,6 +1,7 @@
 ---
 tags: work_log
 mood: 8
+meditation: true
 ---
 
 #weight:60.2kg
diff --git a/examples/diary/05.01.2021.md b/examples/diary/05.01.2021.md
index 892a3e0..f9285eb 100644
--- a/examples/diary/05.01.2021.md
+++ b/examples/diary/05.01.2021.md
@@ -1,6 +1,7 @@
 ---
 tags: work_log
 mood: 8
+meditation: true
 ---
 
 #weight:60.2kg
diff --git a/examples/diary/2021-01-02.md b/examples/diary/2021-01-02.md
index f81816e..efa7db3 100644
--- a/examples/diary/2021-01-02.md
+++ b/examples/diary/2021-01-02.md
@@ -18,6 +18,7 @@ deepValue:
                     very: 
                         deep: 13.3
 randchar: D
+meditation: true
 ---
 
 #weight:76.2kg
diff --git a/examples/diary/2021-01-03.md b/examples/diary/2021-01-03.md
index 7d0cc2e..c932cbc 100644
--- a/examples/diary/2021-01-03.md
+++ b/examples/diary/2021-01-03.md
@@ -18,6 +18,7 @@ deepValue:
                     very: 
                         deep: 73.0
 randchar: D
+meditation: true
 ---
 
 #weight:63.2kg
diff --git a/examples/diary/2021-01-04.md b/examples/diary/2021-01-04.md
index 05cf37f..20e97e9 100644
--- a/examples/diary/2021-01-04.md
+++ b/examples/diary/2021-01-04.md
@@ -18,6 +18,7 @@ deepValue:
                     very: 
                         deep: 88.6
 randchar: B
+meditation: true
 ---
 
 #weight:61.6kg
diff --git a/examples/diary/2021-01-05-Tuesday.md b/examples/diary/2021-01-05-Tuesday.md
index 892a3e0..f9285eb 100644
--- a/examples/diary/2021-01-05-Tuesday.md
+++ b/examples/diary/2021-01-05-Tuesday.md
@@ -1,6 +1,7 @@
 ---
 tags: work_log
 mood: 8
+meditation: true
 ---
 
 #weight:60.2kg
diff --git a/examples/diary/2021-01-05.md b/examples/diary/2021-01-05.md
index fab397f..da13f77 100644
--- a/examples/diary/2021-01-05.md
+++ b/examples/diary/2021-01-05.md
@@ -18,6 +18,7 @@ deepValue:
                     very: 
                         deep: 13.1
 randchar: A
+meditation: true
 ---
 
 #weight:72.5kg
diff --git a/examples/diary/2021-01-06.md b/examples/diary/2021-01-06.md
index 45daced..21cbfba 100644
--- a/examples/diary/2021-01-06.md
+++ b/examples/diary/2021-01-06.md
@@ -18,6 +18,7 @@ deepValue:
                     very: 
                         deep: 20.7
 randchar: D
+meditation: true
 ---
 
 #weight:60.1kg
diff --git a/examples/diary/2021-01-09.md b/examples/diary/2021-01-09.md
index 96fe317..b3573e8 100644
--- a/examples/diary/2021-01-09.md
+++ b/examples/diary/2021-01-09.md
@@ -18,6 +18,7 @@ deepValue:
                     very: 
                         deep: 68.6
 randchar: A
+meditation: true
 ---
 
 #weight:68.8kg
diff --git a/examples/diary/2021-01-12.md b/examples/diary/2021-01-12.md
index 3999d50..9bebb98 100644
--- a/examples/diary/2021-01-12.md
+++ b/examples/diary/2021-01-12.md
@@ -18,6 +18,7 @@ deepValue:
                     very: 
                         deep: 45.0
 randchar: A
+meditation: true
 ---
 
 #weight:61.7kg
diff --git a/examples/diary/2021-01-13.md b/examples/diary/2021-01-13.md
index d49e5e6..0777c37 100644
--- a/examples/diary/2021-01-13.md
+++ b/examples/diary/2021-01-13.md
@@ -18,6 +18,7 @@ deepValue:
                     very: 
                         deep: 64.5
 randchar: E
+meditation: true
 ---
 
 #weight:71.7kg
diff --git a/examples/diary/2021-01-14.md b/examples/diary/2021-01-14.md
index 5d6e37f..13677a8 100644
--- a/examples/diary/2021-01-14.md
+++ b/examples/diary/2021-01-14.md
@@ -18,6 +18,7 @@ deepValue:
                     very: 
                         deep: 61.5
 randchar: C
+meditation: true
 ---
 
 #weight:77.1kg
diff --git a/examples/diary/2021-01-15.md b/examples/diary/2021-01-15.md
index 7da38fe..2218e8b 100644
--- a/examples/diary/2021-01-15.md
+++ b/examples/diary/2021-01-15.md
@@ -18,6 +18,7 @@ deepValue:
                     very: 
                         deep: 44.0
 randchar: A
+meditation: true
 ---
 
 #weight:69.6kg
diff --git a/examples/diary/2021-01-18.md b/examples/diary/2021-01-18.md
index b06ee71..780b960 100644
--- a/examples/diary/2021-01-18.md
+++ b/examples/diary/2021-01-18.md
@@ -18,6 +18,7 @@ deepValue:
                     very: 
                         deep: 19.5
 randchar: A
+meditation: true
 ---
 
 #weight:78.7kg
diff --git a/examples/diary/2021-01-19.md b/examples/diary/2021-01-19.md
index 11ce05b..78a1428 100644
--- a/examples/diary/2021-01-19.md
+++ b/examples/diary/2021-01-19.md
@@ -18,6 +18,7 @@ deepValue:
                     very: 
                         deep: 29.5
 randchar: C
+meditation: true
 ---
 
 #weight:69.3kg
diff --git a/examples/diary/2021-01-21.md b/examples/diary/2021-01-21.md
index 95f6869..8b9082a 100644
--- a/examples/diary/2021-01-21.md
+++ b/examples/diary/2021-01-21.md
@@ -19,6 +19,7 @@ deepValue:
                         deep: 11.1
 randchar: B
 sleptwell: false
+meditation: true
 ---
 
 #weight:67.3kg
diff --git a/examples/diary/2021-01-24.md b/examples/diary/2021-01-24.md
index 4c8baef..9deeb9f 100644
--- a/examples/diary/2021-01-24.md
+++ b/examples/diary/2021-01-24.md
@@ -19,6 +19,7 @@ deepValue:
                         deep: 39.4
 randchar: B
 sleptwell: true
+meditation: true
 ---
 
 #weight:64.1kg
diff --git a/examples/diary/2021-01-26.md b/examples/diary/2021-01-26.md
index c189d61..7041505 100644
--- a/examples/diary/2021-01-26.md
+++ b/examples/diary/2021-01-26.md
@@ -18,6 +18,7 @@ deepValue:
                     very: 
                         deep: 73.1
 randchar: B
+meditation: true
 ---
 
 #weight:72.7kg
diff --git a/examples/diary/2021-01-27.md b/examples/diary/2021-01-27.md
index e7c320e..89b43c9 100644
--- a/examples/diary/2021-01-27.md
+++ b/examples/diary/2021-01-27.md
@@ -18,6 +18,7 @@ deepValue:
                     very: 
                         deep: 78.5
 randchar: B
+meditation: true
 ---
 
 #weight:63.7kg
diff --git a/examples/diary/20210103-D.md b/examples/diary/20210103-D.md
index 3a89f50..68128a3 100644
--- a/examples/diary/20210103-D.md
+++ b/examples/diary/20210103-D.md
@@ -2,6 +2,7 @@
 tags: 
 mood: 7
 bloodpressure: 178.2/119.4
+meditation: true
 ---
 
 #weight:74.9kg
diff --git a/examples/diary/20210104-D.md b/examples/diary/20210104-D.md
index 6ee80be..7b0f459 100644
--- a/examples/diary/20210104-D.md
+++ b/examples/diary/20210104-D.md
@@ -2,6 +2,7 @@
 tags: work_log
 mood: 3
 bloodpressure: 178.6/119.2
+meditation: true
 ---
 
 #weight:73.5kg
diff --git a/examples/diary/20210105-D.md b/examples/diary/20210105-D.md
index 1f8cccf..9af72af 100644
--- a/examples/diary/20210105-D.md
+++ b/examples/diary/20210105-D.md
@@ -2,6 +2,7 @@
 tags: work_log
 mood: 1
 bloodpressure: 177/119
+meditation: true
 ---
 
 #weight:70.0kg
diff --git a/examples/diary/5-20210105.md b/examples/diary/5-20210105.md
index 892a3e0..f9285eb 100644
--- a/examples/diary/5-20210105.md
+++ b/examples/diary/5-20210105.md
@@ -1,6 +1,7 @@
 ---
 tags: work_log
 mood: 8
+meditation: true
 ---
 
 #weight:60.2kg
diff --git a/examples/diary/D-20210103.md b/examples/diary/D-20210103.md
index 3a89f50..68128a3 100644
--- a/examples/diary/D-20210103.md
+++ b/examples/diary/D-20210103.md
@@ -2,6 +2,7 @@
 tags: 
 mood: 7
 bloodpressure: 178.2/119.4
+meditation: true
 ---
 
 #weight:74.9kg
diff --git a/examples/diary/D-20210104.md b/examples/diary/D-20210104.md
index 6ee80be..7b0f459 100644
--- a/examples/diary/D-20210104.md
+++ b/examples/diary/D-20210104.md
@@ -2,6 +2,7 @@
 tags: work_log
 mood: 3
 bloodpressure: 178.6/119.2
+meditation: true
 ---
 
 #weight:73.5kg
diff --git a/examples/diary/D-20210105.md b/examples/diary/D-20210105.md
index 1f8cccf..9af72af 100644
--- a/examples/diary/D-20210105.md
+++ b/examples/diary/D-20210105.md
@@ -2,6 +2,7 @@
 tags: work_log
 mood: 1
 bloodpressure: 177/119
+meditation: true
 ---
 
 #weight:70.0kg
diff --git a/examples/diary/Jeffrey-20210103-Diary.md b/examples/diary/Jeffrey-20210103-Diary.md
index 3a89f50..68128a3 100644
--- a/examples/diary/Jeffrey-20210103-Diary.md
+++ b/examples/diary/Jeffrey-20210103-Diary.md
@@ -2,6 +2,7 @@
 tags: 
 mood: 7
 bloodpressure: 178.2/119.4
+meditation: true
 ---
 
 #weight:74.9kg
diff --git a/examples/diary/Jeffrey-20210103-Journal.md b/examples/diary/Jeffrey-20210103-Journal.md
index 3a89f50..68128a3 100644
--- a/examples/diary/Jeffrey-20210103-Journal.md
+++ b/examples/diary/Jeffrey-20210103-Journal.md
@@ -2,6 +2,7 @@
 tags: 
 mood: 7
 bloodpressure: 178.2/119.4
+meditation: true
 ---
 
 #weight:74.9kg
diff --git a/examples/diary/Jeffrey-20210104-Diary.md b/examples/diary/Jeffrey-20210104-Diary.md
index 6ee80be..7b0f459 100644
--- a/examples/diary/Jeffrey-20210104-Diary.md
+++ b/examples/diary/Jeffrey-20210104-Diary.md
@@ -2,6 +2,7 @@
 tags: work_log
 mood: 3
 bloodpressure: 178.6/119.2
+meditation: true
 ---
 
 #weight:73.5kg
diff --git a/examples/diary/Jeffrey-20210104-Journal.md b/examples/diary/Jeffrey-20210104-Journal.md
index 6ee80be..7b0f459 100644
--- a/examples/diary/Jeffrey-20210104-Journal.md
+++ b/examples/diary/Jeffrey-20210104-Journal.md
@@ -2,6 +2,7 @@
 tags: work_log
 mood: 3
 bloodpressure: 178.6/119.2
+meditation: true
 ---
 
 #weight:73.5kg
diff --git a/examples/diary/Jeffrey-20210105-Diary.md b/examples/diary/Jeffrey-20210105-Diary.md
index 1f8cccf..9af72af 100644
--- a/examples/diary/Jeffrey-20210105-Diary.md
+++ b/examples/diary/Jeffrey-20210105-Diary.md
@@ -2,6 +2,7 @@
 tags: work_log
 mood: 1
 bloodpressure: 177/119
+meditation: true
 ---
 
 #weight:70.0kg
diff --git a/examples/diary/Jeffrey-20210105-Journal.md b/examples/diary/Jeffrey-20210105-Journal.md
index 1f8cccf..9af72af 100644
--- a/examples/diary/Jeffrey-20210105-Journal.md
+++ b/examples/diary/Jeffrey-20210105-Journal.md
@@ -2,6 +2,7 @@
 tags: work_log
 mood: 1
 bloodpressure: 177/119
+meditation: true
 ---
 
 #weight:70.0kg
diff --git a/examples/diary/Lucas-20210103-Diary.md b/examples/diary/Lucas-20210103-Diary.md
index 3a89f50..68128a3 100644
--- a/examples/diary/Lucas-20210103-Diary.md
+++ b/examples/diary/Lucas-20210103-Diary.md
@@ -2,6 +2,7 @@
 tags: 
 mood: 7
 bloodpressure: 178.2/119.4
+meditation: true
 ---
 
 #weight:74.9kg
diff --git a/examples/diary/Lucas-20210103-Journal.md b/examples/diary/Lucas-20210103-Journal.md
index 3a89f50..68128a3 100644
--- a/examples/diary/Lucas-20210103-Journal.md
+++ b/examples/diary/Lucas-20210103-Journal.md
@@ -2,6 +2,7 @@
 tags: 
 mood: 7
 bloodpressure: 178.2/119.4
+meditation: true
 ---
 
 #weight:74.9kg
diff --git a/examples/diary/Lucas-20210104-Diary.md b/examples/diary/Lucas-20210104-Diary.md
index 6ee80be..7b0f459 100644
--- a/examples/diary/Lucas-20210104-Diary.md
+++ b/examples/diary/Lucas-20210104-Diary.md
@@ -2,6 +2,7 @@
 tags: work_log
 mood: 3
 bloodpressure: 178.6/119.2
+meditation: true
 ---
 
 #weight:73.5kg
diff --git a/examples/diary/Lucas-20210104-Journal.md b/examples/diary/Lucas-20210104-Journal.md
index 6ee80be..7b0f459 100644
--- a/examples/diary/Lucas-20210104-Journal.md
+++ b/examples/diary/Lucas-20210104-Journal.md
@@ -2,6 +2,7 @@
 tags: work_log
 mood: 3
 bloodpressure: 178.6/119.2
+meditation: true
 ---
 
 #weight:73.5kg
diff --git a/examples/diary/Lucas-20210105-Diary.md b/examples/diary/Lucas-20210105-Diary.md
index 1f8cccf..9af72af 100644
--- a/examples/diary/Lucas-20210105-Diary.md
+++ b/examples/diary/Lucas-20210105-Diary.md
@@ -2,6 +2,7 @@
 tags: work_log
 mood: 1
 bloodpressure: 177/119
+meditation: true
 ---
 
 #weight:70.0kg
diff --git a/examples/diary/Lucas-20210105-Journal.md b/examples/diary/Lucas-20210105-Journal.md
index 1f8cccf..9af72af 100644
--- a/examples/diary/Lucas-20210105-Journal.md
+++ b/examples/diary/Lucas-20210105-Journal.md
@@ -2,6 +2,7 @@
 tags: work_log
 mood: 1
 bloodpressure: 177/119
+meditation: true
 ---
 
 #weight:70.0kg

From 9ea538b5a95e673d646c269cc955fec37e897a9e Mon Sep 17 00:00:00 2001
From: Mike Greiner <mike.greiner@protonmail.com>
Date: Thu, 19 Feb 2026 07:53:01 -0700
Subject: [PATCH 398/402] fix: correct indentation and remove unrelated
 try/catch in postprocessor

Fix inconsistent indentation of the frontmatter.exists block to match
surrounding code (16 spaces). Remove unrelated try/catch wrapper that
was causing inconsistent indentation at the method boundary.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/main.ts | 41 +++++++++++++++++------------------------
 1 file changed, 17 insertions(+), 24 deletions(-)

diff --git a/src/main.ts b/src/main.ts
index eb4754c..819749c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -261,11 +261,10 @@ export default class Tracker extends Plugin {
         el: HTMLElement,
         ctx: MarkdownPostProcessorContext
     ) {
-        try {
-            // console.log("postprocess");
-            const canvas = document.createElement("div");
+        // console.log("postprocess");
+        const canvas = document.createElement("div");
 
-            let yamlText = source.trim();
+        let yamlText = source.trim();
 
         // Replace all tabs by spaces
         let tabSize = this.app.vault.getConfig("tabSize");
@@ -538,20 +537,20 @@ export default class Tracker extends Plugin {
                 } // console.log("Search frontmatter keys");
 
                 // console.log("Search frontmatter exists");
-        if (
-            fileCache &&
-            query.getType() === SearchType.FrontmatterExists &&
-            query.getTarget() !== "tags"
-        ) {
-            let gotAnyValue = collecting.collectDataFromFrontmatterExists(
-                fileCache,
-                query,
-                renderInfo,
-                dataMap,
-                xValueMap
-            );
-            processInfo.gotAnyValidYValue ||= gotAnyValue;
-        } // console.log("Search frontmatter exists");
+                if (
+                    fileCache &&
+                    query.getType() === SearchType.FrontmatterExists &&
+                    query.getTarget() !== "tags"
+                ) {
+                    let gotAnyValue = collecting.collectDataFromFrontmatterExists(
+                        fileCache,
+                        query,
+                        renderInfo,
+                        dataMap,
+                        xValueMap
+                    );
+                    processInfo.gotAnyValidYValue ||= gotAnyValue;
+                } // console.log("Search frontmatter exists");
 
                 // console.log("Search wiki links");
                 if (
@@ -787,12 +786,6 @@ export default class Tracker extends Plugin {
         }
 
         el.appendChild(canvas);
-        } catch (error) {
-            console.error("TRACKER: ERROR in postprocessor:", error);
-            console.error("TRACKER: Error stack:", error.stack);
-            const canvas = document.createElement("div");
-            return this.renderErrorMessage("Error: " + error.message, canvas, el);
-        }
     }
 
     // TODO: remove this.app and move to collecting.ts

From e337f9d14054b466ca5446b9338fadbe4b836ec2 Mon Sep 17 00:00:00 2001
From: Joe Constant <joe@joeconstant.com>
Date: Fri, 20 Feb 2026 17:07:01 -0700
Subject: [PATCH 399/402] Release 1.19.0

---
 README.md            |    4 +
 docs/ReleaseNotes.md |    4 +
 manifest.json        |    2 +-
 package-lock.json    | 6012 +++++++++++++++++++++++++++++++++---------
 package.json         |    2 +-
 versions.json        |    3 +-
 6 files changed, 4748 insertions(+), 1279 deletions(-)

diff --git a/README.md b/README.md
index 18a845e..734a6cd 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,10 @@ This is an [Obsidian](https://obsidian.md/) plugin that helps you collect data f
 
 ## What's New
 
+Version 1.19.0
+
+- Add `searchType: frontmatter.exists` for tracking field existence
+
 Version 1.18.0
 
 - Support all days for startWeekOn parameter
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index 274b6fd..7a1dec8 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,5 +1,9 @@
 # Release Notes
 
+## 1.19.0
+
+- Add `searchType: frontmatter.exists` for tracking field existence
+
 ## 1.18.0
 
 - Support all days for startWeekOn parameter
diff --git a/manifest.json b/manifest.json
index ab508a9..7840aaf 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "id": "obsidian-tracker",
   "name": "Tracker",
-  "version": "1.18.0",
+  "version": "1.19.0",
   "minAppVersion": "0.9.12",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "author": "pyrochlore",
diff --git a/package-lock.json b/package-lock.json
index f04e151..ab08b07 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.18.0",
+  "version": "1.19.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "obsidian-tracker",
-      "version": "1.18.0",
+      "version": "1.19.0",
       "license": "MIT",
       "dependencies": {
         "d3": "^7.9.0",
@@ -20,1823 +20,4346 @@
         "@rollup/plugin-terser": "^0.4.4",
         "@rollup/plugin-typescript": "^12.3.0",
         "@types/d3": "^7.4.3",
+        "@types/jest": "^29.5.14",
         "@types/node": "^25.3.0",
         "@types/sprintf-js": "^1.1.4",
+        "jest": "^29.7.0",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
         "rollup": "^4.57.1",
         "rollup-plugin-copy": "^3.5.0",
+        "ts-jest": "^29.4.6",
         "tslib": "^2.8.1",
         "typescript": "^5.9.3"
       }
     },
-    "node_modules/@codemirror/state": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.0.tgz",
-      "integrity": "sha512-MwBHVK60IiIHDcoMet78lxt6iw5gJOGSbNbOIVBHWVXIH4/Nq1+GQgLLGgI1KlnN86WDXsPudVaqYHKBIx7Eyw==",
+    "node_modules/@babel/code-frame": {
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz",
+      "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
-        "@marijn/find-cluster-break": "^1.0.0"
+        "@babel/helper-validator-identifier": "^7.28.5",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@codemirror/view": {
-      "version": "6.38.6",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.38.6.tgz",
-      "integrity": "sha512-qiS0z1bKs5WOvHIAC0Cybmv4AJSkAXgX5aD6Mqd2epSLlVJsQl8NG23jCVouIgkh4All/mrbdsf2UOLFnJw0tw==",
+    "node_modules/@babel/compat-data": {
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.0.tgz",
+      "integrity": "sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "@codemirror/state": "^6.5.0",
-        "crelt": "^1.0.6",
-        "style-mod": "^4.1.0",
-        "w3c-keyname": "^2.2.4"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.13",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
-      "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
+    "node_modules/@babel/core": {
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.0.tgz",
+      "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.5.0",
-        "@jridgewell/trace-mapping": "^0.3.24"
+        "@babel/code-frame": "^7.29.0",
+        "@babel/generator": "^7.29.0",
+        "@babel/helper-compilation-targets": "^7.28.6",
+        "@babel/helper-module-transforms": "^7.28.6",
+        "@babel/helpers": "^7.28.6",
+        "@babel/parser": "^7.29.0",
+        "@babel/template": "^7.28.6",
+        "@babel/traverse": "^7.29.0",
+        "@babel/types": "^7.29.0",
+        "@jridgewell/remapping": "^2.3.5",
+        "convert-source-map": "^2.0.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
       }
     },
-    "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
-      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+    "node_modules/@babel/generator": {
+      "version": "7.29.1",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.1.tgz",
+      "integrity": "sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.29.0",
+        "@babel/types": "^7.29.0",
+        "@jridgewell/gen-mapping": "^0.3.12",
+        "@jridgewell/trace-mapping": "^0.3.28",
+        "jsesc": "^3.0.2"
+      },
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@jridgewell/source-map": {
-      "version": "0.3.11",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.11.tgz",
-      "integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==",
+    "node_modules/@babel/helper-compilation-targets": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.28.6.tgz",
+      "integrity": "sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.25"
+        "@babel/compat-data": "^7.28.6",
+        "@babel/helper-validator-option": "^7.27.1",
+        "browserslist": "^4.24.0",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
-      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+    "node_modules/@babel/helper-globals": {
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz",
+      "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
     },
-    "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.31",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
-      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.28.6.tgz",
+      "integrity": "sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jridgewell/resolve-uri": "^3.1.0",
-        "@jridgewell/sourcemap-codec": "^1.4.14"
+        "@babel/traverse": "^7.28.6",
+        "@babel/types": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@marijn/find-cluster-break": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz",
-      "integrity": "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.6.tgz",
+      "integrity": "sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
+        "@babel/helper-module-imports": "^7.28.6",
+        "@babel/helper-validator-identifier": "^7.28.5",
+        "@babel/traverse": "^7.28.6"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+    "node_modules/@babel/helper-plugin-utils": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.28.6.tgz",
+      "integrity": "sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 8"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
+      "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",
+      "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helpers": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.6.tgz",
+      "integrity": "sha512-xOBvwq86HHdB7WUDTfKfT/Vuxh7gElQ+Sfti2Cy6yIWNW05P8iUslOVcZ4/sKbE+/jQaukQAdz/gf3724kYdqw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
+        "@babel/template": "^7.28.6",
+        "@babel/types": "^7.28.6"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@rollup/plugin-commonjs": {
-      "version": "29.0.0",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-29.0.0.tgz",
-      "integrity": "sha512-U2YHaxR2cU/yAiwKJtJRhnyLk7cifnQw0zUpISsocBDoHDJn+HTV74ABqnwr5bEgWUwFZC9oFL6wLe21lHu5eQ==",
+    "node_modules/@babel/parser": {
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.0.tgz",
+      "integrity": "sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@rollup/pluginutils": "^5.0.1",
-        "commondir": "^1.0.1",
-        "estree-walker": "^2.0.2",
-        "fdir": "^6.2.0",
-        "is-reference": "1.2.1",
-        "magic-string": "^0.30.3",
-        "picomatch": "^4.0.2"
+        "@babel/types": "^7.29.0"
+      },
+      "bin": {
+        "parser": "bin/babel-parser.js"
       },
       "engines": {
-        "node": ">=16.0.0 || 14 >= 14.17"
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
       },
       "peerDependencies": {
-        "rollup": "^2.68.0||^3.0.0||^4.0.0"
-      },
-      "peerDependenciesMeta": {
-        "rollup": {
-          "optional": true
-        }
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@rollup/plugin-node-resolve": {
-      "version": "16.0.3",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-16.0.3.tgz",
-      "integrity": "sha512-lUYM3UBGuM93CnMPG1YocWu7X802BrNF3jW2zny5gQyLQgRFJhV1Sq0Zi74+dh/6NBx1DxFC4b4GXg9wUCG5Qg==",
+    "node_modules/@babel/plugin-syntax-bigint": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@rollup/pluginutils": "^5.0.1",
-        "@types/resolve": "1.20.2",
-        "deepmerge": "^4.2.2",
-        "is-module": "^1.0.0",
-        "resolve": "^1.22.1"
-      },
-      "engines": {
-        "node": ">=14.0.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
       },
       "peerDependencies": {
-        "rollup": "^2.78.0||^3.0.0||^4.0.0"
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.12.13"
       },
-      "peerDependenciesMeta": {
-        "rollup": {
-          "optional": true
-        }
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@rollup/plugin-terser": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-terser/-/plugin-terser-0.4.4.tgz",
-      "integrity": "sha512-XHeJC5Bgvs8LfukDwWZp7yeqin6ns8RTl2B9avbejt6tZqsqvVoWI7ZTQrcNsfKEDWBTnTxM8nMDkO2IFFbd0A==",
+    "node_modules/@babel/plugin-syntax-class-static-block": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "serialize-javascript": "^6.0.1",
-        "smob": "^1.0.0",
-        "terser": "^5.17.4"
+        "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "rollup": "^2.0.0||^3.0.0||^4.0.0"
-      },
-      "peerDependenciesMeta": {
-        "rollup": {
-          "optional": true
-        }
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@rollup/plugin-typescript": {
-      "version": "12.3.0",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-12.3.0.tgz",
-      "integrity": "sha512-7DP0/p7y3t67+NabT9f8oTBFE6gGkto4SA6Np2oudYmZE/m1dt8RB0SjL1msMxFpLo631qjRCcBlAbq1ml/Big==",
+    "node_modules/@babel/plugin-syntax-import-attributes": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.28.6.tgz",
+      "integrity": "sha512-jiLC0ma9XkQT3TKJ9uYvlakm66Pamywo+qwL+oL8HJOvc6TWdZXVfhqJr8CCzbSGUAbDOzlGHJC1U+vRfLQDvw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@rollup/pluginutils": "^5.1.0",
-        "resolve": "^1.22.1"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "rollup": "^2.14.0||^3.0.0||^4.0.0",
-        "tslib": "*",
-        "typescript": ">=3.7.0"
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
-      "peerDependenciesMeta": {
-        "rollup": {
-          "optional": true
-        },
-        "tslib": {
-          "optional": true
-        }
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@rollup/pluginutils": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.3.0.tgz",
-      "integrity": "sha512-5EdhGZtnu3V88ces7s53hhfK5KSASnJZv8Lulpc04cWO3REESroJXg73DFsOmgbU2BhwV0E20bu2IDZb3VKW4Q==",
+    "node_modules/@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/estree": "^1.0.0",
-        "estree-walker": "^2.0.2",
-        "picomatch": "^4.0.2"
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-jsx": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.28.6.tgz",
+      "integrity": "sha512-wgEmr06G6sIpqr8YDwA2dSRTE3bJ+V0IfpzfSY3Lfgd7YWOaAdlykvJi13ZKBt8cZHfgH1IXN+CL656W3uUa4w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
-      "peerDependenciesMeta": {
-        "rollup": {
-          "optional": true
-        }
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.57.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.57.1.tgz",
-      "integrity": "sha512-A6ehUVSiSaaliTxai040ZpZ2zTevHYbvu/lDoeAteHI8QnaosIzm4qwtezfRg1jOYaUmnzLX1AOD6Z+UJjtifg==",
-      "cpu": [
-        "arm"
-      ],
+    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ]
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
     },
-    "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.57.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.57.1.tgz",
-      "integrity": "sha512-dQaAddCY9YgkFHZcFNS/606Exo8vcLHwArFZ7vxXq4rigo2bb494/xKMMwRRQW6ug7Js6yXmBZhSBRuBvCCQ3w==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ]
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
     },
-    "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.57.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.57.1.tgz",
-      "integrity": "sha512-crNPrwJOrRxagUYeMn/DZwqN88SDmwaJ8Cvi/TN1HnWBU7GwknckyosC2gd0IqYRsHDEnXf328o9/HC6OkPgOg==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
     },
-    "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.57.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.57.1.tgz",
-      "integrity": "sha512-Ji8g8ChVbKrhFtig5QBV7iMaJrGtpHelkB3lsaKzadFBe58gmjfGXAOfI5FV0lYMH8wiqsxKQ1C9B0YTRXVy4w==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
     },
-    "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.57.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.57.1.tgz",
-      "integrity": "sha512-R+/WwhsjmwodAcz65guCGFRkMb4gKWTcIeLy60JJQbXrJ97BOXHxnkPFrP+YwFlaS0m+uWJTstrUA9o+UchFug==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
     },
-    "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.57.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.57.1.tgz",
-      "integrity": "sha512-IEQTCHeiTOnAUC3IDQdzRAGj3jOAYNr9kBguI7MQAAZK3caezRrg0GxAb6Hchg4lxdZEI5Oq3iov/w/hnFWY9Q==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
     },
-    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.57.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.57.1.tgz",
-      "integrity": "sha512-F8sWbhZ7tyuEfsmOxwc2giKDQzN3+kuBLPwwZGyVkLlKGdV1nvnNwYD0fKQ8+XS6hp9nY7B+ZeK01EBUE7aHaw==",
-      "cpu": [
-        "arm"
-      ],
+    "node_modules/@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
     },
-    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.57.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.57.1.tgz",
-      "integrity": "sha512-rGfNUfn0GIeXtBP1wL5MnzSj98+PZe/AXaGBCRmT0ts80lU5CATYGxXukeTX39XBKsxzFpEeK+Mrp9faXOlmrw==",
-      "cpu": [
-        "arm"
-      ],
+    "node_modules/@babel/plugin-syntax-typescript": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.28.6.tgz",
+      "integrity": "sha512-+nDNmQye7nlnuuHDboPbGm00Vqg3oO8niRRL27/4LYHUsHYh0zJ1xWOz0uRwNFmM1Avzk8wZbc6rdiYhomzv/A==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
     },
-    "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.57.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.57.1.tgz",
-      "integrity": "sha512-MMtej3YHWeg/0klK2Qodf3yrNzz6CGjo2UntLvk2RSPlhzgLvYEB3frRvbEF2wRKh1Z2fDIg9KRPe1fawv7C+g==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@babel/template": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.28.6.tgz",
+      "integrity": "sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "dependencies": {
+        "@babel/code-frame": "^7.28.6",
+        "@babel/parser": "^7.28.6",
+        "@babel/types": "^7.28.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
     },
-    "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.57.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.57.1.tgz",
-      "integrity": "sha512-1a/qhaaOXhqXGpMFMET9VqwZakkljWHLmZOX48R0I/YLbhdxr1m4gtG1Hq7++VhVUmf+L3sTAf9op4JlhQ5u1Q==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@babel/traverse": {
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.0.tgz",
+      "integrity": "sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "dependencies": {
+        "@babel/code-frame": "^7.29.0",
+        "@babel/generator": "^7.29.0",
+        "@babel/helper-globals": "^7.28.0",
+        "@babel/parser": "^7.29.0",
+        "@babel/template": "^7.28.6",
+        "@babel/types": "^7.29.0",
+        "debug": "^4.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
     },
-    "node_modules/@rollup/rollup-linux-loong64-gnu": {
-      "version": "4.57.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.57.1.tgz",
-      "integrity": "sha512-QWO6RQTZ/cqYtJMtxhkRkidoNGXc7ERPbZN7dVW5SdURuLeVU7lwKMpo18XdcmpWYd0qsP1bwKPf7DNSUinhvA==",
-      "cpu": [
-        "loong64"
-      ],
+    "node_modules/@babel/types": {
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz",
+      "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.28.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
     },
-    "node_modules/@rollup/rollup-linux-loong64-musl": {
-      "version": "4.57.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.57.1.tgz",
-      "integrity": "sha512-xpObYIf+8gprgWaPP32xiN5RVTi/s5FCR+XMXSKmhfoJjrpRAjCuuqQXyxUa/eJTdAE6eJ+KDKaoEqjZQxh3Gw==",
-      "cpu": [
-        "loong64"
-      ],
+    "node_modules/@bcoe/v8-coverage": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
       "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "license": "MIT"
     },
-    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
-      "version": "4.57.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.57.1.tgz",
-      "integrity": "sha512-4BrCgrpZo4hvzMDKRqEaW1zeecScDCR+2nZ86ATLhAoJ5FQ+lbHVD3ttKe74/c7tNT9c6F2viwB3ufwp01Oh2w==",
-      "cpu": [
-        "ppc64"
-      ],
+    "node_modules/@codemirror/state": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.0.tgz",
+      "integrity": "sha512-MwBHVK60IiIHDcoMet78lxt6iw5gJOGSbNbOIVBHWVXIH4/Nq1+GQgLLGgI1KlnN86WDXsPudVaqYHKBIx7Eyw==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "peer": true,
+      "dependencies": {
+        "@marijn/find-cluster-break": "^1.0.0"
+      }
     },
-    "node_modules/@rollup/rollup-linux-ppc64-musl": {
-      "version": "4.57.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.57.1.tgz",
-      "integrity": "sha512-NOlUuzesGauESAyEYFSe3QTUguL+lvrN1HtwEEsU2rOwdUDeTMJdO5dUYl/2hKf9jWydJrO9OL/XSSf65R5+Xw==",
-      "cpu": [
-        "ppc64"
-      ],
+    "node_modules/@codemirror/view": {
+      "version": "6.38.6",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.38.6.tgz",
+      "integrity": "sha512-qiS0z1bKs5WOvHIAC0Cybmv4AJSkAXgX5aD6Mqd2epSLlVJsQl8NG23jCVouIgkh4All/mrbdsf2UOLFnJw0tw==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "peer": true,
+      "dependencies": {
+        "@codemirror/state": "^6.5.0",
+        "crelt": "^1.0.6",
+        "style-mod": "^4.1.0",
+        "w3c-keyname": "^2.2.4"
+      }
     },
-    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.57.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.57.1.tgz",
-      "integrity": "sha512-ptA88htVp0AwUUqhVghwDIKlvJMD/fmL/wrQj99PRHFRAG6Z5nbWoWG4o81Nt9FT+IuqUQi+L31ZKAFeJ5Is+A==",
-      "cpu": [
-        "riscv64"
-      ],
+    "node_modules/@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
       "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "license": "ISC",
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/@rollup/rollup-linux-riscv64-musl": {
-      "version": "4.57.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.57.1.tgz",
-      "integrity": "sha512-S51t7aMMTNdmAMPpBg7OOsTdn4tySRQvklmL3RpDRyknk87+Sp3xaumlatU+ppQ+5raY7sSTcC2beGgvhENfuw==",
-      "cpu": [
-        "riscv64"
-      ],
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.57.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.57.1.tgz",
-      "integrity": "sha512-Bl00OFnVFkL82FHbEqy3k5CUCKH6OEJL54KCyx2oqsmZnFTR8IoNqBF+mjQVcRCT5sB6yOvK8A37LNm/kPJiZg==",
-      "cpu": [
-        "s390x"
-      ],
+    "node_modules/@jest/console": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
+      "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
     },
-    "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.57.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.57.1.tgz",
-      "integrity": "sha512-ABca4ceT4N+Tv/GtotnWAeXZUZuM/9AQyCyKYyKnpk4yoA7QIAuBt6Hkgpw8kActYlew2mvckXkvx0FfoInnLg==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@jest/core": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
+      "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "dependencies": {
+        "@jest/console": "^29.7.0",
+        "@jest/reporters": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "jest-changed-files": "^29.7.0",
+        "jest-config": "^29.7.0",
+        "jest-haste-map": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-resolve-dependencies": "^29.7.0",
+        "jest-runner": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "jest-watcher": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^29.7.0",
+        "slash": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
     },
-    "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.57.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.57.1.tgz",
-      "integrity": "sha512-HFps0JeGtuOR2convgRRkHCekD7j+gdAuXM+/i6kGzQtFhlCtQkpwtNzkNj6QhCDp7DRJ7+qC/1Vg2jt5iSOFw==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@jest/environment": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
+      "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "dependencies": {
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-mock": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
     },
-    "node_modules/@rollup/rollup-openbsd-x64": {
-      "version": "4.57.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.57.1.tgz",
-      "integrity": "sha512-H+hXEv9gdVQuDTgnqD+SQffoWoc0Of59AStSzTEj/feWTBAnSfSD3+Dql1ZruJQxmykT/JVY0dE8Ka7z0DH1hw==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@jest/expect": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
+      "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ]
+      "dependencies": {
+        "expect": "^29.7.0",
+        "jest-snapshot": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
     },
-    "node_modules/@rollup/rollup-openharmony-arm64": {
-      "version": "4.57.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.57.1.tgz",
-      "integrity": "sha512-4wYoDpNg6o/oPximyc/NG+mYUejZrCU2q+2w6YZqrAs2UcNUChIZXjtafAiiZSUc7On8v5NyNj34Kzj/Ltk6dQ==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@jest/expect-utils": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
+      "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "openharmony"
-      ]
+      "dependencies": {
+        "jest-get-type": "^29.6.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
     },
-    "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.57.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.57.1.tgz",
-      "integrity": "sha512-O54mtsV/6LW3P8qdTcamQmuC990HDfR71lo44oZMZlXU4tzLrbvTii87Ni9opq60ds0YzuAlEr/GNwuNluZyMQ==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@jest/fake-timers": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
+      "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@sinonjs/fake-timers": "^10.0.2",
+        "@types/node": "*",
+        "jest-message-util": "^29.7.0",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
     },
-    "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.57.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.57.1.tgz",
-      "integrity": "sha512-P3dLS+IerxCT/7D2q2FYcRdWRl22dNbrbBEtxdWhXrfIMPP9lQhb5h4Du04mdl5Woq05jVCDPCMF7Ub0NAjIew==",
-      "cpu": [
-        "ia32"
-      ],
+    "node_modules/@jest/globals": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
+      "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/expect": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "jest-mock": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
     },
-    "node_modules/@rollup/rollup-win32-x64-gnu": {
-      "version": "4.57.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.57.1.tgz",
-      "integrity": "sha512-VMBH2eOOaKGtIJYleXsi2B8CPVADrh+TyNxJ4mWPnKfLB/DBUmzW+5m1xUrcwWoMfSLagIRpjUFeW5CO5hyciQ==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@jest/reporters": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
+      "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
+      "dependencies": {
+        "@bcoe/v8-coverage": "^0.2.3",
+        "@jest/console": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-instrument": "^6.0.0",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-reports": "^3.1.3",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "slash": "^3.0.0",
+        "string-length": "^4.0.1",
+        "strip-ansi": "^6.0.0",
+        "v8-to-istanbul": "^9.0.1"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
     },
-    "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.57.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.57.1.tgz",
-      "integrity": "sha512-mxRFDdHIWRxg3UfIIAwCm6NzvxG0jDX/wBN6KsQFTvKFqqg9vTrWUE68qEjHt19A5wwx5X5aUi2zuZT7YR0jrA==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@jest/schemas": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
+      "dependencies": {
+        "@sinclair/typebox": "^0.27.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
     },
-    "node_modules/@types/codemirror": {
-      "version": "5.60.8",
-      "resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-5.60.8.tgz",
-      "integrity": "sha512-VjFgDF/eB+Aklcy15TtOTLQeMjTo07k7KAjql8OK5Dirr7a6sJY4T1uVBDuTVG9VEmn1uUsohOpYnVfgC6/jyw==",
+    "node_modules/@jest/source-map": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
+      "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/tern": "*"
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.2.9"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@types/d3": {
-      "version": "7.4.3",
-      "resolved": "https://registry.npmjs.org/@types/d3/-/d3-7.4.3.tgz",
-      "integrity": "sha512-lZXZ9ckh5R8uiFVt8ogUNf+pIrK4EsWrx2Np75WvF/eTpJ0FMHNhjXk8CKEx/+gpHbNQyJWehbFaTvqmHWB3ww==",
+    "node_modules/@jest/test-result": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
+      "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/d3-array": "*",
-        "@types/d3-axis": "*",
-        "@types/d3-brush": "*",
-        "@types/d3-chord": "*",
-        "@types/d3-color": "*",
-        "@types/d3-contour": "*",
-        "@types/d3-delaunay": "*",
-        "@types/d3-dispatch": "*",
-        "@types/d3-drag": "*",
-        "@types/d3-dsv": "*",
-        "@types/d3-ease": "*",
-        "@types/d3-fetch": "*",
-        "@types/d3-force": "*",
-        "@types/d3-format": "*",
-        "@types/d3-geo": "*",
-        "@types/d3-hierarchy": "*",
-        "@types/d3-interpolate": "*",
-        "@types/d3-path": "*",
-        "@types/d3-polygon": "*",
-        "@types/d3-quadtree": "*",
-        "@types/d3-random": "*",
-        "@types/d3-scale": "*",
-        "@types/d3-scale-chromatic": "*",
-        "@types/d3-selection": "*",
-        "@types/d3-shape": "*",
-        "@types/d3-time": "*",
-        "@types/d3-time-format": "*",
-        "@types/d3-timer": "*",
-        "@types/d3-transition": "*",
-        "@types/d3-zoom": "*"
+        "@jest/console": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@types/d3-array": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.2.tgz",
-      "integrity": "sha512-hOLWVbm7uRza0BYXpIIW5pxfrKe0W+D5lrFiAEYR+pb6w3N2SwSMaJbXdUfSEv+dT4MfHBLtn5js0LAWaO6otw==",
+    "node_modules/@jest/test-sequencer": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
+      "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "dependencies": {
+        "@jest/test-result": "^29.7.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
     },
-    "node_modules/@types/d3-axis": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@types/d3-axis/-/d3-axis-3.0.6.tgz",
-      "integrity": "sha512-pYeijfZuBd87T0hGn0FO1vQ/cgLk6E1ALJjfkC0oJ8cbwkZl3TpgS8bVBLZN+2jjGgg38epgxb2zmoGtSfvgMw==",
+    "node_modules/@jest/transform": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
+      "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/d3-selection": "*"
+        "@babel/core": "^7.11.6",
+        "@jest/types": "^29.6.3",
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "babel-plugin-istanbul": "^6.1.1",
+        "chalk": "^4.0.0",
+        "convert-source-map": "^2.0.0",
+        "fast-json-stable-stringify": "^2.1.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "pirates": "^4.0.4",
+        "slash": "^3.0.0",
+        "write-file-atomic": "^4.0.2"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@types/d3-brush": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@types/d3-brush/-/d3-brush-3.0.6.tgz",
-      "integrity": "sha512-nH60IZNNxEcrh6L1ZSMNA28rj27ut/2ZmI3r96Zd+1jrZD++zD3LsMIjWlvg4AYrHn/Pqz4CF3veCxGjtbqt7A==",
+    "node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/d3-selection": "*"
+        "@jest/schemas": "^29.6.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@types/d3-chord": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@types/d3-chord/-/d3-chord-3.0.6.tgz",
-      "integrity": "sha512-LFYWWd8nwfwEmTZG9PfQxd17HbNPksHBiJHaKuY1XeqscXacsS2tyoo6OdRsjf+NQYeB6XrNL3a25E3gH69lcg==",
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.13",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
+      "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.5.0",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      }
+    },
+    "node_modules/@jridgewell/remapping": {
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz",
+      "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/source-map": {
+      "version": "0.3.11",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.11.tgz",
+      "integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/d3-color": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz",
-      "integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==",
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.31",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
+      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "node_modules/@marijn/find-cluster-break": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz",
+      "integrity": "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/d3-contour": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@types/d3-contour/-/d3-contour-3.0.6.tgz",
-      "integrity": "sha512-BjzLgXGnCWjUSYGfH1cpdo41/hgdWETu4YxpezoztawmqsvCeep+8QGfiY6YbDvfgHz/DkjeIkkZVJavB4a3rg==",
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/d3-array": "*",
-        "@types/geojson": "*"
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@rollup/plugin-commonjs": {
+      "version": "29.0.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-29.0.0.tgz",
+      "integrity": "sha512-U2YHaxR2cU/yAiwKJtJRhnyLk7cifnQw0zUpISsocBDoHDJn+HTV74ABqnwr5bEgWUwFZC9oFL6wLe21lHu5eQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@rollup/pluginutils": "^5.0.1",
+        "commondir": "^1.0.1",
+        "estree-walker": "^2.0.2",
+        "fdir": "^6.2.0",
+        "is-reference": "1.2.1",
+        "magic-string": "^0.30.3",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=16.0.0 || 14 >= 14.17"
+      },
+      "peerDependencies": {
+        "rollup": "^2.68.0||^3.0.0||^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/plugin-node-resolve": {
+      "version": "16.0.3",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-16.0.3.tgz",
+      "integrity": "sha512-lUYM3UBGuM93CnMPG1YocWu7X802BrNF3jW2zny5gQyLQgRFJhV1Sq0Zi74+dh/6NBx1DxFC4b4GXg9wUCG5Qg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@rollup/pluginutils": "^5.0.1",
+        "@types/resolve": "1.20.2",
+        "deepmerge": "^4.2.2",
+        "is-module": "^1.0.0",
+        "resolve": "^1.22.1"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^2.78.0||^3.0.0||^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/plugin-terser": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-terser/-/plugin-terser-0.4.4.tgz",
+      "integrity": "sha512-XHeJC5Bgvs8LfukDwWZp7yeqin6ns8RTl2B9avbejt6tZqsqvVoWI7ZTQrcNsfKEDWBTnTxM8nMDkO2IFFbd0A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "serialize-javascript": "^6.0.1",
+        "smob": "^1.0.0",
+        "terser": "^5.17.4"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^2.0.0||^3.0.0||^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/plugin-typescript": {
+      "version": "12.3.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-12.3.0.tgz",
+      "integrity": "sha512-7DP0/p7y3t67+NabT9f8oTBFE6gGkto4SA6Np2oudYmZE/m1dt8RB0SjL1msMxFpLo631qjRCcBlAbq1ml/Big==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@rollup/pluginutils": "^5.1.0",
+        "resolve": "^1.22.1"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^2.14.0||^3.0.0||^4.0.0",
+        "tslib": "*",
+        "typescript": ">=3.7.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        },
+        "tslib": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/pluginutils": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.3.0.tgz",
+      "integrity": "sha512-5EdhGZtnu3V88ces7s53hhfK5KSASnJZv8Lulpc04cWO3REESroJXg73DFsOmgbU2BhwV0E20bu2IDZb3VKW4Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.0",
+        "estree-walker": "^2.0.2",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.58.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.58.0.tgz",
+      "integrity": "sha512-mr0tmS/4FoVk1cnaeN244A/wjvGDNItZKR8hRhnmCzygyRXYtKF5jVDSIILR1U97CTzAYmbgIj/Dukg62ggG5w==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.58.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.58.0.tgz",
+      "integrity": "sha512-+s++dbp+/RTte62mQD9wLSbiMTV+xr/PeRJEc/sFZFSBRlHPNPVaf5FXlzAL77Mr8FtSfQqCN+I598M8U41ccQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.58.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.58.0.tgz",
+      "integrity": "sha512-MFWBwTcYs0jZbINQBXHfSrpSQJq3IUOakcKPzfeSznONop14Pxuqa0Kg19GD0rNBMPQI2tFtu3UzapZpH0Uc1Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.58.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.58.0.tgz",
+      "integrity": "sha512-yiKJY7pj9c9JwzuKYLFaDZw5gma3fI9bkPEIyofvVfsPqjCWPglSHdpdwXpKGvDeYDms3Qal8qGMEHZ1M/4Udg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.58.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.58.0.tgz",
+      "integrity": "sha512-x97kCoBh5MOevpn/CNK9W1x8BEzO238541BGWBc315uOlN0AD/ifZ1msg+ZQB05Ux+VF6EcYqpiagfLJ8U3LvQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.58.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.58.0.tgz",
+      "integrity": "sha512-Aa8jPoZ6IQAG2eIrcXPpjRcMjROMFxCt1UYPZZtCxRV68WkuSigYtQ/7Zwrcr2IvtNJo7T2JfDXyMLxq5L4Jlg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.58.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.58.0.tgz",
+      "integrity": "sha512-Ob8YgT5kD/lSIYW2Rcngs5kNB/44Q2RzBSPz9brf2WEtcGR7/f/E9HeHn1wYaAwKBni+bdXEwgHvUd0x12lQSA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.58.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.58.0.tgz",
+      "integrity": "sha512-K+RI5oP1ceqoadvNt1FecL17Qtw/n9BgRSzxif3rTL2QlIu88ccvY+Y9nnHe/cmT5zbH9+bpiJuG1mGHRVwF4Q==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.58.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.58.0.tgz",
+      "integrity": "sha512-T+17JAsCKUjmbopcKepJjHWHXSjeW7O5PL7lEFaeQmiVyw4kkc5/lyYKzrv6ElWRX/MrEWfPiJWqbTvfIvjM1Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.58.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.58.0.tgz",
+      "integrity": "sha512-cCePktb9+6R9itIJdeCFF9txPU7pQeEHB5AbHu/MKsfH/k70ZtOeq1k4YAtBv9Z7mmKI5/wOLYjQ+B9QdxR6LA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loong64-gnu": {
+      "version": "4.58.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.58.0.tgz",
+      "integrity": "sha512-iekUaLkfliAsDl4/xSdoCJ1gnnIXvoNz85C8U8+ZxknM5pBStfZjeXgB8lXobDQvvPRCN8FPmmuTtH+z95HTmg==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loong64-musl": {
+      "version": "4.58.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.58.0.tgz",
+      "integrity": "sha512-68ofRgJNl/jYJbxFjCKE7IwhbfxOl1muPN4KbIqAIe32lm22KmU7E8OPvyy68HTNkI2iV/c8y2kSPSm2mW/Q9Q==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
+      "version": "4.58.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.58.0.tgz",
+      "integrity": "sha512-dpz8vT0i+JqUKuSNPCP5SYyIV2Lh0sNL1+FhM7eLC457d5B9/BC3kDPp5BBftMmTNsBarcPcoz5UGSsnCiw4XQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-musl": {
+      "version": "4.58.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.58.0.tgz",
+      "integrity": "sha512-4gdkkf9UJ7tafnweBCR/mk4jf3Jfl0cKX9Np80t5i78kjIH0ZdezUv/JDI2VtruE5lunfACqftJ8dIMGN4oHew==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.58.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.58.0.tgz",
+      "integrity": "sha512-YFS4vPnOkDTD/JriUeeZurFYoJhPf9GQQEF/v4lltp3mVcBmnsAdjEWhr2cjUCZzZNzxCG0HZOvJU44UGHSdzw==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-musl": {
+      "version": "4.58.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.58.0.tgz",
+      "integrity": "sha512-x2xgZlFne+QVNKV8b4wwaCS8pwq3y14zedZ5DqLzjdRITvreBk//4Knbcvm7+lWmms9V9qFp60MtUd0/t/PXPw==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.58.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.58.0.tgz",
+      "integrity": "sha512-jIhrujyn4UnWF8S+DHSkAkDEO3hLX0cjzxJZPLF80xFyzyUIYgSMRcYQ3+uqEoyDD2beGq7Dj7edi8OnJcS/hg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.58.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.58.0.tgz",
+      "integrity": "sha512-+410Srdoh78MKSJxTQ+hZ/Mx+ajd6RjjPwBPNd0R3J9FtL6ZA0GqiiyNjCO9In0IzZkCNrpGymSfn+kgyPQocg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.58.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.58.0.tgz",
+      "integrity": "sha512-ZjMyby5SICi227y1MTR3VYBpFTdZs823Rs/hpakufleBoufoOIB6jtm9FEoxn/cgO7l6PM2rCEl5Kre5vX0QrQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-openbsd-x64": {
+      "version": "4.58.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.58.0.tgz",
+      "integrity": "sha512-ds4iwfYkSQ0k1nb8LTcyXw//ToHOnNTJtceySpL3fa7tc/AsE+UpUFphW126A6fKBGJD5dhRvg8zw1rvoGFxmw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-openharmony-arm64": {
+      "version": "4.58.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.58.0.tgz",
+      "integrity": "sha512-fd/zpJniln4ICdPkjWFhZYeY/bpnaN9pGa6ko+5WD38I0tTqk9lXMgXZg09MNdhpARngmxiCg0B0XUamNw/5BQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.58.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.58.0.tgz",
+      "integrity": "sha512-YpG8dUOip7DCz3nr/JUfPbIUo+2d/dy++5bFzgi4ugOGBIox+qMbbqt/JoORwvI/C9Kn2tz6+Bieoqd5+B1CjA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.58.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.58.0.tgz",
+      "integrity": "sha512-b9DI8jpFQVh4hIXFr0/+N/TzLdpBIoPzjt0Rt4xJbW3mzguV3mduR9cNgiuFcuL/TeORejJhCWiAXe3E/6PxWA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-gnu": {
+      "version": "4.58.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.58.0.tgz",
+      "integrity": "sha512-CSrVpmoRJFN06LL9xhkitkwUcTZtIotYAF5p6XOR2zW0Zz5mzb3IPpcoPhB02frzMHFNo1reQ9xSF5fFm3hUsQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.58.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.58.0.tgz",
+      "integrity": "sha512-QFsBgQNTnh5K0t/sBsjJLq24YVqEIVkGpfN2VHsnN90soZyhaiA9UUHufcctVNL4ypJY0wrwad0wslx2KJQ1/w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@sinclair/typebox": {
+      "version": "0.27.10",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.10.tgz",
+      "integrity": "sha512-MTBk/3jGLNB2tVxv6uLlFh1iu64iYOQ2PbdOSK3NW8JZsmlaOh2q6sdtKowBhfw8QFLmYNzTW4/oK4uATIi6ZA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@sinonjs/commons": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
+      "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "type-detect": "4.0.8"
+      }
+    },
+    "node_modules/@sinonjs/fake-timers": {
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
+      "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@sinonjs/commons": "^3.0.0"
+      }
+    },
+    "node_modules/@types/babel__core": {
+      "version": "7.20.5",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
+      "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
+      }
+    },
+    "node_modules/@types/babel__generator": {
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.27.0.tgz",
+      "integrity": "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__template": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
+      "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__traverse": {
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.28.0.tgz",
+      "integrity": "sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.28.2"
+      }
+    },
+    "node_modules/@types/codemirror": {
+      "version": "5.60.8",
+      "resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-5.60.8.tgz",
+      "integrity": "sha512-VjFgDF/eB+Aklcy15TtOTLQeMjTo07k7KAjql8OK5Dirr7a6sJY4T1uVBDuTVG9VEmn1uUsohOpYnVfgC6/jyw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/tern": "*"
+      }
+    },
+    "node_modules/@types/d3": {
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/@types/d3/-/d3-7.4.3.tgz",
+      "integrity": "sha512-lZXZ9ckh5R8uiFVt8ogUNf+pIrK4EsWrx2Np75WvF/eTpJ0FMHNhjXk8CKEx/+gpHbNQyJWehbFaTvqmHWB3ww==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/d3-array": "*",
+        "@types/d3-axis": "*",
+        "@types/d3-brush": "*",
+        "@types/d3-chord": "*",
+        "@types/d3-color": "*",
+        "@types/d3-contour": "*",
+        "@types/d3-delaunay": "*",
+        "@types/d3-dispatch": "*",
+        "@types/d3-drag": "*",
+        "@types/d3-dsv": "*",
+        "@types/d3-ease": "*",
+        "@types/d3-fetch": "*",
+        "@types/d3-force": "*",
+        "@types/d3-format": "*",
+        "@types/d3-geo": "*",
+        "@types/d3-hierarchy": "*",
+        "@types/d3-interpolate": "*",
+        "@types/d3-path": "*",
+        "@types/d3-polygon": "*",
+        "@types/d3-quadtree": "*",
+        "@types/d3-random": "*",
+        "@types/d3-scale": "*",
+        "@types/d3-scale-chromatic": "*",
+        "@types/d3-selection": "*",
+        "@types/d3-shape": "*",
+        "@types/d3-time": "*",
+        "@types/d3-time-format": "*",
+        "@types/d3-timer": "*",
+        "@types/d3-transition": "*",
+        "@types/d3-zoom": "*"
+      }
+    },
+    "node_modules/@types/d3-array": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.2.tgz",
+      "integrity": "sha512-hOLWVbm7uRza0BYXpIIW5pxfrKe0W+D5lrFiAEYR+pb6w3N2SwSMaJbXdUfSEv+dT4MfHBLtn5js0LAWaO6otw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-axis": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-axis/-/d3-axis-3.0.6.tgz",
+      "integrity": "sha512-pYeijfZuBd87T0hGn0FO1vQ/cgLk6E1ALJjfkC0oJ8cbwkZl3TpgS8bVBLZN+2jjGgg38epgxb2zmoGtSfvgMw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/d3-selection": "*"
+      }
+    },
+    "node_modules/@types/d3-brush": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-brush/-/d3-brush-3.0.6.tgz",
+      "integrity": "sha512-nH60IZNNxEcrh6L1ZSMNA28rj27ut/2ZmI3r96Zd+1jrZD++zD3LsMIjWlvg4AYrHn/Pqz4CF3veCxGjtbqt7A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/d3-selection": "*"
+      }
+    },
+    "node_modules/@types/d3-chord": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-chord/-/d3-chord-3.0.6.tgz",
+      "integrity": "sha512-LFYWWd8nwfwEmTZG9PfQxd17HbNPksHBiJHaKuY1XeqscXacsS2tyoo6OdRsjf+NQYeB6XrNL3a25E3gH69lcg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-color": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz",
+      "integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-contour": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-contour/-/d3-contour-3.0.6.tgz",
+      "integrity": "sha512-BjzLgXGnCWjUSYGfH1cpdo41/hgdWETu4YxpezoztawmqsvCeep+8QGfiY6YbDvfgHz/DkjeIkkZVJavB4a3rg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/d3-array": "*",
+        "@types/geojson": "*"
+      }
+    },
+    "node_modules/@types/d3-delaunay": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
+      "integrity": "sha512-ZMaSKu4THYCU6sV64Lhg6qjf1orxBthaC161plr5KuPHo3CNm8DTHiLw/5Eq2b6TsNP0W0iJrUOFscY6Q450Hw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-dispatch": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-dispatch/-/d3-dispatch-3.0.7.tgz",
+      "integrity": "sha512-5o9OIAdKkhN1QItV2oqaE5KMIiXAvDWBDPrD85e58Qlz1c1kI/J0NcqbEG88CoTwJrYe7ntUCVfeUl2UJKbWgA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-drag": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-drag/-/d3-drag-3.0.7.tgz",
+      "integrity": "sha512-HE3jVKlzU9AaMazNufooRJ5ZpWmLIoc90A37WU2JMmeq28w1FQqCZswHZ3xR+SuxYftzHq6WU6KJHvqxKzTxxQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/d3-selection": "*"
+      }
+    },
+    "node_modules/@types/d3-dsv": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-dsv/-/d3-dsv-3.0.7.tgz",
+      "integrity": "sha512-n6QBF9/+XASqcKK6waudgL0pf/S5XHPPI8APyMLLUHd8NqouBGLsU8MgtO7NINGtPBtk9Kko/W4ea0oAspwh9g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-ease": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.2.tgz",
+      "integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-fetch": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-fetch/-/d3-fetch-3.0.7.tgz",
+      "integrity": "sha512-fTAfNmxSb9SOWNB9IoG5c8Hg6R+AzUHDRlsXsDZsNp6sxAEOP0tkP3gKkNSO/qmHPoBFTxNrjDprVHDQDvo5aA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/d3-dsv": "*"
+      }
+    },
+    "node_modules/@types/d3-force": {
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@types/d3-force/-/d3-force-3.0.10.tgz",
+      "integrity": "sha512-ZYeSaCF3p73RdOKcjj+swRlZfnYpK1EbaDiYICEEp5Q6sUiqFaFQ9qgoshp5CzIyyb/yD09kD9o2zEltCexlgw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-format": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-format/-/d3-format-3.0.4.tgz",
+      "integrity": "sha512-fALi2aI6shfg7vM5KiR1wNJnZ7r6UuggVqtDA+xiEdPZQwy/trcQaHnwShLuLdta2rTymCNpxYTiMZX/e09F4g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-geo": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-3.1.0.tgz",
+      "integrity": "sha512-856sckF0oP/diXtS4jNsiQw/UuK5fQG8l/a9VVLeSouf1/PPbBE1i1W852zVwKwYCBkFJJB7nCFTbk6UMEXBOQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/geojson": "*"
+      }
+    },
+    "node_modules/@types/d3-hierarchy": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-hierarchy/-/d3-hierarchy-3.1.7.tgz",
+      "integrity": "sha512-tJFtNoYBtRtkNysX1Xq4sxtjK8YgoWUNpIiUee0/jHGRwqvzYxkq0hGVbbOGSz+JgFxxRu4K8nb3YpG3CMARtg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-interpolate": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz",
+      "integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/d3-color": "*"
+      }
+    },
+    "node_modules/@types/d3-path": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.1.tgz",
+      "integrity": "sha512-VMZBYyQvbGmWyWVea0EHs/BwLgxc+MKi1zLDCONksozI4YJMcTt8ZEuIR4Sb1MMTE8MMW49v0IwI5+b7RmfWlg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-polygon": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-polygon/-/d3-polygon-3.0.2.tgz",
+      "integrity": "sha512-ZuWOtMaHCkN9xoeEMr1ubW2nGWsp4nIql+OPQRstu4ypeZ+zk3YKqQT0CXVe/PYqrKpZAi+J9mTs05TKwjXSRA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-quadtree": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-quadtree/-/d3-quadtree-3.0.6.tgz",
+      "integrity": "sha512-oUzyO1/Zm6rsxKRHA1vH0NEDG58HrT5icx/azi9MF1TWdtttWl0UIUsjEQBBh+SIkrpd21ZjEv7ptxWys1ncsg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-random": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-random/-/d3-random-3.0.3.tgz",
+      "integrity": "sha512-Imagg1vJ3y76Y2ea0871wpabqp613+8/r0mCLEBfdtqC7xMSfj9idOnmBYyMoULfHePJyxMAw3nWhJxzc+LFwQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-scale": {
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.9.tgz",
+      "integrity": "sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/d3-time": "*"
+      }
+    },
+    "node_modules/@types/d3-scale-chromatic": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
+      "integrity": "sha512-iWMJgwkK7yTRmWqRB5plb1kadXyQ5Sj8V/zYlFGMUBbIPKQScw+Dku9cAAMgJG+z5GYDoMjWGLVOvjghDEFnKQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-selection": {
+      "version": "3.0.11",
+      "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.11.tgz",
+      "integrity": "sha512-bhAXu23DJWsrI45xafYpkQ4NtcKMwWnAC/vKrd2l+nxMFuvOT3XMYTIj2opv8vq8AO5Yh7Qac/nSeP/3zjTK0w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-shape": {
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.8.tgz",
+      "integrity": "sha512-lae0iWfcDeR7qt7rA88BNiqdvPS5pFVPpo5OfjElwNaT2yyekbM0C9vK+yqBqEmHr6lDkRnYNoTBYlAgJa7a4w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/d3-path": "*"
+      }
+    },
+    "node_modules/@types/d3-time": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.4.tgz",
+      "integrity": "sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-time-format": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-4.0.3.tgz",
+      "integrity": "sha512-5xg9rC+wWL8kdDj153qZcsJ0FWiFt0J5RB6LYUNZjwSnesfblqrI/bJ1wBdJ8OQfncgbJG5+2F+qfqnqyzYxyg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-timer": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.2.tgz",
+      "integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-transition": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-3.0.9.tgz",
+      "integrity": "sha512-uZS5shfxzO3rGlu0cC3bjmMFKsXv+SmZZcgp0KD22ts4uGXp5EVYGzu/0YdwZeKmddhcAccYtREJKkPfXkZuCg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/d3-selection": "*"
+      }
+    },
+    "node_modules/@types/d3-zoom": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-3.0.8.tgz",
+      "integrity": "sha512-iqMC4/YlFCSlO8+2Ii1GGGliCAY4XdeG748w5vQUbevlbDu0zSjH/+jojorQVBK/se0j6DUFNPBGSqD3YWYnDw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/d3-interpolate": "*",
+        "@types/d3-selection": "*"
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/fs-extra": {
+      "version": "8.1.5",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.1.5.tgz",
+      "integrity": "sha512-0dzKcwO+S8s2kuF5Z9oUWatQJj5Uq/iqphEtE3GQJVRRYm/tD1LglU2UnXi2A8jLq5umkGouOXOR9y0n613ZwQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/geojson": {
+      "version": "7946.0.16",
+      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz",
+      "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/minimatch": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/graceful-fs": {
+      "version": "4.1.9",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
+      "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/istanbul-lib-coverage": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
+      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/istanbul-lib-report": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
+      "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "*"
+      }
+    },
+    "node_modules/@types/istanbul-reports": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
+      "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/istanbul-lib-report": "*"
+      }
+    },
+    "node_modules/@types/jest": {
+      "version": "29.5.14",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.14.tgz",
+      "integrity": "sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "expect": "^29.0.0",
+        "pretty-format": "^29.0.0"
+      }
+    },
+    "node_modules/@types/minimatch": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
+      "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/node": {
+      "version": "25.3.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.3.0.tgz",
+      "integrity": "sha512-4K3bqJpXpqfg2XKGK9bpDTc6xO/xoUP/RBWS7AtRMug6zZFaRekiLzjVtAoZMquxoAbzBvy5nxQ7veS5eYzf8A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~7.18.0"
+      }
+    },
+    "node_modules/@types/resolve": {
+      "version": "1.20.2",
+      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz",
+      "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/sprintf-js": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@types/sprintf-js/-/sprintf-js-1.1.4.tgz",
+      "integrity": "sha512-aWK1reDYWxcjgcIIPmQi3u+OQDuYa9b+lr6eIsGWrekJ9vr1NSjr4Eab8oQ1iKuH1ltFHpXGyerAv1a3FMKxzQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/stack-utils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
+      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/tern": {
+      "version": "0.23.9",
+      "resolved": "https://registry.npmjs.org/@types/tern/-/tern-0.23.9.tgz",
+      "integrity": "sha512-ypzHFE/wBzh+BlH6rrBgS5I/Z7RD21pGhZ2rltb/+ZrVM1awdZwjx7hE5XfuYgHWk9uvV5HLZN3SloevCAp3Bw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "*"
+      }
+    },
+    "node_modules/@types/yargs": {
+      "version": "17.0.35",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.35.tgz",
+      "integrity": "sha512-qUHkeCyQFxMXg79wQfTtfndEC+N9ZZg76HJftDJp+qH2tV7Gj4OJi7l+PiWwJ+pWtW8GwSmqsDj/oymhrTWXjg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@types/yargs-parser": {
+      "version": "21.0.3",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
+      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/acorn": {
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
+      "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "type-fest": "^0.21.3"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/anymatch/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/argparse/node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-jest": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
+      "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/transform": "^29.7.0",
+        "@types/babel__core": "^7.1.14",
+        "babel-plugin-istanbul": "^6.1.1",
+        "babel-preset-jest": "^29.6.3",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.8.0"
+      }
+    },
+    "node_modules/babel-plugin-istanbul": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^5.0.4",
+        "test-exclude": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-plugin-jest-hoist": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
+      "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/template": "^7.3.3",
+        "@babel/types": "^7.3.3",
+        "@types/babel__core": "^7.1.14",
+        "@types/babel__traverse": "^7.0.6"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/babel-preset-current-node-syntax": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.2.0.tgz",
+      "integrity": "sha512-E/VlAEzRrsLEb2+dv8yp3bo4scof3l9nR4lrld+Iy5NyVqgVYUJnDAmunkhPMisRI32Qc4iRiz425d8vM++2fg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-bigint": "^7.8.3",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
+        "@babel/plugin-syntax-import-attributes": "^7.24.7",
+        "@babel/plugin-syntax-import-meta": "^7.10.4",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0 || ^8.0.0-0"
+      }
+    },
+    "node_modules/babel-preset-jest": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
+      "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "babel-plugin-jest-hoist": "^29.6.3",
+        "babel-preset-current-node-syntax": "^1.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/baseline-browser-mapping": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.0.tgz",
+      "integrity": "sha512-lIyg0szRfYbiy67j9KN8IyeD7q7hcmqnJ1ddWmNt19ItGpNN64mnllmxUNFIOdOm6by97jlL6wfpTTJrmnjWAA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "baseline-browser-mapping": "dist/cli.cjs"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/browserslist": {
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.1.tgz",
+      "integrity": "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "baseline-browser-mapping": "^2.9.0",
+        "caniuse-lite": "^1.0.30001759",
+        "electron-to-chromium": "^1.5.263",
+        "node-releases": "^2.0.27",
+        "update-browserslist-db": "^1.2.0"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
+    "node_modules/bs-logger": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
+      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-json-stable-stringify": "2.x"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/bser": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "node-int64": "^0.4.0"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001770",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001770.tgz",
+      "integrity": "sha512-x/2CLQ1jHENRbHg5PSId2sXq1CIO1CISvwWAj027ltMVG2UNgW+w9oH2+HzgEIRFembL8bUlXtfbBHR1fCg2xw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "CC-BY-4.0"
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/char-regex": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cjs-module-lexer": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz",
+      "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "iojs": ">= 1.0.0",
+        "node": ">= 0.12.0"
+      }
+    },
+    "node_modules/collect-v8-coverage": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.3.tgz",
+      "integrity": "sha512-1L5aqIkwPfiodaMgQunkF1zRhNqifHBmtbbbxcr6yVxxBnliw4TDOW6NxpO8DJLgJ16OT+Y4ztZqP6p/FtXnAw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/colorette": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz",
+      "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/create-jest": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
+      "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "jest-config": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "prompts": "^2.0.1"
+      },
+      "bin": {
+        "create-jest": "bin/create-jest.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/crelt": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
+      "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/d3": {
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/d3/-/d3-7.9.0.tgz",
+      "integrity": "sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-array": "3",
+        "d3-axis": "3",
+        "d3-brush": "3",
+        "d3-chord": "3",
+        "d3-color": "3",
+        "d3-contour": "4",
+        "d3-delaunay": "6",
+        "d3-dispatch": "3",
+        "d3-drag": "3",
+        "d3-dsv": "3",
+        "d3-ease": "3",
+        "d3-fetch": "3",
+        "d3-force": "3",
+        "d3-format": "3",
+        "d3-geo": "3",
+        "d3-hierarchy": "3",
+        "d3-interpolate": "3",
+        "d3-path": "3",
+        "d3-polygon": "3",
+        "d3-quadtree": "3",
+        "d3-random": "3",
+        "d3-scale": "4",
+        "d3-scale-chromatic": "3",
+        "d3-selection": "3",
+        "d3-shape": "3",
+        "d3-time": "3",
+        "d3-time-format": "4",
+        "d3-timer": "3",
+        "d3-transition": "3",
+        "d3-zoom": "3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-array": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
+      "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
+      "license": "ISC",
+      "dependencies": {
+        "internmap": "1 - 2"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-axis": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz",
+      "integrity": "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-brush": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz",
+      "integrity": "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-dispatch": "1 - 3",
+        "d3-drag": "2 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-selection": "3",
+        "d3-transition": "3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-chord": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz",
+      "integrity": "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-path": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-color": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
+      "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-contour": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-4.0.2.tgz",
+      "integrity": "sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-array": "^3.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-delaunay": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
+      "integrity": "sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==",
+      "license": "ISC",
+      "dependencies": {
+        "delaunator": "5"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-dispatch": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
+      "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-drag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz",
+      "integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-dispatch": "1 - 3",
+        "d3-selection": "3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-dsv": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz",
+      "integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==",
+      "license": "ISC",
+      "dependencies": {
+        "commander": "7",
+        "iconv-lite": "0.6",
+        "rw": "1"
+      },
+      "bin": {
+        "csv2json": "bin/dsv2json.js",
+        "csv2tsv": "bin/dsv2dsv.js",
+        "dsv2dsv": "bin/dsv2dsv.js",
+        "dsv2json": "bin/dsv2json.js",
+        "json2csv": "bin/json2dsv.js",
+        "json2dsv": "bin/json2dsv.js",
+        "json2tsv": "bin/json2dsv.js",
+        "tsv2csv": "bin/dsv2dsv.js",
+        "tsv2json": "bin/dsv2json.js"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-ease": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
+      "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-fetch": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz",
+      "integrity": "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-dsv": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-force": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz",
+      "integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-dispatch": "1 - 3",
+        "d3-quadtree": "1 - 3",
+        "d3-timer": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-format": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.2.tgz",
+      "integrity": "sha512-AJDdYOdnyRDV5b6ArilzCPPwc1ejkHcoyFarqlPqT7zRYjhavcT3uSrqcMvsgh2CgoPbK3RCwyHaVyxYcP2Arg==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-geo": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz",
+      "integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-array": "2.5.0 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-hierarchy": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz",
+      "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-interpolate": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
+      "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-color": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-path": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
+      "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-polygon": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz",
+      "integrity": "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-quadtree": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz",
+      "integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-random": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz",
+      "integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-scale": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
+      "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-array": "2.10.0 - 3",
+        "d3-format": "1 - 3",
+        "d3-interpolate": "1.2.0 - 3",
+        "d3-time": "2.1.1 - 3",
+        "d3-time-format": "2 - 4"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-scale-chromatic": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
+      "integrity": "sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-color": "1 - 3",
+        "d3-interpolate": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-selection": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz",
+      "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
+      "license": "ISC",
+      "peer": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-shape": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
+      "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-path": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-time": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
+      "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-array": "2 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-time-format": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
+      "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-time": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-timer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
+      "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-transition": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz",
+      "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-color": "1 - 3",
+        "d3-dispatch": "1 - 3",
+        "d3-ease": "1 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-timer": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "d3-selection": "2 - 3"
+      }
+    },
+    "node_modules/d3-zoom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz",
+      "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-dispatch": "1 - 3",
+        "d3-drag": "2 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-selection": "2 - 3",
+        "d3-transition": "2 - 3"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@types/d3-delaunay": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/@types/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
-      "integrity": "sha512-ZMaSKu4THYCU6sV64Lhg6qjf1orxBthaC161plr5KuPHo3CNm8DTHiLw/5Eq2b6TsNP0W0iJrUOFscY6Q450Hw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/d3-dispatch": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@types/d3-dispatch/-/d3-dispatch-3.0.7.tgz",
-      "integrity": "sha512-5o9OIAdKkhN1QItV2oqaE5KMIiXAvDWBDPrD85e58Qlz1c1kI/J0NcqbEG88CoTwJrYe7ntUCVfeUl2UJKbWgA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/d3-drag": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@types/d3-drag/-/d3-drag-3.0.7.tgz",
-      "integrity": "sha512-HE3jVKlzU9AaMazNufooRJ5ZpWmLIoc90A37WU2JMmeq28w1FQqCZswHZ3xR+SuxYftzHq6WU6KJHvqxKzTxxQ==",
+    "node_modules/debug": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/d3-selection": "*"
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@types/d3-dsv": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@types/d3-dsv/-/d3-dsv-3.0.7.tgz",
-      "integrity": "sha512-n6QBF9/+XASqcKK6waudgL0pf/S5XHPPI8APyMLLUHd8NqouBGLsU8MgtO7NINGtPBtk9Kko/W4ea0oAspwh9g==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/d3-ease": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.2.tgz",
-      "integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/d3-fetch": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@types/d3-fetch/-/d3-fetch-3.0.7.tgz",
-      "integrity": "sha512-fTAfNmxSb9SOWNB9IoG5c8Hg6R+AzUHDRlsXsDZsNp6sxAEOP0tkP3gKkNSO/qmHPoBFTxNrjDprVHDQDvo5aA==",
+    "node_modules/dedent": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.7.1.tgz",
+      "integrity": "sha512-9JmrhGZpOlEgOLdQgSm0zxFaYoQon408V1v49aqTWuXENVlnCuY9JBZcXZiCsZQWDjTm5Qf/nIvAy77mXDAjEg==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@types/d3-dsv": "*"
+      "peerDependencies": {
+        "babel-plugin-macros": "^3.1.0"
+      },
+      "peerDependenciesMeta": {
+        "babel-plugin-macros": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@types/d3-force": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/@types/d3-force/-/d3-force-3.0.10.tgz",
-      "integrity": "sha512-ZYeSaCF3p73RdOKcjj+swRlZfnYpK1EbaDiYICEEp5Q6sUiqFaFQ9qgoshp5CzIyyb/yD09kD9o2zEltCexlgw==",
+    "node_modules/deepmerge": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "node_modules/@types/d3-format": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/d3-format/-/d3-format-3.0.4.tgz",
-      "integrity": "sha512-fALi2aI6shfg7vM5KiR1wNJnZ7r6UuggVqtDA+xiEdPZQwy/trcQaHnwShLuLdta2rTymCNpxYTiMZX/e09F4g==",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/delaunator": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.1.tgz",
+      "integrity": "sha512-8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw==",
+      "license": "ISC",
+      "dependencies": {
+        "robust-predicates": "^3.0.2"
+      }
     },
-    "node_modules/@types/d3-geo": {
+    "node_modules/detect-newline": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-3.1.0.tgz",
-      "integrity": "sha512-856sckF0oP/diXtS4jNsiQw/UuK5fQG8l/a9VVLeSouf1/PPbBE1i1W852zVwKwYCBkFJJB7nCFTbk6UMEXBOQ==",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@types/geojson": "*"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@types/d3-hierarchy": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/@types/d3-hierarchy/-/d3-hierarchy-3.1.7.tgz",
-      "integrity": "sha512-tJFtNoYBtRtkNysX1Xq4sxtjK8YgoWUNpIiUee0/jHGRwqvzYxkq0hGVbbOGSz+JgFxxRu4K8nb3YpG3CMARtg==",
+    "node_modules/diff-sequences": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
     },
-    "node_modules/@types/d3-interpolate": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz",
-      "integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==",
+    "node_modules/dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/d3-color": "*"
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@types/d3-path": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.1.tgz",
-      "integrity": "sha512-VMZBYyQvbGmWyWVea0EHs/BwLgxc+MKi1zLDCONksozI4YJMcTt8ZEuIR4Sb1MMTE8MMW49v0IwI5+b7RmfWlg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/d3-polygon": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@types/d3-polygon/-/d3-polygon-3.0.2.tgz",
-      "integrity": "sha512-ZuWOtMaHCkN9xoeEMr1ubW2nGWsp4nIql+OPQRstu4ypeZ+zk3YKqQT0CXVe/PYqrKpZAi+J9mTs05TKwjXSRA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/d3-quadtree": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@types/d3-quadtree/-/d3-quadtree-3.0.6.tgz",
-      "integrity": "sha512-oUzyO1/Zm6rsxKRHA1vH0NEDG58HrT5icx/azi9MF1TWdtttWl0UIUsjEQBBh+SIkrpd21ZjEv7ptxWys1ncsg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/d3-random": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/d3-random/-/d3-random-3.0.3.tgz",
-      "integrity": "sha512-Imagg1vJ3y76Y2ea0871wpabqp613+8/r0mCLEBfdtqC7xMSfj9idOnmBYyMoULfHePJyxMAw3nWhJxzc+LFwQ==",
+    "node_modules/electron-to-chromium": {
+      "version": "1.5.302",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.302.tgz",
+      "integrity": "sha512-sM6HAN2LyK82IyPBpznDRqlTQAtuSaO+ShzFiWTvoMJLHyZ+Y39r8VMfHzwbU8MVBzQ4Wdn85+wlZl2TLGIlwg==",
       "dev": true,
-      "license": "MIT"
+      "license": "ISC"
     },
-    "node_modules/@types/d3-scale": {
-      "version": "4.0.9",
-      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.9.tgz",
-      "integrity": "sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw==",
+    "node_modules/emittery": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
+      "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@types/d3-time": "*"
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
       }
     },
-    "node_modules/@types/d3-scale-chromatic": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
-      "integrity": "sha512-iWMJgwkK7yTRmWqRB5plb1kadXyQ5Sj8V/zYlFGMUBbIPKQScw+Dku9cAAMgJG+z5GYDoMjWGLVOvjghDEFnKQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/d3-selection": {
-      "version": "3.0.11",
-      "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.11.tgz",
-      "integrity": "sha512-bhAXu23DJWsrI45xafYpkQ4NtcKMwWnAC/vKrd2l+nxMFuvOT3XMYTIj2opv8vq8AO5Yh7Qac/nSeP/3zjTK0w==",
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/d3-shape": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.8.tgz",
-      "integrity": "sha512-lae0iWfcDeR7qt7rA88BNiqdvPS5pFVPpo5OfjElwNaT2yyekbM0C9vK+yqBqEmHr6lDkRnYNoTBYlAgJa7a4w==",
+    "node_modules/error-ex": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.4.tgz",
+      "integrity": "sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/d3-path": "*"
+        "is-arrayish": "^0.2.1"
       }
     },
-    "node_modules/@types/d3-time": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.4.tgz",
-      "integrity": "sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/d3-time-format": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-4.0.3.tgz",
-      "integrity": "sha512-5xg9rC+wWL8kdDj153qZcsJ0FWiFt0J5RB6LYUNZjwSnesfblqrI/bJ1wBdJ8OQfncgbJG5+2F+qfqnqyzYxyg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/d3-timer": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.2.tgz",
-      "integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==",
+    "node_modules/escalade": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
     },
-    "node_modules/@types/d3-transition": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-3.0.9.tgz",
-      "integrity": "sha512-uZS5shfxzO3rGlu0cC3bjmMFKsXv+SmZZcgp0KD22ts4uGXp5EVYGzu/0YdwZeKmddhcAccYtREJKkPfXkZuCg==",
+    "node_modules/escape-string-regexp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@types/d3-selection": "*"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@types/d3-zoom": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-3.0.8.tgz",
-      "integrity": "sha512-iqMC4/YlFCSlO8+2Ii1GGGliCAY4XdeG748w5vQUbevlbDu0zSjH/+jojorQVBK/se0j6DUFNPBGSqD3YWYnDw==",
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/d3-interpolate": "*",
-        "@types/d3-selection": "*"
+      "license": "BSD-2-Clause",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/@types/estree": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
-      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+    "node_modules/estree-walker": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/fs-extra": {
-      "version": "8.1.5",
-      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.1.5.tgz",
-      "integrity": "sha512-0dzKcwO+S8s2kuF5Z9oUWatQJj5Uq/iqphEtE3GQJVRRYm/tD1LglU2UnXi2A8jLq5umkGouOXOR9y0n613ZwQ==",
+    "node_modules/execa": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/node": "*"
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
-    "node_modules/@types/geojson": {
-      "version": "7946.0.16",
-      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz",
-      "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==",
+    "node_modules/exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
       "dev": true,
-      "license": "MIT"
+      "engines": {
+        "node": ">= 0.8.0"
+      }
     },
-    "node_modules/@types/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
+    "node_modules/expect": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
+      "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/minimatch": "*",
-        "@types/node": "*"
+        "@jest/expect-utils": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@types/minimatch": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
-      "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/node": {
-      "version": "25.3.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.3.0.tgz",
-      "integrity": "sha512-4K3bqJpXpqfg2XKGK9bpDTc6xO/xoUP/RBWS7AtRMug6zZFaRekiLzjVtAoZMquxoAbzBvy5nxQ7veS5eYzf8A==",
+    "node_modules/fast-glob": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~7.18.0"
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.8"
+      },
+      "engines": {
+        "node": ">=8.6.0"
       }
     },
-    "node_modules/@types/resolve": {
-      "version": "1.20.2",
-      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz",
-      "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==",
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/sprintf-js": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/@types/sprintf-js/-/sprintf-js-1.1.4.tgz",
-      "integrity": "sha512-aWK1reDYWxcjgcIIPmQi3u+OQDuYa9b+lr6eIsGWrekJ9vr1NSjr4Eab8oQ1iKuH1ltFHpXGyerAv1a3FMKxzQ==",
+    "node_modules/fastq": {
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz",
+      "integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==",
       "dev": true,
-      "license": "MIT"
+      "license": "ISC",
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
     },
-    "node_modules/@types/tern": {
-      "version": "0.23.9",
-      "resolved": "https://registry.npmjs.org/@types/tern/-/tern-0.23.9.tgz",
-      "integrity": "sha512-ypzHFE/wBzh+BlH6rrBgS5I/Z7RD21pGhZ2rltb/+ZrVM1awdZwjx7hE5XfuYgHWk9uvV5HLZN3SloevCAp3Bw==",
+    "node_modules/fb-watchman": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
+      "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
       "dev": true,
-      "license": "MIT",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@types/estree": "*"
+        "bser": "2.1.1"
       }
     },
-    "node_modules/acorn": {
-      "version": "8.15.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
-      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
+    "node_modules/fdir": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
       "dev": true,
       "license": "MIT",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
       "engines": {
-        "node": ">=0.4.0"
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "picomatch": "^3 || ^4"
+      },
+      "peerDependenciesMeta": {
+        "picomatch": {
+          "optional": true
+        }
       }
     },
-    "node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+    "node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+    "node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+    "node_modules/fs-extra": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "fill-range": "^7.1.1"
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=6 <7 || >=8"
       }
     },
-    "node_modules/buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
       "dev": true,
-      "license": "MIT"
+      "license": "ISC"
     },
-    "node_modules/colorette": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz",
-      "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==",
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
-      "license": "MIT"
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
     },
-    "node_modules/commander": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 10"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "dev": true,
-      "license": "MIT"
+      "license": "ISC",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
     },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+    "node_modules/get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.0.0"
+      }
     },
-    "node_modules/crelt": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
-      "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==",
+    "node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
-    "node_modules/d3": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/d3/-/d3-7.9.0.tgz",
-      "integrity": "sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA==",
+    "node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+      "dev": true,
       "license": "ISC",
       "dependencies": {
-        "d3-array": "3",
-        "d3-axis": "3",
-        "d3-brush": "3",
-        "d3-chord": "3",
-        "d3-color": "3",
-        "d3-contour": "4",
-        "d3-delaunay": "6",
-        "d3-dispatch": "3",
-        "d3-drag": "3",
-        "d3-dsv": "3",
-        "d3-ease": "3",
-        "d3-fetch": "3",
-        "d3-force": "3",
-        "d3-format": "3",
-        "d3-geo": "3",
-        "d3-hierarchy": "3",
-        "d3-interpolate": "3",
-        "d3-path": "3",
-        "d3-polygon": "3",
-        "d3-quadtree": "3",
-        "d3-random": "3",
-        "d3-scale": "4",
-        "d3-scale-chromatic": "3",
-        "d3-selection": "3",
-        "d3-shape": "3",
-        "d3-time": "3",
-        "d3-time-format": "4",
-        "d3-timer": "3",
-        "d3-transition": "3",
-        "d3-zoom": "3"
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/d3-array": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
-      "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
       "license": "ISC",
       "dependencies": {
-        "internmap": "1 - 2"
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/globby": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.1.tgz",
+      "integrity": "sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/glob": "^7.1.1",
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.0.3",
+        "glob": "^7.1.3",
+        "ignore": "^5.1.1",
+        "merge2": "^1.2.3",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/handlebars": {
+      "version": "4.7.8",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
+      "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "minimist": "^1.2.5",
+        "neo-async": "^2.6.2",
+        "source-map": "^0.6.1",
+        "wordwrap": "^1.0.0"
+      },
+      "bin": {
+        "handlebars": "bin/handlebars"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=0.4.7"
+      },
+      "optionalDependencies": {
+        "uglify-js": "^3.1.4"
       }
     },
-    "node_modules/d3-axis": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz",
-      "integrity": "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==",
-      "license": "ISC",
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": ">=8"
       }
     },
-    "node_modules/d3-brush": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz",
-      "integrity": "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==",
-      "license": "ISC",
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "d3-dispatch": "1 - 3",
-        "d3-drag": "2 - 3",
-        "d3-interpolate": "1 - 3",
-        "d3-selection": "3",
-        "d3-transition": "3"
+        "function-bind": "^1.1.2"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/d3-chord": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz",
-      "integrity": "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==",
-      "license": "ISC",
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=10.17.0"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "license": "MIT",
       "dependencies": {
-        "d3-path": "1 - 3"
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/d3-color": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
-      "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
-      "license": "ISC",
+    "node_modules/ignore": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": ">= 4"
       }
     },
-    "node_modules/d3-contour": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-4.0.2.tgz",
-      "integrity": "sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==",
-      "license": "ISC",
+    "node_modules/import-local": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
+      "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "d3-array": "^3.2.0"
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/d3-delaunay": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
-      "integrity": "sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==",
-      "license": "ISC",
-      "dependencies": {
-        "delaunator": "5"
-      },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": ">=0.8.19"
       }
     },
-    "node_modules/d3-dispatch": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
-      "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==",
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+      "dev": true,
       "license": "ISC",
-      "engines": {
-        "node": ">=12"
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
       }
     },
-    "node_modules/d3-drag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz",
-      "integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==",
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/internmap": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
+      "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
       "license": "ISC",
-      "dependencies": {
-        "d3-dispatch": "1 - 3",
-        "d3-selection": "3"
-      },
       "engines": {
         "node": ">=12"
       }
     },
-    "node_modules/d3-dsv": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz",
-      "integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==",
-      "license": "ISC",
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/is-core-module": {
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "commander": "7",
-        "iconv-lite": "0.6",
-        "rw": "1"
+        "hasown": "^2.0.2"
       },
-      "bin": {
-        "csv2json": "bin/dsv2json.js",
-        "csv2tsv": "bin/dsv2dsv.js",
-        "dsv2dsv": "bin/dsv2dsv.js",
-        "dsv2json": "bin/dsv2json.js",
-        "json2csv": "bin/json2dsv.js",
-        "json2dsv": "bin/json2dsv.js",
-        "json2tsv": "bin/json2dsv.js",
-        "tsv2csv": "bin/dsv2dsv.js",
-        "tsv2json": "bin/dsv2json.js"
+      "engines": {
+        "node": ">= 0.4"
       },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/d3-ease": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
-      "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==",
-      "license": "BSD-3-Clause",
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": ">=8"
       }
     },
-    "node_modules/d3-fetch": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz",
-      "integrity": "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==",
-      "license": "ISC",
-      "dependencies": {
-        "d3-dsv": "1 - 3"
-      },
+    "node_modules/is-generator-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": ">=6"
       }
     },
-    "node_modules/d3-force": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz",
-      "integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==",
-      "license": "ISC",
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "d3-dispatch": "1 - 3",
-        "d3-quadtree": "1 - 3",
-        "d3-timer": "1 - 3"
+        "is-extglob": "^2.1.1"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/d3-format": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.2.tgz",
-      "integrity": "sha512-AJDdYOdnyRDV5b6ArilzCPPwc1ejkHcoyFarqlPqT7zRYjhavcT3uSrqcMvsgh2CgoPbK3RCwyHaVyxYcP2Arg==",
-      "license": "ISC",
-      "engines": {
-        "node": ">=12"
-      }
+    "node_modules/is-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
+      "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==",
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/d3-geo": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz",
-      "integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==",
-      "license": "ISC",
-      "dependencies": {
-        "d3-array": "2.5.0 - 3"
-      },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": ">=0.12.0"
       }
     },
-    "node_modules/d3-hierarchy": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz",
-      "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==",
-      "license": "ISC",
+    "node_modules/is-plain-object": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.1.tgz",
+      "integrity": "sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/d3-interpolate": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
-      "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
-      "license": "ISC",
+    "node_modules/is-reference": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
+      "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "d3-color": "1 - 3"
-      },
-      "engines": {
-        "node": ">=12"
+        "@types/estree": "*"
       }
     },
-    "node_modules/d3-path": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
-      "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==",
-      "license": "ISC",
+    "node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/d3-polygon": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz",
-      "integrity": "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==",
-      "license": "ISC",
-      "engines": {
-        "node": ">=12"
-      }
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true,
+      "license": "ISC"
     },
-    "node_modules/d3-quadtree": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz",
-      "integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==",
-      "license": "ISC",
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
+      "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
-        "node": ">=12"
+        "node": ">=8"
       }
     },
-    "node_modules/d3-random": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz",
-      "integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==",
-      "license": "ISC",
+    "node_modules/istanbul-lib-instrument": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
+      "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@babel/core": "^7.23.9",
+        "@babel/parser": "^7.23.9",
+        "@istanbuljs/schema": "^0.1.3",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^7.5.4"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=10"
       }
     },
-    "node_modules/d3-scale": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
-      "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
+    "node_modules/istanbul-lib-instrument/node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "dev": true,
       "license": "ISC",
-      "dependencies": {
-        "d3-array": "2.10.0 - 3",
-        "d3-format": "1 - 3",
-        "d3-interpolate": "1.2.0 - 3",
-        "d3-time": "2.1.1 - 3",
-        "d3-time-format": "2 - 4"
+      "bin": {
+        "semver": "bin/semver.js"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=10"
       }
     },
-    "node_modules/d3-scale-chromatic": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
-      "integrity": "sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==",
-      "license": "ISC",
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+      "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "d3-color": "1 - 3",
-        "d3-interpolate": "1 - 3"
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^4.0.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=10"
       }
     },
-    "node_modules/d3-selection": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz",
-      "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
-      "license": "ISC",
-      "peer": true,
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=10"
       }
     },
-    "node_modules/d3-shape": {
+    "node_modules/istanbul-reports": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
-      "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
-      "license": "ISC",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.2.0.tgz",
+      "integrity": "sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "d3-path": "^3.1.0"
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=8"
       }
     },
-    "node_modules/d3-time": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
-      "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
-      "license": "ISC",
+    "node_modules/jest": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
+      "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "d3-array": "2 - 3"
+        "@jest/core": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "import-local": "^3.0.2",
+        "jest-cli": "^29.7.0"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
       },
       "engines": {
-        "node": ">=12"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
       }
     },
-    "node_modules/d3-time-format": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
-      "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
-      "license": "ISC",
+    "node_modules/jest-changed-files": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
+      "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "d3-time": "1 - 3"
+        "execa": "^5.0.0",
+        "jest-util": "^29.7.0",
+        "p-limit": "^3.1.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/d3-timer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
-      "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
-      "license": "ISC",
+    "node_modules/jest-circus": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
+      "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/expect": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "dedent": "^1.0.0",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^29.7.0",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "p-limit": "^3.1.0",
+        "pretty-format": "^29.7.0",
+        "pure-rand": "^6.0.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      },
       "engines": {
-        "node": ">=12"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/d3-transition": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz",
-      "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==",
-      "license": "ISC",
+    "node_modules/jest-cli": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
+      "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "d3-color": "1 - 3",
-        "d3-dispatch": "1 - 3",
-        "d3-ease": "1 - 3",
-        "d3-interpolate": "1 - 3",
-        "d3-timer": "1 - 3"
+        "@jest/core": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "create-jest": "^29.7.0",
+        "exit": "^0.1.2",
+        "import-local": "^3.0.2",
+        "jest-config": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "yargs": "^17.3.1"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
       },
       "engines": {
-        "node": ">=12"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       },
       "peerDependencies": {
-        "d3-selection": "2 - 3"
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
       }
     },
-    "node_modules/d3-zoom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz",
-      "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==",
-      "license": "ISC",
+    "node_modules/jest-config": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
+      "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "d3-dispatch": "1 - 3",
-        "d3-drag": "2 - 3",
-        "d3-interpolate": "1 - 3",
-        "d3-selection": "2 - 3",
-        "d3-transition": "2 - 3"
+        "@babel/core": "^7.11.6",
+        "@jest/test-sequencer": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "babel-jest": "^29.7.0",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-circus": "^29.7.0",
+        "jest-environment-node": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-runner": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "parse-json": "^5.2.0",
+        "pretty-format": "^29.7.0",
+        "slash": "^3.0.0",
+        "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": ">=12"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@types/node": "*",
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "ts-node": {
+          "optional": true
+        }
       }
     },
-    "node_modules/deepmerge": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
-      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+    "node_modules/jest-diff": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
+      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "diff-sequences": "^29.6.3",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/delaunator": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.1.tgz",
-      "integrity": "sha512-8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw==",
-      "license": "ISC",
+    "node_modules/jest-docblock": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
+      "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "robust-predicates": "^3.0.2"
+        "detect-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+    "node_modules/jest-each": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
+      "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "path-type": "^4.0.0"
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "pretty-format": "^29.7.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/estree-walker": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
-      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/fast-glob": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
-      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+    "node_modules/jest-environment-node": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
+      "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.8"
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0"
       },
       "engines": {
-        "node": ">=8.6.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/fastq": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz",
-      "integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==",
+    "node_modules/jest-get-type": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "reusify": "^1.0.4"
+      "license": "MIT",
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/fdir": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
-      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
+    "node_modules/jest-haste-map": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
+      "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/graceful-fs": "^4.1.3",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "walker": "^1.0.8"
+      },
       "engines": {
-        "node": ">=12.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       },
-      "peerDependencies": {
-        "picomatch": "^3 || ^4"
+      "optionalDependencies": {
+        "fsevents": "^2.3.2"
+      }
+    },
+    "node_modules/jest-leak-detector": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
+      "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
       },
-      "peerDependenciesMeta": {
-        "picomatch": {
-          "optional": true
-        }
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+    "node_modules/jest-matcher-utils": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
+      "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "to-regex-range": "^5.0.1"
+        "chalk": "^4.0.0",
+        "jest-diff": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/fs-extra": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+    "node_modules/jest-message-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
+      "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^29.6.3",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^29.7.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
       },
       "engines": {
-        "node": ">=6 <7 || >=8"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+    "node_modules/jest-mock": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
+      "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
       "dev": true,
-      "license": "ISC"
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-util": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
     },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+    "node_modules/jest-pnp-resolver": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
+      "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
       "dev": true,
-      "hasInstallScript": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
       "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+        "node": ">=6"
+      },
+      "peerDependencies": {
+        "jest-resolve": "*"
+      },
+      "peerDependenciesMeta": {
+        "jest-resolve": {
+          "optional": true
+        }
       }
     },
-    "node_modules/function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+    "node_modules/jest-regex-util": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
+      "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
       "dev": true,
       "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+    "node_modules/jest-resolve": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
+      "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
       "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "resolve": "^1.20.0",
+        "resolve.exports": "^2.0.0",
+        "slash": "^3.0.0"
       },
       "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+    "node_modules/jest-resolve-dependencies": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
+      "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
       "dependencies": {
-        "is-glob": "^4.0.1"
+        "jest-regex-util": "^29.6.3",
+        "jest-snapshot": "^29.7.0"
       },
       "engines": {
-        "node": ">= 6"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/globby": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.1.tgz",
-      "integrity": "sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==",
+    "node_modules/jest-runner": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
+      "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/glob": "^7.1.1",
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.0.3",
-        "glob": "^7.1.3",
-        "ignore": "^5.1.1",
-        "merge2": "^1.2.3",
-        "slash": "^3.0.0"
+        "@jest/console": "^29.7.0",
+        "@jest/environment": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "emittery": "^0.13.1",
+        "graceful-fs": "^4.2.9",
+        "jest-docblock": "^29.7.0",
+        "jest-environment-node": "^29.7.0",
+        "jest-haste-map": "^29.7.0",
+        "jest-leak-detector": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-resolve": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-watcher": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "p-limit": "^3.1.0",
+        "source-map-support": "0.5.13"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/graceful-fs": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+    "node_modules/jest-runtime": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
+      "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "function-bind": "^1.1.2"
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/globals": "^29.7.0",
+        "@jest/source-map": "^29.6.3",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^1.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-mock": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+    "node_modules/jest-snapshot": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
+      "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
+        "@babel/core": "^7.11.6",
+        "@babel/generator": "^7.7.2",
+        "@babel/plugin-syntax-jsx": "^7.7.2",
+        "@babel/plugin-syntax-typescript": "^7.7.2",
+        "@babel/types": "^7.3.3",
+        "@jest/expect-utils": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "babel-preset-current-node-syntax": "^1.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^29.7.0",
+        "graceful-fs": "^4.2.9",
+        "jest-diff": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^29.7.0",
+        "semver": "^7.5.3"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/ignore": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
-      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+    "node_modules/jest-snapshot/node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
       "dev": true,
-      "license": "MIT",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
       "engines": {
-        "node": ">= 4"
+        "node": ">=10"
       }
     },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+    "node_modules/jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
       "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+    "node_modules/jest-util/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/internmap": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
-      "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
-      "license": "ISC",
+      "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/is-core-module": {
-      "version": "2.16.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
-      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+    "node_modules/jest-validate": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
+      "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "hasown": "^2.0.2"
+        "@jest/types": "^29.6.3",
+        "camelcase": "^6.2.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.6.3",
+        "leven": "^3.1.0",
+        "pretty-format": "^29.7.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+    "node_modules/jest-validate/node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+    "node_modules/jest-watcher": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
+      "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "is-extglob": "^2.1.1"
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "emittery": "^0.13.1",
+        "jest-util": "^29.7.0",
+        "string-length": "^4.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/is-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
-      "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+    "node_modules/jest-worker": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
+      "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "jest-util": "^29.7.0",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
       "engines": {
-        "node": ">=0.12.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/is-plain-object": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.1.tgz",
-      "integrity": "sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==",
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "node_modules/is-reference": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
-      "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==",
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/js-yaml": {
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
+      "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/estree": "*"
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
     "node_modules/jsep": {
@@ -1848,6 +4371,39 @@
         "node": ">= 10.16.0"
       }
     },
+    "node_modules/jsesc": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/jsonfile": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
@@ -1858,6 +4414,63 @@
         "graceful-fs": "^4.1.6"
       }
     },
+    "node_modules/kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/leven": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
     "node_modules/magic-string": {
       "version": "0.30.21",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
@@ -1868,6 +4481,59 @@
         "@jridgewell/sourcemap-codec": "^1.5.5"
       }
     },
+    "node_modules/make-dir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/make-dir/node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/make-error": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/makeerror": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "tmpl": "1.0.5"
+      }
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/merge2": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
@@ -1905,6 +4571,16 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -1918,6 +4594,16 @@
         "node": "*"
       }
     },
+    "node_modules/minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/moment": {
       "version": "2.29.4",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
@@ -1928,6 +4614,64 @@
         "node": "*"
       }
     },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.27",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.27.tgz",
+      "integrity": "sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/obsidian": {
       "version": "1.12.2",
       "resolved": "https://github.com/obsidianmd/obsidian-api/tarball/master",
@@ -1953,6 +4697,106 @@
         "wrappy": "1"
       }
     },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-locate/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -1963,6 +4807,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/path-parse": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
@@ -1980,6 +4834,13 @@
         "node": ">=8"
       }
     },
+    "node_modules/picocolors": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/picomatch": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
@@ -1994,6 +4855,88 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/pirates": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz",
+      "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pretty-format": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/schemas": "^29.6.3",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/prompts": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kleur": "^3.0.3",
+        "sisteransi": "^1.0.5"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/pure-rand": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",
+      "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/dubzzz"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fast-check"
+        }
+      ],
+      "license": "MIT"
+    },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -2025,6 +4968,23 @@
         "safe-buffer": "^5.1.0"
       }
     },
+    "node_modules/react-is": {
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/resolve": {
       "version": "1.22.11",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz",
@@ -2046,6 +5006,39 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/resolve-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve.exports": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz",
+      "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/reusify": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
@@ -2064,9 +5057,9 @@
       "license": "Unlicense"
     },
     "node_modules/rollup": {
-      "version": "4.57.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.57.1.tgz",
-      "integrity": "sha512-oQL6lgK3e2QZeQ7gcgIkS2YZPg5slw37hYufJ3edKlfQSGGm8ICoxswK15ntSzF/a8+h7ekRy7k7oWc3BQ7y8A==",
+      "version": "4.58.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.58.0.tgz",
+      "integrity": "sha512-wbT0mBmWbIvvq8NeEYWWvevvxnOyhKChir47S66WCxw1SXqhw7ssIYejnQEVt7XYQpsj2y8F9PM+Cr3SNEa0gw==",
       "dev": true,
       "license": "MIT",
       "peer": true,
@@ -2081,31 +5074,31 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.57.1",
-        "@rollup/rollup-android-arm64": "4.57.1",
-        "@rollup/rollup-darwin-arm64": "4.57.1",
-        "@rollup/rollup-darwin-x64": "4.57.1",
-        "@rollup/rollup-freebsd-arm64": "4.57.1",
-        "@rollup/rollup-freebsd-x64": "4.57.1",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.57.1",
-        "@rollup/rollup-linux-arm-musleabihf": "4.57.1",
-        "@rollup/rollup-linux-arm64-gnu": "4.57.1",
-        "@rollup/rollup-linux-arm64-musl": "4.57.1",
-        "@rollup/rollup-linux-loong64-gnu": "4.57.1",
-        "@rollup/rollup-linux-loong64-musl": "4.57.1",
-        "@rollup/rollup-linux-ppc64-gnu": "4.57.1",
-        "@rollup/rollup-linux-ppc64-musl": "4.57.1",
-        "@rollup/rollup-linux-riscv64-gnu": "4.57.1",
-        "@rollup/rollup-linux-riscv64-musl": "4.57.1",
-        "@rollup/rollup-linux-s390x-gnu": "4.57.1",
-        "@rollup/rollup-linux-x64-gnu": "4.57.1",
-        "@rollup/rollup-linux-x64-musl": "4.57.1",
-        "@rollup/rollup-openbsd-x64": "4.57.1",
-        "@rollup/rollup-openharmony-arm64": "4.57.1",
-        "@rollup/rollup-win32-arm64-msvc": "4.57.1",
-        "@rollup/rollup-win32-ia32-msvc": "4.57.1",
-        "@rollup/rollup-win32-x64-gnu": "4.57.1",
-        "@rollup/rollup-win32-x64-msvc": "4.57.1",
+        "@rollup/rollup-android-arm-eabi": "4.58.0",
+        "@rollup/rollup-android-arm64": "4.58.0",
+        "@rollup/rollup-darwin-arm64": "4.58.0",
+        "@rollup/rollup-darwin-x64": "4.58.0",
+        "@rollup/rollup-freebsd-arm64": "4.58.0",
+        "@rollup/rollup-freebsd-x64": "4.58.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.58.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.58.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.58.0",
+        "@rollup/rollup-linux-arm64-musl": "4.58.0",
+        "@rollup/rollup-linux-loong64-gnu": "4.58.0",
+        "@rollup/rollup-linux-loong64-musl": "4.58.0",
+        "@rollup/rollup-linux-ppc64-gnu": "4.58.0",
+        "@rollup/rollup-linux-ppc64-musl": "4.58.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.58.0",
+        "@rollup/rollup-linux-riscv64-musl": "4.58.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.58.0",
+        "@rollup/rollup-linux-x64-gnu": "4.58.0",
+        "@rollup/rollup-linux-x64-musl": "4.58.0",
+        "@rollup/rollup-openbsd-x64": "4.58.0",
+        "@rollup/rollup-openharmony-arm64": "4.58.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.58.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.58.0",
+        "@rollup/rollup-win32-x64-gnu": "4.58.0",
+        "@rollup/rollup-win32-x64-msvc": "4.58.0",
         "fsevents": "~2.3.2"
       }
     },
@@ -2183,15 +5176,62 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
       "license": "MIT"
     },
-    "node_modules/serialize-javascript": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
-      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
+    "node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/serialize-javascript": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/sisteransi": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
       "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
+      "license": "MIT"
     },
     "node_modules/slash": {
       "version": "3.0.0",
@@ -2224,9 +5264,9 @@
       }
     },
     "node_modules/source-map-support": {
-      "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "version": "0.5.13",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2240,6 +5280,94 @@
       "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
       "license": "BSD-3-Clause"
     },
+    "node_modules/stack-utils": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
+      "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "escape-string-regexp": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/string-length": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "char-regex": "^1.0.2",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/style-mod": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.3.tgz",
@@ -2247,6 +5375,19 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/supports-preserve-symlinks-flag": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
@@ -2286,6 +5427,39 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/terser/node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/tmpl": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -2299,6 +5473,85 @@
         "node": ">=8.0"
       }
     },
+    "node_modules/ts-jest": {
+      "version": "29.4.6",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.6.tgz",
+      "integrity": "sha512-fSpWtOO/1AjSNQguk43hb/JCo16oJDnMJf3CdEGNkqsEX3t0KX96xvyX1D7PfLCpVoKu4MfVrqUkFyblYoY4lA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bs-logger": "^0.2.6",
+        "fast-json-stable-stringify": "^2.1.0",
+        "handlebars": "^4.7.8",
+        "json5": "^2.2.3",
+        "lodash.memoize": "^4.1.2",
+        "make-error": "^1.3.6",
+        "semver": "^7.7.3",
+        "type-fest": "^4.41.0",
+        "yargs-parser": "^21.1.1"
+      },
+      "bin": {
+        "ts-jest": "cli.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": ">=7.0.0-beta.0 <8",
+        "@jest/transform": "^29.0.0 || ^30.0.0",
+        "@jest/types": "^29.0.0 || ^30.0.0",
+        "babel-jest": "^29.0.0 || ^30.0.0",
+        "jest": "^29.0.0 || ^30.0.0",
+        "jest-util": "^29.0.0 || ^30.0.0",
+        "typescript": ">=4.3 <6"
+      },
+      "peerDependenciesMeta": {
+        "@babel/core": {
+          "optional": true
+        },
+        "@jest/transform": {
+          "optional": true
+        },
+        "@jest/types": {
+          "optional": true
+        },
+        "babel-jest": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        },
+        "jest-util": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ts-jest/node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ts-jest/node_modules/type-fest": {
+      "version": "4.41.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
+      "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/tslib": {
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
@@ -2307,6 +5560,29 @@
       "license": "0BSD",
       "peer": true
     },
+    "node_modules/type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/typescript": {
       "version": "5.9.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
@@ -2322,6 +5598,20 @@
         "node": ">=14.17"
       }
     },
+    "node_modules/uglify-js": {
+      "version": "3.19.3",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",
+      "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "optional": true,
+      "bin": {
+        "uglifyjs": "bin/uglifyjs"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/undici-types": {
       "version": "7.18.2",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz",
@@ -2339,6 +5629,52 @@
         "node": ">= 4.0.0"
       }
     },
+    "node_modules/update-browserslist-db": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",
+      "integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.1"
+      },
+      "bin": {
+        "update-browserslist-db": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
+      }
+    },
+    "node_modules/v8-to-istanbul": {
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
+      "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.12",
+        "@types/istanbul-lib-coverage": "^2.0.1",
+        "convert-source-map": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.12.0"
+      }
+    },
     "node_modules/w3c-keyname": {
       "version": "2.2.8",
       "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
@@ -2346,12 +5682,136 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/walker": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
+      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "makeerror": "1.0.12"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/wordwrap": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+      "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "dev": true,
       "license": "ISC"
+    },
+    "node_modules/write-file-atomic": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.7"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     }
   }
 }
diff --git a/package.json b/package.json
index 27d8cbe..b8d0769 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.18.0",
+  "version": "1.19.0",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {
diff --git a/versions.json b/versions.json
index 9157c01..8ce0487 100644
--- a/versions.json
+++ b/versions.json
@@ -40,5 +40,6 @@
   "1.15.1": "0.9.12",
   "1.16.0": "0.9.12",
   "1.17.0": "0.9.12",
-  "1.18.0": "0.9.12"
+  "1.18.0": "0.9.12",
+  "1.19.0": "0.9.12"
 }

From 8327f94c17ec46fca694c44ce8f51482f3178fa1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Mar 2026 14:32:08 +0000
Subject: [PATCH 400/402] Bump @types/node from 25.3.0 to 25.3.3

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.3.0 to 25.3.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.3.3
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 29 +++++++++++++----------------
 package.json      |  2 +-
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ab08b07..5ea23b4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
         "@rollup/plugin-typescript": "^12.3.0",
         "@types/d3": "^7.4.3",
         "@types/jest": "^29.5.14",
-        "@types/node": "^25.3.0",
+        "@types/node": "^25.3.3",
         "@types/sprintf-js": "^1.1.4",
         "jest": "^29.7.0",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
@@ -938,7 +938,8 @@
       "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz",
       "integrity": "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
@@ -1910,9 +1911,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.3.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.3.0.tgz",
-      "integrity": "sha512-4K3bqJpXpqfg2XKGK9bpDTc6xO/xoUP/RBWS7AtRMug6zZFaRekiLzjVtAoZMquxoAbzBvy5nxQ7veS5eYzf8A==",
+      "version": "25.3.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.3.3.tgz",
+      "integrity": "sha512-DpzbrH7wIcBaJibpKo9nnSQL0MTRdnWttGyE5haGwK86xgMOkFLp7vEyfQPGLOJh5wNYiJ3V9PmUMDhV9u8kkQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2256,7 +2257,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.9.0",
         "caniuse-lite": "^1.0.30001759",
@@ -2509,7 +2509,8 @@
       "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
       "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/cross-spawn": {
       "version": "7.0.6",
@@ -2843,7 +2844,6 @@
       "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz",
       "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
       "license": "ISC",
-      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -3737,7 +3737,6 @@
       "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/core": "^29.7.0",
         "@jest/types": "^29.6.3",
@@ -4847,7 +4846,6 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -5062,7 +5060,6 @@
       "integrity": "sha512-wbT0mBmWbIvvq8NeEYWWvevvxnOyhKChir47S66WCxw1SXqhw7ssIYejnQEVt7XYQpsj2y8F9PM+Cr3SNEa0gw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/estree": "1.0.8"
       },
@@ -5373,7 +5370,8 @@
       "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.3.tgz",
       "integrity": "sha512-i/n8VsZydrugj3Iuzll8+x/00GH2vnYsk1eomD8QiRrSAeW6ItbCQDtfXCeJHd0iwiNagqjQkvpvREEPtW3IoQ==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/supports-color": {
       "version": "7.2.0",
@@ -5557,8 +5555,7 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
       "dev": true,
-      "license": "0BSD",
-      "peer": true
+      "license": "0BSD"
     },
     "node_modules/type-detect": {
       "version": "4.0.8",
@@ -5589,7 +5586,6 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -5680,7 +5676,8 @@
       "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
       "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/walker": {
       "version": "1.0.8",
diff --git a/package.json b/package.json
index b8d0769..be01f4a 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "@rollup/plugin-typescript": "^12.3.0",
     "@types/d3": "^7.4.3",
     "@types/jest": "^29.5.14",
-    "@types/node": "^25.3.0",
+    "@types/node": "^25.3.3",
     "@types/sprintf-js": "^1.1.4",
     "jest": "^29.7.0",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",

From c74f3b6c0a119c8a365a7d1367899b4eea167a0c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Mar 2026 17:30:30 +0000
Subject: [PATCH 401/402] Bump rollup from 4.58.0 to 4.59.0

Bumps [rollup](https://github.com/rollup/rollup) from 4.58.0 to 4.59.0.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v4.58.0...v4.59.0)

---
updated-dependencies:
- dependency-name: rollup
  dependency-version: 4.59.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 208 +++++++++++++++++++++++-----------------------
 package.json      |   2 +-
 2 files changed, 105 insertions(+), 105 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5ea23b4..0850ef9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,7 +25,7 @@
         "@types/sprintf-js": "^1.1.4",
         "jest": "^29.7.0",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-        "rollup": "^4.57.1",
+        "rollup": "^4.59.0",
         "rollup-plugin-copy": "^3.5.0",
         "ts-jest": "^29.4.6",
         "tslib": "^2.8.1",
@@ -1105,9 +1105,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.58.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.58.0.tgz",
-      "integrity": "sha512-mr0tmS/4FoVk1cnaeN244A/wjvGDNItZKR8hRhnmCzygyRXYtKF5jVDSIILR1U97CTzAYmbgIj/Dukg62ggG5w==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.59.0.tgz",
+      "integrity": "sha512-upnNBkA6ZH2VKGcBj9Fyl9IGNPULcjXRlg0LLeaioQWueH30p6IXtJEbKAgvyv+mJaMxSm1l6xwDXYjpEMiLMg==",
       "cpu": [
         "arm"
       ],
@@ -1119,9 +1119,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.58.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.58.0.tgz",
-      "integrity": "sha512-+s++dbp+/RTte62mQD9wLSbiMTV+xr/PeRJEc/sFZFSBRlHPNPVaf5FXlzAL77Mr8FtSfQqCN+I598M8U41ccQ==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.59.0.tgz",
+      "integrity": "sha512-hZ+Zxj3SySm4A/DylsDKZAeVg0mvi++0PYVceVyX7hemkw7OreKdCvW2oQ3T1FMZvCaQXqOTHb8qmBShoqk69Q==",
       "cpu": [
         "arm64"
       ],
@@ -1133,9 +1133,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.58.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.58.0.tgz",
-      "integrity": "sha512-MFWBwTcYs0jZbINQBXHfSrpSQJq3IUOakcKPzfeSznONop14Pxuqa0Kg19GD0rNBMPQI2tFtu3UzapZpH0Uc1Q==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.59.0.tgz",
+      "integrity": "sha512-W2Psnbh1J8ZJw0xKAd8zdNgF9HRLkdWwwdWqubSVk0pUuQkoHnv7rx4GiF9rT4t5DIZGAsConRE3AxCdJ4m8rg==",
       "cpu": [
         "arm64"
       ],
@@ -1147,9 +1147,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.58.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.58.0.tgz",
-      "integrity": "sha512-yiKJY7pj9c9JwzuKYLFaDZw5gma3fI9bkPEIyofvVfsPqjCWPglSHdpdwXpKGvDeYDms3Qal8qGMEHZ1M/4Udg==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.59.0.tgz",
+      "integrity": "sha512-ZW2KkwlS4lwTv7ZVsYDiARfFCnSGhzYPdiOU4IM2fDbL+QGlyAbjgSFuqNRbSthybLbIJ915UtZBtmuLrQAT/w==",
       "cpu": [
         "x64"
       ],
@@ -1161,9 +1161,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.58.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.58.0.tgz",
-      "integrity": "sha512-x97kCoBh5MOevpn/CNK9W1x8BEzO238541BGWBc315uOlN0AD/ifZ1msg+ZQB05Ux+VF6EcYqpiagfLJ8U3LvQ==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.59.0.tgz",
+      "integrity": "sha512-EsKaJ5ytAu9jI3lonzn3BgG8iRBjV4LxZexygcQbpiU0wU0ATxhNVEpXKfUa0pS05gTcSDMKpn3Sx+QB9RlTTA==",
       "cpu": [
         "arm64"
       ],
@@ -1175,9 +1175,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.58.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.58.0.tgz",
-      "integrity": "sha512-Aa8jPoZ6IQAG2eIrcXPpjRcMjROMFxCt1UYPZZtCxRV68WkuSigYtQ/7Zwrcr2IvtNJo7T2JfDXyMLxq5L4Jlg==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.59.0.tgz",
+      "integrity": "sha512-d3DuZi2KzTMjImrxoHIAODUZYoUUMsuUiY4SRRcJy6NJoZ6iIqWnJu9IScV9jXysyGMVuW+KNzZvBLOcpdl3Vg==",
       "cpu": [
         "x64"
       ],
@@ -1189,9 +1189,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.58.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.58.0.tgz",
-      "integrity": "sha512-Ob8YgT5kD/lSIYW2Rcngs5kNB/44Q2RzBSPz9brf2WEtcGR7/f/E9HeHn1wYaAwKBni+bdXEwgHvUd0x12lQSA==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.59.0.tgz",
+      "integrity": "sha512-t4ONHboXi/3E0rT6OZl1pKbl2Vgxf9vJfWgmUoCEVQVxhW6Cw/c8I6hbbu7DAvgp82RKiH7TpLwxnJeKv2pbsw==",
       "cpu": [
         "arm"
       ],
@@ -1203,9 +1203,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.58.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.58.0.tgz",
-      "integrity": "sha512-K+RI5oP1ceqoadvNt1FecL17Qtw/n9BgRSzxif3rTL2QlIu88ccvY+Y9nnHe/cmT5zbH9+bpiJuG1mGHRVwF4Q==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.59.0.tgz",
+      "integrity": "sha512-CikFT7aYPA2ufMD086cVORBYGHffBo4K8MQ4uPS/ZnY54GKj36i196u8U+aDVT2LX4eSMbyHtyOh7D7Zvk2VvA==",
       "cpu": [
         "arm"
       ],
@@ -1217,9 +1217,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.58.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.58.0.tgz",
-      "integrity": "sha512-T+17JAsCKUjmbopcKepJjHWHXSjeW7O5PL7lEFaeQmiVyw4kkc5/lyYKzrv6ElWRX/MrEWfPiJWqbTvfIvjM1Q==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.59.0.tgz",
+      "integrity": "sha512-jYgUGk5aLd1nUb1CtQ8E+t5JhLc9x5WdBKew9ZgAXg7DBk0ZHErLHdXM24rfX+bKrFe+Xp5YuJo54I5HFjGDAA==",
       "cpu": [
         "arm64"
       ],
@@ -1231,9 +1231,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.58.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.58.0.tgz",
-      "integrity": "sha512-cCePktb9+6R9itIJdeCFF9txPU7pQeEHB5AbHu/MKsfH/k70ZtOeq1k4YAtBv9Z7mmKI5/wOLYjQ+B9QdxR6LA==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.59.0.tgz",
+      "integrity": "sha512-peZRVEdnFWZ5Bh2KeumKG9ty7aCXzzEsHShOZEFiCQlDEepP1dpUl/SrUNXNg13UmZl+gzVDPsiCwnV1uI0RUA==",
       "cpu": [
         "arm64"
       ],
@@ -1245,9 +1245,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-loong64-gnu": {
-      "version": "4.58.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.58.0.tgz",
-      "integrity": "sha512-iekUaLkfliAsDl4/xSdoCJ1gnnIXvoNz85C8U8+ZxknM5pBStfZjeXgB8lXobDQvvPRCN8FPmmuTtH+z95HTmg==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.59.0.tgz",
+      "integrity": "sha512-gbUSW/97f7+r4gHy3Jlup8zDG190AuodsWnNiXErp9mT90iCy9NKKU0Xwx5k8VlRAIV2uU9CsMnEFg/xXaOfXg==",
       "cpu": [
         "loong64"
       ],
@@ -1259,9 +1259,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-loong64-musl": {
-      "version": "4.58.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.58.0.tgz",
-      "integrity": "sha512-68ofRgJNl/jYJbxFjCKE7IwhbfxOl1muPN4KbIqAIe32lm22KmU7E8OPvyy68HTNkI2iV/c8y2kSPSm2mW/Q9Q==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.59.0.tgz",
+      "integrity": "sha512-yTRONe79E+o0FWFijasoTjtzG9EBedFXJMl888NBEDCDV9I2wGbFFfJQQe63OijbFCUZqxpHz1GzpbtSFikJ4Q==",
       "cpu": [
         "loong64"
       ],
@@ -1273,9 +1273,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-ppc64-gnu": {
-      "version": "4.58.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.58.0.tgz",
-      "integrity": "sha512-dpz8vT0i+JqUKuSNPCP5SYyIV2Lh0sNL1+FhM7eLC457d5B9/BC3kDPp5BBftMmTNsBarcPcoz5UGSsnCiw4XQ==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.59.0.tgz",
+      "integrity": "sha512-sw1o3tfyk12k3OEpRddF68a1unZ5VCN7zoTNtSn2KndUE+ea3m3ROOKRCZxEpmT9nsGnogpFP9x6mnLTCaoLkA==",
       "cpu": [
         "ppc64"
       ],
@@ -1287,9 +1287,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-ppc64-musl": {
-      "version": "4.58.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.58.0.tgz",
-      "integrity": "sha512-4gdkkf9UJ7tafnweBCR/mk4jf3Jfl0cKX9Np80t5i78kjIH0ZdezUv/JDI2VtruE5lunfACqftJ8dIMGN4oHew==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.59.0.tgz",
+      "integrity": "sha512-+2kLtQ4xT3AiIxkzFVFXfsmlZiG5FXYW7ZyIIvGA7Bdeuh9Z0aN4hVyXS/G1E9bTP/vqszNIN/pUKCk/BTHsKA==",
       "cpu": [
         "ppc64"
       ],
@@ -1301,9 +1301,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.58.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.58.0.tgz",
-      "integrity": "sha512-YFS4vPnOkDTD/JriUeeZurFYoJhPf9GQQEF/v4lltp3mVcBmnsAdjEWhr2cjUCZzZNzxCG0HZOvJU44UGHSdzw==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.59.0.tgz",
+      "integrity": "sha512-NDYMpsXYJJaj+I7UdwIuHHNxXZ/b/N2hR15NyH3m2qAtb/hHPA4g4SuuvrdxetTdndfj9b1WOmy73kcPRoERUg==",
       "cpu": [
         "riscv64"
       ],
@@ -1315,9 +1315,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-musl": {
-      "version": "4.58.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.58.0.tgz",
-      "integrity": "sha512-x2xgZlFne+QVNKV8b4wwaCS8pwq3y14zedZ5DqLzjdRITvreBk//4Knbcvm7+lWmms9V9qFp60MtUd0/t/PXPw==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.59.0.tgz",
+      "integrity": "sha512-nLckB8WOqHIf1bhymk+oHxvM9D3tyPndZH8i8+35p/1YiVoVswPid2yLzgX7ZJP0KQvnkhM4H6QZ5m0LzbyIAg==",
       "cpu": [
         "riscv64"
       ],
@@ -1329,9 +1329,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.58.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.58.0.tgz",
-      "integrity": "sha512-jIhrujyn4UnWF8S+DHSkAkDEO3hLX0cjzxJZPLF80xFyzyUIYgSMRcYQ3+uqEoyDD2beGq7Dj7edi8OnJcS/hg==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.59.0.tgz",
+      "integrity": "sha512-oF87Ie3uAIvORFBpwnCvUzdeYUqi2wY6jRFWJAy1qus/udHFYIkplYRW+wo+GRUP4sKzYdmE1Y3+rY5Gc4ZO+w==",
       "cpu": [
         "s390x"
       ],
@@ -1343,9 +1343,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.58.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.58.0.tgz",
-      "integrity": "sha512-+410Srdoh78MKSJxTQ+hZ/Mx+ajd6RjjPwBPNd0R3J9FtL6ZA0GqiiyNjCO9In0IzZkCNrpGymSfn+kgyPQocg==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.59.0.tgz",
+      "integrity": "sha512-3AHmtQq/ppNuUspKAlvA8HtLybkDflkMuLK4DPo77DfthRb71V84/c4MlWJXixZz4uruIH4uaa07IqoAkG64fg==",
       "cpu": [
         "x64"
       ],
@@ -1357,9 +1357,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.58.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.58.0.tgz",
-      "integrity": "sha512-ZjMyby5SICi227y1MTR3VYBpFTdZs823Rs/hpakufleBoufoOIB6jtm9FEoxn/cgO7l6PM2rCEl5Kre5vX0QrQ==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.59.0.tgz",
+      "integrity": "sha512-2UdiwS/9cTAx7qIUZB/fWtToJwvt0Vbo0zmnYt7ED35KPg13Q0ym1g442THLC7VyI6JfYTP4PiSOWyoMdV2/xg==",
       "cpu": [
         "x64"
       ],
@@ -1371,9 +1371,9 @@
       ]
     },
     "node_modules/@rollup/rollup-openbsd-x64": {
-      "version": "4.58.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.58.0.tgz",
-      "integrity": "sha512-ds4iwfYkSQ0k1nb8LTcyXw//ToHOnNTJtceySpL3fa7tc/AsE+UpUFphW126A6fKBGJD5dhRvg8zw1rvoGFxmw==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.59.0.tgz",
+      "integrity": "sha512-M3bLRAVk6GOwFlPTIxVBSYKUaqfLrn8l0psKinkCFxl4lQvOSz8ZrKDz2gxcBwHFpci0B6rttydI4IpS4IS/jQ==",
       "cpu": [
         "x64"
       ],
@@ -1385,9 +1385,9 @@
       ]
     },
     "node_modules/@rollup/rollup-openharmony-arm64": {
-      "version": "4.58.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.58.0.tgz",
-      "integrity": "sha512-fd/zpJniln4ICdPkjWFhZYeY/bpnaN9pGa6ko+5WD38I0tTqk9lXMgXZg09MNdhpARngmxiCg0B0XUamNw/5BQ==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.59.0.tgz",
+      "integrity": "sha512-tt9KBJqaqp5i5HUZzoafHZX8b5Q2Fe7UjYERADll83O4fGqJ49O1FsL6LpdzVFQcpwvnyd0i+K/VSwu/o/nWlA==",
       "cpu": [
         "arm64"
       ],
@@ -1399,9 +1399,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.58.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.58.0.tgz",
-      "integrity": "sha512-YpG8dUOip7DCz3nr/JUfPbIUo+2d/dy++5bFzgi4ugOGBIox+qMbbqt/JoORwvI/C9Kn2tz6+Bieoqd5+B1CjA==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.59.0.tgz",
+      "integrity": "sha512-V5B6mG7OrGTwnxaNUzZTDTjDS7F75PO1ae6MJYdiMu60sq0CqN5CVeVsbhPxalupvTX8gXVSU9gq+Rx1/hvu6A==",
       "cpu": [
         "arm64"
       ],
@@ -1413,9 +1413,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.58.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.58.0.tgz",
-      "integrity": "sha512-b9DI8jpFQVh4hIXFr0/+N/TzLdpBIoPzjt0Rt4xJbW3mzguV3mduR9cNgiuFcuL/TeORejJhCWiAXe3E/6PxWA==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.59.0.tgz",
+      "integrity": "sha512-UKFMHPuM9R0iBegwzKF4y0C4J9u8C6MEJgFuXTBerMk7EJ92GFVFYBfOZaSGLu6COf7FxpQNqhNS4c4icUPqxA==",
       "cpu": [
         "ia32"
       ],
@@ -1427,9 +1427,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-gnu": {
-      "version": "4.58.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.58.0.tgz",
-      "integrity": "sha512-CSrVpmoRJFN06LL9xhkitkwUcTZtIotYAF5p6XOR2zW0Zz5mzb3IPpcoPhB02frzMHFNo1reQ9xSF5fFm3hUsQ==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.59.0.tgz",
+      "integrity": "sha512-laBkYlSS1n2L8fSo1thDNGrCTQMmxjYY5G0WFWjFFYZkKPjsMBsgJfGf4TLxXrF6RyhI60L8TMOjBMvXiTcxeA==",
       "cpu": [
         "x64"
       ],
@@ -1441,9 +1441,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.58.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.58.0.tgz",
-      "integrity": "sha512-QFsBgQNTnh5K0t/sBsjJLq24YVqEIVkGpfN2VHsnN90soZyhaiA9UUHufcctVNL4ypJY0wrwad0wslx2KJQ1/w==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.59.0.tgz",
+      "integrity": "sha512-2HRCml6OztYXyJXAvdDXPKcawukWY2GpR5/nxKp4iBgiO3wcoEGkAaqctIbZcNB6KlUQBIqt8VYkNSj2397EfA==",
       "cpu": [
         "x64"
       ],
@@ -5055,9 +5055,9 @@
       "license": "Unlicense"
     },
     "node_modules/rollup": {
-      "version": "4.58.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.58.0.tgz",
-      "integrity": "sha512-wbT0mBmWbIvvq8NeEYWWvevvxnOyhKChir47S66WCxw1SXqhw7ssIYejnQEVt7XYQpsj2y8F9PM+Cr3SNEa0gw==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.59.0.tgz",
+      "integrity": "sha512-2oMpl67a3zCH9H79LeMcbDhXW/UmWG/y2zuqnF2jQq5uq9TbM9TVyXvA4+t+ne2IIkBdrLpAaRQAvo7YI/Yyeg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5071,31 +5071,31 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.58.0",
-        "@rollup/rollup-android-arm64": "4.58.0",
-        "@rollup/rollup-darwin-arm64": "4.58.0",
-        "@rollup/rollup-darwin-x64": "4.58.0",
-        "@rollup/rollup-freebsd-arm64": "4.58.0",
-        "@rollup/rollup-freebsd-x64": "4.58.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.58.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.58.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.58.0",
-        "@rollup/rollup-linux-arm64-musl": "4.58.0",
-        "@rollup/rollup-linux-loong64-gnu": "4.58.0",
-        "@rollup/rollup-linux-loong64-musl": "4.58.0",
-        "@rollup/rollup-linux-ppc64-gnu": "4.58.0",
-        "@rollup/rollup-linux-ppc64-musl": "4.58.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.58.0",
-        "@rollup/rollup-linux-riscv64-musl": "4.58.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.58.0",
-        "@rollup/rollup-linux-x64-gnu": "4.58.0",
-        "@rollup/rollup-linux-x64-musl": "4.58.0",
-        "@rollup/rollup-openbsd-x64": "4.58.0",
-        "@rollup/rollup-openharmony-arm64": "4.58.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.58.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.58.0",
-        "@rollup/rollup-win32-x64-gnu": "4.58.0",
-        "@rollup/rollup-win32-x64-msvc": "4.58.0",
+        "@rollup/rollup-android-arm-eabi": "4.59.0",
+        "@rollup/rollup-android-arm64": "4.59.0",
+        "@rollup/rollup-darwin-arm64": "4.59.0",
+        "@rollup/rollup-darwin-x64": "4.59.0",
+        "@rollup/rollup-freebsd-arm64": "4.59.0",
+        "@rollup/rollup-freebsd-x64": "4.59.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.59.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.59.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.59.0",
+        "@rollup/rollup-linux-arm64-musl": "4.59.0",
+        "@rollup/rollup-linux-loong64-gnu": "4.59.0",
+        "@rollup/rollup-linux-loong64-musl": "4.59.0",
+        "@rollup/rollup-linux-ppc64-gnu": "4.59.0",
+        "@rollup/rollup-linux-ppc64-musl": "4.59.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.59.0",
+        "@rollup/rollup-linux-riscv64-musl": "4.59.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.59.0",
+        "@rollup/rollup-linux-x64-gnu": "4.59.0",
+        "@rollup/rollup-linux-x64-musl": "4.59.0",
+        "@rollup/rollup-openbsd-x64": "4.59.0",
+        "@rollup/rollup-openharmony-arm64": "4.59.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.59.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.59.0",
+        "@rollup/rollup-win32-x64-gnu": "4.59.0",
+        "@rollup/rollup-win32-x64-msvc": "4.59.0",
         "fsevents": "~2.3.2"
       }
     },
diff --git a/package.json b/package.json
index be01f4a..93941c7 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "@types/sprintf-js": "^1.1.4",
     "jest": "^29.7.0",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
-    "rollup": "^4.57.1",
+    "rollup": "^4.59.0",
     "rollup-plugin-copy": "^3.5.0",
     "ts-jest": "^29.4.6",
     "tslib": "^2.8.1",

From 2f42c1c7011e2bf0a734c624ae3d1b543e30b427 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Mar 2026 17:30:38 +0000
Subject: [PATCH 402/402] Bump jest and @types/jest

Bumps [jest](https://github.com/jestjs/jest/tree/HEAD/packages/jest) and [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest). These dependencies needed to be updated together.

Updates `jest` from 29.7.0 to 30.2.0
- [Release notes](https://github.com/jestjs/jest/releases)
- [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jestjs/jest/commits/v30.2.0/packages/jest)

Updates `@types/jest` from 29.5.14 to 30.0.0
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest)

---
updated-dependencies:
- dependency-name: jest
  dependency-version: 30.2.0
  dependency-type: direct:development
  update-type: version-update:semver-major
- dependency-name: "@types/jest"
  dependency-version: 30.0.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 2052 +++++++++++++++++++++++++++++++--------------
 package.json      |    4 +-
 2 files changed, 1410 insertions(+), 646 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5ea23b4..ecf1894 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,10 +20,10 @@
         "@rollup/plugin-terser": "^0.4.4",
         "@rollup/plugin-typescript": "^12.3.0",
         "@types/d3": "^7.4.3",
-        "@types/jest": "^29.5.14",
+        "@types/jest": "^30.0.0",
         "@types/node": "^25.3.3",
         "@types/sprintf-js": "^1.1.4",
-        "jest": "^29.7.0",
+        "jest": "^30.2.0",
         "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
         "rollup": "^4.57.1",
         "rollup-plugin-copy": "^3.5.0",
@@ -553,6 +553,143 @@
         "w3c-keyname": "^2.2.4"
       }
     },
+    "node_modules/@emnapi/core": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.8.1.tgz",
+      "integrity": "sha512-AvT9QFpxK0Zd8J0jopedNm+w/2fIzvtPKPjqyw9jwvBaReTTqPBk9Hixaz7KbjimP+QNz605/XnjFcDAL2pqBg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@emnapi/wasi-threads": "1.1.0",
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@emnapi/runtime": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.8.1.tgz",
+      "integrity": "sha512-mehfKSMWjjNol8659Z8KxEMrdSJDDot5SXMq00dM8BN4o+CLNXQ0xH2V7EchNHV4RmbZLmmPdEaXZc5H2FXmDg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@emnapi/wasi-threads": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.1.0.tgz",
+      "integrity": "sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@isaacs/cliui/node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
+      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.2.2"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
     "node_modules/@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@@ -581,61 +718,61 @@
       }
     },
     "node_modules/@jest/console": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
-      "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-30.2.0.tgz",
+      "integrity": "sha512-+O1ifRjkvYIkBqASKWgLxrpEhQAAE7hY77ALLUufSk5717KfOShg6IbqLmdsLMPdUiFvA2kTs0R7YZy+l0IzZQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "^29.6.3",
+        "@jest/types": "30.2.0",
         "@types/node": "*",
-        "chalk": "^4.0.0",
-        "jest-message-util": "^29.7.0",
-        "jest-util": "^29.7.0",
+        "chalk": "^4.1.2",
+        "jest-message-util": "30.2.0",
+        "jest-util": "30.2.0",
         "slash": "^3.0.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/core": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
-      "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-30.2.0.tgz",
+      "integrity": "sha512-03W6IhuhjqTlpzh/ojut/pDB2LPRygyWX8ExpgHtQA8H/3K7+1vKmcINx5UzeOX1se6YEsBsOHQ1CRzf3fOwTQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/console": "^29.7.0",
-        "@jest/reporters": "^29.7.0",
-        "@jest/test-result": "^29.7.0",
-        "@jest/transform": "^29.7.0",
-        "@jest/types": "^29.6.3",
+        "@jest/console": "30.2.0",
+        "@jest/pattern": "30.0.1",
+        "@jest/reporters": "30.2.0",
+        "@jest/test-result": "30.2.0",
+        "@jest/transform": "30.2.0",
+        "@jest/types": "30.2.0",
         "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
-        "jest-changed-files": "^29.7.0",
-        "jest-config": "^29.7.0",
-        "jest-haste-map": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-regex-util": "^29.6.3",
-        "jest-resolve": "^29.7.0",
-        "jest-resolve-dependencies": "^29.7.0",
-        "jest-runner": "^29.7.0",
-        "jest-runtime": "^29.7.0",
-        "jest-snapshot": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jest-validate": "^29.7.0",
-        "jest-watcher": "^29.7.0",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^29.7.0",
-        "slash": "^3.0.0",
-        "strip-ansi": "^6.0.0"
+        "ansi-escapes": "^4.3.2",
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "exit-x": "^0.2.2",
+        "graceful-fs": "^4.2.11",
+        "jest-changed-files": "30.2.0",
+        "jest-config": "30.2.0",
+        "jest-haste-map": "30.2.0",
+        "jest-message-util": "30.2.0",
+        "jest-regex-util": "30.0.1",
+        "jest-resolve": "30.2.0",
+        "jest-resolve-dependencies": "30.2.0",
+        "jest-runner": "30.2.0",
+        "jest-runtime": "30.2.0",
+        "jest-snapshot": "30.2.0",
+        "jest-util": "30.2.0",
+        "jest-validate": "30.2.0",
+        "jest-watcher": "30.2.0",
+        "micromatch": "^4.0.8",
+        "pretty-format": "30.2.0",
+        "slash": "^3.0.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "peerDependencies": {
         "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -646,117 +783,150 @@
         }
       }
     },
+    "node_modules/@jest/diff-sequences": {
+      "version": "30.0.1",
+      "resolved": "https://registry.npmjs.org/@jest/diff-sequences/-/diff-sequences-30.0.1.tgz",
+      "integrity": "sha512-n5H8QLDJ47QqbCNn5SuFjCRDrOLEZ0h8vAHCK5RL9Ls7Xa8AQLa/YxAc9UjFqoEDM48muwtBGjtMY5cr0PLDCw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
     "node_modules/@jest/environment": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
-      "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-30.2.0.tgz",
+      "integrity": "sha512-/QPTL7OBJQ5ac09UDRa3EQes4gt1FTEG/8jZ/4v5IVzx+Cv7dLxlVIvfvSVRiiX2drWyXeBjkMSR8hvOWSog5g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/fake-timers": "^29.7.0",
-        "@jest/types": "^29.6.3",
+        "@jest/fake-timers": "30.2.0",
+        "@jest/types": "30.2.0",
         "@types/node": "*",
-        "jest-mock": "^29.7.0"
+        "jest-mock": "30.2.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/expect": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
-      "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-30.2.0.tgz",
+      "integrity": "sha512-V9yxQK5erfzx99Sf+7LbhBwNWEZ9eZay8qQ9+JSC0TrMR1pMDHLMY+BnVPacWU6Jamrh252/IKo4F1Xn/zfiqA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "expect": "^29.7.0",
-        "jest-snapshot": "^29.7.0"
+        "expect": "30.2.0",
+        "jest-snapshot": "30.2.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/expect-utils": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
-      "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-30.2.0.tgz",
+      "integrity": "sha512-1JnRfhqpD8HGpOmQp180Fo9Zt69zNtC+9lR+kT7NVL05tNXIi+QC8Csz7lfidMoVLPD3FnOtcmp0CEFnxExGEA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "jest-get-type": "^29.6.3"
+        "@jest/get-type": "30.1.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/fake-timers": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
-      "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-30.2.0.tgz",
+      "integrity": "sha512-HI3tRLjRxAbBy0VO8dqqm7Hb2mIa8d5bg/NJkyQcOk7V118ObQML8RC5luTF/Zsg4474a+gDvhce7eTnP4GhYw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "^29.6.3",
-        "@sinonjs/fake-timers": "^10.0.2",
+        "@jest/types": "30.2.0",
+        "@sinonjs/fake-timers": "^13.0.0",
         "@types/node": "*",
-        "jest-message-util": "^29.7.0",
-        "jest-mock": "^29.7.0",
-        "jest-util": "^29.7.0"
+        "jest-message-util": "30.2.0",
+        "jest-mock": "30.2.0",
+        "jest-util": "30.2.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/get-type": {
+      "version": "30.1.0",
+      "resolved": "https://registry.npmjs.org/@jest/get-type/-/get-type-30.1.0.tgz",
+      "integrity": "sha512-eMbZE2hUnx1WV0pmURZY9XoXPkUYjpc55mb0CrhtdWLtzMQPFvu/rZkTLZFTsdaVQa+Tr4eWAteqcUzoawq/uA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/globals": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
-      "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-30.2.0.tgz",
+      "integrity": "sha512-b63wmnKPaK+6ZZfpYhz9K61oybvbI1aMcIs80++JI1O1rR1vaxHUCNqo3ITu6NU0d4V34yZFoHMn/uoKr/Rwfw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/environment": "30.2.0",
+        "@jest/expect": "30.2.0",
+        "@jest/types": "30.2.0",
+        "jest-mock": "30.2.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/pattern": {
+      "version": "30.0.1",
+      "resolved": "https://registry.npmjs.org/@jest/pattern/-/pattern-30.0.1.tgz",
+      "integrity": "sha512-gWp7NfQW27LaBQz3TITS8L7ZCQ0TLvtmI//4OwlQRx4rnWxcPNIYjxZpDcN4+UlGxgm3jS5QPz8IPTCkb59wZA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/expect": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "jest-mock": "^29.7.0"
+        "@types/node": "*",
+        "jest-regex-util": "30.0.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/reporters": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
-      "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-30.2.0.tgz",
+      "integrity": "sha512-DRyW6baWPqKMa9CzeiBjHwjd8XeAyco2Vt8XbcLFjiwCOEKOvy82GJ8QQnJE9ofsxCMPjH4MfH8fCWIHHDKpAQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^29.7.0",
-        "@jest/test-result": "^29.7.0",
-        "@jest/transform": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@jridgewell/trace-mapping": "^0.3.18",
+        "@jest/console": "30.2.0",
+        "@jest/test-result": "30.2.0",
+        "@jest/transform": "30.2.0",
+        "@jest/types": "30.2.0",
+        "@jridgewell/trace-mapping": "^0.3.25",
         "@types/node": "*",
-        "chalk": "^4.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "exit": "^0.1.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
+        "chalk": "^4.1.2",
+        "collect-v8-coverage": "^1.0.2",
+        "exit-x": "^0.2.2",
+        "glob": "^10.3.10",
+        "graceful-fs": "^4.2.11",
         "istanbul-lib-coverage": "^3.0.0",
         "istanbul-lib-instrument": "^6.0.0",
         "istanbul-lib-report": "^3.0.0",
-        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-lib-source-maps": "^5.0.0",
         "istanbul-reports": "^3.1.3",
-        "jest-message-util": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jest-worker": "^29.7.0",
+        "jest-message-util": "30.2.0",
+        "jest-util": "30.2.0",
+        "jest-worker": "30.2.0",
         "slash": "^3.0.0",
-        "string-length": "^4.0.1",
-        "strip-ansi": "^6.0.0",
+        "string-length": "^4.0.2",
         "v8-to-istanbul": "^9.0.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "peerDependencies": {
         "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -767,109 +937,174 @@
         }
       }
     },
+    "node_modules/@jest/reporters/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/glob": {
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/minimatch": {
+      "version": "9.0.9",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
+      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/@jest/schemas": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
-      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
+      "version": "30.0.5",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+      "integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@sinclair/typebox": "^0.27.8"
+        "@sinclair/typebox": "^0.34.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/@jest/snapshot-utils": {
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/@jest/snapshot-utils/-/snapshot-utils-30.2.0.tgz",
+      "integrity": "sha512-0aVxM3RH6DaiLcjj/b0KrIBZhSX1373Xci4l3cW5xiUWPctZ59zQ7jj4rqcJQ/Z8JuN/4wX3FpJSa3RssVvCug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.2.0",
+        "chalk": "^4.1.2",
+        "graceful-fs": "^4.2.11",
+        "natural-compare": "^1.4.0"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/source-map": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
-      "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
+      "version": "30.0.1",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-30.0.1.tgz",
+      "integrity": "sha512-MIRWMUUR3sdbP36oyNyhbThLHyJ2eEDClPCiHVbrYAe5g3CHRArIVpBw7cdSB5fr+ofSfIb2Tnsw8iEHL0PYQg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.18",
-        "callsites": "^3.0.0",
-        "graceful-fs": "^4.2.9"
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "callsites": "^3.1.0",
+        "graceful-fs": "^4.2.11"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/test-result": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
-      "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-30.2.0.tgz",
+      "integrity": "sha512-RF+Z+0CCHkARz5HT9mcQCBulb1wgCP3FBvl9VFokMX27acKphwyQsNuWH3c+ojd1LeWBLoTYoxF0zm6S/66mjg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/console": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "collect-v8-coverage": "^1.0.0"
+        "@jest/console": "30.2.0",
+        "@jest/types": "30.2.0",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "collect-v8-coverage": "^1.0.2"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/test-sequencer": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
-      "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-30.2.0.tgz",
+      "integrity": "sha512-wXKgU/lk8fKXMu/l5Hog1R61bL4q5GCdT6OJvdAFz1P+QrpoFuLU68eoKuVc4RbrTtNnTL5FByhWdLgOPSph+Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/test-result": "^29.7.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.7.0",
+        "@jest/test-result": "30.2.0",
+        "graceful-fs": "^4.2.11",
+        "jest-haste-map": "30.2.0",
         "slash": "^3.0.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/transform": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
-      "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-30.2.0.tgz",
+      "integrity": "sha512-XsauDV82o5qXbhalKxD7p4TZYYdwcaEXC77PPD2HixEFF+6YGppjrAAQurTl2ECWcEomHBMMNS9AH3kcCFx8jA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/core": "^7.11.6",
-        "@jest/types": "^29.6.3",
-        "@jridgewell/trace-mapping": "^0.3.18",
-        "babel-plugin-istanbul": "^6.1.1",
-        "chalk": "^4.0.0",
+        "@babel/core": "^7.27.4",
+        "@jest/types": "30.2.0",
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "babel-plugin-istanbul": "^7.0.1",
+        "chalk": "^4.1.2",
         "convert-source-map": "^2.0.0",
         "fast-json-stable-stringify": "^2.1.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.7.0",
-        "jest-regex-util": "^29.6.3",
-        "jest-util": "^29.7.0",
-        "micromatch": "^4.0.4",
-        "pirates": "^4.0.4",
+        "graceful-fs": "^4.2.11",
+        "jest-haste-map": "30.2.0",
+        "jest-regex-util": "30.0.1",
+        "jest-util": "30.2.0",
+        "micromatch": "^4.0.8",
+        "pirates": "^4.0.7",
         "slash": "^3.0.0",
-        "write-file-atomic": "^4.0.2"
+        "write-file-atomic": "^5.0.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/types": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
-      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-30.2.0.tgz",
+      "integrity": "sha512-H9xg1/sfVvyfU7o3zMfBEjQ1gcsdeTMgqHoYdN79tuLqfTtuu7WckRA1R5whDwOzxaZAeMKTYWqP+WCAi0CHsg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
+        "@jest/pattern": "30.0.1",
+        "@jest/schemas": "30.0.5",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "@types/istanbul-reports": "^3.0.4",
         "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
+        "@types/yargs": "^17.0.33",
+        "chalk": "^4.1.2"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
@@ -941,6 +1176,19 @@
       "license": "MIT",
       "peer": true
     },
+    "node_modules/@napi-rs/wasm-runtime": {
+      "version": "0.2.12",
+      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz",
+      "integrity": "sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@emnapi/core": "^1.4.3",
+        "@emnapi/runtime": "^1.4.3",
+        "@tybys/wasm-util": "^0.10.0"
+      }
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -979,6 +1227,30 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@pkgr/core": {
+      "version": "0.2.9",
+      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.9.tgz",
+      "integrity": "sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/pkgr"
+      }
+    },
     "node_modules/@rollup/plugin-commonjs": {
       "version": "29.0.0",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-29.0.0.tgz",
@@ -1455,9 +1727,9 @@
       ]
     },
     "node_modules/@sinclair/typebox": {
-      "version": "0.27.10",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.10.tgz",
-      "integrity": "sha512-MTBk/3jGLNB2tVxv6uLlFh1iu64iYOQ2PbdOSK3NW8JZsmlaOh2q6sdtKowBhfw8QFLmYNzTW4/oK4uATIi6ZA==",
+      "version": "0.34.48",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.48.tgz",
+      "integrity": "sha512-kKJTNuK3AQOrgjjotVxMrCn1sUJwM76wMszfq1kdU4uYVJjvEWuFQ6HgvLt4Xz3fSmZlTOxJ/Ie13KnIcWQXFA==",
       "dev": true,
       "license": "MIT"
     },
@@ -1472,13 +1744,24 @@
       }
     },
     "node_modules/@sinonjs/fake-timers": {
-      "version": "10.3.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
-      "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
+      "version": "13.0.5",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz",
+      "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
-        "@sinonjs/commons": "^3.0.0"
+        "@sinonjs/commons": "^3.0.1"
+      }
+    },
+    "node_modules/@tybys/wasm-util": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.1.tgz",
+      "integrity": "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
       }
     },
     "node_modules/@types/babel__core": {
@@ -1855,16 +2138,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/graceful-fs": {
-      "version": "4.1.9",
-      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
-      "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
     "node_modules/@types/istanbul-lib-coverage": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
@@ -1893,14 +2166,14 @@
       }
     },
     "node_modules/@types/jest": {
-      "version": "29.5.14",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.14.tgz",
-      "integrity": "sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==",
+      "version": "30.0.0",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-30.0.0.tgz",
+      "integrity": "sha512-XTYugzhuwqWjws0CVz8QpM36+T+Dz5mTEBKhNs/esGLnCIlGdRy+Dq78NRjd7ls7r8BC8ZRMOrKlkO1hU0JOwA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "expect": "^29.0.0",
-        "pretty-format": "^29.0.0"
+        "expect": "^30.0.0",
+        "pretty-format": "^30.0.0"
       }
     },
     "node_modules/@types/minimatch": {
@@ -1968,6 +2241,282 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@ungap/structured-clone": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz",
+      "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/@unrs/resolver-binding-android-arm-eabi": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm-eabi/-/resolver-binding-android-arm-eabi-1.11.1.tgz",
+      "integrity": "sha512-ppLRUgHVaGRWUx0R0Ut06Mjo9gBaBkg3v/8AxusGLhsIotbBLuRk51rAzqLC8gq6NyyAojEXglNjzf6R948DNw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-android-arm64": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm64/-/resolver-binding-android-arm64-1.11.1.tgz",
+      "integrity": "sha512-lCxkVtb4wp1v+EoN+HjIG9cIIzPkX5OtM03pQYkG+U5O/wL53LC4QbIeazgiKqluGeVEeBlZahHalCaBvU1a2g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-darwin-arm64": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.11.1.tgz",
+      "integrity": "sha512-gPVA1UjRu1Y/IsB/dQEsp2V1pm44Of6+LWvbLc9SDk1c2KhhDRDBUkQCYVWe6f26uJb3fOK8saWMgtX8IrMk3g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-darwin-x64": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.11.1.tgz",
+      "integrity": "sha512-cFzP7rWKd3lZaCsDze07QX1SC24lO8mPty9vdP+YVa3MGdVgPmFc59317b2ioXtgCMKGiCLxJ4HQs62oz6GfRQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-freebsd-x64": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.11.1.tgz",
+      "integrity": "sha512-fqtGgak3zX4DCB6PFpsH5+Kmt/8CIi4Bry4rb1ho6Av2QHTREM+47y282Uqiu3ZRF5IQioJQ5qWRV6jduA+iGw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-arm-gnueabihf": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.11.1.tgz",
+      "integrity": "sha512-u92mvlcYtp9MRKmP+ZvMmtPN34+/3lMHlyMj7wXJDeXxuM0Vgzz0+PPJNsro1m3IZPYChIkn944wW8TYgGKFHw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-arm-musleabihf": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.11.1.tgz",
+      "integrity": "sha512-cINaoY2z7LVCrfHkIcmvj7osTOtm6VVT16b5oQdS4beibX2SYBwgYLmqhBjA1t51CarSaBuX5YNsWLjsqfW5Cw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-arm64-gnu": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.11.1.tgz",
+      "integrity": "sha512-34gw7PjDGB9JgePJEmhEqBhWvCiiWCuXsL9hYphDF7crW7UgI05gyBAi6MF58uGcMOiOqSJ2ybEeCvHcq0BCmQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-arm64-musl": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.11.1.tgz",
+      "integrity": "sha512-RyMIx6Uf53hhOtJDIamSbTskA99sPHS96wxVE/bJtePJJtpdKGXO1wY90oRdXuYOGOTuqjT8ACccMc4K6QmT3w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-ppc64-gnu": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.11.1.tgz",
+      "integrity": "sha512-D8Vae74A4/a+mZH0FbOkFJL9DSK2R6TFPC9M+jCWYia/q2einCubX10pecpDiTmkJVUH+y8K3BZClycD8nCShA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-riscv64-gnu": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.11.1.tgz",
+      "integrity": "sha512-frxL4OrzOWVVsOc96+V3aqTIQl1O2TjgExV4EKgRY09AJ9leZpEg8Ak9phadbuX0BA4k8U5qtvMSQQGGmaJqcQ==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-riscv64-musl": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.11.1.tgz",
+      "integrity": "sha512-mJ5vuDaIZ+l/acv01sHoXfpnyrNKOk/3aDoEdLO/Xtn9HuZlDD6jKxHlkN8ZhWyLJsRBxfv9GYM2utQ1SChKew==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-s390x-gnu": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.11.1.tgz",
+      "integrity": "sha512-kELo8ebBVtb9sA7rMe1Cph4QHreByhaZ2QEADd9NzIQsYNQpt9UkM9iqr2lhGr5afh885d/cB5QeTXSbZHTYPg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-x64-gnu": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.11.1.tgz",
+      "integrity": "sha512-C3ZAHugKgovV5YvAMsxhq0gtXuwESUKc5MhEtjBpLoHPLYM+iuwSj3lflFwK3DPm68660rZ7G8BMcwSro7hD5w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-x64-musl": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.11.1.tgz",
+      "integrity": "sha512-rV0YSoyhK2nZ4vEswT/QwqzqQXw5I6CjoaYMOX0TqBlWhojUf8P94mvI7nuJTeaCkkds3QE4+zS8Ko+GdXuZtA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-wasm32-wasi": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.11.1.tgz",
+      "integrity": "sha512-5u4RkfxJm+Ng7IWgkzi3qrFOvLvQYnPBmjmZQ8+szTK/b31fQCnleNl1GgEt7nIsZRIf5PLhPwT0WM+q45x/UQ==",
+      "cpu": [
+        "wasm32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@napi-rs/wasm-runtime": "^0.2.11"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@unrs/resolver-binding-win32-arm64-msvc": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.11.1.tgz",
+      "integrity": "sha512-nRcz5Il4ln0kMhfL8S3hLkxI85BXs3o8EYoattsJNdsX4YUU89iOkVn7g0VHSRxFuVMdM4Q1jEpIId1Ihim/Uw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-win32-ia32-msvc": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.11.1.tgz",
+      "integrity": "sha512-DCEI6t5i1NmAZp6pFonpD5m7i6aFrpofcp4LA2i8IIq60Jyo28hamKBxNrZcyOwVOZkgsRp9O2sXWBWP8MnvIQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-win32-x64-msvc": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.11.1.tgz",
+      "integrity": "sha512-lrW200hZdbfRtztbygyaq/6jP6AKE8qQN2KvPcJ+x7wiD038YtnYtZ82IMNJ69GJibV7bwL3y9FgK+5w/pYt6g==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
     "node_modules/acorn": {
       "version": "8.16.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
@@ -2078,75 +2627,58 @@
       }
     },
     "node_modules/babel-jest": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
-      "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-30.2.0.tgz",
+      "integrity": "sha512-0YiBEOxWqKkSQWL9nNGGEgndoeL0ZpWrbLMNL5u/Kaxrli3Eaxlt3ZtIDktEvXt4L/R9r3ODr2zKwGM/2BjxVw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/transform": "^29.7.0",
-        "@types/babel__core": "^7.1.14",
-        "babel-plugin-istanbul": "^6.1.1",
-        "babel-preset-jest": "^29.6.3",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
+        "@jest/transform": "30.2.0",
+        "@types/babel__core": "^7.20.5",
+        "babel-plugin-istanbul": "^7.0.1",
+        "babel-preset-jest": "30.2.0",
+        "chalk": "^4.1.2",
+        "graceful-fs": "^4.2.11",
         "slash": "^3.0.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.8.0"
+        "@babel/core": "^7.11.0 || ^8.0.0-0"
       }
     },
     "node_modules/babel-plugin-istanbul": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
-      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.1.tgz",
+      "integrity": "sha512-D8Z6Qm8jCvVXtIRkBnqNHX0zJ37rQcFJ9u8WOS6tkYOsRdHBzypCstaxWiu5ZIlqQtviRYbgnRLSoCEvjqcqbA==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "workspaces": [
+        "test/babel-8"
+      ],
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@istanbuljs/load-nyc-config": "^1.0.0",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-instrument": "^5.0.4",
+        "@istanbuljs/schema": "^0.1.3",
+        "istanbul-lib-instrument": "^6.0.2",
         "test-exclude": "^6.0.0"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
-      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "@babel/core": "^7.12.3",
-        "@babel/parser": "^7.14.7",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "node": ">=12"
       }
     },
     "node_modules/babel-plugin-jest-hoist": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
-      "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-30.2.0.tgz",
+      "integrity": "sha512-ftzhzSGMUnOzcCXd6WHdBGMyuwy15Wnn0iyyWGKgBDLxf9/s5ABuraCSpBX2uG0jUg4rqJnxsLc5+oYBqoxVaA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.3.3",
-        "@babel/types": "^7.3.3",
-        "@types/babel__core": "^7.1.14",
-        "@types/babel__traverse": "^7.0.6"
+        "@types/babel__core": "^7.20.5"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/babel-preset-current-node-syntax": {
@@ -2177,20 +2709,20 @@
       }
     },
     "node_modules/babel-preset-jest": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
-      "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-30.2.0.tgz",
+      "integrity": "sha512-US4Z3NOieAQumwFnYdUWKvUKh8+YSnS/gB3t6YBiz0bskpu7Pine8pPCheNxlPEW4wnUkma2a94YuW2q3guvCQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "babel-plugin-jest-hoist": "^29.6.3",
-        "babel-preset-current-node-syntax": "^1.0.0"
+        "babel-plugin-jest-hoist": "30.2.0",
+        "babel-preset-current-node-syntax": "^1.2.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "@babel/core": "^7.11.0 || ^8.0.0-beta.1"
       }
     },
     "node_modules/balanced-match": {
@@ -2370,9 +2902,9 @@
       }
     },
     "node_modules/ci-info": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
-      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.4.0.tgz",
+      "integrity": "sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg==",
       "dev": true,
       "funding": [
         {
@@ -2386,9 +2918,9 @@
       }
     },
     "node_modules/cjs-module-lexer": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz",
-      "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-2.2.0.tgz",
+      "integrity": "sha512-4bHTS2YuzUvtoLjdy+98ykbNB5jS0+07EvFNXerqZQJ89F7DI6ET7OQo/HJuW6K0aVsKA9hj9/RVb2kQVOrPDQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -2475,34 +3007,12 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/convert-source-map": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/create-jest": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
-      "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jest/types": "^29.6.3",
-        "chalk": "^4.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
-        "jest-config": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "prompts": "^2.0.1"
-      },
-      "bin": {
-        "create-jest": "bin/create-jest.js"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
+    "node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/crelt": {
       "version": "1.0.6",
@@ -2947,9 +3457,9 @@
       }
     },
     "node_modules/dedent": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.7.1.tgz",
-      "integrity": "sha512-9JmrhGZpOlEgOLdQgSm0zxFaYoQon408V1v49aqTWuXENVlnCuY9JBZcXZiCsZQWDjTm5Qf/nIvAy77mXDAjEg==",
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.7.2.tgz",
+      "integrity": "sha512-WzMx3mW98SN+zn3hgemf4OzdmyNhhhKz5Ay0pUfQiMQ3e1g+xmTJWp/pKdwKVXhdSkAEGIIzqeuWrL3mV/AXbA==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -2990,16 +3500,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/diff-sequences": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
-      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
     "node_modules/dir-glob": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
@@ -3013,6 +3513,13 @@
         "node": ">=8"
       }
     },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/electron-to-chromium": {
       "version": "1.5.302",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.302.tgz",
@@ -3115,30 +3622,32 @@
         "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
-    "node_modules/exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
+    "node_modules/exit-x": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/exit-x/-/exit-x-0.2.2.tgz",
+      "integrity": "sha512-+I6B/IkJc1o/2tiURyz/ivu/O0nKNEArIUB5O7zBrlDVJr22SCLH3xTeEry428LvFhRzIA1g8izguxJ/gbNcVQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8.0"
       }
     },
     "node_modules/expect": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
-      "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-30.2.0.tgz",
+      "integrity": "sha512-u/feCi0GPsI+988gU2FLcsHyAHTU0MX1Wg68NhAnN7z/+C5wqG+CY8J53N9ioe8RXgaoz0nBR/TYMf3AycUuPw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/expect-utils": "^29.7.0",
-        "jest-get-type": "^29.6.3",
-        "jest-matcher-utils": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-util": "^29.7.0"
+        "@jest/expect-utils": "30.2.0",
+        "@jest/get-type": "30.1.0",
+        "jest-matcher-utils": "30.2.0",
+        "jest-message-util": "30.2.0",
+        "jest-mock": "30.2.0",
+        "jest-util": "30.2.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/fast-glob": {
@@ -3230,6 +3739,36 @@
         "node": ">=8"
       }
     },
+    "node_modules/foreground-child": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "cross-spawn": "^7.0.6",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/foreground-child/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/fs-extra": {
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
@@ -3703,15 +4242,15 @@
       }
     },
     "node_modules/istanbul-lib-source-maps": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz",
+      "integrity": "sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.23",
         "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^3.0.0",
-        "source-map": "^0.6.1"
+        "istanbul-lib-coverage": "^3.0.0"
       },
       "engines": {
         "node": ">=10"
@@ -3731,23 +4270,39 @@
         "node": ">=8"
       }
     },
+    "node_modules/jackspeak": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
     "node_modules/jest": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
-      "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-30.2.0.tgz",
+      "integrity": "sha512-F26gjC0yWN8uAA5m5Ss8ZQf5nDHWGlN/xWZIh8S5SRbsEKBovwZhxGd6LJlbZYxBgCYOtreSUyb8hpXyGC5O4A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/core": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "import-local": "^3.0.2",
-        "jest-cli": "^29.7.0"
+        "@jest/core": "30.2.0",
+        "@jest/types": "30.2.0",
+        "import-local": "^3.2.0",
+        "jest-cli": "30.2.0"
       },
       "bin": {
         "jest": "bin/jest.js"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "peerDependencies": {
         "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -3759,76 +4314,75 @@
       }
     },
     "node_modules/jest-changed-files": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
-      "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-30.2.0.tgz",
+      "integrity": "sha512-L8lR1ChrRnSdfeOvTrwZMlnWV8G/LLjQ0nG9MBclwWZidA2N5FviRki0Bvh20WRMOX31/JYvzdqTJrk5oBdydQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "execa": "^5.0.0",
-        "jest-util": "^29.7.0",
+        "execa": "^5.1.1",
+        "jest-util": "30.2.0",
         "p-limit": "^3.1.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-circus": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
-      "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-30.2.0.tgz",
+      "integrity": "sha512-Fh0096NC3ZkFx05EP2OXCxJAREVxj1BcW/i6EWqqymcgYKWjyyDpral3fMxVcHXg6oZM7iULer9wGRFvfpl+Tg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/expect": "^29.7.0",
-        "@jest/test-result": "^29.7.0",
-        "@jest/types": "^29.6.3",
+        "@jest/environment": "30.2.0",
+        "@jest/expect": "30.2.0",
+        "@jest/test-result": "30.2.0",
+        "@jest/types": "30.2.0",
         "@types/node": "*",
-        "chalk": "^4.0.0",
+        "chalk": "^4.1.2",
         "co": "^4.6.0",
-        "dedent": "^1.0.0",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^29.7.0",
-        "jest-matcher-utils": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-runtime": "^29.7.0",
-        "jest-snapshot": "^29.7.0",
-        "jest-util": "^29.7.0",
+        "dedent": "^1.6.0",
+        "is-generator-fn": "^2.1.0",
+        "jest-each": "30.2.0",
+        "jest-matcher-utils": "30.2.0",
+        "jest-message-util": "30.2.0",
+        "jest-runtime": "30.2.0",
+        "jest-snapshot": "30.2.0",
+        "jest-util": "30.2.0",
         "p-limit": "^3.1.0",
-        "pretty-format": "^29.7.0",
-        "pure-rand": "^6.0.0",
+        "pretty-format": "30.2.0",
+        "pure-rand": "^7.0.0",
         "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
+        "stack-utils": "^2.0.6"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-cli": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
-      "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-30.2.0.tgz",
+      "integrity": "sha512-Os9ukIvADX/A9sLt6Zse3+nmHtHaE6hqOsjQtNiugFTbKRHYIYtZXNGNK9NChseXy7djFPjndX1tL0sCTlfpAA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/core": "^29.7.0",
-        "@jest/test-result": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "chalk": "^4.0.0",
-        "create-jest": "^29.7.0",
-        "exit": "^0.1.2",
-        "import-local": "^3.0.2",
-        "jest-config": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jest-validate": "^29.7.0",
-        "yargs": "^17.3.1"
+        "@jest/core": "30.2.0",
+        "@jest/test-result": "30.2.0",
+        "@jest/types": "30.2.0",
+        "chalk": "^4.1.2",
+        "exit-x": "^0.2.2",
+        "import-local": "^3.2.0",
+        "jest-config": "30.2.0",
+        "jest-util": "30.2.0",
+        "jest-validate": "30.2.0",
+        "yargs": "^17.7.2"
       },
       "bin": {
         "jest": "bin/jest.js"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "peerDependencies": {
         "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -3840,215 +4394,259 @@
       }
     },
     "node_modules/jest-config": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
-      "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/core": "^7.11.6",
-        "@jest/test-sequencer": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "babel-jest": "^29.7.0",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "deepmerge": "^4.2.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-circus": "^29.7.0",
-        "jest-environment-node": "^29.7.0",
-        "jest-get-type": "^29.6.3",
-        "jest-regex-util": "^29.6.3",
-        "jest-resolve": "^29.7.0",
-        "jest-runner": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jest-validate": "^29.7.0",
-        "micromatch": "^4.0.4",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-30.2.0.tgz",
+      "integrity": "sha512-g4WkyzFQVWHtu6uqGmQR4CQxz/CH3yDSlhzXMWzNjDx843gYjReZnMRanjRCq5XZFuQrGDxgUaiYWE8BRfVckA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.27.4",
+        "@jest/get-type": "30.1.0",
+        "@jest/pattern": "30.0.1",
+        "@jest/test-sequencer": "30.2.0",
+        "@jest/types": "30.2.0",
+        "babel-jest": "30.2.0",
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "deepmerge": "^4.3.1",
+        "glob": "^10.3.10",
+        "graceful-fs": "^4.2.11",
+        "jest-circus": "30.2.0",
+        "jest-docblock": "30.2.0",
+        "jest-environment-node": "30.2.0",
+        "jest-regex-util": "30.0.1",
+        "jest-resolve": "30.2.0",
+        "jest-runner": "30.2.0",
+        "jest-util": "30.2.0",
+        "jest-validate": "30.2.0",
+        "micromatch": "^4.0.8",
         "parse-json": "^5.2.0",
-        "pretty-format": "^29.7.0",
+        "pretty-format": "30.2.0",
         "slash": "^3.0.0",
         "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "peerDependencies": {
         "@types/node": "*",
+        "esbuild-register": ">=3.4.0",
         "ts-node": ">=9.0.0"
       },
       "peerDependenciesMeta": {
         "@types/node": {
           "optional": true
         },
+        "esbuild-register": {
+          "optional": true
+        },
         "ts-node": {
           "optional": true
         }
       }
     },
-    "node_modules/jest-diff": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
-      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
+    "node_modules/jest-config/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^29.6.3",
-        "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.7.0"
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/jest-config/node_modules/glob": {
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/jest-config/node_modules/minimatch": {
+      "version": "9.0.9",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
+      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.2"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/jest-docblock": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
-      "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
+    "node_modules/jest-diff": {
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-30.2.0.tgz",
+      "integrity": "sha512-dQHFo3Pt4/NLlG5z4PxZ/3yZTZ1C7s9hveiOj+GCN+uT109NC2QgsoVZsVOAvbJ3RgKkvyLGXZV9+piDpWbm6A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "detect-newline": "^3.0.0"
+        "@jest/diff-sequences": "30.0.1",
+        "@jest/get-type": "30.1.0",
+        "chalk": "^4.1.2",
+        "pretty-format": "30.2.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
-    "node_modules/jest-each": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
-      "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
+    "node_modules/jest-docblock": {
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-30.2.0.tgz",
+      "integrity": "sha512-tR/FFgZKS1CXluOQzZvNH3+0z9jXr3ldGSD8bhyuxvlVUwbeLOGynkunvlTMxchC5urrKndYiwCFC0DLVjpOCA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "^29.6.3",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^29.6.3",
-        "jest-util": "^29.7.0",
-        "pretty-format": "^29.7.0"
+        "detect-newline": "^3.1.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
-    "node_modules/jest-environment-node": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
-      "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
+    "node_modules/jest-each": {
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-30.2.0.tgz",
+      "integrity": "sha512-lpWlJlM7bCUf1mfmuqTA8+j2lNURW9eNafOy99knBM01i5CQeY5UH1vZjgT9071nDJac1M4XsbyI44oNOdhlDQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/fake-timers": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "jest-mock": "^29.7.0",
-        "jest-util": "^29.7.0"
+        "@jest/get-type": "30.1.0",
+        "@jest/types": "30.2.0",
+        "chalk": "^4.1.2",
+        "jest-util": "30.2.0",
+        "pretty-format": "30.2.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
-    "node_modules/jest-get-type": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
-      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
+    "node_modules/jest-environment-node": {
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-30.2.0.tgz",
+      "integrity": "sha512-ElU8v92QJ9UrYsKrxDIKCxu6PfNj4Hdcktcn0JX12zqNdqWHB0N+hwOnnBBXvjLd2vApZtuLUGs1QSY+MsXoNA==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "@jest/environment": "30.2.0",
+        "@jest/fake-timers": "30.2.0",
+        "@jest/types": "30.2.0",
+        "@types/node": "*",
+        "jest-mock": "30.2.0",
+        "jest-util": "30.2.0",
+        "jest-validate": "30.2.0"
+      },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-haste-map": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
-      "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.2.0.tgz",
+      "integrity": "sha512-sQA/jCb9kNt+neM0anSj6eZhLZUIhQgwDt7cPGjumgLM4rXsfb9kpnlacmvZz3Q5tb80nS+oG/if+NBKrHC+Xw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "^29.6.3",
-        "@types/graceful-fs": "^4.1.3",
+        "@jest/types": "30.2.0",
         "@types/node": "*",
-        "anymatch": "^3.0.3",
-        "fb-watchman": "^2.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-regex-util": "^29.6.3",
-        "jest-util": "^29.7.0",
-        "jest-worker": "^29.7.0",
-        "micromatch": "^4.0.4",
+        "anymatch": "^3.1.3",
+        "fb-watchman": "^2.0.2",
+        "graceful-fs": "^4.2.11",
+        "jest-regex-util": "30.0.1",
+        "jest-util": "30.2.0",
+        "jest-worker": "30.2.0",
+        "micromatch": "^4.0.8",
         "walker": "^1.0.8"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "optionalDependencies": {
-        "fsevents": "^2.3.2"
+        "fsevents": "^2.3.3"
       }
     },
     "node_modules/jest-leak-detector": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
-      "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-30.2.0.tgz",
+      "integrity": "sha512-M6jKAjyzjHG0SrQgwhgZGy9hFazcudwCNovY/9HPIicmNSBuockPSedAP9vlPK6ONFJ1zfyH/M2/YYJxOz5cdQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.7.0"
+        "@jest/get-type": "30.1.0",
+        "pretty-format": "30.2.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-matcher-utils": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
-      "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-30.2.0.tgz",
+      "integrity": "sha512-dQ94Nq4dbzmUWkQ0ANAWS9tBRfqCrn0bV9AMYdOi/MHW726xn7eQmMeRTpX2ViC00bpNaWXq+7o4lIQ3AX13Hg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "chalk": "^4.0.0",
-        "jest-diff": "^29.7.0",
-        "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.7.0"
+        "@jest/get-type": "30.1.0",
+        "chalk": "^4.1.2",
+        "jest-diff": "30.2.0",
+        "pretty-format": "30.2.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-message-util": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
-      "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-30.2.0.tgz",
+      "integrity": "sha512-y4DKFLZ2y6DxTWD4cDe07RglV88ZiNEdlRfGtqahfbIjfsw1nMCPx49Uev4IA/hWn3sDKyAnSPwoYSsAEdcimw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^29.6.3",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^29.7.0",
+        "@babel/code-frame": "^7.27.1",
+        "@jest/types": "30.2.0",
+        "@types/stack-utils": "^2.0.3",
+        "chalk": "^4.1.2",
+        "graceful-fs": "^4.2.11",
+        "micromatch": "^4.0.8",
+        "pretty-format": "30.2.0",
         "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
+        "stack-utils": "^2.0.6"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-mock": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
-      "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-30.2.0.tgz",
+      "integrity": "sha512-JNNNl2rj4b5ICpmAcq+WbLH83XswjPbjH4T7yvGzfAGCPh1rw+xVNbtk+FnRslvt9lkCcdn9i1oAoKUuFsOxRw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "^29.6.3",
+        "@jest/types": "30.2.0",
         "@types/node": "*",
-        "jest-util": "^29.7.0"
+        "jest-util": "30.2.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-pnp-resolver": {
@@ -4070,147 +4668,196 @@
       }
     },
     "node_modules/jest-regex-util": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
-      "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
+      "version": "30.0.1",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz",
+      "integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-resolve": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
-      "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-30.2.0.tgz",
+      "integrity": "sha512-TCrHSxPlx3tBY3hWNtRQKbtgLhsXa1WmbJEqBlTBrGafd5fiQFByy2GNCEoGR+Tns8d15GaL9cxEzKOO3GEb2A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.7.0",
-        "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^29.7.0",
-        "jest-validate": "^29.7.0",
-        "resolve": "^1.20.0",
-        "resolve.exports": "^2.0.0",
-        "slash": "^3.0.0"
+        "chalk": "^4.1.2",
+        "graceful-fs": "^4.2.11",
+        "jest-haste-map": "30.2.0",
+        "jest-pnp-resolver": "^1.2.3",
+        "jest-util": "30.2.0",
+        "jest-validate": "30.2.0",
+        "slash": "^3.0.0",
+        "unrs-resolver": "^1.7.11"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-resolve-dependencies": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
-      "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-30.2.0.tgz",
+      "integrity": "sha512-xTOIGug/0RmIe3mmCqCT95yO0vj6JURrn1TKWlNbhiAefJRWINNPgwVkrVgt/YaerPzY3iItufd80v3lOrFJ2w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "jest-regex-util": "^29.6.3",
-        "jest-snapshot": "^29.7.0"
+        "jest-regex-util": "30.0.1",
+        "jest-snapshot": "30.2.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-runner": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
-      "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-30.2.0.tgz",
+      "integrity": "sha512-PqvZ2B2XEyPEbclp+gV6KO/F1FIFSbIwewRgmROCMBo/aZ6J1w8Qypoj2pEOcg3G2HzLlaP6VUtvwCI8dM3oqQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/console": "^29.7.0",
-        "@jest/environment": "^29.7.0",
-        "@jest/test-result": "^29.7.0",
-        "@jest/transform": "^29.7.0",
-        "@jest/types": "^29.6.3",
+        "@jest/console": "30.2.0",
+        "@jest/environment": "30.2.0",
+        "@jest/test-result": "30.2.0",
+        "@jest/transform": "30.2.0",
+        "@jest/types": "30.2.0",
         "@types/node": "*",
-        "chalk": "^4.0.0",
+        "chalk": "^4.1.2",
         "emittery": "^0.13.1",
-        "graceful-fs": "^4.2.9",
-        "jest-docblock": "^29.7.0",
-        "jest-environment-node": "^29.7.0",
-        "jest-haste-map": "^29.7.0",
-        "jest-leak-detector": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-resolve": "^29.7.0",
-        "jest-runtime": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jest-watcher": "^29.7.0",
-        "jest-worker": "^29.7.0",
+        "exit-x": "^0.2.2",
+        "graceful-fs": "^4.2.11",
+        "jest-docblock": "30.2.0",
+        "jest-environment-node": "30.2.0",
+        "jest-haste-map": "30.2.0",
+        "jest-leak-detector": "30.2.0",
+        "jest-message-util": "30.2.0",
+        "jest-resolve": "30.2.0",
+        "jest-runtime": "30.2.0",
+        "jest-util": "30.2.0",
+        "jest-watcher": "30.2.0",
+        "jest-worker": "30.2.0",
         "p-limit": "^3.1.0",
         "source-map-support": "0.5.13"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-runtime": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
-      "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-30.2.0.tgz",
+      "integrity": "sha512-p1+GVX/PJqTucvsmERPMgCPvQJpFt4hFbM+VN3n8TMo47decMUcJbt+rgzwrEme0MQUA/R+1de2axftTHkKckg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/fake-timers": "^29.7.0",
-        "@jest/globals": "^29.7.0",
-        "@jest/source-map": "^29.6.3",
-        "@jest/test-result": "^29.7.0",
-        "@jest/transform": "^29.7.0",
-        "@jest/types": "^29.6.3",
+        "@jest/environment": "30.2.0",
+        "@jest/fake-timers": "30.2.0",
+        "@jest/globals": "30.2.0",
+        "@jest/source-map": "30.0.1",
+        "@jest/test-result": "30.2.0",
+        "@jest/transform": "30.2.0",
+        "@jest/types": "30.2.0",
         "@types/node": "*",
-        "chalk": "^4.0.0",
-        "cjs-module-lexer": "^1.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-mock": "^29.7.0",
-        "jest-regex-util": "^29.6.3",
-        "jest-resolve": "^29.7.0",
-        "jest-snapshot": "^29.7.0",
-        "jest-util": "^29.7.0",
+        "chalk": "^4.1.2",
+        "cjs-module-lexer": "^2.1.0",
+        "collect-v8-coverage": "^1.0.2",
+        "glob": "^10.3.10",
+        "graceful-fs": "^4.2.11",
+        "jest-haste-map": "30.2.0",
+        "jest-message-util": "30.2.0",
+        "jest-mock": "30.2.0",
+        "jest-regex-util": "30.0.1",
+        "jest-resolve": "30.2.0",
+        "jest-snapshot": "30.2.0",
+        "jest-util": "30.2.0",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
-    "node_modules/jest-snapshot": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
-      "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/core": "^7.11.6",
-        "@babel/generator": "^7.7.2",
-        "@babel/plugin-syntax-jsx": "^7.7.2",
-        "@babel/plugin-syntax-typescript": "^7.7.2",
-        "@babel/types": "^7.3.3",
-        "@jest/expect-utils": "^29.7.0",
-        "@jest/transform": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "babel-preset-current-node-syntax": "^1.0.0",
-        "chalk": "^4.0.0",
-        "expect": "^29.7.0",
-        "graceful-fs": "^4.2.9",
-        "jest-diff": "^29.7.0",
-        "jest-get-type": "^29.6.3",
-        "jest-matcher-utils": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "natural-compare": "^1.4.0",
-        "pretty-format": "^29.7.0",
-        "semver": "^7.5.3"
+    "node_modules/jest-runtime/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/glob": {
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/minimatch": {
+      "version": "9.0.9",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
+      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.2"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/jest-snapshot": {
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-30.2.0.tgz",
+      "integrity": "sha512-5WEtTy2jXPFypadKNpbNkZ72puZCa6UjSr/7djeecHWOu7iYhSXSnHScT8wBz3Rn8Ena5d5RYRcsyKIeqG1IyA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.27.4",
+        "@babel/generator": "^7.27.5",
+        "@babel/plugin-syntax-jsx": "^7.27.1",
+        "@babel/plugin-syntax-typescript": "^7.27.1",
+        "@babel/types": "^7.27.3",
+        "@jest/expect-utils": "30.2.0",
+        "@jest/get-type": "30.1.0",
+        "@jest/snapshot-utils": "30.2.0",
+        "@jest/transform": "30.2.0",
+        "@jest/types": "30.2.0",
+        "babel-preset-current-node-syntax": "^1.2.0",
+        "chalk": "^4.1.2",
+        "expect": "30.2.0",
+        "graceful-fs": "^4.2.11",
+        "jest-diff": "30.2.0",
+        "jest-matcher-utils": "30.2.0",
+        "jest-message-util": "30.2.0",
+        "jest-util": "30.2.0",
+        "pretty-format": "30.2.0",
+        "semver": "^7.7.2",
+        "synckit": "^0.11.8"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-snapshot/node_modules/semver": {
@@ -4227,52 +4874,39 @@
       }
     },
     "node_modules/jest-util": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
-      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.2.0.tgz",
+      "integrity": "sha512-QKNsM0o3Xe6ISQU869e+DhG+4CK/48aHYdJZGlFQVTjnbvgpcKyxpzk29fGiO7i/J8VENZ+d2iGnSsvmuHywlA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "^29.6.3",
+        "@jest/types": "30.2.0",
         "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "graceful-fs": "^4.2.11",
+        "picomatch": "^4.0.2"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-util/node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-validate": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
-      "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-30.2.0.tgz",
+      "integrity": "sha512-FBGWi7dP2hpdi8nBoWxSsLvBFewKAg0+uSQwBaof4Y4DPgBabXgpSYC5/lR7VmnIlSpASmCi/ntRWPbv7089Pw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "^29.6.3",
-        "camelcase": "^6.2.0",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^29.6.3",
+        "@jest/get-type": "30.1.0",
+        "@jest/types": "30.2.0",
+        "camelcase": "^6.3.0",
+        "chalk": "^4.1.2",
         "leven": "^3.1.0",
-        "pretty-format": "^29.7.0"
+        "pretty-format": "30.2.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-validate/node_modules/camelcase": {
@@ -4289,39 +4923,40 @@
       }
     },
     "node_modules/jest-watcher": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
-      "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-30.2.0.tgz",
+      "integrity": "sha512-PYxa28dxJ9g777pGm/7PrbnMeA0Jr7osHP9bS7eJy9DuAjMgdGtxgf0uKMyoIsTWAkIbUW5hSDdJ3urmgXBqxg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/test-result": "^29.7.0",
-        "@jest/types": "^29.6.3",
+        "@jest/test-result": "30.2.0",
+        "@jest/types": "30.2.0",
         "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
+        "ansi-escapes": "^4.3.2",
+        "chalk": "^4.1.2",
         "emittery": "^0.13.1",
-        "jest-util": "^29.7.0",
-        "string-length": "^4.0.1"
+        "jest-util": "30.2.0",
+        "string-length": "^4.0.2"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-worker": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
-      "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-30.2.0.tgz",
+      "integrity": "sha512-0Q4Uk8WF7BUwqXHuAjc23vmopWJw5WH7w2tqBoUOZpOjW/ZnR44GXXd1r82RvnmI2GZge3ivrYXk/BE2+VtW2g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/node": "*",
-        "jest-util": "^29.7.0",
+        "@ungap/structured-clone": "^1.3.0",
+        "jest-util": "30.2.0",
         "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
+        "supports-color": "^8.1.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-worker/node_modules/supports-color": {
@@ -4413,16 +5048,6 @@
         "graceful-fs": "^4.1.6"
       }
     },
-    "node_modules/kleur": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/leven": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
@@ -4603,6 +5228,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/minipass": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz",
+      "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
     "node_modules/moment": {
       "version": "2.29.4",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
@@ -4620,6 +5255,22 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/napi-postinstall": {
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.3.4.tgz",
+      "integrity": "sha512-PHI5f1O0EP5xJ9gQmFGMS6IZcrVvTjpXjz7Na41gTE7eE2hK11lg04CECCYEEjdc17EV4DO+fkGEtt7TpTaTiQ==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "napi-postinstall": "lib/cli.js"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/napi-postinstall"
+      }
+    },
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -4767,6 +5418,13 @@
         "node": ">=6"
       }
     },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+      "dev": true,
+      "license": "BlueOak-1.0.0"
+    },
     "node_modules/parse-json": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
@@ -4823,6 +5481,30 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/path-scurry": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/path-scurry/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/path-type": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
@@ -4877,18 +5559,18 @@
       }
     },
     "node_modules/pretty-format": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
-      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+      "version": "30.2.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-30.2.0.tgz",
+      "integrity": "sha512-9uBdv/B4EefsuAL+pWqueZyZS2Ba+LxfFeQ9DN14HU4bN8bhaxKdkpjpB6fs9+pSjIBu+FXQHImEg8j/Lw0+vA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
+        "@jest/schemas": "30.0.5",
+        "ansi-styles": "^5.2.0",
+        "react-is": "^18.3.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/pretty-format/node_modules/ansi-styles": {
@@ -4904,24 +5586,10 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/prompts": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
-      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "kleur": "^3.0.3",
-        "sisteransi": "^1.0.5"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/pure-rand": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",
-      "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-7.0.1.tgz",
+      "integrity": "sha512-oTUZM/NAZS8p7ANR3SHh30kXB+zK2r2BPcEn/awJIbOvq82WoMN4p62AWWp3Hhw50G0xMsw1mhIBLqHw64EcNQ==",
       "dev": true,
       "funding": [
         {
@@ -5027,16 +5695,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/resolve.exports": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz",
-      "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/reusify": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
@@ -5223,13 +5881,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/sisteransi": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/slash": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
@@ -5319,6 +5970,22 @@
         "node": ">=8"
       }
     },
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -5332,6 +5999,20 @@
         "node": ">=8"
       }
     },
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/strip-bom": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
@@ -5399,6 +6080,22 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/synckit": {
+      "version": "0.11.12",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.12.tgz",
+      "integrity": "sha512-Bh7QjT8/SuKUIfObSXNHNSK6WHo6J1tHCqJsuaFDP7gP0fkzSfTxI8y85JrppZ0h8l0maIgc2tfuZQ6/t3GtnQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@pkgr/core": "^0.2.9"
+      },
+      "engines": {
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/synckit"
+      }
+    },
     "node_modules/terser": {
       "version": "5.46.0",
       "resolved": "https://registry.npmjs.org/terser/-/terser-5.46.0.tgz",
@@ -5625,6 +6322,41 @@
         "node": ">= 4.0.0"
       }
     },
+    "node_modules/unrs-resolver": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.11.1.tgz",
+      "integrity": "sha512-bSjt9pjaEBnNiGgc9rUiHGKv5l4/TGzDmYw3RhnkJGtLhbnnA/5qJj7x3dNDCRx/PJxu774LlH8lCOlB4hEfKg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "napi-postinstall": "^0.3.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/unrs-resolver"
+      },
+      "optionalDependencies": {
+        "@unrs/resolver-binding-android-arm-eabi": "1.11.1",
+        "@unrs/resolver-binding-android-arm64": "1.11.1",
+        "@unrs/resolver-binding-darwin-arm64": "1.11.1",
+        "@unrs/resolver-binding-darwin-x64": "1.11.1",
+        "@unrs/resolver-binding-freebsd-x64": "1.11.1",
+        "@unrs/resolver-binding-linux-arm-gnueabihf": "1.11.1",
+        "@unrs/resolver-binding-linux-arm-musleabihf": "1.11.1",
+        "@unrs/resolver-binding-linux-arm64-gnu": "1.11.1",
+        "@unrs/resolver-binding-linux-arm64-musl": "1.11.1",
+        "@unrs/resolver-binding-linux-ppc64-gnu": "1.11.1",
+        "@unrs/resolver-binding-linux-riscv64-gnu": "1.11.1",
+        "@unrs/resolver-binding-linux-riscv64-musl": "1.11.1",
+        "@unrs/resolver-binding-linux-s390x-gnu": "1.11.1",
+        "@unrs/resolver-binding-linux-x64-gnu": "1.11.1",
+        "@unrs/resolver-binding-linux-x64-musl": "1.11.1",
+        "@unrs/resolver-binding-wasm32-wasi": "1.11.1",
+        "@unrs/resolver-binding-win32-arm64-msvc": "1.11.1",
+        "@unrs/resolver-binding-win32-ia32-msvc": "1.11.1",
+        "@unrs/resolver-binding-win32-x64-msvc": "1.11.1"
+      }
+    },
     "node_modules/update-browserslist-db": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",
@@ -5730,6 +6462,25 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
+    "node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -5738,17 +6489,30 @@
       "license": "ISC"
     },
     "node_modules/write-file-atomic": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
-      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
+      "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "imurmurhash": "^0.1.4",
-        "signal-exit": "^3.0.7"
+        "signal-exit": "^4.0.1"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/write-file-atomic/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/y18n": {
diff --git a/package.json b/package.json
index be01f4a..e9d9408 100644
--- a/package.json
+++ b/package.json
@@ -20,10 +20,10 @@
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^12.3.0",
     "@types/d3": "^7.4.3",
-    "@types/jest": "^29.5.14",
+    "@types/jest": "^30.0.0",
     "@types/node": "^25.3.3",
     "@types/sprintf-js": "^1.1.4",
-    "jest": "^29.7.0",
+    "jest": "^30.2.0",
     "obsidian": "https://github.com/obsidianmd/obsidian-api/tarball/master",
     "rollup": "^4.57.1",
     "rollup-plugin-copy": "^3.5.0",