@sealcode/sealgen 0.7.15 → 0.8.1

package/lib/mount.js

@@ -24,8 +24,10 @@ function mount(router, url, mountable) {
     });
     router.use(url, async (ctx, next) => {
         ctx.set("content-type", "text/html;charset=utf-8");
-        if (!(await mountable.canAccess(ctx)).canAccess) {
-            ctx.body = "no access";
+        const access_result = await mountable.canAccess(ctx);
+        if (!access_result.canAccess) {
+            ctx.status = 403;
+            ctx.body = access_result.message || "no access";
             return;
         }
         await next();

package/lib/mount.js.map

@@ -1 +1 @@
-{"version":3,"file":"mount.js","sourceRoot":"","sources":["../src/mount.ts"],"names":[],"mappings":";;;AAEA,uCAAuC;AAGvC,KAAK,UAAU,iBAAiB,CAAC,GAAY,EAAE,IAAc;IAC5D,MAAM,IAAI,EAAE,CAAC;IACb,IAAI,GAAG,CAAC,IAAI,YAAY,OAAO,EAAE;QAChC,mEAAmE;QACnE,GAAG,CAAC,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC;KAC1B;IACD,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,yBAAyB,CAAC,CAAC;AACpD,CAAC;AAED,SAAgB,KAAK,CAAC,MAAc,EAAE,GAAW,EAAE,SAAoB;IACtE,MAAM,CAAC,GAAG,CACT,GAAG,EACH,sBAAW,CAAC,cAAc,EAAE,EAC5B,sBAAW,CAAC,SAAS,EAAE,EACvB,iBAAiB,CACjB,CAAC;IACF,SAAS,CAAC,IAAI,EAAE,CAAC;IAEjB,yCAAyC;IACzC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAChD,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC;QACrB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACjC,IAAI,CAAC,QAAQ,IAAI,GAAG,CAAC;YACrB,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;SAC9B;QACD,MAAM,IAAI,EAAE,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACnC,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,yBAAyB,CAAC,CAAC;QACnD,IAAI,CAAC,CAAC,MAAM,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE;YAChD,GAAG,CAAC,IAAI,GAAG,WAAW,CAAC;YACvB,OAAO;SACP;QACD,MAAM,IAAI,EAAE,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAC9B,CAAC;AA7BD,sBA6BC"}
+{"version":3,"file":"mount.js","sourceRoot":"","sources":["../src/mount.ts"],"names":[],"mappings":";;;AAEA,uCAAuC;AAGvC,KAAK,UAAU,iBAAiB,CAAC,GAAY,EAAE,IAAc;IAC5D,MAAM,IAAI,EAAE,CAAC;IACb,IAAI,GAAG,CAAC,IAAI,YAAY,OAAO,EAAE;QAChC,mEAAmE;QACnE,GAAG,CAAC,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC;KAC1B;IACD,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,yBAAyB,CAAC,CAAC;AACpD,CAAC;AAED,SAAgB,KAAK,CAAC,MAAc,EAAE,GAAW,EAAE,SAAoB;IACtE,MAAM,CAAC,GAAG,CACT,GAAG,EACH,sBAAW,CAAC,cAAc,EAAE,EAC5B,sBAAW,CAAC,SAAS,EAAE,EACvB,iBAAiB,CACjB,CAAC;IACF,SAAS,CAAC,IAAI,EAAE,CAAC;IAEjB,yCAAyC;IACzC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAChD,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC;QACrB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACjC,IAAI,CAAC,QAAQ,IAAI,GAAG,CAAC;YACrB,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;SAC9B;QACD,MAAM,IAAI,EAAE,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACnC,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,yBAAyB,CAAC,CAAC;QACnD,MAAM,aAAa,GAAG,MAAM,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QACrD,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE;YAC7B,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;YACjB,GAAG,CAAC,IAAI,GAAG,aAAa,CAAC,OAAO,IAAI,WAAW,CAAC;YAChD,OAAO;SACP;QACD,MAAM,IAAI,EAAE,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAC9B,CAAC;AA/BD,sBA+BC"}

package/lib/page/mountable-with-fields.js

@@ -58,6 +58,16 @@ class MountableWithFields extends mountable_1.Mountable {
 			${data.messages.map((message) => `<div class="form-message form-message--${message.type}">${message.text}</div>`)}
 		</div>`;
     }
+    async getParsedValues(ctx) {
+        const raw_values = this.extractRawValues(ctx);
+        const result = {};
+        const promises = Object.entries(this.fields).map(async ([key, field]) => {
+            const { parsed } = await field.getValue(ctx, raw_values);
+            result[key] = parsed;
+        });
+        await Promise.all(promises);
+        return result;
+    }
 }
 exports.MountableWithFields = MountableWithFields;
 //# sourceMappingURL=mountable-with-fields.js.map

package/lib/page/mountable-with-fields.js.map

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

package/lib/templates/form.js

@@ -16,7 +16,9 @@ const fields = {
 	password: new Fields.SimpleFormField(true),
 };
 
-export default new (class ${action_name}Form extends Form<typeof fields> {
+export const ${action_name}Shape = Fields.fieldsToShape(fields);
+
+export default new (class ${action_name}Form extends Form<typeof fields, void> {
 	defaultSuccessMessage = "Formularz wypełniony poprawnie";
 	fields = fields;
 

package/lib/templates/form.js.map

@@ -1 +1 @@
-{"version":3,"file":"form.js","sourceRoot":"","sources":["../../src/templates/form.ts"],"names":[],"mappings":";;;AAAA,sDAAuD;AAEhD,KAAK,UAAU,YAAY,CACjC,WAAmB,EACnB,eAAuB;IAEvB,MAAM,GAAG,GAAG,6BAAe,CAAC,eAAe,CAAC,CAAC;IAC7C,OAAO;;oBAEY,GAAG,CAAC,eAAe,CAAC;yBACf,GAAG,CAAC,kCAAkC,CAAC;;6BAEnC,WAAW;;;;;;;4BAOZ,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBAkCjB,WAAW;;;CAGhC,CAAC;AACF,CAAC;AAvDD,oCAuDC"}
+{"version":3,"file":"form.js","sourceRoot":"","sources":["../../src/templates/form.ts"],"names":[],"mappings":";;;AAAA,sDAAuD;AAEhD,KAAK,UAAU,YAAY,CACjC,WAAmB,EACnB,eAAuB;IAEvB,MAAM,GAAG,GAAG,6BAAe,CAAC,eAAe,CAAC,CAAC;IAC7C,OAAO;;oBAEY,GAAG,CAAC,eAAe,CAAC;yBACf,GAAG,CAAC,kCAAkC,CAAC;;6BAEnC,WAAW;;;;;;;eAOzB,WAAW;;4BAEE,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBAkCjB,WAAW;;;CAGhC,CAAC;AACF,CAAC;AAzDD,oCAyDC"}

package/lib/tests/manual/multiform.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sealcode/sealgen",
-	"version": "0.7.15",
+	"version": "0.8.1",
 	"description": "Module to automate adding routes and collections to a sealious application",
 	"main": "lib/index.js",
 	"scripts": {
@@ -38,7 +38,7 @@
 	"types": "./@types/index.d.ts",
 	"dependencies": {
 		"@koa/router": "^10.1.1",
-		"@sealcode/ts-predicates": "^0.4.0",
+		"@sealcode/ts-predicates": "^0.4.1",
 		"esbuild": "^0.15.5",
 		"esbuild-sass-plugin": "^2.3.1",
 		"koa": "^2.13.0",

package/src/forms/controls/big-radio-group.ts

@@ -0,0 +1,63 @@
+import { Context } from "koa";
+import { FlatTemplatable, tempstream } from "tempstream";
+import { FormField } from "../fields/field";
+import { FormDataValue } from "../form";
+import { FormFieldControl } from "./form-field-control";
+
+export class BigRadioGroup extends FormFieldControl {
+	constructor(
+		public field: FormField,
+		public options: Record<
+			string,
+			{
+				description:
+					| FlatTemplatable
+					| ((
+							ctx: Context,
+							data: Record<string, FormDataValue>,
+							messages: [],
+							feld_name_prefix: string,
+							form_id: string
+					  ) => FlatTemplatable);
+			}
+		>
+	) {
+		super([field]);
+	}
+
+	async render(
+		ctx: Context,
+		data: Record<string, FormDataValue>,
+		messages: [],
+		field_name_prefix: string,
+		form_id: string
+	): Promise<FlatTemplatable> {
+		const { raw: current_value } = await this.field.getValue(ctx, data);
+		return tempstream/* HTML */ `<div class="bigradios">
+			${Object.entries(this.options).map(([key, { description }]) => {
+				const id = `${this.field.name}-radio-${key}`;
+				return tempstream/* HTML */ `<input
+						type="radio"
+						name="${this.field.name}"
+						value="${key}"
+						id="${id}"
+						style="display: none"
+						${this.field.required ? "required" : ""}
+						${key == current_value ? "checked" : ""}
+					/>
+					<div class="bigradio">
+						${typeof description == "function"
+							? description(
+									ctx,
+									data,
+									messages,
+									field_name_prefix,
+									form_id
+							  )
+							: description}
+						<label class="bigradio__cta" for="${id}">Wybierz</label>
+					</div>`;
+			})}
+		</div>`;
+	}
+}

package/src/forms/controls/checkbox.ts

@@ -0,0 +1,19 @@
+import { Context } from "koa";
+import { FormDataValue } from "../form";
+import { Tickable } from "./tickable";
+
+export class Checkbox extends Tickable<boolean> {
+	type = <const>"checkbox";
+
+	isChecked(
+		_ctx: Context,
+		_data: Record<string, FormDataValue>,
+		value: boolean
+	): boolean {
+		return value;
+	}
+
+	getValueAttribute(): string {
+		return "";
+	}
+}

package/src/forms/controls/checkboxed-list-input.ts

@@ -8,7 +8,7 @@ import { FormFieldControl } from "./controls";
 
 export class CheckboxedListInput extends FormFieldControl {
 	constructor(
-		public field: ChekboxedListField,
+		public field: ChekboxedListField<boolean>,
 		public options: { label: string } = { label: field.name }
 	) {
 		super([field]);

package/src/forms/controls/controls.ts

@@ -11,3 +11,8 @@ export { HTML } from "./html";
 export { HiddenInput } from "./hidden-input";
 export { Textarea } from "./textarea";
 export { FieldGroup } from "./field-group";
+export * from "./derived";
+export * from "./tickable";
+export * from "./checkbox";
+export * from "./radio";
+export * from "./big-radio-group";

package/src/forms/controls/derived.ts

@@ -0,0 +1,81 @@
+import { randomUUID } from "crypto";
+import { FlatTemplatable, tempstream } from "tempstream";
+import { FormField } from "../fields/field";
+import { FormControl } from "./form-control";
+
+export class Derived<
+	Consts extends Record<string, unknown> | undefined
+> extends FormControl {
+	role = <const>"decoration";
+
+	constructor(
+		public fields: FormField[],
+		public _render: (
+			values: Record<string, string>,
+			consts: Consts
+		) => string,
+		public consts: Consts
+	) {
+		super();
+	}
+
+	render(): FlatTemplatable {
+		const id = "A" + randomUUID(); // the A makes it always a valid id, as it cannot start with a number
+		return tempstream/* HTML */ `<div>
+			<script>
+				(function () {
+					const consts = {
+						${Object.entries(this.consts || {})
+							.map(([key, value]) => {
+								return `"${key}": ${
+									typeof value === "object"
+										? JSON.stringify(value)
+										: (value as string).toString()
+								}`;
+							})
+							.join(",")},
+					};
+					const form = document.currentScript.closest("form");
+					const render = ${this._render.toString()};
+					function getValues() {
+						return Object.fromEntries(
+							${JSON.stringify(
+								this.fields.map((field) => field.name)
+							)}.map((field_name) => {
+								let input = form.querySelector(
+									\`input[name="\${field_name}"]\`
+								);
+								if (input.type === "radio") {
+									input = form.querySelector(
+										\`input[name="\${field_name}"]:checked\`
+									);
+								}
+								return [field_name, input.value];
+							})
+						);
+					}
+					function setupWatcher(field_name) {
+						form.querySelectorAll(
+							\`input[name="\${field_name}"]\`
+						).forEach((input) => {
+							input.onchange = () => {
+								document.querySelector("#${id}").innerHTML =
+									render(getValues(), consts);
+							};
+						});
+					}
+					${JSON.stringify(
+						this.fields.map((field) => field.name)
+					)}.forEach(setupWatcher);
+					setTimeout(
+						() =>
+							(document.querySelector("#${id}").innerHTML =
+								render(getValues(), consts)),
+						0
+					);
+				})();
+			</script>
+			<div id="${id}">${this._render({}, this.consts)}</div>
+		</div>`;
+	}
+}

package/src/forms/controls/dropdown.ts

@@ -7,7 +7,7 @@ import { FormFieldControl } from "./controls";
 
 export class Dropdown extends FormFieldControl {
 	constructor(
-		public field: PickFromListField,
+		public field: PickFromListField<boolean>,
 		public options: {
 			label: string;
 			autosubmit?: boolean;

package/src/forms/controls/editable-collection-subset.ts

@@ -14,7 +14,7 @@ import { FormFieldControl } from "./controls";
  */
 export class EditableCollectionSubset extends FormFieldControl {
 	constructor(
-		public field: PickFromListField,
+		public field: PickFromListField<false>,
 		public actionname: string,
 		public listLabel?: string,
 		public selectLabel?: string

package/src/forms/controls/html.ts

@@ -2,17 +2,35 @@ import { Context } from "koa";
 import { FlatTemplatable } from "tempstream";
 import { FormControl } from "./controls";
 
+type Renderer = ((ctx: Context) => FlatTemplatable) | FlatTemplatable;
+
 export class HTML extends FormControl {
-	role = <const>"decoration";
+	role = (<const>"decoration") as "decoration" | "submit";
+	public renderer: Renderer;
 
-	constructor(public renderer: ((ctx: Context) => FlatTemplatable) | string) {
+	constructor(role: "decoration" | "submit", renderer: Renderer);
+	constructor(renderer: Renderer);
+	constructor(
+		role_or_renderer: "decoration" | "submit" | Renderer,
+		renderer_or_undefined?:
+			| ((ctx: Context) => FlatTemplatable)
+			| FlatTemplatable
+	) {
 		super();
+		if (arguments.length == 2) {
+			this.role = role_or_renderer as "decoration" | "submit";
+			this.renderer = renderer_or_undefined as Renderer;
+		} else {
+			this.renderer = role_or_renderer;
+		}
 	}
 
 	async render(ctx: Context): Promise<FlatTemplatable> {
 		if (typeof this.renderer === "string") {
 			return this.renderer;
 		}
-		return this.renderer(ctx);
+		return typeof this.renderer == "function"
+			? this.renderer(ctx)
+			: this.renderer;
 	}
 }

package/src/forms/controls/radio.ts

@@ -0,0 +1,43 @@
+import { Context } from "koa";
+import { FormField } from "../fields/field";
+import { FormDataValue } from "../form";
+import { Tickable } from "./tickable";
+
+export class Radio extends Tickable<string> {
+	type = <const>"radio";
+
+	constructor(
+		public field: FormField<boolean, string>,
+		public value: string,
+		options: { label?: string }
+	) {
+		super(field, options);
+	}
+
+	makeInputID(): string {
+		return this.field.name + "-" + this.value.replaceAll(/\W/g, "-");
+	}
+
+	getValueAttribute(): string {
+		return this.value;
+	}
+
+	getWrapperClasses(
+		ctx: Context,
+		data: Record<string, FormDataValue>,
+		value: string
+	): string[] {
+		return [
+			...super.getWrapperClasses(ctx, data, value),
+			this.value.replaceAll(/\W/g, "-"),
+		];
+	}
+
+	isChecked(
+		_ctx: Context,
+		_data: Record<string, FormDataValue>,
+		value: string
+	): boolean {
+		return this.value === value;
+	}
+}

package/src/forms/controls/simple-input.ts

@@ -45,7 +45,10 @@ export class SimpleInput extends FormFieldControl {
 		form_id: string
 	): Promise<FlatTemplatable> {
 		const id = this.options.id || this.field.name;
-		const label = this.options.label || this.field.name;
+		const label =
+			this.options.label != undefined
+				? this.options.label
+				: this.field.name;
 		const type = this.options.type || "text";
 		// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
 		const { parsed, raw, valid, message } = await this.field.getValue(

package/src/forms/controls/textarea.ts

@@ -23,7 +23,9 @@ export class Textarea extends FormFieldControl {
 		return inputWrapper(
 			[name, getRequiredClass(required)],
 			/* HTML */ ` <label for="${name}"
-					>${this.options.label || name}</label
+					>${this.options.label != undefined
+						? this.options.label
+						: name}</label
 				>
 				<textarea
 					name="${name}"

package/src/forms/controls/tickable.ts

@@ -0,0 +1,112 @@
+import { Context } from "koa";
+import { FlatTemplatable } from "tempstream";
+import { attribute } from "../../sanitize";
+import { getRequiredClass, inputWrapper } from "../../utils/input-wrapper";
+import { FormField } from "../fields/field";
+import { FormDataValue } from "../form";
+import { FormFieldControl } from "./controls";
+
+export abstract class Tickable<T extends unknown> extends FormFieldControl {
+	constructor(
+		public field: FormField<boolean, T>,
+		public options: {
+			id?: string;
+			label?: string;
+			hide_errors?: boolean;
+			readonly?: boolean;
+		} = {}
+	) {
+		super([field]);
+	}
+
+	public type: "checkbox" | "radio";
+
+	abstract getValueAttribute(
+		ctx: Context,
+		data: Record<string, FormDataValue>,
+		value: T
+	): string;
+
+	abstract isChecked(
+		ctx: Context,
+		data: Record<string, FormDataValue>,
+		value: T
+	): boolean;
+
+	makeInputID(): string {
+		return this.options.id || this.field.name;
+	}
+
+	getWrapperClasses(
+		ctx: Context,
+		data: Record<string, FormDataValue>,
+		value: T
+	): string[] {
+		return [
+			this.makeInputID(),
+			this.type,
+			this.field.name.replaceAll(/\W/g, "-"),
+			getRequiredClass(this.field.required),
+			...(this.isChecked(ctx, data, value) ? ["checked"] : []),
+		];
+	}
+
+	async render<Fields extends Record<string, FormField>>(
+		ctx: Context,
+		data: Record<string, FormDataValue>,
+		_: unknown[],
+		field_prefix: string,
+		form_id: string
+	): Promise<FlatTemplatable> {
+		const id = this.makeInputID();
+		const label =
+			this.options.label != undefined
+				? this.options.label
+				: this.field.name;
+		// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+		const { parsed, valid, message } = await this.field.getValue(ctx, data);
+		// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+		const readonly = this.options.readonly || false;
+		const required = this.field.required;
+
+		return inputWrapper(
+			this.getWrapperClasses(ctx, data, parsed),
+
+			/* HTML */ `
+				<input
+					id="${id}"
+					type="${this.type}"
+					name="${field_prefix}${this.field.name}"
+					value="${attribute(
+						this.getValueAttribute(ctx, data, parsed)
+					)}"
+					${form_id ? `form="${form_id}"` : ""}
+					${this.isChecked(ctx, data, parsed) ? "checked" : ""}
+					${readonly ? "readonly" : ""}
+					${required ? "required" : ""}
+					onchange="this.closest('form').querySelectorAll('.form-input__wrapper--${this
+						.field
+						.name}').forEach(e=>e.setAttribute('data-checked','false'));
+				this.closest('.form-input__wrapper').setAttribute('data-checked',this.checked);"
+				/>
+
+				<label for="${id}">${label}</label>
+				<script>
+					(function () {
+						let wrapper = document.currentScript.closest(
+							".form-input__wrapper"
+						);
+						wrapper.setAttribute(
+							"data-checked",
+							wrapper.querySelector("input").checked.toString()
+						);
+					})();
+				</script>
+
+				${~valid && !this.options.hide_errors
+					? `<div class="input__error">${message}</div>`
+					: ""}
+			`
+		);
+	}
+}

package/src/forms/fields/boolean.ts

@@ -0,0 +1,55 @@
+import { is, predicates } from "@sealcode/ts-predicates";
+import { Context } from "koa";
+import { FormDataValue } from "../form";
+import { FieldParseResult, FormField } from "./field";
+
+const truthy = ["true", "on", "yes", "1"];
+const falsy = ["false", "off", "no", "0"];
+
+export class Boolean<Required extends boolean> extends FormField<
+	Required,
+	boolean
+> {
+	predicate = predicates.boolean;
+	constructor(required: Required, public error_message: string = "") {
+		super(required);
+	}
+
+	public async isValueValid(
+		_: Context,
+		value: boolean
+	): Promise<{ valid: boolean; message: string }> {
+		if (this.required && !value) {
+			return { valid: false, message: this.error_message };
+		}
+		return { valid: true, message: "" };
+	}
+
+	async parse(
+		_: Context,
+		value: FormDataValue
+	): Promise<FieldParseResult<boolean>> {
+		if (is(value, predicates.boolean)) {
+			return { parsable: true, parsed_value: value, error: null };
+		} else if (
+			is(value, predicates.string) &&
+			[...truthy, ...falsy].includes(value)
+		) {
+			return {
+				parsable: true,
+				parsed_value: truthy.includes(value),
+				error: null,
+			};
+		} else {
+			return {
+				parsable: false,
+				parsed_value: null,
+				error: "Please enter a boolean",
+			};
+		}
+	}
+
+	public getEmptyValue(): boolean {
+		return false;
+	}
+}

package/src/forms/fields/checkboxed-list.ts

@@ -7,9 +7,12 @@ import {
 	FormFieldValidationResponse,
 } from "./field";
 
-export class ChekboxedListField extends FormField<Record<string, "on">> {
+export class ChekboxedListField<Required extends boolean> extends FormField<
+	Required,
+	Record<string, "on">
+> {
 	constructor(
-		public required: boolean = false,
+		public required: Required,
 		public generateOptions: (
 			ctx: Context
 		) => Promise<Record<string, string> | { [i: string]: string }>,
@@ -19,6 +22,8 @@ export class ChekboxedListField extends FormField<Record<string, "on">> {
 		super(required);
 	}
 
+	predicate = predicates.array(predicates.string); // TODO: this is probably wrong
+
 	public async isValueValid(
 		_: Context,
 		value: unknown

package/src/forms/fields/collection-field.ts

@@ -1,3 +1,4 @@
+import { predicates } from "@sealcode/ts-predicates";
 import { Context } from "koa";
 import { Depromisify, Field, FieldOutput } from "sealious";
 import { FormDataValue } from "../form";
@@ -8,13 +9,16 @@ import {
 	FormFieldValidationResponse,
 } from "./field";
 
-export class CollectionField<F extends Field> extends FormField<
-	FieldOutput<F>
-> {
-	constructor(required: boolean, public sealiousField: F) {
+export class CollectionField<
+	F extends Field,
+	Required extends boolean
+> extends FormField<Required, FieldOutput<F>> {
+	constructor(required: Required, public sealiousField: F) {
 		super(required);
 	}
 
+	predicate = predicates.unknown;
+
 	async parse(
 		ctx: Context,
 		raw_value: FormDataValue

package/src/forms/fields/email.ts

@@ -1,8 +1,12 @@
+import { predicates } from "@sealcode/ts-predicates";
 import { RegExpField } from "./regexp";
 
-export class EmailField extends RegExpField {
+export class EmailField<
+	Required extends boolean
+> extends RegExpField<Required> {
+	predicate = predicates.string;
 	constructor(
-		required = false,
+		required: Required,
 		public error_message = "Please enter a proper email address",
 		public default_value = ""
 	) {