ts-fortress 2.6.2 → 2.8.0

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.
Files changed (117) hide show
  1. package/dist/branded/brand.d.mts +3 -2
  2. package/dist/branded/brand.d.mts.map +1 -1
  3. package/dist/branded/brand.mjs +8 -7
  4. package/dist/branded/brand.mjs.map +1 -1
  5. package/dist/branded/number/finite-number.d.mts.map +1 -1
  6. package/dist/branded/number/finite-number.mjs +1 -0
  7. package/dist/branded/number/finite-number.mjs.map +1 -1
  8. package/dist/branded/number/int.d.mts.map +1 -1
  9. package/dist/branded/number/int.mjs +1 -0
  10. package/dist/branded/number/int.mjs.map +1 -1
  11. package/dist/branded/number/int16.d.mts.map +1 -1
  12. package/dist/branded/number/int16.mjs +1 -0
  13. package/dist/branded/number/int16.mjs.map +1 -1
  14. package/dist/branded/number/int32.d.mts.map +1 -1
  15. package/dist/branded/number/int32.mjs +1 -0
  16. package/dist/branded/number/int32.mjs.map +1 -1
  17. package/dist/branded/number/non-negative-finite-number.d.mts.map +1 -1
  18. package/dist/branded/number/non-negative-finite-number.mjs +1 -0
  19. package/dist/branded/number/non-negative-finite-number.mjs.map +1 -1
  20. package/dist/branded/number/non-zero-finite-number.d.mts.map +1 -1
  21. package/dist/branded/number/non-zero-finite-number.mjs +1 -0
  22. package/dist/branded/number/non-zero-finite-number.mjs.map +1 -1
  23. package/dist/branded/number/non-zero-int.d.mts.map +1 -1
  24. package/dist/branded/number/non-zero-int.mjs +1 -0
  25. package/dist/branded/number/non-zero-int.mjs.map +1 -1
  26. package/dist/branded/number/non-zero-safe-int.d.mts.map +1 -1
  27. package/dist/branded/number/non-zero-safe-int.mjs +1 -0
  28. package/dist/branded/number/non-zero-safe-int.mjs.map +1 -1
  29. package/dist/branded/number/positive-finite-number.d.mts.map +1 -1
  30. package/dist/branded/number/positive-finite-number.mjs +1 -0
  31. package/dist/branded/number/positive-finite-number.mjs.map +1 -1
  32. package/dist/branded/number/positive-int.d.mts.map +1 -1
  33. package/dist/branded/number/positive-int.mjs +1 -0
  34. package/dist/branded/number/positive-int.mjs.map +1 -1
  35. package/dist/branded/number/positive-safe-int.d.mts.map +1 -1
  36. package/dist/branded/number/positive-safe-int.mjs +1 -0
  37. package/dist/branded/number/positive-safe-int.mjs.map +1 -1
  38. package/dist/branded/number/safe-int.d.mts.map +1 -1
  39. package/dist/branded/number/safe-int.mjs +1 -0
  40. package/dist/branded/number/safe-int.mjs.map +1 -1
  41. package/dist/branded/number/safe-uint.d.mts.map +1 -1
  42. package/dist/branded/number/safe-uint.mjs +1 -0
  43. package/dist/branded/number/safe-uint.mjs.map +1 -1
  44. package/dist/branded/number/uint.d.mts.map +1 -1
  45. package/dist/branded/number/uint.mjs +1 -0
  46. package/dist/branded/number/uint.mjs.map +1 -1
  47. package/dist/branded/number/uint16.d.mts.map +1 -1
  48. package/dist/branded/number/uint16.mjs +1 -0
  49. package/dist/branded/number/uint16.mjs.map +1 -1
  50. package/dist/branded/number/uint32.d.mts.map +1 -1
  51. package/dist/branded/number/uint32.mjs +1 -0
  52. package/dist/branded/number/uint32.mjs.map +1 -1
  53. package/dist/utils/create-cast-fn.d.mts.map +1 -1
  54. package/dist/utils/create-cast-fn.mjs +1 -2
  55. package/dist/utils/create-cast-fn.mjs.map +1 -1
  56. package/dist/utils/validation-error.d.mts +2 -2
  57. package/dist/utils/validation-error.d.mts.map +1 -1
  58. package/dist/utils/validation-error.mjs +10 -3
  59. package/dist/utils/validation-error.mjs.map +1 -1
  60. package/package.json +2 -2
  61. package/src/array/array-of-length.test.mts +2 -2
  62. package/src/array/array.test.mts +2 -4
  63. package/src/array/non-empty-array.test.mts +2 -2
  64. package/src/array/tuple.test.mts +2 -2
  65. package/src/branded/brand.mts +16 -20
  66. package/src/branded/number/finite-number.mts +1 -0
  67. package/src/branded/number/finite-number.test.mts +5 -6
  68. package/src/branded/number/int.mts +1 -0
  69. package/src/branded/number/int.test.mts +6 -7
  70. package/src/branded/number/int16.mts +1 -0
  71. package/src/branded/number/int16.test.mts +4 -6
  72. package/src/branded/number/int32.mts +1 -0
  73. package/src/branded/number/int32.test.mts +4 -6
  74. package/src/branded/number/non-negative-finite-number.mts +1 -0
  75. package/src/branded/number/non-negative-finite-number.test.mts +4 -6
  76. package/src/branded/number/non-zero-finite-number.mts +1 -0
  77. package/src/branded/number/non-zero-finite-number.test.mts +4 -5
  78. package/src/branded/number/non-zero-int.mts +1 -0
  79. package/src/branded/number/non-zero-int.test.mts +4 -5
  80. package/src/branded/number/non-zero-safe-int.mts +1 -0
  81. package/src/branded/number/non-zero-safe-int.test.mts +4 -5
  82. package/src/branded/number/positive-finite-number.mts +1 -0
  83. package/src/branded/number/positive-finite-number.test.mts +4 -6
  84. package/src/branded/number/positive-int.mts +1 -0
  85. package/src/branded/number/positive-int.test.mts +6 -8
  86. package/src/branded/number/positive-safe-int.mts +1 -0
  87. package/src/branded/number/positive-safe-int.test.mts +4 -6
  88. package/src/branded/number/safe-int.mts +1 -0
  89. package/src/branded/number/safe-int.test.mts +4 -5
  90. package/src/branded/number/safe-uint.mts +1 -0
  91. package/src/branded/number/safe-uint.test.mts +4 -6
  92. package/src/branded/number/uint.mts +1 -0
  93. package/src/branded/number/uint.test.mts +6 -8
  94. package/src/branded/number/uint16.mts +1 -0
  95. package/src/branded/number/uint16.test.mts +4 -6
  96. package/src/branded/number/uint32.mts +1 -0
  97. package/src/branded/number/uint32.test.mts +4 -6
  98. package/src/branded/simple-branded-number.test.mts +4 -4
  99. package/src/branded/simple-branded-string.test.mts +6 -6
  100. package/src/compose/intersection.test.mts +2 -2
  101. package/src/enum/enum.test.mts +0 -2
  102. package/src/enum/uint-range.test.mts +0 -2
  103. package/src/primitives/bigint.test.mts +3 -3
  104. package/src/primitives/boolean.test.mts +4 -4
  105. package/src/primitives/null.test.mts +3 -3
  106. package/src/primitives/number.test.mts +5 -3
  107. package/src/primitives/string.test.mts +6 -4
  108. package/src/primitives/symbol.test.mts +1 -1
  109. package/src/primitives/undefined.test.mts +3 -3
  110. package/src/record/key-value-record.test.mts +2 -2
  111. package/src/record/omit.test.mts +1 -1
  112. package/src/record/partial.test.mts +5 -5
  113. package/src/record/pick.test.mts +1 -1
  114. package/src/record/record.test.mts +4 -4
  115. package/src/utils/create-cast-fn.mts +2 -8
  116. package/src/utils/validation-error.mts +18 -3
  117. package/src/utils/validation-error.test.mts +3 -3
