@sealcode/sealgen 0.3.2 → 0.4.2

package/@types/page/page.d.ts

@@ -1,26 +1,19 @@
 /// <reference types="koa__router" />
-/// <reference types="node" />
 import Router from "@koa/router";
 import { BaseContext } from "koa";
-import { Templatable } from "tempstream";
-export declare type PageErrorMessage = {
-    type: "access" | "internal";
-    message: string;
-};
-export interface Mountable {
-    mount: (router: Router, path: string) => void;
-    canAccess: (ctx: BaseContext) => Promise<{
-        canAccess: boolean;
-        message: string;
-    }>;
-    renderError(ctx: BaseContext, error: PageErrorMessage): Promise<Templatable>;
-}
-export declare abstract class Page implements Mountable {
+import { FlatTemplatable } from "tempstream";
+import { FormDataValue } from "../forms/form";
+import { Fields, Mountable, PageErrorMessage } from "./mountable";
+import { PagePropsParser } from "./props-parser";
+export declare abstract class Page<F extends Fields = Record<string, never>> extends Mountable<F> {
+    propsParser: PagePropsParser<Record<keyof Fields, unknown>>;
+    controls: never[];
     mount(router: Router, path: string): void;
     canAccess(_: BaseContext): Promise<{
         canAccess: boolean;
         message: string;
     }>;
-    renderError(_: BaseContext, error: PageErrorMessage): Promise<import("stream").Readable>;
-    abstract render(ctx: BaseContext): Promise<Templatable>;
+    renderError(_: BaseContext, error: PageErrorMessage): Promise<FlatTemplatable>;
+    abstract render(ctx: BaseContext): Promise<FlatTemplatable>;
+    extractRawValues(ctx: BaseContext): Record<string, FormDataValue>;
 }

package/@types/page/props-parser.d.ts

@@ -1,20 +1,15 @@
-import { Shape } from "@sealcode/ts-predicates";
 import { BaseContext } from "koa";
+import { FormData, FormDataValue } from "..";
 import { BasePageProps } from "./list";
 export declare type EncodedProps = Record<string, unknown>;
-export declare abstract class PagePropsParser<PropsType extends BasePageProps> {
-    propsShape: Shape;
-    defaultValues: Partial<PropsType>;
-    abstract decode(ctx: BaseContext): PropsType;
-    abstract encode(props: PropsType): EncodedProps;
+export declare abstract class PagePropsParser<PropsType> {
+    abstract decode(ctx: BaseContext): Record<string, FormDataValue>;
+    abstract encode(props: Record<string, FormData>): EncodedProps;
     abstract getHTMLInputName(prop_name: string): string;
-    constructor(propsShape: Shape, defaultValues: Partial<PropsType>);
     overwriteProp(ctx: BaseContext, new_props: Partial<PropsType>): EncodedProps;
-    makeHiddenInputs(values: PropsType, fields_to_skip: string[]): string;
-    getDefaultValue<Key extends keyof PropsType>(key: Key): PropsType[Key] | undefined;
 }
 export declare class AllQueryParams<PropsType extends BasePageProps> extends PagePropsParser<PropsType> {
-    decode(ctx: BaseContext): PropsType;
+    decode(ctx: BaseContext): Record<string, FormDataValue>;
     encode(props: PropsType): Record<string, unknown>;
     getHTMLInputName(prop_name: string): string;
 }

package/@types/utils/translate.d.ts

@@ -0,0 +1,3 @@
+import { BaseContext } from "koa";
+import { Translation } from "sealious";
+export declare function t(ctx: BaseContext, key: string, props: any[], default_translation: Translation): string;

package/lib/build.js

@@ -62,7 +62,7 @@ async function complex_build(watch) {
                     console.log(`Built main.scss [on ${path}]`);
                 }
                 catch (e) {
-                    console.error(e);
+                    console.error(e.message);
                     await sleep_1.sleep(200);
                     scss_build
                         ?.rebuild?.()
@@ -110,6 +110,7 @@ async function buildProject(...args) {
     catch (e) {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         console.error(e.message);
+        await buildProject(...args);
     }
 }
 exports.buildProject = buildProject;

package/lib/build.js.map

@@ -1 +1 @@
-{"version":3,"file":"build.js","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"build.js","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"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"}

package/lib/forms/controls/checkboxed-list-input.js

@@ -3,38 +3,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CheckboxedListInput = void 0;
 const ts_predicates_1 = require("@sealcode/ts-predicates");
 const tempstream_1 = require("tempstream");
-const form_fields_list_1 = require("../form-fields-list");
 const controls_1 = require("./controls");
 class CheckboxedListInput extends controls_1.FormFieldControl {
-    constructor(fieldname, options = { label: fieldname }) {
-        super([fieldname]);
-        this.fieldname = fieldname;
+    constructor(field, options = { label: field.name }) {
+        super([field]);
+        this.field = field;
         this.options = options;
     }
-    isValidFieldName(form) {
-        return form.fields.some((f) => f.name == this.fieldname);
-    }
-    async _render(ctx, fields, data) {
-        // safe to disable this as isValidFieldName takes care of checking if the field is of this type
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        const field = form_fields_list_1.FormFieldsList.getField(fields, this.fieldname);
-        const pickedValues = data.values[field.name] || "";
+    async render(ctx, data) {
+        const { parsed: pickedValues } = await this.field.getValue(ctx, data);
         if (!ts_predicates_1.is(pickedValues, ts_predicates_1.predicates.array(ts_predicates_1.predicates.string))) {
             throw new Error("picked values is not an array of strings");
         }
         const [options, isVisible] = await Promise.all([
-            field.generateOptions(ctx),
-            field.isVisible(ctx),
+            this.field.generateOptions(ctx),
+            this.field.isVisible(ctx),
         ]);
         return tempstream_1.tempstream /* HTML */ `${isVisible
             ? Object.entries(options).map(([value, text]) => /* HTML */ `<div>
 						<input
 							type="checkbox"
-							id="${field.name}.${value}"
-							name="${field.name}.${value}"
+							id="${this.field.name}.${value}"
+							name="${this.field.name}.${value}"
 							${pickedValues.includes(value) ? "checked" : ""}
 						/>
-						<label for="${field.name}.${value}">${text}</label>
+						<label for="${this.field.name}.${value}">${text}</label>
 					</div>`)
             : ""}`;
     }

package/lib/forms/controls/checkboxed-list-input.js.map

@@ -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,0DAAqD;AACrD,yCAA8C;AAE9C,MAAa,mBAAoB,SAAQ,2BAAgB;IACxD,YACQ,SAAiB,EACjB,UAA6B,EAAE,KAAK,EAAE,SAAS,EAAE;QAExD,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QAHZ,cAAS,GAAT,SAAS,CAAQ;QACjB,YAAO,GAAP,OAAO,CAA0C;IAGzD,CAAC;IAED,gBAAgB,CAAC,IAAU;QAC1B,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAgB,EAAE,MAAmB,EAAE,IAAc;QAClE,+FAA+F;QAC/F,yEAAyE;QACzE,MAAM,KAAK,GAAG,iCAAc,CAAC,QAAQ,CACpC,MAAM,EACN,IAAI,CAAC,SAAS,CACQ,CAAC;QACxB,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QACnD,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,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC;YAC1B,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC;SACpB,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,KAAK,CAAC,IAAI,IAAI,KAAK;eACjB,KAAK,CAAC,IAAI,IAAI,KAAK;SACzB,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;;oBAElC,KAAK,CAAC,IAAI,IAAI,KAAK,KAAK,IAAI;YACpC,CACN;YACH,CAAC,CAAC,EAAE,EAAE,CAAC;IACT,CAAC;CACD;AAzCD,kDAyCC"}
+{"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,GAAgB,EAAE,IAAmC;QACjE,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"}

package/lib/forms/controls/dropdown.js

@@ -2,37 +2,33 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Dropdown = void 0;
 const tempstream_1 = require("tempstream");
-const field_1 = require("../field");
-const form_fields_list_1 = require("../form-fields-list");
 const controls_1 = require("./controls");
 class Dropdown extends controls_1.FormFieldControl {
-    constructor(fieldname, options = {
-        label: fieldname,
+    constructor(field, options = {
+        label: field.name,
         autosubmit: false,
         autocomplete: true,
     }) {
-        super([fieldname]);
-        this.fieldname = fieldname;
+        super([field]);
+        this.field = field;
         this.options = options;
     }
-    areFieldNamesValid(fields) {
-        return (super.areFieldNamesValid(fields) &&
-            form_fields_list_1.FormFieldsList.getField(fields, this.fieldname) instanceof field_1.PickFromListField);
-    }
-    _render(ctx, fields, data) {
-        // safe to disable this as isValidFieldName takes care of checking if the field is of this type
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        const field = form_fields_list_1.FormFieldsList.getField(fields, this.fieldname);
-        const picked_value = data.values[field.name] || "";
-        const id = field.name;
-        return tempstream_1.tempstream /* HTML */ `<label for="${id}">${this.options.label}</label
+    async render(ctx, data) {
+        const { parsed: picked_value } = await this.field.getValue(ctx, data);
+        const id = this.field.name;
+        return tempstream_1.tempstream /* HTML */ `<label for="${id}"
+				>${this.options.label}</label
 			><select
-				name="${this.fieldnames}"
+				name="${this.field.name}"
 				id="${id}"
-				${this.options.autosubmit ? `onchange='this.form.submit()'` : ""}
+				${this.options.autosubmit
+            ? `onchange='this.form.submit()'`
+            : ""}
 				${!this.options.autocomplete ? `autocomplete="off"` : ""}
 			>
-				${Promise.resolve(field.generateOptions(ctx)).then((options) => Object.entries(options).map(([value, text]) => `<option value="${value}" ${(value || "") == picked_value ? "selected" : ""}>${text}</option>`))}
+				${Promise.resolve(this.field.generateOptions(ctx)).then((options) => Object.entries(options).map(([value, text]) => `<option value="${value}" ${(value || "") == picked_value
+            ? "selected"
+            : ""}>${text}</option>`))}
 			</select>`;
     }
 }

package/lib/forms/controls/dropdown.js.map

@@ -1 +1 @@
-{"version":3,"file":"dropdown.js","sourceRoot":"","sources":["../../../src/forms/controls/dropdown.ts"],"names":[],"mappings":";;;AACA,2CAAwC;AACxC,oCAAwD;AAExD,0DAAqD;AACrD,yCAA8C;AAE9C,MAAa,QAAS,SAAQ,2BAAgB;IAC7C,YACQ,SAAiB,EACjB,UAIH;QACH,KAAK,EAAE,SAAS;QAChB,UAAU,EAAE,KAAK;QACjB,YAAY,EAAE,IAAI;KAClB;QAED,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QAXZ,cAAS,GAAT,SAAS,CAAQ;QACjB,YAAO,GAAP,OAAO,CAQb;IAGF,CAAC;IAED,kBAAkB,CAAC,MAAmB;QACrC,OAAO,CACN,KAAK,CAAC,kBAAkB,CAAC,MAAM,CAAC;YAChC,iCAAc,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,yBAAiB,CAC5E,CAAC;IACH,CAAC;IAED,OAAO,CAAC,GAAgB,EAAE,MAAmB,EAAE,IAAc;QAC5D,+FAA+F;QAC/F,yEAAyE;QACzE,MAAM,KAAK,GAAG,iCAAc,CAAC,QAAQ,CACpC,MAAM,EACN,IAAI,CAAC,SAAS,CACO,CAAC;QACvB,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QACnD,MAAM,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC;QACtB,OAAO,uBAAU,CAAA,UAAU,CAAC,eAAe,EAAE,KAAK,IAAI,CAAC,OAAO,CAAC,KAAK;;YAE1D,IAAI,CAAC,UAAU;UACjB,EAAE;MACN,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC,CAAC,EAAE;MAC9D,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE;;MAEtD,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAC9D,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAC1B,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,CACjB,kBAAkB,KAAK,KACtB,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,YAAY,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAC9C,IAAI,IAAI,WAAW,CACpB,CACD;aACQ,CAAC;IACb,CAAC;CACD;AAjDD,4BAiDC"}
+{"version":3,"file":"dropdown.js","sourceRoot":"","sources":["../../../src/forms/controls/dropdown.ts"],"names":[],"mappings":";;;AACA,2CAAwC;AAGxC,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,GAAgB,EAChB,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,KAAK,KACtB,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"}

package/lib/forms/controls/editable-collection-subset.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EditableCollectionSubset = void 0;
 const tempstream_1 = require("tempstream");
-const form_fields_list_1 = require("../form-fields-list");
 const controls_1 = require("./controls");
 /**
  * This control has own forms in it so if you want to use it you
@@ -12,52 +11,51 @@ const controls_1 = require("./controls");
  * this control for reference.
  */
 class EditableCollectionSubset extends controls_1.FormFieldControl {
-    constructor(fieldname, actionname, listLabel, selectLabel) {
-        super([fieldname]);
-        this.fieldname = fieldname;
+    constructor(field, actionname, listLabel, selectLabel) {
+        super([field]);
+        this.field = field;
         this.actionname = actionname;
         this.listLabel = listLabel;
         this.selectLabel = selectLabel;
         this.role = "input";
     }
-    _render(ctx, fields, data) {
-        // safe to disable this as isValidFieldName takes care of checking if the field is of this type
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        const field = form_fields_list_1.FormFieldsList.getField(fields, this.fieldname);
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        const values = data.values[this.fieldname];
+    async render(ctx, data) {
+        const { parsed: values } = await this.field.getValue(ctx, data);
         return tempstream_1.tempstream /* HTML */ `<div>
 			<ul>
-				${Promise.resolve(field.generateOptions(ctx)).then((options) => Object.entries(options)
-            .filter(([value]) => values.includes(value))
+				${Promise.resolve(this.field.generateOptions(ctx)).then((options) => Object.entries(options)
+            .filter(([value]) => (values || []).includes(value))
             .map(([value, text]) => /* HTML */ `
-								<li>
-									<form method="POST" action="${ctx.path}">
-										<span>${text}</span>
-										<input
-											type="hidden"
-											name="${this.fieldname}"
-											value="${value}"
-										/>
-										<input
-											type="hidden"
-											name="${this.actionname}"
-											value="list"
-										/>
-										<input
-											type="submit"
-											${this.listLabel
+									<li>
+										<form
+											method="POST"
+											action="${ctx.path}"
+										>
+											<span>${text}</span>
+											<input
+												type="hidden"
+												name="${this.field.name}"
+												value="${value}"
+											/>
+											<input
+												type="hidden"
+												name="${this.actionname}"
+												value="list"
+											/>
+											<input
+												type="submit"
+												${this.listLabel
             ? `value="${this.listLabel}"`
             : ""}
-										/>
-									</form>
-								</li>
-							`))}
+											/>
+										</form>
+									</li>
+								`))}
 			</ul>
 			<form method="POST" action="${ctx.path}">
-				<select name="${this.fieldname}">
-					${Promise.resolve(field.generateOptions(ctx)).then((options) => Object.entries(options)
-            .filter(([value]) => !values.includes(value))
+				<select name="${this.field.name}">
+					${Promise.resolve(this.field.generateOptions(ctx)).then((options) => Object.entries(options)
+            .filter(([value]) => !(values || []).includes(value))
             .map(([value, text]) => `<option value="${value}">${text}</option>`))}
 				</select>
 				<input type="hidden" name="${this.actionname}" value="select" />

package/lib/forms/controls/editable-collection-subset.js.map

@@ -1 +1 @@
-{"version":3,"file":"editable-collection-subset.js","sourceRoot":"","sources":["../../../src/forms/controls/editable-collection-subset.ts"],"names":[],"mappings":";;;AACA,2CAAqD;AAGrD,0DAAqD;AACrD,yCAA8C;AAE9C;;;;;;GAMG;AACH,MAAa,wBAAyB,SAAQ,2BAAgB;IAC7D,YACQ,SAAiB,EACjB,UAAkB,EAClB,SAAkB,EAClB,WAAoB;QAE3B,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QALZ,cAAS,GAAT,SAAS,CAAQ;QACjB,eAAU,GAAV,UAAU,CAAQ;QAClB,cAAS,GAAT,SAAS,CAAS;QAClB,gBAAW,GAAX,WAAW,CAAS;QAsE5B,SAAI,GAAU,OAAO,CAAC;IAnEtB,CAAC;IAED,OAAO,CACN,GAAgB,EAChB,MAAmB,EACnB,IAAsB;QAEtB,+FAA+F;QAC/F,yEAAyE;QACzE,MAAM,KAAK,GAAG,iCAAc,CAAC,QAAQ,CACpC,MAAM,EACN,IAAI,CAAC,SAAS,CACO,CAAC;QACvB,yEAAyE;QACzE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAa,CAAC;QAEvD,OAAO,uBAAU,CAAA,UAAU,CAAC;;MAExB,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAC9D,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;aACrB,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;aAC3C,GAAG,CACH,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC;;uCAEE,GAAG,CAAC,IAAI;kBAC7B,IAAI;;;mBAGH,IAAI,CAAC,SAAS;oBACb,KAAK;;;;mBAIN,IAAI,CAAC,UAAU;;;;;aAKrB,IAAI,CAAC,SAAS;YACf,CAAC,CAAC,UAAU,IAAI,CAAC,SAAS,GAAG;YAC7B,CAAC,CAAC,EAAE;;;;QAIR,CACD,CACF;;iCAE4B,GAAG,CAAC,IAAI;oBACrB,IAAI,CAAC,SAAS;OAC3B,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAC9D,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;aACrB,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;aAC5C,GAAG,CACH,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,CACjB,kBAAkB,KAAK,KAAK,IAAI,WAAW,CAC5C,CACF;;iCAE2B,IAAI,CAAC,UAAU;;;OAGzC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC,EAAE;;;SAGnD,CAAC;IACT,CAAC;CAED;AA5ED,4DA4EC"}
+{"version":3,"file":"editable-collection-subset.js","sourceRoot":"","sources":["../../../src/forms/controls/editable-collection-subset.ts"],"names":[],"mappings":";;;AACA,2CAAyD;AAGzD,yCAA8C;AAE9C;;;;;;GAMG;AACH,MAAa,wBAAyB,SAAQ,2BAAgB;IAC7D,YACQ,KAAwB,EACxB,UAAkB,EAClB,SAAkB,EAClB,WAAoB;QAE3B,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QALR,UAAK,GAAL,KAAK,CAAmB;QACxB,eAAU,GAAV,UAAU,CAAQ;QAClB,cAAS,GAAT,SAAS,CAAS;QAClB,gBAAW,GAAX,WAAW,CAAS;QA0E5B,SAAI,GAAU,OAAO,CAAC;IAvEtB,CAAC;IAED,KAAK,CAAC,MAAM,CACX,GAAgB,EAChB,IAAmC;QAEnC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAEhE,OAAO,uBAAU,CAAA,UAAU,CAAC;;MAExB,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;aACrB,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CACnB,CAAC,MAAM,IAAK,EAAe,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAC5C;aACA,GAAG,CACH,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC;;;;qBAIjB,GAAG,CAAC,IAAI;;mBAEV,IAAI;;;oBAGH,IAAI,CAAC,KAAK,CAAC,IAAI;qBACd,KAAK;;;;oBAIN,IAAI,CAAC,UAAU;;;;;cAKrB,IAAI,CAAC,SAAS;YACf,CAAC,CAAC,UAAU,IAAI,CAAC,SAAS,GAAG;YAC7B,CAAC,CAAC,EAAE;;;;SAIR,CACD,CACH;;iCAE4B,GAAG,CAAC,IAAI;oBACrB,IAAI,CAAC,KAAK,CAAC,IAAI;OAC5B,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;aACrB,MAAM,CACN,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CACX,CAAC,CAAC,MAAM,IAAK,EAAe,CAAC,CAAC,QAAQ,CACrC,KAAK,CACL,CACF;aACA,GAAG,CACH,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,CACjB,kBAAkB,KAAK,KAAK,IAAI,WAAW,CAC5C,CACH;;iCAE2B,IAAI,CAAC,UAAU;;;OAGzC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC,EAAE;;;SAGnD,CAAC;IACT,CAAC;CAED;AAhFD,4DAgFC"}

package/lib/forms/controls/form-control.js.map

@@ -1 +1 @@
-{"version":3,"file":"form-control.js","sourceRoot":"","sources":["../../../src/forms/controls/form-control.ts"],"names":[],"mappings":";;;AAKA,MAAsB,WAAW;CAOhC;AAPD,kCAOC"}
+{"version":3,"file":"form-control.js","sourceRoot":"","sources":["../../../src/forms/controls/form-control.ts"],"names":[],"mappings":";;;AAIA,MAAsB,WAAW;CAOhC;AAPD,kCAOC"}

package/lib/forms/controls/form-field-control.js

@@ -3,20 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FormFieldControl = void 0;
 const form_control_1 = require("./form-control");
 class FormFieldControl extends form_control_1.FormControl {
-    constructor(fieldnames) {
+    constructor(fields) {
         super();
-        this.fieldnames = fieldnames;
+        this.fields = fields;
         this.role = "input";
     }
-    areFieldNamesValid(fields) {
-        return this.fieldnames.every((fieldname) => fields.some((f) => f.name == fieldname));
-    }
-    render(ctx, fields, data) {
-        if (!this.areFieldNamesValid(fields)) {
-            throw new Error(`Invalid field names given to form control: "${this.fieldnames.join(", ")}". Allowed fields are: ${fields.map((f) => f.name).join(", ")}`);
-        }
-        return this._render(ctx, fields, data);
-    }
 }
 exports.FormFieldControl = FormFieldControl;
 //# sourceMappingURL=form-field-control.js.map

package/lib/forms/controls/form-field-control.js.map

@@ -1 +1 @@
-{"version":3,"file":"form-field-control.js","sourceRoot":"","sources":["../../../src/forms/controls/form-field-control.ts"],"names":[],"mappings":";;;AAIA,iDAA6C;AAE7C,MAAsB,gBAAiB,SAAQ,0BAAW;IAEzD,YAAmB,UAAoB;QACtC,KAAK,EAAE,CAAC;QADU,eAAU,GAAV,UAAU,CAAU;QADvC,SAAI,GAAU,OAAO,CAAC;IAGtB,CAAC;IAED,kBAAkB,CAAC,MAAmB;QACrC,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,EAAE,CAC1C,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,SAAS,CAAC,CACvC,CAAC;IACH,CAAC;IAQD,MAAM,CACL,GAAgB,EAChB,MAAmB,EACnB,IAAc;QAEd,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE;YACrC,MAAM,IAAI,KAAK,CACd,+CAA+C,IAAI,CAAC,UAAU,CAAC,IAAI,CAClE,IAAI,CACJ,0BAA0B,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACjE,CAAC;SACF;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IACxC,CAAC;CACD;AAhCD,4CAgCC"}
+{"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"}

package/lib/forms/controls/simple-input.js

@@ -1,48 +1,42 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SimpleInput = void 0;
-const form_fields_list_1 = require("../form-fields-list");
 const controls_1 = require("./controls");
 class SimpleInput extends controls_1.FormFieldControl {
-    constructor(fieldname, options = {}) {
-        super([fieldname]);
-        this.fieldname = fieldname;
+    constructor(field, options = {}) {
+        super([field]);
+        this.field = field;
         this.options = options;
     }
-    _render(_, fields, data) {
-        const field = form_fields_list_1.FormFieldsList.getField(fields, this.fieldname);
-        if (!field) {
-            throw new Error("wrong field name");
-        }
-        const id = this.options.id || field.name;
-        const label = this.options.label || field.name;
+    async render(ctx, data) {
+        const id = this.options.id || this.field.name;
+        const label = this.options.label || this.field.name;
         const type = this.options.type || "text";
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        const value = data.values[field.name];
+        const { parsed, raw, valid, message } = await this.field.getValue(ctx, data);
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        const raw_value = data.raw_values[field.name];
         const placeholder = this.options.placeholder || type;
         const readonly = this.options.readonly || false;
-        const required = field.required;
-        const error = data.errors[field.name];
-        return /* HTML */ `<div class="input">
+        const required = this.field.required;
+        return /* HTML */ `<div class="form-input form-input__wrapper">
 			<label for="${id}">${label}</label>
 			<input
 				id="${id}"
 				type="${type}"
-				name="${field.name}"
-				value="${value === undefined
-            ? raw_value == undefined
-                ? ""
-                : raw_value
-            : value}"
+				name="${this.field.name}"
+				value="${!valid && raw
+            ? raw.toString()
+            : parsed !== undefined && parsed !== null
+                ? // 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
+                    parsed?.toString() || ""
+                : ""}"
 				placeholder="${placeholder}"
 				${readonly ? "readonly" : ""}
 				${required ? "required" : ""}
 				${!this.options.autocomplete ? `autocomplete="off"` : ""}
 				${this.options.step ? `step="${this.options.step}"` : ""}
 			/>
-			${error ? `<div class="input__error">${error}</div>` : ""}
+			${~valid ? `<div class="input__error">${message}</div>` : ""}
 		</div>`;
     }
 }

package/lib/forms/controls/simple-input.js.map

@@ -1 +1 @@
-{"version":3,"file":"simple-input.js","sourceRoot":"","sources":["../../../src/forms/controls/simple-input.ts"],"names":[],"mappings":";;;AAGA,0DAAqD;AACrD,yCAA8C;AAE9C,MAAa,WAAY,SAAQ,2BAAgB;IAChD,YACQ,SAAiB,EACjB,UAsBH,EAAE;QAEN,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QAzBZ,cAAS,GAAT,SAAS,CAAQ;QACjB,YAAO,GAAP,OAAO,CAsBR;IAGP,CAAC;IAED,OAAO,CAAC,CAAc,EAAE,MAAmB,EAAE,IAAc;QAC1D,MAAM,KAAK,GAAG,iCAAc,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9D,IAAI,CAAC,KAAK,EAAE;YACX,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;SACpC;QACD,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,KAAK,CAAC,IAAI,CAAC;QACzC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,CAAC;QAC/C,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,MAAM,CAAC;QACzC,yEAAyE;QACzE,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAW,CAAC;QAChD,yEAAyE;QACzE,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAW,CAAC;QACxD,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,KAAK,CAAC,QAAQ,CAAC;QAChC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACtC,OAAO,UAAU,CAAC;iBACH,EAAE,KAAK,KAAK;;UAEnB,EAAE;YACA,IAAI;YACJ,KAAK,CAAC,IAAI;aACT,KAAK,KAAK,SAAS;YAC3B,CAAC,CAAC,SAAS,IAAI,SAAS;gBACvB,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,SAAS;YACZ,CAAC,CAAC,KAAK;mBACO,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,KAAK,CAAC,CAAC,CAAC,6BAA6B,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE;SACnD,CAAC;IACT,CAAC;CACD;AAlED,kCAkEC"}
+{"version":3,"file":"simple-input.js","sourceRoot":"","sources":["../../../src/forms/controls/simple-input.ts"],"names":[],"mappings":";;;AAKA,yCAA8C;AAE9C,MAAa,WAAY,SAAQ,2BAAgB;IAChD,YACQ,KAAgB,EAChB,UAsBH,EAAE;QAEN,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QAzBR,UAAK,GAAL,KAAK,CAAW;QAChB,YAAO,GAAP,OAAO,CAsBR;IAGP,CAAC;IAED,KAAK,CAAC,MAAM,CACX,GAAgB,EAChB,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;iBACH,EAAE,KAAK,KAAK;;UAEnB,EAAE;YACA,IAAI;YACJ,IAAI,CAAC,KAAK,CAAC,IAAI;aACd,CAAC,KAAK,IAAI,GAAG;YACrB,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;mBACU,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,CAAC,CAAC,CAAC,6BAA6B,OAAO,QAAQ,CAAC,CAAC,CAAC,EAAE;SACtD,CAAC;IACT,CAAC;CACD;AApED,kCAoEC"}

package/lib/forms/field.js

@@ -3,49 +3,83 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NumberField = exports.ChekboxedListField = exports.PickFromListField = exports.FormField = void 0;
 const ts_predicates_1 = require("@sealcode/ts-predicates");
 class FormField {
-    constructor(name, required = false, validator = async () => ({
-        valid: true,
-        message: "",
-    })) {
-        this.name = name;
+    constructor(required = false) {
         this.required = required;
-        this.validator = validator;
+    }
+    init(fieldname) {
+        this.name = fieldname;
     }
     async _validate(ctx, value) {
-        if (this.required && (value == "" || value == null || value == undefined)) {
+        if (this.required &&
+            (value === "" || value === null || value === undefined)) {
             return { valid: false, message: "This field is required" };
         }
-        return this.validator(ctx, value, this);
+        return this.isValueValid(ctx, value);
     }
-    getEmptyValue() {
-        return "";
+    async isValueValid(ctx, value) {
+        return { valid: true, message: "" };
+    }
+    async getValue(ctx, all_form_values) {
+        if (Object.keys(all_form_values).length === 0) {
+            // don't validate on virgin form
+            return {
+                parsed: this.getEmptyValue(),
+                valid: true,
+                message: "",
+                raw: "",
+            };
+        }
+        const raw = all_form_values[this.name];
+        const { parsable, parsed_value, error: parse_error, } = await this.parse(raw);
+        if (!parsable) {
+            return {
+                valid: false,
+                parsed: this.getEmptyValue(),
+                raw,
+                message: parse_error || "Error",
+            };
+        }
+        const { valid, message } = await this._validate(ctx, parsed_value);
+        return {
+            parsed: parsed_value,
+            valid,
+            message,
+            raw: all_form_values[this.name],
+        };
     }
 }
 exports.FormField = FormField;
-class PickFromListField extends FormField {
-    constructor(name, required = false, generateOptions, customValidation = (ctx, value, instance) => instance.valueInList(ctx, value)) {
-        super(name, required, (ctx, value) => this.customValidation(ctx, value, this));
-        this.name = name;
+class PickFromListField extends SimpleFormField {
+    constructor(required = false, generateOptions, customValidation = (ctx, value, instance) => instance.valueInList(ctx, value)) {
+        super(required);
         this.required = required;
         this.generateOptions = generateOptions;
         this.customValidation = customValidation;
     }
+    isValueValid(ctx, value) {
+        return this.customValidation(ctx, value, this);
+    }
     async valueInList(ctx, value) {
         const options = await this.generateOptions(ctx);
         if (!ts_predicates_1.is(value, ts_predicates_1.predicates.string)) {
             return { valid: false, message: "not a string" };
         }
         if (!Object.keys(options).includes(value)) {
-            return { valid: false, message: `"${value}" is not one of the options` };
+            return {
+                valid: false,
+                message: `"${value}" is not one of the options`,
+            };
         }
         return { valid: true, message: "" };
     }
+    getEmptyValue() {
+        return "";
+    }
 }
 exports.PickFromListField = PickFromListField;
 class ChekboxedListField extends FormField {
-    constructor(name, required = false, generateOptions, isVisible = () => Promise.resolve(true)) {
-        super(name, required, (ctx, value) => this.isValueValid(ctx, value));
-        this.name = name;
+    constructor(required = false, generateOptions, isVisible = () => Promise.resolve(true)) {
+        super(required);
         this.required = required;
         this.generateOptions = generateOptions;
         this.isVisible = isVisible;
@@ -59,11 +93,31 @@ class ChekboxedListField extends FormField {
         }
         return { valid: true, message: "" };
     }
+    async parse(raw_value) {
+        if (ts_predicates_1.is(raw_value, ts_predicates_1.predicates.object)) {
+            return {
+                parsable: true,
+                parsed_value: Object.fromEntries(Object.entries(raw_value).filter(([, value]) => value === "on")),
+                error: null,
+            };
+        }
+        else {
+            return {
+                parsed_value: null,
+                parsable: false,
+                error: "Expected an object",
+            };
+        }
+    }
+    getEmptyValue() {
+        return {};
+    }
 }
 exports.ChekboxedListField = ChekboxedListField;
 class NumberField extends FormField {
-    constructor(field_name, required) {
-        super(field_name, required, (_, value) => this.isValueValid(_, value));
+    constructor(required = false, default_value) {
+        super(required);
+        this.default_value = default_value;
     }
     async isValueValid(_, value) {
         if ((ts_predicates_1.is(value, ts_predicates_1.predicates.string) &&
@@ -75,6 +129,28 @@ class NumberField extends FormField {
         }
         return { valid: false, message: "Proszę wprowadzić liczbę" };
     }
+    async parse(value) {
+        if ((ts_predicates_1.is(value, ts_predicates_1.predicates.string) &&
+            !isNaN(parseFloat(value)) &&
+            parseFloat(value).toString() == value.trim()) ||
+            ts_predicates_1.is(value, ts_predicates_1.predicates.number)) {
+            return {
+                parsable: true,
+                parsed_value: parseFloat(value.toString()),
+                error: null,
+            };
+        }
+        else {
+            return {
+                parsable: false,
+                parsed_value: null,
+                error: "Please enter a number",
+            };
+        }
+    }
+    getEmptyValue() {
+        return this.default_value;
+    }
 }
 exports.NumberField = NumberField;
 //# sourceMappingURL=field.js.map