@sealcode/sealgen 0.6.1 → 0.7.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 (78) 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/forms/controls/field-group.d.ts +17 -0
  8. package/@types/forms/controls/form-control.d.ts +1 -1
  9. package/@types/forms/controls/form-field-control.d.ts +1 -1
  10. package/@types/forms/controls/simple-input.d.ts +2 -1
  11. package/@types/forms/form.d.ts +19 -6
  12. package/@types/forms/multiform.d.ts +9 -11
  13. package/@types/index.d.ts +1 -0
  14. package/@types/page/mountable-with-fields.d.ts +32 -0
  15. package/@types/page/mountable.d.ts +2 -27
  16. package/@types/page/page.d.ts +2 -2
  17. package/@types/templates/multiform.d.ts +1 -0
  18. package/@types/templates/redirect.d.ts +1 -0
  19. package/@types/utils/input-wrapper.d.ts +4 -0
  20. package/coverage/clover.xml +79 -0
  21. package/lib/add-route.js +27 -8
  22. package/lib/add-route.js.map +1 -1
  23. package/lib/forms/controls/checkboxed-list-input.js +12 -9
  24. package/lib/forms/controls/checkboxed-list-input.js.map +1 -1
  25. package/lib/forms/controls/dropdown.js +14 -12
  26. package/lib/forms/controls/dropdown.js.map +1 -1
  27. package/lib/forms/controls/field-group.js +26 -0
  28. package/lib/forms/controls/field-group.js.map +1 -0
  29. package/lib/forms/controls/form-control.js.map +1 -1
  30. package/lib/forms/controls/form-field-control.js.map +1 -1
  31. package/lib/forms/controls/simple-input.js +6 -8
  32. package/lib/forms/controls/simple-input.js.map +1 -1
  33. package/lib/forms/controls/textarea.js +13 -15
  34. package/lib/forms/controls/textarea.js.map +1 -1
  35. package/lib/forms/form.js +95 -57
  36. package/lib/forms/form.js.map +1 -1
  37. package/lib/forms/multiform.js +52 -62
  38. package/lib/forms/multiform.js.map +1 -1
  39. package/lib/generate-routes.js +7 -3
  40. package/lib/generate-routes.js.map +1 -1
  41. package/lib/index.js +1 -0
  42. package/lib/index.js.map +1 -1
  43. package/lib/page/list.js +1 -1
  44. package/lib/page/list.js.map +1 -1
  45. package/lib/page/mountable-with-fields.js +63 -0
  46. package/lib/page/mountable-with-fields.js.map +1 -0
  47. package/lib/page/mountable.js +2 -49
  48. package/lib/page/mountable.js.map +1 -1
  49. package/lib/page/page.js +2 -2
  50. package/lib/page/page.js.map +1 -1
  51. package/lib/templates/multiform.js +59 -0
  52. package/lib/templates/multiform.js.map +1 -0
  53. package/lib/templates/redirect.js +27 -0
  54. package/lib/templates/redirect.js.map +1 -0
  55. package/lib/tests/manual/multiform.js +14 -5
  56. package/lib/tests/manual/multiform.js.map +1 -1
  57. package/lib/utils/input-wrapper.js +20 -0
  58. package/lib/utils/input-wrapper.js.map +1 -0
  59. package/package.json +4 -3
  60. package/src/add-route.ts +30 -11
  61. package/src/forms/controls/checkboxed-list-input.ts +17 -10
  62. package/src/forms/controls/dropdown.ts +28 -23
  63. package/src/forms/controls/form-control.ts +3 -1
  64. package/src/forms/controls/form-field-control.ts +4 -1
  65. package/src/forms/controls/simple-input.ts +19 -12
  66. package/src/forms/controls/textarea.ts +15 -14
  67. package/src/forms/form.ts +122 -76
  68. package/src/forms/multiform.ts +211 -0
  69. package/src/generate-routes.ts +7 -3
  70. package/src/index.ts +1 -0
  71. package/src/page/list.ts +1 -1
  72. package/src/page/mountable-with-fields.ts +112 -0
  73. package/src/page/mountable.ts +4 -96
  74. package/src/page/page.ts +7 -3
  75. package/src/templates/multiform.ts +58 -0
  76. package/src/templates/redirect.ts +22 -0
  77. package/src/tests/manual/multiform.ts +106 -0
  78. package/src/utils/input-wrapper.ts +18 -0
