@researchdatabox/sails-ng-common 0.0.1-beta.9474 → 0.0.1-beta.9700

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 (108) hide show
  1. package/dist/src/config/component/accordion.model.d.ts +6 -6
  2. package/dist/src/config/component/accordion.model.js +13 -13
  3. package/dist/src/config/component/action-row-layout.model.d.ts +1 -1
  4. package/dist/src/config/component/action-row-layout.model.js +3 -3
  5. package/dist/src/config/component/cancel-button.model.d.ts +2 -2
  6. package/dist/src/config/component/cancel-button.model.js +5 -5
  7. package/dist/src/config/component/checkbox-input.model.d.ts +3 -3
  8. package/dist/src/config/component/checkbox-input.model.js +7 -7
  9. package/dist/src/config/component/checkbox-tree.model.d.ts +3 -3
  10. package/dist/src/config/component/checkbox-tree.model.js +7 -7
  11. package/dist/src/config/component/content.model.d.ts +2 -2
  12. package/dist/src/config/component/content.model.js +5 -5
  13. package/dist/src/config/component/data-location.model.d.ts +3 -3
  14. package/dist/src/config/component/data-location.model.js +7 -7
  15. package/dist/src/config/component/date-input.model.d.ts +3 -3
  16. package/dist/src/config/component/date-input.model.js +7 -7
  17. package/dist/src/config/component/default-layout.model.d.ts +1 -1
  18. package/dist/src/config/component/default-layout.model.js +3 -3
  19. package/dist/src/config/component/delete-button.model.d.ts +2 -2
  20. package/dist/src/config/component/delete-button.model.js +5 -5
  21. package/dist/src/config/component/dropdown-input.model.d.ts +3 -3
  22. package/dist/src/config/component/dropdown-input.model.js +7 -7
  23. package/dist/src/config/component/file-upload.model.d.ts +3 -3
  24. package/dist/src/config/component/file-upload.model.js +7 -7
  25. package/dist/src/config/component/group.model.d.ts +3 -3
  26. package/dist/src/config/component/group.model.js +7 -7
  27. package/dist/src/config/component/inline-layout.model.d.ts +1 -1
  28. package/dist/src/config/component/inline-layout.model.js +3 -3
  29. package/dist/src/config/component/map.model.d.ts +3 -3
  30. package/dist/src/config/component/map.model.js +7 -7
  31. package/dist/src/config/component/pdf-list.model.d.ts +3 -3
  32. package/dist/src/config/component/pdf-list.model.js +7 -7
  33. package/dist/src/config/component/publish-data-location-refresh.model.d.ts +3 -2
  34. package/dist/src/config/component/publish-data-location-refresh.model.js +6 -5
  35. package/dist/src/config/component/publish-data-location-refresh.outline.d.ts +5 -0
  36. package/dist/src/config/component/publish-data-location-selector.model.d.ts +9 -5
  37. package/dist/src/config/component/publish-data-location-selector.model.js +13 -9
  38. package/dist/src/config/component/publish-data-location-selector.outline.d.ts +8 -3
  39. package/dist/src/config/component/publish-data-location-selector.outline.js +1 -1
  40. package/dist/src/config/component/question-tree.model.d.ts +3 -3
  41. package/dist/src/config/component/question-tree.model.js +7 -7
  42. package/dist/src/config/component/radio-input.model.d.ts +3 -3
  43. package/dist/src/config/component/radio-input.model.js +7 -7
  44. package/dist/src/config/component/record-metadata-retriever.model.d.ts +2 -2
  45. package/dist/src/config/component/record-metadata-retriever.model.js +5 -5
  46. package/dist/src/config/component/record-selector.model.d.ts +3 -3
  47. package/dist/src/config/component/record-selector.model.js +7 -7
  48. package/dist/src/config/component/repeatable.model.d.ts +4 -4
  49. package/dist/src/config/component/repeatable.model.js +9 -9
  50. package/dist/src/config/component/reusable.model.d.ts +2 -2
  51. package/dist/src/config/component/reusable.model.js +5 -5
  52. package/dist/src/config/component/rich-text-editor.model.d.ts +3 -3
  53. package/dist/src/config/component/rich-text-editor.model.js +7 -7
  54. package/dist/src/config/component/save-button.model.d.ts +6 -2
  55. package/dist/src/config/component/save-button.model.js +9 -5
  56. package/dist/src/config/component/save-button.outline.d.ts +17 -0
  57. package/dist/src/config/component/save-status.model.d.ts +2 -2
  58. package/dist/src/config/component/save-status.model.js +5 -5
  59. package/dist/src/config/component/simple-input.model.d.ts +3 -3
  60. package/dist/src/config/component/simple-input.model.js +7 -7
  61. package/dist/src/config/component/suggested-validation-summary.model.d.ts +2 -2
  62. package/dist/src/config/component/suggested-validation-summary.model.js +5 -5
  63. package/dist/src/config/component/tab-content.model.d.ts +3 -3
  64. package/dist/src/config/component/tab-content.model.js +7 -7
  65. package/dist/src/config/component/tab-nav-button.model.d.ts +2 -2
  66. package/dist/src/config/component/tab-nav-button.model.js +5 -5
  67. package/dist/src/config/component/tab.model.d.ts +3 -3
  68. package/dist/src/config/component/tab.model.js +7 -7
  69. package/dist/src/config/component/text-area.model.d.ts +3 -3
  70. package/dist/src/config/component/text-area.model.js +7 -7
  71. package/dist/src/config/component/typeahead-input.model.d.ts +3 -3
  72. package/dist/src/config/component/typeahead-input.model.js +7 -7
  73. package/dist/src/config/component/validation-summary.model.d.ts +2 -2
  74. package/dist/src/config/component/validation-summary.model.js +5 -5
  75. package/dist/src/config/field.model.d.ts +1 -1
  76. package/dist/src/config/form-component.model.d.ts +1 -1
  77. package/dist/src/config/form-component.model.js +1 -1
  78. package/dist/src/config/form-config.model.d.ts +1 -1
  79. package/dist/src/config/form-config.model.js +3 -3
  80. package/dist/src/config/form-config.outline.d.ts +2 -4
  81. package/dist/src/config/form-override.model.js +1 -1
  82. package/dist/src/config/form-prehydrate.outline.d.ts +17 -0
  83. package/dist/src/config/form-prehydrate.outline.js +5 -0
  84. package/dist/src/config/form-types.model.js +2 -2
  85. package/dist/src/config/helpers.d.ts +8 -0
  86. package/dist/src/config/helpers.js +18 -1
  87. package/dist/src/config/names/naming-helpers.d.ts +41 -0
  88. package/dist/src/config/names/naming-helpers.js +122 -6
  89. package/dist/src/config/names/query-helpers.js +3 -8
  90. package/dist/src/config/visitor/base.model.d.ts +94 -94
  91. package/dist/src/config/visitor/base.model.js +188 -188
  92. package/dist/src/config/visitor/base.outline.d.ts +95 -95
  93. package/dist/src/config/visitor/common.model.d.ts +2 -2
  94. package/dist/src/config/visitor/common.model.js +8 -8
  95. package/dist/src/index.d.ts +2 -0
  96. package/dist/src/index.js +3 -1
  97. package/dist/src/jsonata-helpers.d.ts +25 -0
  98. package/dist/src/jsonata-helpers.js +46 -0
  99. package/dist/src/template.outline.js +3 -2
  100. package/dist/src/validation/form.model.d.ts +62 -7
  101. package/dist/src/validation/form.model.js +1 -1
  102. package/dist/src/validation/helpers.d.ts +3 -1
  103. package/dist/src/validation/helpers.js +29 -2
  104. package/dist/src/validation/validators-support.d.ts +9 -9
  105. package/dist/src/validation/validators-support.js +52 -28
  106. package/dist/src/validation/validators.d.ts +8 -10
  107. package/dist/src/validation/validators.js +94 -191
  108. package/package.json +2 -2
