@defra/forms-model 3.0.570 → 3.0.572

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 (28) hide show
  1. package/dist/module/form/form-definition/index.js +20 -1
  2. package/dist/module/form/form-definition/index.js.map +1 -1
  3. package/dist/module/form/form-editor/macros/types.js.map +1 -1
  4. package/dist/module/form/form-editor/preview/controller/page-controller.js +0 -21
  5. package/dist/module/form/form-editor/preview/controller/page-controller.js.map +1 -1
  6. package/dist/module/form/form-manager/types.js +5 -0
  7. package/dist/module/form/form-manager/types.js.map +1 -1
  8. package/dist/types/form/form-definition/index.d.ts +2 -1
  9. package/dist/types/form/form-definition/index.d.ts.map +1 -1
  10. package/dist/types/form/form-editor/macros/types.d.ts +0 -4
  11. package/dist/types/form/form-editor/macros/types.d.ts.map +1 -1
  12. package/dist/types/form/form-editor/preview/controller/page-controller.d.ts +0 -5
  13. package/dist/types/form/form-editor/preview/controller/page-controller.d.ts.map +1 -1
  14. package/dist/types/form/form-manager/types.d.ts +1 -0
  15. package/dist/types/form/form-manager/types.d.ts.map +1 -1
  16. package/package.json +1 -1
  17. package/schemas/component-schema-v2.json +27 -0
  18. package/schemas/component-schema.json +27 -0
  19. package/schemas/form-definition-schema.json +81 -0
  20. package/schemas/form-definition-v2-schema.json +135 -0
  21. package/schemas/list-schema-v2.json +54 -0
  22. package/schemas/list-schema.json +54 -0
  23. package/schemas/page-schema-v2.json +81 -0
  24. package/schemas/page-schema.json +27 -0
  25. package/src/form/form-definition/index.ts +28 -1
  26. package/src/form/form-editor/macros/types.ts +0 -4
  27. package/src/form/form-editor/preview/controller/page-controller.js +0 -27
  28. package/src/form/form-manager/types.ts +5 -0
package/dist/types/form/form-editor/macros/types.d.ts CHANGED
@@ -77,10 +77,6 @@ export interface PagePreviewPanelMacro {
77
77
  text: string;
78
78
  classes: string;
79
79
  };
80
- readonly repeaterButton?: {
81
- text: string;
82
- classes: string;
83
- };
84
80
  }
85
81
  export interface SummaryRowActionItem {
86
82
  href: string;
package/dist/types/form/form-editor/macros/types.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/form/form-editor/macros/types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/form/form-editor/macros/types.ts"],"names":[],"mappings":"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"}
package/dist/types/form/form-editor/preview/controller/page-controller.d.ts CHANGED
@@ -27,11 +27,6 @@ export class PreviewPageController extends PreviewPageControllerBase {
27
27
  */
28
28
  get titleAndFirstTitleSame(): boolean;
29
29
  get repeaterText(): string | undefined;
30
- get repeaterButton(): {
31
- classes: string;
32
- text: string;
33
- } | undefined;
34
- get repeaterButtonText(): string | undefined;
35
30
  #private;
36
31
  }
37
32
  import { PreviewPageControllerBase } from '../../../../form/form-editor/preview/controller/page-controller-base.js';
package/dist/types/form/form-editor/preview/controller/page-controller.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"page-controller.d.ts","sourceRoot":"","sources":["../../../../../../src/form/form-editor/preview/controller/page-controller.js"],"names":[],"mappings":"AAiBA;IA0ME;;;;;OAKG;IACH,4CAKC;IA7MD;;;;;OAKG;IACH,wBALW,YAAY,EAAE,YACd,oBAAoB,cACpB,cAAc,YACd,YAAY,EAkBtB;IAmCD;;OAEG;IACH,sBAFa,OAAO,CAgBnB;IAED;;;OAGG;IACH,qCAHW,gBAAgB,GACd,iBAAiB,CAgC7B;IAED;;OAEG;IACH,8BAFa,OAAO,CASnB;IAwBD,uCAQC;IAaD;;;kBAUC;IAED,6CAaC;;CAcF;0CAvOyC,mEAAmE;sCA4OxE,2CAA2C;uCAFY,yCAAyC;kCAIpG,2BAA2B;0CAJgC,yCAAyC;oCAGlG,qCAAqC;kCAHoB,yCAAyC"}
1
+ {"version":3,"file":"page-controller.d.ts","sourceRoot":"","sources":["../../../../../../src/form/form-editor/preview/controller/page-controller.js"],"names":[],"mappings":"AAiBA;IA+KE;;;;;OAKG;IACH,4CAKC;IAlLD;;;;;OAKG;IACH,wBALW,YAAY,EAAE,YACd,oBAAoB,cACpB,cAAc,YACd,YAAY,EAkBtB;IAmCD;;OAEG;IACH,sBAFa,OAAO,CAgBnB;IAED;;;OAGG;IACH,qCAHW,gBAAgB,GACd,iBAAiB,CAgC7B;IAED;;OAEG;IACH,8BAFa,OAAO,CASnB;IAwBD,uCAQC;;CAyBF;0CA5MyC,mEAAmE;sCAiNxE,2CAA2C;uCAFY,yCAAyC;kCAIpG,2BAA2B;0CAJgC,yCAAyC;oCAGlG,qCAAqC;kCAHoB,yCAAyC"}
package/dist/types/form/form-manager/types.d.ts CHANGED
@@ -39,6 +39,7 @@ export declare enum FormDefinitionError {
39
39
  RefConditionConditionId = "ref_condition_condition_id",
40
40
  RefPageComponentList = "ref_page_component_list",
41
41
  IncompatibleConditionComponentType = "incompatible_condition_component_type",
42
+ IncompatibleQuestionRegex = "incompatible_question_regex",
42
43
  Other = "other"
43
44
  }