@@ -15,7 +15,7 @@ describe('simpleBrandedNumber', () => {
15
15
 
16
16
  test('creates branded number type with default value 0', () => {
17
17
  expect(userIdType.defaultValue).toBe(0);
18
- expect(userIdType.typeName).toBe('UserId');
18
+ expect(userIdType.typeName).toBe('"UserId"');
19
19
  });
20
20
 
21
21
  describe('is', () => {
@@ -69,7 +69,7 @@ describe('simpleBrandedNumber', () => {
69
69
  },
70
70
  ]);
71
71
  expect(validationErrorsToMessages(result.value)).toStrictEqual([
72
- 'Expected number, got string',
72
+ 'Expected <number>, got <string> type value "not a number".',
73
73
  ]);
74
74
  }
75
75
  });
@@ -105,7 +105,7 @@ describe('simpleBrandedNumber', () => {
105
105
 
106
106
  test('creates branded number type with custom default value', () => {
107
107
  expect(scoreType.defaultValue).toBe(100);
108
- expect(scoreType.typeName).toBe('Score');
108
+ expect(scoreType.typeName).toBe('"Score"');
109
109
  });
110
110
 
111
111
  describe('validate', () => {
@@ -142,7 +142,7 @@ describe('simpleBrandedNumber', () => {
142
142
  },
143
143
  ]);
144
144
  expect(validationErrorsToMessages(result.value)).toStrictEqual([
145
- 'Expected number, got string',
145
+ 'Expected <number>, got <string> type value "invalid".',
146
146
  ]);
147
147
  }
148
148
  });