@@ -9,29 +9,23 @@ const helpers_1 = require("./helpers");
9
9
  */
10
10
  exports.FORM_VALIDATOR_EMAIL_REGEXP = /^(?=.{1,254}$)(?=.{1,64}@)[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+)*@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/;
11
11
  /**
12
- * Definitions of shared form validators.
12
+ * Definitions of form validators.
13
13
  *
14
- * These can be used on both server-side and client-side. The server provides them to the client.
15
- * These are the shared / common definitions.
16
- * ReDBox implementations can modify these validation definitions or add more.
14
+ * These can be used on both server-side and client-side.
15
+ * The server provides them to the client.
17
16
  *
18
- * The validators are based on:
19
- * angular built-in validators: https://github.com/angular/angular/blob/5105fd6f05f01f04873ab1c87d64079fd8519ad4/packages/forms/src/validators.ts
20
- * formly schema: https://github.com/ngx-formly/ngx-formly/blob/a2f7901b6c0895aee63b4b5fe748fc5ec0ad5475/src/core/src/lib/models/fieldconfig.ts
17
+ * Sails hooks can use these validators functions, but cannot extend or override them.
18
+ * Use the 'jsonata-expression' validator to create custom validator functions.
21
19
  *
22
- * These validation definitions need to be on the server-side, and provided to the client-side from the server.
23
- * There are two sets of validator definitions - 1) shared / common definitions in the core; 2) definitions specific to a client.
24
- * These two set of definitions need to be merged and provided by the server to the client.
20
+ * The validators are based on:
21
+ * - angular built-in validators: https://github.com/angular/angular/blob/5105fd6f05f01f04873ab1c87d64079fd8519ad4/packages/forms/src/validators.ts
22
+ * - formly schema: https://github.com/ngx-formly/ngx-formly/blob/a2f7901b6c0895aee63b4b5fe748fc5ec0ad5475/src/core/src/lib/models/fieldconfig.ts
25
23
  */