44
45
  export interface ErrorMatchValue {
package/dist/types/form/form-manager/types.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/form/form-manager/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,KAAK,CAAA;AAElC,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,qCAAqC,CAAA;AACjE,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAE1D,MAAM,WAAW,eAAe;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,UAAU,CAAC,EAAE,cAAc,GAAG,IAAI,CAAA;IAClC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAC1B;AAED,MAAM,WAAW,wBAAwB;IACvC,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAGD,oBAAY,uBAAuB;IACjC,MAAM,WAAW,CAAE,oBAAoB;IACvC,GAAG,QAAQ,CAAE,wBAAwB;IACrC,IAAI,SAAS,CAAE,4BAA4B;IAC3C,YAAY,iBAAiB;CAC9B;AAGD,oBAAY,mBAAmB;IAC7B,YAAY,mBAAmB;IAC/B,cAAc,qBAAqB;IACnC,qBAAqB,6BAA6B;IAClD,uBAAuB,+BAA+B;IACtD,iBAAiB,wBAAwB;IACzC,kBAAkB,yBAAyB;IAC3C,YAAY,mBAAmB;IAC/B,eAAe,sBAAsB;IACrC,cAAc,qBAAqB;IACnC,iBAAiB,wBAAwB;IACzC,0BAA0B,iCAAiC;IAC3D,gBAAgB,wBAAwB;IACxC,kBAAkB,0BAA0B;IAC5C,mBAAmB,2BAA2B;IAC9C,gBAAgB,uBAAuB;IACvC,uBAAuB,+BAA+B;IACtD,kBAAkB,0BAA0B;IAC5C,kBAAkB,0BAA0B;IAC5C,uBAAuB,+BAA+B;IACtD,oBAAoB,4BAA4B;IAChD,kCAAkC,0CAA0C;IAC5E,KAAK,UAAU;CAChB;AAED,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,uBAAuB,CAAA;CAC9B;AAED,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC,mBAAmB,EAAE,eAAe,CAAC,CAAA;AAG/E,eAAO,MAAM,oBAAoB,EAAE,oBAyFlC,CAAA;AAED,MAAM,MAAM,kCAAkC,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;AAEpE,MAAM,WAAW,oCAAoC;IACnD,IAAI,EAAE,kCAAkC,CAAA;IACxC,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,iCAAiC;IAChD,IAAI,EAAE,kCAAkC,CAAA;CACzC;AAED,MAAM,WAAW,0CAA0C;IACzD,IAAI,EAAE,kCAAkC,CAAA;IACxC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,kBAAkB,EAAE;QAClB,GAAG,CAAC,EAAE,MAAM,CAAA;QACZ,KAAK,CAAC,EAAE,OAAO,CAAA;KAChB,CAAA;IACD,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,MAAM,wBAAwB,GAChC;IACE,EAAE,EAAE,mBAAmB,CAAA;IACvB,IAAI,EAAE,uBAAuB,CAAC,MAAM,CAAA;IACpC,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,oCAAoC,CAAA;CAC7C,GACD;IACE,EAAE,EAAE,mBAAmB,CAAA;IACvB,IAAI,EAAE,uBAAuB,CAAC,GAAG,CAAA;IACjC,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,iCAAiC,CAAA;CAC1C,GACD;IACE,EAAE,EAAE,mBAAmB,CAAA;IACvB,IAAI,EAAE,uBAAuB,CAAC,IAAI,CAAA;IAClC,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,OAAO,GAAG,SAAS,CAAA;CAC5B,GACD;IACE,EAAE,EAAE,mBAAmB,CAAA;IACvB,IAAI,EAAE,uBAAuB,CAAC,YAAY,CAAA;IAC1C,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,0CAA0C,CAAA;CACnD,CAAA"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/form/form-manager/types.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@defra/forms-model",
3
- "version": "3.0.570",
3
+ "version": "3.0.572",
4
4
  "description": "A hapi plugin providing the model for Defra forms",
5
5
  "homepage": "https://github.com/DEFRA/forms-designer/tree/main/model#readme",
6
6
  "types": "dist/types/index.d.ts",
package/schemas/component-schema-v2.json CHANGED
@@ -135,6 +135,33 @@
135
135
  "type": "number",
136
136
  "description": "Exact length required for validation",
137
137
  "title": "Length"
138
+ },
139
+ "regex": {
140
+ "type": [
141
+ "array",
142
+ "boolean",
143
+ "number",
144
+ "object",
145
+ "string",
146
+ "null"
147
+ ],
148
+ "oneOf": [
149
+ {
150
+ "type": "string",
151
+ "description": "Regex expression for validation of user field content",
152
+ "title": "Regex (string)"
153
+ },
154
+ {
155
+ "type": "string",
156
+ "title": "Regex (string)"
157
+ }
158
+ ],
159
+ "title": "Regex",
160
+ "description": "The regex value.",
161
+ "oneOfTitles": [
162
+ "Regex (string)",
163
+ "Regex (string)"
164
+ ]
138
165
  }
