@sealcode/sealgen 0.8.0 → 0.8.2

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 { FormFieldControl } from "../forms/controls/controls";
+import { FormControl, FormFieldControl } from "../forms/controls/controls";
 import { FormField, NumberField } from "../forms/fields/field";
 import { naturalNumbers, UrlWithNewParams } from "../utils/utils";
 import { FormDataValue } from "..";
@@ -39,7 +39,7 @@ export abstract class ListPage<
 	abstract renderItem(ctx: Context, item: ItemType): Promise<FlatTemplatable>;
 
 	filterFields: Record<string, FormField> = {};
-	filterControls: FormFieldControl[] = [];
+	filterControls: FormControl[] = [];
 
 	init(): void {
 		super.init();
@@ -54,15 +54,17 @@ export abstract class ListPage<
 
 	async renderItems(
 		ctx: Context,
-		values: Record<string, FormDataValue> = this.extractRawValues(ctx)
+		values: Record<string, FormDataValue> = this.extractRawValues(ctx),
+		items?: ItemType[]
 	): Promise<FlatTemplatable> {
 		const { parsed: page } = await this.fields.page.getValue(ctx, values);
 		const { parsed: itemsPerPage } =
 			await this.fields.itemsPerPage.getValue(ctx, values);
 		const items_promise = this.getItems(ctx, page, itemsPerPage, values);
-		return tempstream`${items_promise.then((items) =>
-			items.map((item) => this.renderItem(ctx, item))
-		)}`;
+		return tempstream`${(items
+			? Promise.resolve(items)
+			: items_promise
+		).then((items) => items.map((item) => this.renderItem(ctx, item)))}`;
 	}
 
 	async render(ctx: Context): Promise<FlatTemplatable> {
@@ -132,7 +134,7 @@ ${this.renderListContainer(ctx, this.renderItems(ctx, values))}`;
 		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);
-			filter[fieldname] = parsed;
+			filter[fieldname] = field.mapToFilter(parsed);
 		}
 		return filter;
 	}
@@ -144,10 +146,10 @@ ${this.renderListContainer(ctx, this.renderItems(ctx, values))}`;
 				"page",
 				...Object.values(this.filterFields).map((f) => f.name),
 			])}
-			${this.filterControls.map((control) =>
+			${this.filterControls.map((control) => {
 				// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-				control.render(ctx, values, [], "", "")
-			)}
+				return control.render(ctx, values, [], "", "");
+			})}
 		</form>`;
 	}
 }

package/src/sanitize.ts

@@ -1,5 +1,5 @@
 export function attribute(raw: string): string {
-	return raw
+	return (raw || "")
 		.replaceAll("<", "&lt;")
 		.replace('"', "&quot;")
 		.replaceAll("'", "&#39;");

package/src/utils/input-wrapper.ts

@@ -1,5 +1,5 @@
 import { Readable } from "stream";
-import { tempstream } from "tempstream";
+import { FlatTemplatable, tempstream } from "tempstream";
 
 export function getRequiredClass(isRequired: boolean): string {
 	return isRequired ? "required" : "";
@@ -9,7 +9,10 @@ function getModifierClasses(modifiers: string[]) {
 	return modifiers.map((m) => "form-input__wrapper--" + m).join(" ");
 }
 
-export function inputWrapper(modifiers: string[], input: string): Readable {
+export function inputWrapper(
+	modifiers: string[],
+	input: FlatTemplatable
+): Readable {
 	return tempstream/* HTML */ `<div
 		class="form-input form-input__wrapper ${getModifierClasses(modifiers)}"
 	>