@sealcode/sealgen 0.19.5 → 0.19.7

package/src/forms/form.test.ts

@@ -18,9 +18,9 @@ const fields = {
 
 export function form_factory(canAccessFun?: Mountable["canAccess"]): Form<typeof fields, void> {
 	const result = new (class extends Form<typeof fields, void> {
-		fields = fields;
+		getFields = () => fields;
 		submitButtonText = "Submit";
-		controls = [
+		getControls = () => [
 			new Controls.SimpleInput(fields.text, {
 				label: "This is a test:",
 				type: "password",
@@ -112,7 +112,7 @@ describe("form test", () => {
 				router,
 				"/",
 				form_factory(
-					async (ctx: Koa.Context): Promise<{ canAccess: boolean; message: string }> => {
+					async (_ctx: Koa.Context): Promise<{ canAccess: boolean; message: string }> => {
 						return { canAccess: true, message: "" };
 					}
 				),
@@ -184,9 +184,9 @@ describe("form test", () => {
 				"/",
 				form_factory(
 					async (ctx: Koa.Context): Promise<{ canAccess: boolean; message: string }> => {
-						return ctx.$context && ctx.$context.user_id
-							? { canAccess: true, message: "" }
-							: { canAccess: false, message: "" };
+						return ctx.$context && ctx.$context.user_id ?
+								{ canAccess: true, message: "" }
+							:	{ canAccess: false, message: "" };
 					}
 				),
 				true
@@ -214,9 +214,9 @@ describe("form test", () => {
 				"/",
 				form_factory(
 					async (ctx: Koa.Context): Promise<{ canAccess: boolean; message: string }> => {
-						return ctx.$context && ctx.$context.user_id
-							? { canAccess: true, message: "" }
-							: { canAccess: false, message: "" };
+						return ctx.$context && ctx.$context.user_id ?
+								{ canAccess: true, message: "" }
+							:	{ canAccess: false, message: "" };
 					}
 				),
 				true
@@ -242,9 +242,9 @@ describe("form test", () => {
 					router,
 					"/",
 					new (class extends Form<typeof fields, void> {
-						fields = fields;
+						getFields = () => fields;
 						submitButtonText = "Submit";
-						controls = [
+						getControls = () => [
 							new Controls.SimpleInput(fields.text, {
 								label: "This is a test:",
 								type: "password",
@@ -311,9 +311,9 @@ describe("form test", () => {
 					router,
 					"/",
 					new (class extends Form<typeof fields, void> {
-						fields = fields;
+						getFields = () => fields;
 						submitButtonText = "Submit";
-						controls = [
+						getControls = () => [
 							new Controls.SimpleInput(fields.text, {
 								label: "This is a test:",
 								type: "text",
@@ -375,8 +375,8 @@ describe("form test", () => {
 				router,
 				"/",
 				new (class extends Form<typeof fields, null> {
-					fields = fields;
-					controls = [new Controls.SimpleInput(fields.title)];
+					getFields = () => fields;
+					getControls = () => [new Controls.SimpleInput(fields.title)];
 
 					async getInitialValues() {
 						return { title: "Hello" };

package/src/forms/form.ts

@@ -66,15 +66,15 @@ export abstract class Form<
 	): Promise<JSX.Element | Readable> {
 		return tempstream /* HTML */ `<div class="form-container">
 			${this.makeOpenFormTag(ctx)}
-			${!this.controls.some((control) => control.role == "messages")
-				? this.renderMessages(ctx, data)
-				: ""}
+			${!this.controls.some((control) => control.role == "messages") ?
+				this.renderMessages(ctx, data)
+			:	""}
 			${this.renderControls(
 				this.makeFormControlContext(ctx, data, show_field_errors)
 			)}
-			${this.controls.some((control) => control.role == "submit")
-				? ""
-				: this.makeSubmitButton()}
+			${this.controls.some((control) => control.role == "submit") ?
+				""
+			:	this.makeSubmitButton()}
 			${this.makeCloseFormTag()}
 		</div>`;
 	}
@@ -102,9 +102,10 @@ export abstract class Form<
 		form_messages: FormMessage[],
 		field_errors: FieldMessages<keyof Fields>
 	): Promise<FormReaction> {
-		const messages = form_messages.length
-			? form_messages
-			: [<const>{ type: "error", text: "Some fields are invalid" }];
+		const messages =
+			form_messages.length ? form_messages : (
+				[<const>{ type: "error", text: "Some fields are invalid" }]
+			);
 		return {
 			action: "stay",
 			content: await this.render(
@@ -217,12 +218,13 @@ export abstract class Form<
 			// eslint-disable-next-line no-console
 			console.dir(e, { depth: 5 });
 			const message =
-				is(e, predicates.object) &&
-				hasFieldOfType(e, "message", predicates.string)
-					? e?.message
-					: is(e, predicates.string)
-						? e
-						: "Wystąpił błąd";
+				(
+					is(e, predicates.object) &&
+					hasFieldOfType(e, "message", predicates.string)
+				) ?
+					e?.message
+				: is(e, predicates.string) ? e
+				: "Wystąpił błąd";
 
 			return this.onError(
 				ctx,
@@ -241,6 +243,20 @@ export abstract class Form<
 		}
 	}
 
+	init(path: string, router: Router) {
+		super.init(path, router);
+		if (this.initialized) {
+			return;
+		}
+		// for use with other subroutes or middlewares that individual controls
+		// might register
+		const subrouter = new Router();
+		for (const control of this.controls) {
+			control.mount(subrouter, this);
+		}
+		router.use(path, subrouter.routes(), subrouter.allowedMethods());
+	}
+
 	public mount(router: Router, path: string): void {
 		router.use(path, async (ctx, next) => {
 			const result = await this.canAccess(ctx);
@@ -255,14 +271,6 @@ export abstract class Form<
 			await next();
 		});
 
-		// for use with other subroutes or middlewares that individual controls
-		// might register
-		const subrouter = new Router();
-		for (const control of this.controls) {
-			control.mount(subrouter, this);
-		}
-		router.use(path, subrouter.routes(), subrouter.allowedMethods());
-
 		router.get(path, async (ctx) => {
 			ctx.type = "html";
 			ctx.body = await this.render(
@@ -292,9 +300,9 @@ export abstract class Form<
 	async extractRawValues(
 		ctx: Context
 	): Promise<Record<string, FormDataValue>> {
-		return Object.keys(ctx.$body).length
-			? ctx.$body
-			: this.getInitialValues(ctx);
+		return Object.keys(ctx.$body).length ?
+				ctx.$body
+			:	this.getInitialValues(ctx);
 	}
 
 	static initFieldNames(fields: Record<string, FormField>): void {

package/src/forms/multiform.test.ts

@@ -27,8 +27,8 @@ const fields1 = {
 
 const form1 = new (class extends Form<typeof fields1, void> {
 	defaultSuccessMessage = "Form1 done!";
-	controls = [new FormHeader("form1"), new SimpleInput(fields1.email)];
-	fields = fields1;
+	getControls = () => [new FormHeader("form1"), new SimpleInput(fields1.email)];
+	getFields = () => fields1;
 	onSubmit() {
 		return;
 	}
@@ -40,8 +40,8 @@ const fields2 = {
 
 const form2 = new (class extends Form<Record<never, unknown>, void> {
 	defaultSuccessMessage = "Form2 done!";
-	controls = [new FormHeader("form2"), new SimpleInput(fields2.name)];
-	fields = fields2;
+	getControls = () => [new FormHeader("form2"), new SimpleInput(fields2.name)];
+	getFields = () => fields2;
 	onSubmit() {
 		return;
 	}
@@ -427,7 +427,7 @@ describe("multiform test", () => {
 							form1: new (class extends Form<typeof fields1, void> {
 								fields = fields1;
 								submitButtonText = "Submit";
-								controls = [
+								getControls = () => [
 									new SimpleInput(fields1.email, {
 										label: "This is a test:",
 										type: "text",
@@ -500,9 +500,9 @@ describe("multiform test", () => {
 						name = "multiform_test";
 						forms = {
 							form1: new (class extends Form<typeof fields, void> {
-								fields = fields;
+								getFields = () => fields;
 								submitButtonText = "Submit";
-								controls = [
+								getControls = () => [
 									new SimpleInput(fields.text, {
 										label: "This is a test:",
 										type: "text",

package/src/forms/multiform.ts

@@ -11,12 +11,15 @@ import { Form } from "./form.js";
 const FIELD_PREFIX_SEPARATOR = "___";
 
 export class Multiform extends MountableWithFields {
-	controls = [];
+	getControls = () => [];
 	public name: string;
 	public forms: Record<string, Form<Fields, unknown>>;
 
-	init(): void {
-		super.init();
+	init(path: string, router: Router): void {
+		if (this.initialized) {
+			return;
+		}
+		super.init(path, router);
 		for (const [key, form] of Object.entries(this.forms)) {
 			if (key !== attribute(key)) {
 				throw new Error(
@@ -30,7 +33,7 @@ export class Multiform extends MountableWithFields {
 			form.field_names_prefix = key + FIELD_PREFIX_SEPARATOR;
 			form.form_id = this.name;
 			form.action = "./" + key;
-			form.init();
+			form.init(path, router);
 			form.extractRawValues = async (context) =>
 				this.getSubformRawValues(context, key);
 			const submit_button_id = this.name + "_" + key + "_submit";
@@ -82,9 +85,9 @@ export class Multiform extends MountableWithFields {
 			throw new Error("Wrong turbo-frame header value type");
 		}
 		const forms_to_render =
-			requested_frame && this.forms[requested_frame]
-				? [<const>[requested_frame, this.forms[requested_frame]]]
-				: Object.entries(this.forms);
+			requested_frame && this.forms[requested_frame] ?
+				[<const>[requested_frame, this.forms[requested_frame]]]
+			:	Object.entries(this.forms);
 		return forms_to_render;
 	}
 

package/src/mount.ts

@@ -19,9 +19,9 @@ export function mount(
 	url: string | { rawURL: string },
 	mountable: Mountable,
 	use_dummy_app = false,
-	file_manager: FileManager | undefined = use_dummy_app
-		? new FileManager("/tmp", "/uploaded_files")
-		: undefined
+	file_manager: FileManager | undefined = use_dummy_app ?
+		new FileManager("/tmp", "/uploaded_files")
+	:	undefined
 ): void {
 	const raw_url = typeof url === "string" ? url : url.rawURL;
 
@@ -35,8 +35,9 @@ export function mount(
 
 	const fileManager = new FileManager("/tmp", "/uploaded_files");
 
-	const args = use_dummy_app
-		? [
+	const args =
+		use_dummy_app ?
+			[
 				async (ctx: Context, next: any) => {
 					// this dummy is a temporary solution it's ilustrating the ways that
 					// sealgen is coupled with sealious. Definitely room for improvement in this
@@ -66,14 +67,17 @@ export function mount(
 				SealiousMiddlewares.parseBody(file_manager),
 				handleHtmlPromise,
 			]
-		: [
+		:	[
 				SealiousMiddlewares.extractContext(),
 				SealiousMiddlewares.parseBody(file_manager),
 				handleHtmlPromise,
 			];
 
 	router.use(raw_url, ...args);
-	mountable.init();
+	router.use(raw_url, async (_ctx, next) => {
+		mountable.init(raw_url, router);
+		await next();
+	});
 
 	// to automatically add trailing slashes:
 	router.get(raw_url.slice(0, -1), async (ctx, next) => {

package/src/page/list.ts

@@ -1,15 +1,16 @@
-import { Context } from "koa";
-import { Templatable, tempstream, FlatTemplatable } from "tempstream";
-import { Page } from "./page.js";
 import { ShapeToType } from "@sealcode/ts-predicates";
+import { Context } from "koa";
+import qs from "qs";
+import { FlatTemplatable, Templatable, tempstream } from "tempstream";
 import { FormControl } from "../forms/controls/controls.js";
 import { FormField } from "../forms/fields/field.js";
-import { naturalNumbers, UrlWithNewParams } from "../utils/utils.js";
-import { makeHiddenInputs } from "../make-hidden-inputs.js";
-import qs from "qs";
 import { NumberField } from "../forms/fields/number.js";
 import { TextBasedSimpleField } from "../forms/fields/simple-form-field.js";
 import { FormDataValue } from "../forms/form-types.js";
+import { makeHiddenInputs } from "../make-hidden-inputs.js";
+import { naturalNumbers, UrlWithNewParams } from "../utils/utils.js";
+import { Page } from "./page.js";
+import Router from "@koa/router";
 
 export const BasePagePropsShape = <const>{};
 export type BasePageProps = ShapeToType<typeof BasePagePropsShape>;
@@ -72,8 +73,11 @@ export abstract class ListPage<
 	filterFields: Record<string, FormField> = {};
 	filterControls: FormControl[] = [];
 
-	init(): void {
-		super.init();
+	init(path: string, router: Router): void {
+		if (this.initialized) {
+			return;
+		}
+		super.init(path, router);
 		for (const [, field] of Object.entries(this.filterFields)) {
 			void field.init();
 		}
@@ -107,9 +111,9 @@ export abstract class ListPage<
 		}
 		const { itemsPerPage, page } = await this.getPaginationConfig(ctx);
 		const items_promise = this.getItems(ctx, page, itemsPerPage, values);
-		return tempstream`${(items
-			? Promise.resolve(items)
-			: items_promise
+		return tempstream`${(items ?
+			Promise.resolve(items)
+		:	items_promise
 		).then((items) =>
 			items.map((item, index) => this.renderItem(ctx, item, index))
 		)}`;
@@ -128,12 +132,12 @@ export abstract class ListPage<
 
 		return tempstream /* HTML */ `<div class="list-pagination">
 			<div class="list-pagination__left">
-				${page > 1
-					? this.renderPageButton(ctx, 1, "Pierwsza strona")
-					: ""}
-				${page > 1
-					? this.renderPageButton(ctx, page - 1, "Poprzednia strona")
-					: ""}
+				${page > 1 ?
+					this.renderPageButton(ctx, 1, "Pierwsza strona")
+				:	""}
+				${page > 1 ?
+					this.renderPageButton(ctx, page - 1, "Poprzednia strona")
+				:	""}
 			</div>
 			<div class="list-pagination__center">
 				<select
@@ -157,12 +161,12 @@ export abstract class ListPage<
 				</select>
 			</div>
 			<div class="list-pagination__right">
-				${page < totalIems
-					? this.renderPageButton(ctx, page + 1, "Następna strona")
-					: ""}
-				${page < totalIems
-					? this.renderPageButton(ctx, totalIems, "Ostatnia strona")
-					: ""}
+				${page < totalIems ?
+					this.renderPageButton(ctx, page + 1, "Następna strona")
+				:	""}
+				${page < totalIems ?
+					this.renderPageButton(ctx, totalIems, "Ostatnia strona")
+				:	""}
 			</div>
 		</div>`;
 	}
@@ -248,11 +252,12 @@ export abstract class ListPage<
 		const current_order =
 			current_sort?.field == field ? current_sort.order : null;
 		const order =
-			current_order === "asc" // cycles the sort order: null → "asc" → "desc" → null → ...
-				? "desc"
-				: current_order === null
-					? "asc"
-					: null;
+			(
+				current_order === "asc" // cycles the sort order: null → "asc" → "desc" → null → ...
+			) ?
+				"desc"
+			: current_order === null ? "asc"
+			: null;
 		return /* HTML */ `<th data-field="${field}">
 			<a href="${this.makeSortLink(ctx, field, order)}"
 				>${label}

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

@@ -11,8 +11,8 @@ describe("mountable-with-fields", () => {
 			required: new CollectionField(true, new FieldTypes.Text()),
 		};
 		new (class extends Form<typeof fields, void> {
-			fields = fields;
-			controls = [];
+			getFields = () => fields;
+			getControls = () => [];
 			async onSubmit(ctx: Context, form_values: FormData) {
 				const data = await this.getParsedValues(ctx);
 				// this should not throw a Typescript error

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

@@ -13,6 +13,7 @@ import type {
 	FormData,
 } from "../forms/form-types.js";
 import { Mountable } from "./mountable.js";
+import Router from "@koa/router";
 
 export type PageErrorMessage = { type: "access" | "internal"; message: string };
 
@@ -27,21 +28,41 @@ type ParsedValue<T extends FormField> = Resolved<
 export abstract class MountableWithFields<
 	F extends Fields = Fields,
 > extends Mountable {
+	getFields: () => F;
 	fields: F;
+	initialized = false;
 	field_names_prefix = ""; // useful for multiform, where many forms are merged into one and field assignment is made using the prefix
 	form_id = ""; // all fields within this mountable will be tied to form of this id
-	abstract controls: FormControl[];
+	abstract getControls: (fields: F) => FormControl[];
+	controls: FormControl[];
 
 	constructor() {
 		super();
 		if (!this.fields) this.fields = {} as F;
 	}
 
-	init(): void {
+	/** most routes should be setup using .mount(), but mount runs before
+        initialization so we don't yet have controls, app, etc ready for dynamic
+        routes **/
+	init(path: string, router: Router): void {
+		// we setup fields not on construction, but sometime after the app is
+		// initialized, as some field constructors require app data to fulle
+		// construct themselves
+		super.init(path, router);
+		if (this.initialized) {
+			return;
+		}
+		if (this.getFields) {
+			this.fields = this.getFields();
+		} else if (!this.fields) {
+			throw new Error("Fields not defined and getter not provided");
+		}
+		this.controls = this.getControls(this.fields);
 		for (const [field_name, field] of Object.entries(this.fields)) {
 			void field.init();
 			field.setName(field_name);
 		}
+		this.initialized = true;
 	}
 
 	makeFormControlContext(
@@ -145,9 +166,9 @@ export abstract class MountableWithFields<
 	): Promise<Record<string, FormDataValue>>;
 
 	async getParsedValues(ctx: Context): Promise<{
-		[field in keyof F]: F[field] extends FormField<true>
-			? Exclude<ParsedValue<F[field]>, null>
-			: ParsedValue<F[field]>;
+		[field in keyof F]: F[field] extends FormField<true> ?
+			Exclude<ParsedValue<F[field]>, null>
+		:	ParsedValue<F[field]>;
 	}> {
 		const raw_values = await this.extractRawValues(ctx);
 		const result: Record<string, unknown> = {};

package/src/page/mountable.ts

@@ -3,7 +3,7 @@ import Router from "@koa/router";
 import { Context } from "koa";
 
 export abstract class Mountable {
-	init(): void {}
+	init(_path: string, _router: Router): void {}
 	abstract mount(router: Router, path: string): void;
 
 	abstract canAccess(

package/src/page/page.ts

@@ -15,7 +15,7 @@ export abstract class Page<
 > extends MountableWithFields<F> {
 	propsParser: PagePropsParser<Record<keyof Fields, unknown>> =
 		new AllQueryParams();
-	controls = [];
+	getControls = () => [];
 
 	mount(router: Router, path: string): void {
 		router.get(path, async (ctx) => {

package/src/templates/form.ts

@@ -4,13 +4,12 @@ const defaults = {
 	postimport: `
          import { Fields } from "@sealcode/sealgen";
          import type {FormDataValue} from "@sealcode/sealgen";`,
-	fields: `
-           password: new Fields.Password(true),`,
-	controls: `
-		new Controls.SimpleInput(fields.password, {
+	get_fields: `()=>(<const>{ password: new Fields.Password(true) })`,
+	get_controls: `
+	()=><const>[new Controls.SimpleInput(fields.password, {
 			label: "Password:",
 			type: "password",
-}),`,
+})],`,
 	validate_method: `async validateValues(
 		ctx: Context,
 		data: Record<string, FormDataValue>
@@ -48,28 +47,20 @@ export async function formTemplate(
 	const params = { ...defaults, ..._params };
 	const content = `import type { Context } from "koa";
 import type { FormData } from "@sealcode/sealgen";
-import { Form,  Controls, fieldsToShape } from "@sealcode/sealgen";
+import { Form,  Controls } from "@sealcode/sealgen";
 import html from "src/back/html.js";
 
 ${params.postimport}
 
 export const actionName = "${action_name}";
 
-const fields = {
-    ${params.fields}
-};
-
-Form.initFieldNames(fields);
-
-export const ${action_name}Shape = fieldsToShape(fields);
+const getFields = ${params.get_fields};
 
-export default new (class ${action_name}Form extends Form<typeof fields, void> {
+export default new (class ${action_name}Form extends Form<ReturnType<typeof getFields>, void> {
 	defaultSuccessMessage = "Formularz wypełniony poprawnie";
-	fields = fields;
+    getFields = getFields;
 
-	controls = [
-		${params.controls}
-	];
+    getControls = ${params.get_controls};
 
    ${params.other_methods}
 

package/src/templates/shared/collection-create-form.ts

@@ -12,11 +12,11 @@ export async function createItemFormTemplate(
 ): Promise<string> {
 	const collection_fields =
 		await extract_fields_from_collection(collection_name);
-	const formFieldsVar = `${toPascalCase(collection_name)}FormFields`;
+	const formFieldsGetterVar = `get${toPascalCase(collection_name)}FormFields`;
 
 	return formTemplate(create_action_name, {
 		success_message: "Created!",
-		postimport: `import {${formFieldsVar}, get${toPascalCase(
+		postimport: `import {${formFieldsGetterVar}, get${toPascalCase(
 			collection_name
 		)}FormControls }from "./shared.js";
 
@@ -28,12 +28,12 @@ export async function createItemFormTemplate(
 		import {tempstream} from "tempstream";
 `,
 
-		fields: `...${toPascalCase(collection_name)}FormFields`,
-		controls: `
+		get_fields: `get${toPascalCase(collection_name)}FormFields`,
+		get_controls: `(fields: ReturnType<typeof getFields>)=>[
                 new Controls.FormHeader("Create ${toPascalCase(
 					collection_name
 				)}"), 
-                ...get${toPascalCase(collection_name)}FormControls()`,
+                ...get${toPascalCase(collection_name)}FormControls(fields)]`,
 
 		can_access: `canAccess = async (ctx: Context) => {
 			 const policy = ${toPascalCase(collection_name)}.getPolicy("create");
@@ -55,15 +55,15 @@ export async function createItemFormTemplate(
 		${collection_fields
 			.map((field_info) =>
 				field_info.form_field.generateCreateValueGetter(field_info, {
-					form_field_types: formFieldsVar,
+					form_field_types: "FormFieldTypes",
 					sealious_field: `fields${wrapAttribute(field_info.name)}`,
-					form_fields: "fields",
+					form_fields: "this.fields",
 				})
 			)
 			.join(",\n")} 
 			});
 
-   		for(const field of Object.values(${formFieldsVar})){
+   		for(const field of Object.values(this.fields)){
 			// eslint-disable-next-line no-await-in-loop
             await field.postSealiousCreate(ctx, created, formData)
         }