@sealcode/sealgen 0.6.1 → 0.7.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.
Files changed (91) hide show
  1. package/.nyc_output/1c5dff80-7861-427a-b1bb-d0686211f098.json +1 -0
  2. package/.nyc_output/a38a0d08-1f1f-4973-b5e2-efc434c1593d.json +1 -0
  3. package/.nyc_output/processinfo/1c5dff80-7861-427a-b1bb-d0686211f098.json +1 -0
  4. package/.nyc_output/processinfo/a38a0d08-1f1f-4973-b5e2-efc434c1593d.json +1 -0
  5. package/.nyc_output/processinfo/index.json +1 -0
  6. package/.xunit +3 -0
  7. package/@types/components/components.d.ts +1 -0
  8. package/@types/components/tabs.d.ts +2 -0
  9. package/@types/forms/controls/controls.d.ts +1 -0
  10. package/@types/forms/controls/field-group.d.ts +17 -0
  11. package/@types/forms/controls/form-control.d.ts +1 -1
  12. package/@types/forms/controls/form-field-control.d.ts +1 -1
  13. package/@types/forms/controls/simple-input.d.ts +2 -1
  14. package/@types/forms/form.d.ts +19 -6
  15. package/@types/forms/multiform.d.ts +9 -11
  16. package/@types/index.d.ts +2 -0
  17. package/@types/page/mountable-with-fields.d.ts +32 -0
  18. package/@types/page/mountable.d.ts +2 -27
  19. package/@types/page/page.d.ts +2 -2
  20. package/@types/templates/multiform.d.ts +1 -0
  21. package/@types/templates/redirect.d.ts +1 -0
  22. package/@types/utils/input-wrapper.d.ts +4 -0
  23. package/coverage/clover.xml +79 -0
  24. package/lib/add-route.js +27 -8
  25. package/lib/add-route.js.map +1 -1
  26. package/lib/components/components.js +14 -0
  27. package/lib/components/components.js.map +1 -0
  28. package/lib/components/tabs.js +92 -0
  29. package/lib/components/tabs.js.map +1 -0
  30. package/lib/forms/controls/checkboxed-list-input.js +12 -9
  31. package/lib/forms/controls/checkboxed-list-input.js.map +1 -1
  32. package/lib/forms/controls/controls.js +3 -1
  33. package/lib/forms/controls/controls.js.map +1 -1
  34. package/lib/forms/controls/dropdown.js +14 -12
  35. package/lib/forms/controls/dropdown.js.map +1 -1
  36. package/lib/forms/controls/field-group.js +26 -0
  37. package/lib/forms/controls/field-group.js.map +1 -0
  38. package/lib/forms/controls/form-control.js.map +1 -1
  39. package/lib/forms/controls/form-field-control.js.map +1 -1
  40. package/lib/forms/controls/simple-input.js +6 -8
  41. package/lib/forms/controls/simple-input.js.map +1 -1
  42. package/lib/forms/controls/textarea.js +13 -15
  43. package/lib/forms/controls/textarea.js.map +1 -1
  44. package/lib/forms/form.js +95 -57
  45. package/lib/forms/form.js.map +1 -1
  46. package/lib/forms/multiform.js +52 -62
  47. package/lib/forms/multiform.js.map +1 -1
  48. package/lib/generate-routes.js +7 -3
  49. package/lib/generate-routes.js.map +1 -1
  50. package/lib/index.js +3 -1
  51. package/lib/index.js.map +1 -1
  52. package/lib/page/list.js +1 -1
  53. package/lib/page/list.js.map +1 -1
  54. package/lib/page/mountable-with-fields.js +63 -0
  55. package/lib/page/mountable-with-fields.js.map +1 -0
  56. package/lib/page/mountable.js +2 -49
  57. package/lib/page/mountable.js.map +1 -1
  58. package/lib/page/page.js +2 -2
  59. package/lib/page/page.js.map +1 -1
  60. package/lib/templates/multiform.js +59 -0
  61. package/lib/templates/multiform.js.map +1 -0
  62. package/lib/templates/redirect.js +27 -0
  63. package/lib/templates/redirect.js.map +1 -0
  64. package/lib/tests/manual/multiform.js +14 -5
  65. package/lib/tests/manual/multiform.js.map +1 -1
  66. package/lib/utils/input-wrapper.js +20 -0
  67. package/lib/utils/input-wrapper.js.map +1 -0
  68. package/package.json +4 -3
  69. package/src/add-route.ts +30 -11
  70. package/src/components/components.ts +1 -0
  71. package/src/components/tabs.ts +95 -0
  72. package/src/forms/controls/checkboxed-list-input.ts +17 -10
  73. package/src/forms/controls/controls.ts +1 -0
  74. package/src/forms/controls/dropdown.ts +28 -23
  75. package/src/forms/controls/field-group.ts +32 -0
  76. package/src/forms/controls/form-control.ts +3 -1
  77. package/src/forms/controls/form-field-control.ts +4 -1
  78. package/src/forms/controls/simple-input.ts +19 -12
  79. package/src/forms/controls/textarea.ts +15 -14
  80. package/src/forms/form.ts +122 -76
  81. package/src/forms/multiform.ts +211 -0
  82. package/src/generate-routes.ts +7 -3
  83. package/src/index.ts +2 -0
  84. package/src/page/list.ts +1 -1
  85. package/src/page/mountable-with-fields.ts +112 -0
  86. package/src/page/mountable.ts +4 -96
  87. package/src/page/page.ts +7 -3
  88. package/src/templates/multiform.ts +58 -0
  89. package/src/templates/redirect.ts +22 -0
  90. package/src/tests/manual/multiform.ts +106 -0
  91. package/src/utils/input-wrapper.ts +18 -0