26
24
  exports.formValidatorsSharedDefinitions = [
27
25
  {
28
26
  class: "min",
29
27
  message: "@validator-error-min",
30
28
  create: (config) => {
31
- const optionNameKey = "class";
32
- const optionNameValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionNameKey, "min");
33
- const optionMessageKey = "message";
34
- const optionMessageValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionMessageKey, "@validator-error-min");
35
29
  const optionMinKey = "min";
36
30
  const optionMinValue = (0, helpers_1.formValidatorGetDefinitionNumber)(config, optionMinKey);
37
31
  return (control) => {
@@ -48,15 +42,10 @@ exports.formValidatorsSharedDefinitions = [
48
42
  // Controls with NaN values after parsing should be treated as not having a
49
43
  // minimum, per the HTML forms spec: https://www.w3.org/TR/html5/forms.html#attr-input-min
50
44
  if (value === undefined || (!isNaN(value) && value < optionMinValue)) {
51
- return {
52
- [optionNameValue]: {
53
- [optionMessageKey]: optionMessageValue,
54
- params: {
55
- requiredThreshold: optionMinValue,
56
- actual: control.value,
57
- },
58
- },
59
- };
45
+ return (0, helpers_1.formValidatorBuildError)(config, {
46
+ requiredThreshold: optionMinValue,
47
+ actual: control.value,
48
+ });
60
49
  }
61
50
  return null;
62
51
  };
@@ -66,10 +55,6 @@ exports.formValidatorsSharedDefinitions = [
66
55
  class: "max",
67
56
  message: "@validator-error-max",
68
57
  create: (config) => {
69
- const optionNameKey = "class";
70
- const optionNameValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionNameKey, "max");
71
- const optionMessageKey = "message";
72
- const optionMessageValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionMessageKey, "@validator-error-max");
73
58
  const optionMaxKey = "max";
74
59
  const optionMaxValue = (0, helpers_1.formValidatorGetDefinitionNumber)(config, optionMaxKey);
75
60
  return (control) => {
@@ -86,15 +71,10 @@ exports.formValidatorsSharedDefinitions = [
86
71
  // Controls with NaN values after parsing should be treated as not having a
87
72
  // maximum, per the HTML forms spec: https://www.w3.org/TR/html5/forms.html#attr-input-max
88
73
  if (value === undefined || (!isNaN(value) && value > optionMaxValue)) {
89
- return {
90
- [optionNameValue]: {
91
- [optionMessageKey]: optionMessageValue,
92
- params: {
93
- requiredThreshold: optionMaxValue,
94
- actual: control.value,
95
- },
96
- },
97
- };
74
+ return (0, helpers_1.formValidatorBuildError)(config, {
75
+ requiredThreshold: optionMaxValue,
76
+ actual: control.value,
77
+ });
98
78
  }
99
79
  return null;
100
80
  };
@@ -104,10 +84,6 @@ exports.formValidatorsSharedDefinitions = [
104
84
  class: "minLength",
105
85
  message: "@validator-error-min-length",
106
86
  create: (config) => {
107
- const optionNameKey = "class";
108
- const optionNameValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionNameKey, "minLength");
109
- const optionMessageKey = "message";
110
- const optionMessageValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionMessageKey, "@validator-error-min-length");
111
87
  const optionMinLengthKey = "minLength";
112
88
  const optionMinLengthValue = (0, helpers_1.formValidatorGetDefinitionNumber)(config, optionMinLengthKey);
113
89
  return (control) => {
@@ -118,15 +94,10 @@ exports.formValidatorsSharedDefinitions = [
118
94
  return null;
119
95
  }
120
96
  return length < optionMinLengthValue
121
- ? {
122
- [optionNameValue]: {
123
- [optionMessageKey]: optionMessageValue,
124
- params: {
125
- requiredLength: optionMinLengthValue,
126
- actualLength: length,
127
- },
128
- },
129
- }
97
+ ? (0, helpers_1.formValidatorBuildError)(config, {
98
+ requiredLength: optionMinLengthValue,
99
+ actualLength: length,
100
+ })
130
101
  : null;
131
102
  };
132
103
  },
@@ -135,24 +106,15 @@ exports.formValidatorsSharedDefinitions = [
135
106
  class: "maxLength",
136
107
  message: "@validator-error-max-length",
137
108
  create: (config) => {
138
- const optionNameKey = "class";
139
- const optionNameValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionNameKey, "maxLength");
140
- const optionMessageKey = "message";
141
- const optionMessageValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionMessageKey, "@validator-error-max-length");
142
109
  const optionMaxLengthKey = "maxLength";
143
110
  const optionMaxLengthValue = (0, helpers_1.formValidatorGetDefinitionNumber)(config, optionMaxLengthKey);
144
111
  return (control) => {
145
112
  const length = (0, helpers_1.formValidatorLengthOrSize)(control.value);
146
113
  if (length !== null && length > optionMaxLengthValue) {
147
- return {
148
- [optionNameValue]: {
149
- [optionMessageKey]: optionMessageValue,
150
- params: {
151
- requiredLength: optionMaxLengthValue,
152
- actualLength: length,
153
- },
154
- },
155
- };
114
+ return (0, helpers_1.formValidatorBuildError)(config, {
115
+ requiredLength: optionMaxLengthValue,
116
+ actualLength: length,
117
+ });
156
118
  }
157
119
  return null;
158
120
  };
@@ -162,23 +124,14 @@ exports.formValidatorsSharedDefinitions = [
162
124
  class: "required",
163
125
  message: "@validator-error-required",
164
126
  create: (config) => {
165
- const optionNameKey = "class";
166
- const optionNameValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionNameKey, "required");
167
- const optionMessageKey = "message";
168
- const optionMessageValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionMessageKey, "@validator-error-required");
169
127
  const optionRequiredKey = "required";
170
128
  const optionRequiredValue = (0, helpers_1.formValidatorGetDefinitionBoolean)(config, optionRequiredKey, true);
171
129
  return (control) => {
172
130
  if (optionRequiredValue && (control.value == null || (0, helpers_1.formValidatorLengthOrSize)(control.value) === 0)) {
173
- return {
174
- [optionNameValue]: {
175
- [optionMessageKey]: optionMessageValue,
176
- params: {
177
- required: optionRequiredValue,
178
- actual: control.value,
179
- },
180
- },
181
- };
131
+ return (0, helpers_1.formValidatorBuildError)(config, {
132
+ required: optionRequiredValue,
133
+ actual: control.value,
134
+ });
182
135
  }
183
136
  return null;
184
137
  };
@@ -188,23 +141,14 @@ exports.formValidatorsSharedDefinitions = [
188
141
  class: "requiredTrue",
189
142
  message: "@validator-error-required-true",
190
143
  create: (config) => {
191
- const optionNameKey = "class";
192
- const optionNameValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionNameKey, "requiredTrue")?.toString() ?? "";
193
- const optionMessageKey = "message";
194
- const optionMessageValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionMessageKey, "@validator-error-required-true");
195
144
  const optionRequiredKey = "requiredTrue";
196
145
  const optionRequiredValue = (0, helpers_1.formValidatorGetDefinitionBoolean)(config, optionRequiredKey, true);
197
146
  return (control) => {
198
147
  if (optionRequiredValue && control.value !== true) {
199
- return {
200
- [optionNameValue]: {
201
- [optionMessageKey]: optionMessageValue,
202
- params: {
203
- required: optionRequiredValue,
204
- actual: control.value,
205
- },
206
- },
207
- };
148
+ return (0, helpers_1.formValidatorBuildError)(config, {
149
+ required: optionRequiredValue,
150
+ actual: control.value,
151
+ });
208
152
  }
209
153
  return null;
210
154
  };
@@ -214,10 +158,6 @@ exports.formValidatorsSharedDefinitions = [
214
158
  class: "email",
215
159
  message: "@validator-error-email",
216
160
  create: (config) => {
217
- const optionNameKey = "class";
218
- const optionNameValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionNameKey, "email");
219
- const optionMessageKey = "message";
220
- const optionMessageValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionMessageKey, "@validator-error-email");
221
161
  const optionDescriptionKey = "description";
222
162
  const optionDescriptionValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionDescriptionKey, "email must be in format (name)@(domain.tld)");
223
163
  const optionPatternKey = "pattern";
@@ -230,15 +170,10 @@ exports.formValidatorsSharedDefinitions = [
230
170
  const value = control.value?.toString() ?? "";
231
171
  const testOutcome = optionPatternValue.test(value);
232
172
  if (!testOutcome) {
233
- return {
234
- [optionNameValue]: {
235
- [optionMessageKey]: optionMessageValue,
236
- params: {
237
- requiredPattern: optionPatternValue,
238
- description: optionDescriptionValue, actual: control.value,
239
- },
240
- },
241
- };
173
+ return (0, helpers_1.formValidatorBuildError)(config, {
174
+ requiredPattern: optionPatternValue,
175
+ description: optionDescriptionValue, actual: control.value,
176
+ });
242
177
  }
243
178
  return null;
244
179
  };
@@ -248,10 +183,6 @@ exports.formValidatorsSharedDefinitions = [
248
183
  class: "pattern",
249
184
  message: "@validator-error-pattern",
250
185
  create: (config) => {
251
- const optionNameKey = "class";
252
- const optionNameValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionNameKey, "pattern");
253
- const optionMessageKey = "message";
254
- const optionMessageValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionMessageKey, "@validator-error-pattern");
255
186
  const optionDescriptionKey = "description";
256
187
  const optionDescriptionValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionDescriptionKey);