@@ -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":";;;AAEA,2CAAsE;AACtE,2DAKiC;AAEjC,iDAAwE;AAsBxE,MAAsB,IAAuB,SAAQ,qBAAY;IAAjE;;QACC,0BAAqB,GAAG,MAAM,CAAC;QAC/B,qBAAgB,GAAG,QAAQ,CAAC;IAmJ7B,CAAC;IAjJA,KAAK,CAAC,SAAS;IACd,6DAA6D;IAC7D,CAAU;QAEV,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,WAAW,CAChB,CAAU,EACV,KAAuB;QAEvB,OAAO,uBAAU,CAAA,UAAU,CAAC,QAAQ,KAAK,CAAC,OAAO,QAAQ,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAY,EAAE,IAAc;QACxC,OAAO,uBAAU,CAAA,UAAU,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,IAChD,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,IAAI,UAAU,CAAC;YAC3D,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC;YAChC,CAAC,CAAC,EACJ,IAAI,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,+BACjC,IAAI,CAAC,gBACN,YAAY,CAAC;IACd,CAAC;IAEM,WAAW;QACjB,OAAO,kCAAkC,CAAC;IAC3C,CAAC;IAEM,KAAK,CAAC,eAAe,CAC3B,GAAY,EACZ,aAA4B;QAE5B,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;QACjB,GAAG,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;YACjC,UAAU,EAAE,GAAG,CAAC,KAAK;YAErB,QAAQ,EAAE,aAAa,CAAC,MAAM;gBAC7B,CAAC,CAAC,aAAa;gBACf,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,yBAAyB,EAAE,CAAC;SACvD,CAAC,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,OAAO,CACnB,GAAY,EACZ,IAAc,EACd,KAAc;QAEd,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;QACjB,IAAI,aAAa,GAAG,2BAA2B,CAAC;QAChD,IACC,kBAAE,CAAC,KAAK,EAAE,0BAAU,CAAC,MAAM,CAAC;YAC5B,wBAAQ,CAAC,EAAE,OAAO,EAAE,0BAAU,CAAC,MAAM,EAAE,EAAE,KAAK,CAAC,EAC9C;YACD,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC;SAC9B;QACD,GAAG,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;YACjC,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;SAClD,CAAC,CAAC;IACJ,CAAC;IAOM,KAAK,CAAC,SAAS,CAAC,GAAY,EAAE,IAAc;QAClD,GAAG,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;YACjC,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,qBAAqB,EAAE,CAAC;SACjE,CAAC,CAAC;QACH,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,MAAc,EAAE,IAAY;QACxC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACpC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YACzC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;gBACtB,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE;oBAChC,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,MAAM,CAAC,OAAO;iBACvB,CAAC,CAAC;gBACH,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;gBACjB,OAAO;aACP;YACD,MAAM,IAAI,EAAE,CAAC;QACd,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YAC9B,GAAG,CAAC,IAAI,GAAG,MAAM,CAAC;YAClB,GAAG,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;gBACjC,UAAU,EAAE,GAAG,CAAC,KAAK;gBACrB,QAAQ,EAAE,EAAE;aACZ,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YAC/B,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,MAAM,IAAI,CAAC,QAAQ,CACnD,GAAG,EACH,GAAG,CAAC,KAAK,CACT,CAAC;YACF,IAAI,CAAC,KAAK,EAAE;gBACX,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;gBAC/C,OAAO;aACP;YACD,IAAI;gBACH,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;gBACjB,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE;oBACxB,UAAU,EAAE,GAAG,CAAC,KAAK;oBACrB,QAAQ,EAAE,EAAE;iBACZ,CAAC,CAAC;gBACH,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE;oBACzB,UAAU,EAAE,GAAG,CAAC,KAAK;oBACrB,QAAQ,EAAE,EAAE;iBACZ,CAAC,CAAC;aACH;YAAC,OAAO,CAAU,EAAE;gBACpB,sCAAsC;gBACtC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;gBAC7B,MAAM,OAAO,GACZ,kBAAE,CAAC,CAAC,EAAE,0BAAU,CAAC,MAAM,CAAC;oBACxB,8BAAc,CAAC,CAAC,EAAE,SAAS,EAAE,0BAAU,CAAC,MAAM,CAAC;oBAC9C,CAAC,CAAC,CAAC,EAAE,OAAO;oBACZ,CAAC,CAAC,kBAAE,CAAC,CAAC,EAAE,0BAAU,CAAC,MAAM,CAAC;wBAC1B,CAAC,CAAC,CAAC;wBACH,CAAC,CAAC,eAAe,CAAC;gBAEpB,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;gBACjB,MAAM,IAAI,CAAC,OAAO,CACjB,GAAG,EACH;oBACC,UAAU,EAAE,GAAG,CAAC,KAAK;oBACrB,QAAQ,EAAE;wBACT;4BACC,IAAI,EAAE,OAAO;4BACb,IAAI,EAAE,OAAO;yBACb;qBACD;iBACD,EACD,CAAC,CACD,CAAC;aACF;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,gBAAgB,CAAC,GAAY;QAC5B,OAAO,GAAG,CAAC,KAAK,CAAC;IAClB,CAAC;CACD;AArJD,oBAqJC"}
1
+ {"version":3,"file":"form.js","sourceRoot":"","sources":["../../src/forms/form.ts"],"names":[],"mappings":"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"}
@@ -1,19 +1,19 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.Multiform = void 0;
3
4
  const ts_predicates_1 = require("@sealcode/ts-predicates");