139
166
  },
140
167
  "additionalProperties": true,
package/schemas/component-schema.json CHANGED
@@ -141,6 +141,33 @@
141
141
  "type": "number",
142
142
  "description": "Exact length required for validation",
143
143
  "title": "Length"
144
+ },
145
+ "regex": {
146
+ "type": [
147
+ "array",
148
+ "boolean",
149
+ "number",
150
+ "object",
151
+ "string",
152
+ "null"
153
+ ],
154
+ "oneOf": [
155
+ {
156
+ "type": "string",
157
+ "description": "Regex expression for validation of user field content",
158
+ "title": "Regex (string)"
159
+ },
160
+ {
161
+ "type": "string",
162
+ "title": "Regex (string)"
163
+ }
164
+ ],
165
+ "title": "Regex",
166
+ "description": "The regex value.",
167
+ "oneOfTitles": [
168
+ "Regex (string)",
169
+ "Regex (string)"
170
+ ]
144
171
  }
145
172
  },
146
173
  "additionalProperties": true,
package/schemas/form-definition-schema.json CHANGED
@@ -236,6 +236,33 @@
236
236
  "type": "number",
237
237
  "description": "Exact length required for validation",
238
238
  "title": "Length"
239
+ },
240
+ "regex": {
241
+ "type": [
242
+ "array",
243
+ "boolean",
244
+ "number",
245
+ "object",
246
+ "string",
247
+ "null"
248
+ ],
249
+ "oneOf": [
250
+ {
251
+ "type": "string",
252
+ "description": "Regex expression for validation of user field content",
253
+ "title": "Regex (string)"
254
+ },
255
+ {
256
+ "type": "string",
257
+ "title": "Regex (string)"
258
+ }
259
+ ],
260
+ "title": "Regex",
261
+ "description": "The regex value.",
262
+ "oneOfTitles": [
263
+ "Regex (string)",
264
+ "Regex (string)"
265
+ ]
239
266
  }
240
267
  },
241
268
  "additionalProperties": true,
@@ -926,6 +953,33 @@
926
953
  "type": "number",
927
954
  "description": "Exact length required for validation",
928
955
  "title": "Length"