257
188
  const optionPatternKey = "pattern";
@@ -274,16 +205,11 @@ exports.formValidatorsSharedDefinitions = [
274
205
  const value = control.value?.toString();
275
206
  return regex.test(value)
276
207
  ? null
277
- : {
278
- [optionNameValue]: {
279
- [optionMessageKey]: optionMessageValue,
280
- params: {
281
- requiredPattern: regexStr,
282
- description: optionDescriptionValue,
283
- actual: value,
284
- },
285
- },
286
- };
208
+ : (0, helpers_1.formValidatorBuildError)(config, {
209
+ requiredPattern: regexStr,
210
+ description: optionDescriptionValue,
211
+ actual: value,
212
+ });
287
213
  };
288
214
  },
289
215
  },
@@ -291,10 +217,6 @@ exports.formValidatorsSharedDefinitions = [
291
217
  class: "different-values",
292
218
  message: "@validator-error-different-values",
293
219
  create: (config) => {
294
- const optionNameKey = "class";
295
- const optionNameValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionNameKey, "different-values");
296
- const optionMessageKey = "message";
297
- const optionMessageValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionMessageKey, "@validator-different-values");
298
220
  const optionControlNamesKey = "controlNames";
299
221
  const optionControlNamesValue = (0, helpers_1.formValidatorGetDefinitionArray)(config, optionControlNamesKey);