4
5
  const tempstream_1 = require("tempstream");
5
- const __1 = require("..");
6
+ const mountable_with_fields_1 = require("../page/mountable-with-fields");
6
7
  const sanitize_1 = require("../sanitize");
7
8
  const FIELD_PREFIX_SEPARATOR = "___";
8
- class Multiform extends __1.Mountable {
9
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
10
- constructor(name, forms, wrapper = (content) => tempstream_1.tempstream `<!doctype html><html>${content}</html>`) {
11
- super();
12
- this.name = name;
13
- this.forms = forms;
14
- this.wrapper = wrapper;
9
+ class Multiform extends mountable_with_fields_1.MountableWithFields {
10
+ constructor() {
11
+ super(...arguments);
15
12
  this.controls = [];
16
- for (const [key, form] of Object.entries(forms)) {
13
+ }
14
+ init() {
15
+ super.init();
16
+ for (const [key, form] of Object.entries(this.forms)) {
17
17
  if (key !== sanitize_1.attribute(key)) {
18
18
  throw new Error(`Form name "${key}" is not url-safe. Try: "${sanitize_1.attribute(key)}"`);
19
19
  }
@@ -33,9 +33,6 @@ class Multiform extends __1.Mountable {
33
33
  ${form.form_id ? `form="${form.form_id}"` : ""}
34
34
  /> `;
35
35
  }
36
- }
37
- init() {
38
- super.init();
39
36
  for (const form of Object.values(this.forms)) {
40
37
  for (const field of Object.values(form.fields)) {
41
38
  if (field.name.includes(FIELD_PREFIX_SEPARATOR)) {
@@ -47,14 +44,14 @@ class Multiform extends __1.Mountable {
47
44
  extractRawValues(ctx) {
48
45
  return ctx.$body || {};
49
46
  }
50
- async canAccess(_) {
47
+ async canAccess() {
51
48
  return {
52
49
  canAccess: true,
53
50
  message: "this view includes multiple forms and each of them have their unique access rules",
54
51
  };
55
52
  }
56
53
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
57
- getSubFormsToRender(ctx) {
54
+ getSubformsToRender(ctx) {
58
55
  const requested_frame = ctx.headers["turbo-frame"];
59
56
  if (!ts_predicates_1.is(requested_frame, ts_predicates_1.predicates.or(ts_predicates_1.predicates.undefined, ts_predicates_1.predicates.string))) {
60
57
  throw new Error("Wrong turbo-frame header value type");
@@ -64,7 +61,7 @@ class Multiform extends __1.Mountable {
64
61
  : Object.entries(this.forms);
65
62
  return forms_to_render;
66
63
  }
67
- async renderSubForm(ctx, sub_form_name) {
64
+ async renderSubform(ctx, sub_form_name) {
68
65
  const form = this.forms[sub_form_name];
69
66
  const result = await form.canAccess(ctx);
70
67
  if (!result.canAccess) {
@@ -84,8 +81,8 @@ class Multiform extends __1.Mountable {
84
81
  ]));
85
82
  return result;
86
83
  }
87
- async renderSubForms(ctx, messages, prerenderedForms = {}) {
88
- return this.wrapper(tempstream_1.tempstream /* HTML */ `${this.renderMessages(ctx, {
84
+ async render(ctx, messages, prerenderedForms = {}) {
85
+ return tempstream_1.tempstream /* HTML */ `${this.renderMessages(ctx, {
89
86
  raw_values: {},
90
87
  messages,
91
88
  })}
@@ -97,7 +94,7 @@ class Multiform extends __1.Mountable {
97
94
  /* novalidate is here because all the subforms are actuallly one form and errors in one will prevent submitting all of the forms */ ""}
98
95
  method="POST"
99
96
  ></form>
100
- ${this.getSubFormsToRender(ctx).map(([form_name]) => {
97
+ ${this.getSubformsToRender(ctx).map(([form_name]) => {
101
98
  const frame_form_id = this.name + "_" + form_name + "_frame_form";
102
99
  return tempstream_1.tempstream /* HTML */ `<turbo-frame
103
100
  id="${form_name}"
@@ -105,57 +102,50 @@ class Multiform extends __1.Mountable {
105
102
  subform-id="${frame_form_id}"
106
103
  >
107
104
  ${prerenderedForms[form_name] ||
108
- this.renderSubForm(ctx, form_name)}
105
+ this.renderSubform(ctx, form_name)}
109
106
  <form id="${frame_form_id}" method="POST"></form>
110
107
  </turbo-frame>`;
111
108
  })}
112
109
  </div>
113
- <script>
114
- (function () {
115
- if (!window.subform_handlers) {
116
- window.subform_handlers = {};
117
- }
118
- if (window.subform_handlers["${this.name}"]) {
119
- return;
120
- }
121
- const handler = () => {
122
- document
123
- .querySelectorAll("turbo-frame[contains-subform]")
124
- .forEach((frame) => {
125
- frame_form_id =
126
- frame.getAttribute("subform-id");
127
- frame
128
- .querySelectorAll("input")
129
- .forEach((input) => {
130
- input.setAttribute(
131
- "form",
132
- frame_form_id
133
- );
134
- });
135
- });
136
- };
137
- window.subform_handlers["${this.name}"] = handler;
138
- document.documentElement.addEventListener(
139
- "turbo:load",
140
- handler
141
- );
142
- document.documentElement.addEventListener(
143
- "turbo:frame-render",
144
- handler
145
- );
146
- })();
147
- </script>`);
110
+ ${this.makeBottomScript()}`;
148
111
  }
149
- async render(ctx, data) {
150
- return this.renderSubForms(ctx, data.messages, {});
112
+ makeBottomScript() {
113
+ // this script assigns each field to its corresponding form, instead of
114
+ // the html-only version where all fields are attached to one meta-form
115
+ return /* HTML */ ` <script>
116
+ (function () {
117
+ if (!window.subform_handlers) {
118
+ window.subform_handlers = {};
119
+ }
120
+ if (window.subform_handlers["${this.name}"]) {
121
+ return;
122
+ }
123
+ const handler = () => {
124
+ document
125
+ .querySelectorAll("turbo-frame[contains-subform]")
126
+ .forEach((frame) => {
127
+ frame_form_id = frame.getAttribute("subform-id");
128
+ frame.querySelectorAll("input").forEach((input) => {
129
+ input.setAttribute("form", frame_form_id);
130
+ });
131
+ });
132
+ };
133
+ window.subform_handlers["${this.name}"] = handler;
134
+ document.documentElement.addEventListener(
135
+ "turbo:load",
136
+ handler
137
+ );
138
+ document.documentElement.addEventListener(
139
+ "turbo:frame-render",
140
+ handler
141
+ );
142
+ })();
143
+ </script>`;
151
144
  }
152
145
  mount(router, path) {
153
146
  router.get(path, async (ctx) => {
154
147
  ctx.type = "html";
155
- ctx.body = await this.render(ctx, {
156
- raw_values: this.extractRawValues(ctx),
157
- messages: [],
158
- });
148
+ ctx.body = await this.render(ctx, [], {});
159
149
  });
160
150
  for (const [key, form] of Object.entries(this.forms)) {
161
151
  router.post(path + (path.endsWith("/") ? "" : "/") + key, async (ctx) => {
@@ -163,7 +153,7 @@ class Multiform extends __1.Mountable {
163
153
  if (reaction.action == "stay") {
164
154
  ctx.status = 422;
165
155
  const form_content = reaction.content;
166
- ctx.body = this.renderSubForms(ctx, [], {
156
+ ctx.body = this.render(ctx, [], {
167
157
  [key]: form_content,
168
158
  });
169
159
  }
@@ -175,5 +165,5 @@ class Multiform extends __1.Mountable {
175
165
  }
176
166
  }
177
167
  }
178
- exports.default = Multiform;
168
+ exports.Multiform = Multiform;
179
169
  //# sourceMappingURL=multiform.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"multiform.js","sourceRoot":"","sources":["../../src/forms/multiform.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"multiform.js","sourceRoot":"","sources":["../../src/forms/multiform.ts"],"names":[],"mappings":"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"}
@@ -35,7 +35,7 @@ const prettier_1 = require("./utils/prettier");
35
35
  const target_locreq = locreq_1.default(process.cwd());
36
36
  async function extractActionName(full_file_path) {
37
37
  const file_content = await fs_1.promises.readFile(full_file_path, "utf-8");
38
- const result = file_content.match(/export const actionName = "(\w+)"/);
38
+ const result = /export const actionName = "(\w+)"/.exec(file_content);
39
39
  if (result === null) {
40
40
  throw new Error("Missing 'export const actionName' statement?");
41
41
  }
@@ -45,7 +45,9 @@ async function generateRoutes() {
45
45
  const files = await Promise.all((await walk_1.walkDir(target_locreq.resolve("src/back/routes")))
46
46
  .filter((f) => f.endsWith(".page.ts") ||
47
47
  f.endsWith(".form.ts") ||
48
- f.endsWith(".list.ts"))
48
+ f.endsWith(".multiform.ts") ||
49
+ f.endsWith(".list.ts") ||
50
+ f.endsWith(".redirect.ts"))
49
51
  .map(async (fullpath) => ({
50
52
  fullpath,
51
53
  actionName: await extractActionName(fullpath),
@@ -85,7 +87,9 @@ function mount(router: Router, URL: string, mountable: Mountable) {
85
87
  mountable.init();
86
88
  mountable.mount(router, URL);
87
89
  // to automatically add trailing slashes:
88
- router.get(URL.slice(0, -1), (ctx) => ctx.redirect(URL));
90
+ router.get(URL.slice(0, -1), (ctx) => {
91
+ ctx.redirect(ctx.originalUrl + "/");
92
+ });
89
93
  router.use(URL, (ctx) => ctx.set("content-type", "text/html;charset=utf-8"));
90
94
  }
91
95
 
@@ -1 +1 @@
1
- {"version":3,"file":"generate-routes.js","sourceRoot":"","sources":["../src/generate-routes.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2BAAoC;AACpC,mDAAqC;AACrC,+BAAgC;AAChC,oDAA6B;AAC7B,uCAAuC;AACvC,qDAAiD;AACjD,2DAAiE;AACjE,iEAAgE;AAChE,+CAAqD;AAErD,MAAM,aAAa,GAAG,gBAAO,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;AAE7C,KAAK,UAAU,iBAAiB,CAAC,cAAsB;IACtD,MAAM,YAAY,GAAG,MAAM,aAAE,CAAC,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAChE,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;IACvE,IAAI,MAAM,KAAK,IAAI,EAAE;QACpB,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;KAChE;IACD,OAAO,0BAAU,CAChB,MAAM,CAAC,CAAC,CAAC,EACT,0BAAU,CAAC,MAAM,EACjB,+BAA+B,CAC/B,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,cAAc;IACnC,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAC9B,CACC,MAAM,cAAO,CAAC,aAAa,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CACvD;SACC,MAAM,CACN,CAAC,CAAC,EAAE,EAAE,CACL,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC;QACtB,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC;QACtB,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CACvB;SACA,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;QACzB,QAAQ;QACR,UAAU,EAAE,MAAM,iBAAiB,CAAC,QAAQ,CAAC;QAC7C,GAAG,EAAE,uCAAmB,CACvB,GAAG;YACF,eAAQ,CACP,aAAa,CAAC,OAAO,CAAC,iBAAiB,CAAC,EACxC,QAAQ,CACR,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;YACrB,GAAG,CAAC,wSAAwS;SAC7S;KACD,CAAC,CAAC,CACJ,CAAC;IAEF,MAAM,cAAc,GAAG;;;;;;;;EAQtB,KAAK;SACL,GAAG,CACH,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE,CAC5B,uBAAuB,UAAU,YAAY,wBAAU,CACtD,aAAa,CAAC,OAAO,CAAC,2BAA2B,CAAC,EAClD,QAAQ,CACR,IAAI,CACN;SACA,IAAI,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;EA0BV,KAAK;SACL,GAAG,CACH,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAClB,uBAAuB,UAAU,QAAQ,UAAU,IAAI,CACxD;SACA,IAAI,CAAC,IAAI,CAAC;EACV,CAAC;IAEF,MAAM,YAAY,GAAG,GAAG,KAAK;SAC3B,GAAG,CACH,CAAC,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,gBAAgB,UAAU,UAAU,GAAG,IAAI,CACpE;SACA,IAAI,CAAC,IAAI,CAAC;CACZ,CAAC;IAED,MAAM,eAAe,GAAG,MAAM,4BAAiB,EAAE,CAAC;IAClD,MAAM,aAAE,CAAC,SAAS,CACjB,aAAa,CAAC,OAAO,CAAC,2BAA2B,CAAC,EAClD,QAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,eAAe,CAAC,CAChD,CAAC;IAEF,MAAM,aAAE,CAAC,SAAS,CACjB,aAAa,CAAC,OAAO,CAAC,yBAAyB,CAAC,EAChD,QAAQ,CAAC,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,CAC9C,CAAC;IACF,sCAAsC;IACtC,OAAO,CAAC,GAAG,CACV,iFAAiF,CACjF,CAAC;AACH,CAAC;AAhGD,wCAgGC"}
1
+ {"version":3,"file":"generate-routes.js","sourceRoot":"","sources":["../src/generate-routes.ts"],"names":[],"mappings":"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"}
package/lib/index.js CHANGED
@@ -33,4 +33,5 @@ __exportStar(require("./utils/utils"), exports);
33
33
  __exportStar(require("./page/list"), exports);
34
34
  __exportStar(require("./utils/translate"), exports);
35
35
  exports.sanitize = __importStar(require("./sanitize"));
36
+ __exportStar(require("./forms/multiform"), exports);
36
37
  //# sourceMappingURL=index.js.map
package/lib/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAWA,sEAAsD;AACtD,+DAA+C;AAC/C,mDAAiC;AACjC,8CAA4B;AAC5B,+CAA6B;AAC7B,sDAAoC;AACpC,gDAA8B;AAC9B,8CAA4B;AAC5B,oDAAkC;AAClC,uDAAuC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAWA,sEAAsD;AACtD,+DAA+C;AAC/C,mDAAiC;AACjC,8CAA4B;AAC5B,+CAA6B;AAC7B,sDAAoC;AACpC,gDAA8B;AAC9B,8CAA4B;AAC5B,oDAAkC;AAClC,uDAAuC;AACvC,oDAAkC"}
package/lib/page/list.js CHANGED
@@ -95,7 +95,7 @@ class ListPage extends page_1.Page {
95
95
  ])}
96
96
  ${this.filterControls.map((control) =>
97
97
  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
98
- control.render(ctx, values))}
98
+ control.render(ctx, values, [], "", ""))}
99
99
  </form>`;
100
100
  }
101
101
  }