@@ -1 +1 @@
1
- {"version":3,"file":"checkboxed-list-input.js","sourceRoot":"","sources":["../../../src/forms/controls/checkboxed-list-input.ts"],"names":[],"mappings":";;;AAAA,2DAAyD;AAEzD,2CAAwC;AAGxC,yCAA8C;AAE9C,MAAa,mBAAoB,SAAQ,2BAAgB;IACxD,YACQ,KAAyB,EACzB,UAA6B,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE;QAEzD,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QAHR,UAAK,GAAL,KAAK,CAAoB;QACzB,YAAO,GAAP,OAAO,CAA2C;IAG1D,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAY,EAAE,IAAmC;QAC7D,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACtE,IAAI,CAAC,kBAAE,CAAC,YAAY,EAAE,0BAAU,CAAC,KAAK,CAAC,0BAAU,CAAC,MAAM,CAAC,CAAC,EAAE;YAC3D,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;SAC5D;QACD,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC9C,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC;YAC/B,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC;SACzB,CAAC,CAAC;QACH,OAAO,uBAAU,CAAA,UAAU,CAAC,GAAG,SAAS;YACvC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAC3B,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC;;;aAGtB,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,KAAK;eACtB,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,KAAK;SAC9B,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;;oBAElC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,KAAK,KAAK,IAAI;YACzC,CACN;YACH,CAAC,CAAC,EAAE,EAAE,CAAC;IACT,CAAC;CACD;AA/BD,kDA+BC"}
1
+ {"version":3,"file":"checkboxed-list-input.js","sourceRoot":"","sources":["../../../src/forms/controls/checkboxed-list-input.ts"],"names":[],"mappings":";;;AAAA,2DAAyD;AAEzD,2CAAwC;AACxC,6DAA2E;AAG3E,yCAA8C;AAE9C,MAAa,mBAAoB,SAAQ,2BAAgB;IACxD,YACQ,KAAyB,EACzB,UAA6B,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE;QAEzD,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QAHR,UAAK,GAAL,KAAK,CAAoB;QACzB,YAAO,GAAP,OAAO,CAA2C;IAG1D,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAY,EAAE,IAAmC;QAC7D,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACtE,IAAI,CAAC,kBAAE,CAAC,YAAY,EAAE,0BAAU,CAAC,KAAK,CAAC,0BAAU,CAAC,MAAM,CAAC,CAAC,EAAE;YAC3D,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;SAC5D;QACD,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC9C,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC;YAC/B,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC;SACzB,CAAC,CAAC;QAEH,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAEtC,OAAO,uBAAU,CAAA,UAAU,CAAC,GAAG,SAAS;YACvC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,CAC9C,4BAAY,CACX,CAAC,IAAI,EAAE,gCAAgB,CAAC,QAAQ,CAAC,CAAC;YAClC,UAAU,CAAC;;;cAGH,IAAI,IAAI,KAAK;gBACX,IAAI,IAAI,KAAK;UACnB,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;;qBAElC,IAAI,IAAI,KAAK,KAAK,IAAI;OACpC,CACD,CACA;YACH,CAAC,CAAC,EAAE,EAAE,CAAC;IACT,CAAC;CACD;AArCD,kDAqCC"}
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.Textarea = exports.HiddenInput = exports.HTML = exports.FormParagraph = exports.FormHeader = exports.SimpleInput = exports.Dropdown = exports.CheckboxedListInput = exports.Frame = exports.EditableCollectionSubset = exports.FormFieldControl = exports.FormControl = void 0;
3
+ exports.FieldGroup = exports.Textarea = exports.HiddenInput = exports.HTML = exports.FormParagraph = exports.FormHeader = exports.SimpleInput = exports.Dropdown = exports.CheckboxedListInput = exports.Frame = exports.EditableCollectionSubset = exports.FormFieldControl = exports.FormControl = void 0;
4
4
  var form_control_1 = require("./form-control");
5
5
  Object.defineProperty(exports, "FormControl", { enumerable: true, get: function () { return form_control_1.FormControl; } });
6
6
  var form_field_control_1 = require("./form-field-control");
@@ -25,4 +25,6 @@ var hidden_input_1 = require("./hidden-input");
25
25
  Object.defineProperty(exports, "HiddenInput", { enumerable: true, get: function () { return hidden_input_1.HiddenInput; } });
26
26
  var textarea_1 = require("./textarea");
27
27
  Object.defineProperty(exports, "Textarea", { enumerable: true, get: function () { return textarea_1.Textarea; } });