300
222
  return (control) => {
@@ -303,65 +225,65 @@ exports.formValidatorsSharedDefinitions = [
303
225
  ?.filter(i => i !== null && i !== undefined)
304
226
  ?.map(n => control?.get(n?.toString())) ?? [];
305
227
  const values = new Set(controls?.map(c => c?.value) ?? []);
306
- if (values.size !== controls.length) {
307
- return {
308
- [optionNameValue]: {
309
- [optionMessageKey]: optionMessageValue,
310
- params: {
311
- controlNames: optionControlNamesValue,
312
- controlCount: optionControlNamesValue?.length,
313
- valueCount: values.size,
314
- values: Array.from(values),
315
- },
316
- },
317
- };
318
- }
319
- return null;
228
+ const compare = values.size === controls.length;
229
+ return compare
230
+ ? null
231
+ : (0, helpers_1.formValidatorBuildError)(config, {
232
+ controlNames: optionControlNamesValue,
233
+ controlCount: optionControlNamesValue?.length,
234
+ valueCount: values.size,
235
+ values: Array.from(values),
236
+ });
320
237
  };
321
238
  },
322
239
  },
323
240
  {
324
241
  class: "jsonata-expression",
325
242
  message: "@validator-error-jsonata-expression",
326
- create: (config) => {
327
- const optionNameKey = "class";
328
- const optionNameValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionNameKey, "jsonata-expression");
329
- const optionMessageKey = "message";
330
- const optionMessageValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionMessageKey, "@validator-error-jsonata-expression");
243
+ createAsync: (config) => {
331
244
  const optionDescriptionKey = "description";
332
- let optionDescriptionValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionDescriptionKey);
245
+ const optionDescriptionValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionDescriptionKey, "");
333
246
  const optionExpressionKey = "expression";