956
+ },
957
+ "regex": {
958
+ "type": [
959
+ "array",
960
+ "boolean",
961
+ "number",
962
+ "object",
963
+ "string",
964
+ "null"
965
+ ],
966
+ "oneOf": [
967
+ {
968
+ "type": "string",
969
+ "description": "Regex expression for validation of user field content",
970
+ "title": "Regex (string)"
971
+ },
972
+ {
973
+ "type": "string",
974
+ "title": "Regex (string)"
975
+ }
976
+ ],
977
+ "title": "Regex",
978
+ "description": "The regex value.",
979
+ "oneOfTitles": [
980
+ "Regex (string)",
981
+ "Regex (string)"
982
+ ]
929
983
  }
930
984
  },
931
985
  "additionalProperties": true,
@@ -1165,6 +1219,33 @@
1165
1219
  "type": "number",
1166
1220
  "description": "Exact length required for validation",
1167
1221
  "title": "Length"
1222
+ },
1223
+ "regex": {
1224
+ "type": [
1225
+ "array",
1226
+ "boolean",
1227
+ "number",
1228
+ "object",
1229
+ "string",
1230
+ "null"
1231
+ ],
1232
+ "oneOf": [
1233
+ {
1234
+ "type": "string",
1235
+ "description": "Regex expression for validation of user field content",
1236
+ "title": "Regex (string)"
1237
+ },
1238
+ {
1239
+ "type": "string",
1240
+ "title": "Regex (string)"
1241
+ }
1242
+ ],
1243
+ "title": "Regex",
1244
+ "description": "The regex value.",
1245
+ "oneOfTitles": [
1246
+ "Regex (string)",
1247
+ "Regex (string)"
1248
+ ]
1168
1249
  }
1169
1250
  },
1170
1251
  "additionalProperties": true,
package/schemas/form-definition-v2-schema.json CHANGED
@@ -528,6 +528,33 @@
528
528
  "type": "number",
529
529
  "description": "Exact length required for validation",
530
530
  "title": "Length"
531
+ },
532
+ "regex": {
533
+ "type": [
534
+ "array",
535
+ "boolean",
536
+ "number",
537
+ "object",
538
+ "string",
539
+ "null"
540
+ ],
541
+ "oneOf": [
542
+ {
543
+ "type": "string",
544
+ "description": "Regex expression for validation of user field content",
545
+ "title": "Regex (string)"
546
+ },
547
+ {
548
+ "type": "string",
549
+ "title": "Regex (string)"
550
+ }
551
+ ],
552
+ "title": "Regex",
553
+ "description": "The regex value.",
554
+ "oneOfTitles": [
555
+ "Regex (string)",
556
+ "Regex (string)"
557
+ ]
531
558
  }
532
559
  },
533
560
  "additionalProperties": true,
@@ -697,6 +724,33 @@
697
724
  "type": "number",
698
725
  "description": "Exact length required for validation",
699
726
  "title": "Length"
727
+ },
728
+ "regex": {
729
+ "type": [
730
+ "array",
731
+ "boolean",
732
+ "number",
733
+ "object",
734
+ "string",
735
+ "null"
736
+ ],
737
+ "oneOf": [
738
+ {
739
+ "type": "string",
740
+ "description": "Regex expression for validation of user field content",
741
+ "title": "Regex (string)"
742
+ },
743
+ {
744
+ "type": "string",
745
+ "title": "Regex (string)"
746
+ }
747
+ ],
748
+ "title": "Regex",
749
+ "description": "The regex value.",
750
+ "oneOfTitles": [
751
+ "Regex (string)",
752
+ "Regex (string)"
753
+ ]
700
754
  }
701
755
  },
702
756
  "additionalProperties": true,
@@ -949,6 +1003,33 @@
949
1003
  "type": "number",
950
1004
  "description": "Exact length required for validation",
951
1005
  "title": "Length"
1006
+ },
1007
+ "regex": {
1008
+ "type": [
1009
+ "array",
1010
+ "boolean",
1011
+ "number",
1012
+ "object",
1013
+ "string",
1014
+ "null"
1015
+ ],
1016
+ "oneOf": [
1017
+ {
1018
+ "type": "string",
1019
+ "description": "Regex expression for validation of user field content",
1020
+ "title": "Regex (string)"
1021
+ },
1022
+ {
1023
+ "type": "string",
1024
+ "title": "Regex (string)"
1025
+ }
1026
+ ],
1027
+ "title": "Regex",
1028
+ "description": "The regex value.",
1029
+ "oneOfTitles": [
1030
+ "Regex (string)",
1031
+ "Regex (string)"
1032
+ ]
952
1033
  }
