@dwp/govuk-casa 9.4.0 → 9.4.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.
- package/dist/casa.js +17 -7
- package/dist/casa.js.map +1 -1
- package/dist/core-plugins/edit-snapshot/src/configure.d.ts +6 -1
- package/dist/core-plugins/edit-snapshot/src/configure.js +8 -0
- package/dist/core-plugins/edit-snapshot/src/configure.js.map +1 -1
- package/dist/core-plugins/edit-snapshot/src/post-steer-hook.js.map +1 -1
- package/dist/core-plugins/edit-snapshot/src/pre-steer-hook.js.map +1 -1
- package/dist/core-plugins/edit-snapshot/src/utils.js +4 -2
- package/dist/core-plugins/edit-snapshot/src/utils.js.map +1 -1
- package/dist/lib/CasaTemplateLoader.js +0 -1
- package/dist/lib/CasaTemplateLoader.js.map +1 -1
- package/dist/lib/JourneyContext.d.ts +10 -6
- package/dist/lib/JourneyContext.js +11 -9
- package/dist/lib/JourneyContext.js.map +1 -1
- package/dist/lib/MutableRouter.d.ts +1 -1
- package/dist/lib/MutableRouter.js +0 -1
- package/dist/lib/MutableRouter.js.map +1 -1
- package/dist/lib/Plan.d.ts +3 -3
- package/dist/lib/ValidationError.d.ts +1 -1
- package/dist/lib/ValidationError.js +1 -1
- package/dist/lib/ValidatorFactory.js +0 -3
- package/dist/lib/ValidatorFactory.js.map +1 -1
- package/dist/lib/configuration-ingestor.d.ts +75 -14
- package/dist/lib/configuration-ingestor.js +119 -26
- package/dist/lib/configuration-ingestor.js.map +1 -1
- package/dist/lib/configure.js.map +1 -1
- package/dist/lib/context-id-generators.js +1 -1
- package/dist/lib/context-id-generators.js.map +1 -1
- package/dist/lib/field.d.ts +8 -8
- package/dist/lib/field.js +6 -10
- package/dist/lib/field.js.map +1 -1
- package/dist/lib/index.js +17 -7
- package/dist/lib/index.js.map +1 -1
- package/dist/lib/nunjucks-filters.d.ts +5 -1
- package/dist/lib/nunjucks-filters.js +13 -1
- package/dist/lib/nunjucks-filters.js.map +1 -1
- package/dist/lib/utils.js +8 -5
- package/dist/lib/utils.js.map +1 -1
- package/dist/lib/validators/dateObject.d.ts +1 -1
- package/dist/lib/validators/dateObject.js +0 -2
- package/dist/lib/validators/dateObject.js.map +1 -1
- package/dist/lib/validators/email.js +1 -2
- package/dist/lib/validators/email.js.map +1 -1
- package/dist/lib/validators/inArray.js +0 -1
- package/dist/lib/validators/inArray.js.map +1 -1
- package/dist/lib/validators/nino.js +0 -1
- package/dist/lib/validators/nino.js.map +1 -1
- package/dist/lib/validators/postalAddressObject.js +5 -5
- package/dist/lib/validators/postalAddressObject.js.map +1 -1
- package/dist/lib/validators/range.js +0 -1
- package/dist/lib/validators/range.js.map +1 -1
- package/dist/lib/validators/regex.js +0 -1
- package/dist/lib/validators/regex.js.map +1 -1
- package/dist/lib/validators/required.js +0 -1
- package/dist/lib/validators/required.js.map +1 -1
- package/dist/lib/validators/strlen.js +0 -1
- package/dist/lib/validators/strlen.js.map +1 -1
- package/dist/lib/validators/wordCount.js +0 -1
- package/dist/lib/validators/wordCount.js.map +1 -1
- package/dist/lib/waypoint-url.d.ts +4 -5
- package/dist/lib/waypoint-url.js +4 -5
- package/dist/lib/waypoint-url.js.map +1 -1
- package/dist/middleware/body-parser.d.ts +26 -4
- package/dist/middleware/body-parser.js +31 -0
- package/dist/middleware/body-parser.js.map +1 -1
- package/dist/middleware/csrf.d.ts +15 -1
- package/dist/middleware/csrf.js +13 -3
- package/dist/middleware/csrf.js.map +1 -1
- package/dist/middleware/data.d.ts +21 -4
- package/dist/middleware/data.js +33 -4
- package/dist/middleware/data.js.map +1 -1
- package/dist/middleware/gather-fields.js +1 -1
- package/dist/middleware/i18n.d.ts +11 -2
- package/dist/middleware/i18n.js +14 -3
- package/dist/middleware/i18n.js.map +1 -1
- package/dist/middleware/post.d.ts +3 -1
- package/dist/middleware/post.js +5 -0
- package/dist/middleware/post.js.map +1 -1
- package/dist/middleware/session.d.ts +27 -8
- package/dist/middleware/session.js +39 -12
- package/dist/middleware/session.js.map +1 -1
- package/dist/routes/journey.js +2 -3
- package/dist/routes/journey.js.map +1 -1
- package/package.json +27 -30
- package/src/core-plugins/edit-snapshot/src/configure.js +19 -7
- package/src/core-plugins/edit-snapshot/src/post-steer-hook.js +3 -1
- package/src/core-plugins/edit-snapshot/src/pre-steer-hook.js +14 -4
- package/src/core-plugins/edit-snapshot/src/utils.js +19 -7
- package/src/lib/CasaTemplateLoader.js +0 -1
- package/src/lib/JourneyContext.js +16 -11
- package/src/lib/MutableRouter.js +0 -1
- package/src/lib/ValidationError.js +1 -1
- package/src/lib/ValidatorFactory.js +0 -3
- package/src/lib/configuration-ingestor.js +116 -19
- package/src/lib/configure.js +2 -2
- package/src/lib/context-id-generators.js +1 -1
- package/src/lib/field.js +7 -10
- package/src/lib/nunjucks-filters.js +15 -1
- package/src/lib/utils.js +9 -5
- package/src/lib/validators/dateObject.js +1 -2
- package/src/lib/validators/email.js +1 -2
- package/src/lib/validators/inArray.js +0 -1
- package/src/lib/validators/nino.js +0 -1
- package/src/lib/validators/postalAddressObject.js +5 -5
- package/src/lib/validators/range.js +0 -2
- package/src/lib/validators/regex.js +0 -1
- package/src/lib/validators/required.js +0 -1
- package/src/lib/validators/strlen.js +0 -1
- package/src/lib/validators/wordCount.js +0 -1
- package/src/lib/waypoint-url.js +4 -5
- package/src/middleware/body-parser.js +34 -0
- package/src/middleware/csrf.js +13 -3
- package/src/middleware/data.js +37 -5
- package/src/middleware/gather-fields.js +1 -1
- package/src/middleware/i18n.js +15 -3
- package/src/middleware/post.js +6 -0
- package/src/middleware/session.js +24 -5
- package/src/routes/journey.js +6 -4
- package/src/core-plugins/edit-snapshot/readme.md +0 -19
- package/src/core-plugins/readme.md +0 -3
package/dist/lib/utils.js
CHANGED
|
@@ -57,7 +57,6 @@ function isStringable(value) {
|
|
|
57
57
|
* @access private
|
|
58
58
|
*/
|
|
59
59
|
function resolveMiddlewareHooks(hookName, path, hooks = []) {
|
|
60
|
-
/* eslint-disable-next-line max-len */
|
|
61
60
|
const pathMatch = (h) => h.path === undefined ||
|
|
62
61
|
(h.path instanceof RegExp && h.path.test(path)) ||
|
|
63
62
|
h.path === path;
|
|
@@ -118,10 +117,14 @@ function stripWhitespace(value, options) {
|
|
|
118
117
|
if (typeof opts.nested !== "string") {
|
|
119
118
|
throw new TypeError("nested must be a string");
|
|
120
119
|
}
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
120
|
+
// This approach avoids using `/s+$/` regex, which triggers the
|
|
121
|
+
// `sonarjs/slow-regex` eslint rule
|
|
122
|
+
let newValue = value.replace(/^\s+/, opts.leading);
|
|
123
|
+
if (newValue.match(/\s$/)) {
|
|
124
|
+
newValue = `${newValue.trimEnd()}${opts.trailing}`;
|
|
125
|
+
}
|
|
126
|
+
newValue = newValue.replace(/\s+/g, opts.nested);
|
|
127
|
+
return newValue;
|
|
125
128
|
}
|
|
126
129
|
/* ------------------------------------------------ validation / sanitisation */
|
|
127
130
|
/**
|
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,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/lib/utils.js"],"names":[],"mappings":";AAAA;;;GAGG;;AASH,0BAcC;AASD,oCAEC;AAYD,wDASC;AAUD,wCAOC;AAQD,oDAEC;AAWD,0CAiCC;AAYD,4BASC;AAWD,4CAcC;AAUD,4CAIC;AAWD,0CAgBC;AAWD,oCAcC;AAWD,4CAcC;AArQD;;;;;;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,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,GAAG;QACX,OAAO,EAAE,EAAE;QACX,QAAQ,EAAE,EAAE;QACZ,MAAM,EAAE,GAAG;QACX,GAAG,OAAO;KACX,CAAC;IAEF,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,MAAM,IAAI,SAAS,CAAC,wBAAwB,CAAC,CAAC;IAChD,CAAC;IAED,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;QACrC,MAAM,IAAI,SAAS,CAAC,0BAA0B,CAAC,CAAC;IAClD,CAAC;IAED,IAAI,OAAO,IAAI,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACtC,MAAM,IAAI,SAAS,CAAC,2BAA2B,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QACpC,MAAM,IAAI,SAAS,CAAC,yBAAyB,CAAC,CAAC;IACjD,CAAC;IAED,+DAA+D;IAC/D,mCAAmC;IACnC,IAAI,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACnD,IAAI,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1B,QAAQ,GAAG,GAAG,QAAQ,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;IACrD,CAAC;IACD,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAEjD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,gFAAgF;AAEhF;;;;;;;GAOG;AACH,SAAgB,QAAQ,CAAC,GAAG;IAC1B,IACE,CAAC,WAAW,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC,QAAQ,CAChD,MAAM,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAC1B,EACD,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;IAC7D,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;;;;GAQG;AACH,SAAgB,gBAAgB,CAAC,QAAQ;IACvC,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACjC,MAAM,IAAI,SAAS,CAAC,4BAA4B,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;QACrB,MAAM,IAAI,WAAW,CAAC,6BAA6B,CAAC,CAAC;IACvD,CAAC;IAED,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,wBAAwB,CAAC,EAAE,CAAC;QAC9C,MAAM,IAAI,WAAW,CACnB,sEAAsE,CACvE,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,SAAgB,gBAAgB,CAAC,IAAI;IACnC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,YAAY,MAAM,CAAC,EAAE,CAAC;QAC1D,MAAM,IAAI,SAAS,CAAC,sCAAsC,CAAC,CAAC;IAC9D,CAAC;AACH,CAAC;AAED;;;;;;;;GAQG;AACH,SAAgB,eAAe,CAAC,IAAI;IAClC,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,MAAM,IAAI,SAAS,CAAC,2BAA2B,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,WAAW,CACnB,4DAA4D,CAC7D,CAAC;IACJ,CAAC;IAED,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,WAAW,CAAC,yCAAyC,CAAC,CAAC;IACnE,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;;GAQG;AACH,SAAgB,YAAY,CAAC,IAAI;IAC/B,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,MAAM,IAAI,SAAS,CAAC,uBAAuB,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACjB,MAAM,IAAI,WAAW,CAAC,wBAAwB,CAAC,CAAC;IAClD,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,EAAE,CAAC;QACxC,MAAM,IAAI,WAAW,CACnB,yEAAyE,CAC1E,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;;;;;;GAQG;AACH,SAAgB,gBAAgB,CAAC,QAAQ;IACvC,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACjC,MAAM,IAAI,SAAS,CAAC,2BAA2B,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;QACrB,MAAM,IAAI,WAAW,CAAC,4BAA4B,CAAC,CAAC;IACtD,CAAC;IAED,IAAI,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC;QACnC,MAAM,IAAI,WAAW,CACnB,4DAA4D,CAC7D,CAAC;IACJ,CAAC;AACH,CAAC"}
|
|
@@ -80,7 +80,7 @@ export type DateObjectConfigOptions = {
|
|
|
80
80
|
* Override the notion of "now" (useful for
|
|
81
81
|
* testing). Default is `false`
|
|
82
82
|
*/
|
|
83
|
-
now?:
|
|
83
|
+
now?: DateTime;
|
|
84
84
|
};
|
|
85
85
|
import ValidatorFactory from "../ValidatorFactory.js";
|
|
86
86
|
import ValidationError from "../ValidationError.js";
|
|
@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
/* eslint-disable class-methods-use-this */
|
|
7
6
|
const luxon_1 = require("luxon");
|
|
8
7
|
const lodash_1 = __importDefault(require("lodash"));
|
|
9
8
|
const ValidationError_js_1 = __importDefault(require("../ValidationError.js"));
|
|
@@ -101,7 +100,6 @@ class DateObject extends ValidatorFactory_js_1.default {
|
|
|
101
100
|
formats = [...formats, ...test.formats];
|
|
102
101
|
}
|
|
103
102
|
}
|
|
104
|
-
;
|
|
105
103
|
if (typeof value === "object") {
|
|
106
104
|
formats.find((format) => {
|
|
107
105
|
luxonDate = luxon_1.DateTime.fromFormat([value.dd, value.mm, value.yyyy].join("-"), format).startOf("day");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dateObject.js","sourceRoot":"","sources":["../../../src/lib/validators/dateObject.js"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"dateObject.js","sourceRoot":"","sources":["../../../src/lib/validators/dateObject.js"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
/* eslint-disable class-methods-use-this */
|
|
7
6
|
const validator_1 = __importDefault(require("validator"));
|
|
8
7
|
const ValidationError_js_1 = __importDefault(require("../ValidationError.js"));
|
|
9
8
|
const ValidatorFactory_js_1 = __importDefault(require("../ValidatorFactory.js"));
|
|
@@ -35,7 +34,7 @@ class Email extends ValidatorFactory_js_1.default {
|
|
|
35
34
|
try {
|
|
36
35
|
isValid = isEmail(value);
|
|
37
36
|
}
|
|
38
|
-
catch
|
|
37
|
+
catch {
|
|
39
38
|
isValid = false;
|
|
40
39
|
}
|
|
41
40
|
const errorMsg = this.config.errorMsg || {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"email.js","sourceRoot":"","sources":["../../../src/lib/validators/email.js"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"email.js","sourceRoot":"","sources":["../../../src/lib/validators/email.js"],"names":[],"mappings":";;;;;AAAA,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,MAAM,CAAC;YACP,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"}
|
|
@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
/* eslint-disable class-methods-use-this */
|
|
7
6
|
/**
|
|
8
7
|
* Test if a value is present in an array.
|
|
9
8
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inArray.js","sourceRoot":"","sources":["../../../src/lib/validators/inArray.js"],"names":[],"mappings":";;;;;AAAA
|
|
1
|
+
{"version":3,"file":"inArray.js","sourceRoot":"","sources":["../../../src/lib/validators/inArray.js"],"names":[],"mappings":";;;;;AAAA;;;;;;;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"}
|
|
@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
/* eslint-disable class-methods-use-this */
|
|
7
6
|
const ValidationError_js_1 = __importDefault(require("../ValidationError.js"));
|
|
8
7
|
const ValidatorFactory_js_1 = __importDefault(require("../ValidatorFactory.js"));
|
|
9
8
|
const utils_js_1 = require("../utils.js");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nino.js","sourceRoot":"","sources":["../../../src/lib/validators/nino.js"],"names":[],"mappings":";;;;;AAAA
|
|
1
|
+
{"version":3,"file":"nino.js","sourceRoot":"","sources":["../../../src/lib/validators/nino.js"],"names":[],"mappings":";;;;;AAAA,+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"}
|
|
@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
/* eslint-disable class-methods-use-this */
|
|
7
6
|
const lodash_1 = __importDefault(require("lodash"));
|
|
8
7
|
const ValidationError_js_1 = __importDefault(require("../ValidationError.js"));
|
|
9
8
|
const ValidatorFactory_js_1 = __importDefault(require("../ValidatorFactory.js"));
|
|
@@ -82,7 +81,6 @@ class PostalAddressObject extends ValidatorFactory_js_1.default {
|
|
|
82
81
|
},
|
|
83
82
|
...this.config,
|
|
84
83
|
};
|
|
85
|
-
/* eslint-disable-next-line require-jsdoc */
|
|
86
84
|
const objectifyError = (err) => typeof err === "string"
|
|
87
85
|
? {
|
|
88
86
|
inline: err,
|
|
@@ -100,11 +98,13 @@ class PostalAddressObject extends ValidatorFactory_js_1.default {
|
|
|
100
98
|
let valid = true;
|
|
101
99
|
const errorMsgs = [];
|
|
102
100
|
if (typeof value === "object") {
|
|
103
|
-
const reAddr = /^[
|
|
104
|
-
const reAddrLine1 =
|
|
101
|
+
const reAddr = /^[a-z0-9\-,.&#()/\\:;'" ]{2,}$/i;
|
|
102
|
+
const reAddrLine1 = /^(\d+|[a-z0-9\-,.&#()/\\:;'" ]{2,})$/i;
|
|
105
103
|
// UK Postcode regex taken from the dwp java pc checker
|
|
106
104
|
// https://github.com/dwp/postcode-format-validation
|
|
107
|
-
|
|
105
|
+
/* eslint-disable sonarjs/regex-complexity */
|
|
106
|
+
const rePostcode = /^(?![QVX])[A-Z]((?![IJZ])[A-Z]\d((\d?)|([ABEHMNPRVWXY]?))|(\d(\d?|[ABCDEFGHJKPSTUW]?))) ?\d((?![CIKMOV])[A-Z]){2}$|^(BFPO) ?\d{1,4}$/i;
|
|
107
|
+
/* eslint-enable sonarjs/regex-complexity */
|
|
108
108
|
// [required, regex, strlenmax, error message]
|
|
109
109
|
const attributes = {
|
|
110
110
|
address1: [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postalAddressObject.js","sourceRoot":"","sources":["../../../src/lib/validators/postalAddressObject.js"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"postalAddressObject.js","sourceRoot":"","sources":["../../../src/lib/validators/postalAddressObject.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"range.js","sourceRoot":"","sources":["../../../src/lib/validators/range.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"range.js","sourceRoot":"","sources":["../../../src/lib/validators/range.js"],"names":[],"mappings":";;;;;AAAA,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"}
|
|
@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
/* eslint-disable class-methods-use-this */
|
|
7
6
|
const ValidatorFactory_js_1 = __importDefault(require("../ValidatorFactory.js"));
|
|
8
7
|
const ValidationError_js_1 = __importDefault(require("../ValidationError.js"));
|
|
9
8
|
const utils_js_1 = require("../utils.js");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"regex.js","sourceRoot":"","sources":["../../../src/lib/validators/regex.js"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"regex.js","sourceRoot":"","sources":["../../../src/lib/validators/regex.js"],"names":[],"mappings":";;;;;AAAA,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"}
|
|
@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
/* eslint-disable class-methods-use-this */
|
|
7
6
|
const lodash_1 = __importDefault(require("lodash"));
|
|
8
7
|
const utils_js_1 = require("../utils.js");
|
|
9
8
|
const ValidatorFactory_js_1 = __importDefault(require("../ValidatorFactory.js"));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"required.js","sourceRoot":"","sources":["../../../src/lib/validators/required.js"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"required.js","sourceRoot":"","sources":["../../../src/lib/validators/required.js"],"names":[],"mappings":";;;;;AAAA,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"}
|
|
@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
/* eslint-disable class-methods-use-this */
|
|
7
6
|
const ValidatorFactory_js_1 = __importDefault(require("../ValidatorFactory.js"));
|
|
8
7
|
const ValidationError_js_1 = __importDefault(require("../ValidationError.js"));
|
|
9
8
|
const utils_js_1 = require("../utils.js");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strlen.js","sourceRoot":"","sources":["../../../src/lib/validators/strlen.js"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"strlen.js","sourceRoot":"","sources":["../../../src/lib/validators/strlen.js"],"names":[],"mappings":";;;;;AAAA,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"}
|
|
@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
/* eslint-disable class-methods-use-this */
|
|
7
6
|
const ValidatorFactory_js_1 = __importDefault(require("../ValidatorFactory.js"));
|
|
8
7
|
const ValidationError_js_1 = __importDefault(require("../ValidationError.js"));
|
|
9
8
|
const utils_js_1 = require("../utils.js");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wordCount.js","sourceRoot":"","sources":["../../../src/lib/validators/wordCount.js"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"wordCount.js","sourceRoot":"","sources":["../../../src/lib/validators/wordCount.js"],"names":[],"mappings":";;;;;AAAA,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"}
|
|
@@ -12,14 +12,13 @@
|
|
|
12
12
|
* });
|
|
13
13
|
*
|
|
14
14
|
* @param {object} obj Options
|
|
15
|
-
* @param {string} [obj.waypoint
|
|
16
|
-
* @param {string} [obj.mountUrl
|
|
15
|
+
* @param {string} [obj.waypoint] Waypoint. Default is `""`
|
|
16
|
+
* @param {string} [obj.mountUrl] Mount URL. Default is `"/"`
|
|
17
17
|
* @param {JourneyContext} [obj.journeyContext] JourneyContext
|
|
18
|
-
* @param {boolean} [obj.edit
|
|
19
|
-
* `false`
|
|
18
|
+
* @param {boolean} [obj.edit] Turn edit mode on or off. Default is `false`
|
|
20
19
|
* @param {string} [obj.editOrigin] Edit mode original URL
|
|
21
20
|
* @param {boolean} [obj.skipTo] Skip to this waypoint from the current one
|
|
22
|
-
* @param {string} [obj.routeName
|
|
21
|
+
* @param {string} [obj.routeName] Plan route name; next | prev. Default is
|
|
23
22
|
* `next`
|
|
24
23
|
* @returns {string} URL
|
|
25
24
|
*/
|
package/dist/lib/waypoint-url.js
CHANGED
|
@@ -54,14 +54,13 @@ const sanitiseWaypointWithAllowedParams = (w) => {
|
|
|
54
54
|
* });
|
|
55
55
|
*
|
|
56
56
|
* @param {object} obj Options
|
|
57
|
-
* @param {string} [obj.waypoint
|
|
58
|
-
* @param {string} [obj.mountUrl
|
|
57
|
+
* @param {string} [obj.waypoint] Waypoint. Default is `""`
|
|
58
|
+
* @param {string} [obj.mountUrl] Mount URL. Default is `"/"`
|
|
59
59
|
* @param {JourneyContext} [obj.journeyContext] JourneyContext
|
|
60
|
-
* @param {boolean} [obj.edit
|
|
61
|
-
* `false`
|
|
60
|
+
* @param {boolean} [obj.edit] Turn edit mode on or off. Default is `false`
|
|
62
61
|
* @param {string} [obj.editOrigin] Edit mode original URL
|
|
63
62
|
* @param {boolean} [obj.skipTo] Skip to this waypoint from the current one
|
|
64
|
-
* @param {string} [obj.routeName
|
|
63
|
+
* @param {string} [obj.routeName] Plan route name; next | prev. Default is
|
|
65
64
|
* `next`
|
|
66
65
|
* @returns {string} URL
|
|
67
66
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"waypoint-url.js","sourceRoot":"","sources":["../../src/lib/waypoint-url.js"],"names":[],"mappings":";AAAA;;;GAGG;;
|
|
1
|
+
{"version":3,"file":"waypoint-url.js","sourceRoot":"","sources":["../../src/lib/waypoint-url.js"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,27 @@
|
|
|
1
|
-
|
|
1
|
+
/**
|
|
2
|
+
* Verify request body.
|
|
3
|
+
*
|
|
4
|
+
* @param {Request} req HTTP request
|
|
5
|
+
* @param {Response} res HTTP response
|
|
6
|
+
* @param {Buffer} buf Buffer
|
|
7
|
+
* @param {string} encoding Character encoding
|
|
8
|
+
* @returns {void}
|
|
9
|
+
* @throws {Error} For invalid bodies
|
|
10
|
+
*/
|
|
11
|
+
export function verifyBody(req: Request, res: Response, buf: Buffer, encoding: string): void;
|
|
12
|
+
/**
|
|
13
|
+
* Body parsing middleware.
|
|
14
|
+
*
|
|
15
|
+
* @param {object} opts Options
|
|
16
|
+
* @param {number} opts.formMaxParams Max number of parameters that should be
|
|
17
|
+
* parsed
|
|
18
|
+
* @param {number} opts.formMaxBytes Max bytes that should be read
|
|
19
|
+
* @returns {RequestHandler[]} Middleware functions
|
|
20
|
+
*/
|
|
2
21
|
export default function bodyParserMiddleware({ formMaxParams, formMaxBytes }: {
|
|
3
|
-
formMaxParams:
|
|
4
|
-
formMaxBytes:
|
|
5
|
-
}):
|
|
22
|
+
formMaxParams: number;
|
|
23
|
+
formMaxBytes: number;
|
|
24
|
+
}): RequestHandler[];
|
|
25
|
+
export type RequestHandler = import("express").RequestHandler;
|
|
26
|
+
export type Request = import("express").Request;
|
|
27
|
+
export type Response = import("express").Response;
|
|
@@ -3,9 +3,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.verifyBody = verifyBody;
|
|
4
4
|
exports.default = bodyParserMiddleware;
|
|
5
5
|
const express_1 = require("express");
|
|
6
|
+
/**
|
|
7
|
+
* @typedef {import("express").RequestHandler} RequestHandler
|
|
8
|
+
* @access private
|
|
9
|
+
*/
|
|
10
|
+
/**
|
|
11
|
+
* @typedef {import("express").Request} Request
|
|
12
|
+
* @access private
|
|
13
|
+
*/
|
|
14
|
+
/**
|
|
15
|
+
* @typedef {import("express").Response} Response
|
|
16
|
+
* @access private
|
|
17
|
+
*/
|
|
6
18
|
const rProto = /__proto__/i;
|
|
7
19
|
const rPrototype = /prototype[='"[\]]/i;
|
|
8
20
|
const rConstructor = /constructor[='"[\]]/i;
|
|
21
|
+
/**
|
|
22
|
+
* Verify request body.
|
|
23
|
+
*
|
|
24
|
+
* @param {Request} req HTTP request
|
|
25
|
+
* @param {Response} res HTTP response
|
|
26
|
+
* @param {Buffer} buf Buffer
|
|
27
|
+
* @param {string} encoding Character encoding
|
|
28
|
+
* @returns {void}
|
|
29
|
+
* @throws {Error} For invalid bodies
|
|
30
|
+
*/
|
|
9
31
|
function verifyBody(req, res, buf, encoding) {
|
|
10
32
|
const body = decodeURI(buf.toString(encoding)).replace(/[\s\u200B-\u200D\uFEFF]/g, "");
|
|
11
33
|
if (rProto.test(body)) {
|
|
@@ -18,6 +40,15 @@ function verifyBody(req, res, buf, encoding) {
|
|
|
18
40
|
throw new Error("Request body verification failed (constructor)");
|
|
19
41
|
}
|
|
20
42
|
}
|
|
43
|
+
/**
|
|
44
|
+
* Body parsing middleware.
|
|
45
|
+
*
|
|
46
|
+
* @param {object} opts Options
|
|
47
|
+
* @param {number} opts.formMaxParams Max number of parameters that should be
|
|
48
|
+
* parsed
|
|
49
|
+
* @param {number} opts.formMaxBytes Max bytes that should be read
|
|
50
|
+
* @returns {RequestHandler[]} Middleware functions
|
|
51
|
+
*/
|
|
21
52
|
function bodyParserMiddleware({ formMaxParams, formMaxBytes }) {
|
|
22
53
|
return [
|
|
23
54
|
(0, express_1.urlencoded)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"body-parser.js","sourceRoot":"","sources":["../../src/middleware/body-parser.js"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"body-parser.js","sourceRoot":"","sources":["../../src/middleware/body-parser.js"],"names":[],"mappings":";;AA+BA,gCAcC;AAWD,uCAWC;AAnED,qCAA0D;AAE1D;;;GAGG;AAEH;;;GAGG;AAEH;;;GAGG;AAEH,MAAM,MAAM,GAAG,YAAY,CAAC;AAC5B,MAAM,UAAU,GAAG,oBAAoB,CAAC;AACxC,MAAM,YAAY,GAAG,sBAAsB,CAAC;AAE5C;;;;;;;;;GASG;AACH,SAAgB,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ;IAChD,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CACpD,0BAA0B,EAC1B,EAAE,CACH,CAAC;IACF,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;IACD,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;IACD,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;IACpE,CAAC;AACH,CAAC;AAED;;;;;;;;GAQG;AACH,SAAwB,oBAAoB,CAAC,EAAE,aAAa,EAAE,YAAY,EAAE;IAC1E,OAAO;QACL,IAAA,oBAAiB,EAAC;YAChB,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,mCAAmC;YACzC,OAAO,EAAE,IAAI;YACb,cAAc,EAAE,aAAa;YAC7B,KAAK,EAAE,YAAY;YACnB,MAAM,EAAE,UAAU;SACnB,CAAC;KACH,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1,15 @@
|
|
|
1
|
-
|
|
1
|
+
/**
|
|
2
|
+
* @typedef {import("express").RequestHandler} RequestHandler
|
|
3
|
+
* @access private
|
|
4
|
+
*/
|
|
5
|
+
/**
|
|
6
|
+
* Data middleware.
|
|
7
|
+
*
|
|
8
|
+
* 2 middleware: one to generate the csrf token and check its validity (POST
|
|
9
|
+
* only), and one to provide that token to templates via the `casa.csrfToken`
|
|
10
|
+
* variable.
|
|
11
|
+
*
|
|
12
|
+
* @returns {RequestHandler[]} Middleware functions
|
|
13
|
+
*/
|
|
14
|
+
export default function csrfMiddleware(): RequestHandler[];
|
|
15
|
+
export type RequestHandler = import("express").RequestHandler;
|
package/dist/middleware/csrf.js
CHANGED
|
@@ -2,9 +2,19 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.default = csrfMiddleware;
|
|
4
4
|
const csrf_sync_1 = require("csrf-sync");
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
5
|
+
/**
|
|
6
|
+
* @typedef {import("express").RequestHandler} RequestHandler
|
|
7
|
+
* @access private
|
|
8
|
+
*/
|
|
9
|
+
/**
|
|
10
|
+
* Data middleware.
|
|
11
|
+
*
|
|
12
|
+
* 2 middleware: one to generate the csrf token and check its validity (POST
|
|
13
|
+
* only), and one to provide that token to templates via the `casa.csrfToken`
|
|
14
|
+
* variable.
|
|
15
|
+
*
|
|
16
|
+
* @returns {RequestHandler[]} Middleware functions
|
|
17
|
+
*/
|
|
8
18
|
function csrfMiddleware() {
|
|
9
19
|
const { csrfSynchronisedProtection } = (0, csrf_sync_1.csrfSync)({
|
|
10
20
|
getTokenFromRequest: (req) => req.body._csrf,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"csrf.js","sourceRoot":"","sources":["../../src/middleware/csrf.js"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"csrf.js","sourceRoot":"","sources":["../../src/middleware/csrf.js"],"names":[],"mappings":";;AAgBA,iCAcC;AA9BD,yCAAqC;AAErC;;;GAGG;AAEH;;;;;;;;GAQG;AACH,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"}
|
|
@@ -1,5 +1,22 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Data middleware.
|
|
3
|
+
*
|
|
4
|
+
* Decorates the request with some contextual data about the user's journey
|
|
5
|
+
* through the application. This is used by downstream middleware and
|
|
6
|
+
* templates.
|
|
7
|
+
*
|
|
8
|
+
* @param {object} opts Options
|
|
9
|
+
* @param {Plan} opts.plan CASA Plan
|
|
10
|
+
* @param {ContextEventHandler[]} opts.events Event handlers
|
|
11
|
+
* @param {ContextIdGenerator} opts.contextIdGenerator Content ID generator
|
|
12
|
+
* @returns {RequestHandler[]} Middleware functions
|
|
13
|
+
*/
|
|
1
14
|
export default function dataMiddleware({ plan, events, contextIdGenerator }: {
|
|
2
|
-
plan:
|
|
3
|
-
events:
|
|
4
|
-
contextIdGenerator:
|
|
5
|
-
}):
|
|
15
|
+
plan: Plan;
|
|
16
|
+
events: ContextEventHandler[];
|
|
17
|
+
contextIdGenerator: ContextIdGenerator;
|
|
18
|
+
}): RequestHandler[];
|
|
19
|
+
export type RequestHandler = import("express").RequestHandler;
|
|
20
|
+
export type Plan = import("../casa.js").Plan;
|
|
21
|
+
export type ContextEventHandler = import("../casa.js").ContextEventHandler;
|
|
22
|
+
export type ContextIdGenerator = import("../casa.js").ContextIdGenerator;
|
package/dist/middleware/data.js
CHANGED
|
@@ -1,6 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
// Decorates the request with some contextual data about the user's journey
|
|
3
|
-
// through the application. This is used by downstream middleware and templates.
|
|
4
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
5
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
6
4
|
};
|
|
@@ -9,6 +7,22 @@ exports.default = dataMiddleware;
|
|
|
9
7
|
const JourneyContext_js_1 = __importDefault(require("../lib/JourneyContext.js"));
|
|
10
8
|
const utils_js_1 = require("../lib/utils.js");
|
|
11
9
|
const waypoint_url_js_1 = __importDefault(require("../lib/waypoint-url.js"));
|
|
10
|
+
/**
|
|
11
|
+
* @typedef {import("express").RequestHandler} RequestHandler
|
|
12
|
+
* @access private
|
|
13
|
+
*/
|
|
14
|
+
/**
|
|
15
|
+
* @typedef {import("../casa.js").Plan} Plan
|
|
16
|
+
* @access private
|
|
17
|
+
*/
|
|
18
|
+
/**
|
|
19
|
+
* @typedef {import("../casa.js").ContextEventHandler} ContextEventHandler
|
|
20
|
+
* @access private
|
|
21
|
+
*/
|
|
22
|
+
/**
|
|
23
|
+
* @typedef {import("../casa.js").ContextIdGenerator} ContextIdGenerator
|
|
24
|
+
* @access private
|
|
25
|
+
*/
|
|
12
26
|
const editOrigin = (req) => {
|
|
13
27
|
if (Object.hasOwn(req.query, "editorigin")) {
|
|
14
28
|
return (0, waypoint_url_js_1.default)({ waypoint: req.query.editorigin });
|
|
@@ -18,6 +32,19 @@ const editOrigin = (req) => {
|
|
|
18
32
|
}
|
|
19
33
|
return "";
|
|
20
34
|
};
|
|
35
|
+
/**
|
|
36
|
+
* Data middleware.
|
|
37
|
+
*
|
|
38
|
+
* Decorates the request with some contextual data about the user's journey
|
|
39
|
+
* through the application. This is used by downstream middleware and
|
|
40
|
+
* templates.
|
|
41
|
+
*
|
|
42
|
+
* @param {object} opts Options
|
|
43
|
+
* @param {Plan} opts.plan CASA Plan
|
|
44
|
+
* @param {ContextEventHandler[]} opts.events Event handlers
|
|
45
|
+
* @param {ContextIdGenerator} opts.contextIdGenerator Content ID generator
|
|
46
|
+
* @returns {RequestHandler[]} Middleware functions
|
|
47
|
+
*/
|
|
21
48
|
function dataMiddleware({ plan, events, contextIdGenerator }) {
|
|
22
49
|
return [
|
|
23
50
|
(req, res, next) => {
|
|
@@ -31,8 +58,10 @@ function dataMiddleware({ plan, events, contextIdGenerator }) {
|
|
|
31
58
|
// `contextid` request parameter
|
|
32
59
|
journeyContext: JourneyContext_js_1.default.extractContextFromRequest(req).addEventListeners(events),
|
|
33
60
|
// Edit mode
|
|
34
|
-
editMode: (Object.hasOwn(req.query, "edit") &&
|
|
35
|
-
|
|
61
|
+
editMode: (Object.hasOwn(req.query, "edit") &&
|
|
62
|
+
Object.hasOwn(req.query, "editorigin")) ||
|
|
63
|
+
(Object.hasOwn(req.body, "edit") &&
|
|
64
|
+
Object.hasOwn(req.body, "editorigin")),
|
|
36
65
|
editOrigin: editOrigin(req),
|
|
37
66
|
};
|
|
38
67
|
// Grab chosen language from session
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data.js","sourceRoot":"","sources":["../../src/middleware/data.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"data.js","sourceRoot":"","sources":["../../src/middleware/data.js"],"names":[],"mappings":"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"}
|