28
+ var field_group_1 = require("./field-group");
29
+ Object.defineProperty(exports, "FieldGroup", { enumerable: true, get: function () { return field_group_1.FieldGroup; } });
28
30
  //# sourceMappingURL=controls.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"controls.js","sourceRoot":"","sources":["../../../src/forms/controls/controls.ts"],"names":[],"mappings":";;;AAAA,+CAA6C;AAApC,2GAAA,WAAW,OAAA;AACpB,2DAAwD;AAA/C,sHAAA,gBAAgB,OAAA;AACzB,2EAAwE;AAA/D,sIAAA,wBAAwB,OAAA;AACjC,iCAAgC;AAAvB,8FAAA,KAAK,OAAA;AACd,iEAA8D;AAArD,4HAAA,mBAAmB,OAAA;AAC5B,uCAAsC;AAA7B,oGAAA,QAAQ,OAAA;AACjB,+CAA6C;AAApC,2GAAA,WAAW,OAAA;AACpB,6CAA2C;AAAlC,yGAAA,UAAU,OAAA;AACnB,mDAAiD;AAAxC,+GAAA,aAAa,OAAA;AACtB,+BAA8B;AAArB,4FAAA,IAAI,OAAA;AACb,+CAA6C;AAApC,2GAAA,WAAW,OAAA;AACpB,uCAAsC;AAA7B,oGAAA,QAAQ,OAAA"}
1
+ {"version":3,"file":"controls.js","sourceRoot":"","sources":["../../../src/forms/controls/controls.ts"],"names":[],"mappings":";;;AAAA,+CAA6C;AAApC,2GAAA,WAAW,OAAA;AACpB,2DAAwD;AAA/C,sHAAA,gBAAgB,OAAA;AACzB,2EAAwE;AAA/D,sIAAA,wBAAwB,OAAA;AACjC,iCAAgC;AAAvB,8FAAA,KAAK,OAAA;AACd,iEAA8D;AAArD,4HAAA,mBAAmB,OAAA;AAC5B,uCAAsC;AAA7B,oGAAA,QAAQ,OAAA;AACjB,+CAA6C;AAApC,2GAAA,WAAW,OAAA;AACpB,6CAA2C;AAAlC,yGAAA,UAAU,OAAA;AACnB,mDAAiD;AAAxC,+GAAA,aAAa,OAAA;AACtB,+BAA8B;AAArB,4FAAA,IAAI,OAAA;AACb,+CAA6C;AAApC,2GAAA,WAAW,OAAA;AACpB,uCAAsC;AAA7B,oGAAA,QAAQ,OAAA;AACjB,6CAA2C;AAAlC,yGAAA,UAAU,OAAA"}
@@ -1,8 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.Dropdown = void 0;
4
- const tempstream_1 = require("tempstream");
5
4
  const sanitize_1 = require("../../sanitize");
5
+ const input_wrapper_1 = require("../../utils/input-wrapper");
6
6
  const controls_1 = require("./controls");