334
247
  const expression = (0, helpers_1.formValidatorGetDefinitionItem)(config, optionExpressionKey);
335
- const evaluator = config?.["evaluator"];
336
- return (control) => {
337
- if (control.value == null || (0, helpers_1.formValidatorLengthOrSize)(control.value) === 0) {
338
- return null; // don't validate empty values to allow optional controls
339
- }
340
- const value = control.value?.toString();
341
- let success;
248
+ const optionEvaluatorKey = "evaluator";
249
+ const evaluator = (0, helpers_1.formValidatorGetDefinitionItem)(config, optionEvaluatorKey);
250
+ return async (control) => {
251
+ // Notes:
252
+ // 1. For the jsonata-expression validator, always validate the control value.
253
+ // This enables the expression to decide whether empty values are valid or not.
254
+ // If empty values were not validated, then the expression would not have the option to treat empty values as invalid.
255
+ // 2. jsonata tries to define a 'keepSingleton' property on the input value.
256
+ // Must clone the value because control values cannot be extended.
257
+ // See: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Errors/Cant_define_property_object_not_extensible
258
+ let success = null;
259
+ let value;
342
260
  try {
343
- if (typeof evaluator !== "function") {
344
- throw new Error("Missing evaluator");
345
- }
346
- success = evaluator(control);
261
+ value = structuredClone(control.value);
347
262
  }
348
263
  catch (err) {
349
264
  success = false;
350
- optionDescriptionValue = "the validator is not configured correctly";
351
- console.error(`Validator 'jsonata-expression' could not run due to error: ${err}`);
265
+ console.error(`Validator 'jsonata-expression' with description '${optionDescriptionValue}' could not run due to error: control value cannot be cloned`);
266
+ }
267
+ if (success === null && typeof evaluator !== "function") {
268
+ success = false;
269
+ console.error(`Validator 'jsonata-expression' with description '${optionDescriptionValue}' could not run due to error: evaluator is not a function`);
270
+ }
271
+ if (success === null) {
272
+ try {
273
+ success = await evaluator(value) === true;
274
+ }
275
+ catch (err) {
276
+ success = false;
277
+ console.error(`Validator 'jsonata-expression' with description '${optionDescriptionValue}' could not run due to error: ${err}`);
278
+ }
352
279
  }
353
280
  return success
354
281
  ? null
355
- : {
356
- [optionNameValue]: {
357
- [optionMessageKey]: optionMessageValue,
358
- params: {
359
- expression: expression,
360
- description: optionDescriptionValue,
361
- actual: value,
362
- },
363
- },
364
- };
282
+ : (0, helpers_1.formValidatorBuildError)(config, {
283
+ expression: expression,
284
+ description: optionDescriptionValue,
285
+ actual: control.value,
286
+ });
365
287
  };
366
288
  },