@@ -15,7 +15,7 @@ describe('simpleBrandedString', () => {
15
15
 
16
16
  test('creates branded string type with default value empty string', () => {
17
17
  expect(userNameType.defaultValue).toBe('');
18
- expect(userNameType.typeName).toBe('UserName');
18
+ expect(userNameType.typeName).toBe('"UserName"');
19
19
  });
20
20
 
21
21
  describe('is', () => {
@@ -70,7 +70,7 @@ describe('simpleBrandedString', () => {
70
70
  },
71
71
  ]);
72
72
  expect(validationErrorsToMessages(result.value)).toStrictEqual([
73
- 'Expected string, got number',
73
+ 'Expected <string>, got <number> type value `42`.',
74
74
  ]);
75
75
  }
76
76
  });
@@ -106,7 +106,7 @@ describe('simpleBrandedString', () => {
106
106
 
107
107
  test('creates branded string type with custom default value', () => {
108
108
  expect(categoryType.defaultValue).toBe('general');
109
- expect(categoryType.typeName).toBe('Category');
109
+ expect(categoryType.typeName).toBe('"Category"');
110
110
  });
111
111
 
112
112
  describe('validate', () => {
@@ -143,7 +143,7 @@ describe('simpleBrandedString', () => {
143
143
  },
144
144
  ]);
145
145
  expect(validationErrorsToMessages(result.value)).toStrictEqual([
146
- 'Expected string, got object',
146
+ 'Expected <string>, got <object> type value `null`.',
147
147
  ]);
148
148
  }
149
149
  });
@@ -189,8 +189,8 @@ describe('simpleBrandedString', () => {
189
189
  expectType<FirstName, Brand<string, 'FirstName'>>('=');
190
190
  expectType<LastName, Brand<string, 'LastName'>>('=');
191
191
 
192
- expect(firstNameType.typeName).toBe('FirstName');
193
- expect(lastNameType.typeName).toBe('LastName');
192
+ expect(firstNameType.typeName).toBe('"FirstName"');
193
+ expect(lastNameType.typeName).toBe('"LastName"');
194
194
  });
195
195
  });
196
196
  });
@@ -251,9 +251,9 @@ describe('intersection', () => {
251
251
  ]);
252
252
  expect(validationErrorsToMessages(result.value)).toStrictEqual([
253
253
  'The type of value is expected to match all types of { number, number }',
254
- 'Expected number, got string',
254
+ 'Expected <number>, got <string> type value "aaa".',
255
255
  'The type of value is expected to match all types of { number, number }',
256
- 'Expected number, got string',
256
+ 'Expected <number>, got <string> type value "aaa".',
257
257
  ]);