7
7
  class Dropdown extends controls_1.FormFieldControl {
8
8
  constructor(field, options = {
@@ -16,21 +16,23 @@ class Dropdown extends controls_1.FormFieldControl {
16
16
  }
17
17
  async render(ctx, data) {
18
18
  const { parsed: picked_value } = await this.field.getValue(ctx, data);
19
- const id = this.field.name;
20
- return tempstream_1.tempstream /* HTML */ `<label for="${id}"
21
- >${this.options.label}</label
22
- ><select
23
- name="${this.field.name}"
24
- id="${id}"
25
- ${this.options.autosubmit
19
+ const name = this.field.name;
20
+ return input_wrapper_1.inputWrapper([name, input_wrapper_1.getRequiredClass(this.field.required)],
21
+ /* HTML */ `<label for="${name}">${this.options.label}</label
22
+ ><select
23
+ name="${this.field.name}"
24
+ id="${name}"
25
+ ${this.options.autosubmit
26
26
  ? `onchange='this.form.submit()'`
27
27
  : ""}
28
- ${!this.options.autocomplete ? `autocomplete="off"` : ""}
29
- >
30
- ${Promise.resolve(this.field.generateOptions(ctx)).then((options) => Object.entries(options).map(([value, text]) => `<option value="${sanitize_1.attribute(value)}" ${(value || "") == picked_value
28
+ ${!this.options.autocomplete ? `autocomplete="off"` : ""}
29
+ >
30
+ ${
31
+ // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
32
+ Promise.resolve(this.field.generateOptions(ctx)).then((options) => Object.entries(options).map(([value, text]) => `<option value="${sanitize_1.attribute(value)}" ${(value || "") == picked_value
31
33
  ? "selected"
32
34
  : ""}>${text}</option>`))}
33
- </select>`;
35
+ </select>`);
34
36
  }
35
37
  }
36
38
  exports.Dropdown = Dropdown;
@@ -1 +1 @@
1
- {"version":3,"file":"dropdown.js","sourceRoot":"","sources":["../../../src/forms/controls/dropdown.ts"],"names":[],"mappings":";;;AACA,2CAAwC;AACxC,6CAA2C;AAG3C,yCAA8C;AAE9C,MAAa,QAAS,SAAQ,2BAAgB;IAC7C,YACQ,KAAwB,EACxB,UAIH;QACH,KAAK,EAAE,KAAK,CAAC,IAAI;QACjB,UAAU,EAAE,KAAK;QACjB,YAAY,EAAE,IAAI;KAClB;QAED,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QAXR,UAAK,GAAL,KAAK,CAAmB;QACxB,YAAO,GAAP,OAAO,CAQb;IAGF,CAAC;IAED,KAAK,CAAC,MAAM,CACX,GAAY,EACZ,IAAmC;QAEnC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACtE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;QAC3B,OAAO,uBAAU,CAAA,UAAU,CAAC,eAAe,EAAE;OACxC,IAAI,CAAC,OAAO,CAAC,KAAK;;YAEb,IAAI,CAAC,KAAK,CAAC,IAAI;UACjB,EAAE;MACN,IAAI,CAAC,OAAO,CAAC,UAAU;YACxB,CAAC,CAAC,+BAA+B;YACjC,CAAC,CAAC,EAAE;MACH,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE;;MAEtD,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CACtD,CAAC,OAAO,EAAE,EAAE,CACX,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAC1B,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,CACjB,kBAAkB,oBAAS,CAAC,KAAK,CAAC,KACjC,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,YAAY;YAC5B,CAAC,CAAC,UAAU;YACZ,CAAC,CAAC,EACJ,IAAI,IAAI,WAAW,CACpB,CACF;aACQ,CAAC;IACb,CAAC;CACD;AA7CD,4BA6CC"}
1
+ {"version":3,"file":"dropdown.js","sourceRoot":"","sources":["../../../src/forms/controls/dropdown.ts"],"names":[],"mappings":";;;AACA,6CAA2C;AAC3C,6DAA2E;AAG3E,yCAA8C;AAE9C,MAAa,QAAS,SAAQ,2BAAgB;IAC7C,YACQ,KAAwB,EACxB,UAIH;QACH,KAAK,EAAE,KAAK,CAAC,IAAI;QACjB,UAAU,EAAE,KAAK;QACjB,YAAY,EAAE,IAAI;KAClB;QAED,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QAXR,UAAK,GAAL,KAAK,CAAmB;QACxB,YAAO,GAAP,OAAO,CAQb;IAGF,CAAC;IAED,KAAK,CAAC,MAAM,CACX,GAAY,EACZ,IAAmC;QAEnC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACtE,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;QAC7B,OAAO,4BAAY,CAClB,CAAC,IAAI,EAAE,gCAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC7C,UAAU,CAAC,eAAe,IAAI,KAAK,IAAI,CAAC,OAAO,CAAC,KAAK;;aAE3C,IAAI,CAAC,KAAK,CAAC,IAAI;WACjB,IAAI;OACR,IAAI,CAAC,OAAO,CAAC,UAAU;YACxB,CAAC,CAAC,+BAA+B;YACjC,CAAC,CAAC,EAAE;OACH,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE;;OAEtD;QACD,4EAA4E;QAC5E,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CACpD,CAAC,OAAO,EAAE,EAAE,CACX,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAC1B,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,CACjB,kBAAkB,oBAAS,CAAC,KAAK,CAAC,KACjC,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,YAAY;YAC5B,CAAC,CAAC,UAAU;YACZ,CAAC,CAAC,EACJ,IAAI,IAAI,WAAW,CACpB,CAEJ;cACS,CACX,CAAC;IACH,CAAC;CACD;AAlDD,4BAkDC"}
@@ -0,0 +1,26 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.FieldGroup = void 0;
4
+ const tempstream_1 = require("tempstream");
5
+ const form_control_1 = require("./form-control");
6
+ class FieldGroup extends form_control_1.FormControl {
7
+ constructor(controls, options = {}) {
8
+ super();
9
+ this.controls = controls;
10
+ this.options = options;
11
+ this.role = "decoration";
12
+ }
13
+ async render(ctx, data) {
14
+ const { label, classes } = this.options;
15
+ return tempstream_1.tempstream /* HTML */ `
16
+ <div class="field-group ${classes || ""}">
17
+ ${label ? `<label>${label}</label>` : ""}
18
+ <div class="field-group__fields">
19
+ ${this.controls.map((control) => control.render(ctx, data, [], "", ""))}
20
+ </div>
21
+ </div>
22
+ `;
23
+ }
24
+ }
25
+ exports.FieldGroup = FieldGroup;
26
+ //# sourceMappingURL=field-group.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"field-group.js","sourceRoot":"","sources":["../../../src/forms/controls/field-group.ts"],"names":[],"mappings":";;;AACA,2CAAyD;AAEzD,iDAA6C;AAE7C,MAAa,UAAW,SAAQ,0BAAW;IAC1C,YACQ,QAAuB,EACvB,UAAgD,EAAE;QAEzD,KAAK,EAAE,CAAC;QAHD,aAAQ,GAAR,QAAQ,CAAe;QACvB,YAAO,GAAP,OAAO,CAA2C;QAsB1D,SAAI,GAAU,YAAY,CAAC;IAnB3B,CAAC;IAED,KAAK,CAAC,MAAM,CACX,GAAY,EACZ,IAAmC;QAEnC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QAExC,OAAO,uBAAU,CAAA,UAAU,CAAC;6BACD,OAAO,IAAI,EAAE;MACpC,KAAK,CAAC,CAAC,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE;;OAErC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAC/B,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CACrC;;;GAGH,CAAC;IACH,CAAC;CAED;AA1BD,gCA0BC"}
@@ -1 +1 @@
1
- {"version":3,"file":"form-control.js","sourceRoot":"","sources":["../../../src/forms/controls/form-control.ts"],"names":[],"mappings":";;;AAIA,MAAsB,WAAW;CAOhC;AAPD,kCAOC"}
1
+ {"version":3,"file":"form-control.js","sourceRoot":"","sources":["../../../src/forms/controls/form-control.ts"],"names":[],"mappings":";;;AAIA,MAAsB,WAAW;CAShC;AATD,kCASC"}
@@ -1 +1 @@
1
- {"version":3,"file":"form-field-control.js","sourceRoot":"","sources":["../../../src/forms/controls/form-field-control.ts"],"names":[],"mappings":";;;AAIA,iDAA6C;AAQ7C,MAAsB,gBAAiB,SAAQ,0BAAW;IAEzD,YAAmB,MAAmB;QACrC,KAAK,EAAE,CAAC;QADU,WAAM,GAAN,MAAM,CAAa;QADtC,SAAI,GAAU,OAAO,CAAC;IAGtB,CAAC;CAMD;AAVD,4CAUC"}
1
+ {"version":3,"file":"form-field-control.js","sourceRoot":"","sources":["../../../src/forms/controls/form-field-control.ts"],"names":[],"mappings":";;;AAIA,iDAA6C;AAQ7C,MAAsB,gBAAiB,SAAQ,0BAAW;IAEzD,YAAmB,MAAmB;QACrC,KAAK,EAAE,CAAC;QADU,WAAM,GAAN,MAAM,CAAa;QADtC,SAAI,GAAU,OAAO,CAAC;IAGtB,CAAC;CASD;AAbD,4CAaC"}
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.SimpleInput = void 0;
4
4
  const sanitize_1 = require("../../sanitize");
5
+ const input_wrapper_1 = require("../../utils/input-wrapper");
5
6
  const controls_1 = require("./controls");
6
7
  class SimpleInput extends controls_1.FormFieldControl {
7
8
  constructor(field, options = {}) {
@@ -9,7 +10,7 @@ class SimpleInput extends controls_1.FormFieldControl {
9
10
  this.field = field;
10
11
  this.options = options;
11
12
  }
12
- async render(ctx, data) {
13
+ async render(ctx, data, _, field_prefix, form_id) {
13
14
  const id = this.options.id || this.field.name;
14
15
  const label = this.options.label || this.field.name;
15
16
  const type = this.options.type || "text";
@@ -19,22 +20,19 @@ class SimpleInput extends controls_1.FormFieldControl {
19
20
  const placeholder = this.options.placeholder || type;
20
21
  const readonly = this.options.readonly || false;
21
22
  const required = this.field.required;
22
- return /* HTML */ `<div
23
- class="form-input form-input__wrapper ${required
24
- ? "form-input--required"
25
- : ""}"
26
- >
23
+ return /* HTML */ input_wrapper_1.inputWrapper([id, type, input_wrapper_1.getRequiredClass(required)], `
27
24
  <label for="${id}">${label}</label>
28
25
  <input
29
26
  id="${id}"
30
27
  type="${type}"
31
- name="${this.field.name}"
28
+ name="${field_prefix}${this.field.name}"
32
29
  value="${sanitize_1.attribute(!valid && raw
33
30
  ? raw.toString()
34
31
  : parsed !== undefined && parsed !== null
35
32
  ? // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
36
33
  parsed?.toString() || ""
37
34
  : "")}"
35
+ ${form_id ? `form="${form_id}"` : ""}
38
36
  placeholder="${placeholder}"
39
37
  ${readonly ? "readonly" : ""}
40
38
  ${required ? "required" : ""}
@@ -44,7 +42,7 @@ class SimpleInput extends controls_1.FormFieldControl {
44
42
  ${~valid && !this.options.hide_errors
45
43
  ? `<div class="input__error">${message}</div>`
46
44
  : ""}
47
- </div>`;
45
+ `);
48
46
  }
49
47
  }
50
48
  exports.SimpleInput = SimpleInput;
@@ -1 +1 @@
1
- {"version":3,"file":"simple-input.js","sourceRoot":"","sources":["../../../src/forms/controls/simple-input.ts"],"names":[],"mappings":";;;AACA,6CAA2C;AAG3C,yCAA8C;AAE9C,MAAa,WAAY,SAAQ,2BAAgB;IAChD,YACQ,KAAgB,EAChB,UAuBH,EAAE;QAEN,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QA1BR,UAAK,GAAL,KAAK,CAAW;QAChB,YAAO,GAAP,OAAO,CAuBR;IAGP,CAAC;IAED,KAAK,CAAC,MAAM,CACX,GAAY,EACZ,IAAmC;QAEnC,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;QAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;QACpD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,MAAM,CAAC;QACzC,yEAAyE;QACzE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAChE,GAAG,EACH,IAAI,CACJ,CAAC;QACF,yEAAyE;QACzE,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,IAAI,CAAC;QACrD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,KAAK,CAAC;QAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;QAErC,OAAO,UAAU,CAAC;2CACuB,QAAQ;YAC/C,CAAC,CAAC,sBAAsB;YACxB,CAAC,CAAC,EAAE;;iBAES,EAAE,KAAK,KAAK;;UAEnB,EAAE;YACA,IAAI;YACJ,IAAI,CAAC,KAAK,CAAC,IAAI;aACd,oBAAS,CACjB,CAAC,KAAK,IAAI,GAAG;YACZ,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE;YAChB,CAAC,CAAC,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,IAAI;gBACzC,CAAC,CAAC,iLAAiL;oBAC/K,MAAc,EAAE,QAAQ,EAAa,IAAI,EAAE;gBAC/C,CAAC,CAAC,EAAE,CACL;mBACc,WAAW;MACxB,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;MAC1B,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;MAC1B,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE;MACtD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE;;KAEvD,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW;YACpC,CAAC,CAAC,6BAA6B,OAAO,QAAQ;YAC9C,CAAC,CAAC,EAAE;SACC,CAAC;IACT,CAAC;CACD;AA7ED,kCA6EC"}
1
+ {"version":3,"file":"simple-input.js","sourceRoot":"","sources":["../../../src/forms/controls/simple-input.ts"],"names":[],"mappings":";;;AAEA,6CAA2C;AAC3C,6DAA2E;AAG3E,yCAA8C;AAE9C,MAAa,WAAY,SAAQ,2BAAgB;IAChD,YACQ,KAAgB,EAChB,UAuBH,EAAE;QAEN,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QA1BR,UAAK,GAAL,KAAK,CAAW;QAChB,YAAO,GAAP,OAAO,CAuBR;IAGP,CAAC;IAED,KAAK,CAAC,MAAM,CACX,GAAY,EACZ,IAAmC,EACnC,CAAY,EACZ,YAAoB,EACpB,OAAe;QAEf,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;QAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;QACpD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,MAAM,CAAC;QACzC,yEAAyE;QACzE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAChE,GAAG,EACH,IAAI,CACJ,CAAC;QACF,yEAAyE;QACzE,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,IAAI,CAAC;QACrD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,KAAK,CAAC;QAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;QAErC,OAAO,UAAU,CAAC,4BAAY,CAC7B,CAAC,EAAE,EAAE,IAAI,EAAE,gCAAgB,CAAC,QAAQ,CAAC,CAAC,EACtC;iBACc,EAAE,KAAK,KAAK;;UAEnB,EAAE;YACA,IAAI;YACJ,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI;aAC7B,oBAAS,CACjB,CAAC,KAAK,IAAI,GAAG;YACZ,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE;YAChB,CAAC,CAAC,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,IAAI;gBACzC,CAAC,CAAC,iLAAiL;oBAC/K,MAAc,EAAE,QAAQ,EAAa,IAAI,EAAE;gBAC/C,CAAC,CAAC,EAAE,CACL;MACC,OAAO,CAAC,CAAC,CAAC,SAAS,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE;mBACrB,WAAW;MACxB,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;MAC1B,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;MAC1B,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE;MACtD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE;;KAGxD,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW;YAClC,CAAC,CAAC,6BAA6B,OAAO,QAAQ;YAC9C,CAAC,CAAC,EACJ;CACF,CACE,CAAC;IACH,CAAC;CACD;AAlFD,kCAkFC"}
@@ -1,8 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.Textarea = void 0;
4
- const tempstream_1 = require("tempstream");
5
4
  const sanitize_1 = require("../../sanitize");
5
+ const input_wrapper_1 = require("../../utils/input-wrapper");
6
6
  const form_field_control_1 = require("./form-field-control");
7
7
  class Textarea extends form_field_control_1.FormFieldControl {
8
8
  constructor(field, options = {}) {
@@ -12,21 +12,19 @@ class Textarea extends form_field_control_1.FormFieldControl {
12
12
  }
13
13
  async render(ctx, data) {
14
14
  const { raw } = await this.field.getValue(ctx, data);
15
- return tempstream_1.tempstream /* HTML */ `<div
16
- class="form-input form-input__wrapper"
17
- >
18
- <label for="${this.field.name}"
19
- >${this.options.label || this.field.name}</label
20
- >
21
- <textarea
22
- name="${this.field.name}"
23
- id="${this.field.name}"
24
- rows="${this.options.rows || 5}"
25
- cols="${this.options.cols || 33}"
26
- >
15
+ const { name, required } = this.field;
16
+ return input_wrapper_1.inputWrapper([name, input_wrapper_1.getRequiredClass(required)],
17
+ /* HTML */ ` <label for="${name}"
18
+ >${this.options.label || name}</label
19
+ >
20
+ <textarea
21
+ name="${name}"
22
+ id="${name}"
23
+ rows="${this.options.rows || 5}"
24
+ cols="${this.options.cols || 33}"
25
+ >
27
26
  ${sanitize_1.attribute((raw || "").toString())}</textarea
28
- >
29
- </div>`;
27
+ >`);
30
28
  }
31
29
  }
32
30
  exports.Textarea = Textarea;
@@ -1 +1 @@
1
- {"version":3,"file":"textarea.js","sourceRoot":"","sources":["../../../src/forms/controls/textarea.ts"],"names":[],"mappings":";;;AACA,2CAAyD;AACzD,6CAA2C;AAG3C,6DAAwD;AAExD,MAAa,QAAS,SAAQ,qCAAgB;IAC7C,YACQ,KAAgB,EAChB,UAA4D,EAAE;QAErE,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QAHR,UAAK,GAAL,KAAK,CAAW;QAChB,YAAO,GAAP,OAAO,CAAuD;IAGtE,CAAC;IAED,KAAK,CAAC,MAAM,CACX,GAAY,EACZ,IAAmC;QAEnC,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACrD,OAAO,uBAAU,CAAA,UAAU,CAAC;;;iBAGb,IAAI,CAAC,KAAK,CAAC,IAAI;OACzB,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI;;;YAGhC,IAAI,CAAC,KAAK,CAAC,IAAI;UACjB,IAAI,CAAC,KAAK,CAAC,IAAI;YACb,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC;YACtB,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE;;EAEjC,oBAAS,CAAC,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;;SAE1B,CAAC;IACT,CAAC;CACD;AA7BD,4BA6BC"}
1
+ {"version":3,"file":"textarea.js","sourceRoot":"","sources":["../../../src/forms/controls/textarea.ts"],"names":[],"mappings":";;;AAEA,6CAA2C;AAC3C,6DAA2E;AAG3E,6DAAwD;AAExD,MAAa,QAAS,SAAQ,qCAAgB;IAC7C,YACQ,KAAgB,EAChB,UAA4D,EAAE;QAErE,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QAHR,UAAK,GAAL,KAAK,CAAW;QAChB,YAAO,GAAP,OAAO,CAAuD;IAGtE,CAAC;IAED,KAAK,CAAC,MAAM,CACX,GAAY,EACZ,IAAmC;QAEnC,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACrD,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACtC,OAAO,4BAAY,CAClB,CAAC,IAAI,EAAE,gCAAgB,CAAC,QAAQ,CAAC,CAAC;QAClC,UAAU,CAAC,gBAAgB,IAAI;QAC1B,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,IAAI;;;aAGrB,IAAI;WACN,IAAI;aACF,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC;aACtB,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE;;EAElC,oBAAS,CAAC,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;MAC7B,CACH,CAAC;IACH,CAAC;CACD;AA7BD,4BA6BC"}
package/lib/forms/form.js CHANGED
@@ -3,12 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.Form = void 0;
4
4
  const tempstream_1 = require("tempstream");
5
5
  const ts_predicates_1 = require("@sealcode/ts-predicates");
6
- const mountable_1 = require("../page/mountable");
7
- class Form extends mountable_1.Mountable {
6
+ const mountable_with_fields_1 = require("../page/mountable-with-fields");
7
+ class Form extends mountable_with_fields_1.MountableWithFields {
8
8
  constructor() {
9
9
  super(...arguments);
10
10
  this.defaultSuccessMessage = "Done";
11
11
  this.submitButtonText = "Wyślij";
12
+ this.action = "./";
12
13
  }
13
14
  async canAccess(
14
15
  // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -18,41 +19,105 @@ class Form extends mountable_1.Mountable {
18
19
  async renderError(_, error) {
19
20
  return tempstream_1.tempstream /* HTML */ `<div>${error.message}</div>`;
20
21
  }
22
+ makeSubmitButton() {
23
+ return /* HTML */ `<input
24
+ type="submit"
25
+ value="${this.submitButtonText}"
26
+ formaction="${this.action}"
27
+ ${this.form_id ? `form="${this.form_id}"` : ""}
28
+ />`;
29
+ }
21
30
  async render(ctx, data) {
22
- return tempstream_1.tempstream /* HTML */ `${this.makeFormTag()} ${!this.controls.some((control) => control.role == "messages")
31
+ return tempstream_1.tempstream /* HTML */ `${this.makeOpenFormTag()}
32
+ ${!this.controls.some((control) => control.role == "messages")
23
33
  ? this.renderMessages(ctx, data)
24
- : ""} ${this.renderControls(ctx, data)}<input type="submit" value="${this.submitButtonText}"/></form>`;
34
+ : ""}
35
+ ${this.renderControls(ctx, data)} ${this.makeSubmitButton()}
36
+ ${this.makeCloseFormTag()}`;
37
+ }
38
+ makeOpenFormTag() {
39
+ return `<form method="POST" action="${this.action}">`;
25
40
  }
26
- makeFormTag() {
27
- return `<form method="POST" action="./">`;
41
+ makeCloseFormTag() {
42
+ return `</form>`;
28
43
  }
29
44
  async onValuesInvalid(ctx, form_messages) {
30
- ctx.status = 422;
31
- ctx.body = await this.render(ctx, {
32
- raw_values: ctx.$body,
33
- messages: form_messages.length
34
- ? form_messages
35
- : [{ type: "error", text: "Some fields are invalid" }],
36
- });
45
+ const messages = form_messages.length
46
+ ? form_messages
47
+ : [{ type: "error", text: "Some fields are invalid" }];
48
+ return {
49
+ action: "stay",
50
+ content: await this.render(ctx, {
51
+ raw_values: this.extractRawValues(ctx),
52
+ messages,
53
+ }),
54
+ messages,
55
+ };
37
56
  }
38
57
  async onError(ctx, data, error) {
39
- ctx.status = 422;
40
58
  let error_message = "Unknown error has occured";
41
59
  if (ts_predicates_1.is(error, ts_predicates_1.predicates.object) &&
42
60
  ts_predicates_1.hasShape({ message: ts_predicates_1.predicates.string }, error)) {
43
61
  error_message = error.message;
44
62
  }
45
- ctx.body = await this.render(ctx, {
46
- raw_values: data.raw_values,
47
- messages: [{ type: "error", text: error_message }],
48
- });
63
+ const messages = [{ type: "error", text: error_message }];
64
+ return {
65
+ action: "stay",
66
+ content: await this.render(ctx, {
67
+ raw_values: data.raw_values,
68
+ messages: [],
69
+ }),
70
+ messages,
71
+ };
49
72
  }
50
73
  async onSuccess(ctx, data) {
51
- ctx.body = await this.render(ctx, {
52
- raw_values: data.raw_values,
53
- messages: [{ type: "success", text: this.defaultSuccessMessage }],
54
- });
55
- ctx.status = 422;
74
+ const messages = [
75
+ { type: "success", text: this.defaultSuccessMessage },
76
+ ];
77
+ return {
78
+ action: "stay",
79
+ content: await this.render(ctx, {
80
+ raw_values: data.raw_values,
81
+ messages,
82
+ }),
83
+ messages,
84
+ };
85
+ }
86
+ async handlePost(ctx) {
87
+ const { valid, form_messages } = await this.validate(ctx, this.extractRawValues(ctx));
88
+ if (!valid) {
89
+ return this.onValuesInvalid(ctx, form_messages);
90
+ }
91
+ try {
92
+ ctx.status = 303;
93
+ await this.onSubmit(ctx, {
94
+ raw_values: this.extractRawValues(ctx),
95
+ messages: [],
96
+ });
97
+ return this.onSuccess(ctx, {
98
+ raw_values: this.extractRawValues(ctx),
99
+ messages: [],
100
+ });
101
+ }
102
+ catch (e) {
103
+ // eslint-disable-next-line no-console
104
+ console.dir(e, { depth: 5 });
105
+ const message = ts_predicates_1.is(e, ts_predicates_1.predicates.object) &&
106
+ ts_predicates_1.hasFieldOfType(e, "message", ts_predicates_1.predicates.string)
107
+ ? e?.message
108
+ : ts_predicates_1.is(e, ts_predicates_1.predicates.string)
109
+ ? e
110
+ : "Wystąpił błąd";
111
+ return this.onError(ctx, {
112
+ raw_values: this.extractRawValues(ctx),
113
+ messages: [
114
+ {
115
+ type: "error",
116
+ text: message,
117
+ },
118
+ ],
119
+ }, e);
120
+ }
56
121
  }
57
122
  mount(router, path) {
58
123
  router.use(path, async (ctx, next) => {
@@ -70,46 +135,19 @@ class Form extends mountable_1.Mountable {
70
135
  router.get(path, async (ctx) => {
71
136
  ctx.type = "html";
72
137
  ctx.body = await this.render(ctx, {
73
- raw_values: ctx.$body,
138
+ raw_values: this.extractRawValues(ctx),
74
139
  messages: [],
75
140
  });
76
141
  });
77
142
  router.post(path, async (ctx) => {
78
- const { valid, form_messages } = await this.validate(ctx, ctx.$body);
79
- if (!valid) {
80
- await this.onValuesInvalid(ctx, form_messages);
81
- return;
143
+ const reaction = await this.handlePost(ctx);
144
+ if (reaction.action == "stay") {
145
+ ctx.status = 422;
146
+ ctx.body = reaction.content;
82
147
  }
83
- try {
148
+ else if (reaction.action == "redirect") {
84
149
  ctx.status = 303;
85
- await this.onSubmit(ctx, {
86
- raw_values: ctx.$body,
87
- messages: [],
88
- });
89
- await this.onSuccess(ctx, {
90
- raw_values: ctx.$body,
91
- messages: [],
92
- });
93
- }
94
- catch (e) {
95
- // eslint-disable-next-line no-console
96
- console.dir(e, { depth: 5 });
97
- const message = ts_predicates_1.is(e, ts_predicates_1.predicates.object) &&
98
- ts_predicates_1.hasFieldOfType(e, "message", ts_predicates_1.predicates.string)
99
- ? e?.message
100
- : ts_predicates_1.is(e, ts_predicates_1.predicates.string)
101
- ? e
102
- : "Wystąpił błąd";
103
- ctx.status = 422;
104
- await this.onError(ctx, {
105
- raw_values: ctx.$body,
106
- messages: [
107
- {
108
- type: "error",
109
- text: message,
110
- },
111
- ],
112
- }, e);
150
+ ctx.redirect(reaction.url);
113
151
  }
114
152
  });
115
153
  }
@@ -1 +1 @@
1
- {"version":3,"file":"form.js","sourceRoot":"","sources":["../../src/forms/form.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"form.js","sourceRoot":"","sources":["../../src/forms/form.ts"],"names":[],"mappings":"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"}