@yamato-daiwa/es-extensions 1.4.0 → 1.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/Distributable/cjs/RawObjectDataProcessor/RawObjectDataProcessor.js +79 -131
- package/Distributable/cjs/RawObjectDataProcessor/RawObjectDataProcessorLocalization__English.js +4 -4
- package/Distributable/cjs/index.js +9 -4
- package/Distributable/esm/RawObjectDataProcessor/RawObjectDataProcessor.d.ts +1 -2
- package/Distributable/esm/RawObjectDataProcessor/RawObjectDataProcessor.js +79 -131
- package/Distributable/esm/RawObjectDataProcessor/RawObjectDataProcessorLocalization__English.js +4 -4
- package/Distributable/esm/index.d.ts +2 -1
- package/Distributable/esm/index.js +2 -1
- package/README.md +0 -1
- package/package.json +1 -1
|
@@ -17,6 +17,7 @@ const isString_1 = require("../TypeGuards/Strings/isString");
|
|
|
17
17
|
const isBoolean_1 = require("../TypeGuards/isBoolean");
|
|
18
18
|
const isNonEmptyArray_1 = require("../TypeGuards/Arrays/isNonEmptyArray");
|
|
19
19
|
const substituteWhenUndefined_1 = require("../DefaultValueSubstituters/substituteWhenUndefined");
|
|
20
|
+
const stringifyAndFormatArbitraryValue_1 = require("../Strings/stringifyAndFormatArbitraryValue");
|
|
20
21
|
const Logger_1 = require("../Logging/Logger");
|
|
21
22
|
const InvalidParameterValueError_1 = require("../Logging/Errors/InvalidParameterValue/InvalidParameterValueError");
|
|
22
23
|
class RawObjectDataProcessor {
|
|
@@ -61,9 +62,7 @@ class RawObjectDataProcessor {
|
|
|
61
62
|
...validDataSpecification,
|
|
62
63
|
...{ type: RawObjectDataProcessor.ValuesTypesIDs.fixedKeyAndValuePairsObject }
|
|
63
64
|
},
|
|
64
|
-
parentObject: rawData
|
|
65
|
-
targetValueBeforeFirstPreValidationModification: rawData,
|
|
66
|
-
mustLogTargetValueAsItWasBeforeFirstPreValidationModification: false
|
|
65
|
+
parentObject: rawData
|
|
67
66
|
});
|
|
68
67
|
break;
|
|
69
68
|
}
|
|
@@ -74,9 +73,7 @@ class RawObjectDataProcessor {
|
|
|
74
73
|
...validDataSpecification,
|
|
75
74
|
...{ type: RawObjectDataProcessor.ValuesTypesIDs.indexedArrayOfUniformElements }
|
|
76
75
|
},
|
|
77
|
-
parentObject: rawData
|
|
78
|
-
targetValueBeforeFirstPreValidationModification: rawData,
|
|
79
|
-
mustLogTargetValueAsItWasBeforeFirstPreValidationModification: false
|
|
76
|
+
parentObject: rawData
|
|
80
77
|
});
|
|
81
78
|
break;
|
|
82
79
|
}
|
|
@@ -87,9 +84,7 @@ class RawObjectDataProcessor {
|
|
|
87
84
|
...validDataSpecification,
|
|
88
85
|
...{ type: RawObjectDataProcessor.ValuesTypesIDs.associativeArrayOfUniformTypeValues }
|
|
89
86
|
},
|
|
90
|
-
parentObject: rawData
|
|
91
|
-
targetValueBeforeFirstPreValidationModification: rawData,
|
|
92
|
-
mustLogTargetValueAsItWasBeforeFirstPreValidationModification: false
|
|
87
|
+
parentObject: rawData
|
|
93
88
|
});
|
|
94
89
|
}
|
|
95
90
|
}
|
|
@@ -153,15 +148,14 @@ class RawObjectDataProcessor {
|
|
|
153
148
|
occurrenceLocation: "RawObjectDataProcessor.processSingleNeitherUndefinedNorNullValue(parametersObject)"
|
|
154
149
|
});
|
|
155
150
|
}
|
|
156
|
-
processFixedKeyAndValuePairsNonNullObjectTypeValue({ targetValue__expectedToBeObject, targetObjectTypeValueSpecification, parentObject,
|
|
151
|
+
processFixedKeyAndValuePairsNonNullObjectTypeValue({ targetValue__expectedToBeObject, targetObjectTypeValueSpecification, parentObject, targetPropertyStringifiedValueBeforeFirstPreValidationModification }) {
|
|
157
152
|
if (!(0, isArbitraryObject_1.default)(targetValue__expectedToBeObject)) {
|
|
158
153
|
this.registerValidationError(this.validationErrorsMessagesBuilder.buildValueTypeDoesNotMatchWithExpectedErrorMessage({
|
|
159
154
|
targetPropertyDotSeparatedQualifiedName: this.currentObjectPropertyDotSeparatedQualifiedName,
|
|
160
155
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
161
156
|
targetPropertyValue: targetValue__expectedToBeObject,
|
|
162
157
|
targetPropertyValueSpecification: targetObjectTypeValueSpecification,
|
|
163
|
-
|
|
164
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification
|
|
158
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification
|
|
165
159
|
}));
|
|
166
160
|
return { isInvalid: true };
|
|
167
161
|
}
|
|
@@ -181,9 +175,11 @@ class RawObjectDataProcessor {
|
|
|
181
175
|
this.currentlyIteratedPropertyNewNameForLogging = childPropertyFinalName;
|
|
182
176
|
}
|
|
183
177
|
let childPropertyValue = targetValue__expectedToBeObject[childPropertyName];
|
|
184
|
-
|
|
178
|
+
let childPropertyStringifiedValueBeforeFirstPreValidationModification;
|
|
185
179
|
const preValidationModifications = RawObjectDataProcessor.getNormalizedPreValidationModifications(childPropertySpecification.preValidationModifications);
|
|
186
|
-
|
|
180
|
+
if (preValidationModifications.length > 0) {
|
|
181
|
+
childPropertyStringifiedValueBeforeFirstPreValidationModification = (0, stringifyAndFormatArbitraryValue_1.default)(childPropertyValue);
|
|
182
|
+
}
|
|
187
183
|
for (const preValidationModification of preValidationModifications) {
|
|
188
184
|
try {
|
|
189
185
|
childPropertyValue = preValidationModification(childPropertyValue);
|
|
@@ -194,8 +190,7 @@ class RawObjectDataProcessor {
|
|
|
194
190
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
195
191
|
targetPropertyValue: childPropertyValue,
|
|
196
192
|
targetPropertyValueSpecification: childPropertySpecification,
|
|
197
|
-
|
|
198
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogChildPropertyValueAsItWasBeforeFirstPreValidationModification,
|
|
193
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification: childPropertyStringifiedValueBeforeFirstPreValidationModification,
|
|
199
194
|
thrownError: error
|
|
200
195
|
}));
|
|
201
196
|
}
|
|
@@ -208,8 +203,7 @@ class RawObjectDataProcessor {
|
|
|
208
203
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
209
204
|
targetPropertyValue: childPropertyValue,
|
|
210
205
|
targetPropertyValueSpecification: childPropertySpecification,
|
|
211
|
-
|
|
212
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogChildPropertyValueAsItWasBeforeFirstPreValidationModification
|
|
206
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification: childPropertyStringifiedValueBeforeFirstPreValidationModification
|
|
213
207
|
}));
|
|
214
208
|
continue;
|
|
215
209
|
}
|
|
@@ -222,8 +216,7 @@ class RawObjectDataProcessor {
|
|
|
222
216
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
223
217
|
targetPropertyValue: childPropertyValue,
|
|
224
218
|
targetPropertyValueSpecification: childPropertySpecification,
|
|
225
|
-
|
|
226
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogChildPropertyValueAsItWasBeforeFirstPreValidationModification,
|
|
219
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification: childPropertyStringifiedValueBeforeFirstPreValidationModification,
|
|
227
220
|
requirementConditionDescription: childPropertySpecification.requiredIf.descriptionForLogging
|
|
228
221
|
}));
|
|
229
222
|
continue;
|
|
@@ -259,8 +252,7 @@ class RawObjectDataProcessor {
|
|
|
259
252
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
260
253
|
targetPropertyValue: childPropertyValue,
|
|
261
254
|
targetPropertyValueSpecification: childPropertySpecification,
|
|
262
|
-
|
|
263
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogChildPropertyValueAsItWasBeforeFirstPreValidationModification
|
|
255
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification: childPropertyStringifiedValueBeforeFirstPreValidationModification
|
|
264
256
|
}));
|
|
265
257
|
continue;
|
|
266
258
|
}
|
|
@@ -311,8 +303,7 @@ class RawObjectDataProcessor {
|
|
|
311
303
|
targetValue: childPropertyValue,
|
|
312
304
|
targetValueSpecification: childPropertySpecification,
|
|
313
305
|
parentObject,
|
|
314
|
-
|
|
315
|
-
mustLogTargetValueAsItWasBeforeFirstPreValidationModification: mustLogChildPropertyValueAsItWasBeforeFirstPreValidationModification
|
|
306
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification: childPropertyStringifiedValueBeforeFirstPreValidationModification
|
|
316
307
|
});
|
|
317
308
|
switch (this.processingApproach) {
|
|
318
309
|
case RawObjectDataProcessor.ProcessingApproaches.newObjectAssembling: {
|
|
@@ -352,8 +343,7 @@ class RawObjectDataProcessor {
|
|
|
352
343
|
targetPropertyValue: targetValue__expectedToBeObject,
|
|
353
344
|
targetPropertyValueSpecification: targetObjectTypeValueSpecification,
|
|
354
345
|
customValidationDescription: customValidator.descriptionForLogging,
|
|
355
|
-
|
|
356
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification
|
|
346
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification
|
|
357
347
|
}));
|
|
358
348
|
}
|
|
359
349
|
}
|
|
@@ -374,15 +364,14 @@ class RawObjectDataProcessor {
|
|
|
374
364
|
}
|
|
375
365
|
return { processedValue: processedValueWorkpiece };
|
|
376
366
|
}
|
|
377
|
-
processIndexedArrayTypeValue({ targetValue__expectedToBeIndexedArray, targetIndexedArrayTypeValueSpecification, parentObject,
|
|
367
|
+
processIndexedArrayTypeValue({ targetValue__expectedToBeIndexedArray, targetIndexedArrayTypeValueSpecification, parentObject, targetPropertyStringifiedValueBeforeFirstPreValidationModification }) {
|
|
378
368
|
if (!Array.isArray(targetValue__expectedToBeIndexedArray)) {
|
|
379
369
|
this.registerValidationError(this.validationErrorsMessagesBuilder.buildValueTypeDoesNotMatchWithExpectedErrorMessage({
|
|
380
370
|
targetPropertyDotSeparatedQualifiedName: this.currentObjectPropertyDotSeparatedQualifiedName,
|
|
381
371
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
382
372
|
targetPropertyValue: targetValue__expectedToBeIndexedArray,
|
|
383
373
|
targetPropertyValueSpecification: targetIndexedArrayTypeValueSpecification,
|
|
384
|
-
|
|
385
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification
|
|
374
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification
|
|
386
375
|
}));
|
|
387
376
|
return { isInvalid: true };
|
|
388
377
|
}
|
|
@@ -395,8 +384,7 @@ class RawObjectDataProcessor {
|
|
|
395
384
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
396
385
|
targetPropertyValue: targetValue__expectedToBeIndexedArray,
|
|
397
386
|
targetPropertyValueSpecification: targetIndexedArrayTypeValueSpecification,
|
|
398
|
-
|
|
399
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification,
|
|
387
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification,
|
|
400
388
|
minimalElementsCount: targetIndexedArrayTypeValueSpecification.minimalElementsCount,
|
|
401
389
|
actualElementsCount: targetValue__expectedToBeIndexedArray.length
|
|
402
390
|
}));
|
|
@@ -409,8 +397,7 @@ class RawObjectDataProcessor {
|
|
|
409
397
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
410
398
|
targetPropertyValue: targetValue__expectedToBeIndexedArray,
|
|
411
399
|
targetPropertyValueSpecification: targetIndexedArrayTypeValueSpecification,
|
|
412
|
-
|
|
413
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification,
|
|
400
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification,
|
|
414
401
|
maximalElementsCount: targetIndexedArrayTypeValueSpecification.maximalElementsCount,
|
|
415
402
|
actualElementsCount: targetValue__expectedToBeIndexedArray.length
|
|
416
403
|
}));
|
|
@@ -423,8 +410,7 @@ class RawObjectDataProcessor {
|
|
|
423
410
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
424
411
|
targetPropertyValue: targetValue__expectedToBeIndexedArray,
|
|
425
412
|
targetPropertyValueSpecification: targetIndexedArrayTypeValueSpecification,
|
|
426
|
-
|
|
427
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification,
|
|
413
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification,
|
|
428
414
|
exactElementsCount: targetIndexedArrayTypeValueSpecification.exactElementsCount,
|
|
429
415
|
actualElementsCount: targetValue__expectedToBeIndexedArray.length
|
|
430
416
|
}));
|
|
@@ -435,11 +421,13 @@ class RawObjectDataProcessor {
|
|
|
435
421
|
let oneOnMoreElementsAreInvalid = false;
|
|
436
422
|
for (const [index, _element] of targetValue__expectedToBeIndexedArray.entries()) {
|
|
437
423
|
this.currentlyIteratedObjectPropertyQualifiedNameSegmentsForLogging[currentObjectDepthLevel__beginWithZero] = index;
|
|
424
|
+
let element = _element;
|
|
425
|
+
let stringifiedElementValueBeforeFirstPreValidationModification;
|
|
438
426
|
const preValidationModifications = RawObjectDataProcessor.
|
|
439
427
|
getNormalizedPreValidationModifications(targetIndexedArrayTypeValueSpecification.element.preValidationModifications);
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
428
|
+
if (preValidationModifications.length > 0) {
|
|
429
|
+
stringifiedElementValueBeforeFirstPreValidationModification = (0, stringifyAndFormatArbitraryValue_1.default)(_element);
|
|
430
|
+
}
|
|
443
431
|
for (const preValidationModification of preValidationModifications) {
|
|
444
432
|
try {
|
|
445
433
|
element = preValidationModification(element);
|
|
@@ -450,8 +438,7 @@ class RawObjectDataProcessor {
|
|
|
450
438
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
451
439
|
targetPropertyValue: element,
|
|
452
440
|
targetPropertyValueSpecification: targetIndexedArrayTypeValueSpecification.element,
|
|
453
|
-
|
|
454
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogElementAsItWasBeforeFirstPreValidationModification,
|
|
441
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification: stringifiedElementValueBeforeFirstPreValidationModification,
|
|
455
442
|
thrownError: error
|
|
456
443
|
}));
|
|
457
444
|
}
|
|
@@ -464,8 +451,7 @@ class RawObjectDataProcessor {
|
|
|
464
451
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
465
452
|
targetPropertyValue: targetValue__expectedToBeIndexedArray,
|
|
466
453
|
targetPropertyValueSpecification: targetIndexedArrayTypeValueSpecification,
|
|
467
|
-
|
|
468
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogElementAsItWasBeforeFirstPreValidationModification
|
|
454
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification: stringifiedElementValueBeforeFirstPreValidationModification
|
|
469
455
|
}));
|
|
470
456
|
}
|
|
471
457
|
continue;
|
|
@@ -478,8 +464,7 @@ class RawObjectDataProcessor {
|
|
|
478
464
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
479
465
|
targetPropertyValue: targetValue__expectedToBeIndexedArray,
|
|
480
466
|
targetPropertyValueSpecification: targetIndexedArrayTypeValueSpecification,
|
|
481
|
-
|
|
482
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogElementAsItWasBeforeFirstPreValidationModification
|
|
467
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification: stringifiedElementValueBeforeFirstPreValidationModification
|
|
483
468
|
}));
|
|
484
469
|
}
|
|
485
470
|
continue;
|
|
@@ -488,8 +473,7 @@ class RawObjectDataProcessor {
|
|
|
488
473
|
targetValue: element,
|
|
489
474
|
targetValueSpecification: targetIndexedArrayTypeValueSpecification.element,
|
|
490
475
|
parentObject,
|
|
491
|
-
|
|
492
|
-
mustLogTargetValueAsItWasBeforeFirstPreValidationModification: mustLogElementAsItWasBeforeFirstPreValidationModification
|
|
476
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification: stringifiedElementValueBeforeFirstPreValidationModification
|
|
493
477
|
});
|
|
494
478
|
switch (this.processingApproach) {
|
|
495
479
|
case RawObjectDataProcessor.ProcessingApproaches.newObjectAssembling: {
|
|
@@ -521,8 +505,7 @@ class RawObjectDataProcessor {
|
|
|
521
505
|
targetPropertyValue: targetValue__expectedToBeIndexedArray,
|
|
522
506
|
targetPropertyValueSpecification: targetIndexedArrayTypeValueSpecification,
|
|
523
507
|
customValidationDescription: customValidator.descriptionForLogging,
|
|
524
|
-
|
|
525
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification
|
|
508
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification
|
|
526
509
|
}));
|
|
527
510
|
}
|
|
528
511
|
}
|
|
@@ -538,15 +521,14 @@ class RawObjectDataProcessor {
|
|
|
538
521
|
}
|
|
539
522
|
return { processedValue: processedValueWorkpiece };
|
|
540
523
|
}
|
|
541
|
-
processAssociativeArrayTypeValue({ targetValue__expectedToBeAssociativeArrayTypeObject, targetAssociativeArrayTypeValueSpecification, parentObject,
|
|
524
|
+
processAssociativeArrayTypeValue({ targetValue__expectedToBeAssociativeArrayTypeObject, targetAssociativeArrayTypeValueSpecification, parentObject, targetPropertyStringifiedValueBeforeFirstPreValidationModification }) {
|
|
542
525
|
if (!(0, isArbitraryObject_1.default)(targetValue__expectedToBeAssociativeArrayTypeObject)) {
|
|
543
526
|
this.registerValidationError(this.validationErrorsMessagesBuilder.buildValueTypeDoesNotMatchWithExpectedErrorMessage({
|
|
544
527
|
targetPropertyDotSeparatedQualifiedName: this.currentObjectPropertyDotSeparatedQualifiedName,
|
|
545
528
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
546
529
|
targetPropertyValue: targetValue__expectedToBeAssociativeArrayTypeObject,
|
|
547
530
|
targetPropertyValueSpecification: targetAssociativeArrayTypeValueSpecification,
|
|
548
|
-
|
|
549
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification
|
|
531
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification
|
|
550
532
|
}));
|
|
551
533
|
return { isInvalid: true };
|
|
552
534
|
}
|
|
@@ -560,8 +542,7 @@ class RawObjectDataProcessor {
|
|
|
560
542
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
561
543
|
targetPropertyValue: targetValue__expectedToBeAssociativeArrayTypeObject,
|
|
562
544
|
targetPropertyValueSpecification: targetAssociativeArrayTypeValueSpecification,
|
|
563
|
-
|
|
564
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification,
|
|
545
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification,
|
|
565
546
|
minimalEntriesCount: targetAssociativeArrayTypeValueSpecification.minimalEntriesCount,
|
|
566
547
|
actualEntriesCount: Object.entries(targetValue__expectedToBeAssociativeArrayTypeObject).length
|
|
567
548
|
}));
|
|
@@ -575,8 +556,7 @@ class RawObjectDataProcessor {
|
|
|
575
556
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
576
557
|
targetPropertyValue: targetValue__expectedToBeAssociativeArrayTypeObject,
|
|
577
558
|
targetPropertyValueSpecification: targetAssociativeArrayTypeValueSpecification,
|
|
578
|
-
|
|
579
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification,
|
|
559
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification,
|
|
580
560
|
maximalEntriesCount: targetAssociativeArrayTypeValueSpecification.maximalEntriesCount,
|
|
581
561
|
actualEntriesCount: Object.entries(targetValue__expectedToBeAssociativeArrayTypeObject).length
|
|
582
562
|
}));
|
|
@@ -590,8 +570,7 @@ class RawObjectDataProcessor {
|
|
|
590
570
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
591
571
|
targetPropertyValue: targetValue__expectedToBeAssociativeArrayTypeObject,
|
|
592
572
|
targetPropertyValueSpecification: targetAssociativeArrayTypeValueSpecification,
|
|
593
|
-
|
|
594
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification,
|
|
573
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification,
|
|
595
574
|
exactEntriesCount: targetAssociativeArrayTypeValueSpecification.exactEntriesCount,
|
|
596
575
|
actualEntriesCount: Object.entries(targetValue__expectedToBeAssociativeArrayTypeObject).length
|
|
597
576
|
}));
|
|
@@ -606,8 +585,7 @@ class RawObjectDataProcessor {
|
|
|
606
585
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
607
586
|
targetPropertyValue: targetValue__expectedToBeAssociativeArrayTypeObject,
|
|
608
587
|
targetPropertyValueSpecification: targetAssociativeArrayTypeValueSpecification,
|
|
609
|
-
|
|
610
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification,
|
|
588
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification,
|
|
611
589
|
missingRequiredKeys
|
|
612
590
|
}));
|
|
613
591
|
}
|
|
@@ -627,8 +605,7 @@ class RawObjectDataProcessor {
|
|
|
627
605
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
628
606
|
targetPropertyValue: targetValue__expectedToBeAssociativeArrayTypeObject,
|
|
629
607
|
targetPropertyValueSpecification: targetAssociativeArrayTypeValueSpecification,
|
|
630
|
-
|
|
631
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification,
|
|
608
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification,
|
|
632
609
|
requiredKeysAlternatives: targetAssociativeArrayTypeValueSpecification.oneOfKeysIsRequired
|
|
633
610
|
}));
|
|
634
611
|
}
|
|
@@ -647,8 +624,7 @@ class RawObjectDataProcessor {
|
|
|
647
624
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
648
625
|
targetPropertyValue: targetValue__expectedToBeAssociativeArrayTypeObject,
|
|
649
626
|
targetPropertyValueSpecification: targetAssociativeArrayTypeValueSpecification,
|
|
650
|
-
|
|
651
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification,
|
|
627
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification,
|
|
652
628
|
foundDisallowedKeys
|
|
653
629
|
}));
|
|
654
630
|
}
|
|
@@ -662,11 +638,13 @@ class RawObjectDataProcessor {
|
|
|
662
638
|
if (foundDisallowedKeys.includes(key)) {
|
|
663
639
|
continue;
|
|
664
640
|
}
|
|
641
|
+
let value = _value;
|
|
642
|
+
let stringifiedValueBeforeFirstPreValidationModification;
|
|
665
643
|
const preValidationModifications = RawObjectDataProcessor.
|
|
666
644
|
getNormalizedPreValidationModifications(targetAssociativeArrayTypeValueSpecification.value.preValidationModifications);
|
|
667
|
-
|
|
668
|
-
|
|
669
|
-
|
|
645
|
+
if (preValidationModifications.length > 0) {
|
|
646
|
+
stringifiedValueBeforeFirstPreValidationModification = (0, stringifyAndFormatArbitraryValue_1.default)(value);
|
|
647
|
+
}
|
|
670
648
|
for (const preValidationModification of preValidationModifications) {
|
|
671
649
|
try {
|
|
672
650
|
value = preValidationModification(value);
|
|
@@ -677,8 +655,7 @@ class RawObjectDataProcessor {
|
|
|
677
655
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
678
656
|
targetPropertyValue: value,
|
|
679
657
|
targetPropertyValueSpecification: targetAssociativeArrayTypeValueSpecification.value,
|
|
680
|
-
|
|
681
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogCurrentAssociativeArrayEntireValueAsItWasBeforeFirstPreValidationModification,
|
|
658
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification: stringifiedValueBeforeFirstPreValidationModification,
|
|
682
659
|
thrownError: error
|
|
683
660
|
}));
|
|
684
661
|
}
|
|
@@ -692,8 +669,7 @@ class RawObjectDataProcessor {
|
|
|
692
669
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
693
670
|
targetPropertyValue: targetValue__expectedToBeAssociativeArrayTypeObject,
|
|
694
671
|
targetPropertyValueSpecification: targetAssociativeArrayTypeValueSpecification,
|
|
695
|
-
|
|
696
|
-
targetPropertyValueBeforeFirstPreValidationModification: valueBeforeFirstPreValidationModification
|
|
672
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification: stringifiedValueBeforeFirstPreValidationModification
|
|
697
673
|
}));
|
|
698
674
|
}
|
|
699
675
|
continue;
|
|
@@ -706,8 +682,7 @@ class RawObjectDataProcessor {
|
|
|
706
682
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
707
683
|
targetPropertyValue: targetValue__expectedToBeAssociativeArrayTypeObject,
|
|
708
684
|
targetPropertyValueSpecification: targetAssociativeArrayTypeValueSpecification,
|
|
709
|
-
|
|
710
|
-
targetPropertyValueBeforeFirstPreValidationModification: valueBeforeFirstPreValidationModification
|
|
685
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification: stringifiedValueBeforeFirstPreValidationModification
|
|
711
686
|
}));
|
|
712
687
|
}
|
|
713
688
|
continue;
|
|
@@ -716,8 +691,7 @@ class RawObjectDataProcessor {
|
|
|
716
691
|
targetValue: value,
|
|
717
692
|
targetValueSpecification: targetAssociativeArrayTypeValueSpecification.value,
|
|
718
693
|
parentObject,
|
|
719
|
-
|
|
720
|
-
mustLogTargetValueAsItWasBeforeFirstPreValidationModification: mustLogCurrentAssociativeArrayEntireValueAsItWasBeforeFirstPreValidationModification
|
|
694
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification: stringifiedValueBeforeFirstPreValidationModification
|
|
721
695
|
});
|
|
722
696
|
switch (this.processingApproach) {
|
|
723
697
|
case RawObjectDataProcessor.ProcessingApproaches.newObjectAssembling: {
|
|
@@ -749,8 +723,7 @@ class RawObjectDataProcessor {
|
|
|
749
723
|
targetPropertyValue: targetValue__expectedToBeAssociativeArrayTypeObject,
|
|
750
724
|
targetPropertyValueSpecification: targetAssociativeArrayTypeValueSpecification,
|
|
751
725
|
customValidationDescription: customValidator.descriptionForLogging,
|
|
752
|
-
|
|
753
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification
|
|
726
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification
|
|
754
727
|
}));
|
|
755
728
|
}
|
|
756
729
|
}
|
|
@@ -766,7 +739,7 @@ class RawObjectDataProcessor {
|
|
|
766
739
|
}
|
|
767
740
|
return { processedValue: processedValueWorkpiece };
|
|
768
741
|
}
|
|
769
|
-
processSingleNeitherUndefinedNorNullValue({ targetValue, targetValueSpecification, parentObject,
|
|
742
|
+
processSingleNeitherUndefinedNorNullValue({ targetValue, targetValueSpecification, parentObject, targetPropertyStringifiedValueBeforeFirstPreValidationModification }) {
|
|
770
743
|
const targetValueTypeID = RawObjectDataProcessor.
|
|
771
744
|
getNormalizedValueTypeID(targetValueSpecification.type);
|
|
772
745
|
switch (targetValueTypeID) {
|
|
@@ -775,8 +748,7 @@ class RawObjectDataProcessor {
|
|
|
775
748
|
targetValue__expectedToBeNumber: targetValue,
|
|
776
749
|
targetValueSpecification: targetValueSpecification,
|
|
777
750
|
parentObject,
|
|
778
|
-
|
|
779
|
-
mustLogTargetValueAsItWasBeforeFirstPreValidationModification
|
|
751
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification
|
|
780
752
|
});
|
|
781
753
|
}
|
|
782
754
|
case RawObjectDataProcessor.ValuesTypesIDs.string: {
|
|
@@ -784,8 +756,7 @@ class RawObjectDataProcessor {
|
|
|
784
756
|
targetValue__expectedToBeString: targetValue,
|
|
785
757
|
targetValueSpecification: targetValueSpecification,
|
|
786
758
|
parentObject,
|
|
787
|
-
|
|
788
|
-
mustLogTargetValueAsItWasBeforeFirstPreValidationModification
|
|
759
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification
|
|
789
760
|
});
|
|
790
761
|
}
|
|
791
762
|
case RawObjectDataProcessor.ValuesTypesIDs.boolean: {
|
|
@@ -793,8 +764,7 @@ class RawObjectDataProcessor {
|
|
|
793
764
|
targetValue__expectedToBeBoolean: targetValue,
|
|
794
765
|
targetValueSpecification: targetValueSpecification,
|
|
795
766
|
parentObject,
|
|
796
|
-
|
|
797
|
-
mustLogTargetValueAsItWasBeforeFirstPreValidationModification
|
|
767
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification
|
|
798
768
|
});
|
|
799
769
|
}
|
|
800
770
|
case RawObjectDataProcessor.ValuesTypesIDs.fixedKeyAndValuePairsObject: {
|
|
@@ -802,8 +772,7 @@ class RawObjectDataProcessor {
|
|
|
802
772
|
targetValue__expectedToBeObject: targetValue,
|
|
803
773
|
targetObjectTypeValueSpecification: targetValueSpecification,
|
|
804
774
|
parentObject,
|
|
805
|
-
|
|
806
|
-
mustLogTargetValueAsItWasBeforeFirstPreValidationModification
|
|
775
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification
|
|
807
776
|
});
|
|
808
777
|
}
|
|
809
778
|
case RawObjectDataProcessor.ValuesTypesIDs.indexedArrayOfUniformElements: {
|
|
@@ -811,8 +780,7 @@ class RawObjectDataProcessor {
|
|
|
811
780
|
targetValue__expectedToBeIndexedArray: targetValue,
|
|
812
781
|
targetIndexedArrayTypeValueSpecification: targetValueSpecification,
|
|
813
782
|
parentObject,
|
|
814
|
-
|
|
815
|
-
mustLogTargetValueAsItWasBeforeFirstPreValidationModification
|
|
783
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification
|
|
816
784
|
});
|
|
817
785
|
}
|
|
818
786
|
case RawObjectDataProcessor.ValuesTypesIDs.associativeArrayOfUniformTypeValues: {
|
|
@@ -820,8 +788,7 @@ class RawObjectDataProcessor {
|
|
|
820
788
|
targetValue__expectedToBeAssociativeArrayTypeObject: targetValue,
|
|
821
789
|
targetAssociativeArrayTypeValueSpecification: targetValueSpecification,
|
|
822
790
|
parentObject,
|
|
823
|
-
|
|
824
|
-
mustLogTargetValueAsItWasBeforeFirstPreValidationModification
|
|
791
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification
|
|
825
792
|
});
|
|
826
793
|
}
|
|
827
794
|
default: break;
|
|
@@ -831,8 +798,7 @@ class RawObjectDataProcessor {
|
|
|
831
798
|
targetValue,
|
|
832
799
|
targetValueSpecification,
|
|
833
800
|
parentObject,
|
|
834
|
-
|
|
835
|
-
mustLogTargetValueAsItWasBeforeFirstPreValidationModification
|
|
801
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification
|
|
836
802
|
});
|
|
837
803
|
}
|
|
838
804
|
Logger_1.default.logError({
|
|
@@ -844,15 +810,14 @@ class RawObjectDataProcessor {
|
|
|
844
810
|
});
|
|
845
811
|
return this.isValidationOnlyMode ? { isValidButValidationOnlyModeActive: true } : { isInvalid: true };
|
|
846
812
|
}
|
|
847
|
-
processNumberValue({ targetValue__expectedToBeNumber, targetValueSpecification, parentObject,
|
|
813
|
+
processNumberValue({ targetValue__expectedToBeNumber, targetValueSpecification, parentObject, targetPropertyStringifiedValueBeforeFirstPreValidationModification }) {
|
|
848
814
|
if (!(0, isNumber_1.default)(targetValue__expectedToBeNumber)) {
|
|
849
815
|
this.registerValidationError(this.validationErrorsMessagesBuilder.buildValueTypeDoesNotMatchWithExpectedErrorMessage({
|
|
850
816
|
targetPropertyDotSeparatedQualifiedName: this.currentObjectPropertyDotSeparatedQualifiedName,
|
|
851
817
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
852
818
|
targetPropertyValue: targetValue__expectedToBeNumber,
|
|
853
819
|
targetPropertyValueSpecification: targetValueSpecification,
|
|
854
|
-
|
|
855
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification
|
|
820
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification
|
|
856
821
|
}));
|
|
857
822
|
return { isInvalid: true };
|
|
858
823
|
}
|
|
@@ -901,8 +866,7 @@ class RawObjectDataProcessor {
|
|
|
901
866
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
902
867
|
targetPropertyValue: targetValue__expectedToBeNumber,
|
|
903
868
|
targetPropertyValueSpecification: targetValueSpecification,
|
|
904
|
-
|
|
905
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification,
|
|
869
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification,
|
|
906
870
|
expectedNumbersSet: targetValueSpecification.numbersSet
|
|
907
871
|
}));
|
|
908
872
|
return { isInvalid: true };
|
|
@@ -914,8 +878,7 @@ class RawObjectDataProcessor {
|
|
|
914
878
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
915
879
|
targetPropertyValue: targetValue__expectedToBeNumber,
|
|
916
880
|
targetPropertyValueSpecification: targetValueSpecification,
|
|
917
|
-
|
|
918
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification
|
|
881
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification
|
|
919
882
|
}));
|
|
920
883
|
return { isInvalid: true };
|
|
921
884
|
}
|
|
@@ -927,8 +890,7 @@ class RawObjectDataProcessor {
|
|
|
927
890
|
targetPropertyValue: targetValue__expectedToBeNumber,
|
|
928
891
|
targetPropertyValueSpecification: targetValueSpecification,
|
|
929
892
|
requiredMinimum: targetValueSpecification.minimalValue,
|
|
930
|
-
|
|
931
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification
|
|
893
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification
|
|
932
894
|
}));
|
|
933
895
|
return { isInvalid: true };
|
|
934
896
|
}
|
|
@@ -939,8 +901,7 @@ class RawObjectDataProcessor {
|
|
|
939
901
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
940
902
|
targetPropertyValue: targetValue__expectedToBeNumber,
|
|
941
903
|
targetPropertyValueSpecification: targetValueSpecification,
|
|
942
|
-
|
|
943
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification,
|
|
904
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification,
|
|
944
905
|
allowedMaximum: targetValueSpecification.maximalValue
|
|
945
906
|
}));
|
|
946
907
|
return { isInvalid: true };
|
|
@@ -958,8 +919,7 @@ class RawObjectDataProcessor {
|
|
|
958
919
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
959
920
|
targetPropertyValue: targetValue__expectedToBeNumber,
|
|
960
921
|
targetPropertyValueSpecification: targetValueSpecification,
|
|
961
|
-
|
|
962
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification,
|
|
922
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification,
|
|
963
923
|
customValidationDescription: customValidator.descriptionForLogging
|
|
964
924
|
}));
|
|
965
925
|
}
|
|
@@ -977,15 +937,14 @@ class RawObjectDataProcessor {
|
|
|
977
937
|
}
|
|
978
938
|
return { processedValue };
|
|
979
939
|
}
|
|
980
|
-
processStringValue({ targetValue__expectedToBeString, targetValueSpecification, parentObject,
|
|
940
|
+
processStringValue({ targetValue__expectedToBeString, targetValueSpecification, parentObject, targetPropertyStringifiedValueBeforeFirstPreValidationModification }) {
|
|
981
941
|
if (!(0, isString_1.default)(targetValue__expectedToBeString)) {
|
|
982
942
|
this.registerValidationError(this.validationErrorsMessagesBuilder.buildValueTypeDoesNotMatchWithExpectedErrorMessage({
|
|
983
943
|
targetPropertyDotSeparatedQualifiedName: this.currentObjectPropertyDotSeparatedQualifiedName,
|
|
984
944
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
985
945
|
targetPropertyValue: targetValue__expectedToBeString,
|
|
986
946
|
targetPropertyValueSpecification: targetValueSpecification,
|
|
987
|
-
|
|
988
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification
|
|
947
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification
|
|
989
948
|
}));
|
|
990
949
|
return { isInvalid: true };
|
|
991
950
|
}
|
|
@@ -996,8 +955,7 @@ class RawObjectDataProcessor {
|
|
|
996
955
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
997
956
|
targetPropertyValue: targetValue__expectedToBeString,
|
|
998
957
|
targetPropertyValueSpecification: targetValueSpecification,
|
|
999
|
-
|
|
1000
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification
|
|
958
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification
|
|
1001
959
|
}));
|
|
1002
960
|
return { isInvalid: true };
|
|
1003
961
|
}
|
|
@@ -1008,8 +966,7 @@ class RawObjectDataProcessor {
|
|
|
1008
966
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
1009
967
|
targetPropertyValue: targetValue__expectedToBeString,
|
|
1010
968
|
targetPropertyValueSpecification: targetValueSpecification,
|
|
1011
|
-
|
|
1012
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification,
|
|
969
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification,
|
|
1013
970
|
minimalCharactersCount: targetValueSpecification.minimalCharactersCount,
|
|
1014
971
|
realCharactersCount: targetValue__expectedToBeString.length
|
|
1015
972
|
}));
|
|
@@ -1022,8 +979,7 @@ class RawObjectDataProcessor {
|
|
|
1022
979
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
1023
980
|
targetPropertyValue: targetValue__expectedToBeString,
|
|
1024
981
|
targetPropertyValueSpecification: targetValueSpecification,
|
|
1025
|
-
|
|
1026
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification,
|
|
982
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification,
|
|
1027
983
|
maximalCharactersCount: targetValueSpecification.maximalCharactersCount,
|
|
1028
984
|
realCharactersCount: targetValue__expectedToBeString.length
|
|
1029
985
|
}));
|
|
@@ -1036,8 +992,7 @@ class RawObjectDataProcessor {
|
|
|
1036
992
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
1037
993
|
targetPropertyValue: targetValue__expectedToBeString,
|
|
1038
994
|
targetPropertyValueSpecification: targetValueSpecification,
|
|
1039
|
-
|
|
1040
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification,
|
|
995
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification,
|
|
1041
996
|
fixedCharactersCount: targetValueSpecification.fixedCharactersCount,
|
|
1042
997
|
realCharactersCount: targetValue__expectedToBeString.length
|
|
1043
998
|
}));
|
|
@@ -1050,8 +1005,7 @@ class RawObjectDataProcessor {
|
|
|
1050
1005
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
1051
1006
|
targetPropertyValue: targetValue__expectedToBeString,
|
|
1052
1007
|
targetPropertyValueSpecification: targetValueSpecification,
|
|
1053
|
-
|
|
1054
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification,
|
|
1008
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification,
|
|
1055
1009
|
regularExpression: targetValueSpecification.validValueRegularExpression
|
|
1056
1010
|
}));
|
|
1057
1011
|
return { isInvalid: true };
|
|
@@ -1069,8 +1023,7 @@ class RawObjectDataProcessor {
|
|
|
1069
1023
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
1070
1024
|
targetPropertyValue: targetValue__expectedToBeString,
|
|
1071
1025
|
targetPropertyValueSpecification: targetValueSpecification,
|
|
1072
|
-
|
|
1073
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification,
|
|
1026
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification,
|
|
1074
1027
|
customValidationDescription: customValidator.descriptionForLogging
|
|
1075
1028
|
}));
|
|
1076
1029
|
}
|
|
@@ -1088,15 +1041,14 @@ class RawObjectDataProcessor {
|
|
|
1088
1041
|
}
|
|
1089
1042
|
return { processedValue };
|
|
1090
1043
|
}
|
|
1091
|
-
processBooleanValue({ targetValue__expectedToBeBoolean, targetValueSpecification, parentObject,
|
|
1044
|
+
processBooleanValue({ targetValue__expectedToBeBoolean, targetValueSpecification, parentObject, targetPropertyStringifiedValueBeforeFirstPreValidationModification }) {
|
|
1092
1045
|
if (!(0, isBoolean_1.default)(targetValue__expectedToBeBoolean)) {
|
|
1093
1046
|
this.registerValidationError(this.validationErrorsMessagesBuilder.buildValueTypeDoesNotMatchWithExpectedErrorMessage({
|
|
1094
1047
|
targetPropertyDotSeparatedQualifiedName: this.currentObjectPropertyDotSeparatedQualifiedName,
|
|
1095
1048
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
1096
1049
|
targetPropertyValue: targetValue__expectedToBeBoolean,
|
|
1097
1050
|
targetPropertyValueSpecification: targetValueSpecification,
|
|
1098
|
-
|
|
1099
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification
|
|
1051
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification
|
|
1100
1052
|
}));
|
|
1101
1053
|
return { isInvalid: true };
|
|
1102
1054
|
}
|
|
@@ -1107,8 +1059,7 @@ class RawObjectDataProcessor {
|
|
|
1107
1059
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
1108
1060
|
targetPropertyValue: targetValue__expectedToBeBoolean,
|
|
1109
1061
|
targetPropertyValueSpecification: targetValueSpecification,
|
|
1110
|
-
|
|
1111
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification,
|
|
1062
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification,
|
|
1112
1063
|
disallowedVariant: !(targetValueSpecification.trueOnly === true)
|
|
1113
1064
|
}));
|
|
1114
1065
|
return { isInvalid: true };
|
|
@@ -1127,8 +1078,7 @@ class RawObjectDataProcessor {
|
|
|
1127
1078
|
targetPropertyValue: targetValue__expectedToBeBoolean,
|
|
1128
1079
|
targetPropertyValueSpecification: targetValueSpecification,
|
|
1129
1080
|
customValidationDescription: customValidator.descriptionForLogging,
|
|
1130
|
-
|
|
1131
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification
|
|
1081
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification
|
|
1132
1082
|
}));
|
|
1133
1083
|
}
|
|
1134
1084
|
}
|
|
@@ -1145,7 +1095,7 @@ class RawObjectDataProcessor {
|
|
|
1145
1095
|
}
|
|
1146
1096
|
return { processedValue };
|
|
1147
1097
|
}
|
|
1148
|
-
processMultipleTypesAllowedValue({ targetValue, targetValueSpecification, parentObject,
|
|
1098
|
+
processMultipleTypesAllowedValue({ targetValue, targetValueSpecification, parentObject, targetPropertyStringifiedValueBeforeFirstPreValidationModification }) {
|
|
1149
1099
|
let specificationForCurrentValueType;
|
|
1150
1100
|
switch (typeof targetValue) {
|
|
1151
1101
|
case "number": {
|
|
@@ -1182,8 +1132,7 @@ class RawObjectDataProcessor {
|
|
|
1182
1132
|
targetPropertyNewName: this.currentlyIteratedPropertyNewNameForLogging,
|
|
1183
1133
|
targetPropertyValue: targetValue,
|
|
1184
1134
|
targetPropertyValueSpecification: targetValueSpecification,
|
|
1185
|
-
|
|
1186
|
-
mustLogTargetPropertyValueBeforeFirstPreValidationModification: mustLogTargetValueAsItWasBeforeFirstPreValidationModification
|
|
1135
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification
|
|
1187
1136
|
}),
|
|
1188
1137
|
occurrenceLocation: "RawObjectDataProcessor.processMultipleTypesAllowedValue(parametersObject)"
|
|
1189
1138
|
});
|
|
@@ -1209,8 +1158,7 @@ class RawObjectDataProcessor {
|
|
|
1209
1158
|
targetValue,
|
|
1210
1159
|
targetValueSpecification: specificationForCurrentValueType,
|
|
1211
1160
|
parentObject,
|
|
1212
|
-
|
|
1213
|
-
mustLogTargetValueAsItWasBeforeFirstPreValidationModification
|
|
1161
|
+
targetPropertyStringifiedValueBeforeFirstPreValidationModification
|
|
1214
1162
|
});
|
|
1215
1163
|
}
|
|
1216
1164
|
registerValidationError(errorMessage) {
|