258
258
  }
259
259
  });
@@ -72,8 +72,6 @@ describe('enumType', () => {
72
72
  expect(validationErrorsToMessages(result.value)).toStrictEqual([
73
73
  'The value is expected to be one of the elements contained in { 3, 2, a }',
74
74
  ]);
75
- } else {
76
- throw new Error('Expected validation to fail');
77
75
  }
78
76
  });
79
77
 
@@ -81,8 +81,6 @@ describe('uintRange', () => {
81
81
  expect(validationErrorsToMessages(result.value)).toStrictEqual([
82
82
  'The value is expected to be an integer between 1 and 12',
83
83
  ]);
84
- } else {
85
- throw new Error('Expected validation to fail');
86
84
  }
87
85
  });
88
86
  });
@@ -64,7 +64,7 @@ describe('bigint', () => {
64
64
  ]);
65
65
 
66
66
  expect(validationErrorsToMessages(result.value)).toStrictEqual([
67
- 'Expected bigint, got number',
67
+ 'Expected <bigint>, got <number> type value `123`.',
68
68
  ]);
69
69
  }
70
70
  });
@@ -199,7 +199,7 @@ describe('bigintLiteral', () => {
199
199
  ]);
200
200
 
201
201
  expect(validationErrorsToMessages(result.value)).toStrictEqual([
202
- 'Expected bigintLiteral(42), got bigint',
202
+ 'Expected <bigintLiteral(42)>, got <bigint> type value `99`.',
203
203
  ]);
204
204
  }
205
205
  });
@@ -220,7 +220,7 @@ describe('bigintLiteral', () => {
220
220
  ]);
221
221
 
222
222
  expect(validationErrorsToMessages(result.value)).toStrictEqual([
223
- 'Expected bigintLiteral(42), got string',
223
+ 'Expected <bigintLiteral(42)>, got <string> type value "not a bigint".',
224
224
  ]);
225
225
  }
226
226
  });
@@ -64,7 +64,7 @@ describe('boolean', () => {
64
64
  ]);
65
65
 
66
66
  expect(validationErrorsToMessages(result.value)).toStrictEqual([
67
- 'Expected boolean, got string',
67
+ 'Expected <boolean>, got <string> type value "not a boolean".',
68
68
  ]);
69
69
  }
70
70
  });
@@ -202,7 +202,7 @@ describe('booleanLiteral', () => {
202
202
  ]);
203
203
 
204
204
  expect(validationErrorsToMessages(result.value)).toStrictEqual([
205
- 'Expected booleanLiteral(true), got boolean',
205
+ 'Expected <booleanLiteral(true)>, got <boolean> type value `false`.',
206
206
  ]);
207
207
  }
208
208
  });
@@ -223,7 +223,7 @@ describe('booleanLiteral', () => {
223
223
  ]);
224
224
 
225
225
  expect(validationErrorsToMessages(result.value)).toStrictEqual([
226
- 'Expected booleanLiteral(true), got string',
226
+ 'Expected <booleanLiteral(true)>, got <string> type value "not a boolean".',
227
227
  ]);
228
228
  }
229
229
  });
@@ -318,7 +318,7 @@ describe('booleanLiteral', () => {
318
318
  ]);
319
319
 
320
320
  expect(validationErrorsToMessages(result.value)).toStrictEqual([
321
- 'Expected booleanLiteral(false), got boolean',
321
+ 'Expected <booleanLiteral(false)>, got <boolean> type value `true`.',
322
322
  ]);
323
323
  }
324
324
  });
@@ -68,7 +68,7 @@ describe('nullType', () => {
68
68
  const value: unknown = undefined;
69
69
  expect(() => {
70
70
  nullType.assertIs(value);
71
- }).toThrow('Expected null, got undefined');
71
+ }).toThrow('Expected <null>, got <undefined> type value `undefined`.');
72
72
  });
73
73
  });
74
74
 
