@qrvey/utils 1.18.7 → 1.18.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/README.md +1 -1
  2. package/dist/cjs/comparativeAnalysis/index.js +6 -4
  3. package/dist/comparativeAnalysis/index.js +6 -4
  4. package/package.json +3 -2
package/README.md CHANGED
@@ -1,4 +1,4 @@
1
- # [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.18.7*
1
+ # [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.18.8*
2
2
 
3
3
  > Helper, Utils for all Qrvey Projects
4
4
 
package/dist/cjs/comparativeAnalysis/index.js CHANGED
@@ -88,16 +88,18 @@ function formatComparativePeriodCaption(period, allDatesText, colLabel = "") {
88
88
  if (!period?.date1) {
89
89
  return colLabel ? `${colLabel} - ${allDatesText}` : allDatesText;
90
90
  }
91
- const dateRange = period.date2
92
- ? `${period.date1}-${period.date2}`
93
- : period.date1;
91
+ const d1 = period.formattedDate1 ?? period.date1;
92
+ const d2 = period.formattedDate2 ?? period.date2;
93
+ const dateRange = period.date2 ? `${d1} - ${d2}` : d1;
94
94
  return colLabel ? `${colLabel} - ${dateRange}` : dateRange;
95
95
  }
96
96
  function formatDeltaDefaultCaption(referencePeriod, compareTo, allDatesText, colLabel = "") {
97
97
  const fmtPeriodFn = (p) => {
98
98
  if (!p?.date1)
99
99
  return allDatesText;
100
- return p.date2 ? `${p.date1}-${p.date2}` : p.date1;
100
+ const d1 = p.formattedDate1 ?? p.date1;
101
+ const d2 = p.formattedDate2 ?? p.date2;
102
+ return p.date2 ? `${d1} - ${d2}` : d1;
101
103
  };
102
104
  const ref = fmtPeriodFn(referencePeriod);
103
105
  const cmp = fmtPeriodFn(compareTo);
package/dist/comparativeAnalysis/index.js CHANGED
@@ -70,16 +70,18 @@ export function formatComparativePeriodCaption(period, allDatesText, colLabel =
70
70
  if (!period?.date1) {
71
71
  return colLabel ? `${colLabel} - ${allDatesText}` : allDatesText;
72
72
  }
73
- const dateRange = period.date2
74
- ? `${period.date1}-${period.date2}`
75
- : period.date1;
73
+ const d1 = period.formattedDate1 ?? period.date1;
74
+ const d2 = period.formattedDate2 ?? period.date2;
75
+ const dateRange = period.date2 ? `${d1} - ${d2}` : d1;
76
76
  return colLabel ? `${colLabel} - ${dateRange}` : dateRange;
77
77
  }
78
78
  export function formatDeltaDefaultCaption(referencePeriod, compareTo, allDatesText, colLabel = "") {
79
79
  const fmtPeriodFn = (p) => {
80
80
  if (!p?.date1)
81
81
  return allDatesText;
82
- return p.date2 ? `${p.date1}-${p.date2}` : p.date1;
82
+ const d1 = p.formattedDate1 ?? p.date1;
83
+ const d2 = p.formattedDate2 ?? p.date2;
84
+ return p.date2 ? `${d1} - ${d2}` : d1;
83
85
  };
84
86
  const ref = fmtPeriodFn(referencePeriod);
85
87
  const cmp = fmtPeriodFn(compareTo);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@qrvey/utils",
3
- "version": "1.18.7",
3
+ "version": "1.18.8",
4
4
  "description": "Helper, Utils for all Qrvey Projects",
5
5
  "homepage": "https://bitbucket.org/qrvey/qrvey_utils/wiki/Home",
6
6
  "main": "dist/cjs/index.js",
@@ -82,7 +82,8 @@
82
82
  "dist/**/*"
83
83
  ],
84
84
  "overrides": {
85
- "js-yaml": "4.2.0"
85
+ "brace-expansion": "^5.0.8",
86
+ "js-yaml": "4.3.0"
86
87
  },
87
88
  "sideEffects": false,
88
89
  "types": "dist/index.d.ts"