@dwp/govuk-casa 8.16.2 → 8.16.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-ie8.css +1 -1
- package/dist/assets/css/casa.css +1 -1
- package/dist/casa.d.ts +13 -13
- package/dist/casa.js +17 -7
- package/dist/casa.js.map +1 -1
- package/dist/lib/CasaTemplateLoader.d.ts +1 -1
- package/dist/lib/CasaTemplateLoader.js +13 -14
- package/dist/lib/CasaTemplateLoader.js.map +1 -1
- package/dist/lib/JourneyContext.d.ts +10 -4
- package/dist/lib/JourneyContext.js +57 -47
- package/dist/lib/JourneyContext.js.map +1 -1
- package/dist/lib/MutableRouter.d.ts +1 -1
- package/dist/lib/MutableRouter.js +22 -23
- package/dist/lib/MutableRouter.js.map +1 -1
- package/dist/lib/Plan.d.ts +5 -5
- package/dist/lib/Plan.js +49 -36
- package/dist/lib/Plan.js.map +1 -1
- package/dist/lib/ValidationError.d.ts +1 -1
- package/dist/lib/ValidationError.js +9 -9
- package/dist/lib/ValidationError.js.map +1 -1
- package/dist/lib/ValidatorFactory.js +4 -7
- package/dist/lib/ValidatorFactory.js.map +1 -1
- package/dist/lib/configuration-ingestor.d.ts +75 -14
- package/dist/lib/configuration-ingestor.js +156 -64
- package/dist/lib/configuration-ingestor.js.map +1 -1
- package/dist/lib/configure.js +11 -10
- package/dist/lib/configure.js.map +1 -1
- package/dist/lib/constants.js +8 -8
- package/dist/lib/context-id-generators.d.ts +1 -1
- package/dist/lib/context-id-generators.js +7 -4
- package/dist/lib/context-id-generators.js.map +1 -1
- package/dist/lib/end-session.js +2 -2
- package/dist/lib/field.d.ts +6 -6
- package/dist/lib/field.js +15 -21
- package/dist/lib/field.js.map +1 -1
- package/dist/lib/index.d.ts +13 -13
- package/dist/lib/index.js +17 -7
- package/dist/lib/index.js.map +1 -1
- package/dist/lib/logger.js +7 -7
- package/dist/lib/logger.js.map +1 -1
- package/dist/lib/mount.js +3 -3
- package/dist/lib/mount.js.map +1 -1
- package/dist/lib/nunjucks-filters.d.ts +5 -1
- package/dist/lib/nunjucks-filters.js +37 -23
- package/dist/lib/nunjucks-filters.js.map +1 -1
- package/dist/lib/nunjucks.d.ts +2 -2
- package/dist/lib/nunjucks.js +6 -7
- package/dist/lib/nunjucks.js.map +1 -1
- package/dist/lib/utils.js +52 -42
- package/dist/lib/utils.js.map +1 -1
- package/dist/lib/validators/dateObject.d.ts +3 -3
- package/dist/lib/validators/dateObject.js +44 -37
- package/dist/lib/validators/dateObject.js.map +1 -1
- package/dist/lib/validators/email.d.ts +2 -2
- package/dist/lib/validators/email.js +4 -5
- package/dist/lib/validators/email.js.map +1 -1
- package/dist/lib/validators/inArray.d.ts +2 -2
- package/dist/lib/validators/inArray.js +5 -6
- package/dist/lib/validators/inArray.js.map +1 -1
- package/dist/lib/validators/index.d.ts +10 -10
- package/dist/lib/validators/index.js.map +1 -1
- package/dist/lib/validators/nino.d.ts +2 -2
- package/dist/lib/validators/nino.js +10 -7
- package/dist/lib/validators/nino.js.map +1 -1
- package/dist/lib/validators/postalAddressObject.d.ts +2 -2
- package/dist/lib/validators/postalAddressObject.js +52 -39
- package/dist/lib/validators/postalAddressObject.js.map +1 -1
- package/dist/lib/validators/range.d.ts +2 -2
- package/dist/lib/validators/range.js +6 -7
- package/dist/lib/validators/range.js.map +1 -1
- package/dist/lib/validators/regex.d.ts +2 -2
- package/dist/lib/validators/regex.js +4 -5
- package/dist/lib/validators/regex.js.map +1 -1
- package/dist/lib/validators/required.d.ts +2 -2
- package/dist/lib/validators/required.js +6 -9
- package/dist/lib/validators/required.js.map +1 -1
- package/dist/lib/validators/strlen.d.ts +2 -2
- package/dist/lib/validators/strlen.js +8 -9
- package/dist/lib/validators/strlen.js.map +1 -1
- package/dist/lib/validators/wordCount.d.ts +2 -2
- package/dist/lib/validators/wordCount.js +10 -9
- package/dist/lib/validators/wordCount.js.map +1 -1
- package/dist/lib/waypoint-url.d.ts +4 -4
- package/dist/lib/waypoint-url.js +23 -23
- package/dist/lib/waypoint-url.js.map +1 -1
- package/dist/middleware/body-parser.d.ts +27 -5
- package/dist/middleware/body-parser.js +37 -6
- package/dist/middleware/body-parser.js.map +1 -1
- package/dist/middleware/csrf.d.ts +3 -0
- package/dist/middleware/csrf.js +3 -0
- package/dist/middleware/csrf.js.map +1 -1
- package/dist/middleware/data.d.ts +22 -5
- package/dist/middleware/data.js +37 -7
- package/dist/middleware/data.js.map +1 -1
- package/dist/middleware/gather-fields.d.ts +1 -1
- package/dist/middleware/gather-fields.js +4 -3
- package/dist/middleware/gather-fields.js.map +1 -1
- package/dist/middleware/i18n.d.ts +11 -2
- package/dist/middleware/i18n.js +26 -17
- package/dist/middleware/i18n.js.map +1 -1
- package/dist/middleware/post.d.ts +3 -1
- package/dist/middleware/post.js +35 -18
- package/dist/middleware/post.js.map +1 -1
- package/dist/middleware/pre.d.ts +1 -1
- package/dist/middleware/pre.js +43 -21
- package/dist/middleware/pre.js.map +1 -1
- package/dist/middleware/progress-journey.d.ts +1 -1
- package/dist/middleware/progress-journey.js +5 -5
- package/dist/middleware/progress-journey.js.map +1 -1
- package/dist/middleware/sanitise-fields.d.ts +2 -2
- package/dist/middleware/sanitise-fields.js +13 -11
- package/dist/middleware/sanitise-fields.js.map +1 -1
- package/dist/middleware/serve-first-waypoint.d.ts +1 -1
- package/dist/middleware/serve-first-waypoint.js +6 -4
- package/dist/middleware/serve-first-waypoint.js.map +1 -1
- package/dist/middleware/session.d.ts +27 -8
- package/dist/middleware/session.js +53 -25
- package/dist/middleware/session.js.map +1 -1
- package/dist/middleware/skip-waypoint.d.ts +1 -1
- package/dist/middleware/skip-waypoint.js +3 -3
- package/dist/middleware/skip-waypoint.js.map +1 -1
- package/dist/middleware/steer-journey.d.ts +1 -1
- package/dist/middleware/steer-journey.js +15 -13
- package/dist/middleware/steer-journey.js.map +1 -1
- package/dist/middleware/strip-proxy-path.d.ts +1 -1
- package/dist/middleware/strip-proxy-path.js +3 -3
- package/dist/middleware/strip-proxy-path.js.map +1 -1
- package/dist/middleware/validate-fields.d.ts +2 -2
- package/dist/middleware/validate-fields.js +2 -5
- package/dist/middleware/validate-fields.js.map +1 -1
- package/dist/routes/ancillary.d.ts +2 -2
- package/dist/routes/ancillary.js +3 -3
- package/dist/routes/ancillary.js.map +1 -1
- package/dist/routes/journey.d.ts +1 -1
- package/dist/routes/journey.js +85 -31
- package/dist/routes/journey.js.map +1 -1
- package/dist/routes/static.d.ts +13 -4
- package/dist/routes/static.js +21 -19
- package/dist/routes/static.js.map +1 -1
- package/package.json +33 -36
- package/src/casa.js +13 -13
- package/src/lib/CasaTemplateLoader.js +21 -17
- package/src/lib/JourneyContext.js +118 -79
- package/src/lib/MutableRouter.js +30 -26
- package/src/lib/Plan.js +109 -62
- package/src/lib/ValidationError.js +13 -10
- package/src/lib/ValidatorFactory.js +7 -8
- package/src/lib/configuration-ingestor.js +200 -74
- package/src/lib/configure.js +31 -30
- package/src/lib/constants.js +8 -8
- package/src/lib/context-id-generators.js +39 -38
- package/src/lib/end-session.js +3 -3
- package/src/lib/field.js +48 -32
- package/src/lib/index.js +12 -12
- package/src/lib/logger.js +9 -9
- package/src/lib/mount.js +68 -73
- package/src/lib/nunjucks-filters.js +57 -44
- package/src/lib/nunjucks.js +20 -16
- package/src/lib/utils.js +69 -44
- package/src/lib/validators/dateObject.js +57 -48
- package/src/lib/validators/email.js +8 -9
- package/src/lib/validators/inArray.js +8 -9
- package/src/lib/validators/index.js +11 -11
- package/src/lib/validators/nino.js +25 -12
- package/src/lib/validators/postalAddressObject.js +73 -55
- package/src/lib/validators/range.js +9 -11
- package/src/lib/validators/regex.js +7 -8
- package/src/lib/validators/required.js +13 -14
- package/src/lib/validators/strlen.js +11 -12
- package/src/lib/validators/wordCount.js +17 -12
- package/src/lib/waypoint-url.js +48 -33
- package/src/middleware/body-parser.js +44 -10
- package/src/middleware/csrf.js +4 -1
- package/src/middleware/data.js +62 -25
- package/src/middleware/gather-fields.js +8 -8
- package/src/middleware/i18n.js +49 -39
- package/src/middleware/post.js +47 -21
- package/src/middleware/pre.js +59 -35
- package/src/middleware/progress-journey.js +32 -18
- package/src/middleware/sanitise-fields.js +43 -20
- package/src/middleware/serve-first-waypoint.js +12 -10
- package/src/middleware/session.js +97 -65
- package/src/middleware/skip-waypoint.js +7 -9
- package/src/middleware/steer-journey.js +39 -27
- package/src/middleware/strip-proxy-path.js +8 -7
- package/src/middleware/validate-fields.js +5 -12
- package/src/routes/ancillary.js +4 -6
- package/src/routes/journey.js +158 -78
- package/src/routes/static.js +64 -26
|
@@ -12,7 +12,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
12
12
|
};
|
|
13
13
|
var _MutableRouter_instances, _MutableRouter_stack, _MutableRouter_router, _MutableRouter_sealed, _MutableRouter_append, _MutableRouter_prepend, _MutableRouter_replace;
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
/* eslint-disable sonarjs/no-duplicate-string,class-methods-use-this */
|
|
16
15
|
const express_1 = require("express");
|
|
17
16
|
/**
|
|
18
17
|
* @memberof module:@dwp/govuk-casa
|
|
@@ -70,7 +69,7 @@ class MutableRouter {
|
|
|
70
69
|
* @returns {void}
|
|
71
70
|
*/
|
|
72
71
|
prependAll(path, ...callbacks) {
|
|
73
|
-
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_prepend).call(this,
|
|
72
|
+
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_prepend).call(this, "all", path, ...callbacks);
|
|
74
73
|
}
|
|
75
74
|
/**
|
|
76
75
|
* Prepend middleware function(s) using the `get()` method.
|
|
@@ -80,7 +79,7 @@ class MutableRouter {
|
|
|
80
79
|
* @returns {void}
|
|
81
80
|
*/
|
|
82
81
|
prependGet(path, ...callbacks) {
|
|
83
|
-
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_prepend).call(this,
|
|
82
|
+
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_prepend).call(this, "get", path, ...callbacks);
|
|
84
83
|
}
|
|
85
84
|
/**
|
|
86
85
|
* Prepend middleware function(s) using the `post()` method.
|
|
@@ -90,7 +89,7 @@ class MutableRouter {
|
|
|
90
89
|
* @returns {void}
|
|
91
90
|
*/
|
|
92
91
|
prependPost(path, ...callbacks) {
|
|
93
|
-
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_prepend).call(this,
|
|
92
|
+
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_prepend).call(this, "post", path, ...callbacks);
|
|
94
93
|
}
|
|
95
94
|
/**
|
|
96
95
|
* Prepend middleware function(s) using the `delete()` method.
|
|
@@ -100,7 +99,7 @@ class MutableRouter {
|
|
|
100
99
|
* @returns {void}
|
|
101
100
|
*/
|
|
102
101
|
prependDelete(path, ...callbacks) {
|
|
103
|
-
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_prepend).call(this,
|
|
102
|
+
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_prepend).call(this, "delete", path, ...callbacks);
|
|
104
103
|
}
|
|
105
104
|
/**
|
|
106
105
|
* Prepend middleware function(s) using the `put()` method.
|
|
@@ -110,7 +109,7 @@ class MutableRouter {
|
|
|
110
109
|
* @returns {void}
|
|
111
110
|
*/
|
|
112
111
|
prependPut(path, ...callbacks) {
|
|
113
|
-
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_prepend).call(this,
|
|
112
|
+
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_prepend).call(this, "put", path, ...callbacks);
|
|
114
113
|
}
|
|
115
114
|
/**
|
|
116
115
|
* Prepend middleware function(s) using the `use()` method.
|
|
@@ -120,7 +119,7 @@ class MutableRouter {
|
|
|
120
119
|
* @returns {void}
|
|
121
120
|
*/
|
|
122
121
|
prependUse(path, ...callbacks) {
|
|
123
|
-
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_prepend).call(this,
|
|
122
|
+
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_prepend).call(this, "use", path, ...callbacks);
|
|
124
123
|
}
|
|
125
124
|
/* -------------------------------------------------------------- replacers */
|
|
126
125
|
/**
|
|
@@ -131,7 +130,7 @@ class MutableRouter {
|
|
|
131
130
|
* @returns {void}
|
|
132
131
|
*/
|
|
133
132
|
replaceAll(path, ...callbacks) {
|
|
134
|
-
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_replace).call(this,
|
|
133
|
+
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_replace).call(this, "all", path, ...callbacks);
|
|
135
134
|
}
|
|
136
135
|
/**
|
|
137
136
|
* Replace middleware function(s) that were mounted using the `get()` method.
|
|
@@ -141,7 +140,7 @@ class MutableRouter {
|
|
|
141
140
|
* @returns {void}
|
|
142
141
|
*/
|
|
143
142
|
replaceGet(path, ...callbacks) {
|
|
144
|
-
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_replace).call(this,
|
|
143
|
+
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_replace).call(this, "get", path, ...callbacks);
|
|
145
144
|
}
|
|
146
145
|
/**
|
|
147
146
|
* Replace middleware function(s) that were mounted using the `post()` method.
|
|
@@ -151,7 +150,7 @@ class MutableRouter {
|
|
|
151
150
|
* @returns {void}
|
|
152
151
|
*/
|
|
153
152
|
replacePost(path, ...callbacks) {
|
|
154
|
-
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_replace).call(this,
|
|
153
|
+
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_replace).call(this, "post", path, ...callbacks);
|
|
155
154
|
}
|
|
156
155
|
/**
|
|
157
156
|
* Replace middleware function(s) that were mounted using the `delete()` method.
|
|
@@ -161,7 +160,7 @@ class MutableRouter {
|
|
|
161
160
|
* @returns {void}
|
|
162
161
|
*/
|
|
163
162
|
replaceDelete(path, ...callbacks) {
|
|
164
|
-
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_replace).call(this,
|
|
163
|
+
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_replace).call(this, "delete", path, ...callbacks);
|
|
165
164
|
}
|
|
166
165
|
/**
|
|
167
166
|
* Replace middleware function(s) that were mounted using the `put()` method.
|
|
@@ -171,7 +170,7 @@ class MutableRouter {
|
|
|
171
170
|
* @returns {void}
|
|
172
171
|
*/
|
|
173
172
|
replacePut(path, ...callbacks) {
|
|
174
|
-
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_replace).call(this,
|
|
173
|
+
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_replace).call(this, "put", path, ...callbacks);
|
|
175
174
|
}
|
|
176
175
|
/**
|
|
177
176
|
* Replace middleware function(s) that were mounted using the `use()` method.
|
|
@@ -181,7 +180,7 @@ class MutableRouter {
|
|
|
181
180
|
* @returns {void}
|
|
182
181
|
*/
|
|
183
182
|
replaceUse(path, ...callbacks) {
|
|
184
|
-
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_replace).call(this,
|
|
183
|
+
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_replace).call(this, "use", path, ...callbacks);
|
|
185
184
|
}
|
|
186
185
|
/* ---------------------------------------------- express.Router() wrappers */
|
|
187
186
|
/**
|
|
@@ -192,7 +191,7 @@ class MutableRouter {
|
|
|
192
191
|
* @returns {void}
|
|
193
192
|
*/
|
|
194
193
|
all(path, ...callbacks) {
|
|
195
|
-
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_append).call(this,
|
|
194
|
+
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_append).call(this, "all", path, ...callbacks);
|
|
196
195
|
}
|
|
197
196
|
/**
|
|
198
197
|
* Append middleware function(s) using the `get()` method.
|
|
@@ -202,7 +201,7 @@ class MutableRouter {
|
|
|
202
201
|
* @returns {void}
|
|
203
202
|
*/
|
|
204
203
|
get(path, ...callbacks) {
|
|
205
|
-
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_append).call(this,
|
|
204
|
+
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_append).call(this, "get", path, ...callbacks);
|
|
206
205
|
}
|
|
207
206
|
/**
|
|
208
207
|
* Append middleware function(s) using the `post()` method.
|
|
@@ -212,7 +211,7 @@ class MutableRouter {
|
|
|
212
211
|
* @returns {void}
|
|
213
212
|
*/
|
|
214
213
|
post(path, ...callbacks) {
|
|
215
|
-
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_append).call(this,
|
|
214
|
+
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_append).call(this, "post", path, ...callbacks);
|
|
216
215
|
}
|
|
217
216
|
/**
|
|
218
217
|
* Append middleware function(s) using the `delete()` method.
|
|
@@ -222,7 +221,7 @@ class MutableRouter {
|
|
|
222
221
|
* @returns {void}
|
|
223
222
|
*/
|
|
224
223
|
delete(path, ...callbacks) {
|
|
225
|
-
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_append).call(this,
|
|
224
|
+
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_append).call(this, "delete", path, ...callbacks);
|
|
226
225
|
}
|
|
227
226
|
/**
|
|
228
227
|
* Append middleware function(s) using the `put()` method.
|
|
@@ -232,7 +231,7 @@ class MutableRouter {
|
|
|
232
231
|
* @returns {void}
|
|
233
232
|
*/
|
|
234
233
|
put(path, ...callbacks) {
|
|
235
|
-
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_append).call(this,
|
|
234
|
+
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_append).call(this, "put", path, ...callbacks);
|
|
236
235
|
}
|
|
237
236
|
/**
|
|
238
237
|
* Append middleware function(s) using the `use()` method.
|
|
@@ -242,15 +241,15 @@ class MutableRouter {
|
|
|
242
241
|
* @returns {void}
|
|
243
242
|
*/
|
|
244
243
|
use(path, ...callbacks) {
|
|
245
|
-
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_append).call(this,
|
|
244
|
+
__classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_append).call(this, "use", path, ...callbacks);
|
|
246
245
|
}
|
|
247
246
|
route() {
|
|
248
|
-
throw new Error(
|
|
247
|
+
throw new Error("route() method is not supported on MutableRouter. Use verb methods for now.");
|
|
249
248
|
}
|
|
250
249
|
}
|
|
251
250
|
_MutableRouter_stack = new WeakMap(), _MutableRouter_router = new WeakMap(), _MutableRouter_sealed = new WeakMap(), _MutableRouter_instances = new WeakSet(), _MutableRouter_append = function _MutableRouter_append(method, path, ...callbacks) {
|
|
252
251
|
if (__classPrivateFieldGet(this, _MutableRouter_sealed, "f")) {
|
|
253
|
-
throw new Error(
|
|
252
|
+
throw new Error("Cannot alter middleware in a sealed mutable router");
|
|
254
253
|
}
|
|
255
254
|
__classPrivateFieldGet(this, _MutableRouter_stack, "f").push({
|
|
256
255
|
method,
|
|
@@ -259,7 +258,7 @@ _MutableRouter_stack = new WeakMap(), _MutableRouter_router = new WeakMap(), _Mu
|
|
|
259
258
|
});
|
|
260
259
|
}, _MutableRouter_prepend = function _MutableRouter_prepend(method, path, ...callbacks) {
|
|
261
260
|
if (__classPrivateFieldGet(this, _MutableRouter_sealed, "f")) {
|
|
262
|
-
throw new Error(
|
|
261
|
+
throw new Error("Cannot alter middleware in a sealed mutable router");
|
|
263
262
|
}
|
|
264
263
|
__classPrivateFieldGet(this, _MutableRouter_stack, "f").splice(0, 0, {
|
|
265
264
|
method,
|
|
@@ -268,7 +267,7 @@ _MutableRouter_stack = new WeakMap(), _MutableRouter_router = new WeakMap(), _Mu
|
|
|
268
267
|
});
|
|
269
268
|
}, _MutableRouter_replace = function _MutableRouter_replace(method, path, ...callbacks) {
|
|
270
269
|
if (__classPrivateFieldGet(this, _MutableRouter_sealed, "f")) {
|
|
271
|
-
throw new Error(
|
|
270
|
+
throw new Error("Cannot alter middleware in a sealed mutable router");
|
|
272
271
|
}
|
|
273
272
|
const finder = (command) => `${command.method}|${command.path}` === `${method}|${path}`;
|
|
274
273
|
const index = __classPrivateFieldGet(this, _MutableRouter_stack, "f").findIndex(finder);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MutableRouter.js","sourceRoot":"","sources":["../../src/lib/MutableRouter.js"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"MutableRouter.js","sourceRoot":"","sources":["../../src/lib/MutableRouter.js"],"names":[],"mappings":"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"}
|
package/dist/lib/Plan.d.ts
CHANGED
|
@@ -78,7 +78,7 @@ export default class Plan {
|
|
|
78
78
|
* @param {string} [tgt] Target waypoint.
|
|
79
79
|
* @returns {PlanRoute[]} Route objects found.
|
|
80
80
|
*/
|
|
81
|
-
getOutwardRoutes(src: string, tgt?: string
|
|
81
|
+
getOutwardRoutes(src: string, tgt?: string): PlanRoute[];
|
|
82
82
|
/**
|
|
83
83
|
* Return all outward routes (out-edges) from the given waypoint, to the
|
|
84
84
|
* optional target waypoint, matching the "prev" name.
|
|
@@ -87,7 +87,7 @@ export default class Plan {
|
|
|
87
87
|
* @param {string} [tgt] Target waypoint.
|
|
88
88
|
* @returns {PlanRoute[]} Route objects found.
|
|
89
89
|
*/
|
|
90
|
-
getPrevOutwardRoutes(src: string, tgt?: string
|
|
90
|
+
getPrevOutwardRoutes(src: string, tgt?: string): PlanRoute[];
|
|
91
91
|
/**
|
|
92
92
|
* Add a sequence of waypoints that will follow on from each other, with no
|
|
93
93
|
* routing logic between them.
|
|
@@ -136,7 +136,7 @@ export default class Plan {
|
|
|
136
136
|
* @param {PlanRouteCondition} [followPrev] Follow test function.
|
|
137
137
|
* @returns {Plan} Chain
|
|
138
138
|
*/
|
|
139
|
-
setRoute(src: string, tgt: string, followNext?:
|
|
139
|
+
setRoute(src: string, tgt: string, followNext?: PlanRouteCondition, followPrev?: PlanRouteCondition): Plan;
|
|
140
140
|
/**
|
|
141
141
|
* Create a named route between two waypoints, and give that route a function
|
|
142
142
|
* that determine whether it should be followed during traversal operations.
|
|
@@ -224,5 +224,5 @@ export type PlanConstructorOptions = {
|
|
|
224
224
|
*/
|
|
225
225
|
arbiter?: string | import("../casa").PlanArbiter | undefined;
|
|
226
226
|
};
|
|
227
|
-
import JourneyContext from
|
|
228
|
-
import { Graph } from
|
|
227
|
+
import JourneyContext from "./JourneyContext.js";
|
|
228
|
+
import { Graph } from "@dagrejs/graphlib";
|
package/dist/lib/Plan.js
CHANGED
|
@@ -18,7 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
18
18
|
const graphlib_1 = require("@dagrejs/graphlib");
|
|
19
19
|
const JourneyContext_js_1 = __importDefault(require("./JourneyContext.js"));
|
|
20
20
|
const logger_js_1 = __importDefault(require("./logger.js"));
|
|
21
|
-
const log = (0, logger_js_1.default)(
|
|
21
|
+
const log = (0, logger_js_1.default)("lib:plan");
|
|
22
22
|
/**
|
|
23
23
|
* @access private
|
|
24
24
|
* @typedef {import('../casa').PlanRoute} PlanRoute
|
|
@@ -49,7 +49,7 @@ const log = (0, logger_js_1.default)('lib:plan');
|
|
|
49
49
|
*/
|
|
50
50
|
function defaultNextFollow(r, context) {
|
|
51
51
|
const { validation: v = {} } = context.toObject();
|
|
52
|
-
return Object.prototype.hasOwnProperty.call(v, r.source) && v[r.source] === null;
|
|
52
|
+
return (Object.prototype.hasOwnProperty.call(v, r.source) && v[r.source] === null);
|
|
53
53
|
}
|
|
54
54
|
/**
|
|
55
55
|
* Will check if the target waypoint (the one we're moving back to) has
|
|
@@ -60,7 +60,7 @@ function defaultNextFollow(r, context) {
|
|
|
60
60
|
*/
|
|
61
61
|
function defaultPrevFollow(r, context) {
|
|
62
62
|
const { validation: v = {} } = context.toObject();
|
|
63
|
-
return Object.prototype.hasOwnProperty.call(v, r.target) && v[r.target] === null;
|
|
63
|
+
return (Object.prototype.hasOwnProperty.call(v, r.target) && v[r.target] === null);
|
|
64
64
|
}
|
|
65
65
|
/**
|
|
66
66
|
* Validate a given waypoint ID.
|
|
@@ -72,11 +72,11 @@ function defaultPrevFollow(r, context) {
|
|
|
72
72
|
* @throws {SyntaxError} If waypoint ID is incorrectly formatted
|
|
73
73
|
*/
|
|
74
74
|
function validateWaypointId(val) {
|
|
75
|
-
if (typeof val !==
|
|
75
|
+
if (typeof val !== "string") {
|
|
76
76
|
throw new TypeError(`Expected waypoint id to be a string, got ${typeof val}`);
|
|
77
77
|
}
|
|
78
|
-
if (val.substr(0, 6) ===
|
|
79
|
-
throw new SyntaxError(
|
|
78
|
+
if (val.substr(0, 6) === "url://" && !val.endsWith("/")) {
|
|
79
|
+
throw new SyntaxError("url:// waypoints must include a trailing /");
|
|
80
80
|
}
|
|
81
81
|
}
|
|
82
82
|
/**
|
|
@@ -89,10 +89,10 @@ function validateWaypointId(val) {
|
|
|
89
89
|
* @throws {ReferenceError} If route name is neither "next" or "prev"
|
|
90
90
|
*/
|
|
91
91
|
function validateRouteName(val) {
|
|
92
|
-
if (typeof val !==
|
|
92
|
+
if (typeof val !== "string") {
|
|
93
93
|
throw new TypeError(`Expected route name to be a string, got ${typeof val}`);
|
|
94
94
|
}
|
|
95
|
-
else if (![
|
|
95
|
+
else if (!["next", "prev"].includes(val)) {
|
|
96
96
|
throw new ReferenceError(`Expected route name to be one of next or prev. Got ${val}`);
|
|
97
97
|
}
|
|
98
98
|
return val;
|
|
@@ -251,7 +251,9 @@ class Plan {
|
|
|
251
251
|
*/
|
|
252
252
|
getRoutes() {
|
|
253
253
|
const self = priv.get(this);
|
|
254
|
-
return self.dgraph
|
|
254
|
+
return self.dgraph
|
|
255
|
+
.edges()
|
|
256
|
+
.map((edge) => makeRouteObject(self.dgraph, edge));
|
|
255
257
|
}
|
|
256
258
|
/**
|
|
257
259
|
* Get the condition function for the given parameters.
|
|
@@ -274,7 +276,9 @@ class Plan {
|
|
|
274
276
|
*/
|
|
275
277
|
getOutwardRoutes(src, tgt = null) {
|
|
276
278
|
const self = priv.get(this);
|
|
277
|
-
return self.dgraph
|
|
279
|
+
return self.dgraph
|
|
280
|
+
.outEdges(src, tgt)
|
|
281
|
+
.map((e) => makeRouteObject(self.dgraph, e));
|
|
278
282
|
}
|
|
279
283
|
/**
|
|
280
284
|
* Return all outward routes (out-edges) from the given waypoint, to the
|
|
@@ -285,7 +289,7 @@ class Plan {
|
|
|
285
289
|
* @returns {PlanRoute[]} Route objects found.
|
|
286
290
|
*/
|
|
287
291
|
getPrevOutwardRoutes(src, tgt = null) {
|
|
288
|
-
return this.getOutwardRoutes(src, tgt).filter((r) => r.name ===
|
|
292
|
+
return this.getOutwardRoutes(src, tgt).filter((r) => r.name === "prev");
|
|
289
293
|
}
|
|
290
294
|
/**
|
|
291
295
|
* Add a sequence of waypoints that will follow on from each other, with no
|
|
@@ -311,7 +315,7 @@ class Plan {
|
|
|
311
315
|
* @returns {Plan} Chain
|
|
312
316
|
*/
|
|
313
317
|
setNextRoute(src, tgt, follow) {
|
|
314
|
-
return this.setNamedRoute(src, tgt,
|
|
318
|
+
return this.setNamedRoute(src, tgt, "next", follow);
|
|
315
319
|
}
|
|
316
320
|
/**
|
|
317
321
|
* Create a new directed route between two waypoints, labelled as "prev".
|
|
@@ -322,7 +326,7 @@ class Plan {
|
|
|
322
326
|
* @returns {Plan} Chain
|
|
323
327
|
*/
|
|
324
328
|
setPrevRoute(src, tgt, follow) {
|
|
325
|
-
return this.setNamedRoute(src, tgt,
|
|
329
|
+
return this.setNamedRoute(src, tgt, "prev", follow);
|
|
326
330
|
}
|
|
327
331
|
/**
|
|
328
332
|
* Adds both a "next" and "prev" route between the two waypoints.
|
|
@@ -347,15 +351,18 @@ class Plan {
|
|
|
347
351
|
* @returns {Plan} Chain
|
|
348
352
|
*/
|
|
349
353
|
setRoute(src, tgt, followNext = undefined, followPrev = undefined) {
|
|
350
|
-
this.setNamedRoute(src, tgt,
|
|
354
|
+
this.setNamedRoute(src, tgt, "next", followNext);
|
|
351
355
|
let followPrevious = followPrev;
|
|
352
356
|
if (followPrevious === undefined) {
|
|
353
|
-
followPrevious =
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
+
followPrevious =
|
|
358
|
+
followNext === undefined
|
|
359
|
+
? undefined
|
|
360
|
+
: (r, c) => {
|
|
361
|
+
const invertedRoute = Object.assign(Object.assign({}, r), { source: r.target, target: r.source });
|
|
362
|
+
return followNext(invertedRoute, c);
|
|
363
|
+
};
|
|
357
364
|
}
|
|
358
|
-
this.setNamedRoute(tgt, src,
|
|
365
|
+
this.setNamedRoute(tgt, src, "prev", followPrevious);
|
|
359
366
|
return this;
|
|
360
367
|
}
|
|
361
368
|
/**
|
|
@@ -391,7 +398,7 @@ class Plan {
|
|
|
391
398
|
const conditionName = follow && follow.name;
|
|
392
399
|
// Warn if we're overwriting an existing edge on the same name
|
|
393
400
|
if (self.dgraph.hasEdge(src, tgt, name)) {
|
|
394
|
-
log.warn(
|
|
401
|
+
log.warn("Setting a route that already exists (%s, %s, %s). Will be overridden", src, tgt, name);
|
|
395
402
|
}
|
|
396
403
|
self.dgraph.setEdge(src, tgt, { conditionName }, name);
|
|
397
404
|
// Determine which follow function to use
|
|
@@ -400,20 +407,20 @@ class Plan {
|
|
|
400
407
|
if (!self.options.validateBeforeRouteCondition) {
|
|
401
408
|
followFunc = follow;
|
|
402
409
|
}
|
|
403
|
-
else if (name ===
|
|
410
|
+
else if (name === "next") {
|
|
404
411
|
// Retain the original function name of route condition
|
|
405
412
|
followFunc = {
|
|
406
|
-
[follow.name]: (r, c) =>
|
|
413
|
+
[follow.name]: (r, c) => defaultNextFollow(r, c) && follow(r, c),
|
|
407
414
|
}[follow.name];
|
|
408
415
|
}
|
|
409
416
|
else {
|
|
410
417
|
// Retain the original function name of route condition
|
|
411
418
|
followFunc = {
|
|
412
|
-
[follow.name]: (r, c) =>
|
|
419
|
+
[follow.name]: (r, c) => defaultPrevFollow(r, c) && follow(r, c),
|
|
413
420
|
}[follow.name];
|
|
414
421
|
}
|
|
415
422
|
}
|
|
416
|
-
else if (name ===
|
|
423
|
+
else if (name === "next") {
|
|
417
424
|
followFunc = defaultNextFollow;
|
|
418
425
|
}
|
|
419
426
|
else {
|
|
@@ -444,7 +451,7 @@ class Plan {
|
|
|
444
451
|
* @returns {PlanRoute[]} List of traversed waypoints
|
|
445
452
|
*/
|
|
446
453
|
traverseNextRoutes(context, options = {}) {
|
|
447
|
-
return this.traverseRoutes(context, Object.assign(Object.assign({}, options), { routeName:
|
|
454
|
+
return this.traverseRoutes(context, Object.assign(Object.assign({}, options), { routeName: "next" }));
|
|
448
455
|
}
|
|
449
456
|
/**
|
|
450
457
|
* Traverse the Plan by following all "prev" routes, and returning the IDs of
|
|
@@ -455,7 +462,7 @@ class Plan {
|
|
|
455
462
|
* @returns {PlanRoute[]} List of traversed waypoints
|
|
456
463
|
*/
|
|
457
464
|
traversePrevRoutes(context, options = {}) {
|
|
458
|
-
return this.traverseRoutes(context, Object.assign(Object.assign({}, options), { routeName:
|
|
465
|
+
return this.traverseRoutes(context, Object.assign(Object.assign({}, options), { routeName: "prev" }));
|
|
459
466
|
}
|
|
460
467
|
/**
|
|
461
468
|
* Traverse through the plan from a particular starting waypoint. This is a
|
|
@@ -478,7 +485,7 @@ class Plan {
|
|
|
478
485
|
}
|
|
479
486
|
const self = priv.get(this);
|
|
480
487
|
/** @type {PlanTraverseOptions} */
|
|
481
|
-
const { startWaypoint = this.getWaypoints()[0], stopCondition = () =>
|
|
488
|
+
const { startWaypoint = this.getWaypoints()[0], stopCondition = () => false, arbiter = self.options.arbiter, routeName, } = options;
|
|
482
489
|
if (!self.dgraph.hasNode(startWaypoint)) {
|
|
483
490
|
throw new ReferenceError(`Plan does not contain waypoint '${startWaypoint}'`);
|
|
484
491
|
}
|
|
@@ -503,9 +510,9 @@ class Plan {
|
|
|
503
510
|
// When there's more than one candidate route to take, we need help to choose
|
|
504
511
|
if (target.length > 1) {
|
|
505
512
|
const satisfied = target.map((t) => `${t.v} -> ${t.w}`);
|
|
506
|
-
log.debug(`Multiple routes were satisfied for "${routeName}" from "${startWP}" (${satisfied.join(
|
|
507
|
-
if (arbiter ===
|
|
508
|
-
log.debug(
|
|
513
|
+
log.debug(`Multiple routes were satisfied for "${routeName}" from "${startWP}" (${satisfied.join(" / ")}). Deciding how to resolve ...`);
|
|
514
|
+
if (arbiter === "auto") {
|
|
515
|
+
log.debug("Using automatic arbitration process");
|
|
509
516
|
const targetNames = target.map(({ w }) => w);
|
|
510
517
|
const forwardTraversal = this.traverseNextRoutes(context, {
|
|
511
518
|
stopCondition: ({ source }) => targetNames.includes(source),
|
|
@@ -514,7 +521,7 @@ class Plan {
|
|
|
514
521
|
target = target.filter((t) => t.w === resolved.source);
|
|
515
522
|
}
|
|
516
523
|
else if (arbiter instanceof Function) {
|
|
517
|
-
log.debug(
|
|
524
|
+
log.debug("Using custom arbitration process");
|
|
518
525
|
// Convert to routeObject and back to edge object so that only the
|
|
519
526
|
// routeObject is used in the public API
|
|
520
527
|
target = arbiter({
|
|
@@ -522,10 +529,14 @@ class Plan {
|
|
|
522
529
|
journeyContext: context,
|
|
523
530
|
travereOptions: options,
|
|
524
531
|
});
|
|
525
|
-
target = target.map((r) => ({
|
|
532
|
+
target = target.map((r) => ({
|
|
533
|
+
v: r.source,
|
|
534
|
+
w: r.target,
|
|
535
|
+
name: r.name,
|
|
536
|
+
}));
|
|
526
537
|
}
|
|
527
538
|
else {
|
|
528
|
-
log.warn(
|
|
539
|
+
log.warn("Unable to arbitrate");
|
|
529
540
|
target = [];
|
|
530
541
|
}
|
|
531
542
|
}
|
|
@@ -548,14 +559,16 @@ class Plan {
|
|
|
548
559
|
}
|
|
549
560
|
return results;
|
|
550
561
|
}
|
|
551
|
-
log.debug(
|
|
562
|
+
log.debug("Encountered loop (%s). Stopping traversal.", `${route.source} -> ${route.target}`);
|
|
552
563
|
}
|
|
553
|
-
return [
|
|
564
|
+
return [
|
|
565
|
+
makeRouteObject(self.dgraph, {
|
|
554
566
|
v: startWP,
|
|
555
567
|
w: null,
|
|
556
568
|
name: routeName,
|
|
557
569
|
label: {},
|
|
558
|
-
})
|
|
570
|
+
}),
|
|
571
|
+
];
|
|
559
572
|
};
|
|
560
573
|
return traverse(startWaypoint);
|
|
561
574
|
}
|
package/dist/lib/Plan.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Plan.js","sourceRoot":"","sources":["../../src/lib/Plan.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Plan.js","sourceRoot":"","sources":["../../src/lib/Plan.js"],"names":[],"mappings":"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"}
|
|
@@ -32,7 +32,7 @@ export default class ValidationError {
|
|
|
32
32
|
*
|
|
33
33
|
* @param {object} args Arguments
|
|
34
34
|
* @param {ErrorMessageConfig} args.errorMsg Error message config to seed ValidationError
|
|
35
|
-
* @param {ValidateContext} [args.dataContext
|
|
35
|
+
* @param {ValidateContext} [args.dataContext] Data for error msg function
|
|
36
36
|
* @returns {ValidationError} Error instance
|
|
37
37
|
* @throws {TypeError} If errorMsg is not in a valid type
|
|
38
38
|
*/
|
|
@@ -40,13 +40,13 @@ class ValidationError {
|
|
|
40
40
|
*
|
|
41
41
|
* @param {object} args Arguments
|
|
42
42
|
* @param {ErrorMessageConfig} args.errorMsg Error message config to seed ValidationError
|
|
43
|
-
* @param {ValidateContext} [args.dataContext
|
|
43
|
+
* @param {ValidateContext} [args.dataContext] Data for error msg function
|
|
44
44
|
* @returns {ValidationError} Error instance
|
|
45
45
|
* @throws {TypeError} If errorMsg is not in a valid type
|
|
46
46
|
*/
|
|
47
47
|
static make({ errorMsg, dataContext = {} }) {
|
|
48
48
|
// Convert strings to the most basic object primitive
|
|
49
|
-
if (typeof errorMsg ===
|
|
49
|
+
if (typeof errorMsg === "string") {
|
|
50
50
|
return new ValidationError({
|
|
51
51
|
summary: errorMsg,
|
|
52
52
|
inline: errorMsg,
|
|
@@ -60,7 +60,7 @@ class ValidationError {
|
|
|
60
60
|
}
|
|
61
61
|
// Use the user-defined function to generate an error primitive for the
|
|
62
62
|
// given context
|
|
63
|
-
if (typeof errorMsg ===
|
|
63
|
+
if (typeof errorMsg === "function") {
|
|
64
64
|
return new ValidationError(errorMsg.call(null, Object.assign({}, dataContext)));
|
|
65
65
|
}
|
|
66
66
|
// Core Error
|
|
@@ -72,7 +72,7 @@ class ValidationError {
|
|
|
72
72
|
});
|
|
73
73
|
}
|
|
74
74
|
// Unsupported
|
|
75
|
-
throw new TypeError(
|
|
75
|
+
throw new TypeError("errorMsg must be a string, Error, primitive object or function that generates a primitive object");
|
|
76
76
|
}
|
|
77
77
|
/**
|
|
78
78
|
* Create a ValidationError.
|
|
@@ -80,10 +80,10 @@ class ValidationError {
|
|
|
80
80
|
* @param {string|ErrorMessageConfigObject} errorParam Error configuration
|
|
81
81
|
*/
|
|
82
82
|
constructor(errorParam = {}) {
|
|
83
|
-
if (!isPlainObject(errorParam) && typeof errorParam !==
|
|
84
|
-
throw new TypeError(
|
|
83
|
+
if (!isPlainObject(errorParam) && typeof errorParam !== "string") {
|
|
84
|
+
throw new TypeError("Constructor requires a string or object");
|
|
85
85
|
}
|
|
86
|
-
const error = typeof errorParam ===
|
|
86
|
+
const error = typeof errorParam === "string" ? { summary: errorParam } : errorParam;
|
|
87
87
|
// Store parameters for later use in applying contexts
|
|
88
88
|
const originals = {
|
|
89
89
|
summary: error.summary,
|
|
@@ -123,7 +123,7 @@ class ValidationError {
|
|
|
123
123
|
// Get original constructor parameters
|
|
124
124
|
const originals = params.get(this);
|
|
125
125
|
// Expand variables
|
|
126
|
-
if (typeof originals.variables ===
|
|
126
|
+
if (typeof originals.variables === "function") {
|
|
127
127
|
this.variables = originals.variables.call(this, context);
|
|
128
128
|
}
|
|
129
129
|
// Set field name
|
|
@@ -139,7 +139,7 @@ class ValidationError {
|
|
|
139
139
|
: [originals.focusSuffix];
|
|
140
140
|
fieldHref += focusSuffix[0];
|
|
141
141
|
}
|
|
142
|
-
this.field = context.fieldName + (originals.fieldKeySuffix ||
|
|
142
|
+
this.field = context.fieldName + (originals.fieldKeySuffix || "");
|
|
143
143
|
this.fieldHref = fieldHref;
|
|
144
144
|
this.focusSuffix = focusSuffix || [];
|
|
145
145
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValidationError.js","sourceRoot":"","sources":["../../src/lib/ValidationError.js"],"names":[],"mappings":";;;;;AAAA,oDAA4B;AAE5B,MAAM,EAAE,aAAa,EAAE,GAAG,gBAAM,CAAC,CAAC,WAAW;AAE7C,MAAM,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;AAE7B;;;GAGG;AAEH;;;GAGG;AAEH;;;GAGG;AAEH;;;GAGG;AACH,MAAqB,eAAe;IAClC;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,MAAM,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,WAAW,GAAG,EAAE,EAAE;QACxC,qDAAqD;QACrD,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;YACjC,OAAO,IAAI,eAAe,CAAC;gBACzB,OAAO,EAAE,QAAQ;gBACjB,MAAM,EAAE,QAAQ;gBAChB,WAAW,EAAE,EAAE;aAChB,CAAC,CAAC;QACL,CAAC;QAED,yEAAyE;QACzE,kBAAkB;QAClB,IAAI,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5B,OAAO,IAAI,eAAe,CAAC,QAAQ,CAAC,CAAC;QACvC,CAAC;QAED,uEAAuE;QACvE,gBAAgB;QAChB,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE,CAAC;YACnC,OAAO,IAAI,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,oBAAO,WAAW,EAAG,CAAC,CAAC;QACtE,CAAC;QAED,aAAa;QACb,IAAI,QAAQ,YAAY,KAAK,EAAE,CAAC;YAC9B,OAAO,IAAI,eAAe,CAAC;gBACzB,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,MAAM,EAAE,QAAQ,CAAC,OAAO;gBACxB,WAAW,EAAE,QAAQ,CAAC,WAAW,IAAI,EAAE;aACxC,CAAC,CAAC;QACL,CAAC;QAED,cAAc;QACd,MAAM,IAAI,SAAS,
|
|
1
|
+
{"version":3,"file":"ValidationError.js","sourceRoot":"","sources":["../../src/lib/ValidationError.js"],"names":[],"mappings":"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"}
|