@@ -82,7 +82,7 @@ describe('nullType', () => {
82
82
  test('non-null throws error', () => {
83
83
  const value: unknown = undefined;
84
84
  expect(() => nullType.cast(value)).toThrow(
85
- 'Expected null, got undefined',
85
+ 'Expected <null>, got <undefined> type value `undefined`.',
86
86
  );
87
87
  });
88
88
 
@@ -91,7 +91,7 @@ describe('nullType', () => {
91
91
 
92
92
  for (const value of values) {
93
93
  expect(() => nullType.cast(value)).toThrow(
94
- /Expected null, got (number|string|boolean|undefined)/u,
94
+ /Expected <null>, got <(number|string|boolean|undefined)> type value/u,
95
95
  );
96
96
  }
97
97
  });
@@ -88,7 +88,7 @@ describe('number', () => {
88
88
  const value: unknown = '42';
89
89
  expect(() => {
90
90
  assertIs(value);
91
- }).toThrow(/Expected number/u);
91
+ }).toThrow(/Expected <number>/u);
92
92
  });
93
93
  });
94
94
 
@@ -101,14 +101,16 @@ describe('number', () => {
101
101
 
102
102
  test('invalid value throws error', () => {
103
103
  const value: unknown = 'not a number';
104
- expect(() => num.cast(value)).toThrow('Expected number, got string');
104
+ expect(() => num.cast(value)).toThrow(
105
+ 'Expected <number>, got <string> type value "not a number".',
106
+ );
105
107
  });
106
108
 
107
109
  test('throws error with type mismatch', () => {
108
110
  const numWithDefault = number(100);
109
111
  const value: unknown = 'not a number';
110
112
  expect(() => numWithDefault.cast(value)).toThrow(
111
- 'Expected number, got string',
113
+ 'Expected <number>, got <string> type value "not a number".',
112
114
  );
113
115
  });
114
116
  });
@@ -91,7 +91,7 @@ describe('string', () => {
91
91
  const value: unknown = 42;
92
92
  expect(() => {
93
93
  assertIs(value);
94
- }).toThrow(/Expected string/u);
94
+ }).toThrow(/Expected <string>/u);
95
95
  });
96
96
  });
97
97
 
@@ -104,14 +104,16 @@ describe('string', () => {
104
104
 
105
105
  test('invalid value throws error', () => {
106
106
  const value: unknown = 42;
107
- expect(() => str.cast(value)).toThrow('Expected string, got number');
107
+ expect(() => str.cast(value)).toThrow(
108
+ 'Expected <string>, got <number> type value `42`.',
109
+ );
108
110
  });
109
111
 
110
112
  test('throws error with type mismatch', () => {
111
113
  const strWithDefault = string('default');
112
114
  const value: unknown = 42;
113
115
  expect(() => strWithDefault.cast(value)).toThrow(
114
- 'Expected string, got number',
116
+ 'Expected <string>, got <number> type value `42`.',
115
117
  );
116
118
  });
117
119
  });
@@ -332,7 +334,7 @@ describe('stringLiteral', () => {
332
334
  test('invalid value throws error', () => {
333
335
  const value: unknown = 'world';
334
336
  expect(() => hello.cast(value)).toThrow(
335
- 'Expected stringLiteral("hello"), got string',
337
+ 'Expected <stringLiteral("hello")>, got <string> type value "world".',
336
338
  );
337
339
  });
338
340
  });
@@ -66,7 +66,7 @@ describe('symbol', () => {
66
66
  ]);
67
67
 
68
68
  expect(validationErrorsToMessages(result.value)).toStrictEqual([
69
- 'Expected symbol, got string',
69
+ 'Expected <symbol>, got <string> type value "not a symbol".',
70
70
  ]);
71
71
  }
72
72
  });
@@ -77,7 +77,7 @@ describe('undefinedType', () => {
77
77
  const value: unknown = null;
78
78
  expect(() => {
79
79
  undefinedType.assertIs(value);
80
- }).toThrow(`Expected undefined, got ${typeof value}`);
80
+ }).toThrow('Expected <undefined>, got <object> type value `null`.');
81
81
  });