367
289
  },
@@ -370,10 +292,6 @@ exports.formValidatorsSharedDefinitions = [
370
292
  class: "orcid",
371
293
  message: "@validator-error-orcid",
372
294
  create: (config) => {
373
- const optionNameKey = "class";
374
- const optionNameValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionNameKey, "orcid");
375
- const optionMessageKey = "message";
376
- const optionMessageValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionMessageKey, "@validator-error-orcid");
377
295
  return (control) => {
378
296
  if (control.value == null || control.value === "") {
379
297
  return null; // don't validate empty values
@@ -381,25 +299,15 @@ exports.formValidatorsSharedDefinitions = [
381
299
  let value = control.value.toString();
382
300
  // Validate format: either xxxx-xxxx-xxxx-xxxx or xxxxxxxxxxxxxxxx, last digit can be X or x
383
301
  if (!/^(\d{4}-\d{4}-\d{4}-\d{3}[\dXx]|\d{15}[\dXx])$/.test(value)) {
384
- return {
385
- [optionNameValue]: {
386
- [optionMessageKey]: optionMessageValue,
387
- params: {
388
- actual: control.value,
389
- },
390
- },
391
- };
302
+ return (0, helpers_1.formValidatorBuildError)(config, {
303
+ actual: control.value,
304
+ });
392
305
  }
393
306
  value = value.replace(/-/g, '');
394
307
  if (value.length !== 16) {
395
- return {
396
- [optionNameValue]: {
397
- [optionMessageKey]: optionMessageValue,
398
- params: {
399
- actual: control.value,
400
- },
401
- },
402
- };
308
+ return (0, helpers_1.formValidatorBuildError)(config, {
309
+ actual: control.value,
310
+ });
403
311
  }
404
312
  const baseDigits = value.substring(0, 15);
405
313
  const checkDigit = value.substring(15);
@@ -412,18 +320,13 @@ exports.formValidatorsSharedDefinitions = [
412
320
  const result = (12 - remainder) % 11;
413
321
  const calculatedCheckDigit = result === 10 ? "X" : result.toString();
414
322
  if (checkDigit.toUpperCase() !== calculatedCheckDigit) {
415
- return {
416
- [optionNameValue]: {
417
- [optionMessageKey]: optionMessageValue,
418
- params: {
419
- actual: control.value,
420
- },
421
- },
422
- };
323
+ return (0, helpers_1.formValidatorBuildError)(config, {
324
+ actual: control.value,
325
+ });
423
326
  }
424
327
  return null;
425
328
  };
426
329
  },
427
330
  },
428
331
  ];
429
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/validation/validators.ts"],"names":[],"mappings":"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"}
332
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/validation/validators.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@researchdatabox/sails-ng-common",
3
- "version": "0.0.1-beta.9474",
3
+ "version": "0.0.1-beta.9700",
4
4
  "description": "Common models shared between Sails API endpoints and client-side Angular code",
5
5
  "main": "dist/src/index.js",
6
6
  "types": "dist/src/index.d.ts",
@@ -72,7 +72,7 @@
72
72
  ]
73
73
  },
74
74
  "dependencies": {
75
- "@jsonjoy.com/json-pointer": "18.15.0",
75
+ "@jsonjoy.com/json-pointer": "18.21.0",
76
76
  "lodash": "4.18.1",
77
77
  "lodash-es": "4.18.1",
78
78
  "luxon": "3.7.2",