@dwp/govuk-casa 9.3.3 → 9.3.4
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.
- package/dist/assets/css/casa.css +1 -1
- package/dist/assets/css/casa.css.map +1 -1
- package/dist/lib/CasaTemplateLoader.js +22 -28
- package/dist/lib/CasaTemplateLoader.js.map +1 -1
- package/dist/lib/JourneyContext.js +86 -112
- package/dist/lib/JourneyContext.js.map +1 -1
- package/dist/lib/MutableRouter.js +71 -80
- package/dist/lib/MutableRouter.js.map +1 -1
- package/dist/lib/Plan.js +15 -26
- package/dist/lib/Plan.js.map +1 -1
- package/dist/lib/ValidationError.js +3 -3
- package/dist/lib/ValidationError.js.map +1 -1
- package/dist/lib/configuration-ingestor.js +21 -10
- package/dist/lib/configuration-ingestor.js.map +1 -1
- package/dist/lib/configure.js +18 -17
- package/dist/lib/configure.js.map +1 -1
- package/dist/lib/end-session.js +5 -5
- package/dist/lib/end-session.js.map +1 -1
- package/dist/lib/field.js +56 -65
- package/dist/lib/field.js.map +1 -1
- package/dist/lib/nunjucks-filters.js +6 -6
- package/dist/lib/nunjucks-filters.js.map +1 -1
- package/dist/lib/nunjucks.js +3 -3
- package/dist/lib/nunjucks.js.map +1 -1
- package/dist/lib/utils.js +6 -1
- package/dist/lib/utils.js.map +1 -1
- package/dist/lib/validators/dateObject.js +23 -14
- package/dist/lib/validators/dateObject.js.map +1 -1
- package/dist/lib/validators/email.js +2 -5
- package/dist/lib/validators/email.js.map +1 -1
- package/dist/lib/validators/inArray.js +2 -5
- package/dist/lib/validators/inArray.js.map +1 -1
- package/dist/lib/validators/nino.js +1 -4
- package/dist/lib/validators/nino.js.map +1 -1
- package/dist/lib/validators/postalAddressObject.js +26 -19
- package/dist/lib/validators/postalAddressObject.js.map +1 -1
- package/dist/lib/validators/range.js +2 -6
- package/dist/lib/validators/range.js.map +1 -1
- package/dist/lib/validators/regex.js +1 -4
- package/dist/lib/validators/regex.js.map +1 -1
- package/dist/lib/validators/required.js +1 -4
- package/dist/lib/validators/required.js.map +1 -1
- package/dist/lib/validators/strlen.js +1 -4
- package/dist/lib/validators/strlen.js.map +1 -1
- package/dist/lib/validators/wordCount.js +1 -4
- package/dist/lib/validators/wordCount.js.map +1 -1
- package/dist/middleware/csrf.js +4 -2
- package/dist/middleware/csrf.js.map +1 -1
- package/dist/middleware/data.js +17 -10
- package/dist/middleware/data.js.map +1 -1
- package/dist/middleware/i18n.d.ts +1 -1
- package/dist/middleware/i18n.js +16 -16
- package/dist/middleware/i18n.js.map +1 -1
- package/dist/middleware/post.js +9 -7
- package/dist/middleware/post.js.map +1 -1
- package/dist/middleware/pre.js +2 -2
- package/dist/middleware/pre.js.map +1 -1
- package/dist/middleware/sanitise-fields.d.ts +1 -1
- package/dist/middleware/sanitise-fields.js +1 -2
- package/dist/middleware/sanitise-fields.js.map +1 -1
- package/dist/middleware/session.js +11 -6
- package/dist/middleware/session.js.map +1 -1
- package/dist/middleware/strip-proxy-path.js +1 -2
- package/dist/middleware/strip-proxy-path.js.map +1 -1
- package/dist/middleware/validate-fields.d.ts +1 -1
- package/dist/middleware/validate-fields.js +1 -2
- package/dist/middleware/validate-fields.js.map +1 -1
- package/dist/routes/journey.js +15 -11
- package/dist/routes/journey.js.map +1 -1
- package/dist/routes/static.js +8 -9
- package/dist/routes/static.js.map +1 -1
- package/package.json +23 -22
- package/src/lib/JourneyContext.js +22 -19
- package/src/lib/MutableRouter.js +2 -2
- package/src/lib/Plan.js +2 -8
- package/src/lib/ValidationError.js +2 -2
- package/src/lib/configuration-ingestor.js +21 -12
- package/src/lib/configure.js +14 -11
- package/src/lib/end-session.js +5 -5
- package/src/lib/nunjucks-filters.js +6 -6
- package/src/lib/nunjucks.js +2 -2
- package/src/lib/validators/dateObject.js +5 -5
- package/src/lib/validators/postalAddressObject.js +8 -10
- package/src/middleware/data.js +4 -7
- package/src/middleware/i18n.js +9 -9
- package/src/middleware/pre.js +1 -1
- package/src/middleware/sanitise-fields.js +1 -2
- package/src/routes/journey.js +2 -2
- package/src/routes/static.js +4 -4
|
@@ -16,7 +16,8 @@ const { all: deepmergeAll } = deepmerge_1.default;
|
|
|
16
16
|
// ref: https://www.npmjs.com/package/deepmerge
|
|
17
17
|
const combineMerge = (target, source, options) => {
|
|
18
18
|
const destination = target.slice();
|
|
19
|
-
source.
|
|
19
|
+
for (let index = 0; index < source.length; index++) {
|
|
20
|
+
const item = source[index];
|
|
20
21
|
// ESLint disabled as `index` is only an integer
|
|
21
22
|
/* eslint-disable security/detect-object-injection */
|
|
22
23
|
if (typeof destination[index] === "undefined") {
|
|
@@ -29,7 +30,7 @@ const combineMerge = (target, source, options) => {
|
|
|
29
30
|
destination.push(item);
|
|
30
31
|
}
|
|
31
32
|
/* eslint-enable security/detect-object-injection */
|
|
32
|
-
}
|
|
33
|
+
}
|
|
33
34
|
return destination;
|
|
34
35
|
};
|
|
35
36
|
// Allows objects to be deepmerged and retain their type, without becoming [object Object]
|
|
@@ -52,8 +53,7 @@ function isPlainObjectOrArray(o) {
|
|
|
52
53
|
if (isObject(prot) === false) {
|
|
53
54
|
return false;
|
|
54
55
|
}
|
|
55
|
-
|
|
56
|
-
return prot.hasOwnProperty("isPrototypeOf");
|
|
56
|
+
return Object.hasOwn(prot, "isPrototypeOf");
|
|
57
57
|
}
|
|
58
58
|
function mergeObjects(...objects) {
|
|
59
59
|
return deepmergeAll([Object.create(null), ...objects], {
|
|
@@ -118,7 +118,7 @@ function formatDateObject(date, config = {}) {
|
|
|
118
118
|
function renderAsAttributes(attrsObject) {
|
|
119
119
|
const attrsList = [];
|
|
120
120
|
if (typeof attrsObject === "object") {
|
|
121
|
-
Object.keys(attrsObject)
|
|
121
|
+
for (const key of Object.keys(attrsObject)) {
|
|
122
122
|
// ESLint disable as `attrsObject` is dev-controlled, `Object.keys()` has
|
|
123
123
|
// been used (to get "own" properties) and `m` is one of the characters
|
|
124
124
|
// found by the regex.
|
|
@@ -132,7 +132,7 @@ function renderAsAttributes(attrsObject) {
|
|
|
132
132
|
})[m]);
|
|
133
133
|
/* eslint-enable security/detect-object-injection */
|
|
134
134
|
attrsList.push(`${key}="${value}"`);
|
|
135
|
-
}
|
|
135
|
+
}
|
|
136
136
|
}
|
|
137
137
|
return new nunjucks_1.default.runtime.SafeString(attrsList.join(" "));
|
|
138
138
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nunjucks-filters.js","sourceRoot":"","sources":["../../src/lib/nunjucks-filters.js"],"names":[],"mappings":";;;;;AAkJS,oCAAY;AAAE,4BAAQ;AAAE,4CAAgB;AAAE,gDAAkB;AAlJrE,0DAA8B;AAC9B,iCAAiC;AACjC,wDAAgC;AAEhC,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,mBAAK,CAAC;AAEpC,4EAA4E;AAC5E,kBAAkB;AAClB,+CAA+C;AAE/C,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;IAC/C,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;IAEnC,
|
|
1
|
+
{"version":3,"file":"nunjucks-filters.js","sourceRoot":"","sources":["../../src/lib/nunjucks-filters.js"],"names":[],"mappings":"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"}
|
package/dist/lib/nunjucks.js
CHANGED
|
@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.default = nunjucksConfig;
|
|
7
|
-
const
|
|
8
|
-
const
|
|
7
|
+
const node_fs_1 = require("node:fs");
|
|
8
|
+
const node_path_1 = require("node:path");
|
|
9
9
|
const nunjucks_1 = require("nunjucks");
|
|
10
10
|
const dirname_cjs_1 = __importDefault(require("./dirname.cjs"));
|
|
11
11
|
const CasaTemplateLoader_js_1 = __importDefault(require("./CasaTemplateLoader.js"));
|
|
@@ -42,7 +42,7 @@ function nunjucksConfig({ views = [] }) {
|
|
|
42
42
|
// These can't be modified once set. But they can be overridden by res.locals.
|
|
43
43
|
env.addGlobal("casaVersion",
|
|
44
44
|
/* eslint-disable-next-line security/detect-non-literal-fs-filename */
|
|
45
|
-
JSON.parse((0,
|
|
45
|
+
JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.resolve)(dirname_cjs_1.default, "../../package.json"))).version);
|
|
46
46
|
env.addGlobal("mergeObjects", nunjucks_filters_js_1.mergeObjects);
|
|
47
47
|
env.addGlobal("includes", nunjucks_filters_js_1.includes);
|
|
48
48
|
env.addGlobal("formatDateObject", nunjucks_filters_js_1.formatDateObject);
|
package/dist/lib/nunjucks.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nunjucks.js","sourceRoot":"","sources":["../../src/lib/nunjucks.js"],"names":[],"mappings":";;;;;AAyBA,iCAiCC;AA1DD,
|
|
1
|
+
{"version":3,"file":"nunjucks.js","sourceRoot":"","sources":["../../src/lib/nunjucks.js"],"names":[],"mappings":";;;;;AAyBA,iCAiCC;AA1DD,qCAAuC;AACvC,yCAAoC;AACpC,uCAAuC;AACvC,gEAAoC;AACpC,oFAAyD;AACzD,+DAK+B;AAE/B;;;;GAIG;AAEH;;;;;;GAMG;AACH,SAAwB,cAAc,CAAC,EAAE,KAAK,GAAG,EAAE,EAAE;IACnD,4EAA4E;IAC5E,2EAA2E;IAC3E,6EAA6E;IAC7E,MAAM,MAAM,GAAG,IAAI,+BAAkB,CAAC,KAAK,EAAE;QAC3C,KAAK,EAAE,KAAK;QACZ,OAAO,EAAE,KAAK;KACf,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,IAAI,sBAAW,CAAC,MAAM,EAAE;QAClC,UAAU,EAAE,IAAI;QAChB,gBAAgB,EAAE,KAAK;QACvB,UAAU,EAAE,KAAK;QACjB,YAAY,EAAE,KAAK;KACpB,CAAC,CAAC;IAEH,yCAAyC;IACzC,GAAG,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAElD,UAAU;IACV,8EAA8E;IAC9E,GAAG,CAAC,SAAS,CACX,aAAa;IACb,sEAAsE;IACtE,IAAI,CAAC,KAAK,CAAC,IAAA,sBAAY,EAAC,IAAA,mBAAO,EAAC,qBAAO,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC,OAAO,CACzE,CAAC;IAEF,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,kCAAY,CAAC,CAAC;IAC5C,GAAG,CAAC,SAAS,CAAC,UAAU,EAAE,8BAAQ,CAAC,CAAC;IACpC,GAAG,CAAC,SAAS,CAAC,kBAAkB,EAAE,sCAAgB,CAAC,CAAC;IACpD,GAAG,CAAC,SAAS,CAAC,oBAAoB,EAAE,wCAAkB,CAAC,CAAC;IAExD,OAAO,GAAG,CAAC;AACb,CAAC"}
|
package/dist/lib/utils.js
CHANGED
|
@@ -100,7 +100,12 @@ function coerceInputToInteger(input) {
|
|
|
100
100
|
* @access private
|
|
101
101
|
*/
|
|
102
102
|
function stripWhitespace(value, options) {
|
|
103
|
-
const opts =
|
|
103
|
+
const opts = {
|
|
104
|
+
leading: "",
|
|
105
|
+
trailing: "",
|
|
106
|
+
nested: " ",
|
|
107
|
+
...options,
|
|
108
|
+
};
|
|
104
109
|
if (typeof value !== "string") {
|
|
105
110
|
throw new TypeError("value must be a string");
|
|
106
111
|
}
|
package/dist/lib/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/lib/utils.js"],"names":[],"mappings":";AAAA;;;GAGG;;AASH,0BAcC;AASD,oCAEC;AAYD,wDAUC;AAUD,wCAOC;AAQD,oDAEC;AAWD,0CA4BC;AAYD,4BASC;AAWD,4CAcC;AAUD,4CAIC;AAWD,0CAgBC;AAWD,oCAcC;AAWD,4CAcC;AAjQD;;;;;;GAMG;AACH,SAAgB,OAAO,CAAC,GAAG;IACzB,IACE,GAAG,KAAK,IAAI;QACZ,OAAO,GAAG,KAAK,WAAW;QAC1B,CAAC,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,EAAE,CAAC,EACvC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAClD,0EAA0E;QAC1E,+DAA+D;QAC/D,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;IACvE,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,YAAY,CAAC,KAAK;IAChC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC;AAChE,CAAC;AAED;;;;;;;;;GASG;AACH,SAAgB,sBAAsB,CAAC,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,EAAE;IAC/D,sCAAsC;IACtC,MAAM,SAAS,GAAG,CAAC,CAAC,EAAE,EAAE,CACtB,CAAC,CAAC,IAAI,KAAK,SAAS;QACpB,CAAC,CAAC,CAAC,IAAI,YAAY,MAAM,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/C,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC;IAClB,OAAO,KAAK;SACT,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC;SAClC,MAAM,CAAC,SAAS,CAAC;SACjB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;AAC9B,CAAC;AAED;;;;;;;GAOG;AACH,SAAgB,cAAc,CAAC,KAAK,EAAE,QAAQ;IAC5C,8EAA8E;IAC9E,MAAM,EAAE,GACN,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,QAAQ,KAAK,SAAS,CAAC;QAC1E,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,EAAE,CAAC;IACT,OAAO,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAClD,CAAC;AAED;;;;;GAKG;AACH,SAAgB,oBAAoB,CAAC,KAAK;IACxC,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;AAC7E,CAAC;AAED;;;;;;;;GAQG;AACH,SAAgB,eAAe,CAAC,KAAK,EAAE,OAAO;IAC5C,MAAM,IAAI,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/lib/utils.js"],"names":[],"mappings":"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"}
|
|
@@ -44,22 +44,30 @@ const { isPlainObject } = lodash_1.default;
|
|
|
44
44
|
* @augments ValidatorFactory
|
|
45
45
|
*/
|
|
46
46
|
class DateObject extends ValidatorFactory_js_1.default {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
/** @property {string} name Validator name ("dateObject") */
|
|
50
|
-
this.name = "dateObject";
|
|
51
|
-
}
|
|
47
|
+
/** @property {string} name Validator name ("dateObject") */
|
|
48
|
+
name = "dateObject";
|
|
52
49
|
validate(value, dataContext = {}) {
|
|
53
|
-
const config =
|
|
50
|
+
const config = {
|
|
51
|
+
errorMsg: {
|
|
54
52
|
inline: "validation:rule.dateObject.inline",
|
|
55
53
|
summary: "validation:rule.dateObject.summary",
|
|
56
|
-
},
|
|
54
|
+
},
|
|
55
|
+
errorMsgAfterOffset: {
|
|
57
56
|
inline: "validation:rule.dateObject.afterOffset.inline",
|
|
58
57
|
summary: "validation:rule.dateObject.afterOffset.summary",
|
|
59
|
-
},
|
|
58
|
+
},
|
|
59
|
+
errorMsgBeforeOffset: {
|
|
60
60
|
inline: "validation:rule.dateObject.beforeOffset.inline",
|
|
61
61
|
summary: "validation:rule.dateObject.beforeOffset.summary",
|
|
62
|
-
},
|
|
62
|
+
},
|
|
63
|
+
now: luxon_1.DateTime.local(),
|
|
64
|
+
allowSingleDigitDay: false,
|
|
65
|
+
allowSingleDigitMonth: false,
|
|
66
|
+
allowMonthNames: false,
|
|
67
|
+
afterOffsetFromNow: undefined,
|
|
68
|
+
beforeOffsetFromNow: undefined,
|
|
69
|
+
...this.config,
|
|
70
|
+
};
|
|
63
71
|
let valid = false;
|
|
64
72
|
let { errorMsg } = config;
|
|
65
73
|
let luxonDate;
|
|
@@ -88,11 +96,12 @@ class DateObject extends ValidatorFactory_js_1.default {
|
|
|
88
96
|
formats: ["dd-MMM-yyyy", "dd-MMMM-yyyy"],
|
|
89
97
|
},
|
|
90
98
|
];
|
|
91
|
-
|
|
99
|
+
for (const test of formatTests) {
|
|
92
100
|
if (test.flags.every((v) => v === true)) {
|
|
93
101
|
formats = [...formats, ...test.formats];
|
|
94
102
|
}
|
|
95
|
-
}
|
|
103
|
+
}
|
|
104
|
+
;
|
|
96
105
|
if (typeof value === "object") {
|
|
97
106
|
formats.find((format) => {
|
|
98
107
|
luxonDate = luxon_1.DateTime.fromFormat([value.dd, value.mm, value.yyyy].join("-"), format).startOf("day");
|
|
@@ -122,13 +131,13 @@ class DateObject extends ValidatorFactory_js_1.default {
|
|
|
122
131
|
// Check presence of each object component (dd, mm, yyyy) in order to log
|
|
123
132
|
// which specific parts are in error
|
|
124
133
|
errorMsg.focusSuffix = [];
|
|
125
|
-
if (!Object.
|
|
134
|
+
if (!Object.hasOwn(value, "dd") || !value.dd) {
|
|
126
135
|
errorMsg.focusSuffix.push("[dd]");
|
|
127
136
|
}
|
|
128
|
-
if (!Object.
|
|
137
|
+
if (!Object.hasOwn(value, "mm") || !value.mm) {
|
|
129
138
|
errorMsg.focusSuffix.push("[mm]");
|
|
130
139
|
}
|
|
131
|
-
if (!Object.
|
|
140
|
+
if (!Object.hasOwn(value, "yyyy") || !value.yyyy) {
|
|
132
141
|
errorMsg.focusSuffix.push("[yyyy]");
|
|
133
142
|
}
|
|
134
143
|
// If the date is invalid, but not specific parts have been highlighted in
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dateObject.js","sourceRoot":"","sources":["../../../src/lib/validators/dateObject.js"],"names":[],"mappings":";;;;;AAAA,2CAA2C;AAC3C,iCAAiC;AACjC,oDAA4B;AAC5B,+EAAoD;AACpD,iFAAsD;AACtD,0CAA8D;AAE9D,MAAM,EAAE,aAAa,EAAE,GAAG,gBAAM,CAAC;AAEjC;;;GAGG;AAEH;;;;;;;;;;;;;;;;;GAiBG;AAEH;;;;;;;;;;GAUG;AACH,MAAqB,UAAW,SAAQ,6BAAgB;
|
|
1
|
+
{"version":3,"file":"dateObject.js","sourceRoot":"","sources":["../../../src/lib/validators/dateObject.js"],"names":[],"mappings":"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"}
|
|
@@ -28,11 +28,8 @@ const { isEmail } = validator_1.default; // CommonJS
|
|
|
28
28
|
* @augments ValidatorFactory
|
|
29
29
|
*/
|
|
30
30
|
class Email extends ValidatorFactory_js_1.default {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
/** @property {string} name Validator name ("email") */
|
|
34
|
-
this.name = "email";
|
|
35
|
-
}
|
|
31
|
+
/** @property {string} name Validator name ("email") */
|
|
32
|
+
name = "email";
|
|
36
33
|
validate(value, dataContext = {}) {
|
|
37
34
|
let isValid;
|
|
38
35
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"email.js","sourceRoot":"","sources":["../../../src/lib/validators/email.js"],"names":[],"mappings":";;;;;AAAA,2CAA2C;AAC3C,0DAAqC;AACrC,+EAAoD;AACpD,iFAAsD;AACtD,0CAA6C;AAE7C,MAAM,EAAE,OAAO,EAAE,GAAG,mBAAY,CAAC,CAAC,WAAW;AAE7C;;;GAGG;AAEH;;;GAGG;AAEH;;;;;;;;;GASG;AACH,MAAqB,KAAM,SAAQ,6BAAgB;
|
|
1
|
+
{"version":3,"file":"email.js","sourceRoot":"","sources":["../../../src/lib/validators/email.js"],"names":[],"mappings":";;;;;AAAA,2CAA2C;AAC3C,0DAAqC;AACrC,+EAAoD;AACpD,iFAAsD;AACtD,0CAA6C;AAE7C,MAAM,EAAE,OAAO,EAAE,GAAG,mBAAY,CAAC,CAAC,WAAW;AAE7C;;;GAGG;AAEH;;;GAGG;AAEH;;;;;;;;;GASG;AACH,MAAqB,KAAM,SAAQ,6BAAgB;IACjD,uDAAuD;IACvD,IAAI,GAAG,OAAO,CAAC;IAEf,QAAQ,CAAC,KAAK,EAAE,WAAW,GAAG,EAAE;QAC9B,IAAI,OAAO,CAAC;QACZ,IAAI,CAAC;YACH,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,GAAG,KAAK,CAAC;QAClB,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI;YACvC,OAAO,EAAE,+BAA+B;YACxC,MAAM,EAAE,8BAA8B;SACvC,CAAC;QAEF,OAAO,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,4BAAe,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED,QAAQ,CAAC,KAAK;QACZ,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO,IAAA,yBAAc,EAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AA1BD,wBA0BC"}
|
|
@@ -36,11 +36,8 @@ const utils_js_1 = require("../utils.js");
|
|
|
36
36
|
* @augments ValidatorFactory
|
|
37
37
|
*/
|
|
38
38
|
class InArray extends ValidatorFactory_js_1.default {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
/** @property {string} name Validator name ("inArray") */
|
|
42
|
-
this.name = "inArray";
|
|
43
|
-
}
|
|
39
|
+
/** @property {string} name Validator name ("inArray") */
|
|
40
|
+
name = "inArray";
|
|
44
41
|
validate(value, dataContext = {}) {
|
|
45
42
|
let valid = false;
|
|
46
43
|
const source = this.config.source || [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inArray.js","sourceRoot":"","sources":["../../../src/lib/validators/inArray.js"],"names":[],"mappings":";;;;;AAAA,2CAA2C;AAC3C;;;;;;;GAOG;AACH,+EAAoD;AACpD,iFAAsD;AACtD,0CAA2D;AAE3D;;;GAGG;AAEH;;;;GAIG;AAEH;;;;;;;;;;GAUG;AACH,MAAqB,OAAQ,SAAQ,6BAAgB;
|
|
1
|
+
{"version":3,"file":"inArray.js","sourceRoot":"","sources":["../../../src/lib/validators/inArray.js"],"names":[],"mappings":";;;;;AAAA,2CAA2C;AAC3C;;;;;;;GAOG;AACH,+EAAoD;AACpD,iFAAsD;AACtD,0CAA2D;AAE3D;;;GAGG;AAEH;;;;GAIG;AAEH;;;;;;;;;;GAUG;AACH,MAAqB,OAAQ,SAAQ,6BAAgB;IACnD,yDAAyD;IACzD,IAAI,GAAG,SAAS,CAAC;IAEjB,QAAQ,CAAC,KAAK,EAAE,WAAW,GAAG,EAAE;QAC9B,IAAI,KAAK,GAAG,KAAK,CAAC;QAClB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;QACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI;YACvC,MAAM,EAAE,gCAAgC;YACxC,OAAO,EAAE,iCAAiC;SAC3C,CAAC;QAEF,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,WAAW,EAAE,CAAC;YACnD,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YACtD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;gBACjD,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;oBACjD,KAAK,GAAG,IAAI,CAAC;gBACf,CAAC;qBAAM,CAAC;oBACN,KAAK,GAAG,KAAK,CAAC;oBACd,MAAM;gBACR,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,4BAAe,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,QAAQ,CAAC,KAAK;QACZ,MAAM,MAAM,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,yBAAc,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAEvD,mBAAmB;QACnB,IAAI,IAAA,uBAAY,EAAC,KAAK,CAAC,EAAE,CAAC;YACxB,OAAO,IAAA,yBAAc,EAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;QAED,kCAAkC;QAClC,qEAAqE;QACrE,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC3B,CAAC;QAED,oBAAoB;QACpB,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AA5CD,0BA4CC"}
|
|
@@ -29,10 +29,7 @@ const utils_js_1 = require("../utils.js");
|
|
|
29
29
|
* @augments ValidatorFactory
|
|
30
30
|
*/
|
|
31
31
|
class Nino extends ValidatorFactory_js_1.default {
|
|
32
|
-
|
|
33
|
-
super(...arguments);
|
|
34
|
-
this.name = "nino";
|
|
35
|
-
}
|
|
32
|
+
name = "nino";
|
|
36
33
|
validate(value, dataContext = {}) {
|
|
37
34
|
const { allowWhitespace, errorMsg = {
|
|
38
35
|
inline: "validation:rule.nino.inline",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nino.js","sourceRoot":"","sources":["../../../src/lib/validators/nino.js"],"names":[],"mappings":";;;;;AAAA,2CAA2C;AAC3C,+EAAoD;AACpD,iFAAsD;AACtD,0CAA6C;AAE7C;;;GAGG;AAEH;;;;;GAKG;AAEH;;;;;;;;;;GAUG;AACH,MAAqB,IAAK,SAAQ,6BAAgB;
|
|
1
|
+
{"version":3,"file":"nino.js","sourceRoot":"","sources":["../../../src/lib/validators/nino.js"],"names":[],"mappings":";;;;;AAAA,2CAA2C;AAC3C,+EAAoD;AACpD,iFAAsD;AACtD,0CAA6C;AAE7C;;;GAGG;AAEH;;;;;GAKG;AAEH;;;;;;;;;;GAUG;AACH,MAAqB,IAAK,SAAQ,6BAAgB;IAChD,IAAI,GAAG,MAAM,CAAC;IAEd,QAAQ,CAAC,KAAK,EAAE,WAAW,GAAG,EAAE;QAC9B,MAAM,EACJ,eAAe,EACf,QAAQ,GAAG;YACT,MAAM,EAAE,6BAA6B;YACrC,OAAO,EAAE,8BAA8B;SACxC,GACF,GAAG,IAAI,CAAC,MAAM,CAAC;QAEhB,IACE,OAAO,eAAe,KAAK,WAAW;YACtC,OAAO,eAAe,KAAK,SAAS,EACpC,CAAC;YACD,MAAM,IAAI,SAAS,CACjB,+EAA+E,OAAO,eAAe,EAAE,CACxG,CAAC;QACJ,CAAC;QACD,MAAM,KAAK,GACT,OAAO,KAAK,KAAK,QAAQ;YACzB,KAAK;iBACF,OAAO,CACN,OAAO,eAAe,KAAK,WAAW,IAAI,eAAe;gBACvD,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,EAAE,EACN,EAAE,CACH;iBACA,KAAK,CACJ,0EAA0E,CAC3E,CAAC;QAEN,OAAO,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,4BAAe,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,QAAQ,CAAC,KAAK;QACZ,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO,IAAA,yBAAc,EAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AA1CD,uBA0CC"}
|
|
@@ -45,36 +45,43 @@ const { isPlainObject } = lodash_1.default; // CommonjS
|
|
|
45
45
|
* @augments ValidatorFactory
|
|
46
46
|
*/
|
|
47
47
|
class PostalAddressObject extends ValidatorFactory_js_1.default {
|
|
48
|
-
|
|
49
|
-
super(...arguments);
|
|
50
|
-
this.name = "postalAddressObject";
|
|
51
|
-
}
|
|
48
|
+
name = "postalAddressObject";
|
|
52
49
|
validate(value, dataContext = {}) {
|
|
53
|
-
const cfg =
|
|
50
|
+
const cfg = {
|
|
51
|
+
requiredFields: ["address1", "address3", "postcode"],
|
|
52
|
+
strlenmax: undefined,
|
|
53
|
+
errorMsgAddress1: {
|
|
54
54
|
inline: "validation:rule.postalAddressObject.address1.inline",
|
|
55
55
|
summary: "validation:rule.postalAddressObject.address1.summary",
|
|
56
56
|
focusSuffix: "[address1]",
|
|
57
|
-
},
|
|
57
|
+
},
|
|
58
|
+
errorMsgAddress2: {
|
|
58
59
|
inline: "validation:rule.postalAddressObject.address2.inline",
|
|
59
60
|
summary: "validation:rule.postalAddressObject.address2.summary",
|
|
60
61
|
focusSuffix: "[address2]",
|
|
61
|
-
},
|
|
62
|
+
},
|
|
63
|
+
errorMsgAddress3: {
|
|
62
64
|
inline: "validation:rule.postalAddressObject.address3.inline",
|
|
63
65
|
summary: "validation:rule.postalAddressObject.address3.summary",
|
|
64
66
|
focusSuffix: "[address3]",
|
|
65
|
-
},
|
|
67
|
+
},
|
|
68
|
+
errorMsgAddress4: {
|
|
66
69
|
inline: "validation:rule.postalAddressObject.address4.inline",
|
|
67
70
|
summary: "validation:rule.postalAddressObject.address4.summary",
|
|
68
71
|
focusSuffix: "[address4]",
|
|
69
|
-
},
|
|
72
|
+
},
|
|
73
|
+
errorMsgPostcode: {
|
|
70
74
|
inline: "validation:rule.postalAddressObject.postcode.inline",
|
|
71
75
|
summary: "validation:rule.postalAddressObject.postcode.summary",
|
|
72
76
|
focusSuffix: "[postcode]",
|
|
73
|
-
},
|
|
77
|
+
},
|
|
78
|
+
errorMsg: {
|
|
74
79
|
inline: "validation:rule.postalAddressObject.group.inline",
|
|
75
80
|
summary: "validation:rule.postalAddressObject.group.summary",
|
|
76
81
|
focusSuffix: "[address1]",
|
|
77
|
-
}
|
|
82
|
+
},
|
|
83
|
+
...this.config,
|
|
84
|
+
};
|
|
78
85
|
/* eslint-disable-next-line require-jsdoc */
|
|
79
86
|
const objectifyError = (err) => typeof err === "string"
|
|
80
87
|
? {
|
|
@@ -85,11 +92,11 @@ class PostalAddressObject extends ValidatorFactory_js_1.default {
|
|
|
85
92
|
// Work out required/optional parts based on config
|
|
86
93
|
const reqF = Object.create(null);
|
|
87
94
|
const reqC = cfg.requiredFields;
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
95
|
+
reqF.address1 = reqC.indexOf("address1") > -1;
|
|
96
|
+
reqF.address2 = reqC.indexOf("address2") > -1;
|
|
97
|
+
reqF.address3 = reqC.indexOf("address3") > -1;
|
|
98
|
+
reqF.address4 = reqC.indexOf("address4") > -1;
|
|
99
|
+
reqF.postcode = reqC.indexOf("postcode") > -1;
|
|
93
100
|
let valid = true;
|
|
94
101
|
const errorMsgs = [];
|
|
95
102
|
if (typeof value === "object") {
|
|
@@ -113,9 +120,9 @@ class PostalAddressObject extends ValidatorFactory_js_1.default {
|
|
|
113
120
|
};
|
|
114
121
|
// ESLint disabled as `k` is a known value from the constant list above
|
|
115
122
|
/* eslint-disable security/detect-object-injection */
|
|
116
|
-
Object.keys(attributes)
|
|
123
|
+
for (const k of Object.keys(attributes)) {
|
|
117
124
|
const attr = attributes[k];
|
|
118
|
-
const hasProperty = Object.
|
|
125
|
+
const hasProperty = Object.hasOwn(value, k);
|
|
119
126
|
const hasContent = hasProperty && value[k].length > 0;
|
|
120
127
|
const condMissingOrRegexMismatch = (attr[0] || hasContent) && (!hasProperty || !value[k].match(attr[1]));
|
|
121
128
|
const condExceedStrlen = attr[2] > 0 && hasContent && String(value[k]).length > attr[2];
|
|
@@ -125,7 +132,7 @@ class PostalAddressObject extends ValidatorFactory_js_1.default {
|
|
|
125
132
|
fieldKeySuffix: `[${k}]`,
|
|
126
133
|
}));
|
|
127
134
|
}
|
|
128
|
-
}
|
|
135
|
+
}
|
|
129
136
|
/* eslint-enable security/detect-object-injection */
|
|
130
137
|
}
|
|
131
138
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postalAddressObject.js","sourceRoot":"","sources":["../../../src/lib/validators/postalAddressObject.js"],"names":[],"mappings":";;;;;AAAA,2CAA2C;AAC3C,oDAA4B;AAC5B,+EAAoD;AACpD,iFAAsD;AACtD,0CAA6C;AAE7C,MAAM,EAAE,aAAa,EAAE,GAAG,gBAAM,CAAC,CAAC,WAAW;AAE7C;;;GAGG;AAEH;;;;;;;;;;;;;;;;;;GAkBG;AAEH;;;;;;;;;;;GAWG;AACH,MAAqB,mBAAoB,SAAQ,6BAAgB;
|
|
1
|
+
{"version":3,"file":"postalAddressObject.js","sourceRoot":"","sources":["../../../src/lib/validators/postalAddressObject.js"],"names":[],"mappings":"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"}
|
|
@@ -29,10 +29,7 @@ const utils_js_1 = require("../utils.js");
|
|
|
29
29
|
* @augments ValidatorFactory
|
|
30
30
|
*/
|
|
31
31
|
class Range extends ValidatorFactory_js_1.default {
|
|
32
|
-
|
|
33
|
-
super(...arguments);
|
|
34
|
-
this.name = "range";
|
|
35
|
-
}
|
|
32
|
+
name = "range";
|
|
36
33
|
validate(inputValue, dataContext = {}) {
|
|
37
34
|
const { errorMsgMax = {
|
|
38
35
|
inline: "validation:rule.range.max.inline",
|
|
@@ -54,13 +51,12 @@ class Range extends ValidatorFactory_js_1.default {
|
|
|
54
51
|
return valid ? [] : [ValidationError_js_1.default.make({ errorMsg, dataContext })];
|
|
55
52
|
}
|
|
56
53
|
sanitise(value) {
|
|
57
|
-
var _a;
|
|
58
54
|
// treat an empty string as undefined
|
|
59
55
|
// when user submits empty form, it stores an empty string
|
|
60
56
|
if (value !== "" && value !== undefined) {
|
|
61
57
|
// add to custom validator docs to ensure not to return a falsy value as
|
|
62
58
|
// it doesn't show on screen
|
|
63
|
-
return (
|
|
59
|
+
return (0, utils_js_1.coerceInputToInteger)(value)?.toString();
|
|
64
60
|
}
|
|
65
61
|
return undefined;
|
|
66
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"range.js","sourceRoot":"","sources":["../../../src/lib/validators/range.js"],"names":[],"mappings":";AAAA,2CAA2C;;;;;AAE3C,iFAAsD;AACtD,+EAAoD;AACpD,0CAAmD;AAEnD;;;GAGG;AAEH;;;;;;;;GAQG;AAEH;;;;;;;GAOG;AACH,MAAqB,KAAM,SAAQ,6BAAgB;
|
|
1
|
+
{"version":3,"file":"range.js","sourceRoot":"","sources":["../../../src/lib/validators/range.js"],"names":[],"mappings":";AAAA,2CAA2C;;;;;AAE3C,iFAAsD;AACtD,+EAAoD;AACpD,0CAAmD;AAEnD;;;GAGG;AAEH;;;;;;;;GAQG;AAEH;;;;;;;GAOG;AACH,MAAqB,KAAM,SAAQ,6BAAgB;IACjD,IAAI,GAAG,OAAO,CAAC;IAEf,QAAQ,CAAC,UAAU,EAAE,WAAW,GAAG,EAAE;QACnC,MAAM,EACJ,WAAW,GAAG;YACZ,MAAM,EAAE,kCAAkC;YAC1C,OAAO,EAAE,mCAAmC;SAC7C,EACD,WAAW,GAAG;YACZ,MAAM,EAAE,kCAAkC;YAC1C,OAAO,EAAE,mCAAmC;SAC7C,EACD,GAAG,GAAG,MAAM,CAAC,SAAS,EACtB,GAAG,GAAG,MAAM,CAAC,SAAS,GACvB,GAAG,IAAI,CAAC,MAAM,CAAC;QAEhB,IAAI,QAAQ,CAAC;QACb,IAAI,KAAK,GAAG,IAAI,CAAC;QAEjB,IAAI,UAAU,GAAG,GAAG,EAAE,CAAC;YACrB,KAAK,GAAG,KAAK,CAAC;YACd,QAAQ,GAAG,WAAW,CAAC;QACzB,CAAC;QAED,IAAI,UAAU,GAAG,GAAG,EAAE,CAAC;YACrB,KAAK,GAAG,KAAK,CAAC;YACd,QAAQ,GAAG,WAAW,CAAC;QACzB,CAAC;QAED,OAAO,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,4BAAe,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,QAAQ,CAAC,KAAK;QACZ,qCAAqC;QACrC,0DAA0D;QAC1D,IAAI,KAAK,KAAK,EAAE,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxC,wEAAwE;YACxE,4BAA4B;YAC5B,OAAO,IAAA,+BAAoB,EAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAC;QACjD,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AA3CD,wBA2CC"}
|
|
@@ -26,10 +26,7 @@ const utils_js_1 = require("../utils.js");
|
|
|
26
26
|
* @augments ValidatorFactory
|
|
27
27
|
*/
|
|
28
28
|
class Regex extends ValidatorFactory_js_1.default {
|
|
29
|
-
|
|
30
|
-
super(...arguments);
|
|
31
|
-
this.name = "regex";
|
|
32
|
-
}
|
|
29
|
+
name = "regex";
|
|
33
30
|
validate(value = "", dataContext = {}) {
|
|
34
31
|
const invert = this.config.invert || false;
|
|
35
32
|
const match = value.match(this.config.pattern || /.*/);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"regex.js","sourceRoot":"","sources":["../../../src/lib/validators/regex.js"],"names":[],"mappings":";;;;;AAAA,2CAA2C;AAC3C,iFAAsD;AACtD,+EAAoD;AACpD,0CAA6C;AAE7C;;;GAGG;AAEH;;;;;GAKG;AAEH;;;;;;;GAOG;AACH,MAAqB,KAAM,SAAQ,6BAAgB;
|
|
1
|
+
{"version":3,"file":"regex.js","sourceRoot":"","sources":["../../../src/lib/validators/regex.js"],"names":[],"mappings":";;;;;AAAA,2CAA2C;AAC3C,iFAAsD;AACtD,+EAAoD;AACpD,0CAA6C;AAE7C;;;GAGG;AAEH;;;;;GAKG;AAEH;;;;;;;GAOG;AACH,MAAqB,KAAM,SAAQ,6BAAgB;IACjD,IAAI,GAAG,OAAO,CAAC;IAEf,QAAQ,CAAC,KAAK,GAAG,EAAE,EAAE,WAAW,GAAG,EAAE;QACnC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,KAAK,CAAC;QAC3C,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC;QACvD,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;QAEtC,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI;YACvC,MAAM,EAAE,8BAA8B;YACtC,OAAO,EAAE,+BAA+B;SACzC,CAAC;QAEF,OAAO,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,4BAAe,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,QAAQ,CAAC,KAAK;QACZ,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO,IAAA,yBAAc,EAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAtBD,wBAsBC"}
|
|
@@ -29,10 +29,7 @@ const { isPlainObject } = lodash_1.default; // CommonJS
|
|
|
29
29
|
* @augments ValidatorFactory
|
|
30
30
|
*/
|
|
31
31
|
class Required extends ValidatorFactory_js_1.default {
|
|
32
|
-
|
|
33
|
-
super(...arguments);
|
|
34
|
-
this.name = "required";
|
|
35
|
-
}
|
|
32
|
+
name = "required";
|
|
36
33
|
validate(value, dataContext = {}) {
|
|
37
34
|
const { errorMsg = {
|
|
38
35
|
inline: "validation:rule.required.inline",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"required.js","sourceRoot":"","sources":["../../../src/lib/validators/required.js"],"names":[],"mappings":";;;;;AAAA,2CAA2C;AAC3C,oDAA4B;AAC5B,0CAAoE;AACpE,iFAAsD;AACtD,+EAAoD;AAEpD,MAAM,EAAE,aAAa,EAAE,GAAG,gBAAM,CAAC,CAAC,WAAW;AAE7C;;;GAGG;AAEH;;;GAGG;AAEH;;;;;;;;;;GAUG;AACH,MAAqB,QAAS,SAAQ,6BAAgB;
|
|
1
|
+
{"version":3,"file":"required.js","sourceRoot":"","sources":["../../../src/lib/validators/required.js"],"names":[],"mappings":";;;;;AAAA,2CAA2C;AAC3C,oDAA4B;AAC5B,0CAAoE;AACpE,iFAAsD;AACtD,+EAAoD;AAEpD,MAAM,EAAE,aAAa,EAAE,GAAG,gBAAM,CAAC,CAAC,WAAW;AAE7C;;;GAGG;AAEH;;;GAGG;AAEH;;;;;;;;;;GAUG;AACH,MAAqB,QAAS,SAAQ,6BAAgB;IACpD,IAAI,GAAG,UAAU,CAAC;IAElB,QAAQ,CAAC,KAAK,EAAE,WAAW,GAAG,EAAE;QAC9B,MAAM,EACJ,QAAQ,GAAG;YACT,MAAM,EAAE,iCAAiC;YACzC,OAAO,EAAE,kCAAkC;SAC5C,GACF,GAAG,IAAI,CAAC,MAAM,CAAC;QAEhB,IAAI,CAAC,IAAA,kBAAO,EAAC,KAAK,CAAC,EAAE,CAAC;YACpB,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAO,CAAC,4BAAe,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,QAAQ,CAAC,KAAK;QACZ,MAAM,MAAM,GAAG,CAAC,GAAG,EAAE,EAAE;YACrB,MAAM,CAAC,GAAG,IAAA,yBAAc,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;YACzC,OAAO,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAC9D,CAAC,CAAC;QAEF,IAAI,IAAA,uBAAY,EAAC,KAAK,CAAC,EAAE,CAAC;YACxB,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC;QAED,kCAAkC;QAClC,qEAAqE;QACrE,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC3B,CAAC;QAED,kCAAkC;QAClC,yEAAyE;QACzE,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CACtD,CAAC;QACJ,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AA5CD,2BA4CC"}
|
|
@@ -29,10 +29,7 @@ const utils_js_1 = require("../utils.js");
|
|
|
29
29
|
* @augments ValidatorFactory
|
|
30
30
|
*/
|
|
31
31
|
class Strlen extends ValidatorFactory_js_1.default {
|
|
32
|
-
|
|
33
|
-
super(...arguments);
|
|
34
|
-
this.name = "strlen";
|
|
35
|
-
}
|
|
32
|
+
name = "strlen";
|
|
36
33
|
validate(inputValue = "", dataContext = {}) {
|
|
37
34
|
const { errorMsgMax = {
|
|
38
35
|
inline: "validation:rule.strlen.max.inline",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strlen.js","sourceRoot":"","sources":["../../../src/lib/validators/strlen.js"],"names":[],"mappings":";;;;;AAAA,2CAA2C;AAC3C,iFAAsD;AACtD,+EAAoD;AACpD,0CAA6C;AAE7C;;;GAGG;AAEH;;;;;;;;GAQG;AAEH;;;;;;;GAOG;AACH,MAAqB,MAAO,SAAQ,6BAAgB;
|
|
1
|
+
{"version":3,"file":"strlen.js","sourceRoot":"","sources":["../../../src/lib/validators/strlen.js"],"names":[],"mappings":";;;;;AAAA,2CAA2C;AAC3C,iFAAsD;AACtD,+EAAoD;AACpD,0CAA6C;AAE7C;;;GAGG;AAEH;;;;;;;;GAQG;AAEH;;;;;;;GAOG;AACH,MAAqB,MAAO,SAAQ,6BAAgB;IAClD,IAAI,GAAG,QAAQ,CAAC;IAEhB,QAAQ,CAAC,UAAU,GAAG,EAAE,EAAE,WAAW,GAAG,EAAE;QACxC,MAAM,EACJ,WAAW,GAAG;YACZ,MAAM,EAAE,mCAAmC;YAC3C,OAAO,EAAE,oCAAoC;SAC9C,EACD,WAAW,GAAG;YACZ,MAAM,EAAE,mCAAmC;YAC3C,OAAO,EAAE,oCAAoC;SAC9C,EACD,GAAG,EACH,GAAG,GACJ,GAAG,IAAI,CAAC,MAAM,CAAC;QAEhB,IAAI,QAAQ,CAAC;QACb,IAAI,KAAK,GAAG,IAAI,CAAC;QAEjB,IAAI,OAAO,GAAG,KAAK,WAAW,IAAI,UAAU,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;YAC1D,KAAK,GAAG,KAAK,CAAC;YACd,QAAQ,GAAG,WAAW,CAAC;QACzB,CAAC;QAED,IAAI,OAAO,GAAG,KAAK,WAAW,IAAI,UAAU,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;YAC1D,KAAK,GAAG,KAAK,CAAC;YACd,QAAQ,GAAG,WAAW,CAAC;QACzB,CAAC;QAED,OAAO,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,4BAAe,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,QAAQ,CAAC,KAAK;QACZ,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO,IAAA,yBAAc,EAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAvCD,yBAuCC"}
|
|
@@ -29,10 +29,7 @@ const utils_js_1 = require("../utils.js");
|
|
|
29
29
|
* @augments ValidatorFactory
|
|
30
30
|
*/
|
|
31
31
|
class WordCount extends ValidatorFactory_js_1.default {
|
|
32
|
-
|
|
33
|
-
super(...arguments);
|
|
34
|
-
this.name = "wordCount";
|
|
35
|
-
}
|
|
32
|
+
name = "wordCount";
|
|
36
33
|
count(input) {
|
|
37
34
|
return (input.match(/\S+/g) || []).length;
|
|
38
35
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wordCount.js","sourceRoot":"","sources":["../../../src/lib/validators/wordCount.js"],"names":[],"mappings":";;;;;AAAA,2CAA2C;AAC3C,iFAAsD;AACtD,+EAAoD;AACpD,0CAA6C;AAE7C;;;GAGG;AAEH;;;;;;;;GAQG;AAEH;;;;;;;GAOG;AACH,MAAqB,SAAU,SAAQ,6BAAgB;
|
|
1
|
+
{"version":3,"file":"wordCount.js","sourceRoot":"","sources":["../../../src/lib/validators/wordCount.js"],"names":[],"mappings":";;;;;AAAA,2CAA2C;AAC3C,iFAAsD;AACtD,+EAAoD;AACpD,0CAA6C;AAE7C;;;GAGG;AAEH;;;;;;;;GAQG;AAEH;;;;;;;GAOG;AACH,MAAqB,SAAU,SAAQ,6BAAgB;IACrD,IAAI,GAAG,WAAW,CAAC;IAEnB,KAAK,CAAC,KAAK;QACT,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;IAC5C,CAAC;IAED,QAAQ,CAAC,UAAU,GAAG,EAAE,EAAE,WAAW,GAAG,EAAE;QACxC,MAAM,EACJ,WAAW,GAAG;YACZ,MAAM,EAAE,sCAAsC;YAC9C,OAAO,EAAE,uCAAuC;SACjD,EACD,WAAW,GAAG;YACZ,MAAM,EAAE,sCAAsC;YAC9C,OAAO,EAAE,uCAAuC;SACjD,EACD,GAAG,EACH,GAAG,GACJ,GAAG,IAAI,CAAC,MAAM,CAAC;QAEhB,IAAI,QAAQ,CAAC;QACb,IAAI,KAAK,GAAG,IAAI,CAAC;QAEjB,IACE,OAAO,GAAG,KAAK,WAAW;YAC1B,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,GAAG,EAC7C,CAAC;YACD,KAAK,GAAG,KAAK,CAAC;YACd,QAAQ,GAAG,WAAW,CAAC;QACzB,CAAC;QAED,IACE,OAAO,GAAG,KAAK,WAAW;YAC1B,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,GAAG,EAC7C,CAAC;YACD,KAAK,GAAG,KAAK,CAAC;YACd,QAAQ,GAAG,WAAW,CAAC;QACzB,CAAC;QAED,OAAO,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,4BAAe,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,QAAQ,CAAC,KAAK;QACZ,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO,IAAA,yBAAc,EAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAjDD,4BAiDC"}
|
package/dist/middleware/csrf.js
CHANGED
|
@@ -12,8 +12,10 @@ function csrfMiddleware() {
|
|
|
12
12
|
return [
|
|
13
13
|
csrfSynchronisedProtection,
|
|
14
14
|
(req, res, next) => {
|
|
15
|
-
|
|
16
|
-
|
|
15
|
+
res.locals.casa = {
|
|
16
|
+
...res.locals?.casa,
|
|
17
|
+
csrfToken: req.csrfToken(),
|
|
18
|
+
};
|
|
17
19
|
next();
|
|
18
20
|
},
|
|
19
21
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"csrf.js","sourceRoot":"","sources":["../../src/middleware/csrf.js"],"names":[],"mappings":";;AAMA,iCAcC;AApBD,yCAAqC;AAErC,4EAA4E;AAC5E,6EAA6E;AAC7E,YAAY;AAEZ,SAAwB,cAAc;IACpC,MAAM,EAAE,0BAA0B,EAAE,GAAG,IAAA,oBAAQ,EAAC;QAC9C,mBAAmB,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK;KAC7C,CAAC,CAAC;IACH,OAAO;QACL,0BAA0B;QAC1B,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"csrf.js","sourceRoot":"","sources":["../../src/middleware/csrf.js"],"names":[],"mappings":";;AAMA,iCAcC;AApBD,yCAAqC;AAErC,4EAA4E;AAC5E,6EAA6E;AAC7E,YAAY;AAEZ,SAAwB,cAAc;IACpC,MAAM,EAAE,0BAA0B,EAAE,GAAG,IAAA,oBAAQ,EAAC;QAC9C,mBAAmB,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK;KAC7C,CAAC,CAAC;IACH,OAAO;QACL,0BAA0B;QAC1B,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACjB,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG;gBAChB,GAAG,GAAG,CAAC,MAAM,EAAE,IAAI;gBACnB,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE;aAC3B,CAAC;YACF,IAAI,EAAE,CAAC;QACT,CAAC;KACF,CAAC;AACJ,CAAC"}
|