@alanszp/nunjucks-utils 19.0.0 → 20.0.1
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.
|
@@ -18,9 +18,20 @@ exports.dateFnsLocales = {
|
|
|
18
18
|
function parseDate(date, format, baseDate) {
|
|
19
19
|
if (!(0, date_fns_1.isDate)(date) && !(0, lodash_1.isString)(date))
|
|
20
20
|
return null;
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
21
|
+
if ((0, date_fns_1.isDate)(date))
|
|
22
|
+
return date;
|
|
23
|
+
if (!format) {
|
|
24
|
+
// attempt to parse the date as an ISO 8601 string
|
|
25
|
+
const parsedISO = (0, date_fns_1.parseISO)(date);
|
|
26
|
+
if (!isNaN(parsedISO.getTime()))
|
|
27
|
+
return parsedISO;
|
|
28
|
+
// If previous attempt failed, parse as a date string
|
|
29
|
+
const parsedDateString = (0, date_fns_1.parse)(date, "yyyy-MM-dd", baseDate || new Date());
|
|
30
|
+
if (!isNaN(parsedDateString.getTime()))
|
|
31
|
+
return parsedDateString;
|
|
32
|
+
return null;
|
|
33
|
+
}
|
|
34
|
+
return (0, date_fns_1.parse)(date, format, baseDate || new Date());
|
|
24
35
|
}
|
|
25
36
|
function formatDate(date, formatTemplate, locale, options = {}) {
|
|
26
37
|
var _a;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dateFunctions.js","sourceRoot":"","sources":["../../src/filters/dateFunctions.ts"],"names":[],"mappings":";;;AAcA,
|
|
1
|
+
{"version":3,"file":"dateFunctions.js","sourceRoot":"","sources":["../../src/filters/dateFunctions.ts"],"names":[],"mappings":";;;AAcA,8BAqBC;AAED,gCAaC;AAlDD,uCAA2D;AAC3D,4CAAqD;AACrD,mCAAkC;AAErB,QAAA,cAAc,GAAG;IAC5B,EAAE,EAAE,aAAI;IACR,EAAE,EAAF,WAAE;IACF,EAAE,EAAF,WAAE;IACF,OAAO,EAAE,WAAE;IACX,IAAI,EAAE,WAAE;IACR,OAAO,EAAE,aAAI;IACb,IAAI,EAAE,aAAI;CACX,CAAC;AAEF,SAAgB,SAAS,CACvB,IAAa,EACb,MAAe,EACf,QAAe;IAEf,IAAI,CAAC,IAAA,iBAAM,EAAC,IAAI,CAAC,IAAI,CAAC,IAAA,iBAAQ,EAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IAClD,IAAI,IAAA,iBAAM,EAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IAE9B,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,kDAAkD;QAClD,MAAM,SAAS,GAAG,IAAA,mBAAQ,EAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;YAAE,OAAO,SAAS,CAAC;QAElD,qDAAqD;QACrD,MAAM,gBAAgB,GAAG,IAAA,gBAAK,EAAC,IAAI,EAAE,YAAY,EAAE,QAAQ,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;QAC3E,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC;YAAE,OAAO,gBAAgB,CAAC;QAEhE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,IAAA,gBAAK,EAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;AACrD,CAAC;AAED,SAAgB,UAAU,CACxB,IAAa,EACb,cAAsB,EACtB,MAAe,EACf,OAAO,GAAG,EAAE;;IAEZ,MAAM,aAAa,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IACtC,IAAI,CAAC,aAAa,IAAI,CAAC,IAAA,iBAAM,EAAC,aAAa,CAAC;QAAE,OAAO,EAAE,CAAC;IAExD,OAAO,IAAA,iBAAM,EAAC,aAAa,EAAE,cAAc,kBACzC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,MAAA,sBAAc,CAAC,MAAM,CAAC,mCAAI,WAAE,CAAC,CAAC,CAAC,WAAE,IAC/C,OAAO,EACV,CAAC;AACL,CAAC"}
|
|
@@ -3,6 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const locale_1 = require("date-fns/locale");
|
|
4
4
|
const dateFunctions_1 = require("./dateFunctions");
|
|
5
5
|
describe("parseDate", () => {
|
|
6
|
+
it("should parse a valid ISO 8601 string date", () => {
|
|
7
|
+
const result = (0, dateFunctions_1.parseDate)("2022-08-23T00:00:00.000Z");
|
|
8
|
+
expect(result).toBeInstanceOf(Date);
|
|
9
|
+
expect(result === null || result === void 0 ? void 0 : result.getFullYear()).toBe(2022);
|
|
10
|
+
expect(result === null || result === void 0 ? void 0 : result.getMonth()).toBe(7);
|
|
11
|
+
expect(result === null || result === void 0 ? void 0 : result.getDate()).toBe(23);
|
|
12
|
+
});
|
|
6
13
|
it("should parse a valid date string with default format", () => {
|
|
7
14
|
const result = (0, dateFunctions_1.parseDate)("2023-06-15");
|
|
8
15
|
expect(result).toBeInstanceOf(Date);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dateFunctions.test.js","sourceRoot":"","sources":["../../src/filters/dateFunctions.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"dateFunctions.test.js","sourceRoot":"","sources":["../../src/filters/dateFunctions.test.ts"],"names":[],"mappings":";;AAAA,4CAAqC;AACrC,mDAAwD;AAExD,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACnD,MAAM,MAAM,GAAG,IAAA,yBAAS,EAAC,0BAA0B,CAAC,CAAC;QACrD,MAAM,CAAC,MAAM,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnC,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;QAC9D,MAAM,MAAM,GAAG,IAAA,yBAAS,EAAC,YAAY,CAAC,CAAC;QACvC,MAAM,CAAC,MAAM,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnC,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;QAC7D,MAAM,MAAM,GAAG,IAAA,yBAAS,EAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QACrD,MAAM,CAAC,MAAM,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnC,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACvE,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QACnC,MAAM,CAAC,IAAA,yBAAS,EAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;QACzC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAClC,MAAM,MAAM,GAAG,IAAA,yBAAS,EAAC,YAAY,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;QAC3D,MAAM,CAAC,MAAM,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CACpD,yCAAyC,EACzC,CAAC,KAAK,EAAE,EAAE;QACR,MAAM,CAAC,IAAA,yBAAS,EAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IACtC,CAAC,CACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IAC1B,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;QAC/D,MAAM,CAAC,IAAA,0BAAU,EAAC,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,IAAI,CAAC;QACN,CAAC,IAAI,EAAE,MAAM,CAAC;QACd,CAAC,IAAI,EAAE,OAAO,CAAC;QACf,CAAC,IAAI,EAAE,OAAO,CAAC;QACf,CAAC,OAAO,EAAE,OAAO,CAAC;QAClB,CAAC,MAAM,EAAE,OAAO,CAAC;QACjB,CAAC,OAAO,EAAE,OAAO,CAAC;QAClB,CAAC,MAAM,EAAE,OAAO,CAAC;KAClB,CAAC,CAAC,gCAAgC,EAAE,CAAC,MAAM,EAAE,aAAa,EAAE,EAAE;QAC7D,MAAM,CAAC,IAAA,0BAAU,EAAC,YAAY,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;QACrC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QACnC,MAAM,CAAC,IAAA,0BAAU,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CACpD,iDAAiD,EACjD,CAAC,KAAK,EAAE,EAAE;QACR,MAAM,CAAC,IAAA,0BAAU,EAAC,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACnD,CAAC,CACF,CAAC;IAEF,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACzD,MAAM,CAAC,IAAA,0BAAU,EAAC,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,WAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CACtE,OAAO,CACR,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@alanszp/nunjucks-utils",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "20.0.1",
|
|
4
4
|
"description": "Nunjucks filters and helpers.",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"typings": "dist/index.d.ts",
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"nunjucks": "^3.2.4"
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@alanszp/relative-date": "^
|
|
24
|
+
"@alanszp/relative-date": "^20.0.1",
|
|
25
25
|
"date-fns": "^4.1.0",
|
|
26
26
|
"lodash": "^4.17.21"
|
|
27
27
|
},
|
|
@@ -34,5 +34,5 @@
|
|
|
34
34
|
"jest": "^29.7.0",
|
|
35
35
|
"nunjucks": "^3.2.4"
|
|
36
36
|
},
|
|
37
|
-
"gitHead": "
|
|
37
|
+
"gitHead": "76238dec1f4644fb5170f19e7ea399371bf8eeee"
|
|
38
38
|
}
|