82
82
  });
83
83
 
@@ -92,7 +92,7 @@ describe('undefinedType', () => {
92
92
  const value: unknown = null;
93
93
  expect(() => {
94
94
  undefinedType.cast(value);
95
- }).toThrow('Expected undefined, got object');
95
+ }).toThrow('Expected <undefined>, got <object> type value `null`.');
96
96
  });
97
97
 
98
98
  test('any non-undefined value throws error', () => {
@@ -101,7 +101,7 @@ describe('undefinedType', () => {
101
101
  for (const value of values) {
102
102
  expect(() => {
103
103
  undefinedType.cast(value);
104
- }).toThrow(`Expected undefined, got ${typeof value}`);
104
+ }).toThrow(/^Expected <undefined>, got <.*> type value .+\.$/u);
105
105
  }
106
106
  });
107
107
  });
@@ -130,9 +130,9 @@ describe('keyValueRecord', () => {
130
130
  ]);
131
131
  expect(validationErrorsToMessages(result.value)).toStrictEqual([
132
132
  'The value of the record is expected to be <number>',
133
- 'Expected number at month, got string',
133
+ 'Expected <number> at month, got <string> type value "ab".',
134
134
  'The value of the record is expected to be <number>',
135
- 'Expected number at date, got string',
135
+ 'Expected <number> at date, got <string> type value "cd".',
136
136
  ]);
137
137
  }
138
138
  });
@@ -138,7 +138,7 @@ describe('omit', () => {
138
138
  },
139
139
  ]);
140
140
  expect(validationErrorsToMessages(result.value)).toStrictEqual([
141
- 'Expected number at month, got string',
141
+ 'Expected <number> at month, got <string> type value "ab".',
142
142
  ]);
143
143
  }
144
144
  });
@@ -186,8 +186,8 @@ describe('partial', () => {
186
186
  },
187
187
  ]);
188
188
  expect(validationErrorsToMessages(result.value)).toStrictEqual([
189
- 'Expected number at month, got string',
190
- 'Expected number at date, got string',
189
+ 'Expected <number> at month, got <string> type value "ab".',
190
+ 'Expected <number> at date, got <string> type value "cd".',
191
191
  ]);
192
192
  }
193
193
  });
@@ -212,7 +212,7 @@ describe('partial', () => {
212
212
  },
213
213
  ]);
214
214
  expect(validationErrorsToMessages(result.value)).toStrictEqual([
215
- 'Expected number at month, got string',
215
+ 'Expected <number> at month, got <string> type value "ab".',
216
216
  ]);
217
217
  }
218
218
  });
@@ -385,8 +385,8 @@ describe('partial', () => {
385
385
  },
386
386
  ]);
387
387
  expect(validationErrorsToMessages(result.value)).toStrictEqual([
388
- 'Expected number at month, got string',
389
- 'Expected number at date, got string',
388
+ 'Expected <number> at month, got <string> type value "ab".',
389
+ 'Expected <number> at date, got <string> type value "cd".',
390
390
  ]);
391
391
  }
392
392
  });
@@ -138,7 +138,7 @@ describe('pick', () => {
138
138
  },
139
139
  ]);
140
140
  expect(validationErrorsToMessages(result.value)).toStrictEqual([
141
- 'Expected number at month, got string',
141
+ 'Expected <number> at month, got <string> type value "ab".',
142
142
  ]);
143
143
  }
144
144
  });
@@ -106,8 +106,8 @@ describe('record', () => {
106
106
  },
107
107
  ]);
108
108
  expect(validationErrorsToMessages(result.value)).toStrictEqual([
109
- 'Expected number at month, got string',
110
- 'Expected number at date, got string',
109
+ 'Expected <number> at month, got <string> type value "ab".',
110
+ 'Expected <number> at date, got <string> type value "cd".',
111
111
  ]);
112
112
  }
113
113
  });
@@ -319,8 +319,8 @@ describe('partial record', () => {
319
319
  },
320
320
  ]);