953
1034
  },
954
1035
  "additionalProperties": true,
@@ -1227,6 +1308,33 @@
1227
1308
  "type": "number",
1228
1309
  "description": "Exact length required for validation",
1229
1310
  "title": "Length"
1311
+ },
1312
+ "regex": {
1313
+ "type": [
1314
+ "array",
1315
+ "boolean",
1316
+ "number",
1317
+ "object",
1318
+ "string",
1319
+ "null"
1320
+ ],
1321
+ "oneOf": [
1322
+ {
1323
+ "type": "string",
1324
+ "description": "Regex expression for validation of user field content",
1325
+ "title": "Regex (string)"
1326
+ },
1327
+ {
1328
+ "type": "string",
1329
+ "title": "Regex (string)"
1330
+ }
1331
+ ],
1332
+ "title": "Regex",
1333
+ "description": "The regex value.",
1334
+ "oneOfTitles": [
1335
+ "Regex (string)",
1336
+ "Regex (string)"
1337
+ ]
1230
1338
  }
1231
1339
  },
1232
1340
  "additionalProperties": true,
@@ -1466,6 +1574,33 @@
1466
1574
  "type": "number",
1467
1575
  "description": "Exact length required for validation",
1468
1576
  "title": "Length"
1577
+ },
1578
+ "regex": {
1579
+ "type": [
1580
+ "array",
1581
+ "boolean",
1582
+ "number",
1583
+ "object",
1584
+ "string",
1585
+ "null"
1586
+ ],
1587
+ "oneOf": [
1588
+ {
1589
+ "type": "string",
1590
+ "description": "Regex expression for validation of user field content",
1591
+ "title": "Regex (string)"
1592
+ },
1593
+ {
1594
+ "type": "string",
1595
+ "title": "Regex (string)"
1596
+ }
1597
+ ],
1598
+ "title": "Regex",
1599
+ "description": "The regex value.",
1600
+ "oneOfTitles": [
1601
+ "Regex (string)",
1602
+ "Regex (string)"
1603
+ ]
1469
1604
  }
1470
1605
  },
1471
1606
  "additionalProperties": true,
package/schemas/list-schema-v2.json CHANGED
@@ -206,6 +206,33 @@
206
206
  "type": "number",
207
207
  "description": "Exact length required for validation",
208
208
  "title": "Length"
209
+ },
210
+ "regex": {
211
+ "type": [
212
+ "array",
213
+ "boolean",
214
+ "number",
215
+ "object",
216
+ "string",
217
+ "null"
218
+ ],
219
+ "oneOf": [
220
+ {
221
+ "type": "string",
222
+ "description": "Regex expression for validation of user field content",
223
+ "title": "Regex (string)"
224
+ },
225
+ {
226
+ "type": "string",
227
+ "title": "Regex (string)"
228
+ }
229
+ ],
230
+ "title": "Regex",
231
+ "description": "The regex value.",
232
+ "oneOfTitles": [
233
+ "Regex (string)",
234
+ "Regex (string)"
235
+ ]
209
236
  }
210
237
  },
211
238
  "additionalProperties": true,
@@ -445,6 +472,33 @@
445
472
  "type": "number",
446
473
  "description": "Exact length required for validation",
447
474
  "title": "Length"
475
+ },
476
+ "regex": {
477
+ "type": [
478
+ "array",
479
+ "boolean",
480
+ "number",
481
+ "object",
482
+ "string",
483
+ "null"
484
+ ],
485
+ "oneOf": [
486
+ {
487
+ "type": "string",
488
+ "description": "Regex expression for validation of user field content",
489
+ "title": "Regex (string)"
490
+ },
491
+ {
492
+ "type": "string",
493
+ "title": "Regex (string)"
494
+ }
495
+ ],
496
+ "title": "Regex",
497
+ "description": "The regex value.",
498
+ "oneOfTitles": [
499
+ "Regex (string)",
500
+ "Regex (string)"
501
+ ]
448
502
  }
449
503
  },
450
504
  "additionalProperties": true,
package/schemas/list-schema.json CHANGED
@@ -212,6 +212,33 @@
212
212
  "type": "number",
213
213
  "description": "Exact length required for validation",
214
214
  "title": "Length"
