@sealcode/sealgen 0.8.3 → 0.8.5

package/src/forms/multiform.ts

@@ -29,7 +29,7 @@ export class Multiform extends MountableWithFields {
 			form.form_id = this.name;
 			form.action = "./" + key;
 			form.init();
-			form.extractRawValues = (context) =>
+			form.extractRawValues = async (context) =>
 				this.getSubformRawValues(context, key);
 			const submit_button_id = this.name + "_" + key + "_submit";
 
@@ -52,7 +52,9 @@ export class Multiform extends MountableWithFields {
 		}
 	}
 
-	extractRawValues(ctx: Context): Record<string, FormDataValue> {
+	async extractRawValues(
+		ctx: Context
+	): Promise<Record<string, FormDataValue>> {
 		return ctx.$body || {};
 	}
 
@@ -86,17 +88,22 @@ export class Multiform extends MountableWithFields {
 
 	async renderSubform(
 		ctx: Context,
-		sub_form_name: string
+		sub_form_name: string,
+		show_field_errors: boolean
 	): Promise<FlatTemplatable> {
 		const form = this.forms[sub_form_name];
 		const result = await form.canAccess(ctx);
 		if (!result.canAccess) {
 			return result.message;
 		}
-		return form.render(ctx, {
-			raw_values: this.getSubformRawValues(ctx, sub_form_name),
-			messages: [],
-		});
+		return form.render(
+			ctx,
+			{
+				raw_values: this.getSubformRawValues(ctx, sub_form_name),
+				messages: [],
+			},
+			show_field_errors
+		);
 	}
 
 	getSubformRawValues(
@@ -119,7 +126,8 @@ export class Multiform extends MountableWithFields {
 	async render(
 		ctx: Context,
 		messages: FormMessage[],
-		prerenderedForms: Record<string, FlatTemplatable | undefined> = {}
+		prerenderedForms: Record<string, FlatTemplatable | undefined> = {},
+		show_field_errors: boolean
 	): Promise<FlatTemplatable> {
 		return tempstream/* HTML */ `${this.renderMessages(ctx, {
 				raw_values: {},
@@ -143,7 +151,7 @@ export class Multiform extends MountableWithFields {
 						subform-id="${frame_form_id}"
 					>
 						${prerenderedForms[form_name] ||
-						this.renderSubform(ctx, form_name)}
+						this.renderSubform(ctx, form_name, show_field_errors)}
 						<form id="${frame_form_id}" method="POST"></form>
 					</turbo-frame>`;
 				})}
@@ -188,7 +196,7 @@ export class Multiform extends MountableWithFields {
 	mount(router: Router, path: string): void {
 		router.get(path, async (ctx) => {
 			ctx.type = "html";
-			ctx.body = await this.render(ctx, [], {});
+			ctx.body = await this.render(ctx, [], {}, false);
 		});
 
 		for (const [key, form] of Object.entries(this.forms)) {
@@ -199,9 +207,14 @@ export class Multiform extends MountableWithFields {
 					if (reaction.action == "stay") {
 						ctx.status = 422;
 						const form_content = reaction.content;
-						ctx.body = this.render(ctx, [], {
-							[key]: form_content,
-						});
+						ctx.body = this.render(
+							ctx,
+							[],
+							{
+								[key]: form_content,
+							},
+							true
+						);
 					} else if (reaction.action == "redirect") {
 						ctx.status = 303;
 						ctx.redirect(reaction.url);

package/src/page/list.ts

@@ -5,7 +5,7 @@ import { Templatable, tempstream, FlatTemplatable } from "tempstream";
 import { peopleWhoCan } from "./access-control";
 import { Page } from "./page";
 import { ShapeToType } from "@sealcode/ts-predicates";
-import { FormControl, FormFieldControl } from "../forms/controls/controls";
+import { FormControl } from "../forms/controls/controls";
 import { FormField, NumberField } from "../forms/fields/field";
 import { naturalNumbers, UrlWithNewParams } from "../utils/utils";
 import { FormDataValue } from "..";
@@ -54,9 +54,12 @@ export abstract class ListPage<
 
 	async renderItems(
 		ctx: Context,
-		values: Record<string, FormDataValue> = this.extractRawValues(ctx),
+		values?: Record<string, FormDataValue>,
 		items?: ItemType[]
 	): Promise<FlatTemplatable> {
+		if (!values) {
+			values = await this.extractRawValues(ctx);
+		}
 		const { parsed: page } = await this.fields.page.getValue(ctx, values);
 		const { parsed: itemsPerPage } =
 			await this.fields.itemsPerPage.getValue(ctx, values);
@@ -68,7 +71,7 @@ export abstract class ListPage<
 	}
 
 	async render(ctx: Context): Promise<FlatTemplatable> {
-		const values = this.extractRawValues(ctx);
+		const values = await this.extractRawValues(ctx);
 
 		return tempstream`${this.renderPagination(ctx, values)}
 			  ${this.renderFilters(ctx)}
@@ -130,7 +133,7 @@ ${this.renderListContainer(ctx, this.renderItems(ctx, values))}`;
 
 	async getFilterValues(ctx: Context): Promise<Record<string, unknown>> {
 		const filter = {} as Record<string, unknown>;
-		const raw_values = this.extractRawValues(ctx);
+		const raw_values = await this.extractRawValues(ctx);
 		for (const [fieldname, field] of Object.entries(this.filterFields)) {
 			// eslint-disable-next-line no-await-in-loop
 			const { parsed } = await field.getValue(ctx, raw_values);
@@ -139,8 +142,8 @@ ${this.renderListContainer(ctx, this.renderItems(ctx, values))}`;
 		return filter;
 	}
 
-	renderFilters(ctx: Context): FlatTemplatable {
-		const values = this.extractRawValues(ctx);
+	async renderFilters(ctx: Context): Promise<FlatTemplatable> {
+		const values = await this.extractRawValues(ctx);
 		return tempstream/* HTML */ `<form method="GET">
 			${makeHiddenInputs(ctx, this.fields, values, [
 				"page",
@@ -148,7 +151,7 @@ ${this.renderListContainer(ctx, this.renderItems(ctx, values))}`;
 			])}
 			${this.filterControls.map((control) => {
 				// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-				return control.render(ctx, values, [], "", "");
+				return control.render(ctx, values, [], "", "", false);
 			})}
 		</form>`;
 	}

package/src/page/mountable-with-fields.ts

@@ -77,15 +77,18 @@ export abstract class MountableWithFields<
 
 	public renderControls(
 		ctx: Context,
-		data: FormData<keyof Fields>
+		data: FormData<keyof Fields>,
+		validate: boolean
 	): FlatTemplatable {
+		console.log("RENDER CONTROLS", data.raw_values);
 		return tempstream/* HTML */ `${this.controls.map((control) =>
 			control.render(
 				ctx,
 				data.raw_values,
 				data.messages,
 				this.field_names_prefix,
-				this.form_id
+				this.form_id,
+				validate
 			)
 		)}`;
 	}
@@ -109,12 +112,14 @@ export abstract class MountableWithFields<
 		</div>`;
 	}
 
-	abstract extractRawValues(ctx: Context): Record<string, FormDataValue>;
+	abstract extractRawValues(
+		ctx: Context
+	): Promise<Record<string, FormDataValue>>;
 
 	async getParsedValues(
 		ctx: Context
 	): Promise<ShapeToType<FieldsToShape<F>>> {
-		const raw_values = this.extractRawValues(ctx);
+		const raw_values = await this.extractRawValues(ctx);
 		const result: Record<string, unknown> = {};
 		const promises = Object.entries(this.fields).map(
 			async ([key, field]) => {
@@ -125,4 +130,21 @@ export abstract class MountableWithFields<
 		await Promise.all(promises);
 		return result as ShapeToType<FieldsToShape<F>>;
 	}
+
+	async getDatabaseValues(
+		ctx: Context
+	): Promise<ShapeToType<FieldsToShape<F>>> {
+		const raw_values = await this.extractRawValues(ctx);
+		const result: Record<string, unknown> = {};
+		const promises = Object.entries(this.fields).map(
+			async ([key, field]) => {
+				const db_value = await field.getDatabaseValue(ctx, raw_values);
+				if (db_value !== undefined) {
+					result[key] = db_value;
+				}
+			}
+		);
+		await Promise.all(promises);
+		return result as ShapeToType<FieldsToShape<F>>;
+	}
 }

package/src/page/page.ts

@@ -38,7 +38,9 @@ export abstract class Page<
 
 	public abstract render(ctx: Context): Promise<FlatTemplatable>;
 
-	extractRawValues(ctx: Context): Record<string, FormDataValue> {
+	async extractRawValues(
+		ctx: Context
+	): Promise<Record<string, FormDataValue>> {
 		return this.propsParser.decode(ctx);
 	}
 }

package/src/sanitize.ts

@@ -1,4 +1,7 @@
-export function attribute(raw: string): string {
+export function attribute(raw: string | number): string {
+	if (typeof raw !== "string") {
+		raw = raw.toString();
+	}
 	return (raw || "")
 		.replaceAll("<", "&lt;")
 		.replace('"', "&quot;")

package/src/tests/manual/multiform.ts

@@ -49,20 +49,26 @@ const multiform = new (class extends Multiform {
 	async render(
 		ctx: Koa.Context,
 		messages: FormMessage[],
-		prerenderedForms?: Record<string, FlatTemplatable | undefined>
+		prerenderedForms?: Record<string, FlatTemplatable | undefined>,
+		show_field_errors: boolean = true
 	): Promise<FlatTemplatable> {
-		return tempstream`<!DOCTYPE html>
-		<html>
-			<head>
-				<title>Multiform Test - Sealgen</title>
-				<script type="module">
-					import hotwiredTurbo from "https://cdn.skypack.dev/pin/@hotwired/turbo@v7.0.0-9XNv1By6uiqRlBzQLO2d/mode=imports,min/optimized/@hotwired/turbo.js";
-				</script>
-			</head>
-			<body>
-				${super.render(ctx, messages, prerenderedForms)}
-			</body>
-		</html>`;
+		return tempstream/* HTML */ `<!DOCTYPE html>
+			<html>
+				<head>
+					<title>Multiform Test - Sealgen</title>
+					<script type="module">
+						import hotwiredTurbo from "https://cdn.skypack.dev/pin/@hotwired/turbo@v7.0.0-9XNv1By6uiqRlBzQLO2d/mode=imports,min/optimized/@hotwired/turbo.js";
+					</script>
+				</head>
+				<body>
+					${super.render(
+						ctx,
+						messages,
+						prerenderedForms,
+						show_field_errors
+					)}
+				</body>
+			</html>`;
 	}
 })();