321
321
  expect(validationErrorsToMessages(result.value)).toStrictEqual([
322
- 'Expected number at month, got string',
323
- 'Expected number at date, got string',
322
+ 'Expected <number> at month, got <string> type value "ab".',
323
+ 'Expected <number> at date, got <string> type value "cd".',
324
324
  ]);
325
325
  }
326
326
  });
@@ -1,19 +1,13 @@
1
1
  import { Result } from 'ts-data-forge';
2
2
  import { type Type } from '../type.mjs';
3
- import {
4
- validationErrorsToMessages,
5
- type ValidationError,
6
- } from './validation-error.mjs';
7
-
8
- const validationResultToString = (result: readonly ValidationError[]): string =>
9
- `\n${validationErrorsToMessages(result).join(',\n')}`;
3
+ import { validationErrorsToMessages } from './validation-error.mjs';
10
4
 
11
5
  export const createCastFn =
12
6
  <T,>(validate: Type<T>['validate']) =>
13
7
  (a: unknown): T => {
14
8
  const res = validate(a);
15
9
  if (Result.isErr(res)) {
16
- throw new Error(validationResultToString(res.value));
10
+ throw new Error(validationErrorsToMessages(res.value).join('\n'));
17
11
  }
18
12
  return res.value;
19
13
  };
@@ -1,3 +1,5 @@
1
+ import { isString, pipe, unknownToString } from 'ts-data-forge';
2
+
1
3
  /**
2
4
  * Represents a validation error with structured information
3
5
  */
@@ -21,7 +23,10 @@ export type ValidationErrorWithMessage = MergeIntersection<
21
23
  /**
22
24
  * Converts a validation error to a human-readable string message
23
25
  */
24
- export const validationErrorToMessage = (error: ValidationError): string => {
26
+ export const validationErrorToMessage = (
27
+ error: ValidationError,
28
+ maxLengthToPrintActualValue: number = 20,
29
+ ): string => {
25
30
  const pathStr = error.path.length > 0 ? ` at ${error.path.join('.')}` : '';
26
31
  const actualTypeStr = typeof error.actualValue;
27
32
 
@@ -29,7 +34,15 @@ export const validationErrorToMessage = (error: ValidationError): string => {
29
34
  return `${error.message}${pathStr}`;
30
35
  }
31
36
 
32
- return `Expected ${error.expectedType}${pathStr}, got ${actualTypeStr}`;
37
+ const actualValueStr: string = isString(error.actualValue)
38
+ ? error.actualValue.length <= maxLengthToPrintActualValue
39
+ ? ` "${error.actualValue}"`
40
+ : ''
41
+ : pipe(unknownToString(error.actualValue)).map((s) =>
42
+ s.length <= maxLengthToPrintActualValue ? ` \`${s}\`` : '',
43
+ ).value;
44
+
45
+ return `Expected <${error.expectedType}>${pathStr}, got <${actualTypeStr}> type value${actualValueStr}.`;
33
46
  };
34
47
 
35
48
  /**
@@ -38,7 +51,9 @@ export const validationErrorToMessage = (error: ValidationError): string => {
38
51
  */
39
52
  export const validationErrorsToMessages = (
40
53
  errors: readonly ValidationError[],
41
- ): readonly string[] => errors.map(validationErrorToMessage);
54
+ maxLengthToPrintActualValue: number = 20,
55
+ ): readonly string[] =>
56
+ errors.map((e) => validationErrorToMessage(e, maxLengthToPrintActualValue));
42
57
 
43
58
  /**
44
59
  * Prepends a path segment to all validation errors
@@ -144,9 +144,9 @@ describe('validation-error', () => {
144
144
  ];
145
145
 
146
146
  expect(validationErrorsToMessages(errors)).toStrictEqual([
147
- 'Expected string at user.name, got number',
148
- 'Expected number at items.0, got string',
149
- 'Expected boolean, got object',
147
+ 'Expected <string> at user.name, got <number> type value `123`.',
148
+ 'Expected <number> at items.0, got <string> type value "invalid".',
149
+ 'Expected <boolean>, got <object> type value `null`.',
150
150
  ]);
151
151
  });
152
152