215
+ },
216
+ "regex": {
217
+ "type": [
218
+ "array",
219
+ "boolean",
220
+ "number",
221
+ "object",
222
+ "string",
223
+ "null"
224
+ ],
225
+ "oneOf": [
226
+ {
227
+ "type": "string",
228
+ "description": "Regex expression for validation of user field content",
229
+ "title": "Regex (string)"
230
+ },
231
+ {
232
+ "type": "string",
233
+ "title": "Regex (string)"
234
+ }
235
+ ],
236
+ "title": "Regex",
237
+ "description": "The regex value.",
238
+ "oneOfTitles": [
239
+ "Regex (string)",
240
+ "Regex (string)"
241
+ ]
215
242
  }
216
243
  },
217
244
  "additionalProperties": true,
@@ -451,6 +478,33 @@
451
478
  "type": "number",
452
479
  "description": "Exact length required for validation",
453
480
  "title": "Length"
481
+ },
482
+ "regex": {
483
+ "type": [
484
+ "array",
485
+ "boolean",
486
+ "number",
487
+ "object",
488
+ "string",
489
+ "null"
490
+ ],
491
+ "oneOf": [
492
+ {
493
+ "type": "string",
494
+ "description": "Regex expression for validation of user field content",
495
+ "title": "Regex (string)"
496
+ },
497
+ {
498
+ "type": "string",
499
+ "title": "Regex (string)"
500
+ }
501
+ ],
502
+ "title": "Regex",
503
+ "description": "The regex value.",
504
+ "oneOfTitles": [
505
+ "Regex (string)",
506
+ "Regex (string)"
507
+ ]
454
508
  }
455
509
  },
456
510
  "additionalProperties": true,
package/schemas/page-schema-v2.json CHANGED
@@ -318,6 +318,33 @@
318
318
  "type": "number",
319
319
  "description": "Exact length required for validation",
320
320
  "title": "Length"
321
+ },
322
+ "regex": {
323
+ "type": [
324
+ "array",
325
+ "boolean",
326
+ "number",
327
+ "object",
328
+ "string",
329
+ "null"
330
+ ],
331
+ "oneOf": [
332
+ {
333
+ "type": "string",
334
+ "description": "Regex expression for validation of user field content",
335
+ "title": "Regex (string)"
336
+ },
337
+ {
338
+ "type": "string",
339
+ "title": "Regex (string)"
340
+ }
341
+ ],
342
+ "title": "Regex",
343
+ "description": "The regex value.",
344
+ "oneOfTitles": [
345
+ "Regex (string)",
346
+ "Regex (string)"
347
+ ]
321
348
  }
322
349
  },
323
350
  "additionalProperties": true,
@@ -487,6 +514,33 @@
487
514
  "type": "number",
488
515
  "description": "Exact length required for validation",
489
516
  "title": "Length"
517
+ },
518
+ "regex": {
519
+ "type": [
520
+ "array",
521
+ "boolean",
522
+ "number",
523
+ "object",
524
+ "string",
525
+ "null"
526
+ ],
527
+ "oneOf": [
528
+ {
529
+ "type": "string",
530
+ "description": "Regex expression for validation of user field content",
531
+ "title": "Regex (string)"
532
+ },
533
+ {
534
+ "type": "string",
535
+ "title": "Regex (string)"
536
+ }
537
+ ],
538
+ "title": "Regex",
539
+ "description": "The regex value.",
540
+ "oneOfTitles": [
541
+ "Regex (string)",
542
+ "Regex (string)"
543
+ ]
490
544
  }
491
545
  },
492
546
  "additionalProperties": true,
@@ -739,6 +793,33 @@
739
793
  "type": "number",
740
794
  "description": "Exact length required for validation",
741
795
  "title": "Length"
796
+ },
797
+ "regex": {
798
+ "type": [
799
+ "array",
800
+ "boolean",
801
+ "number",
802
+ "object",
803
+ "string",
804
+ "null"
805
+ ],
806
+ "oneOf": [
807
+ {
808
+ "type": "string",
809
+ "description": "Regex expression for validation of user field content",
810
+ "title": "Regex (string)"
811
+ },
812
+ {
813
+ "type": "string",
814
+ "title": "Regex (string)"
815
+ }
816
+ ],
817
+ "title": "Regex",
818
+ "description": "The regex value.",
819
+ "oneOfTitles": [
820
+ "Regex (string)",
821
+ "Regex (string)"
822
+ ]
742
823
  }
743
824
  },
744
825
  "additionalProperties": true,